semodule-utils: update to 3.2

Merge inc file into bb file.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Joe MacDonald <joe@deserted.net>

2 files changed, 6 insertions, 8 deletions

diff --git a/recipes-security/selinux/semodule-utils_3.1.bb b/recipes-security/selinux/semodule-utils_3.1.bb
deleted file mode 100644
index 02a63f8..0000000
--- a/recipes-security/selinux/semodule-utils_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] = "d9520d0cdef3d1be412155dc72ec2936"
-SRC_URI[sha256sum] = "0cc37f9cec751d9c2abb5f2b228b060567e973cb47c19b53b8a4a7378baaa853"
diff --git a/recipes-security/selinux/semodule-utils.inc b/recipes-security/selinux/semodule-utils_3.2.bb
index 23cbd14..7773d5b 100644
--- a/recipes-security/selinux/semodule-utils.inc
+++ b/recipes-security/selinux/semodule-utils_3.2.bb
@@ -2,20 +2,25 @@ SUMMARY = "Utilities to manipulate SELinux policy module package"
 DESCRIPTION = "\
 The utilities to create, expand, link and show the dependencies between \
 the SELinux policy module packages."
-
 SECTION = "base"
 LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=393a5ca445f6965873eca0259a17f833"
+
+require selinux_common.inc
 
 DEPENDS += "libsepol"
 RDEPENDS_${PN}-dev = ""
 
 EXTRA_OEMAKE += "LIBSEPOLA=${STAGING_LIBDIR}/libsepol.a"
 
+S = "${WORKDIR}/git/semodule-utils"
+
 PACKAGES =+ "\
         ${PN}-semodule-expand \
         ${PN}-semodule-link \
         ${PN}-semodule-package \
 "
+
 FILES_${PN}-semodule-expand += "${bindir}/semodule_expand"
 FILES_${PN}-semodule-link += "${bindir}/semodule_link"
 FILES_${PN}-semodule-package += "\