Just pushed out new version

eliasbakken · Jan 15, 2016 · f0b5557 · f0b5557
1 parent 529e1ce
commit f0b5557
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 18 deletions.
diff --git a/configs/kamikaze.conf b/configs/kamikaze.conf
@@ -1,17 +1,25 @@
 # TODO next: 
 # wifi via zeroconf 
-#  CRDA error 
-# Finish Toggle 
-# Custom controls in Octoprint
 # Py2dsc-deb on redeem, toggle, octoprint, 
 # Exchange Cura for CuraEngine
-# Remove console on startup to disable cursor and key presses. 
+# Research PyClutter
+# Fix Pip
+# webcam
+# Kamikaze pull from omap-image-builder
+# Remove operate
+# Single partition
 
 # TODO:
+# Preheat on Toggle not working (401)
+# Steppers disabled during kernel boot. 
 
 
 # STAGED: 
-# remove i2c-dev module (built in) and mt7601Usta
+# Enable cape on first start-up 
+# musb usb 1-1: new full-speed USB device number 103 using musb-hdrc
+#   Not happening with no Wifi.
+#   rfkill disables wifi
+#   CRDA error 
 
 # DONE: 
 # Adafruit lib compatible with 4.0.0
@@ -34,7 +42,6 @@
 # A4A overlay
 # Choose printer 
 # Restart redeem from octoprint - New REdeem
-
 # Kernel hung bug!
 # Switch to linux-image-4.1.0-bone9
 # python-pkginfo
@@ -57,9 +64,22 @@
 # Add this libavahi-compat-libdnssd1
 # ssh-keys not generated (dpkg-reconfigure openssh-server to do it manually)
 # Make pybonjour deb
-
 # Operate remove stuff
+# remove i2c-dev module (built in) and mt7601Usta
 
+# 2016-01-04
+# Octoprint 1.2.8
+# Custom controls in Octoprint
+# Disable sleep mode
+# missing sockjs
+# unable to get socket info on Toggle (wrong default hostname)
+# eMMC flasher image
+# pvrsrv not starting
+# pvrsrv and toggle gets disabled
+# Remove console on startup to disable cursor and key presses. 
+# start steppers disabled / Uboot-spi
+# Toggle disconnects
+# Toggle 0.5.0 toggle-lib
 
 ##
 release="8.1"
@@ -167,7 +187,7 @@ libmx-dev \
 libmash-dev \
 libwayland-server0 \
 toggle \
-libtoggle \
+libtoggle-dev \
 gir1.2-toggle \
 python-sphinx-rtd-theme \
 python-sphinxcontrib-httpdomain \
@@ -179,21 +199,30 @@ python-flask-login=0.2.2-1 \
 python-flask-principal=0.3.5-1 \
 python-tornado=4.0.1-1 \
 python-certifi \
-python-semantic-version \
+python-semantic-version=2.4.2-1 \
 python-pylru \
 python-sarge \
 python-flask-script \
 python-flask-assets \
-python-rsa \
+python-rsa=3.2-1 \
 python-pyyaml=3.10-1 \
 python-octoprint-redeem \
 python-adafruit-bbio \
+python-evdev \
+python-requests=2.7.0-1 \
+python-psutil=3.2.1-1 \
+python-pkginfo=1.2.1-1 \
+python-netifaces=0.10.0-1 \
+python-watchdog=0.8.3-1 \
+python-netaddr=0.7.17-1 \
+python-pyserial=2.7-1 \
+python-sockjs-tornado=1.0.1-1 \
 "
 #
 
 chroot_COPY_SETUP_SDCARD="enable"
 chroot_before_hook=""
 chroot_after_hook=""
 chroot_script="kamikaze.sh"
-chroot_post_uenv_txt="post_beagleboard.org.txt"
+chroot_post_uenv_txt="kamikaze.txt"
 chroot_tarball="enable"
diff --git a/scripts/chroot.sh b/scripts/chroot.sh
@@ -1100,7 +1100,7 @@ chroot_umount
 
 if [ "x${chroot_COPY_SETUP_SDCARD}" = "xenable" ] ; then
 	echo "Log: copying setup_sdcard.sh related files"
-	sudo cp ${DIR}/tools/setup_sdcard.sh ${DIR}/deploy/${export_filename}/
+	sudo cp ${DIR}/tools/setup_sdcard_kamikaze.sh ${DIR}/deploy/${export_filename}/setup_sdcard.sh
 	sudo mkdir -p ${DIR}/deploy/${export_filename}/hwpack/
 	sudo cp ${DIR}/tools/hwpack/*.conf ${DIR}/deploy/${export_filename}/hwpack/
 

diff --git a/target/chroot/kamikaze.sh b/target/chroot/kamikaze.sh
@@ -65,8 +65,8 @@ setup_system () {
 
 	if [ -f /opt/scripts/boot/am335x_evm.sh ] ; then
 		if [ -f /lib/systemd/system/[email protected] ] ; then
-			cp /lib/systemd/system/[email protected] /etc/systemd/system/[email protected]
-			ln -s /etc/systemd/system/[email protected] /etc/systemd/system/getty.target.wants/[email protected]
+			#cp /lib/systemd/system/[email protected] /etc/systemd/system/[email protected]
+			#ln -s /etc/systemd/system/[email protected] /etc/systemd/system/getty.target.wants/[email protected]
 
 			echo "" >> /etc/securetty
 			echo "#USB Gadget Serial Port" >> /etc/securetty
@@ -117,9 +117,9 @@ todo () {
 			wget https://raw.githubusercontent.com/rcn-ee/mt7601u/master/src/RT2870STA.dat
 			cd /
 		fi
-		if [ ! -f /etc/modules-load.d/mt7601.conf ] ; then
-			echo "mt7601Usta" > /etc/modules-load.d/mt7601.conf
-		fi
+		#if [ ! -f /etc/modules-load.d/mt7601.conf ] ; then
+		#	echo "mt7601u" > /etc/modules-load.d/mt7601.conf
+		#fi
 	fi
 
 

diff --git a/tools/setup_sdcard.sh b/tools/setup_sdcard.sh
@@ -1050,7 +1050,7 @@ populate_rootfs () {
 		fi
 	fi
 
-	cmdline="coherent_pool=1M quiet"
+	cmdline="coherent_pool=1M quiet consoleblank=0 fbcon=rotate:1"
 	if [ "x${enable_systemd}" = "xenabled" ] ; then
 		cmdline="${cmdline} init=/lib/systemd/systemd"
 	fi