Thanks to XZ compression and some other changes, the initrd
fits in flash again on QNAP TS-x09 devices.
(cherry picked from commit a89d48740adb3147a3b64b345e0ce18d9cd0152f)
---
build/config/armel/orion5x/network-console.cfg | 41 +++++++++++++++++++++++++-
debian/changelog | 1 +
2 files changed, 41 insertions(+), 1 deletion(-)
diff --git a/build/config/armel/orion5x/network-console.cfg
b/build/config/armel/orion5x/network-console.cfg
index 7e86100..0908936 100644
--- a/build/config/armel/orion5x/network-console.cfg
+++ b/build/config/armel/orion5x/network-console.cfg
@@ -1,9 +1,14 @@
MEDIA_TYPE = netboot image
-TARGET = $(TEMP_INITRD) $(TEMP_KERNEL) dns-323 kuroboxpro lslive lsmini lspro
mv2120
+TARGET = $(TEMP_INITRD) $(TEMP_KERNEL) dns-323 kuroboxpro lslive lsmini lspro
mv2120 ts209 ts409
EXTRANAME = $(MEDIUM)
TYPE = netboot/network-console
+TEMP_INITRD_XZ = $(TEMP)/initrd.xz
+
+$(TEMP_INITRD_XZ): $(TEMP_INITRD)
+ zcat $(TEMP_INITRD) | xz --check=crc32 -9 > $(TEMP_INITRD_XZ)
+
# D-Link DNS-323 / Conceptronic CH3SNAS
dns-323:
mkdir -p $(SOME_DEST)/$(EXTRANAME)/d-link/dns-323
@@ -94,3 +99,37 @@ mv2120:
cat $(TEMP)/mv2120/kernel.uboot $(TEMP)/mv2120/initrd.uboot >
$(SOME_DEST)/$(EXTRANAME)/hp/mv2120/netboot.img
update-manifest $(SOME_DEST)/$(EXTRANAME)/hp/mv2120/netboot.img
"installer image for HP Media Vault mv2120/mv51x0"
+# QNAP TS-109/TS-209
+ts209: $(TEMP_INITRD_XZ)
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)/qnap/ts-209
+ mkdir -p $(TEMP)/ts-209
+ echo "TS-109/TS-209" > $(SOME_DEST)/$(EXTRANAME)/qnap/ts-209/model
+ # Set machine id 1565 (0x061d)
+ devio > $(TEMP)/ts-209/kernel 'wl 0xe3a01c06,4' 'wl 0xe381101d,4'
+ cat $(TEMP_KERNEL) >> $(TEMP)/ts-209/kernel
+ mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000
-n "Debian kernel" -d $(TEMP)/ts-209/kernel $(TEMP)/ts-209/kernel.uboot
+ cp $(TEMP)/ts-209/kernel.uboot
$(SOME_DEST)/$(EXTRANAME)/qnap/ts-209/kernel
+ cp $(TEMP_INITRD_XZ) $(SOME_DEST)/$(EXTRANAME)/qnap/ts-209/initrd.gz
+ util/pad $(SOME_DEST)/$(EXTRANAME)/qnap/ts-209/initrd.gz 4194304
+ install -m 744 boot/arm/qnap-flash-debian
$(SOME_DEST)/$(EXTRANAME)/qnap/ts-209/flash-debian
+ update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-209/flash-debian
"Script to flash debian-installer"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-209/kernel "Linux
kernel for QNAP TS-109/TS-209"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-209/initrd.gz "initrd
for QNAP TS-109/TS-209"
+ ln -s ts-209 $(SOME_DEST)/$(EXTRANAME)/qnap/ts-109
+
+# QNAP TS-409
+ts409: $(TEMP_INITRD_XZ)
+ mkdir -p $(SOME_DEST)/$(EXTRANAME)/qnap/ts-409
+ mkdir -p $(TEMP)/ts-409
+ echo "TS-409" > $(SOME_DEST)/$(EXTRANAME)/qnap/ts-409/model
+ # Set machine id 1601 (0x0641)
+ devio > $(TEMP)/ts-409/kernel 'wl 0xe3a01c06,4' 'wl 0xe3811041,4'
+ cat $(TEMP_KERNEL) >> $(TEMP)/ts-409/kernel
+ mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000
-n "Debian kernel" -d $(TEMP)/ts-409/kernel $(TEMP)/ts-409/kernel.uboot
+ cp $(TEMP)/ts-409/kernel.uboot
$(SOME_DEST)/$(EXTRANAME)/qnap/ts-409/kernel
+ cp $(TEMP_INITRD_XZ) $(SOME_DEST)/$(EXTRANAME)/qnap/ts-409/initrd.gz
+ util/pad $(SOME_DEST)/$(EXTRANAME)/qnap/ts-409/initrd.gz 4194304
+ install -m 744 boot/arm/qnap-flash-debian
$(SOME_DEST)/$(EXTRANAME)/qnap/ts-409/flash-debian
+ update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-409/flash-debian
"Script to flash debian-installer"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-409/kernel "Linux
kernel for QNAP TS-409"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-409/initrd.gz "initrd
for QNAP TS-409"
diff --git a/debian/changelog b/debian/changelog
index 0d9401c..37dc6ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ debian-installer (20150422+deb8u3) UNRELEASED; urgency=medium
* Exclude usb-modules explicitly on armel/orion5x network-console
to work around bug in util/pkg-list.
* Drop the file extension from the initrd for QNAP devices.
+ * Re-introduce installer images for QNAP TS-x09.
-- Cyril Brulebois <[email protected]> Mon, 14 Sep 2015 09:53:05 +0200
--
2.1.4
