From f7ea27eaf3aa23ef7b8c2e2f2888de47d136e120 Mon Sep 17 00:00:00 2001
From: Christopher Larson <chris_larson@mentor.com>
Date: Wed, 21 Jun 2017 01:59:28 +0500
Subject: [PATCH] linux-libc-headers: merge back into glibc

We don't want to encourage use of alternate versions of this recipe, there are
better ways to add additional headers.

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 conf/distro/include/tcmode-external.inc       |  6 +++---
 recipes-external/glibc/glibc-external.bb      |  8 ++++----
 .../linux-libc-headers-external.bb            | 20 -------------------
 3 files changed, 7 insertions(+), 27 deletions(-)
 delete mode 100644 recipes-external/linux-libc-headers/linux-libc-headers-external.bb

diff --git a/conf/distro/include/tcmode-external.inc b/conf/distro/include/tcmode-external.inc
index b450b47..0eea274 100644
--- a/conf/distro/include/tcmode-external.inc
+++ b/conf/distro/include/tcmode-external.inc
@@ -18,10 +18,10 @@ PREFERRED_PROVIDER_virtual/libintl ?= "glibc-external"
 PREFERRED_PROVIDER_virtual/libiconv ?= "glibc-external"
 PREFERRED_PROVIDER_gdbserver ??= "gdbserver-external"
 PREFERRED_PROVIDER_oprofile ??= "oprofile"
-# These are defined in default-providers.inc, which is parsed before the
-# tcmode, so we can't use ?= for them.
+
+# This is defined in default-providers.inc, which is parsed before the tcmode,
+# so we can't use ?=
 PREFERRED_PROVIDER_libgcc = "libgcc-external"
-PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers-external"
 
 # Pass --no-sysroot-suffix when using an external toolchain with the SDK
 TOOLCHAIN_TARGET_TASK_append = " sdk-env-external-toolchain"
diff --git a/recipes-external/glibc/glibc-external.bb b/recipes-external/glibc/glibc-external.bb
index 6d07744..102c0f0 100644
--- a/recipes-external/glibc/glibc-external.bb
+++ b/recipes-external/glibc/glibc-external.bb
@@ -10,8 +10,7 @@ require recipes-core/glibc/glibc-common.inc
 inherit external-toolchain
 require recipes-external/glibc/glibc-external-version.inc
 
-DEPENDS += "virtual/${TARGET_PREFIX}binutils \
-            linux-libc-headers"
+DEPENDS += "virtual/${TARGET_PREFIX}binutils"
 PROVIDES += "glibc \
              virtual/${TARGET_PREFIX}libc-for-gcc \
              virtual/${TARGET_PREFIX}libc-initial \
@@ -143,8 +142,6 @@ python () {
     # Undo the do_install_append which joined shell to python
     install = d.getVar('do_install', False)
     python, shell = install.split('rm -f ', 1)
-    # bits/syscall.h is in linux-libc-headers-external
-    shell = shell.replace('oe_multilib_header bits/syscall.h bits/long-double.h\n', '')
     d.setVar('do_install_glibc', 'rm -f ' + shell)
     d.setVarFlag('do_install_glibc', 'func', '1')
     new_install = python + '\n    bb.build.exec_func("do_install_glibc", d)\n'
@@ -187,6 +184,9 @@ FILES_${PN}-dev_remove := "${datadir}/aclocal"
 FILES_${PN}-dev_remove = "/lib/*.o"
 FILES_${PN}-dev += "${libdir}/*crt*.o"
 
+linux_include_subdirs = "asm asm-generic bits drm linux mtd rdma sound sys video"
+FILES_${PN}-dev += "${@' '.join('${includedir}/%s' % d for d in '${linux_include_subdirs}'.split())}"
+
 libc_baselibs_dev += "${@' '.join('${libdir}/' + os.path.basename(l.replace('${SOLIBS}', '${SOLIBSDEV}')) for l in '${libc_baselibs}'.replace('${base_libdir}/ld*${SOLIBS}', '').split() if l.endswith('${SOLIBS}'))}"
 FILES_${PN}-staticdev = "\
     ${@'${libc_baselibs_dev}'.replace('${SOLIBSDEV}', '.a')} \
diff --git a/recipes-external/linux-libc-headers/linux-libc-headers-external.bb b/recipes-external/linux-libc-headers/linux-libc-headers-external.bb
deleted file mode 100644
index 804870c..0000000
--- a/recipes-external/linux-libc-headers/linux-libc-headers-external.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-require recipes-kernel/linux-libc-headers/linux-libc-headers.inc
-inherit external-toolchain
-
-LIC_FILES_CHKSUM = "${COMMON_LIC_CHKSUM}"
-DEPENDS = ""
-SRC_URI = ""
-
-linux_include_subdirs = "asm asm-generic bits drm linux mtd rdma sound sys video"
-FILES_${PN}-dev = "${@' '.join('${includedir}/%s' % d for d in '${linux_include_subdirs}'.split())}"
-
-BBCLASSEXTEND = ""
-
-inherit multilib_header
-
-do_install_extra () {
-    oe_multilib_header bits/syscall.h
-    if [ -e "${D}${includedir}/bits/long-double.h" ]; then
-        oe_multilib_header bits/long-double.h
-    fi
-}