aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Spooren <mail@aparcar.org>2020-09-27 22:37:53 -1000
committerDaniel Golle <daniel@makrotopia.org>2020-09-29 00:06:32 +0100
commit96d1dc5ebfbbf68f960610407a83423915e5e966 (patch)
tree6e46238d9539e774466200c6981653fc814b3a8e
parent29fd93da1455910d961c0a0e2d081c3620eec4a3 (diff)
downloadupstream-96d1dc5ebfbbf68f960610407a83423915e5e966.tar.gz
upstream-96d1dc5ebfbbf68f960610407a83423915e5e966.tar.bz2
upstream-96d1dc5ebfbbf68f960610407a83423915e5e966.zip
policycoreutils: install to host/bin not hostpkg
By installing policycoreutils to host/bin it is also available within the ImageBuilder and SDK, allowing to correctly label both filesystems and packages. Signed-off-by: Paul Spooren <mail@aparcar.org>
-rw-r--r--include/image.mk2
-rw-r--r--package/utils/policycoreutils/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/image.mk b/include/image.mk
index da3d500e81..f72095db56 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -243,7 +243,7 @@ endef
ifeq ($(CONFIG_TARGET_ROOTFS_SECURITY_LABELS),y)
define Image/mkfs/squashfs
- echo "$(STAGING_DIR_HOSTPKG)/bin/setfiles -r" \
+ echo "$(STAGING_DIR_HOST)/bin/setfiles -r" \
"$(call mkfs_target_dir,$(1))" \
"$(call mkfs_target_dir,$(1))/etc/selinux/targeted/contexts/files/file_contexts " \
"$(call mkfs_target_dir,$(1))" > $@.fakeroot-script
diff --git a/package/utils/policycoreutils/Makefile b/package/utils/policycoreutils/Makefile
index 6b7b78ed78..a237542be6 100644
--- a/package/utils/policycoreutils/Makefile
+++ b/package/utils/policycoreutils/Makefile
@@ -67,7 +67,7 @@ MAKE_FLAGS += \
HOST_MAKE_FLAGS += \
PAMH=$(CONFIG_BUSYBOX_CONFIG_PAM) \
- DESTDIR=$(STAGING_DIR_HOSTPKG) \
+ DESTDIR=$(STAGING_DIR_HOST) \
PREFIX= \
SBINDIR=/bin