Skip to contentSkip to conversation

remove PREFERRED_VERSION and update libselinux to 2.2.2

PATCH Applied [email protected] 2 participants 4 messages Jan 20, 2014

lore
Share & tools
lore
#0 lore raw

cover remove PREFERRED_VERSION and update libselinux to 2.2.2

From: Wenzong Fan <[email protected]>

* 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%)
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/2 selinux: remove PREFERRED_VERSION configs

From: Wenzong Fan <[email protected]>

---
 recipes-security/selinux/selinux_20131030.inc |    7 -------
 1 file changed, 7 deletions(-)
recipes-security/selinux/selinux_20131030.inc +0 -7
index 807a37c..2cb35d5 100644
@@ -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
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH 2/2 libselinux: migrate SRC_URI to 2.2.2

In reply to [email protected]

From: Wenzong Fan <[email protected]>

---
 .../{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%)
recipes-security/selinux/libselinux_2.2.2.bb renamed from recipes-security/selinux/libselinux_2.2.bb +2 -2
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
@@ -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 \
Signature · 1 line
1.7.9.5
#3 lore raw
In reply to [email protected]
Quoted 16 lines · 于 14-1-20 下午5:27, [email protected] 写道:

From: Wenzong Fan <[email protected]>

* 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

Quoted 9 lines

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. :)

Signature · 1 line
- Pascal