ufs-tool: was upstreamed to meta-openembedded/meta-filesystem
PATCH 1/5 ufs-tool: was upstreamed to meta-openembedded/meta-filesystem
From: Denys Dmytriyenko <[email protected]>
Signed-off-by Denys Dmytriyenko <[email protected]>
--- .../recipes-core/packagegroups/ti-test.bb | 2 +- meta-arago-extras/recipes-bsp/ufs/ufs-tool_git.bb | 20 -------------------- 2 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 meta-arago-extras/recipes-bsp/ufs/ufs-tool_git.bb
meta-arago-distro/recipes-core/packagegroups/ti-test.bb +1 -1
@@ -70,7 +70,7 @@ ARAGO_TI_TEST_append_am65xx = " \ ARAGO_TI_TEST_append_j7 = " \ viddec-test-app \ videnc-test-app \ - ufs-tool \ + ufs-utils \ " ARAGO_TI_TEST_append_keystone = " \
meta-arago-extras/recipes-bsp/ufs/ufs-tool_git.bb deleted +0 -20
@@ -1,20 +0,0 @@ -SUMMARY = "Tool to access UFS device from user space" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -PV = "1.3" - -BRANCH ?= "dev" - -SRCREV = "8b00e33003b57d7071943f63863fcf8cc48d5be9" - -SRC_URI = "git://github.com/westerndigitalcorporation/ufs-tool.git;protocol=git;branch=${BRANCH}" - -S = "${WORKDIR}/git" - -EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} CC="${CC}"" - -do_install() { - install -d ${D}${bindir}/ - install -c -m 755 ${S}/ufs-tool ${D}${bindir}/ -}
Signature · 1 line
2.7.4
PATCH 2/5 bash: revert previous overlayed fix for ptest
From: Denys Dmytriyenko <[email protected]>
Reverts 742186ca7ac250aebdcb916bd850300626f08f3f
Signed-off-by Denys Dmytriyenko <[email protected]>
--- meta-arago-distro/recipes-extended/bash/bash_%.bbappend | 3 --- 1 file changed, 3 deletions(-)
meta-arago-distro/recipes-extended/bash/bash_%.bbappend +0 -3
@@ -1,6 +1,3 @@ PR_append = ".arago0" EXTRA_OECONF += " --disable-command-timing" - -DEPENDS_append_libc-glibc = " virtual/libc-locale" -DEPENDS_remove = "glibc-locale"
Signature · 1 line
2.7.4
PATCH 3/5 external-arm-toolchain: inhibit stripping fix was upstreamed
In reply to Denys DmytriyenkoFrom: Denys Dmytriyenko <[email protected]>
Signed-off-by Denys Dmytriyenko <[email protected]>
--- meta-arago-extras/recipes-core/meta/external-arm-toolchain.bbappend | 3 --- 1 file changed, 3 deletions(-)
meta-arago-extras/recipes-core/meta/external-arm-toolchain.bbappend +0 -3
@@ -1,6 +1,3 @@ -INHIBIT_PACKAGE_STRIP = "0" -INHIBIT_PACKAGE_DEBUG_SPLIT = "0" - ORIG_TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + d.getVar('TARGET_OS'), ''][d.getVar('TARGET_OS') == ('' or 'custom')]}" do_install_append() {
Signature · 1 line
2.7.4
PATCH 4/5 tcmode-external-arm: this was overlayed temporarily before and is no longer needed
In reply to Denys DmytriyenkoFrom: Denys Dmytriyenko <[email protected]>
Signed-off-by Denys Dmytriyenko <[email protected]>
--- .../conf/distro/include/tcmode-external-arm.inc | 113 --------------------- 1 file changed, 113 deletions(-) delete mode 100644 meta-arago-extras/conf/distro/include/tcmode-external-arm.inc
meta-arago-extras/conf/distro/include/tcmode-external-arm.inc deleted +0 -113
@@ -1,113 +0,0 @@ -# -# Configuration to use an external Arm binary toolchain -# - -EXTERNAL_TOOLCHAIN ?= "/usr/local/arm-binary-toolchain/${TARGET_ARCH}" - -TOOLCHAIN_PATH_ADD = "${EXTERNAL_TOOLCHAIN}/bin:" -PATH =. "${TOOLCHAIN_PATH_ADD}" - -EAT_TARGET_SYS_arm ?= "arm-linux-gnueabihf" -EAT_TARGET_SYS_aarch64 ?= "aarch64-linux-gnu" -EAT_TARGET_SYS = "${TARGET_SYS}" -TARGET_PREFIX = "${EAT_TARGET_SYS}-" - -EAT_LIBDIR_arm = "lib" -EAT_LIBDIR_aarch64 = "lib64" - -GCCMULTILIB_forcevariable = "--disable-multilib" -IMAGE_LINGUAS_forcevariable = "" - -# Blacklist toolchain recipes as a belt-and-suspenders way to use the external toolchain -PNBLACKLIST[glibc] = "Using external toolchain" -PNBLACKLIST[libgcc] = "Using external toolchain" -PNBLACKLIST[gcc-cross] = "Using external toolchain" -PNBLACKLIST[gcc-runtime] = "Using external toolchain" - -PREFERRED_PROVIDER_linux-libc-headers = "external-arm-toolchain" -PREFERRED_PROVIDER_linux-libc-headers-dev = "external-arm-toolchain" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "external-arm-toolchain" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "external-arm-toolchain" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "external-arm-toolchain" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "external-arm-toolchain" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "external-arm-toolchain" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "external-arm-toolchain" -PREFERRED_PROVIDER_glibc = "external-arm-toolchain" -PREFERRED_PROVIDER_libgcc = "external-arm-toolchain" -PREFERRED_PROVIDER_virtual/libc = "external-arm-toolchain" -PREFERRED_PROVIDER_virtual/libintl = "external-arm-toolchain" -PREFERRED_PROVIDER_virtual/libiconv = "external-arm-toolchain" -PREFERRED_PROVIDER_virtual/crypt = "external-arm-toolchain" -PREFERRED_PROVIDER_glibc-thread-db = "external-arm-toolchain" -PREFERRED_PROVIDER_glibc-mtrace = "external-arm-toolchain" -PREFERRED_PROVIDER_libc-mtrace = "external-arm-toolchain" -PREFERRED_PROVIDER_virtual/linux-libc-headers = "external-arm-toolchain" - -TARGET_CPPFLAGS_prepend = " -isystem${EXTERNAL_TOOLCHAIN}/${EAT_TARGET_SYS}/include " -TARGET_LDFLAGS_prepend = " -L${EXTERNAL_TOOLCHAIN}/${EAT_TARGET_SYS}/lib -Wl,-rpath-link,${EXTERNAL_TOOLCHAIN}/${EAT_TARGET_SYS}/lib " - -TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_HOST}" - -DISTRO_FEATURES_LIBC = "ipv4 ipv6 libc-backtrace libc-big-macros libc-bsd libc-cxx-tests libc-catgets libc-crypt \ - libc-crypt-ufc libc-db-aliases libc-envz libc-fcvt libc-fmtmsg libc-fstab libc-ftraverse \ - libc-getlogin libc-idn libc-inet-anl libc-libm libc-libm-big \ - libc-memusage libc-nis libc-nsswitch libc-rcmd libc-rtld-debug libc-spawn libc-streams libc-sunrpc \ - libc-utmp libc-utmpx libc-wordexp libc-posix-clang-wchar libc-posix-regexp libc-posix-regexp-glibc \ - libc-posix-wchar-io" - -ENABLE_BINARY_LOCALE_GENERATION = "0" -GLIBC_INTERNAL_USE_BINARY_LOCALE = "precompiled" - -ERROR_QA[type] ?= "list" -python toolchain_metadata_setup () { - import subprocess - if not isinstance(e, bb.event.ConfigParsed): - return - - d = e.data - l = d.createCopy() - l.finalize() - oe_import(l) - - external_toolchain = l.getVar('EXTERNAL_TOOLCHAIN', True) - if not external_toolchain or external_toolchain == 'UNDEFINED': - bb.fatal("Error: EXTERNAL_TOOLCHAIN must be set to the path to your arm toolchain") - - if not os.path.exists(external_toolchain): - bb.fatal("Error: EXTERNAL_TOOLCHAIN path '%s' does not exist" % external_toolchain) - - # The external toolchain may not have been built with the oe-core preferred - # gnu hash setting, so ensure that the corresponding sanity check is not an error. - error_qa = oe.data.typed_value('ERROR_QA', l) - if 'ldflags' in error_qa: - error_qa.remove('ldflags') - d.setVar('ERROR_QA', ' '.join(error_qa)) -} -addhandler toolchain_metadata_setup - -def populate_toolchain_links(d): - import errno - import os - from glob import glob - - d = d.createCopy() - d.finalize() - - pattern = bb.data.expand('${EXTERNAL_TOOLCHAIN}/bin/${TARGET_PREFIX}*', d) - files = glob(pattern) - if not files: - bb.fatal("Unable to populate toolchain binary symlinks") - - bindir = d.getVar('STAGING_BINDIR_TOOLCHAIN', True) - bb.mkdirhier(bindir) - for f in files: - base = os.path.basename(f) - newpath = os.path.join(bindir, base) - try: - os.symlink(f, newpath) - except OSError as exc: - if exc.errno == errno.EEXIST: - break - bb.fatal("Unable to populate toolchain binary symlink for %s: %s" % (newpath, exc)) - -require conf/distro/include/external-arm-toolchain-versions.inc
Signature · 1 line
2.7.4
PATCH 5/5 arago.conf, toolchain-arm: drop custom TCLIBC settings in favor of upstream glibc
In reply to Denys DmytriyenkoFrom: Denys Dmytriyenko <[email protected]>
Looks like external-arm-toolchain has broken locale packaging, so disable those dependencies for now.
Signed-off-by Denys Dmytriyenko <[email protected]>
--- meta-arago-distro/conf/distro/arago.conf | 4 +++ .../conf/distro/include/toolchain-arm.inc | 1 - .../include/tclibc-external-arm-toolchain.inc | 38 ---------------------- 3 files changed, 4 insertions(+), 39 deletions(-) delete mode 100644 meta-arago-extras/conf/distro/include/tclibc-external-arm-toolchain.inc
meta-arago-distro/conf/distro/arago.conf +4 -0
@@ -72,6 +72,10 @@ INITRAMFS_FSTYPES_k2l-hs-evm = "cpio.gz" # Mask any broken recipes (currently none) #BBMASK = "" +TMPDIR .= "-${ARMPKGARCH}-${TCMODE}" + +LIBC_DEPENDENCIES_remove = "glibc-gconv-cp1252 glibc-gconv-ibm850 glibc-gconv-iso8859-1 glibc-gconv-iso8859-15 glibc-localedata-i18n" + # Start with default set of distro features DISTRO_FEATURES = "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC}"
meta-arago-distro/conf/distro/include/toolchain-arm.inc +0 -1
@@ -1,6 +1,5 @@ # Select external binary prebuilt Arm toolchain TCMODE = "external-arm" -TCLIBC = "external-arm-toolchain" EAT_TARGET_SYS_ARMV5 ?= "arm-none-linux-gnueabi" EAT_TARGET_SYS_ARMV7 ?= "arm-none-linux-gnueabihf"
meta-arago-extras/conf/distro/include/tclibc-external-arm-toolchain.inc deleted +0 -38
@@ -1,38 +0,0 @@ -# -# external Arm glibc specific configuration -# - -LIBCEXTENSION = "${@['', '-gnu'][(d.getVar('ABIEXTENSION') or '') != '']}" - -# Add glibc overrides to the overrides for glibc. -LIBCOVERRIDE = ":libc-glibc" -OVERRIDES .= "${LIBCOVERRIDE}" - -PREFERRED_PROVIDER_virtual/libc-locale ?= "external-arm-toolchain" - -PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-glibc" -PREFERRED_PROVIDER_virtual/nativesdk-libintl ?= "nativesdk-glibc" -PREFERRED_PROVIDER_virtual/nativesdk-libc ?= "nativesdk-glibc" - -LIBC_DEPENDENCIES = "libsegfault \ - glibc \ - glibc-dbg \ - glibc-dev \ - glibc-utils \ - glibc-thread-db \ - ${@get_libc_locales_dependencies(d)}" - -LIBC_LOCALE_DEPENDENCIES = "\ - glibc-localedata-i18n \ - glibc-gconv-ibm850 \ - glibc-gconv-cp1252 \ - glibc-gconv-iso8859-1 \ - glibc-gconv-iso8859-15 \ - locale-base-en-us \ - locale-base-en-gb" - -def get_libc_locales_dependencies(d): - if 'libc-locales' in (d.getVar('DISTRO_FEATURES') or '').split() : - return d.getVar('LIBC_LOCALE_DEPENDENCIES') or '' - else: - return ''
Signature · 1 line
2.7.4