From feda8d99e68636eacdcea1c8f938cd0339700fc2 Mon Sep 17 00:00:00 2001 From: Wenzong Fan Date: Mon, 27 Jan 2014 04:33:31 -0500 Subject: refpolicy: fix real path for cpio Signed-off-by: Wenzong Fan --- .../refpolicy-2.20130424/poky-fc-rpm.patch | 25 ++++++++++++++++++++++ .../refpolicy/refpolicy_2.20130424.inc | 1 + 2 files changed, 26 insertions(+) create mode 100644 recipes-security/refpolicy/refpolicy-2.20130424/poky-fc-rpm.patch diff --git a/recipes-security/refpolicy/refpolicy-2.20130424/poky-fc-rpm.patch b/recipes-security/refpolicy/refpolicy-2.20130424/poky-fc-rpm.patch new file mode 100644 index 0000000..7ba3380 --- /dev/null +++ b/recipes-security/refpolicy/refpolicy-2.20130424/poky-fc-rpm.patch @@ -0,0 +1,25 @@ +From 3ecbd842d51a8e70b3403e857a24203285d4983b Mon Sep 17 00:00:00 2001 +From: Wenzong Fan +Date: Mon, 27 Jan 2014 01:13:06 -0500 +Subject: [PATCH] refpolicy: fix real path for cpio + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Wenzong Fan +--- + policy/modules/contrib/rpm.fc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/policy/modules/contrib/rpm.fc b/policy/modules/contrib/rpm.fc +index ebe91fc..539063c 100644 +--- a/policy/modules/contrib/rpm.fc ++++ b/policy/modules/contrib/rpm.fc +@@ -58,4 +58,5 @@ ifdef(`distro_redhat',` + + ifdef(`enable_mls',` + /usr/sbin/cpio -- gen_context(system_u:object_r:rpm_exec_t,s0) ++/bin/cpio.cpio -- gen_context(system_u:object_r:rpm_exec_t,s0) + ') +-- +1.7.9.5 + diff --git a/recipes-security/refpolicy/refpolicy_2.20130424.inc b/recipes-security/refpolicy/refpolicy_2.20130424.inc index cfeeaed..cb1dec6 100644 --- a/recipes-security/refpolicy/refpolicy_2.20130424.inc +++ b/recipes-security/refpolicy/refpolicy_2.20130424.inc @@ -28,6 +28,7 @@ SRC_URI += "file://poky-fc-subs_dist.patch \ file://poky-fc-su.patch \ file://poky-fc-sysnetwork.patch \ file://poky-fc-udevd.patch \ + file://poky-fc-rpm.patch \ " # Specific policy for Poky -- cgit v1.2.3-54-g00ecf