diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2021-03-13 13:50:29 +0800 |
---|---|---|
committer | Joe MacDonald <joe@deserted.net> | 2021-03-17 09:39:50 -0400 |
commit | 2835042b0fe0d04812a1bd9d20befe825151737c (patch) | |
tree | 8eede55fdce4bbe3d0fef6b12fe39bfa7e923b7c | |
parent | ab7ce3d5f68b6f00f155d892b9ba510ed95f8afa (diff) | |
download | meta-selinux-2835042b0fe0d04812a1bd9d20befe825151737c.tar.gz |
selinux: update inc file to 3.2
* 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 <yi.zhao@windriver.com>
Signed-off-by: Joe MacDonald <joe@deserted.net>
-rw-r--r-- | recipes-security/selinux/selinux_20200710.inc | 8 | ||||
-rw-r--r-- | recipes-security/selinux/selinux_common.inc | 15 |
2 files changed, 10 insertions, 13 deletions
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 @@ | |||
1 | SELINUX_RELEASE = "20200710" | ||
2 | |||
3 | SRC_URI = "https://github.com/SELinuxProject/selinux/releases/download/${SELINUX_RELEASE}/${BPN}-${PV}.tar.gz" | ||
4 | |||
5 | UPSTREAM_CHECK_URI = "https://github.com/SELinuxProject/selinux/releases" | ||
6 | UPSTREAM_CHECK_REGEX = "libselinux-(?P<pver>.+)\.tar\.gz" | ||
7 | |||
8 | 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 @@ | |||
1 | HOMEPAGE = "https://github.com/SELinuxProject" | 1 | HOMEPAGE = "https://github.com/SELinuxProject" |
2 | 2 | ||
3 | SRC_URI = "git://github.com/SELinuxProject/selinux.git" | ||
4 | SRCREV = "cf853c1a0c2328ad6c62fb2b2cc55d4926301d6b" | ||
5 | |||
6 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" | ||
7 | |||
3 | do_compile() { | 8 | do_compile() { |
4 | oe_runmake all | 9 | oe_runmake all |
5 | } | 10 | } |
6 | 11 | ||
7 | do_install() { | 12 | do_install() { |
8 | oe_runmake install \ | 13 | oe_runmake install \ |
9 | DESTDIR="${D}" \ | 14 | DESTDIR="${D}" \ |
10 | PREFIX="${prefix}" \ | 15 | PREFIX="${prefix}" \ |
11 | INCLUDEDIR="${includedir}" \ | 16 | INCLUDEDIR="${includedir}" \ |
12 | LIBDIR="${libdir}" \ | 17 | LIBDIR="${libdir}" \ |
13 | SHLIBDIR="${base_libdir}" | 18 | SHLIBDIR="${base_libdir}" |
14 | } | 19 | } |