[meta-selinux][PATCH 0/3] Some fix to udev/refpolicy

[meta-selinux][PATCH 0/3] Some fix to udev/refpolicy

[wenzong.fan]

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

* sync udev/init to latest poky version
* fix real path of udevadm
* fix symlink policy.kern

The following changes since commit 7c182186f54b88e5eb38ad7540e0498da476ab87:

  libsemanage: fix DEPENDS override issue (2014-01-23 18:00:50 +0800)

are available in the git repository at:

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

Wenzong Fan (3):
  udev/init: sync to latest poky version ae819671
  refpolicy: fix real path for udevadm
  refpolicy: fix symlink policy.kern

 recipes-core/udev/udev/init                        |    4 +++-
 .../refpolicy-2.20130424/poky-fc-udevd.patch       |   20 ++++++++++++++------
 recipes-security/refpolicy/refpolicy_common.inc    |    4 ++++
 3 files changed, 21 insertions(+), 7 deletions(-)

-- 
1.7.9.5

[meta-selinux][PATCH 1/3] udev/init: sync to latest poky version ae819671

[wenzong.fan]

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

Sync with the latest init file from poky as of 01262014:

    oe-core commit: ae819671489a22bfdda11210ff620f564aa9b24b

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
 recipes-core/udev/udev/init |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/recipes-core/udev/udev/init b/recipes-core/udev/udev/init
index 29146ec..7194e8c 100644
--- a/recipes-core/udev/udev/init
+++ b/recipes-core/udev/udev/init
@@ -56,7 +56,9 @@ case "$1" in
     }
     [ -e /dev/pts ] || mkdir -m 0755 /dev/pts
     [ -e /dev/shm ] || mkdir -m 1777 /dev/shm
-    mount -a -t tmpfs 2>/dev/null
+    # the automount rule for udev needs /tmp directory available, as /tmp is a symlink
+    # to /var/tmp which in turn is a symlink to /var/volatile/tmp, we need to make sure
+    # /var/volatile/tmp directory to be available.
     mkdir -p /var/volatile/tmp
 
     # Cache handling.
-- 
1.7.9.5

[meta-selinux][PATCH 2/3] refpolicy: fix real path for udevadm

[wenzong.fan]

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

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
 .../refpolicy-2.20130424/poky-fc-udevd.patch       |   20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/recipes-security/refpolicy/refpolicy-2.20130424/poky-fc-udevd.patch b/recipes-security/refpolicy/refpolicy-2.20130424/poky-fc-udevd.patch
index d6540a9..c6c19be 100644
--- a/recipes-security/refpolicy/refpolicy-2.20130424/poky-fc-udevd.patch
+++ b/recipes-security/refpolicy/refpolicy-2.20130424/poky-fc-udevd.patch
@@ -1,17 +1,17 @@
-From 86fd93b15b97042bcf5ff1b2d1228e7d64b8cfd1 Mon Sep 17 00:00:00 2001
+From 025bd3c77d3eeb0e316413bf7e6353f1ccd7f6b2 Mon Sep 17 00:00:00 2001
 From: Wenzong Fan <wenzong.fan@windriver.com>
-Date: Tue, 7 Jan 2014 22:22:00 -0500
-Subject: [PATCH] refpolicy: fix real path for udevd
+Date: Sat, 25 Jan 2014 23:40:05 -0500
+Subject: [PATCH] refpolicy: fix real path for udevd/udevadm
 
 Upstream-Status: Inappropriate [configuration]
 
 Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
 ---
- policy/modules/system/udev.fc |    1 +
- 1 file changed, 1 insertion(+)
+ policy/modules/system/udev.fc |    2 ++
+ 1 file changed, 2 insertions(+)
 
 diff --git a/policy/modules/system/udev.fc b/policy/modules/system/udev.fc
-index 40928d8..36d471d 100644
+index 40928d8..491bb23 100644
 --- a/policy/modules/system/udev.fc
 +++ b/policy/modules/system/udev.fc
 @@ -10,6 +10,7 @@
