* Drop selinux_DATE.inc since upstream now uses X.Y version instead of date for release tag[1]. Move its content to selinux_common.inc. * Switch to git repo in SRC_URI, then all selinux recipes can use unified source.
[1] https://github.com/SELinuxProject/selinux/commit/f63ac245f7addf832e8cde3cc4f26607b738994d Signed-off-by: Yi Zhao <[email protected]> --- recipes-security/selinux/selinux_20200710.inc | 8 -------- recipes-security/selinux/selinux_common.inc | 15 ++++++++++----- 2 files changed, 10 insertions(+), 13 deletions(-) delete mode 100644 recipes-security/selinux/selinux_20200710.inc diff --git a/recipes-security/selinux/selinux_20200710.inc b/recipes-security/selinux/selinux_20200710.inc deleted file mode 100644 index a8a76e9..0000000 --- a/recipes-security/selinux/selinux_20200710.inc +++ /dev/null @@ -1,8 +0,0 @@ -SELINUX_RELEASE = "20200710" - -SRC_URI = "https://github.com/SELinuxProject/selinux/releases/download/${SELINUX_RELEASE}/${BPN}-${PV}.tar.gz"; - -UPSTREAM_CHECK_URI = "https://github.com/SELinuxProject/selinux/releases"; -UPSTREAM_CHECK_REGEX = "libselinux-(?P<pver>.+)\.tar\.gz" - -require selinux_common.inc diff --git a/recipes-security/selinux/selinux_common.inc b/recipes-security/selinux/selinux_common.inc index 09c0acc..f2e180f 100644 --- a/recipes-security/selinux/selinux_common.inc +++ b/recipes-security/selinux/selinux_common.inc @@ -1,14 +1,19 @@ HOMEPAGE = "https://github.com/SELinuxProject"; +SRC_URI = "git://github.com/SELinuxProject/selinux.git" +SRCREV = "cf853c1a0c2328ad6c62fb2b2cc55d4926301d6b" + +UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" + do_compile() { oe_runmake all } do_install() { oe_runmake install \ - DESTDIR="${D}" \ - PREFIX="${prefix}" \ - INCLUDEDIR="${includedir}" \ - LIBDIR="${libdir}" \ - SHLIBDIR="${base_libdir}" + DESTDIR="${D}" \ + PREFIX="${prefix}" \ + INCLUDEDIR="${includedir}" \ + LIBDIR="${libdir}" \ + SHLIBDIR="${base_libdir}" } -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#52690): https://lists.yoctoproject.org/g/yocto/message/52690 Mute This Topic: https://lists.yoctoproject.org/mt/81298589/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
