[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[PATCH 5/5] Drop the initrd extension for QNAP



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 b81fcc76eb52aa75c35d6b25fa0bb45682158f69)
---
 build/config/armel/orion5x/network-console.cfg | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/build/config/armel/orion5x/network-console.cfg b/build/config/armel/orion5x/network-console.cfg
index 0908936..c328f6c 100644
--- a/build/config/armel/orion5x/network-console.cfg
+++ b/build/config/armel/orion5x/network-console.cfg
@@ -109,12 +109,12 @@ ts209: $(TEMP_INITRD_XZ)
 	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
+	cp $(TEMP_INITRD_XZ) $(SOME_DEST)/$(EXTRANAME)/qnap/ts-209/initrd
+	util/pad $(SOME_DEST)/$(EXTRANAME)/qnap/ts-209/initrd 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"
+	update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-209/initrd "initrd for QNAP TS-109/TS-209"
 	ln -s ts-209 $(SOME_DEST)/$(EXTRANAME)/qnap/ts-109
 
 # QNAP TS-409
@@ -127,9 +127,9 @@ ts409: $(TEMP_INITRD_XZ)
 	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
+	cp $(TEMP_INITRD_XZ) $(SOME_DEST)/$(EXTRANAME)/qnap/ts-409/initrd
+	util/pad $(SOME_DEST)/$(EXTRANAME)/qnap/ts-409/initrd 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"
+	update-manifest $(SOME_DEST)/$(EXTRANAME)/qnap/ts-409/initrd "initrd for QNAP TS-409"
-- 
2.1.4


Reply to: