From 44852308c0ea2c9cf8d5c40998599e568d0d9e40 Mon Sep 17 00:00:00 2001 From: Xin Ouyang Date: Fri, 7 Sep 2012 12:12:49 +0800 Subject: audit-2.2.1: copy bits/socket_type.h only if it exists eglibc-2.16 splits enum __socket_type from bits/socket.h to bits/socket_type.h, so old eglibc does not have bits/socket_type.h We should copy it only if it exists. Signed-off-by: Xin Ouyang --- recipes-security/audit/audit_2.2.1.bb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/recipes-security/audit/audit_2.2.1.bb b/recipes-security/audit/audit_2.2.1.bb index 47e6825..bc0f248 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 = "r1" +PR = "r2" LICENSE = "GPLv2+ & LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" @@ -60,7 +60,11 @@ do_compile_prepend() { 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 - cp -f ${STAGING_INCDIR}/bits/socket_type.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() { -- cgit v1.2.3-54-g00ecf