diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2022-05-09 23:27:38 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2022-05-09 23:28:22 +0300 |
commit | 322e9fc9c6aafb1be6757915ca920b5170642aa7 (patch) | |
tree | 860b5f806d45e9fbdece0eee9efabd5b000b64b9 /poky/meta/classes | |
parent | e22d42c0b6ed325dcf25896e58673f23556171dd (diff) | |
download | openbmc-322e9fc9c6aafb1be6757915ca920b5170642aa7.tar.xz |
subtree updates
poky: 27de52e402..d84c73d1ef:
Alexander Kanavin (2):
glib: upgrade 2.72.0 -> 2.72.1
libxml2: update patch status
Carlos Rafael Giani (2):
gstreamer1.0-plugins-good: Fix libsoup dependency
gstreamer1.0: Minor documentation addition
Chen Qi (2):
cases/buildepoxy.py: fix typo
go.bbclass: disable the use of the default configuration file
Davide Gardenal (1):
create-spdx: delete virtual/kernel dependency to fix FreeRTOS build
Dmitry Baryshkov (2):
linux-firmware: correct license for ar3k firmware
arch-armv8-2a.inc: fix a typo in TUNEVALID variable
Henning Schild (1):
wic: do not use PARTLABEL for msdos partition tables
Khem Raj (7):
seatd: Disable overflow warning as error on ppc64/musl
musl: Fix build when usrmerge distro feature is enabled
gcompat: Fix build when usrmerge distro feature is enabled
libc-glibc: Use libxcrypt to provide virtual/crypt
qemu.bbclass: Extend ppc/ppc64 extra options
busybox: Use base_bindir instead of hardcoding /bin path
util-linux: Create u-a symlink for findfs utility
Naveen Saini (1):
gstreamer1.0-plugins-bad: drop patch
Nicolas Dechesne (1):
sanity: skip make 4.2.1 warning for debian
Paul Gortmaker (1):
install/devshell: Introduce git intercept script due to fakeroot issues
Peter Kjellerstedt (2):
terminal.py: Restore error output from Terminal
devshell.bbclass: Allow devshell & pydevshell to use the network
Pgowda (1):
glibc: ptest: Fix glibc-tests package issue
Rahul Kumar (1):
neard: Switch SRC_URI to git repo
Richard Purdie (2):
base: Drop git intercept
staging: Ensure we filter out ourselves
Ross Burton (5):
e2fsprogs: fix CVE-2022-1304
python3: ignore CVE-2015-20107
cve_check: skip remote patches that haven't been fetched when searching for CVE tags
subversion: upgrade to 1.14.2
bitbake.conf: mark all directories as safe for git to read
Russ Dill (2):
package.bbclass: Prevent perform_packagecopy from removing /sysroot-only
kernel-yocto.bbclass: Fixup do_kernel_configcheck usage of KMETA
wangmy (1):
apt: upgrade 2.4.4 -> 2.4.5
meta-openembedded: bb2b5b31a8..5357c7a40e:
Carlos Rafael Giani (1):
pipewire: Upgrade to version 0.3.50
Khem Raj (23):
crash: Fix build for mips target
tcsh: Do not install symlinks into /bin with usrmerge
arno-iptables-firewall: Do not use bitbake variable inside S
fluentbit: Fix build with usrmerge distro feature
tomoyo-tools: Define SBINDIR
tomoyo-tools: Drop md5sum
dietsplash: specify install rootdir
linux-atm: Add knob to root prefix
ufw: Fix build with usrmerge distro feature
klibc: Recognise --dyld-prefix clang option
mozjs: Use vendored icu on ppc/clang
boinc-client: Do not overwrite same file when using usrmerge
pam-ssh-agent-auth: Use specific versions of BSD licenses
fwupd: Enable build with musl
lirc: install systemd units only when using systemd distro feature
fluentbit: Disable systemd support when systemd distro feature is disabled
gtksourceview5: Allow wayland or x11
gtkmm3: Allow wayland or x11 in distro features
gparted: Allow wayland or x11 distro features
lirc: Delete systemd unit files on non systemd distros
atkmm: Allow build with wayland
pangomm: Allow building with wayland
boinc-client: Make script install not depend on host install paths
Mingli Yu (2):
crash: Upgrade to 8.0.0
makedumpfile: Upgrade to 1.7.1
Robert Yang (1):
libldb: Fix installed-vs-shipped and rebuild error
Willy Tu (1):
absil-cpp: Update SRC_URI to to the latest google internal sync
wangmy (11):
evince: upgrade 42.1 -> 42.2
gspell: upgrade 1.9.1 -> 1.10.0
gtksourceview5: upgrade 5.4.0 -> 5.4.1
libadwaita: upgrade 1.1.0 -> 1.1.1
nautilus: upgrade 42.0 -> 42.1.1
htpdate: upgrade 1.3.3 -> 1.3.4
hexedit: upgrade 1.5 -> 1.6
lsscsi: upgrade 0.31 -> 0.32
libencode-perl: upgrade 3.16 -> 3.17
libextutils-cppguess-perl: upgrade 0.23 -> 0.26
libtest-harness-perl: upgrade 3.42 -> 3.44
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I5475712642467a1ecb4d9cf2c93510a40eb7bf24
Diffstat (limited to 'poky/meta/classes')
-rw-r--r-- | poky/meta/classes/create-spdx.bbclass | 2 | ||||
-rw-r--r-- | poky/meta/classes/devshell.bbclass | 4 | ||||
-rw-r--r-- | poky/meta/classes/go.bbclass | 1 | ||||
-rw-r--r-- | poky/meta/classes/kernel-yocto.bbclass | 14 | ||||
-rw-r--r-- | poky/meta/classes/package.bbclass | 8 | ||||
-rw-r--r-- | poky/meta/classes/qemu.bbclass | 6 | ||||
-rw-r--r-- | poky/meta/classes/sanity.bbclass | 2 | ||||
-rw-r--r-- | poky/meta/classes/staging.bbclass | 2 |
8 files changed, 20 insertions, 19 deletions
diff --git a/poky/meta/classes/create-spdx.bbclass b/poky/meta/classes/create-spdx.bbclass index 47a8764bf0..37b6b569a1 100644 --- a/poky/meta/classes/create-spdx.bbclass +++ b/poky/meta/classes/create-spdx.bbclass @@ -35,8 +35,6 @@ SPDX_SUPPLIER[doc] = "The SPDX PackageSupplier field for SPDX packages created f is the contact information for the person or organization who is doing the \ build." -do_image_complete[depends] = "virtual/kernel:do_create_spdx" - def extract_licenses(filename): import re diff --git a/poky/meta/classes/devshell.bbclass b/poky/meta/classes/devshell.bbclass index 62dc958d9a..247d04478c 100644 --- a/poky/meta/classes/devshell.bbclass +++ b/poky/meta/classes/devshell.bbclass @@ -2,6 +2,8 @@ inherit terminal DEVSHELL = "${SHELL}" +PATH:prepend:task-devshell = "${COREBASE}/scripts/git-intercept:" + python do_devshell () { if d.getVarFlag("do_devshell", "manualfakeroot"): d.prependVar("DEVSHELL", "pseudo ") @@ -21,6 +23,7 @@ addtask devshell after do_patch do_prepare_recipe_sysroot DEVSHELL_STARTDIR ?= "${S}" do_devshell[dirs] = "${DEVSHELL_STARTDIR}" do_devshell[nostamp] = "1" +do_devshell[network] = "1" # devshell and fakeroot/pseudo need careful handling since only the final # command should run under fakeroot emulation, any X connection should @@ -154,3 +157,4 @@ python do_pydevshell() { addtask pydevshell after do_patch do_pydevshell[nostamp] = "1" +do_pydevshell[network] = "1" diff --git a/poky/meta/classes/go.bbclass b/poky/meta/classes/go.bbclass index 9c4c92bffd..f3d83febbf 100644 --- a/poky/meta/classes/go.bbclass +++ b/poky/meta/classes/go.bbclass @@ -67,6 +67,7 @@ GO_INSTALL_FILTEROUT ?= "${GO_IMPORT}/vendor/" B = "${WORKDIR}/build" export GOPATH = "${B}" +export GOENV = "off" export GOTMPDIR ?= "${WORKDIR}/build-tmp" GOTMPDIR[vardepvalue] = "" diff --git a/poky/meta/classes/kernel-yocto.bbclass b/poky/meta/classes/kernel-yocto.bbclass index 1d5a8cdf29..4cb638864c 100644 --- a/poky/meta/classes/kernel-yocto.bbclass +++ b/poky/meta/classes/kernel-yocto.bbclass @@ -521,15 +521,15 @@ python do_config_analysis() { python do_kernel_configcheck() { import re, string, sys, subprocess - # if KMETA isn't set globally by a recipe using this routine, we need to - # set the default to 'meta'. Otherwise, kconf_check is not passed a valid - # meta-series for processing - kmeta = d.getVar("KMETA") or "meta" - if not os.path.exists(kmeta): - kmeta = subprocess.check_output(['kgit', '--meta'], cwd=d.getVar('S')).decode('utf-8').rstrip() - s = d.getVar('S') + # if KMETA isn't set globally by a recipe using this routine, use kgit to + # locate or create the meta directory. Otherwise, kconf_check is not + # passed a valid meta-series for processing + kmeta = d.getVar("KMETA") + if not kmeta or not os.path.exists('{}/{}'.format(s,kmeta)): + kmeta = subprocess.check_output(['kgit', '--meta'], cwd=d.getVar('S')).decode('utf-8').rstrip() + env = os.environ.copy() env['PATH'] = "%s:%s%s" % (d.getVar('PATH'), s, "/scripts/util/") env['LD'] = d.getVar('KERNEL_LD') diff --git a/poky/meta/classes/package.bbclass b/poky/meta/classes/package.bbclass index e71daafe94..44fbc32df6 100644 --- a/poky/meta/classes/package.bbclass +++ b/poky/meta/classes/package.bbclass @@ -422,7 +422,6 @@ def splitstaticdebuginfo(file, dvar, dv, d): # return a mapping of files:debugsources import stat - import shutil src = file[len(dvar):] dest = dv["staticlibdir"] + os.path.dirname(src) + dv["staticdir"] + "/" + os.path.basename(src) + dv["staticappend"] @@ -807,15 +806,10 @@ python perform_packagecopy () { dest = d.getVar('D') dvar = d.getVar('PKGD') - # Remove ${D}/sysroot-only if present - sysroot_only = os.path.join(dest, 'sysroot-only') - if cpath.exists(sysroot_only) and cpath.isdir(sysroot_only): - shutil.rmtree(sysroot_only) - # Start by package population by taking a copy of the installed # files to operate on # Preserve sparse files and hard links - cmd = 'tar -cf - -C %s -p -S . | tar -xf - -C %s' % (dest, dvar) + cmd = 'tar --exclude=./sysroot-only -cf - -C %s -p -S . | tar -xf - -C %s' % (dest, dvar) subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT) # replace RPATHs for the nativesdk binaries, to make them relocatable diff --git a/poky/meta/classes/qemu.bbclass b/poky/meta/classes/qemu.bbclass index 01a7b86ae1..7493ac34d4 100644 --- a/poky/meta/classes/qemu.bbclass +++ b/poky/meta/classes/qemu.bbclass @@ -64,4 +64,8 @@ QEMU_EXTRAOPTIONS_ppc64e5500 = " -cpu e500mc" QEMU_EXTRAOPTIONS_ppce6500 = " -cpu e500mc" QEMU_EXTRAOPTIONS_ppc64e6500 = " -cpu e500mc" QEMU_EXTRAOPTIONS_ppc7400 = " -cpu 7400" -QEMU_EXTRAOPTIONS:powerpc64le = " -cpu POWER8" +QEMU_EXTRAOPTIONS_powerpc64le = " -cpu POWER9" +# Some packages e.g. fwupd sets PACKAGE_ARCH = MACHINE_ARCH and uses meson which +# needs right options to usermode qemu +QEMU_EXTRAOPTIONS_qemuppc = " -cpu 7400" +QEMU_EXTRAOPTIONS_qemuppc64 = " -cpu POWER9" diff --git a/poky/meta/classes/sanity.bbclass b/poky/meta/classes/sanity.bbclass index c385d92e8b..c72a7b3ed3 100644 --- a/poky/meta/classes/sanity.bbclass +++ b/poky/meta/classes/sanity.bbclass @@ -470,7 +470,7 @@ def check_make_version(sanity_data): if bb.utils.vercmp_string_op(version, "4.2.1", "=="): distro = oe.lsb.distro_identifier() - if "ubuntu" in distro: + if "ubuntu" in distro or "debian" in distro: return None return "make version 4.2.1 is known to have issues on Centos/OpenSUSE and other non-Ubuntu systems. Please use a buildtools-make-tarball or a newer version of make.\n" return None diff --git a/poky/meta/classes/staging.bbclass b/poky/meta/classes/staging.bbclass index ab827766be..9fc8f4f283 100644 --- a/poky/meta/classes/staging.bbclass +++ b/poky/meta/classes/staging.bbclass @@ -651,7 +651,7 @@ python target_add_sysroot_deps () { taskdepdata = d.getVar("BB_TASKDEPDATA", False) deps = {} for dep in taskdepdata.values(): - if dep[1] == "do_populate_sysroot" and not dep[0].endswith(("-native", "-initial")) and "-cross-" not in dep[0]: + if dep[1] == "do_populate_sysroot" and not dep[0].endswith(("-native", "-initial")) and "-cross-" not in dep[0] and dep[0] != pn: deps[dep[0]] = dep[6] d.setVar("HASHEQUIV_EXTRA_SIGDATA", "\n".join("%s: %s" % (k, deps[k]) for k in sorted(deps.keys()))) |