Merge branch 'master' of bitbucket.org:neutrino-images/ni-buildsystem

archive-server/update.php

@@ -13,7 +13,14 @@ $image_type = trim($_GET["image_type"]);
 $revision = trim($_GET["revision"]);
 $chip_type = trim($_GET["chip_type"]);
 
-if ($revision == 6 || $revision == 7 || $revision == 8 || $revision == 10)
+if ($revision == 1) //FIXME
+{
+	# AX-Technologies
+	$boxtype_sc = "axt";
+	$boxseries = "ax";
+	$boxmodel = "hd51";
+}
+elseif ($revision == 6 || $revision == 7 || $revision == 8 || $revision == 10)
 {
 	# CST - HD1, BSE, Neo, Neo², Zee
 	$boxtype_sc = "cst";

make/images.mk

@@ -97,6 +97,7 @@ endif
 ifeq ($(BOXMODEL), hd51)
 	#make flash-image-axt-single
 	make flash-image-axt-multi
+	make flash-image-axt-minimal
 endif
 
 flash-image: IMAGE_NAME=$(IMAGE_PREFIX)-$(IMAGE_SUFFIX)
@@ -258,3 +259,14 @@ flash-image-axt-multi:
 	# cleanup
 	rm -rf $(IMAGE_DIR)/$(BOXMODEL)
 	rm -rf $(AX_BUILD_TMP)
+
+flash-image-axt-minimal:
+	mkdir -p $(IMAGE_DIR)/$(BOXMODEL)
+	cp $(ZIMAGE_DTB) $(IMAGE_DIR)/$(BOXMODEL)/kernel.bin
+	cd $(BOX); \
+	tar -cvf $(IMAGE_DIR)/$(BOXMODEL)/rootfs.tar -C $(BOX) .  > /dev/null 2>&1; \
+	bzip2 $(IMAGE_DIR)/$(BOXMODEL)/rootfs.tar
+	# Create minimal image
+	cd $(IMAGE_DIR); \
+	tar -czf $(IMAGE_PREFIX)-$(IMAGE_SUFFIX).tgz $(BOXMODEL)/kernel.bin $(BOXMODEL)/rootfs.tar.bz2
+	rm -rf $(IMAGE_DIR)/$(BOXMODEL)

skel-root/axtech/ax/etc/init.d/rcS

@@ -85,7 +85,7 @@ service networking start
 service ntpdate start
 
 # say hi to everyone
-echo "BOOT NI-IMAGE" > /dev/dbox/oled0
+echo "Booting... NI" > /dev/dbox/oled0
 
 # starting services and daemons in order of the symlink names
 LOGINFO "run initscripts start ..."

skel-root/axtech/ax/etc/init.d/start_neutrino

@@ -9,6 +9,12 @@ fi
 until neutrino; do
 	RET=$?
 
+	# shutdown
+	if [ $RET -eq 1 ]; then
+		touch /tmp/.halt
+		break
+	fi
+
 	echo "Neutrino exited with exit code $RET"
 	echo "Neutrino: $RET" > /dev/dbox/oled0
 
@@ -26,4 +32,7 @@ done
 if [ -e /tmp/.reboot ]; then # gets created by neutrino
 	echo "Reboot ..." > /dev/dbox/oled0
 	reboot
+elif [ -e /tmp/.halt ]; then
+	echo "Shutdown ..." > /dev/dbox/oled0
+	poweroff
 fi