diff --git a/machinekit/scripts/000.build_dtc.shu b/machinekit/scripts/000.build_dtc.shu deleted file mode 100755 index 5897bb88f3b5f77807f5f7a70cf2f8f0f0bd9072..0000000000000000000000000000000000000000 --- a/machinekit/scripts/000.build_dtc.shu +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -e - -# Don't try to sudo, it will fail -sudo () { - echo sudo $@ -} - -# Build a dtc compiler that works with the 3.8.13 kernel -. /opt/source/tools/pkgs/dtc.sh - diff --git a/machinekit/scripts/001.build_dtc.shr b/machinekit/scripts/001.build_dtc.shr deleted file mode 100755 index 6b6e9e4084c656cb6043c8e99bd0b15bacefcd44..0000000000000000000000000000000000000000 --- a/machinekit/scripts/001.build_dtc.shr +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -e - -# Install a dtc compiler that works with the 3.8.13 kernel -cd /home/machinekit/git/dtc -make PREFIX=/usr/local/ install - diff --git a/target/chroot/machinekit-jessie.sh b/target/chroot/machinekit-jessie.sh index 74db4ba5bda58807e0bf6479f9fc9bf1592cf593..994ae81c8f8d853ee7ccb6d9d40317a97a89ce5e 100755 --- a/target/chroot/machinekit-jessie.sh +++ b/target/chroot/machinekit-jessie.sh @@ -338,18 +338,12 @@ install_git_repos () { git_target_dir="/opt/source/Robotics_Cape_Installer" git_clone - # Device tree compiler compatible with 3.8 kernels - git_repo="https://github.com/RobertCNelson/tools.git" - git_target_dir="/opt/source/tools" - git_clone -# Don't try to run the build script, sudo will fail -# Instead, run as two parts using the machinekit chroot-hook script -# if [ -f ${git_target_dir}/.git/config ] ; then -# cd ${git_target_dir}/ -# if [ -f ${git_target_dir}/pkgs/dtc.sh ] ; then -# ${git_target_dir}/pkgs/dtc.sh -# fi -# fi + # Build a dtc compiler that works with the 3.8.13 kernel + if [ -f /usr/bin/make ] ; then + if [ -f /opt/scripts/tools/dtc/dtc-3.8.x.sh ] ; then + /opt/scripts/tools/dtc/dtc-3.8.x.sh + fi + fi } install_build_pkgs () {