Drop the initrd extension for QNAP like I said I would. The Kirkwood
images are compressed with gzip now whereas the Orion images are using
XZ. So drop the extension for Orion (as already done on Kirkwood),
especially since the extension is wrong (.gz extension but compressed
with .xz).
(cherry picked from commit 3966d6c1f8ef6baad2c88f0334b91cabb7c8c5ae)
---
build/boot/arm/qnap-flash-debian | 10 +++++-----
build/config/armel/kirkwood/network-console.cfg | 12 ++++++------
debian/changelog | 1 +
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/build/boot/arm/qnap-flash-debian b/build/boot/arm/qnap-flash-debian
index 8065d62..3acaf6a 100644
--- a/build/boot/arm/qnap-flash-debian
+++ b/build/boot/arm/qnap-flash-debian
@@ -9,16 +9,16 @@ if [ ! -e kernel ]; then
exit 1
fi
-if [ ! -e initrd.gz ]; then
- echo "You have to download the initrd.gz file from the debian-installer
for QNAP."
+if [ ! -e initrd ]; then
+ echo "You have to download the initrd file from the debian-installer
for QNAP."
exit 1
fi
-ifilesize=$(ls -l initrd.gz | awk '{print $5}')
+ifilesize=$(ls -l initrd | awk '{print $5}')
# The ramdisk partition is 4 MB on the QNAP TS-109 and TS-209, and
# 9 MB on the QNAP TS-119, TS-219 and TS-219P.
if [ $ifilesize -ne 4194304 -a $ifilesize -ne 9437184 ]; then
- echo "The initrd.gz file is corrupt"
+ echo "The initrd file is corrupt"
exit 1
fi
@@ -134,7 +134,7 @@ rmdir $path
# 5) Finally, write the installer to flash
printf "Writing debian-installer to flash... "
cat kernel > /dev/mtdblock1
-cat initrd.gz > /dev/mtdblock2
+cat initrd > /dev/mtdblock2
echo "done."
echo "Please reboot your QNAP device."
diff --git a/build/config/armel/kirkwood/network-console.cfg
b/build/config/armel/kirkwood/network-console.cfg
index 7a54a37..7b27a12 100644
--- a/build/config/armel/kirkwood/network-console.cfg
+++ b/build/config/armel/kirkwood/network-console.cfg
@@ -25,12 +25,12 @@ ts219:
cat $(TEMP_KERNEL) >> $(TEMP)/ts-219/kernel
mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000
-n "Debian kernel" -d $(TEMP)/ts-219/kernel $(TEMP)/ts-219/kernel.uboot
cp $(TEMP)/ts-219/kernel.uboot
$(SOME_DEST)/$(EXTRANAME)/qnap/ts-219/kernel
- cp $(TEMP_INITRD) $(SOME_DEST)/$(EXTRANAME)/qnap/ts-219/initrd.gz
- util/pad $(SOME_DEST)/$(EXTRANAME)/qnap/ts-219/initrd.gz 9437184
+ cp $(TEMP_INITRD) $(SOME_DEST)/$(EXTRANAME)/qnap/ts-219/initrd
+ util/pad $(SOME_DEST)/$(EXTRANAME)/qnap/ts-219/initrd 9437184
install -m 744 boot/arm/qnap-flash-debian
$(SOME_DEST)/$(EXTRANAME)/qnap/ts-219/flash-debian
update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-219/flash-debian
"Script to flash debian-installer"
update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-219/kernel "Linux
kernel for QNAP TS-119, TS-219 and TS-219P"
- update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-219/initrd.gz "initrd
for QNAP TS-119, TS-219 and TS-219P"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-219/initrd "initrd
for QNAP TS-119, TS-219 and TS-219P"
ln -s ts-219 $(SOME_DEST)/$(EXTRANAME)/qnap/ts-119
ln -s ts-219 $(SOME_DEST)/$(EXTRANAME)/qnap/ts-219p
@@ -44,12 +44,12 @@ ts41x:
cat $(TEMP_KERNEL) >> $(TEMP)/ts-41x/kernel
mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000
-n "Debian kernel" -d $(TEMP)/ts-41x/kernel $(TEMP)/ts-41x/kernel.uboot
cp $(TEMP)/ts-41x/kernel.uboot
$(SOME_DEST)/$(EXTRANAME)/qnap/ts-41x/kernel
- cp $(TEMP_INITRD) $(SOME_DEST)/$(EXTRANAME)/qnap/ts-41x/initrd.gz
- util/pad $(SOME_DEST)/$(EXTRANAME)/qnap/ts-41x/initrd.gz 9437184
+ cp $(TEMP_INITRD) $(SOME_DEST)/$(EXTRANAME)/qnap/ts-41x/initrd
+ util/pad $(SOME_DEST)/$(EXTRANAME)/qnap/ts-41x/initrd 9437184
install -m 744 boot/arm/qnap-flash-debian
$(SOME_DEST)/$(EXTRANAME)/qnap/ts-41x/flash-debian
update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-41x/flash-debian
"Script to flash debian-installer"
update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-41x/kernel "Linux
kernel for QNAP TS-41x"
- update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-41x/initrd.gz "initrd
for QNAP TS-41x"
+ update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-41x/initrd "initrd
for QNAP TS-41x"
# LaCie NAS series: Network Space v2 (and parents), d2 Network v2 and *Big
Network v2
lacie:
diff --git a/debian/changelog b/debian/changelog
index 16dbeef..0d9401c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ debian-installer (20150422+deb8u3) UNRELEASED; urgency=medium
since it's not useful there (Closes: #809301).
* 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.
-- Cyril Brulebois <k...@debian.org> Mon, 14 Sep 2015 09:53:05 +0200
--
2.1.4
