Patchwork [v2,5/8] linux-libc-headers: Fix file conflict -- ..install.cmd

login
register
mail settings
Submitter Mark Hatle
Date July 26, 2011, 9:31 p.m.
Message ID <f37fcfa993314db58e3734ffb0de119f47e7e8a8.1311715727.git.mark.hatle@windriver.com>
Download mbox | patch
Permalink /patch/8581/
State New, archived
Headers show

Comments

Mark Hatle - July 26, 2011, 9:31 p.m.
The ..install.cmd conflicts between various configure runs.

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

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
 .../linux-libc-headers-yocto_git.bb                |    5 ++++-
 .../linux-libc-headers_2.6.37.2.bb                 |    5 ++++-
 .../linux-libc-headers_2.6.39.bb                   |    5 +++++
 3 files changed, 13 insertions(+), 2 deletions(-)
Andrea Adami - July 27, 2011, 12:09 p.m.
On Tue, Jul 26, 2011 at 11:31 PM, Mark Hatle <mark.hatle@windriver.com> wrote:
> The ..install.cmd conflicts between various configure runs.
>
> This isn't used anywhere, so remove it to avoid the conflict.
>
> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
> ---
>  .../linux-libc-headers-yocto_git.bb                |    5 ++++-
>  .../linux-libc-headers_2.6.37.2.bb                 |    5 ++++-
>  .../linux-libc-headers_2.6.39.bb                   |    5 +++++
>  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 a9b041f..1c709cb 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"
>  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"
> 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 51c4926..55d7527 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
>
>  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"
> 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 65c19ec..14f5e8a 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
>
>  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"
> --
> 1.7.3.4
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Thanks for having fixed that.

I noticed two kinds of cruft while packaging: .install and ..install.cmd

       # remove Linux headers .install and ..install.cmd files
        find ${D}${base_libdir}/klibc/include -name '.install' -delete
        find ${D}${base_libdir}/klibc/include -name '..install.cmd' -delete

I'll check now after your patch.

Regards

Andrea

Patch

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 a9b041f..1c709cb 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"
 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"
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 51c4926..55d7527 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
 
 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"
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 65c19ec..14f5e8a 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
 
 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"