summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-08-10 22:37:16 -0700
committerJoe MacDonald <joe_macdonald@mentor.com>2015-08-14 12:38:47 -0400
commit76cb970ddc76037a30cfea5cde684aa15bf2af69 (patch)
tree542d24db4e8ba4b4b76f813651aed3c94b044f57
parentcd04049ee2710cdcfa1f738f3453b1622c895854 (diff)
downloadmeta-selinux-76cb970ddc76037a30cfea5cde684aa15bf2af69.tar.gz
audit: remove add-system-call-table-for-ARM.patch
There isn't lib/machinetabs.h any more, there isn't data structures like "static const char machine_strings", either. This fixed a do_patch error when arm. Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
-rw-r--r--recipes-security/audit/audit/add-system-call-table-for-ARM.patch46
-rw-r--r--recipes-security/audit/audit_2.4.3.bb2
2 files changed, 0 insertions, 48 deletions
diff --git a/recipes-security/audit/audit/add-system-call-table-for-ARM.patch b/recipes-security/audit/audit/add-system-call-table-for-ARM.patch
deleted file mode 100644
index ad94d11..0000000
--- a/recipes-security/audit/audit/add-system-call-table-for-ARM.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From 52ff74be2f01182ed9d4fcc3da059512fad63d72 Mon Sep 17 00:00:00 2001
2From: Han Chao <chan@windriver.com>
3Date: Thu, 27 Feb 2014 14:58:57 +0800
4Subject: [PATCH] add system call table for ARM.
5
6This change enable audit system call on ARM.
7Add arm System call table on machinetabs.h.
8Audit system call need enable kernel config CONFIG_AUDITSYSCALL.
9
10Signed-off-by: Han Chao <chan@windriver.com>
11---
12 lib/machinetabs.h | 11 ++++++-----
13 1 file changed, 6 insertions(+), 5 deletions(-)
14
15diff --git a/lib/machinetabs.h b/lib/machinetabs.h
16index ec2d033..1c2e284 100644
17--- a/lib/machinetabs.h
18+++ b/lib/machinetabs.h
19@@ -1,10 +1,11 @@
20-/* This is a generated file, see Makefile.am for its inputs. */
21-static const char machine_strings[] = "i386\0i486\0i586\0i686\0ia64\0ppc\0ppc64\0s390\0s390x\0x86_64";
22+/* Such is aways generated file, see Makefile.am for its inputs.
23+ * But this version is not generated file, which is for ARM. */
24+static const char machine_strings[] = "armeb\0armv5tejl\0armv5tel\0armv6l\0armv7l";
25 static const unsigned machine_s2i_s[] = {
26- 0,5,10,15,20,25,29,35,40,46,
27+ 0,6,16,25,32,
28 };
29 static const int machine_s2i_i[] = {
30- 0,0,0,0,2,4,3,6,5,1,
31+ 8,8,8,8,8,
32 };
33 static int machine_s2i(const char *s, int *value) {
34 size_t len, i;
35@@ -19,7 +20,7 @@ static int machine_s2i(const char *s, int *value) {
36 }
37 }
38 static const unsigned machine_i2s_direct[] = {
39- 0,46,20,29,25,40,35,
40+ 39,85,59,68,64,
41 };
42 static const char *machine_i2s(int v) {
43 return i2s_direct__(machine_strings, machine_i2s_direct, 0, 6, v);
44--
451.7.9.5
46
diff --git a/recipes-security/audit/audit_2.4.3.bb b/recipes-security/audit/audit_2.4.3.bb
index 869713a..0fcf145 100644
--- a/recipes-security/audit/audit_2.4.3.bb
+++ b/recipes-security/audit/audit_2.4.3.bb
@@ -19,8 +19,6 @@ SRC_URI = "http://people.redhat.com/sgrubb/audit/audit-${PV}.tar.gz \
19SRC_URI[md5sum] = "544d863af2016b76afd8d1691b251164" 19SRC_URI[md5sum] = "544d863af2016b76afd8d1691b251164"
20SRC_URI[sha256sum] = "9c914704fecc602e143e37152f3efbab2469692684c1a8cc1b801c1b49c7abc6" 20SRC_URI[sha256sum] = "9c914704fecc602e143e37152f3efbab2469692684c1a8cc1b801c1b49c7abc6"
21 21
22SRC_URI_append_arm = "file://add-system-call-table-for-ARM.patch"
23
24inherit autotools pythonnative update-rc.d systemd 22inherit autotools pythonnative update-rc.d systemd
25 23
26UPDATERCPN = "auditd" 24UPDATERCPN = "auditd"