From: Markham Date: Sat, 9 Jun 2018 14:46:39 +0000 (+0200) Subject: create hd51 tgz image; fix ofgwrite flicker X-Git-Url: https://git.webhop.me/?a=commitdiff_plain;h=fbb931b27a617b5f347cc9d413aa8e4920227ce4;p=bs-cst-neutrino-hd.git create hd51 tgz image; fix ofgwrite flicker --- diff --git a/archive-patches/ofgwrite-reactivate-correct-input-to-make-ofgwrite-visible-again.patch b/archive-patches/ofgwrite-reactivate-correct-input-to-make-ofgwrite-visible-again.patch index 79946e7..31788d2 100644 --- a/archive-patches/ofgwrite-reactivate-correct-input-to-make-ofgwrite-visible-again.patch +++ b/archive-patches/ofgwrite-reactivate-correct-input-to-make-ofgwrite-visible-again.patch @@ -1,8 +1,22 @@ -diff --git a/ofgwrite.c b/ofgwrite.c -index 58c757e..9867591 100644 --- a/ofgwrite.c +++ b/ofgwrite.c -@@ -592,6 +592,20 @@ int check_neutrino_stopped() +@@ -553,7 +553,9 @@ + int max_time = 70; + int neutrino_found = 1; + ++ if (!stop_neutrino_needed) // M + set_step_progress(0); ++ + if (!quiet) + my_printf("Checking Neutrino is running...\n"); + while (time < max_time && neutrino_found) +@@ -580,11 +582,26 @@ + if (!quiet) + my_printf("Neutrino still running\n"); + } ++ if (!stop_neutrino_needed) // M + set_step_progress(time * 100 / max_time); + } if (neutrino_found) return 0; @@ -23,3 +37,92 @@ index 58c757e..9867591 100644 return 1; } +@@ -657,6 +674,7 @@ + // create directories + ret += chdir("/newroot"); + ret += mkdir("/newroot/bin", 777); ++ ret += mkdir("/newroot/boot", 777); + ret += mkdir("/newroot/dev", 777); + ret += mkdir("/newroot/etc", 777); + ret += mkdir("/newroot/dev/pts", 777); +@@ -670,9 +688,13 @@ + ret += mkdir("/newroot/sys", 777); + ret += mkdir("/newroot/tmp", 777); + ret += mkdir("/newroot/usr", 777); ++/* + ret += mkdir("/newroot/usr/lib", 777); + ret += mkdir("/newroot/usr/lib/autofs", 777); ++*/ + ret += mkdir("/newroot/var", 777); ++ ret += mkdir("/newroot/var/lib", 777); ++ ret += mkdir("/newroot/var/lib/nfs", 777); + if (ret != 0) + { + my_printf("Error creating necessary directories\n"); +@@ -725,6 +747,7 @@ + + // it can take several seconds until Neutrino is shut down + // wait because otherwise remounting read only is not possible ++#if 0 // M + set_step("Wait until Neutrino is stopped"); + if (!check_neutrino_stopped()) + { +@@ -735,8 +758,10 @@ + #endif + return 0; + } ++#endif // M + show_main_window(1, ofgwrite_version); + set_overall_text("Flashing image"); ++ if (stop_neutrino_needed) // M + set_step_without_incr("Wait until Neutrino is stopped"); + sleep(2); + +@@ -1117,7 +1142,18 @@ + my_printf(", because rootfs type is unknown\n"); + return EXIT_FAILURE; + } +- ++// M ++ if (stop_neutrino_needed) ++ { ++ set_step("Wait until Neutrino is stopped"); ++ if (!check_neutrino_stopped()) ++ { ++ my_printf("Error Neutrino can't be stopped! Abort flashing.\n"); ++ set_error_text("Error Neutrino can't be stopped! Abort flashing."); ++ return EXIT_FAILURE; ++ } ++ } ++// M + if (flash_kernel && !flash_rootfs) // flash only kernel + { + if (!quiet) +@@ -1142,7 +1178,10 @@ + { + my_printf("failed. System won't boot. Please flash backup!\n"); + set_error_text1("Error flashing kernel. System won't boot!"); +- set_error_text2("Please flash backup! Go back to Neutrino in 60 sec"); ++// M ++// set_error_text2("Please flash backup! Go back to Neutrino in 60 sec"); ++ set_error_text2("Please flash backup! Go back to prompt in 60 sec"); ++// M + sleep(60); + } + closelog(); +@@ -1199,6 +1238,7 @@ + // stop autofs + ret = system("/etc/init.d/autofs stop"); + #endif ++ ret = system("/etc/init.d/rcK"); // M + // ignore return values, because the processes might not run + } + +@@ -1313,6 +1353,7 @@ + sleep(3); + if (!no_write && stop_neutrino_needed) + { ++ set_step_progress(100); // M + my_printf("Rebooting in 3 seconds...\n"); + set_step("Successfully flashed! Rebooting in 3 seconds..."); + sleep(3); diff --git a/make/applications.mk b/make/applications.mk index 7d5b436..d6f050f 100755 --- a/make/applications.mk +++ b/make/applications.mk @@ -885,7 +885,7 @@ $(D)/ofgwrite: $(ARCHIVE)/ofgwrite-git-$(OFGWRITE_VER).tar.bz2 | $(TARGETPREFIX) $(TOUCH) # -# ofgwrite +# aio-grab # $(D)/aio-grab: $(D)/zlib $(D)/libpng $(D)/libjpeg | $(TARGETPREFIX) $(START_BUILD) diff --git a/make/flashimage.mk b/make/flashimage.mk index 43cb019..5594671 100755 --- a/make/flashimage.mk +++ b/make/flashimage.mk @@ -37,6 +37,7 @@ FOURTH_ROOTFS_PARTITION_OFFSET = $(shell expr $(FOURTH_KERNEL_PARTITION_OFFSET) SWAP_PARTITION_OFFSET = $(shell expr $(FOURTH_ROOTFS_PARTITION_OFFSET) \+ $(ROOTFS_PARTITION_SIZE_MULTI)) flash-image-hd51-multi-disk: IMAGE_NAME=$(shell cat $(RELEASE_DIR)/.version | grep "^imagename=" | cut -d= -f2) +flash-image-hd51-multi-disk: IMG_DATE=$(shell cat $(RELEASE_DIR)/.version | grep "^version" | cut -d= -f2 | cut -c5-) flash-image-hd51-multi-disk: mkdir -p $(HD51_BUILD_TMP) rm -rf $(IMAGE_DIR)/$(BOXMODEL) @@ -81,24 +82,26 @@ flash-image-hd51-multi-disk: cd $(RELEASE_DIR); \ tar -cvf $(IMAGE_DIR)/$(BOXMODEL)/rootfs.tar --exclude=zImage* -C $(RELEASE_DIR) . > /dev/null 2>&1; \ bzip2 $(IMAGE_DIR)/$(BOXMODEL)/rootfs.tar - echo $(BOXMODEL)_$(IMAGE_NAME)_usb_$(shell date '+%d%m%Y-%H%M%S') > $(IMAGE_DIR)/$(BOXMODEL)/imageversion + echo $(BOXMODEL)_$(IMAGE_NAME)_usb_$(IMG_DATE) > $(IMAGE_DIR)/$(BOXMODEL)/imageversion cd $(IMAGE_DIR); \ - zip -r $(BUILD_TMP)/$(BOXMODEL)_multi_usb_$(shell date '+%d.%m.%Y-%H.%M').zip $(BOXMODEL)/rootfs.tar.bz2 $(BOXMODEL)/kernel.bin $(BOXMODEL)/disk.img $(BOXMODEL)/imageversion + zip -r $(BUILD_TMP)/$(BOXMODEL)_multi_usb_$(IMG_DATE).zip $(BOXMODEL)/rootfs.tar.bz2 $(BOXMODEL)/kernel.bin $(BOXMODEL)/disk.img $(BOXMODEL)/imageversion # cleanup rm -rf $(IMAGE_DIR)/$(BOXMODEL) rm -rf $(HD51_BUILD_TMP) flash-image-hd51-multi-rootfs: IMAGE_NAME=$(shell cat $(RELEASE_DIR)/.version | grep "^imagename=" | cut -d= -f2) +flash-image-hd51-multi-rootfs: IMG_DATE=$(shell cat $(RELEASE_DIR)/.version | grep "^version" | cut -d= -f2 | cut -c5-) flash-image-hd51-multi-rootfs: mkdir -p $(IMAGE_DIR)/$(BOXMODEL) + rm -rf $(IMAGE_DIR)/$(BOXMODEL)/* cp $(ZIMAGE_DTB) $(IMAGE_DIR)/$(BOXMODEL)/kernel.bin cd $(RELEASE_DIR); \ tar -cvf $(IMAGE_DIR)/$(BOXMODEL)/rootfs.tar --exclude=zImage* -C $(RELEASE_DIR) . > /dev/null 2>&1; \ bzip2 $(IMAGE_DIR)/$(BOXMODEL)/rootfs.tar - echo $(BOXMODEL)_$(IMAGE_NAME)_ofg_$(shell date '+%d%m%Y-%H%M%S') > $(IMAGE_DIR)/$(BOXMODEL)/imageversion + echo $(BOXMODEL)_$(IMAGE_NAME)_ofg_$(IMG_DATE) > $(IMAGE_DIR)/$(BOXMODEL)/imageversion # Create minimal image - cd $(IMAGE_DIR); \ - zip -r $(BUILD_TMP)/$(BOXMODEL)_multi_ofg_$(shell date '+%d.%m.%Y-%H.%M').zip $(BOXMODEL)/rootfs.tar.bz2 $(BOXMODEL)/kernel.bin $(BOXMODEL)/imageversion + cd $(IMAGE_DIR)/$(BOXMODEL); \ + tar -czf $(BUILD_TMP)/$(BOXMODEL)_multi_ofg_$(IMG_DATE).tgz rootfs.tar.bz2 kernel.bin imageversion rm -rf $(IMAGE_DIR)/$(BOXMODEL)