From d3e0606d43246f5361c3dd05ead0da625ecfa6b6 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 22 Jun 2023 14:06:23 +0000 Subject: [PATCH] uninative: call patchelf-uninative only when needed :Release Notes: mke2fs.real, mkfs.ext2.real, mkfs.ext3.real, mkfs.ext4.real are indentical binary with multiple hardlinks and we end calling patchelf-uninative 4 times even when the interpreter is already set correctly from the build :Detailed Notes: To avoid corrupted binaries created on 18.04 ubuntu avoid calling patchelf-uninative multiple times and in this case don't call it at all. It might be related to: https://github.com/NixOS/patchelf/issues/492 or https://github.com/NixOS/patchelf/issues/446 but the later was already included in patchelf-0.17.2 used in uninative-3.9 This was submitted to upstream in: https://lists.openembedded.org/g/openembedded-core/message/183314 but wasn't merged yet (so it cannot be in meta-webos-backports-* layer) and it might take a while until it's backported to kirkstone. :Testing Performed: Only build tested. :QA Notes: No change to image. :Issues Addressed: [WRP-19053] CCC: Various build fixes [WRP-17893] mkfs.ext4 segfaults with uninative 3.10 and newer [WRP-6209] Update jenkins slaves to use Ubuntu 20.04 or 22.04 Change-Id: Ied1e0965423c660bca375c1e8deac7500014cc03 --- meta-webos/classes/uninative.bbclass | 183 +++++++++++++++++++++++++++ 1 file changed, 183 insertions(+) create mode 100644 meta-webos/classes/uninative.bbclass diff --git a/meta-webos/classes/uninative.bbclass b/meta-webos/classes/uninative.bbclass new file mode 100644 index 000000000..da6e3e365 --- /dev/null +++ b/meta-webos/classes/uninative.bbclass @@ -0,0 +1,183 @@ +# Imported from oe-core as-is in +# https://git.openembedded.org/openembedded-core/tree/meta/classes/uninative.bbclass?h=kirkstone&id=7949e786cf8e50f716ff1f1c4797136637205e0c +# with one modification on top: +# https://lists.openembedded.org/g/openembedded-core/message/183314 + +UNINATIVE_LOADER ?= "${UNINATIVE_STAGING_DIR}-uninative/${BUILD_ARCH}-linux/lib/${@bb.utils.contains('BUILD_ARCH', 'x86_64', 'ld-linux-x86-64.so.2', '', d)}${@bb.utils.contains('BUILD_ARCH', 'i686', 'ld-linux.so.2', '', d)}${@bb.utils.contains('BUILD_ARCH', 'aarch64', 'ld-linux-aarch64.so.1', '', d)}${@bb.utils.contains('BUILD_ARCH', 'ppc64le', 'ld64.so.2', '', d)}" +UNINATIVE_STAGING_DIR ?= "${STAGING_DIR}" + +UNINATIVE_URL ?= "unset" +UNINATIVE_TARBALL ?= "${BUILD_ARCH}-nativesdk-libc-${UNINATIVE_VERSION}.tar.xz" +# Example checksums +#UNINATIVE_CHECKSUM[aarch64] = "dead" +#UNINATIVE_CHECKSUM[i686] = "dead" +#UNINATIVE_CHECKSUM[x86_64] = "dead" +UNINATIVE_DLDIR ?= "${DL_DIR}/uninative/" + +# Enabling uninative will change the following variables so they need to go the parsing ignored variables list to prevent multiple recipe parsing +BB_HASHCONFIG_IGNORE_VARS += "NATIVELSBSTRING SSTATEPOSTUNPACKFUNCS BUILD_LDFLAGS" + +addhandler uninative_event_fetchloader +uninative_event_fetchloader[eventmask] = "bb.event.BuildStarted" + +addhandler uninative_event_enable +uninative_event_enable[eventmask] = "bb.event.ConfigParsed" + +python uninative_event_fetchloader() { + """ + This event fires on the parent and will try to fetch the tarball if the + loader isn't already present. + """ + + chksum = d.getVarFlag("UNINATIVE_CHECKSUM", d.getVar("BUILD_ARCH")) + if not chksum: + bb.fatal("Uninative selected but not configured correctly, please set UNINATIVE_CHECKSUM[%s]" % d.getVar("BUILD_ARCH")) + + loader = d.getVar("UNINATIVE_LOADER") + loaderchksum = loader + ".chksum" + if os.path.exists(loader) and os.path.exists(loaderchksum): + with open(loaderchksum, "r") as f: + readchksum = f.read().strip() + if readchksum == chksum: + return + + import subprocess + try: + # Save and restore cwd as Fetch.download() does a chdir() + olddir = os.getcwd() + + tarball = d.getVar("UNINATIVE_TARBALL") + tarballdir = os.path.join(d.getVar("UNINATIVE_DLDIR"), chksum) + tarballpath = os.path.join(tarballdir, tarball) + + if not os.path.exists(tarballpath + ".done"): + bb.utils.mkdirhier(tarballdir) + if d.getVar("UNINATIVE_URL") == "unset": + bb.fatal("Uninative selected but not configured, please set UNINATIVE_URL") + + localdata = bb.data.createCopy(d) + localdata.setVar('FILESPATH', "") + localdata.setVar('DL_DIR', tarballdir) + # Our games with path manipulation of DL_DIR mean standard PREMIRRORS don't work + # and we can't easily put 'chksum' into the url path from a url parameter with + # the current fetcher url handling + premirrors = bb.fetch2.mirror_from_string(localdata.getVar("PREMIRRORS")) + for line in premirrors: + try: + (find, replace) = line + except ValueError: + continue + if find.startswith("http"): + localdata.appendVar("PREMIRRORS", " ${UNINATIVE_URL}${UNINATIVE_TARBALL} %s/uninative/%s/${UNINATIVE_TARBALL}" % (replace, chksum)) + + srcuri = d.expand("${UNINATIVE_URL}${UNINATIVE_TARBALL};sha256sum=%s" % chksum) + bb.note("Fetching uninative binary shim %s (will check PREMIRRORS first)" % srcuri) + + fetcher = bb.fetch2.Fetch([srcuri], localdata, cache=False) + fetcher.download() + localpath = fetcher.localpath(srcuri) + if localpath != tarballpath and os.path.exists(localpath) and not os.path.exists(tarballpath): + # Follow the symlink behavior from the bitbake fetch2. + # This will cover the case where an existing symlink is broken + # as well as if there are two processes trying to create it + # at the same time. + if os.path.islink(tarballpath): + # Broken symbolic link + os.unlink(tarballpath) + + # Deal with two processes trying to make symlink at once + try: + os.symlink(localpath, tarballpath) + except FileExistsError: + pass + + # ldd output is "ldd (Ubuntu GLIBC 2.23-0ubuntu10) 2.23", extract last option from first line + glibcver = subprocess.check_output(["ldd", "--version"]).decode('utf-8').split('\n')[0].split()[-1] + if bb.utils.vercmp_string(d.getVar("UNINATIVE_MAXGLIBCVERSION"), glibcver) < 0: + raise RuntimeError("Your host glibc version (%s) is newer than that in uninative (%s). Disabling uninative so that sstate is not corrupted." % (glibcver, d.getVar("UNINATIVE_MAXGLIBCVERSION"))) + + cmd = d.expand("\ +mkdir -p ${UNINATIVE_STAGING_DIR}-uninative; \ +cd ${UNINATIVE_STAGING_DIR}-uninative; \ +tar -xJf ${UNINATIVE_DLDIR}/%s/${UNINATIVE_TARBALL}; \ +${UNINATIVE_STAGING_DIR}-uninative/relocate_sdk.py \ + ${UNINATIVE_STAGING_DIR}-uninative/${BUILD_ARCH}-linux \ + ${UNINATIVE_LOADER} \ + ${UNINATIVE_LOADER} \ + ${UNINATIVE_STAGING_DIR}-uninative/${BUILD_ARCH}-linux/${bindir_native}/patchelf-uninative \ + ${UNINATIVE_STAGING_DIR}-uninative/${BUILD_ARCH}-linux${base_libdir_native}/libc*.so*" % chksum) + subprocess.check_output(cmd, shell=True) + + with open(loaderchksum, "w") as f: + f.write(chksum) + + enable_uninative(d) + + except RuntimeError as e: + bb.warn(str(e)) + except bb.fetch2.BBFetchException as exc: + bb.warn("Disabling uninative as unable to fetch uninative tarball: %s" % str(exc)) + bb.warn("To build your own uninative loader, please bitbake uninative-tarball and set UNINATIVE_TARBALL appropriately.") + except subprocess.CalledProcessError as exc: + bb.warn("Disabling uninative as unable to install uninative tarball: %s" % str(exc)) + bb.warn("To build your own uninative loader, please bitbake uninative-tarball and set UNINATIVE_TARBALL appropriately.") + finally: + os.chdir(olddir) +} + +python uninative_event_enable() { + """ + This event handler is called in the workers and is responsible for setting + up uninative if a loader is found. + """ + enable_uninative(d) +} + +def enable_uninative(d): + loader = d.getVar("UNINATIVE_LOADER") + if os.path.exists(loader): + bb.debug(2, "Enabling uninative") + d.setVar("NATIVELSBSTRING", "universal%s" % oe.utils.host_gcc_version(d)) + d.appendVar("SSTATEPOSTUNPACKFUNCS", " uninative_changeinterp") + d.appendVarFlag("SSTATEPOSTUNPACKFUNCS", "vardepvalueexclude", "| uninative_changeinterp") + d.appendVar("BUILD_LDFLAGS", " -Wl,--allow-shlib-undefined -Wl,--dynamic-linker=${UNINATIVE_LOADER}") + d.appendVarFlag("BUILD_LDFLAGS", "vardepvalueexclude", "| -Wl,--allow-shlib-undefined -Wl,--dynamic-linker=${UNINATIVE_LOADER}") + d.appendVarFlag("BUILD_LDFLAGS", "vardepsexclude", "UNINATIVE_LOADER") + d.prependVar("PATH", "${STAGING_DIR}-uninative/${BUILD_ARCH}-linux${bindir_native}:") + +python uninative_changeinterp () { + import subprocess + import stat + import oe.qa + + if not (bb.data.inherits_class('native', d) or bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('cross', d)): + return + + sstateinst = d.getVar('SSTATE_INSTDIR') + for walkroot, dirs, files in os.walk(sstateinst): + for file in files: + if file.endswith(".so") or ".so." in file: + continue + f = os.path.join(walkroot, file) + if os.path.islink(f): + continue + s = os.stat(f) + if not ((s[stat.ST_MODE] & stat.S_IXUSR) or (s[stat.ST_MODE] & stat.S_IXGRP) or (s[stat.ST_MODE] & stat.S_IXOTH)): + continue + elf = oe.qa.ELFFile(f) + try: + elf.open() + except oe.qa.NotELFFileError: + continue + if not elf.isDynamic(): + continue + + current = subprocess.check_output(("patchelf-uninative", "--print-interpreter", f), stderr=subprocess.STDOUT).decode('utf-8').split('\n')[0] + if current != d.getVar("UNINATIVE_LOADER"): + bb.debug(2, "Changing interpreter from %s to %s with %s" % (current, d.getVar("UNINATIVE_LOADER"), ("patchelf-uninative", "--set-interpreter", d.getVar("UNINATIVE_LOADER"), f))) + os.chmod(f, s[stat.ST_MODE] | stat.S_IWUSR) + subprocess.check_output(("patchelf-uninative", "--set-interpreter", d.getVar("UNINATIVE_LOADER"), f), stderr=subprocess.STDOUT) + os.chmod(f, s[stat.ST_MODE]) + else: + bb.debug(2, "Interpreter was already set to %s in %s" % (d.getVar("UNINATIVE_LOADER"), f)) +}