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_2.6.39.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_2.6.39.bb')
-rw-r--r-- | meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.39.bb | 5 |
1 files changed, 5 insertions, 0 deletions
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 | ||
10 | S = "${WORKDIR}/linux-${PV}" | 10 | S = "${WORKDIR}/linux-${PV}" |
11 | 11 | ||
12 | PR = "r2" | ||
13 | |||
12 | set_arch() { | 14 | set_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 | ||
49 | BBCLASSEXTEND = "nativesdk" | 54 | BBCLASSEXTEND = "nativesdk" |