[openwrt/openwrt] refpolicy: fix path to setfiles and checkpolicy

LEDE Commits lede-commits at lists.infradead.org
Tue Sep 29 22:26:33 EDT 2020


dangole pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/359a4b46bb234166010b3e63b147d93db6c3b4f5

commit 359a4b46bb234166010b3e63b147d93db6c3b4f5
Author: Paul Spooren <mail at aparcar.org>
AuthorDate: Mon Sep 28 23:09:22 2020 -1000

    refpolicy: fix path to setfiles and checkpolicy
    
    Directly set path via MAKE vars instead of defning TESTTOOLS. This way
    setfiles, which is required by the ImageBuilder, ends up in /host/bin
    while checkpolicy can stay in hostpkg/bin.
    
    Signed-off-by: Paul Spooren <mail at aparcar.org>
---
 package/system/refpolicy/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/system/refpolicy/Makefile b/package/system/refpolicy/Makefile
index a80b4d043c..a431770955 100644
--- a/package/system/refpolicy/Makefile
+++ b/package/system/refpolicy/Makefile
@@ -56,9 +56,8 @@ endef
 # builds is a small host tool that gets run as part of the build
 # process.
 MAKE_FLAGS += \
-	TEST_TOOLCHAIN="$(STAGING_DIR_HOSTPKG)" \
-	BINDIR=/bin \
-	SBINDIR=/sbin \
+	SETFILES="$(STAGING_DIR_HOST)/bin/setfiles" \
+	CHECKPOLICY="$(STAGING_DIR_HOSTPKG)/bin/checkpolicy" \
 	CC="$(HOSTCC)" \
 	CFLAGS="$(HOST_CFLAGS)"
 



More information about the lede-commits mailing list