aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2014-06-04 08:33:17 +0200
committerGravatar Peter Korsgaard <peter@korsgaard.com>2014-06-04 08:33:17 +0200
commit28b514a569ee839bbda6597b330e9759a67cfbe8 (patch)
tree8a4541caa5b769a870647f719e69eaa36d85ce61 /fs
parent6767952a62a924983fd726b0783162b3e5f85d13 (diff)
downloadbuildroot-28b514a569ee839bbda6597b330e9759a67cfbe8.tar.gz
buildroot-28b514a569ee839bbda6597b330e9759a67cfbe8.tar.bz2
fs/common.mk: unbreak .xz compression when host-xz isn't built
Closes #7160 Since f46f81de1315 (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: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/common.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/common.mk b/fs/common.mk
index 919db2561c..2adaf8ce83 100644
--- a/fs/common.mk
+++ b/fs/common.mk
@@ -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: