aboutsummaryrefslogtreecommitdiff
path: root/package/refpolicy/refpolicy.mk
diff options
context:
space:
mode:
Diffstat (limited to 'package/refpolicy/refpolicy.mk')
-rw-r--r--package/refpolicy/refpolicy.mk11
1 files changed, 6 insertions, 5 deletions
diff --git a/package/refpolicy/refpolicy.mk b/package/refpolicy/refpolicy.mk
index e1924f3c2d..0194708b37 100644
--- a/package/refpolicy/refpolicy.mk
+++ b/package/refpolicy/refpolicy.mk
@@ -6,6 +6,7 @@
REFPOLICY_LICENSE = GPL-2.0
REFPOLICY_LICENSE_FILES = COPYING
+REFPOLICY_CPE_ID_VENDOR = tresys
REFPOLICY_INSTALL_STAGING = YES
REFPOLICY_DEPENDENCIES = \
host-m4 \
@@ -21,9 +22,9 @@ REFPOLICY_SITE = $(call qstrip,$(BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_URL))
REFPOLICY_SITE_METHOD = git
BR_NO_CHECK_HASH_FOR += $(REFPOLICY_SOURCE)
else
-REFPOLICY_VERSION = 2.20200229
+REFPOLICY_VERSION = 2.20200818
REFPOLICY_SOURCE = refpolicy-$(REFPOLICY_VERSION).tar.bz2
-REFPOLICY_SITE = https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200229
+REFPOLICY_SITE = https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818
endif
# Cannot use multiple threads to build the reference policy
@@ -71,7 +72,6 @@ REFPOLICY_MODULES = \
$(foreach d,$(REFPOLICY_EXTRA_MODULES_DIRS),\
$(basename $(notdir $(wildcard $(d)/*.te))))
-ifneq ($(REFPOLICY_EXTRA_MODULES_DIRS),)
define REFPOLICY_COPY_EXTRA_MODULES
mkdir -p $(@D)/policy/modules/buildroot
rsync -au $(addsuffix /*,$(REFPOLICY_EXTRA_MODULES_DIRS)) \
@@ -81,7 +81,6 @@ define REFPOLICY_COPY_EXTRA_MODULES
$(@D)/policy/modules/buildroot/metadata.xml; \
fi
endef
-endif
# In the context of a monolithic policy enabling a piece of the policy as
# 'base' or 'module' is equivalent, so we enable them as 'base'.
@@ -106,7 +105,9 @@ define REFPOLICY_CONFIGURE_CMDS
$(SED) "/MONOLITHIC/c\MONOLITHIC = y" $(@D)/build.conf
$(SED) "/NAME/c\NAME = targeted" $(@D)/build.conf
$(REFPOLICY_CONFIGURE_SYSTEMD)
- $(REFPOLICY_COPY_EXTRA_MODULES)
+ $(if $(REFPOLICY_EXTRA_MODULES_DIRS), \
+ $(REFPOLICY_COPY_EXTRA_MODULES)
+ )
$(REFPOLICY_MAKE) -C $(@D) bare conf
$(REFPOLICY_CONFIGURE_MODULES)
endef