From 78ffebafc721fa63d9896010f2178c3e306a13df Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Tue, 28 Jul 2015 13:22:41 -0700 Subject: [PATCH 1/2] .gitignore: ignore *.pyc, *.pyo Signed-off-by: Christopher Larson --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..52e4e61 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*.pyc +*.pyo From 7ea84d1f97a26491727115014c015730dcad8e5a Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Tue, 28 Jul 2015 13:23:02 -0700 Subject: [PATCH 2/2] glibc-{mtrace,scripts,locale}: align PV with glibc-external Signed-off-by: Christopher Larson --- core/recipes-core/glibc/glibc-locale_%.bbappend | 2 ++ core/recipes-core/glibc/glibc-mtrace_%.bbappend | 1 + core/recipes-core/glibc/glibc-scripts_%.bbappend | 1 + recipes-external/glibc/glibc-external-version.inc | 12 ++++++++++++ recipes-external/glibc/glibc-external.bb | 14 +------------- recipes-external/glibc/glibc-sourcery.bb | 12 +----------- 6 files changed, 18 insertions(+), 24 deletions(-) create mode 100644 core/recipes-core/glibc/glibc-mtrace_%.bbappend create mode 100644 core/recipes-core/glibc/glibc-scripts_%.bbappend create mode 100644 recipes-external/glibc/glibc-external-version.inc diff --git a/core/recipes-core/glibc/glibc-locale_%.bbappend b/core/recipes-core/glibc/glibc-locale_%.bbappend index c5c0655..87075de 100644 --- a/core/recipes-core/glibc/glibc-locale_%.bbappend +++ b/core/recipes-core/glibc/glibc-locale_%.bbappend @@ -1,3 +1,5 @@ +require recipes-external/glibc/glibc-external-version.inc + python () { if d.getVar('TCMODE', True).startswith('external-sourcery'): d.setVar('INHIBIT_PACKAGE_DEBUG_SPLIT', '1') diff --git a/core/recipes-core/glibc/glibc-mtrace_%.bbappend b/core/recipes-core/glibc/glibc-mtrace_%.bbappend new file mode 100644 index 0000000..0f66fff --- /dev/null +++ b/core/recipes-core/glibc/glibc-mtrace_%.bbappend @@ -0,0 +1 @@ +require recipes-external/glibc/glibc-external-version.inc diff --git a/core/recipes-core/glibc/glibc-scripts_%.bbappend b/core/recipes-core/glibc/glibc-scripts_%.bbappend new file mode 100644 index 0000000..0f66fff --- /dev/null +++ b/core/recipes-core/glibc/glibc-scripts_%.bbappend @@ -0,0 +1 @@ +require recipes-external/glibc/glibc-external-version.inc diff --git a/recipes-external/glibc/glibc-external-version.inc b/recipes-external/glibc/glibc-external-version.inc new file mode 100644 index 0000000..652a5f0 --- /dev/null +++ b/recipes-external/glibc/glibc-external-version.inc @@ -0,0 +1,12 @@ +def get_external_libc_version(d): + sopattern = os.path.join(d.getVar('base_libdir', True), 'libc-*.so') + found_paths = oe.external.find_sysroot_files([sopattern], d) + if found_paths: + so_paths = found_paths[0] + if so_paths: + soname = os.path.basename(so_paths[0]) + return soname[5:-3] + + return 'UNKNOWN' + +PV := "${@get_external_libc_version(d)}" diff --git a/recipes-external/glibc/glibc-external.bb b/recipes-external/glibc/glibc-external.bb index bf5debf..e2128a3 100644 --- a/recipes-external/glibc/glibc-external.bb +++ b/recipes-external/glibc/glibc-external.bb @@ -2,19 +2,7 @@ SRC_URI = "file://SUPPORTED" require recipes-core/glibc/glibc-common.inc inherit external-toolchain - -def get_external_libc_version(d): - sopattern = os.path.join(d.getVar('base_libdir', True), 'libc-*.so') - found_paths = find_sysroot_files([sopattern], d) - if found_paths: - so_paths = found_paths[0] - if so_paths: - soname = os.path.basename(so_paths[0]) - return soname[5:-3] - - return 'UNKNOWN' - -PV := "${@get_external_libc_version(d)}" +require recipes-external/glibc/glibc-external-version.inc DEPENDS += "virtual/${TARGET_PREFIX}binutils \ linux-libc-headers" diff --git a/recipes-external/glibc/glibc-sourcery.bb b/recipes-external/glibc/glibc-sourcery.bb index f6520d8..544ad1e 100644 --- a/recipes-external/glibc/glibc-sourcery.bb +++ b/recipes-external/glibc/glibc-sourcery.bb @@ -1,4 +1,5 @@ require recipes-core/glibc/glibc.inc +require recipes-external/glibc/glibc-external-version.inc EXTERNAL_TOOLCHAIN_SYSROOT ?= "${@oe.external.run(d, 'gcc', *(TARGET_CC_ARCH.split() + ['-print-sysroot'])).rstrip()}" @@ -11,17 +12,6 @@ EXTERNAL_PV_SUFFIX ?= "" PV_prepend = "${@'${EXTERNAL_PV_PREFIX}' if '${EXTERNAL_PV_PREFIX}' else ''}" PV_append = "${@'${EXTERNAL_PV_SUFFIX}' if '${EXTERNAL_PV_SUFFIX}' else ''}" -def get_external_libc_version(d): - sysroot = d.getVar('EXTERNAL_TOOLCHAIN_SYSROOT', True) - libpath = oe.path.join(sysroot, d.getVar('base_libdir', True)) - if os.path.exists(libpath): - for filename in os.listdir(libpath): - if filename.startswith('libc-'): - return filename[5:-3] - - return 'UNKNOWN' - -PV := "${@get_external_libc_version(d)}" SRC_PV = "${@'-'.join('${PV}'.split('-')[:-1])}" INHIBIT_DEFAULT_DEPS = "1"