1 files changed, 3 insertions, 23 deletions

diff --git a/recipes-security/audit/audit_2.2.1.bb b/recipes-security/audit/audit_2.2.1.bb
index 4d94025..a58b9e1 100644
--- a/recipes-security/audit/audit_2.2.1.bb
+++ b/recipes-security/audit/audit_2.2.1.bb
@@ -4,7 +4,7 @@ storing and searching the audit records generated by the audit subsystem \
 in the Linux kernel."
 HOMEPAGE = "http://people.redhat.com/sgrubb/audit/"
 SECTION = "base"
-PR = "r5"
+PR = "r6"
 LICENSE = "GPLv2+ & LGPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
@@ -12,8 +12,9 @@ SRC_URI = "http://people.redhat.com/sgrubb/audit/audit-${PV}.tar.gz \
            file://disable-ldap.patch \
            file://audit-python.patch"
 
-SRC_URI += "file://2.2.1-audit-for-cross-compiling.patch \
+SRC_URI += "\
            file://audit-python-configure.patch \
+           file://audit-cross-compiling.patch \
            file://auditd"
 
 inherit autotools pythonnative update-rc.d
@@ -61,27 +62,6 @@ FILES_${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/*/.debug"
 FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}"
 FILES_${PN}-dev += "${base_libdir}/*.so ${base_libdir}/*.la"
 
-# The executables in lib/, which are named as gen_*_h, will run on the hosts to create
-# *_tables.h/*tabs.h header files for the targets.
-# In some old hosts, build will fail because some .h files in the old linux-libc-headers (<= 2.6.29)
-# has incomplete DEFINE lists for the audit system.
-do_compile_prepend() {
-        mkdir -p ${S}/lib/linux
-        cp -f ${STAGING_INCDIR}/linux/audit.h ${S}/lib/linux/
-        cp -f ${STAGING_INCDIR}/linux/elf-em.h ${S}/lib/linux/
-        cp -f ${STAGING_INCDIR}/linux/net.h ${S}/lib/linux/
-        mkdir -p ${S}/lib/sys
-        cp -f ${STAGING_INCDIR}/sys/mount.h ${S}/lib/sys/
-        cp -f ${STAGING_INCDIR}/sys/personality.h ${S}/lib/sys/
-        mkdir -p ${S}/lib/bits
-        cp -f ${STAGING_INCDIR}/bits/socket.h ${S}/lib/bits
-
-        # eglibc-2.16 splits enum __socket_type from bits/socket.h to bits/socket_type.h, so we
-        # copy bits/socket_type.h only if it exists.
-        test -f ${STAGING_INCDIR}/bits/socket_type.h && \
-                cp -f ${STAGING_INCDIR}/bits/socket_type.h ${S}/lib/bits
-}
-
 do_install_append() {
         rm -f ${D}/${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.a
         rm -f ${D}/${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.la