Merge inc file into bb file.

Signed-off-by: Yi Zhao <[email protected]>
---
 recipes-security/selinux/checkpolicy_3.1.bb            |  7 -------
 .../selinux/{checkpolicy.inc => checkpolicy_3.2.bb}    | 10 +++++++---
 2 files changed, 7 insertions(+), 10 deletions(-)
 delete mode 100644 recipes-security/selinux/checkpolicy_3.1.bb
 rename recipes-security/selinux/{checkpolicy.inc => checkpolicy_3.2.bb} (71%)

diff --git a/recipes-security/selinux/checkpolicy_3.1.bb 
b/recipes-security/selinux/checkpolicy_3.1.bb
deleted file mode 100644
index 71045b8..0000000
--- a/recipes-security/selinux/checkpolicy_3.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require selinux_20200710.inc
-require ${BPN}.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
-
-SRC_URI[md5sum] = "1302676cd8853f740a963fd6d5bb4172"
-SRC_URI[sha256sum] = 
"dfc7707070520c93b14fbbdfdbe081364d806bf28e3e79e10318c2594c77bbb2"
diff --git a/recipes-security/selinux/checkpolicy.inc 
b/recipes-security/selinux/checkpolicy_3.2.bb
similarity index 71%
rename from recipes-security/selinux/checkpolicy.inc
rename to recipes-security/selinux/checkpolicy_3.2.bb
index 1d84ebb..552dc26 100644
--- a/recipes-security/selinux/checkpolicy.inc
+++ b/recipes-security/selinux/checkpolicy_3.2.bb
@@ -5,18 +5,22 @@ required for building policies. It uses libsepol to generate 
the \
 binary policy. checkpolicy uses the static libsepol since it deals \
 with low level details of the policy that have not been \
 encapsulated/abstracted by a proper shared library interface."
-
 SECTION = "base"
 LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=393a5ca445f6965873eca0259a17f833"
+
+require selinux_common.inc
 
 DEPENDS += "libsepol bison-native flex-native"
 
 EXTRA_OEMAKE += "LEX='flex'"
 EXTRA_OEMAKE += "LIBSEPOLA=${STAGING_LIBDIR}/libsepol.a"
 
+S = "${WORKDIR}/git/checkpolicy"
+
 do_install_append() {
-       install test/dismod ${D}/${bindir}/sedismod
-       install test/dispol ${D}/${bindir}/sedispol
+    install test/dismod ${D}/${bindir}/sedismod
+    install test/dispol ${D}/${bindir}/sedispol
 }
 
 BBCLASSEXTEND = "native"
-- 
2.25.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#52695): https://lists.yoctoproject.org/g/yocto/message/52695
Mute This Topic: https://lists.yoctoproject.org/mt/81298595/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to