From 7a1dca90453acfeb0984938f2b1f47c81b37931c Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Tue, 7 May 2019 22:02:02 +0200
Subject: [PATCH] - apply new multiboot layout for hd51

---
 archive-patches/initramfs-subdirboot.cpio.gz | Bin 0 -> 10429 bytes
 make/environment-build.mk                    |   3 ++
 make/images.mk                               |  52 ++++++++-----------
 make/linux-kernel.mk                         |   3 ++
 make/rootfs.mk                               |  14 ++++-
 5 files changed, 42 insertions(+), 30 deletions(-)
 create mode 100644 archive-patches/initramfs-subdirboot.cpio.gz

diff --git a/archive-patches/initramfs-subdirboot.cpio.gz b/archive-patches/initramfs-subdirboot.cpio.gz
new file mode 100644
index 0000000000000000000000000000000000000000..1fd9027a494e8d69f60641da61b85ba93ffbd70d
GIT binary patch
literal 10429
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

literal 0
HcmV?d00001

diff --git a/make/environment-build.mk b/make/environment-build.mk
index 09a43fd6..424f3ea3 100644
--- a/make/environment-build.mk
+++ b/make/environment-build.mk
@@ -147,6 +147,9 @@ WHOAMI       := $(shell id -un)
 ARCHIVE       = $(BASE_DIR)/download
 BUILD_TMP     = $(BASE_DIR)/build_tmp
 ROOTFS        = $(BUILD_TMP)/rootfs
+ifeq ($(BOXTYPE), armbox)
+  ROOTFS      = $(BUILD_TMP)/rootfs/linuxrootfs1
+endif
 DEPS_DIR      = $(BASE_DIR)/deps
 D             = $(DEPS_DIR)
 HOST_DIR      = $(BASE_DIR)/host
diff --git a/make/images.mk b/make/images.mk
index 8b9a716d..933ce58b 100644
--- a/make/images.mk
+++ b/make/images.mk
@@ -133,7 +133,7 @@ flash-image-armbox:
 HD51_IMAGE_NAME = disk
 HD51_BOOT_IMAGE = boot.img
 HD51_IMAGE_LINK = $(HD51_IMAGE_NAME).ext4
-HD51_IMAGE_ROOTFS_SIZE = 294912
+HD51_IMAGE_ROOTFS_SIZE = 1048576
 
 # emmc image
 EMMC_IMAGE_SIZE = 3817472
@@ -144,46 +144,40 @@ BLOCK_SIZE = 512
 BLOCK_SECTOR = 2
 IMAGE_ROOTFS_ALIGNMENT = 1024
 BOOT_PARTITION_SIZE = 3072
-KERNEL_PARTITION_OFFSET = $(shell expr $(IMAGE_ROOTFS_ALIGNMENT) \+ $(BOOT_PARTITION_SIZE))
+KERNEL_PARTITION_OFFSET = "$(shell expr $(IMAGE_ROOTFS_ALIGNMENT) \+ $(BOOT_PARTITION_SIZE))"
 KERNEL_PARTITION_SIZE = 8192
-ROOTFS_PARTITION_OFFSET = $(shell expr $(KERNEL_PARTITION_OFFSET) \+ $(KERNEL_PARTITION_SIZE))
+ROOTFS_PARTITION_OFFSET = "$(shell expr $(KERNEL_PARTITION_OFFSET) \+ $(KERNEL_PARTITION_SIZE))"
 
 # partition sizes multi
 ROOTFS_PARTITION_SIZE_MULTI = 819200
