summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2011-07-26 13:00:27 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-27 15:45:47 +0100
commite17f834f16c0a5e5f6b62c898316b082b6cf7362 (patch)
tree9d93310995dfc26f373ff6688064656008df6b3f
parenteb7cd0c2712aea9b274c3d49bdb020aa3e4e5894 (diff)
downloadpoky-e17f834f16c0a5e5f6b62c898316b082b6cf7362.tar.gz
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>
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb5
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.37.2.bb5
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.39.bb5
3 files changed, 13 insertions, 2 deletions
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb
index a9b041fb08..1c709cbc23 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb
@@ -10,7 +10,7 @@ RPROVIDES_${PN}-dev = "linux-libc-headers-dev"
10RPROVIDES_${PN}-dbg = "linux-libc-headers-dbg" 10RPROVIDES_${PN}-dbg = "linux-libc-headers-dbg"
11SRCREV = "69cfbdf9f1ff461a75e5b77d6d7ba35e97db4cc3" 11SRCREV = "69cfbdf9f1ff461a75e5b77d6d7ba35e97db4cc3"
12PV = "2.6.37+git-${SRCPV}" 12PV = "2.6.37+git-${SRCPV}"
13PR = "r3" 13PR = "r4"
14 14
15SRCREV_FORMAT = "meta_machine" 15SRCREV_FORMAT = "meta_machine"
16SRC_URI = "git://git.yoctoproject.org/linux-yocto-2.6.37;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta" 16SRC_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 () {
47do_install() { 47do_install() {
48 set_arch 48 set_arch
49 oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH 49 oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH
50
51 # The ..install.cmd conflicts between various configure runs
52 find ${D}${includedir} -name ..install.cmd | xargs rm -f
50} 53}
51 54
52BBCLASSEXTEND = "nativesdk" 55BBCLASSEXTEND = "nativesdk"
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.37.2.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.37.2.bb
index 51c4926429..55d752798a 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.37.2.bb
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.37.2.bb
@@ -2,7 +2,7 @@ require linux-libc-headers.inc
2 2
3INHIBIT_DEFAULT_DEPS = "1" 3INHIBIT_DEFAULT_DEPS = "1"
4DEPENDS += "unifdef-native" 4DEPENDS += "unifdef-native"
5PR = "r1" 5PR = "r2"
6 6
7SRC_URI += " file://connector-msg-size-fix.patch" 7SRC_URI += " file://connector-msg-size-fix.patch"
8 8
@@ -43,6 +43,9 @@ do_install() {
43 oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH 43 oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH
44 # Kernel should not be exporting this header 44 # Kernel should not be exporting this header
45 rm -f ${D}${exec_prefix}/include/scsi/scsi.h 45 rm -f ${D}${exec_prefix}/include/scsi/scsi.h
46
47 # The ..install.cmd conflicts between various configure runs
48 find ${D}${includedir} -name ..install.cmd | xargs rm -f
46} 49}
47 50
48BBCLASSEXTEND = "nativesdk" 51BBCLASSEXTEND = "nativesdk"
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.39.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.39.bb
index 65c19ecea6..14f5e8a1ae 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.39.bb
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.39.bb
@@ -9,6 +9,8 @@ SRC_URI[sha256sum] = "584d17f2a3ee18a9501d7ff36907639e538cfdba4529978b8550c461d4
9 9
10S = "${WORKDIR}/linux-${PV}" 10S = "${WORKDIR}/linux-${PV}"
11 11
12PR = "r2"
13
12set_arch() { 14set_arch() {
13 case ${TARGET_ARCH} in 15 case ${TARGET_ARCH} in
14 alpha*) ARCH=alpha ;; 16 alpha*) ARCH=alpha ;;
@@ -44,6 +46,9 @@ do_install() {
44 oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH 46 oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH
45 # Kernel should not be exporting this header 47 # Kernel should not be exporting this header
46 rm -f ${D}${exec_prefix}/include/scsi/scsi.h 48 rm -f ${D}${exec_prefix}/include/scsi/scsi.h
49
50 # The ..install.cmd conflicts between various configure runs
51 find ${D}${includedir} -name ..install.cmd | xargs rm -f
47} 52}
48 53
49BBCLASSEXTEND = "nativesdk" 54BBCLASSEXTEND = "nativesdk"