[PATCH 0/2] remove PREFERRED_VERSION and update libselinux to 2.2.2

[PATCH 0/2] remove PREFERRED_VERSION and update libselinux to 2.2.2

[wenzong.fan]

From: Wenzong Fan <wenzong.fan@windriver.com>

* Remove PREFERRED_VERSION configs for selinux, they should be maintained
in distro config files.

* Update libselinux to latest version 2.2.2 which released on on 2013-12-30.

The following changes since commit 3fee4a09cc26816862dacfb2081dc7e0fa7ca47e:

  psmisc: inherit enable-selinux and backport to fix build issue (2014-01-13 17:50:00 +0800)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib wenzong/selinux-update
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=wenzong/selinux-update

Wenzong Fan (2):
  selinux: remove PREFERRED_VERSION configs
  libselinux: migrate SRC_URI to 2.2.2

 .../{libselinux_2.2.bb => libselinux_2.2.2.bb}     |    4 ++--
 recipes-security/selinux/selinux_20131030.inc      |    7 -------
 2 files changed, 2 insertions(+), 9 deletions(-)
 rename recipes-security/selinux/{libselinux_2.2.bb => libselinux_2.2.2.bb} (74%)

-- 
1.7.9.5

[PATCH 1/2] selinux: remove PREFERRED_VERSION configs

[wenzong.fan]

From: Wenzong Fan <wenzong.fan@windriver.com>

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
 recipes-security/selinux/selinux_20131030.inc |    7 -------
 1 file changed, 7 deletions(-)

diff --git a/recipes-security/selinux/selinux_20131030.inc b/recipes-security/selinux/selinux_20131030.inc
index 807a37c..2cb35d5 100644
--- a/recipes-security/selinux/selinux_20131030.inc
+++ b/recipes-security/selinux/selinux_20131030.inc
@@ -2,11 +2,4 @@ SELINUX_RELEASE = "20131030"
 
 SRC_URI = "http://userspace.selinuxproject.org/releases/${SELINUX_RELEASE}/${BPN}-${PV}.tar.gz"
 
-PREFERRED_VERSION_checkpolicy = "2.2"
-PREFERRED_VERSION_libselinux = "2.2"
-PREFERRED_VERSION_libsemanage = "2.2"
-PREFERRED_VERSION_libsepol = "2.2"
-PREFERRED_VERSION_policycoreutils = "2.2.5"
-PREFERRED_VERSION_sepolgen = "1.2.1"
-
 include selinux_common.inc
-- 
1.7.9.5

[PATCH 2/2] libselinux: migrate SRC_URI to 2.2.2

[wenzong.fan]

From: Wenzong Fan <wenzong.fan@windriver.com>

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
 .../{libselinux_2.2.bb => libselinux_2.2.2.bb}     |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename recipes-security/selinux/{libselinux_2.2.bb => libselinux_2.2.2.bb} (74%)

diff --git a/recipes-security/selinux/libselinux_2.2.bb b/recipes-security/selinux/libselinux_2.2.2.bb
similarity index 74%
rename from recipes-security/selinux/libselinux_2.2.bb
rename to recipes-security/selinux/libselinux_2.2.2.bb
index 23bb9cb..d0a4e2e 100644
--- a/recipes-security/selinux/libselinux_2.2.bb
+++ b/recipes-security/selinux/libselinux_2.2.2.bb
@@ -5,8 +5,8 @@ include ${BPN}.inc
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0"
 
-SRC_URI[md5sum] = "d82beab880749a017f2737e6687fec30"
-SRC_URI[sha256sum] = "e9dc64216543a7283d786f623ac28e8867f8794138e7deba474a3aa8d02dce33"
+SRC_URI[md5sum] = "55026eb4654c4f732a27c191b39bebaf"
+SRC_URI[sha256sum] = "30ab363416806da907b86b97f1d31c252473e3200358bb1570f563c8312b5a3e"
 
 SRC_URI += "\
         file://libselinux-drop-Wno-unused-but-set-variable.patch \
-- 
1.7.9.5

Re: [PATCH 0/2] remove PREFERRED_VERSION and update libselinux to 2.2.2

[Pascal Ouyang]

于 14-1-20 下午5:27, wenzong.fan@windriver.com 写道:
> From: Wenzong Fan <wenzong.fan@windriver.com>
> 
> * Remove PREFERRED_VERSION configs for selinux, they should be maintained
> in distro config files.
> 
> * Update libselinux to latest version 2.2.2 which released on on 2013-12-30.
> 
> The following changes since commit 3fee4a09cc26816862dacfb2081dc7e0fa7ca47e:
> 
>    psmisc: inherit enable-selinux and backport to fix build issue (2014-01-13 17:50:00 +0800)
> 
> are available in the git repository at:
> 
>    git://git.pokylinux.org/poky-contrib wenzong/selinux-update
>    http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=wenzong/selinux-update
> 
> Wenzong Fan (2):
>    selinux: remove PREFERRED_VERSION configs
>    libselinux: migrate SRC_URI to 2.2.2
> 
>   .../{libselinux_2.2.bb => libselinux_2.2.2.bb}     |    4 ++--
>   recipes-security/selinux/selinux_20131030.inc      |    7 -------
>   2 files changed, 2 insertions(+), 9 deletions(-)
>   rename recipes-security/selinux/{libselinux_2.2.bb => libselinux_2.2.2.bb} (74%)
> 

Merged to meta-selinux:master.

Thanks. :)

-- 
- Pascal