-SECOND_KERNEL_PARTITION_OFFSET = $(shell expr $(ROOTFS_PARTITION_OFFSET) \+ $(ROOTFS_PARTITION_SIZE_MULTI))
-SECOND_ROOTFS_PARTITION_OFFSET = $(shell expr $(SECOND_KERNEL_PARTITION_OFFSET) \+ $(KERNEL_PARTITION_SIZE))
-THIRD_KERNEL_PARTITION_OFFSET = $(shell expr $(SECOND_ROOTFS_PARTITION_OFFSET) \+ $(ROOTFS_PARTITION_SIZE_MULTI))
-THIRD_ROOTFS_PARTITION_OFFSET = $(shell expr $(THIRD_KERNEL_PARTITION_OFFSET) \+ $(KERNEL_PARTITION_SIZE))
-FOURTH_KERNEL_PARTITION_OFFSET = $(shell expr $(THIRD_ROOTFS_PARTITION_OFFSET) \+ $(ROOTFS_PARTITION_SIZE_MULTI))
-FOURTH_ROOTFS_PARTITION_OFFSET = $(shell expr $(FOURTH_KERNEL_PARTITION_OFFSET) \+ $(KERNEL_PARTITION_SIZE))
-SWAP_PARTITION_OFFSET = $(shell expr $(FOURTH_ROOTFS_PARTITION_OFFSET) \+ $(ROOTFS_PARTITION_SIZE_MULTI))
+SECOND_KERNEL_PARTITION_OFFSET = "$(shell expr $(ROOTFS_PARTITION_OFFSET) \+ $(ROOTFS_PARTITION_SIZE_MULTI))"
+THIRD_KERNEL_PARTITION_OFFSET = "$(shell expr $(SECOND_KERNEL_PARTITION_OFFSET) \+ $(KERNEL_PARTITION_SIZE))"
+FOURTH_KERNEL_PARTITION_OFFSET = "$(shell expr $(THIRD_KERNEL_PARTITION_OFFSET) \+ $(KERNEL_PARTITION_SIZE))"
+MULTI_ROOTFS_PARTITION_OFFSET = "$(shell expr $(FOURTH_KERNEL_PARTITION_OFFSET) \+ $(KERNEL_PARTITION_SIZE))"
 
 flash-image-armbox-multi:
 	mkdir -p $(IMAGE_BUILD_TMP)
 	# Create a sparse image block
 	dd if=/dev/zero of=$(IMAGE_BUILD_TMP)/$(HD51_IMAGE_LINK) seek=$(shell expr $(HD51_IMAGE_ROOTFS_SIZE) \* $(BLOCK_SECTOR)) count=0 bs=$(BLOCK_SIZE)
-	mkfs.ext4 -F $(IMAGE_BUILD_TMP)/$(HD51_IMAGE_LINK) -d $(ROOTFS)
+	mkfs.ext4 -v -F $(IMAGE_BUILD_TMP)/$(HD51_IMAGE_LINK) -d $(ROOTFS)/..
 	# Error codes 0-3 indicate successfull operation of fsck (no errors or errors corrected)
 	fsck.ext4 -pvfD $(IMAGE_BUILD_TMP)/$(HD51_IMAGE_LINK) || [ $? -le 3 ]
 	dd if=/dev/zero of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) count=0 seek=$(shell expr $(EMMC_IMAGE_SIZE) \* $(BLOCK_SECTOR))
 	parted -s $(EMMC_IMAGE) mklabel gpt
 	parted -s $(EMMC_IMAGE) unit KiB mkpart boot fat16 $(IMAGE_ROOTFS_ALIGNMENT) $(shell expr $(IMAGE_ROOTFS_ALIGNMENT) \+ $(BOOT_PARTITION_SIZE))
-	parted -s $(EMMC_IMAGE) unit KiB mkpart kernel1 $(KERNEL_PARTITION_OFFSET) $(shell expr $(KERNEL_PARTITION_OFFSET) \+ $(KERNEL_PARTITION_SIZE))
-	parted -s $(EMMC_IMAGE) unit KiB mkpart rootfs1 ext4 $(ROOTFS_PARTITION_OFFSET) $(shell expr $(ROOTFS_PARTITION_OFFSET) \+ $(ROOTFS_PARTITION_SIZE_MULTI))
-	parted -s $(EMMC_IMAGE) unit KiB mkpart kernel2 $(SECOND_KERNEL_PARTITION_OFFSET) $(shell expr $(SECOND_KERNEL_PARTITION_OFFSET) \+ $(KERNEL_PARTITION_SIZE))
-	parted -s $(EMMC_IMAGE) unit KiB mkpart rootfs2 ext4 $(SECOND_ROOTFS_PARTITION_OFFSET) $(shell expr $(SECOND_ROOTFS_PARTITION_OFFSET) \+ $(ROOTFS_PARTITION_SIZE_MULTI))
-	parted -s $(EMMC_IMAGE) unit KiB mkpart kernel3 $(THIRD_KERNEL_PARTITION_OFFSET) $(shell expr $(THIRD_KERNEL_PARTITION_OFFSET) \+ $(KERNEL_PARTITION_SIZE))
-	parted -s $(EMMC_IMAGE) unit KiB mkpart rootfs3 ext4 $(THIRD_ROOTFS_PARTITION_OFFSET) $(shell expr $(THIRD_ROOTFS_PARTITION_OFFSET) \+ $(ROOTFS_PARTITION_SIZE_MULTI))
-	parted -s $(EMMC_IMAGE) unit KiB mkpart kernel4 $(FOURTH_KERNEL_PARTITION_OFFSET) $(shell expr $(FOURTH_KERNEL_PARTITION_OFFSET) \+ $(KERNEL_PARTITION_SIZE))
-	parted -s $(EMMC_IMAGE) unit KiB mkpart rootfs4 ext4 $(FOURTH_ROOTFS_PARTITION_OFFSET) $(shell expr $(FOURTH_ROOTFS_PARTITION_OFFSET) \+ $(ROOTFS_PARTITION_SIZE_MULTI))
-	parted -s $(EMMC_IMAGE) unit KiB mkpart swap linux-swap $(SWAP_PARTITION_OFFSET) $(shell expr $(EMMC_IMAGE_SIZE) \- 1024)
+	parted -s $(EMMC_IMAGE) unit KiB mkpart linuxkernel $(KERNEL_PARTITION_OFFSET) $(shell expr $(KERNEL_PARTITION_OFFSET) \+ $(KERNEL_PARTITION_SIZE))
+	parted -s $(EMMC_IMAGE) unit KiB mkpart linuxrootfs ext4 $(ROOTFS_PARTITION_OFFSET) $(shell expr $(ROOTFS_PARTITION_OFFSET) \+ $(ROOTFS_PARTITION_SIZE_MULTI))
+	parted -s $(EMMC_IMAGE) unit KiB mkpart linuxkernel2 $(SECOND_KERNEL_PARTITION_OFFSET) $(shell expr $(SECOND_KERNEL_PARTITION_OFFSET) \+ $(KERNEL_PARTITION_SIZE))
+	parted -s $(EMMC_IMAGE) unit KiB mkpart linuxkernel3 $(THIRD_KERNEL_PARTITION_OFFSET) $(shell expr $(THIRD_KERNEL_PARTITION_OFFSET) \+ $(KERNEL_PARTITION_SIZE))
+	parted -s $(EMMC_IMAGE) unit KiB mkpart linuxkernel4 $(FOURTH_KERNEL_PARTITION_OFFSET) $(shell expr $(FOURTH_KERNEL_PARTITION_OFFSET) \+ $(KERNEL_PARTITION_SIZE))
+	parted -s $(EMMC_IMAGE) unit KiB mkpart userdata ext4 $(MULTI_ROOTFS_PARTITION_OFFSET) 100%
 	dd if=/dev/zero of=$(IMAGE_BUILD_TMP)/$(HD51_BOOT_IMAGE) bs=$(BLOCK_SIZE) count=$(shell expr $(BOOT_PARTITION_SIZE) \* $(BLOCK_SECTOR))
 	mkfs.msdos -S 512 $(IMAGE_BUILD_TMP)/$(HD51_BOOT_IMAGE)
