t-head/meta-external-toolchain
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-external-toolchain synced 2026-09-17 12:42:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Convert to new overrides syntax for honister

Browse Source 
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
This commit is contained in:
Christopher Larson
2021-08-17 16:55:56 +00:00
parent dcab4f5860
commit a81f04f908
34 changed files with 154 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
classes/common-license.bbclass
View File

@@ -15,7 +15,7 @@ python () {
#; Set LIC_FILES_CHKSUM to a common license if it's unset and LICENSE is set
licensestr = d.getVar('LICENSE', True)
for pkg in d.getVar('PACKAGES', True).split():
pkg_lic = d.getVar('LICENSE_%s' % pkg, True)
pkg_lic = d.getVar('LICENSE:%s' % pkg, True)
if pkg_lic:
licensestr += ' ' + pkg_lic

16
classes/external-toolchain-cross-canadian.bbclass
View File

@@ -2,10 +2,10 @@ inherit external-toolchain cross-canadian
# Toolchain binaries are expected to run on both this host and SDKMACHINE, so
# we should be able to use host tools.
STRIP_task-package = "strip"
STRIP_task-populate-sysroot = "strip"
OBJCOPY_task-package = "objcopy"
PACKAGE_DEPENDS_remove = "virtual/${TARGET_PREFIX}binutils"
STRIP:task-package = "strip"
STRIP:task-populate-sysroot = "strip"
OBJCOPY:task-package = "objcopy"
PACKAGE_DEPENDS:remove = "virtual/${TARGET_PREFIX}binutils"
# Scan just toolchains root directory, but include some additional mirrors
EXTERNAL_INSTALL_SOURCE_PATHS = "${EXTERNAL_TOOLCHAIN}"
@@ -27,9 +27,9 @@ libdir = "${exec_prefix}/lib"
libexecdir = "${exec_prefix}/libexec"
# We're relying on a compatible host libc, not one from a nativesdk build
INSANE_SKIP_${PN} += "build-deps file-rdeps"
INSANE_SKIP:${PN} += "build-deps file-rdeps"
do_install_append () {
do_install:append () {
for i in ${D}${bindir}/${EXTERNAL_TARGET_SYS}-*; do
if [ -e "$i" ]; then
j="$(basename "$i")"
@@ -43,12 +43,12 @@ python add_files_links () {
full_prefix = os.path.join(d.getVar('bindir'), prefix)
new_prefix = d.getVar('TARGET_PREFIX')
for pkg in d.getVar('PACKAGES').split():
files = (d.getVar('FILES_%s' % pkg) or '').split()
files = (d.getVar('FILES:%s' % pkg) or '').split()
new_files = []
for f in files:
if f.startswith(full_prefix):
new_files.append(f.replace(prefix, new_prefix))
if new_files:
d.appendVar('FILES_%s' % pkg, ' ' + ' '.join(new_files))
d.appendVar('FILES:%s' % pkg, ' ' + ' '.join(new_files))
}
do_package[prefuncs] += "add_files_links"

50
classes/external-toolchain.bbclass
View File

@@ -21,7 +21,7 @@ S = "${WORKDIR}"
INHIBIT_DEFAULT_DEPS = "1"
# Missing build deps don't matter when we don't build anything
INSANE_SKIP_${PN} += "build-deps"
INSANE_SKIP:${PN} += "build-deps"
EXTERNAL_PN ?= "${@PN.replace('-external', '')}"
PROVIDES += "${EXTERNAL_PN}"
@@ -36,14 +36,14 @@ do_compile[noexec] = "1"
EXTERNAL_PV_PREFIX ?= ""
EXTERNAL_PV_SUFFIX ?= ""
PV_prepend = "${@'${EXTERNAL_PV_PREFIX}' if '${EXTERNAL_PV_PREFIX}' else ''}"
PV_append = "${@'${EXTERNAL_PV_SUFFIX}' if '${EXTERNAL_PV_SUFFIX}' else ''}"
PV:prepend = "${@'${EXTERNAL_PV_PREFIX}' if '${EXTERNAL_PV_PREFIX}' else ''}"
PV:append = "${@'${EXTERNAL_PV_SUFFIX}' if '${EXTERNAL_PV_SUFFIX}' else ''}"
EXTERNAL_EXTRA_FILES ?= ""
# Skip this recipe if we don't have files in the external toolchain
EXTERNAL_AUTO_PROVIDE ?= "0"
EXTERNAL_AUTO_PROVIDE_class-target ?= "1"
EXTERNAL_AUTO_PROVIDE:class-target ?= "1"
# We don't care if this path references other variables
EXTERNAL_TOOLCHAIN[vardepvalue] = "${EXTERNAL_TOOLCHAIN}"
@@ -125,13 +125,13 @@ python external_toolchain_do_install () {
bb.build.exec_func('do_install_extra', d)
external_toolchain_propagate_mode(d, installdest)
}
external_toolchain_do_install[vardeps] += "${@' '.join('FILES_%s' % pkg for pkg in '${PACKAGES}'.split())}"
external_toolchain_do_install[vardeps] += "${@' '.join('FILES:%s' % pkg for pkg in '${PACKAGES}'.split())}"
# Change do_install's CWD to EXTERNAL_TOOLCHAIN for convenience
do_install[dirs] = "${D} ${EXTERNAL_TOOLCHAIN}"
python () {
# Deal with any do_install_append
# Deal with any do_install:append
install = d.getVar('do_install', False)
try:
base, appended = install.split('# Sentinel', 1)
@@ -140,31 +140,31 @@ python () {
else:
d.setVar('do_install', base)
if appended.strip():
d.setVar('do_install_appended', appended)
d.setVarFlag('do_install_appended', 'func', '1')
d.appendVarFlag('do_install', 'postfuncs', ' do_install_appended')
d.setVar('do_install_added', appended)
d.setVarFlag('do_install_added', 'func', '1')
d.appendVarFlag('do_install', 'postfuncs', ' do_install_added')
}
# Toolchain shipped binaries weren't necessarily built ideally
WARN_QA_remove = "ldflags textrel"
ERROR_QA_remove = "ldflags textrel"
WARN_QA:remove = "ldflags textrel"
ERROR_QA:remove = "ldflags textrel"
# Debug files may well have already been split out, or stripped out
INSANE_SKIP_${PN} += "already-stripped"
INSANE_SKIP:${PN} += "already-stripped"
RPROVIDES_${PN} += "${EXTERNAL_PN}"
RPROVIDES_${PN}-dev += "${EXTERNAL_PN}-dev"
RPROVIDES_${PN}-staticdev += "${EXTERNAL_PN}-staticdev"
RPROVIDES_${PN}-dbg += "${EXTERNAL_PN}-dbg"
RPROVIDES_${PN}-doc += "${EXTERNAL_PN}-doc"
RPROVIDES_${PN}-locale += "${EXTERNAL_PN}-locale"
RPROVIDES:${PN} += "${EXTERNAL_PN}"
RPROVIDES:${PN}-dev += "${EXTERNAL_PN}-dev"
RPROVIDES:${PN}-staticdev += "${EXTERNAL_PN}-staticdev"
RPROVIDES:${PN}-dbg += "${EXTERNAL_PN}-dbg"
RPROVIDES:${PN}-doc += "${EXTERNAL_PN}-doc"
RPROVIDES:${PN}-locale += "${EXTERNAL_PN}-locale"
LOCALEBASEPN = "${EXTERNAL_PN}"
FILES_${PN} = ""
FILES_${PN}-dev = ""
FILES_${PN}-staticdev = ""
FILES_${PN}-doc = ""
FILES_${PN}-locale = ""
FILES:${PN} = ""
FILES:${PN}-dev = ""
FILES:${PN}-staticdev = ""
FILES:${PN}-doc = ""
FILES:${PN}-locale = ""
def debug_paths(d):
l = d.createCopy()
@@ -177,7 +177,7 @@ def debug_paths(d):
for p in l.getVar('PACKAGES', True).split():
if p.endswith('-dbg'):
continue
for f in (l.getVar('FILES_%s' % p, True) or '').split():
for f in (l.getVar('FILES:%s' % p, True) or '').split():
if any((f == x or f.startswith(x + '/')) for x in exclude):
continue
d = os.path.dirname(f)
@@ -187,4 +187,4 @@ def debug_paths(d):
paths.append('{0}/.debug/{1}.debug'.format(d, b))
return set(paths)
FILES_${PN}-dbg = "${@' '.join(debug_paths(d))}"
FILES:${PN}-dbg = "${@' '.join(debug_paths(d))}"

2
classes/sanity-external-toolchain.bbclass
View File

@@ -47,7 +47,7 @@ def check_toolchain_sanity(d, generate_events=False):
l = d.createCopy()
l.setVar('TOOLCHAIN_OPTIONS', '')
l.setVar('TARGET_PREFIX', '${EXTERNAL_TARGET_SYS}-')
l.setVar('HOST_CC_ARCH_remove', '--no-sysroot-suffix')
l.setVar('HOST_CC_ARCH:remove', '--no-sysroot-suffix')
cmd = l.expand('${EXTERNAL_TOOLCHAIN_BIN}/${EXTERNAL_CC} ${HOST_CC_ARCH} ${CFLAGS} ${LDFLAGS} test.c -o test')
exttc_sanity_run(shlex.split(cmd), d, generate_events, tmpdir)