From 43417aef846c76f30183c436055afc7d10b8b690 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Fri, 12 May 2023 02:23:10 +0200 Subject: [PATCH] Revert "ath79: add empty squashfs-lzma filesystem" This reverts commit 91e3419a33f3f0baa2fb25680f5c9a7b2240102b. Now that squashfs3-lzma generates reproducible output we can drop the empty binary. Having a binary file in the tree is not nice and we actually also use squashfs3-lzma for devices which expect the kernel to be loaded from a squashfs3... Signed-off-by: Daniel Golle --- include/image-commands.mk | 10 ++++++++++ target/linux/ath79/image/Makefile | 3 --- target/linux/ath79/image/empty-squashfs-lzma | Bin 150 -> 0 bytes 3 files changed, 10 insertions(+), 3 deletions(-) delete mode 100755 target/linux/ath79/image/empty-squashfs-lzma diff --git a/include/image-commands.mk b/include/image-commands.mk index e1951672e6..0c13f30fef 100644 --- a/include/image-commands.mk +++ b/include/image-commands.mk @@ -103,6 +103,16 @@ define Build/append-rootfs dd if=$(IMAGE_ROOTFS) >> $@ endef +define Build/append-squashfs-fakeroot-be + rm -rf $@.fakefs $@.fakesquashfs + mkdir $@.fakefs + $(STAGING_DIR_HOST)/bin/mksquashfs3-lzma \ + $@.fakefs $@.fakesquashfs \ + -noappend -root-owned -be -nopad -b 65536 \ + $(if $(SOURCE_DATE_EPOCH),-fixed-time $(SOURCE_DATE_EPOCH)) + cat $@.fakesquashfs >> $@ +endef + define Build/append-squashfs4-fakeroot rm -rf $@.fakefs $@.fakesquashfs mkdir $@.fakefs diff --git a/target/linux/ath79/image/Makefile b/target/linux/ath79/image/Makefile index 02fd26bfd8..8328be7667 100644 --- a/target/linux/ath79/image/Makefile +++ b/target/linux/ath79/image/Makefile @@ -60,9 +60,6 @@ define Build/relocate-kernel rm -rf $@.relocate endef -define Build/append-squashfs-fakeroot-be - cat ./empty-squashfs-lzma >> $@ -endef define Device/Default DEVICE_DTS_DIR := ../dts diff --git a/target/linux/ath79/image/empty-squashfs-lzma b/target/linux/ath79/image/empty-squashfs-lzma deleted file mode 100755 index 803a7661a7bd2a04ae08b73d4a12d68a2b53d265..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmXReEY4tHU|?jL?g*q97(oOaFoRhF4ydANia=_nLA6YR(lDwVO?=XSC}5Ce;MkqS cU%=Dr_D@KO?WyONE9VY;z5mw_