From e755c690c4828db7d964f33122d5daef15979557 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 15 Oct 2017 21:21:06 +0200 Subject: [PATCH 1/4] - skel-root/ax: align welcome message --- skel-root/axtech/ax/etc/init.d/rcS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skel-root/axtech/ax/etc/init.d/rcS b/skel-root/axtech/ax/etc/init.d/rcS index dabc9224..c38c06d0 100755 --- a/skel-root/axtech/ax/etc/init.d/rcS +++ b/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 ..." From 792d947045b5786eb2b68178e06b34534973ef0d Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 15 Oct 2017 21:21:06 +0200 Subject: [PATCH 2/4] - skel-root/ax: fix shutdown --- skel-root/axtech/ax/etc/init.d/start_neutrino | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/skel-root/axtech/ax/etc/init.d/start_neutrino b/skel-root/axtech/ax/etc/init.d/start_neutrino index 1eb07e7d..9b2b23fe 100755 --- a/skel-root/axtech/ax/etc/init.d/start_neutrino +++ b/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 From 313d822f8656f4c827f6a20d0f65d45bb62b617e Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 15 Oct 2017 22:38:14 +0200 Subject: [PATCH 3/4] - online-update: hide wrong images from hd51 boxes --- archive-server/update.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/archive-server/update.php b/archive-server/update.php index 9b2f2df7..c0d4c4c5 100644 --- a/archive-server/update.php +++ b/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"; From 69d00266e79ffa3a11693556ccdcdec9eed54d3f Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 16 Oct 2017 00:00:13 +0200 Subject: [PATCH 4/4] - ax: create minimal image for online-update --- make/images.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/make/images.mk b/make/images.mk index 97685afa..9e721aa8 100644 --- a/make/images.mk +++ b/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)