aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fs/common.mk4
-rw-r--r--package/xz/xz.mk2
2 files changed, 2 insertions, 4 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:
diff --git a/package/xz/xz.mk b/package/xz/xz.mk
index af90f05919..0ecd049092 100644
--- a/package/xz/xz.mk
+++ b/package/xz/xz.mk
@@ -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