diff options
author | Wenzong Fan <wenzong.fan@windriver.com> | 2014-01-27 04:33:31 -0500 |
---|---|---|
committer | Xin Ouyang <xin.ouyang@windriver.com> | 2014-01-28 15:19:51 +0800 |
commit | feda8d99e68636eacdcea1c8f938cd0339700fc2 (patch) | |
tree | b31fc36465eb3f6e4efd04935d463c923d3f2200 | |
parent | 831f953a4973ec45c8924858b0c2c56044c85a47 (diff) | |
download | meta-selinux-feda8d99e68636eacdcea1c8f938cd0339700fc2.tar.gz |
refpolicy: fix real path for cpio
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
-rw-r--r-- | recipes-security/refpolicy/refpolicy-2.20130424/poky-fc-rpm.patch | 25 | ||||
-rw-r--r-- | recipes-security/refpolicy/refpolicy_2.20130424.inc | 1 |
2 files changed, 26 insertions, 0 deletions
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 @@ | |||
1 | From 3ecbd842d51a8e70b3403e857a24203285d4983b Mon Sep 17 00:00:00 2001 | ||
2 | From: Wenzong Fan <wenzong.fan@windriver.com> | ||
3 | Date: Mon, 27 Jan 2014 01:13:06 -0500 | ||
4 | Subject: [PATCH] refpolicy: fix real path for cpio | ||
5 | |||
6 | Upstream-Status: Inappropriate [configuration] | ||
7 | |||
8 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> | ||
9 | --- | ||
10 | policy/modules/contrib/rpm.fc | 1 + | ||
11 | 1 file changed, 1 insertion(+) | ||
12 | |||
13 | diff --git a/policy/modules/contrib/rpm.fc b/policy/modules/contrib/rpm.fc | ||
14 | index ebe91fc..539063c 100644 | ||
15 | --- a/policy/modules/contrib/rpm.fc | ||
16 | +++ b/policy/modules/contrib/rpm.fc | ||
17 | @@ -58,4 +58,5 @@ ifdef(`distro_redhat',` | ||
18 | |||
19 | ifdef(`enable_mls',` | ||
20 | /usr/sbin/cpio -- gen_context(system_u:object_r:rpm_exec_t,s0) | ||
21 | +/bin/cpio.cpio -- gen_context(system_u:object_r:rpm_exec_t,s0) | ||
22 | ') | ||
23 | -- | ||
24 | 1.7.9.5 | ||
25 | |||
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 \ | |||
28 | file://poky-fc-su.patch \ | 28 | file://poky-fc-su.patch \ |
29 | file://poky-fc-sysnetwork.patch \ | 29 | file://poky-fc-sysnetwork.patch \ |
30 | file://poky-fc-udevd.patch \ | 30 | file://poky-fc-udevd.patch \ |
31 | file://poky-fc-rpm.patch \ | ||
31 | " | 32 | " |
32 | 33 | ||
33 | # Specific policy for Poky | 34 | # Specific policy for Poky |