[meta-freescale] [meta-fsl-ppc][PATCH] Remove overriding linux-libc-headers
Zhenhua Luo
zhenhua.luo at freescale.com
Tue Sep 24 02:57:41 PDT 2013
Layers should never need to be overriding linux-libc-headers.
Refer to http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=babbf7a46acaefd9b36031483cafce053f607e66
for the reason.
Address [Bug 5249].
Signed-off-by: Zhenhua Luo <zhenhua.luo at freescale.com>
---
conf/machine/e500mc.inc | 1 -
conf/machine/e500v2.inc | 1 -
conf/machine/e5500-64b.inc | 1 -
conf/machine/e5500.inc | 1 -
conf/machine/e6500-64b.inc | 1 -
conf/machine/e6500.inc | 1 -
...efile.headersinst-install-headers-from-sc.patch | 46 --------------------
recipes-kernel/linux/linux-qoriq-sdk-headers.bb | 34 ---------------
8 files changed, 86 deletions(-)
delete mode 100644 recipes-kernel/linux/files/scripts-Makefile.headersinst-install-headers-from-sc.patch
delete mode 100644 recipes-kernel/linux/linux-qoriq-sdk-headers.bb
diff --git a/conf/machine/e500mc.inc b/conf/machine/e500mc.inc
index 268942a..57952e7 100644
--- a/conf/machine/e500mc.inc
+++ b/conf/machine/e500mc.inc
@@ -7,7 +7,6 @@ MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
PREFERRED_VERSION_virtual/kernel ?= "3.0.34"
-PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers"
PREFERRED_VERSION_qemu = "1.4+fsl"
KERNEL_IMAGETYPE ?= "uImage"
diff --git a/conf/machine/e500v2.inc b/conf/machine/e500v2.inc
index 9688784..befc296 100644
--- a/conf/machine/e500v2.inc
+++ b/conf/machine/e500v2.inc
@@ -5,7 +5,6 @@ MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
PREFERRED_VERSION_virtual/kernel ?= "3.0.34"
-PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers"
PREFERRED_VERSION_qemu = "1.4+fsl"
KERNEL_IMAGETYPE ?= "uImage"
diff --git a/conf/machine/e5500-64b.inc b/conf/machine/e5500-64b.inc
index 3230d51..0ce7f11 100644
--- a/conf/machine/e5500-64b.inc
+++ b/conf/machine/e5500-64b.inc
@@ -8,7 +8,6 @@ MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
PREFERRED_VERSION_virtual/kernel ?= "3.0.34"
-PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers"
PREFERRED_VERSION_qemu = "1.4+fsl"
KERNEL_IMAGETYPE ?= "uImage"
diff --git a/conf/machine/e5500.inc b/conf/machine/e5500.inc
index ae40896..ae66342 100644
--- a/conf/machine/e5500.inc
+++ b/conf/machine/e5500.inc
@@ -7,7 +7,6 @@ MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
PREFERRED_VERSION_virtual/kernel ?= "3.0.34"
-PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers"
PREFERRED_VERSION_qemu = "1.4+fsl"
KERNEL_IMAGETYPE ?= "uImage"
diff --git a/conf/machine/e6500-64b.inc b/conf/machine/e6500-64b.inc
index b8766df..2007353 100644
--- a/conf/machine/e6500-64b.inc
+++ b/conf/machine/e6500-64b.inc
@@ -8,7 +8,6 @@ MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
PREFERRED_VERSION_virtual/kernel ?= "3.0.34"
-PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers"
PREFERRED_VERSION_qemu = "1.4+fsl"
KERNEL_IMAGETYPE ?= "uImage"
diff --git a/conf/machine/e6500.inc b/conf/machine/e6500.inc
index 9968230..23adf15 100644
--- a/conf/machine/e6500.inc
+++ b/conf/machine/e6500.inc
@@ -7,7 +7,6 @@ MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
PREFERRED_VERSION_virtual/kernel ?= "3.0.34"
-PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers"
PREFERRED_VERSION_qemu = "1.4+fsl"
KERNEL_IMAGETYPE ?= "uImage"
diff --git a/recipes-kernel/linux/files/scripts-Makefile.headersinst-install-headers-from-sc.patch b/recipes-kernel/linux/files/scripts-Makefile.headersinst-install-headers-from-sc.patch
deleted file mode 100644
index 0f28d3d..0000000
--- a/recipes-kernel/linux/files/scripts-Makefile.headersinst-install-headers-from-sc.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From e60cc1b011bf0f1acdb7e5168b7bed4ebb78c91f Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield <bruce.ashfield at windriver.com>
-Date: Wed, 9 Jan 2013 16:24:39 -0500
-Subject: [PATCH] scripts/Makefile.headersinst: install headers from scratch file
-
-If headers_install is executed from a deep/long directory structure, the
-shell's maximum argument length can be execeeded, which breaks the operation
-with:
-
-| make[2]: execvp: /bin/sh: Argument list too long
-| make[2]: ***
-
-By dumping the input files to a scratch file and using xargs to read the
-input list from the scratch file, we can avoid blowing out the maximum
-argument size and install headers in a long path name environment.
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield at windriver.com>
----
- scripts/Makefile.headersinst | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
-index 06ba4a7..536d722 100644
---- a/scripts/Makefile.headersinst
-+++ b/scripts/Makefile.headersinst
-@@ -71,7 +71,7 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@))
- quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\
- file$(if $(word 2, $(all-files)),s))
- cmd_install = \
-- $(PERL) $< $(installdir) $(SRCARCH) $(input-files); \
-+ xargs $(PERL) $< $(installdir) $(SRCARCH) < $(INSTALL_HDR_PATH)/.input-files; \
- for F in $(wrapper-files); do \
- echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \
- done; \
-@@ -100,7 +100,9 @@ targets += $(install-file)
- $(install-file): scripts/headers_install.pl $(input-files) FORCE
- $(if $(unwanted),$(call cmd,remove),)
- $(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@)))
-+ @echo $(input-files) > $(INSTALL_HDR_PATH)/.input-files
- $(call if_changed,install)
-+ @rm $(INSTALL_HDR_PATH)/.input-files
-
- else
- __headerscheck: $(subdirs) $(check-file)
---
-1.7.0.4
diff --git a/recipes-kernel/linux/linux-qoriq-sdk-headers.bb b/recipes-kernel/linux/linux-qoriq-sdk-headers.bb
deleted file mode 100644
index 0ee4fc1..0000000
--- a/recipes-kernel/linux/linux-qoriq-sdk-headers.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-DESCRIPTION = "Linux kernel headers for Freescale platforms"
-SECTION = "devel"
-LICENSE = "GPLv2"
-
-PR = "${INC_PR}.1"
-
-INHIBIT_DEFAULT_DEPS = "1"
-PROVIDES = "linux-libc-headers ${PN}"
-RPROVIDES_${PN}-dev += "linux-libc-headers-dev"
-RPROVIDES_${PN}-dbg += "linux-libc-headers-dbg"
-RDEPENDS_${PN}-dev = ""
-RRECOMMENDS_${PN}-dbg = "linux-libc-headers-dev (= ${EXTENDPKGV})"
-
-require recipes-kernel/linux/linux-qoriq-sdk.inc
-
-SRC_URI_append += " file://scripts-Makefile.headersinst-install-headers-from-sc.patch"
-
-inherit kernel-arch
-
-do_configure() {
- oe_runmake allnoconfig
-}
-
-do_compile () {
-}
-
-do_install() {
- oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix}
- # 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
-}
--
1.7.9.5
More information about the meta-freescale
mailing list