From: Paul Spooren Date: Mon, 28 Sep 2020 08:37:53 +0000 (-1000) Subject: policycoreutils: install to host/bin not hostpkg X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=96d1dc5ebfbbf68f960610407a83423915e5e966;p=openwrt%2Fstaging%2Fneocturne.git 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 --- 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