Commit 28b514a5 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

fs/common.mk: unbreak .xz compression when host-xz isn't built 



Closes #7160

Since f46f81de (Don't build host-xz needlessly), host-xz is no longer
unconditionally built when xz fs compression is requested, so don't
explicitly refer to it.

Instead, rely on our check-host-xzcat logic to ensure xz is available and
set the path to ensure our host variant gets picked up if not available on
the build machine.

While we're at it, get rid of the now unused XZ variable.

Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 6767952a

fs/common.mk

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ ROOTFS_$(2)_COMPRESS_CMD = $$(LZOP) -9 -c 
endif

ifeq ($$(BR2_TARGET_ROOTFS_$(2)_XZ),y)

ROOTFS_$(2)_COMPRESS_EXT = .xz

ROOTFS_$(2)_COMPRESS_CMD = $$(XZ) -9 -C crc32 -c

ROOTFS_$(2)_COMPRESS_CMD = xz -9 -C crc32 -c

endif



$$(BINARIES_DIR)/rootfs.$(1): target-finalize $$(ROOTFS_$(2)_DEPENDENCIES)
@@ -90,7 +90,7 @@ endif 
	$(INSTALL) -m 0644 support/misc/target-dir-warning.txt $$(TARGET_DIR_WARNING_FILE)

	-@rm -f $$(FAKEROOT_SCRIPT) $$(FULL_DEVICE_TABLE)

ifneq ($$(ROOTFS_$(2)_COMPRESS_CMD),)

	$$(ROOTFS_$(2)_COMPRESS_CMD) $$@ > $$@$$(ROOTFS_$(2)_COMPRESS_EXT)

	PATH=$(BR_PATH) $$(ROOTFS_$(2)_COMPRESS_CMD) $$@ > $$@$$(ROOTFS_$(2)_COMPRESS_EXT)

endif



rootfs-$(1)-show-depends:

package/xz/xz.mk

+0 −2
Original line number Diff line number Diff line
@@ -14,5 +14,3 @@ XZ_LICENSE_FILES = COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 


$(eval $(autotools-package))

$(eval $(host-autotools-package))
 


XZ = $(HOST_DIR)/usr/bin/xz