summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-02-27 16:37:24 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-28 17:47:10 +0000
commit53b3e8c9d6e34f076a006df41cd2854b3cb30c71 (patch)
tree18736b7316f8d08db34fbbabd08d3c0afdf22159
parentebee3ee60049596cef5e97f3ac970777f34a3c88 (diff)
downloadpoky-53b3e8c9d6e34f076a006df41cd2854b3cb30c71.tar.gz
glibc: Move common bits to glibc-common.inc
We have been duplicating few variables in glibc recipes which could actually be defined once, therefore move them to glibc-common.inc which is included by all glibc family of recipes (From OE-Core rev: 41093cb6c6d5edccebf41e62ed537779b1ee47bf) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/glibc/glibc-collateral.inc18
-rw-r--r--meta/recipes-core/glibc/glibc-common.inc14
-rw-r--r--meta/recipes-core/glibc/glibc.inc8
-rw-r--r--meta/recipes-core/glibc/glibc_2.29.bb5
4 files changed, 17 insertions, 28 deletions
diff --git a/meta/recipes-core/glibc/glibc-collateral.inc b/meta/recipes-core/glibc/glibc-collateral.inc
index 3379270566..52880791a7 100644
--- a/meta/recipes-core/glibc/glibc-collateral.inc
+++ b/meta/recipes-core/glibc/glibc-collateral.inc
@@ -1,15 +1,7 @@
1INHIBIT_DEFAULT_DEPS = "1" 1require glibc-common.inc
2LICENSE = "GPLv2 & LGPLv2.1"
3LIC_FILES_CHKSUM ?= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \
4 file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780"
5HOMEPAGE = "http://www.gnu.org/software/libc/index.html"
6 2
7# This needs to match with glibc.inc, otherwise glibc-scripts and glibc-locale 3LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \
8# will fail to find main glibc, for details see 4 file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780"
9# http://lists.openembedded.org/pipermail/openembedded-core/2015-January/100679.html
10ARM_INSTRUCTION_SET_armv4 = "arm"
11ARM_INSTRUCTION_SET_armv5 = "arm"
12ARM_INSTRUCTION_SET_armv6 = "arm"
13 5
14deltask do_fetch 6deltask do_fetch
15deltask do_unpack 7deltask do_unpack
@@ -18,7 +10,3 @@ do_configure[noexec] = "1"
18do_compile[noexec] = "1" 10do_compile[noexec] = "1"
19 11
20do_install[depends] += "virtual/${MLPREFIX}libc:do_stash_locale" 12do_install[depends] += "virtual/${MLPREFIX}libc:do_stash_locale"
21
22COMPATIBLE_HOST_libc-musl_class-target = "null"
23
24PV = "2.29"
diff --git a/meta/recipes-core/glibc/glibc-common.inc b/meta/recipes-core/glibc/glibc-common.inc
index b05e162f88..cded384592 100644
--- a/meta/recipes-core/glibc/glibc-common.inc
+++ b/meta/recipes-core/glibc/glibc-common.inc
@@ -7,4 +7,18 @@ LIC_FILES_CHKSUM ?= "file://LICENSES;md5=07a394b26e0902b9ffdec03765209770 \
7 file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \ 7 file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \
8 file://posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \ 8 file://posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \
9 file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff " 9 file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff "
10
10CVE_PRODUCT = "glibc" 11CVE_PRODUCT = "glibc"
12
13INHIBIT_DEFAULT_DEPS = "1"
14
15ARM_INSTRUCTION_SET_armv4 = "arm"
16ARM_INSTRUCTION_SET_armv5 = "arm"
17ARM_INSTRUCTION_SET_armv6 = "arm"
18#
19# We will skip parsing glibc when target system C library selection is not glibc
20# this helps in easing out parsing for non-glibc system libraries
21#
22COMPATIBLE_HOST_libc-musl_class-target = "null"
23
24PV = "2.29"
diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc
index 67af396133..b550abd877 100644
--- a/meta/recipes-core/glibc/glibc.inc
+++ b/meta/recipes-core/glibc/glibc.inc
@@ -34,14 +34,6 @@ CACHED_CONFIGUREVARS_append_mipsarch = " libc_cv_ld_gnu_indirect_function=no"
34 34
35GLIBC_EXTRA_OECONF ?= "" 35GLIBC_EXTRA_OECONF ?= ""
36GLIBC_EXTRA_OECONF_class-nativesdk = "" 36GLIBC_EXTRA_OECONF_class-nativesdk = ""
37INHIBIT_DEFAULT_DEPS = "1"
38
39# This needs to match with glibc-collateral.inc, otherwise glibc-scripts and glibc-locale
40# will fail to find main glibc, for details see
41# http://lists.openembedded.org/pipermail/openembedded-core/2015-January/100679.html
42ARM_INSTRUCTION_SET_armv4 = "arm"
43ARM_INSTRUCTION_SET_armv5 = "arm"
44ARM_INSTRUCTION_SET_armv6 = "arm"
45 37
46# glibc uses PARALLELMFLAGS variable to pass parallel build info so transfer 38# glibc uses PARALLELMFLAGS variable to pass parallel build info so transfer
47# PARALLEL_MAKE into PARALLELMFLAGS and empty out PARALLEL_MAKE 39# PARALLEL_MAKE into PARALLELMFLAGS and empty out PARALLEL_MAKE
diff --git a/meta/recipes-core/glibc/glibc_2.29.bb b/meta/recipes-core/glibc/glibc_2.29.bb
index bd8aa6d503..c3e969d2f8 100644
--- a/meta/recipes-core/glibc/glibc_2.29.bb
+++ b/meta/recipes-core/glibc/glibc_2.29.bb
@@ -69,11 +69,6 @@ BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
69TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}" 69TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}"
70 70
71GLIBC_BROKEN_LOCALES = "" 71GLIBC_BROKEN_LOCALES = ""
72#
73# We will skip parsing glibc when target system C library selection is not glibc
74# this helps in easing out parsing for non-glibc system libraries
75#
76COMPATIBLE_HOST_libc-musl_class-target = "null"
77 72
78GLIBCPIE ??= "" 73GLIBCPIE ??= ""
79 74