From c8809128feb7515d21a73d13babd465b8fc981d3 Mon Sep 17 00:00:00 2001 From: Alex Stewart Date: Wed, 16 Nov 2022 11:25:13 -0600 Subject: [PATCH] refpolicy: remove bbappends The NI refpolicy is not in a maintainable or serviceable state and does not build on kirkstone. In absence of a clear user profile for this workflow, it isn't reasonable to fix. Remove the refpolicy bbappends, and use the default refpolicies that we inherit from meta-selinux. Signed-off-by: Alex Stewart --- .../refpolicy/refpolicy-mcs_git.bbappend | 1 - .../refpolicy/refpolicy-minimum_git.bbappend | 1 - .../refpolicy/refpolicy-mls_git.bbappend | 1 - recipes-security/refpolicy/refpolicy-ni.inc | 12 ------------ .../refpolicy/refpolicy-standard_git.bbappend | 1 - .../refpolicy/refpolicy-targeted_git.bbappend | 6 ------ 6 files changed, 22 deletions(-) delete mode 100644 recipes-security/refpolicy/refpolicy-mcs_git.bbappend delete mode 100644 recipes-security/refpolicy/refpolicy-minimum_git.bbappend delete mode 100644 recipes-security/refpolicy/refpolicy-mls_git.bbappend delete mode 100644 recipes-security/refpolicy/refpolicy-ni.inc delete mode 100644 recipes-security/refpolicy/refpolicy-standard_git.bbappend delete mode 100644 recipes-security/refpolicy/refpolicy-targeted_git.bbappend diff --git a/recipes-security/refpolicy/refpolicy-mcs_git.bbappend b/recipes-security/refpolicy/refpolicy-mcs_git.bbappend deleted file mode 100644 index 0420bcac5..000000000 --- a/recipes-security/refpolicy/refpolicy-mcs_git.bbappend +++ /dev/null @@ -1 +0,0 @@ -include refpolicy-ni.inc diff --git a/recipes-security/refpolicy/refpolicy-minimum_git.bbappend b/recipes-security/refpolicy/refpolicy-minimum_git.bbappend deleted file mode 100644 index 0420bcac5..000000000 --- a/recipes-security/refpolicy/refpolicy-minimum_git.bbappend +++ /dev/null @@ -1 +0,0 @@ -include refpolicy-ni.inc diff --git a/recipes-security/refpolicy/refpolicy-mls_git.bbappend b/recipes-security/refpolicy/refpolicy-mls_git.bbappend deleted file mode 100644 index 0420bcac5..000000000 --- a/recipes-security/refpolicy/refpolicy-mls_git.bbappend +++ /dev/null @@ -1 +0,0 @@ -include refpolicy-ni.inc diff --git a/recipes-security/refpolicy/refpolicy-ni.inc b/recipes-security/refpolicy/refpolicy-ni.inc deleted file mode 100644 index c329bd519..000000000 --- a/recipes-security/refpolicy/refpolicy-ni.inc +++ /dev/null @@ -1,12 +0,0 @@ -SRC_URI = "${NILRT_GIT}/ni-refpolicy.git;branch=nilrt/17.0/krogoth;protocol=https \ - file://customizable_types \ - file://setrans-mls.conf \ - file://setrans-mcs.conf \ -" - -PV = "2.20140311+git${SRCPV}" -SRCREV = "43d39eb64adb1d634f6f2712c460b21a8e565385" - -S = "${WORKDIR}/git" - -DEFAULT_PREFERENCE = "1" diff --git a/recipes-security/refpolicy/refpolicy-standard_git.bbappend b/recipes-security/refpolicy/refpolicy-standard_git.bbappend deleted file mode 100644 index 0420bcac5..000000000 --- a/recipes-security/refpolicy/refpolicy-standard_git.bbappend +++ /dev/null @@ -1 +0,0 @@ -include refpolicy-ni.inc diff --git a/recipes-security/refpolicy/refpolicy-targeted_git.bbappend b/recipes-security/refpolicy/refpolicy-targeted_git.bbappend deleted file mode 100644 index 2c5a02b05..000000000 --- a/recipes-security/refpolicy/refpolicy-targeted_git.bbappend +++ /dev/null @@ -1,6 +0,0 @@ -include refpolicy-ni.inc - -SRC_URI =+ "\ - file://refpolicy-fix-optional-issue-on-sysadm-module.patch \ - file://refpolicy-unconfined_u-default-user.patch \ -"