sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

linux-libc-headers: Fix file conflict -- ..install.cmd 

The ..install.cmd conflicts between various configure runs.

This isn't used anywhere, so remove it to avoid the conflict.

(From OE-Core rev: f7b1ccfaa15e2dd4ff25f2a5f56ac3aff63c7288)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Mark Hatle 2011-07-26 13:00:27 -05:00 committed by Richard Purdie
parent eb7cd0c271
commit e17f834f16
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meta/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb
View File

@ -10,7 +10,7 @@ RPROVIDES_${PN}-dev = "linux-libc-headers-dev"
RPROVIDES_${PN}-dbg = "linux-libc-headers-dbg"
SRCREV = "69cfbdf9f1ff461a75e5b77d6d7ba35e97db4cc3"
PV = "2.6.37+git-${SRCPV}"
PR = "r3"
PR = "r4"
SRCREV_FORMAT = "meta_machine"
SRC_URI = "git://git.yoctoproject.org/linux-yocto-2.6.37;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
@ -47,6 +47,9 @@ do_compile () {
do_install() {
set_arch
oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH
# The ..install.cmd conflicts between various configure runs
find ${D}${includedir} -name ..install.cmd | xargs rm -f
}
BBCLASSEXTEND = "nativesdk"

5
meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.37.2.bb
View File

@ -2,7 +2,7 @@ require linux-libc-headers.inc
INHIBIT_DEFAULT_DEPS = "1"
DEPENDS += "unifdef-native"
PR = "r1"
PR = "r2"
SRC_URI += " file://connector-msg-size-fix.patch"
@ -43,6 +43,9 @@ do_install() {
oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH
# Kernel should not be exporting this header
rm -f ${D}${exec_prefix}/include/scsi/scsi.h
# The ..install.cmd conflicts between various configure runs
find ${D}${includedir} -name ..install.cmd | xargs rm -f
}
BBCLASSEXTEND = "nativesdk"

5
meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.39.bb
View File

@ -9,6 +9,8 @@ SRC_URI[sha256sum] = "584d17f2a3ee18a9501d7ff36907639e538cfdba4529978b8550c461d4
S = "${WORKDIR}/linux-${PV}"
PR = "r2"
set_arch() {
case ${TARGET_ARCH} in
alpha*) ARCH=alpha ;;
@ -44,6 +46,9 @@ do_install() {
oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH
# Kernel should not be exporting this header
rm -f ${D}${exec_prefix}/include/scsi/scsi.h
# The ..install.cmd conflicts between various configure runs
find ${D}${includedir} -name ..install.cmd | xargs rm -f
}
BBCLASSEXTEND = "nativesdk"