-	echo "boot emmcflash0.kernel1 'brcm_cma=440M@328M brcm_cma=192M@768M root=/dev/mmcblk0p3 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_TMP)/STARTUP
-	echo "boot emmcflash0.kernel1 'brcm_cma=440M@328M brcm_cma=192M@768M root=/dev/mmcblk0p3 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_TMP)/STARTUP_1
-	echo "boot emmcflash0.kernel2 'brcm_cma=440M@328M brcm_cma=192M@768M root=/dev/mmcblk0p5 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_TMP)/STARTUP_2
-	echo "boot emmcflash0.kernel3 'brcm_cma=440M@328M brcm_cma=192M@768M root=/dev/mmcblk0p7 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_TMP)/STARTUP_3
-	echo "boot emmcflash0.kernel4 'brcm_cma=440M@328M brcm_cma=192M@768M root=/dev/mmcblk0p9 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_TMP)/STARTUP_4
+	echo "boot emmcflash0.linuxkernel  'root=/dev/mmcblk0p3 rootsubdir=linuxrootfs1 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_TMP)/STARTUP
+	echo "boot emmcflash0.linuxkernel  'root=/dev/mmcblk0p3 rootsubdir=linuxrootfs1 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_TMP)/STARTUP_1
+	echo "boot emmcflash0.linuxkernel2 'root=/dev/mmcblk0p7 rootsubdir=linuxrootfs2 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_TMP)/STARTUP_2
+	echo "boot emmcflash0.linuxkernel3 'root=/dev/mmcblk0p7 rootsubdir=linuxrootfs3 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_TMP)/STARTUP_3
+	echo "boot emmcflash0.linuxkernel4 'root=/dev/mmcblk0p7 rootsubdir=linuxrootfs4 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_TMP)/STARTUP_4
 	mcopy -i $(IMAGE_BUILD_TMP)/$(HD51_BOOT_IMAGE) -v $(IMAGE_BUILD_TMP)/STARTUP ::
 	mcopy -i $(IMAGE_BUILD_TMP)/$(HD51_BOOT_IMAGE) -v $(IMAGE_BUILD_TMP)/STARTUP_1 ::
 	mcopy -i $(IMAGE_BUILD_TMP)/$(HD51_BOOT_IMAGE) -v $(IMAGE_BUILD_TMP)/STARTUP_2 ::
@@ -198,12 +192,12 @@ flash-image-armbox-multi:
 	mkdir -p $(IMAGE_DIR)/$(BOXMODEL)
 	cp $(KERNEL_ZIMAGE_DTB) $(IMAGE_DIR)/$(BOXMODEL)/kernel.bin
 	cp $(EMMC_IMAGE) $(IMAGE_DIR)/$(BOXMODEL)