@@ -22,6 +22,14 @@ index 40928d8..36d471d 100644
  
  ifdef(`distro_debian',`
  /lib/udev/create_static_nodes -- gen_context(system_u:object_r:udev_exec_t,s0)
+@@ -27,6 +28,7 @@ ifdef(`distro_redhat',`
+ ')
+ 
+ /usr/bin/udevinfo --	gen_context(system_u:object_r:udev_exec_t,s0)
++/usr/bin/udevadm  --	gen_context(system_u:object_r:udev_exec_t,s0)
+ 
+ /usr/lib/systemd/systemd-udevd -- gen_context(system_u:object_r:udev_exec_t,s0)
+ 
 -- 
 1.7.9.5
 
-- 
1.7.9.5

[meta-selinux][PATCH 3/3] refpolicy: fix symlink policy.kern

[wenzong.fan]

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

It includes build host path, this does not work on target.

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
 recipes-security/refpolicy/refpolicy_common.inc |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/recipes-security/refpolicy/refpolicy_common.inc b/recipes-security/refpolicy/refpolicy_common.inc
index a71c5dd..6bf7830 100644
--- a/recipes-security/refpolicy/refpolicy_common.inc
+++ b/recipes-security/refpolicy/refpolicy_common.inc
@@ -109,4 +109,8 @@ EOF
 
 	# install policy headers
 	oe_runmake install-headers DESTDIR=${D}
+
+	# Fix symbol link policy.kern
+	link_path=`readlink -f ${D}${sysconfdir}/selinux/${POLICY_NAME}/modules/active/policy.kern`
+	ln -sf ../../policy/`basename $link_path` ${D}${sysconfdir}/selinux/${POLICY_NAME}/modules/active/policy.kern
 }
-- 
1.7.9.5

Re: [meta-selinux][PATCH 3/3] refpolicy: fix symlink policy.kern

[Pascal Ouyang]

于 14-1-26 下午4:54, wenzong.fan@windriver.com 写道:
> From: Wenzong Fan <wenzong.fan@windriver.com>
> 
> It includes build host path, this does not work on target.
> 
> Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
> ---
>   recipes-security/refpolicy/refpolicy_common.inc |    4 ++++
>   1 file changed, 4 insertions(+)
> 
> diff --git a/recipes-security/refpolicy/refpolicy_common.inc b/recipes-security/refpolicy/refpolicy_common.inc
> index a71c5dd..6bf7830 100644
> --- a/recipes-security/refpolicy/refpolicy_common.inc
> +++ b/recipes-security/refpolicy/refpolicy_common.inc
> @@ -109,4 +109,8 @@ EOF
>   
>   	# install policy headers
>   	oe_runmake install-headers DESTDIR=${D}
> +
> +	# Fix symbol link policy.kern
> +	link_path=`readlink -f ${D}${sysconfdir}/selinux/${POLICY_NAME}/modules/active/policy.kern`
> +	ln -sf ../../policy/`basename $link_path` ${D}${sysconfdir}/selinux/${POLICY_NAME}/modules/active/policy.kern
>   }
> 

Change you commit message to:

    refpolicy: fix new symlink for policy.kern

    New 2.2 release of libsemanage removes policy.kern and replace with
    symlink from Dan Walsh. It is a host path while cross-compiling, so
    fix this path.

And merge. Thanks:)

-- 
- Pascal

Re: [meta-selinux][PATCH 0/3] Some fix to udev/refpolicy

[Pascal Ouyang]

于 14-1-26 下午4:54, wenzong.fan@windriver.com 写道:
> From: Wenzong Fan <wenzong.fan@windriver.com>
> 
> * sync udev/init to latest poky version
> * fix real path of udevadm
> * fix symlink policy.kern
> 
> The following changes since commit 7c182186f54b88e5eb38ad7540e0498da476ab87:
> 
>    libsemanage: fix DEPENDS override issue (2014-01-23 18:00:50 +0800)
> 
> are available in the git repository at:
> 
>    git://git.pokylinux.org/poky-contrib wenzong/ref-updates
>    http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=wenzong/ref-updates
> 
> Wenzong Fan (3):
>    udev/init: sync to latest poky version ae819671
>    refpolicy: fix real path for udevadm
>    refpolicy: fix symlink policy.kern
> 
>   recipes-core/udev/udev/init                        |    4 +++-
>   .../refpolicy-2.20130424/poky-fc-udevd.patch       |   20 ++++++++++++++------
>   recipes-security/refpolicy/refpolicy_common.inc    |    4 ++++
>   3 files changed, 21 insertions(+), 7 deletions(-)
> 

Merged to meta-selinux master. Thanks. :)

-- 
- Pascal