Merge branch 'config-hooks' of https://github.com/cdsteinkuehler/omap-image-builder

machinekit/scripts/001.download.shu

@@ -3,5 +3,6 @@
 cd ~
 
 #wget http://static.mah.priv.at/public/beaglebone/starterkit/deploy/3.8.13xenomai-bone20.config
-wget http://static.mah.priv.at/public/beaglebone/starterkit/deploy/3.8.13xenomai-bone23.config
+#wget http://static.mah.priv.at/public/beaglebone/starterkit/deploy/3.8.13xenomai-bone23.config
+wget http://www.machinekit.net/deb/wheezy-armhf/v3.8.13xenomai-bone26/3.8.13xenomai-bone26.config
 

machinekit/scripts/005.make-linuxcnc.shu

@@ -8,10 +8,12 @@ cd ~
 if [ -f kickstart.${SOURCE}.tar ] ; then
 	tar xf kickstart.${SOURCE}.tar
 else
-	git clone -b MachineKit git://git.mah.priv.at/emc2-dev.git linuxcnc
+	git clone -b MachineKit-ubc git://git.mah.priv.at/emc2-dev.git linuxcnc
+	git remote add github https://github.com/cdsteinkuehler/MachineKit.git
+	git remote add linuxcnc git://git.linuxcnc.org/git/linuxcnc.git
 	cd ~/linuxcnc/src
 	./autogen.sh
-	./configure --with-threads=xenomai-user --with-platform=beaglebone --with-kernel=/boot/3.8.13xenomai-bone20.config
+	./configure --with-xenomai --with-platform=beaglebone --enable-emcweb
 	make
 fi
 

machinekit/scripts/008.make-dtc.shr

@@ -3,11 +3,10 @@
 eval cd ~$1/dtc
 make PREFIX=/usr/local/ install
 
+for FILE in $( eval find ~$1/linuxcnc/configs -name dtc.sh ) ; do
 
-eval cd ~$1/linuxcnc/configs/BeagleBone/BeBoPr
-./dtc.sh
-
-
-eval cd ~$1/linuxcnc/configs/BeagleBone/K9.3D
-./dtc.sh
+    cd $( dirname $FILE )
+    ./dtc.sh
 
+done
+~

releases.sh

@@ -11,7 +11,8 @@ select_custom_kernel () {
 	#SUBARCH="omap-psp"
 	#KERNEL_ABI="TESTING"
 	#kernel_chooser
-	chroot_KERNEL_HTTP_DIR="${chroot_KERNEL_HTTP_DIR} http://www.machinekit.net/deb/wheezy-armhf/v3.8.13xenomai-bone23/"
+	# Remember to change file name in machinekit/scripts/001.download.shu !!
+	chroot_KERNEL_HTTP_DIR="${chroot_KERNEL_HTTP_DIR} http://www.machinekit.net/deb/wheezy-armhf/v3.8.13xenomai-bone26/"
 
 	SUBARCH="omap-psp"
 	KERNEL_ABI="STABLE"