diff options
| author | Tony Butler <spudz76@gmail.com> | 2023-04-17 19:28:36 -0700 |
|---|---|---|
| committer | Christian Marangi <ansuelsmth@gmail.com> | 2023-04-18 13:57:47 +0200 |
| commit | 69bc620180d2ec670e7a936171262fc3e9e99179 (patch) | |
| tree | 90b869311b08aea6b78e9ac68d725eb762023a54 /include | |
| parent | 394d7134ec42f14ddb91769c737098753fa68266 (diff) | |
| download | upstream-69bc620180d2ec670e7a936171262fc3e9e99179.tar.gz upstream-69bc620180d2ec670e7a936171262fc3e9e99179.tar.bz2 upstream-69bc620180d2ec670e7a936171262fc3e9e99179.zip | |
build: fix incorrect initramfs bzip2 compression
Requires: tools/bzip2
fix consistency of executable to use `$(STAGING_DIR_HOST)/bin/bzip2`, and
not system-installed ones from the usual environment `PATH`;
this affects option `CONFIG_KERNEL_INITRAMFS_COMPRESSION_BZIP2`
this may have worked in the past but only via side effect of having the
binaries on the host system (and whatever unpredictable version or
patchset those might be)
Fixes: 330bd380e8b6 ("image: allow building FIT and uImage with ramdisk")
Signed-off-by: Tony Butler <spudz76@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/kernel-defaults.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk index 37c1141139..c1976ee6c7 100644 --- a/include/kernel-defaults.mk +++ b/include/kernel-defaults.mk @@ -177,7 +177,7 @@ else ( cd $(TARGET_DIR); find . | LC_ALL=C sort | $(STAGING_DIR_HOST)/bin/cpio --reproducible -o -H newc -R 0:0 > $(KERNEL_BUILD_DIR)/initrd.cpio ) endif $(if $(SOURCE_DATE_EPOCH),touch -hcd "@$(SOURCE_DATE_EPOCH)" $(KERNEL_BUILD_DIR)/initrd.cpio) - $(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_BZIP2),bzip2 -9 -c < $(KERNEL_BUILD_DIR)/initrd.cpio > $(KERNEL_BUILD_DIR)/initrd.cpio.bzip2) + $(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_BZIP2),$(STAGING_DIR_HOST)/bin/bzip2 -9 -c < $(KERNEL_BUILD_DIR)/initrd.cpio > $(KERNEL_BUILD_DIR)/initrd.cpio.bzip2) $(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_GZIP),gzip -n -f -S .gzip -9n $(KERNEL_BUILD_DIR)/initrd.cpio) $(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_LZ4),$(STAGING_DIR_HOST)/bin/lz4c -l -c1 -fz --favor-decSpeed $(KERNEL_BUILD_DIR)/initrd.cpio) $(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_LZMA),$(STAGING_DIR_HOST)/bin/lzma e -lc1 -lp2 -pb2 $(KERNEL_BUILD_DIR)/initrd.cpio $(KERNEL_BUILD_DIR)/initrd.cpio.lzma) |