summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glibc/glibc-collateral.inc
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 13:35:27 +0000
commit41093cb6c6d5edccebf41e62ed537779b1ee47bf (patch)
treef4fcbaebca98d1c8b0d181b4fbe0dc0633ceb2bf /meta/recipes-core/glibc/glibc-collateral.inc
parent9421abbbf8fd6ff7c67ac8186a17d1c26583be6f (diff)
downloadopenembedded-core-contrib-41093cb6c6d5edccebf41e62ed537779b1ee47bf.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 Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glibc/glibc-collateral.inc')
-rw-r--r--meta/recipes-core/glibc/glibc-collateral.inc18
1 files changed, 3 insertions, 15 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 @@
-INHIBIT_DEFAULT_DEPS = "1"
-LICENSE = "GPLv2 & LGPLv2.1"
-LIC_FILES_CHKSUM ?= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \
- file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780"
-HOMEPAGE = "http://www.gnu.org/software/libc/index.html"
+require glibc-common.inc
-# This needs to match with glibc.inc, otherwise glibc-scripts and glibc-locale
-# will fail to find main glibc, for details see
-# http://lists.openembedded.org/pipermail/openembedded-core/2015-January/100679.html
-ARM_INSTRUCTION_SET_armv4 = "arm"
-ARM_INSTRUCTION_SET_armv5 = "arm"
-ARM_INSTRUCTION_SET_armv6 = "arm"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \
+ file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780"
deltask do_fetch
deltask do_unpack
@@ -18,7 +10,3 @@ do_configure[noexec] = "1"
do_compile[noexec] = "1"
do_install[depends] += "virtual/${MLPREFIX}libc:do_stash_locale"
-
-COMPATIBLE_HOST_libc-musl_class-target = "null"
-
-PV = "2.29"