diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2011-07-26 13:00:27 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-27 15:45:47 +0100 |
commit | e17f834f16c0a5e5f6b62c898316b082b6cf7362 (patch) | |
tree | 9d93310995dfc26f373ff6688064656008df6b3f /meta/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb | |
parent | eb7cd0c2712aea9b274c3d49bdb020aa3e4e5894 (diff) | |
download | poky-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>
Diffstat (limited to 'meta/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb')
-rw-r--r-- | meta/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb | 5 |
1 files changed, 4 insertions, 1 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" | |||
10 | RPROVIDES_${PN}-dbg = "linux-libc-headers-dbg" | 10 | RPROVIDES_${PN}-dbg = "linux-libc-headers-dbg" |
11 | SRCREV = "69cfbdf9f1ff461a75e5b77d6d7ba35e97db4cc3" | 11 | SRCREV = "69cfbdf9f1ff461a75e5b77d6d7ba35e97db4cc3" |
12 | PV = "2.6.37+git-${SRCPV}" | 12 | PV = "2.6.37+git-${SRCPV}" |
13 | PR = "r3" | 13 | PR = "r4" |
14 | 14 | ||
15 | SRCREV_FORMAT = "meta_machine" | 15 | SRCREV_FORMAT = "meta_machine" |
16 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-2.6.37;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta" | 16 | 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 () { | |||
47 | do_install() { | 47 | do_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 | ||
52 | BBCLASSEXTEND = "nativesdk" | 55 | BBCLASSEXTEND = "nativesdk" |