-	cd $(ROOTFS); \
-	tar -cvf $(IMAGE_DIR)/$(BOXMODEL)/rootfs.tar -C $(ROOTFS) .  > /dev/null 2>&1; \
+	cd $(ROOTFS) && \
+		tar -cvf $(IMAGE_DIR)/$(BOXMODEL)/rootfs.tar -C $(ROOTFS) .  > /dev/null 2>&1; \
 	bzip2 $(IMAGE_DIR)/$(BOXMODEL)/rootfs.tar
 	echo $(IMAGE_PREFIX) > $(IMAGE_DIR)/$(BOXMODEL)/imageversion
-	cd $(IMAGE_DIR); \
-	zip -r $(IMAGE_PREFIX)-$(IMAGE_SUFFIX)_multi_usb.zip $(BOXMODEL)/*
+	cd $(IMAGE_DIR) && \
+		zip -r $(IMAGE_PREFIX)-$(IMAGE_SUFFIX)_multi_usb.zip $(BOXMODEL)/*
 	# cleanup
 	rm -rf $(IMAGE_DIR)/$(BOXMODEL)
 	rm -rf $(IMAGE_BUILD_TMP)
diff --git a/make/linux-kernel.mk b/make/linux-kernel.mk
index 825d55fd..0ef851ba 100644
--- a/make/linux-kernel.mk
+++ b/make/linux-kernel.mk
@@ -64,6 +64,9 @@ ifeq ($(BOXTYPE)-$(BOXSERIES), coolstream-hd1)
 	sed -i -e 's/EXTRAVERSION = .15/EXTRAVERSION = .13/g' $(BUILD_TMP)/$(KERNEL_SRC)/Makefile
 else ifeq ($(BOXTYPE)-$(BOXSERIES), coolstream-hd2)
 	sed -i -e 's/SUBLEVEL = 108/SUBLEVEL = 93/g' $(BUILD_TMP)/$(KERNEL_SRC)/Makefile
+else ifeq ($(BOXTYPE), armbox)
+	sed -i -e 's/CONFIG_INITRAMFS_SOURCE=""/CONFIG_INITRAMFS_SOURCE="initramfs-subdirboot.cpio.gz"\nCONFIG_INITRAMFS_ROOT_UID=0\nCONFIG_INITRAMFS_ROOT_GID=0/g' $(BUILD_TMP)/$(KERNEL_OBJ)/.config
+	install -m 644 $(PATCHES)/initramfs-subdirboot.cpio.gz $(BUILD_TMP)/$(KERNEL_OBJ)
 endif
 	$(TOUCH)
 
diff --git a/make/rootfs.mk b/make/rootfs.mk
index 529445f4..16673fc7 100644
--- a/make/rootfs.mk
+++ b/make/rootfs.mk
@@ -3,7 +3,7 @@
 #
 # -----------------------------------------------------------------------------
 
-target-finish: .version update.urls
+target-finish: .version image-version update.urls
 
 # -----------------------------------------------------------------------------
 
@@ -18,6 +18,13 @@ $(TARGET_DIR)/.version: | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
+image-version: $(TARGET_DIR)/etc/image-version
+$(TARGET_DIR)/etc/image-version: | $(TARGET_DIR)
+	echo "distro=NI \o/ Neutrino-Image"						 > $@
+	echo "imageversion=$$(git describe --always --long --tags | sed 's/-/./2')"	>> $@
+
+# -----------------------------------------------------------------------------
+
 update.urls: $(TARGET_DIR)/var/etc/update.urls
 $(TARGET_DIR)/var/etc/update.urls: | $(TARGET_DIR)
 	echo "$(NI-SERVER)/update.php"				 > $@
@@ -42,6 +49,7 @@ rootfs: target-finish $(ROOTFS) rootfs-cleanup rootfs-strip rootfs-softlinks
 # create filesystem for our images
 $(ROOTFS): | $(TARGET_DIR)
 	rm -rf $(ROOTFS)
+	mkdir -p $(dir $(ROOTFS))
 	cp -a $(TARGET_DIR) $(ROOTFS)
 
 # -----------------------------------------------------------------------------
@@ -126,6 +134,10 @@ endif
 	mkdir -p $(ROOTFS)/var/tuxbox/config
 	pushd $(ROOTFS)/var/tuxbox/config && \
 		ln -sf /var/keys/SoftCam.Key SoftCam.Key
+ifeq ($(BOXTYPE), armbox)
+	pushd $(ROOTFS)/usr/bin && \
+		ln -sf /bin/neutrino enigma2
+endif
 
 # -----------------------------------------------------------------------------