diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2022-05-01 14:36:13 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2022-05-01 14:37:37 +0300 |
| commit | e22d42c0b6ed325dcf25896e58673f23556171dd (patch) | |
| tree | 92a75887acd8bb560b5e5357f846a81e1f3868db | |
| parent | d541ec52554ae60b0d5903cccf97905bcaaf209e (diff) | |
| download | openbmc-e22d42c0b6ed325dcf25896e58673f23556171dd.tar.xz | |
subtree updates
poky: 30b38d9cb9..27de52e402:
Abongwa Amahnui Bonalais (2):
documentation/brief-yoctoprojectqs: add directory for local.conf
dev-manual: add command used to add the signed-off-by line.
Alex Kiernan (1):
kernel: Delete unused KERNEL_LOCALVERSION variable
Alexander Kanavin (4):
webkitgtk: update 2.34.6 -> 2.36.0
epiphany: upgrade 41.3 -> 42.0
itstool: correct upstream version check
webkitgtk: adjust patch status
Bruce Ashfield (2):
linux-yocto-dev: update to v5.18+
lttng-modules: support kernel 5.18+
Davide Gardenal (1):
create-spdx: fix error when symlink cannot be created
Ferry Toth (2):
apt: add apt selftest to test signed package feeds
package_manager: fix missing dependency on gnupg when signing deb package feeds
Jon Mason (2):
linux-yocto: Remove unnecessary, commented out qemuarm entry
qemuarm64: use virtio pci interfaces
Kai Kang (1):
update_udev_hwdb: fix multilib issue with systemd
Khem Raj (8):
webkitgtk: Add missing header locale.h
python3: Do not detect multiarch when cross compiling
kernel-devsrc: Check for gen_vdso_offsets.sh before copying on riscv
babeltrace: Disable warnings as errors
xserver-xorg: Fix build with gcc12
systemtap: Fix build with gcc-12
gnupg: Disable FORTIFY_SOURCES on mips
mdadm: Drop clang specific cflags
Konrad Weihmann (11):
kern-tools-native: add missing license
gmp: add missing COPYINGv3
itstool: add missing COPYING.GPL3
libcap: add pam_cap license
libsdl2: fix license
libidn2: add Unicode-DFS-2016 license
gettext: add MIT conditional as license
python3-pip: correct license
cmake: add missing licenses
git: correct license
ncurses: use COPYING file
Lee Chee Yang (1):
migration-guides: release-notes-4.0: update 'Repositories / Downloads' section
Martin Jansa (1):
systemd-boot: remove outdated EFI_LD comment
Michael Halstead (2):
releases: update for yocto 4.0
set_versions: update for 4.0 release
Michael Opdenacker (1):
migration-guides: release-notes-4.0: mention LTS release
Nicolas Dechesne (1):
migration-guides: stop including documents with ".. include"
Olaf Mandel (1):
bitbake: fetch2/git: canonicalize ids in generated tarballs
Paul Eggleton (9):
migration-3.4: add missing entry on EXTRA_USERS_PARAMS
ref-manual: add a note about hard-coded passwords
ref-manual: mention wildcarding support in INCOMPATIBLE_LICENSE
ref-manual: add mention of vendor filtering to CVE_PRODUCT
ref-manual: add KERNEL_DEBUG_TIMESTAMPS
ref-manual: add empty-dirs QA check and QA_EMPTY_DIRS*
migration-guides: complete migration guide for 4.0
migration-guides: add release notes for 4.0
ref-manual: add ZSTD_THREADS
Paulo Neves (1):
selftest/lic_checksum: Add test for filename containing space
Pavel Zhukov (1):
bitbake: fetch2: Add GIT_SSH_COMMAND to the list of exports
Peter Kjellerstedt (4):
bitbake: pyinotify.py: Simplify identification of which event has occurred
shadow: Disable the use of syslog() for the native tools
u-boot: Correct the SRC_URI
u-boot: Inherit pkgconfig
Quentin Schulz (15):
docs: sphinx-static: switchers.js.in: remove duplicate for outdated versions
docs: set_versions.py: add information about obsolescence of a release
docs: sphinx-static: switchers.js.in: improve obsolete version detection
docs: set_versions.py: fix latest release of a branch being shown twice in switchers.js
docs: set_versions.py: fix latest version of an active release shown as obsolete
docs: update Bitbake objects.inv location for master branch
docs: set_versions.py: mark as obsolete only branches and old tags from obsolete releases
docs: sphinx-static: switchers.js.in: rename all_versions to switcher_versions
docs: sphinx-static: switchers.js.in: fix broken switcher for branches
docs: sphinx-static: switchers.js.in: do not mark branches as outdated
docs: conf.py: fix cve extlinks caption for sphinx <4.0
docs: ref-manual: variables: add hashed password example in EXTRA_USERS_PARAMS
docs: migration-guides: migration-3.4: mention that hardcoded password are supported if hashed
docs: migration-guides: release-notes-4.0: fix risc-v typo
docs: migration-guides: release-notes-4.0: replace kernel placeholder with correct recipe name
Ricardo Salveti (1):
bitbake: fetch2/crate: fix logger.debug line
Richard Purdie (25):
qemu: Add fix for CVE-2022-1050
tiff: Add marker for CVE-2022-1056 being fixed
git: Ignore CVE-2022-24975
Revert "adwaita-icon-theme: upgrade 41.0 -> 42.0"
migration-guide: Kirkstone is now 4.0
local.conf.sample: Update for 4.0 in sstate url
externalsrc/devtool: Fix to work with fixed export funcition flags handling
sanity: Show a warning that make 4.2.1 is buggy on non-ubuntu systems
runqemu: Allow auto detection of the correct graphics options
bitbake: checksum: Allow spaces in URI filenames
bitbake: ast: Improve function flags handling for EXPORT_FUNCTIONS
rxvt-unicode: Fix icon name
puzzles: Drop broken icon
build-appliance-image: Update to master head revision
build-appliance-image: Update to master head revision
bluez5: Add fix for startup issues under systemd
build-appliance-image: Update to master head revision
alsa-tools: Ensure we install correctly
libxshmfence: Correct LICENSE to HPND
bitbake.conf: Correct BB_SIGNATURE_EXCLUDE_FLAGS
git: Upgrade 2.35.1 -> 2.35.2
build-appliance-image: Update to master head revision
build-appliance: Switch to kirkstone branch
ref-manual: Add XZ_THREADS and XZ_MEMLIMIT
buildtools-tarball: Only add cert envvars if certs are included
Schmidt, Adriaan (1):
bitbake: bitbake-diffsigs: make finding of changed signatures more robust
Scott Murray (1):
runqemu: Do not auto detect graphics if publicvnc is specified
Steve Sakoman (2):
busybox: fix CVE-2022-28391
lua: fix CVE-2022-28805
wangmy (5):
linux-firmware: upgrade 20220310 -> 20220411
libsoup: upgrade 3.0.5 -> 3.0.6
apt: upgrade 2.4.3 -> 2.4.4
libusb1: upgrade 1.0.25 -> 1.0.26
libgit2: upgrade 1.4.2 -> 1.4.3
zhengruoqin (3):
wireless-regdb: upgrade 2022.02.18 -> 2022.04.08
git: upgrade 2.35.2 -> 2.35.3
ruby: upgrade 3.1.1 -> 3.1.2
meta-openembedded: 1888971b1f..bb2b5b31a8:
Alex Kiernan (2):
audit: Upgrade 3.0.6 -> 3.0.7
mosh: Drop perl dependencies from server
Andreas Müller (21):
libnma: upgrade 1.8.36 -> 1.8.38
gnome-control-center: upgrade 41.2 -> 42.0
gnome-flashback: upgrade 3.42.1 -> 3.44.0
gnome-panel: upgrade 3.42.0 -> 3.44.0
gnome-session: upgrade 41.3 -> 42.0
gnome-shell-extensions: upgrade 41.1 -> 42.0
gthumb: upgrade 3.12.0 -> 3.12.2
ibus: upgrade 1.5.23+ -> 1.5.26
libportal: upgrade 0.5 -> 0.6
network-manager-applet: upgrade 1.24.0 -> 1.24.0
sysprof: upgrade 3.42.1 -> 3.44.0
gnome-shell: fix bluetooth PACKAGECONFIG
packagegroup-gnome-desktop: replace gnome-bluetooth by gnome-bluetooth4
gnome-bluetooth: avoid clashes with gnome-bluetooth4
gnome-bluetooth: rename recipes to avoid suffix in future
gnome-bluetooth: Add PACKAGECONFIG pulseaudio and filter by distro-feature
gnome-backgrounds: upgrade 41.0 -> 42.0
gnome-settings-daemon: upgrade 41.0 -> 42.1
libgweather4: Fix introspection build
gjs: Add cairo to DEPENDS unconditionally
gnome-shell-extensions: Stop copying gnome-classic session to wayland
Andrej Valek (1):
poco: upgrade 1.11.1 -> 1.11.2
Armin Kuster (1):
meta-openemnedded: Add myself as kirkstone maintainer
Ben Fekih, Hichem (1):
sdbus-c++-libsystemd: bugfix dev package is not installed
Changqing Li (1):
drbd-utils: fix for usrmerge
Dmitry Baryshkov (1):
gpsd: split python utils from gps-utils
Jan Vermaete (1):
netdata: version bump 1.33.1 -> 1.34.1
KARN JYE LAU (1):
icewm:include imlib2-loaders package
Kai Kang (1):
python3-blivetgui: use symbolic list-add and edit- icons
Khem Raj (31):
dbus-cxx: Include missing <utility> header
safec: Upgrade to 3.7.1
mongodb: Update to 4.4.13
libkcapi: Upgrade to 1.4.0
libpfm4: Remove -Werror from compiler flags
parallel-deqp-runner: Fix build with gcc 12
glmark2: Fix build with gcc12
memcached: Upgrade to 1.6.15
tvheadend: Update to latest trunk
ot-br-posix: Disable Wsign-compare for clang
opensaf: Fix build with gcc 12
boost-sml: Disable examples
mpich: Add new directory modules/hwloc/config to search path
gnulib: Do not use git operations to install the sources
sysprof: Fix build to work with llvm libunwind
linuxconsole: Fix makefile issue found with clang
mongodb: Fix aarch64 build with gcc12
libcereal: Link libatomics with gcc as well
wpantund: Add missing dependency on boost
gimp: Disable vector icons on 32bit systems
mozjs-91: Upgrade to 91.8.0
mozjs-78: Switch to system libicu
nodejs: Upgrade to 16.14.2
ot-br-posix: Fix build with gcc
dlt-daemon: Fix build on rv32/rv64
grpc: Fix build with rv32/rv64
ltrace: Fix build on ppc64 with gcc12
opencv: Fix build with gcc-12 on ppc64
mozjs-91: Disable strip
mozjs-91: Add option to use system ICU
sysprof: Remove libunwind on rv32
Leon Anavi (2):
python3-bitstruct: Upgrade 8.13.0 -> 8.14.0
python3-marshmallow: Upgrade 3.14.1 -> 3.15.0
Marguet, Nicolas (1):
openjpeg: fix CVE-2022-1122
Mingli Yu (2):
tgt: move from meta-openstack
libconfig-general-perl: move from meta-openstack
Oleksandr Kravchuk (4):
htpdate: update to 1.3.3
redis: upgrade to 7.0-rc3
pkcs11-helper: fix PV
python3-imgtool: update to 1.9.0
Peter Kjellerstedt (3):
gpsd: Only copy the Python files if they are created
poppler: Support building for native
gpsd: Correct the creation of the gps-utils-python package
Preeti Sachan (1):
gnuplot: inherit pkgconfig
Suhrid_S (1):
clinfo: Upgrade 2.2.18.04.06 -> 3.0.21.02.21
Trevor Gamblin (2):
nftables: add ptest
phoronix-test-suite: upgrade 10.8.1 -> 10.8.2
Xu Huan (10):
python3-redis: upgrade 4.2.1 -> 4.2.2
python3-sentry-sdk: upgrade 1.5.7 -> 1.5.8
python3-sqlalchemy: upgrade 1.4.34 -> 1.4.35
python3-graphviz: upgrade 0.19.1 -> 0.19.2
python3-kivy: upgrade 2.0.0 -> 2.1.0
python3-aenum: upgrade 3.1.8 -> 3.1.11
python3-aws-iot-device-sdk-python: upgrade 1.5.1 -> 1.5.2
python3-cmd2: upgrade 2.4.0 -> 2.4.1
python3-django: upgrade 2.2.27 -> 2.2.28
python3-imageio: upgrade 2.16.1 -> 2.17.0
Yi Zhao (4):
frr: add recipe
libldb: upgrade 2.3.2 -> 2.3.3
samba: upgrade 4.14.12 -> 4.14.13
frr: install correct initscript
wangmy (31):
nbdkit: upgrade 1.25.7 -> 1.30.2
icewm: upgrade 2.9.0 -> 2.9.6
lapack: upgrade 3.9.0 -> 3.10.0
libbpf: upgrade 0.5.0 -> 0.7.0
libmtp: upgrade 1.1.18 -> 1.1.19
logwatch: upgrade 7.5.3 -> 7.6
mpich: upgrade 3.4.3 -> 4.0.2
libvpx: upgrade 1.8.2 -> 1.11.0
linuxconsole: upgrade 1.7.0 -> 1.7.1
mercurial: upgrade 5.5 -> 6.1
ocl-icd: upgrade 2.3.0 -> 2.3.1
octave: upgrade 6.4.0 -> 7.1.0
rdma-core: upgrade 39.0 -> 40.0
pam-plugin-ldapdb: upgrade 1.3 -> 1.3.1
pax-utils: upgrade 1.2.2 -> 1.3.3
pcsc-tools: upgrade 1.5.8 -> 1.6.0
pegtl: upgrade 3.2.1 -> 3.2.5
qpdf: upgrade 10.5.0 -> 10.6.3
s-nail: upgrade 14.9.23 -> 14.9.24
smcroute: upgrade 2.5.4 -> 2.5.5
squashfs-tools-ng: upgrade 1.0.2 -> 1.1.4
st: upgrade 0.8.4 -> 0.8.5
tracker: upgrade 3.2.1 -> 3.3.0
thingsboard-gateway: upgrade 2.8 -> 2.9
thrift: upgrade 0.14.2 -> 0.16.0
toybox: upgrade 0.8.5 -> 0.8.6
unbound: upgrade 1.13.2 -> 1.15.0
twm: upgrade 1.0.11 -> 1.0.12
unixodbc: upgrade 2.3.7 -> 2.3.9
xterm: upgrade 368 -> 372
python3-cppy: upgrade 1.2.0 -> 1.2.1
zhengruoqin (5):
python3-google-api-python-client: upgrade 2.42.0 -> 2.43.0
python3-googleapis-common-protos: upgrade 1.54.0 -> 1.56.0
python3-nocaselist: upgrade 1.0.4 -> 1.0.5
python3-pylint: upgrade 2.13.2 -> 2.13.5
python3-nocasedict: upgrade 1.0.2 -> 1.0.3
meta-raspberrypi: 83f5577d8d..0135a02ea5:
Andrei Gherzan (19):
raspberrypi-firmware: Update to 20220331
linux-raspberrypi: Update 5.15 recipe to 5.15.34
linux-raspberrypi: Update 5.10 recipe to 5.10.110
bcm2835: Update to 1.71
pi-blaster: Uprev the recipe
linux-firmware-rpidistro: Update to 20210315-3+rpt4
raspi-gpio: Uprev revision to current HEAD of master branch
python3-rtimu: Upgrade to 7.2.1
rpio: Upgrade to 0.10.1
python3-adafruit-pureio: Uprade to 1.1.8
python3-adafruit-platformdetect: Upgrade to 3.22.1
python3-adafruit-circuitpython-register: Upgrade to 1.9.8
rpi-basic-image: Drop image
rpi-hwup-image: Drop image
packagegroup-rpi-test: Include more packages
ci: Use test builds with the test image
docs: Drop mention of deprecated images
docs: Bump copyright year
rpi-base.inc: Add MCP3008 ADC overlay
Davide Gardenal (1):
bluez-firmware-rpidistro: Add compatibility to oe-core/create-spdx
Jan Vermaete (1):
docs: link to latest documentation of kas
Khem Raj (1):
python3-sense-hat: Use specific BSD license
Meng Li (1):
u-boot: Remove the randundant patch
meta-security: 498ca39cd6..93f2146211:
Anton Antonov (1):
Upgrade parsec-service to 1.0.0 and parsec-tool to 0.5.2
Joe Slater (1):
LICENSE: update to SPDX standard names
Petr Gotthard (6):
tpm2-tools: fix missing version number
tpm2-openssl: update to 1.1.0
tpm2-tss: update to 3.2.0
tpm2-abrmd: update to 2.4.1
tpm2-tss-engine: fix version string and build with openssl 3.0
tpm2-pkcs11: update to 1.8.0
Ranjitsinh Rathod (1):
samhain.inc: Correct LICENSE to GPL-2.0-only
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I65c1aa83e6068b57ba668bc876919f77eea16aeb
370 files changed, 5337 insertions, 4432 deletions
diff --git a/meta-openembedded/README b/meta-openembedded/README index 7318f09cdb..82f2e9699a 100644 --- a/meta-openembedded/README +++ b/meta-openembedded/README @@ -1,6 +1,6 @@ Collection of layers for the OE-core universe -Main layer maintainer: Khem Raj <raj.khem@gmail.com> +Main layer maintainer: Armin Kuster <akuster808@gmail.com> This repository is a collection of layers to suppliment OE-Core with additional packages, Each layer have designated maintainer diff --git a/meta-openembedded/meta-filesystems/README b/meta-openembedded/meta-filesystems/README index 78a4429ce2..a1cf6d99ba 100644 --- a/meta-openembedded/meta-filesystems/README +++ b/meta-openembedded/meta-filesystems/README @@ -11,26 +11,26 @@ This layer depends on: URI: git://git.openembedded.org/openembedded-core layers: meta - branch: master + branch: kirkstone URI: git://git.openembedded.org/meta-openembedded layers: meta-oe - branch: master + branch: kirkstone Patches ======= Please submit any patches against the filesystems layer to the OpenEmbedded development mailing list (openembedded-devel@lists.openembedded.org) -with '[meta-filesystems]' in the subject. +with '[meta-filesystems][kirkstone]' in the subject. -Layer maintainer: Khem Raj <raj.khem@gmail.com> +Layer maintainer: Armin Kuster <akuster808@gmail.com> When sending single patches, please use something like: git send-email -1 -M \ --to openembedded-devel@lists.openembedded.org \ - --subject-prefix='meta-filesystems][PATCH' + --subject-prefix='meta-filesystems][kirkstone][PATCH' Table of Contents diff --git a/meta-openembedded/meta-gnome/README b/meta-openembedded/meta-gnome/README index fbb0d72476..99ce43a332 100644 --- a/meta-openembedded/meta-gnome/README +++ b/meta-openembedded/meta-gnome/README @@ -3,14 +3,14 @@ Dependencies This layer depends on: URI: git://git.openembedded.org/openembedded-core -branch: master +branch: kirkstone URI: git://git.openembedded.org/meta-openembedded -branch: master +branch: kirkstone -Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-gnome]' in the subject' +Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-gnome][kirkstone]' in the subject' When sending single patches, please using something like: -git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-gnome][PATCH' +git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-gnome][kirkstone][PATCH' -Layer maintainer: Andreas Müller <schnitzeltony@gmail.com> +Layer maintainer: Armin Kuster <akuster808@gmail.com> diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.36.bb b/meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.38.bb index fff7d25d8d..75c704bc27 100644 --- a/meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.36.bb +++ b/meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.38.bb @@ -10,7 +10,7 @@ inherit gnomebase gobject-introspection gtk-doc gettext vala features_check REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG','gcr','x11','',d)}" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -SRC_URI[archive.sha256sum] = "d99415f4cdff642230019ec5cdd2b1fbf1ec550a8ae865219f75482a642b7b7a" +SRC_URI[archive.sha256sum] = "5ed93eae18456ff5a8a4f408178c1ee198dc8d3a46c65f9075b101916e64e8b4" PACKAGECONFIG ?= "gcr iso_codes mobile_broadband_provider_info" PACKAGECONFIG[gcr] = "-Dgcr=true,-Dgcr=false,gcr" diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet/0001-meson.build-address-meson-0.61-failures.patch b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet/0001-meson.build-address-meson-0.61-failures.patch deleted file mode 100644 index 4a5cd5b81b..0000000000 --- a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet/0001-meson.build-address-meson-0.61-failures.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ab27e6e6c839e1c65e4059a06982453a7aa1b6b3 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex@linutronix.de> -Date: Fri, 21 Jan 2022 22:34:09 +0100 -Subject: [PATCH] meson.build: address meson 0.61 failures - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/network-manager-applet/-/merge_requests/107] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - meson.build | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/meson.build b/meson.build -index 7ab613c8..688a7311 100644 ---- a/meson.build -+++ b/meson.build -@@ -253,7 +253,6 @@ desktop_file_validate = find_program('desktop-file-validate', required: false) - - foreach desktop: desktop_files - i18n.merge_file( -- desktop + '-desktop', - input: desktop + '.desktop.in', - output: desktop + '.desktop', - install: true, -@@ -274,7 +273,6 @@ endforeach - appdata = 'nm-connection-editor.appdata.xml' - - i18n.merge_file( -- 'desktop', - input: appdata + '.in', - output: appdata, - install: true, diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.24.0.bb b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.26.0.bb index c0667b5bb1..8046b139c0 100644 --- a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.24.0.bb +++ b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.26.0.bb @@ -9,8 +9,7 @@ inherit features_check gnomebase gsettings gtk-icon-cache gettext REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI += " file://0001-meson.build-address-meson-0.61-failures.patch" -SRC_URI[archive.sha256sum] = "b9f4bca5d0352718e07b7385fb195a9bbc8fd686b7959b74137854d52aab9c58" +SRC_URI[archive.sha256sum] = "69611b29064adbd57395fe3e51a9ebde1ea794615f776900453a2bbe3d8cddfd" # We don't not have ubuntu's appindicator (yet?) EXTRA_OEMESON = "-Dappindicator=no" diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.30.bb b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.30.bb index 1155e0eec3..a73de1e3ff 100644 --- a/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.30.bb +++ b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.30.bb @@ -51,11 +51,7 @@ EXTRA_OECONF = "--disable-python \ --disable-check-update \ --without-wmf" -EXTRA_OECONF:append:toolchain-clang:arm = " --disable-vector-icons" -EXTRA_OECONF:append:toolchain-clang:riscv32 = " --disable-vector-icons" -EXTRA_OECONF:append:toolchain-clang:mips = " --disable-vector-icons" -EXTRA_OECONF:append:toolchain-clang:x86 = " --disable-vector-icons" -EXTRA_OECONF:append:powerpc = " --disable-vector-icons" +EXTRA_OECONF += "${@oe.utils.conditional('SITEINFO_BITS', '32', ' --disable-vector-icons', '', d)}" do_configure:append() { find ${B} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.72.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.72.0.bb index 9e6fc45db3..95e4bd5cc6 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.72.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.72.0.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8dcea832f6acf45d856abfeb2d51ec48" GNOMEBASEBUILDCLASS = "meson" -DEPENDS = "mozjs-91" +DEPENDS = "mozjs-91 cairo" inherit gnomebase gsettings gobject-introspection vala gettext features_check upstream-version-is-even pkgconfig diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_41.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_41.0.bb deleted file mode 100644 index 289cc9ed5e..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_41.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "GNOME wallpapers" -LICENSE = "GPL-2.0-only & CC-BY-2.0 & CC-BY-SA-2.0 & CC-BY-SA-3.0" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=75859989545e37968a99b631ef42722e \ - file://COPYING_CCBY2;md5=effd72660912b727dfa9722cb295d7be \ - file://COPYING_CCBYSA2;md5=4737b7833b3212fdf30257f056ef3e64 \ - file://COPYING_CCBYSA3;md5=b52fb0a6df395efb7047cb6fc56bfd7e \ -" - -SECTION = "x11/gnome" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gettext allarch - -SRC_URI[archive.sha256sum] = "1da1ac0d261bedf0fcd2c85b480bc65505e23cf51f1143126c0d37717e693145" - -FILES:${PN} += " \ - ${datadir}/backgrounds \ - ${datadir}/gnome-background-properties \ -" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_42.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_42.0.bb new file mode 100644 index 0000000000..d700c1bcb0 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_42.0.bb @@ -0,0 +1,16 @@ +SUMMARY = "GNOME wallpapers" +LICENSE = "CC-BY-SA-3.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=b52fb0a6df395efb7047cb6fc56bfd7e" + +SECTION = "x11/gnome" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gettext allarch + +SRC_URI[archive.sha256sum] = "4c7fe1a09f459c5f77189a5982524fce05d888944955d679910f234606c1295d" + +FILES:${PN} += " \ + ${datadir}/backgrounds \ + ${datadir}/gnome-background-properties \ +" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0001-build-Fix-build-for-newer-versions-of-meson.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth3/0001-build-Fix-build-for-newer-versions-of-meson.patch index 16c87b6a63..16c87b6a63 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0001-build-Fix-build-for-newer-versions-of-meson.patch +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth3/0001-build-Fix-build-for-newer-versions-of-meson.patch diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.5.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth3_3.34.5.bb index 57fe74495d..e2a885b1fb 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.5.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth3_3.34.5.bb @@ -8,6 +8,9 @@ SECTION = "x11/gnome" DEPENDS = "udev gtk+3 libnotify libcanberra bluez5" +GNOMEBN = "gnome-bluetooth" +S = "${WORKDIR}/${GNOMEBN}-${PV}" + GNOMEBASEBUILDCLASS = "meson" GTKDOC_MESON_OPTION = "gtk_doc" @@ -22,4 +25,16 @@ SRC_URI += " file://0001-build-Fix-build-for-newer-versions-of-meson.patch" SRC_URI[archive.md5sum] = "d83faa54abaf64bb40b5313bc233e74e" SRC_URI[archive.sha256sum] = "6c949e52c8becc2054daacd604901f66ce5cf709a5fa91c4bb7cacc939b53ea9" +# avoid clashes with gnome-bluetooth +do_install:append() { + # just bluetooth-sendto / bluetooth-sendto.desktop only + rm -rf ${D}${bindir} + rm -rf ${D}${datadir}/applications +} + +FILES:${PN} += "${datadir}/gnome-bluetooth" + +# offer alternate bluetooth-sendto +RRECOMMENS:${PN} += "gnome-bluetooth" + RDEPENDS:${PN} += "bluez5" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth4_42.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.0.bb index 3fe2c35ef4..36fe9cf215 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth4_42.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.0.bb @@ -18,9 +18,6 @@ DEPENDS = " \ libadwaita \ " -GNOMEBN = "gnome-bluetooth" -S = "${WORKDIR}/${GNOMEBN}-${PV}" - GNOMEBASEBUILDCLASS = "meson" GTKDOC_MESON_OPTION = "gtk_doc" GTKIC_VERSION = "4" @@ -31,6 +28,17 @@ REQUIRED_DISTRO_FEATURES = "x11" SRC_URI[archive.sha256sum] = "3d1e2720673bc9a242619dc5d231fd6e776c18a49da29f43cdc433055adb0170" -RDEPENDS:${PN} += "bluez5" +BT_PULSE_PACKS = " \ + pulseaudio-lib-bluez5-util \ + pulseaudio-module-bluetooth-discover \ + pulseaudio-module-bluetooth-policy \ + pulseaudio-module-bluez5-device \ + pulseaudio-module-bluez5-discover \ +" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)}" +PACKAGECONFIG[pulseaudio] = ",,,${BT_PULSE_PACKS}" FILES:${PN} += "${datadir}/gnome-bluetooth-3.0" + +RDEPENDS:${PN} += "bluez5" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch index 8170f514ed..768ba54390 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch @@ -19,19 +19,19 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meson_options.txt b/meson_options.txt -index a347168..2cd8121 100644 +index dbca723..af0f871 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,4 @@ +option('oe_sysroot', type: 'string', value: '', description: 'Directory for OE-sysroot') - option('cheese', type: 'boolean', value: true, description: 'build with cheese webcam support') option('documentation', type: 'boolean', value: false, description: 'build documentation') option('ibus', type: 'boolean', value: true, description: 'build with IBus support') + option('privileged_group', type: 'string', value: 'wheel', description: 'name of group that has elevated permissions') diff --git a/panels/background/meson.build b/panels/background/meson.build -index bb34b69..f22722e 100644 +index 3634c47..459ccfe 100644 --- a/panels/background/meson.build +++ b/panels/background/meson.build -@@ -36,7 +36,7 @@ common_sources = [] +@@ -25,7 +25,7 @@ common_sources = [] enums = 'gdesktop-enums-types' enums_header = files( @@ -41,5 +41,5 @@ index bb34b69..f22722e 100644 ) -- -2.20.1 +2.34.1 diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-meson-drop-unused-argument-for-i18n.merge_file.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-meson-drop-unused-argument-for-i18n.merge_file.patch deleted file mode 100644 index 7a1180e682..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-meson-drop-unused-argument-for-i18n.merge_file.patch +++ /dev/null @@ -1,504 +0,0 @@ -From 90715329c277f21537eb5af86d8f222c4a2abd24 Mon Sep 17 00:00:00 2001 -From: Jan Beich <jbeich@FreeBSD.org> -Date: Fri, 7 Jan 2022 01:53:52 +0000 -Subject: [PATCH] meson: drop unused argument for i18n.merge_file() - -Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. - -panels/applications/meson.build:10:5: ERROR: Function does not take positional arguments. -panels/background/meson.build:10:5: ERROR: Function does not take positional arguments. -panels/camera/meson.build:10:5: ERROR: Function does not take positional arguments. -[...] - -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - panels/applications/meson.build | 1 - - panels/background/meson.build | 1 - - panels/bluetooth/meson.build | 1 - - panels/camera/meson.build | 1 - - panels/color/meson.build | 1 - - panels/datetime/meson.build | 2 -- - panels/default-apps/meson.build | 1 - - panels/diagnostics/meson.build | 1 - - panels/display/meson.build | 1 - - panels/info-overview/meson.build | 1 - - panels/keyboard/meson.build | 2 -- - panels/location/meson.build | 1 - - panels/lock/meson.build | 1 - - panels/microphone/meson.build | 1 - - panels/mouse/meson.build | 1 - - panels/multitasking/meson.build | 1 - - panels/network/meson.build | 1 - - panels/notifications/meson.build | 1 - - panels/online-accounts/meson.build | 1 - - panels/power/meson.build | 1 - - panels/printers/meson.build | 1 - - panels/region/meson.build | 1 - - panels/removable-media/meson.build | 1 - - panels/search/meson.build | 1 - - panels/sharing/meson.build | 2 -- - panels/sound/meson.build | 1 - - panels/thunderbolt/meson.build | 1 - - panels/universal-access/meson.build | 1 - - panels/usage/meson.build | 1 - - panels/user-accounts/meson.build | 2 -- - panels/wacom/meson.build | 1 - - panels/wwan/meson.build | 1 - - shell/appdata/meson.build | 1 - - shell/meson.build | 1 - - tests/interactive-panels/applications/meson.build | 1 - - 35 files changed, 39 deletions(-) - -diff --git a/panels/applications/meson.build b/panels/applications/meson.build -index d511bf6..bd4fd64 100644 ---- a/panels/applications/meson.build -+++ b/panels/applications/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type : 'desktop', - input : desktop_in, - output : desktop, -diff --git a/panels/background/meson.build b/panels/background/meson.build -index 730cf54..1f231b9 100644 ---- a/panels/background/meson.build -+++ b/panels/background/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/bluetooth/meson.build b/panels/bluetooth/meson.build -index c3fce74..4bed812 100644 ---- a/panels/bluetooth/meson.build -+++ b/panels/bluetooth/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/camera/meson.build b/panels/camera/meson.build -index 4f26118..bf2e727 100644 ---- a/panels/camera/meson.build -+++ b/panels/camera/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/color/meson.build b/panels/color/meson.build -index 742caf6..bb038cd 100644 ---- a/panels/color/meson.build -+++ b/panels/color/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/datetime/meson.build b/panels/datetime/meson.build -index 6568394..9bbdc7c 100644 ---- a/panels/datetime/meson.build -+++ b/panels/datetime/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -@@ -20,7 +19,6 @@ i18n.merge_file( - polkit = 'org.gnome.controlcenter.@0@.policy'.format(cappletname) - - i18n.merge_file( -- polkit, - input: polkit + '.in', - output: polkit, - po_dir: po_dir, -diff --git a/panels/default-apps/meson.build b/panels/default-apps/meson.build -index 6855006..2a24321 100644 ---- a/panels/default-apps/meson.build -+++ b/panels/default-apps/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/diagnostics/meson.build b/panels/diagnostics/meson.build -index fac9b4c..2f25c21 100644 ---- a/panels/diagnostics/meson.build -+++ b/panels/diagnostics/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/display/meson.build b/panels/display/meson.build -index 12f35cc..57bdfcf 100644 ---- a/panels/display/meson.build -+++ b/panels/display/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/info-overview/meson.build b/panels/info-overview/meson.build -index 2fe10b3..aa81c48 100644 ---- a/panels/info-overview/meson.build -+++ b/panels/info-overview/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/keyboard/meson.build b/panels/keyboard/meson.build -index a2ae026..ae71c94 100644 ---- a/panels/keyboard/meson.build -+++ b/panels/keyboard/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -@@ -45,7 +44,6 @@ xml_files = [ - - foreach file: xml_files - i18n.merge_file( -- file, - input: file + '.in', - output: file, - po_dir: po_dir, -diff --git a/panels/location/meson.build b/panels/location/meson.build -index bfc6e82..f4c835d 100644 ---- a/panels/location/meson.build -+++ b/panels/location/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/lock/meson.build b/panels/lock/meson.build -index 0661af4..18dbfb2 100644 ---- a/panels/lock/meson.build -+++ b/panels/lock/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/microphone/meson.build b/panels/microphone/meson.build -index e0847a4..bc7f73a 100644 ---- a/panels/microphone/meson.build -+++ b/panels/microphone/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/mouse/meson.build b/panels/mouse/meson.build -index 357aaae..7b46097 100644 ---- a/panels/mouse/meson.build -+++ b/panels/mouse/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/multitasking/meson.build b/panels/multitasking/meson.build -index 772b638..53fd0d8 100644 ---- a/panels/multitasking/meson.build -+++ b/panels/multitasking/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/network/meson.build b/panels/network/meson.build -index d7cd6e4..43a5690 100644 ---- a/panels/network/meson.build -+++ b/panels/network/meson.build -@@ -25,7 +25,6 @@ foreach name: panel_names - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/notifications/meson.build b/panels/notifications/meson.build -index df70261..1b04b24 100644 ---- a/panels/notifications/meson.build -+++ b/panels/notifications/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/online-accounts/meson.build b/panels/online-accounts/meson.build -index 82f1d56..6870977 100644 ---- a/panels/online-accounts/meson.build -+++ b/panels/online-accounts/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/power/meson.build b/panels/power/meson.build -index 0e3ea1d..1cafe2a 100644 ---- a/panels/power/meson.build -+++ b/panels/power/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/printers/meson.build b/panels/printers/meson.build -index ccce64c..042c67a 100644 ---- a/panels/printers/meson.build -+++ b/panels/printers/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/region/meson.build b/panels/region/meson.build -index 68b7f00..27bc5ff 100644 ---- a/panels/region/meson.build -+++ b/panels/region/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/removable-media/meson.build b/panels/removable-media/meson.build -index b51799a..fc07c48 100644 ---- a/panels/removable-media/meson.build -+++ b/panels/removable-media/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/search/meson.build b/panels/search/meson.build -index 39b076b..a4dd79d 100644 ---- a/panels/search/meson.build -+++ b/panels/search/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/sharing/meson.build b/panels/sharing/meson.build -index b3803bc..49dbb06 100644 ---- a/panels/sharing/meson.build -+++ b/panels/sharing/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -@@ -29,7 +28,6 @@ polkit_in = configure_file( - ) - - i18n.merge_file( -- polkit, - input: polkit_in, - output: polkit, - po_dir: po_dir, -diff --git a/panels/sound/meson.build b/panels/sound/meson.build -index fa0f128..18f75dd 100644 ---- a/panels/sound/meson.build -+++ b/panels/sound/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/thunderbolt/meson.build b/panels/thunderbolt/meson.build -index 53aa9b4..38ef294 100644 ---- a/panels/thunderbolt/meson.build -+++ b/panels/thunderbolt/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/universal-access/meson.build b/panels/universal-access/meson.build -index 5e225fe..d845e70 100644 ---- a/panels/universal-access/meson.build -+++ b/panels/universal-access/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/usage/meson.build b/panels/usage/meson.build -index 74f720e..6047ce0 100644 ---- a/panels/usage/meson.build -+++ b/panels/usage/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/user-accounts/meson.build b/panels/user-accounts/meson.build -index b8ee9d9..fa56aae 100644 ---- a/panels/user-accounts/meson.build -+++ b/panels/user-accounts/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -@@ -85,7 +84,6 @@ meson.add_install_script('sh', '-c', - polkit = 'org.gnome.controlcenter.@0@.policy'.format(cappletname) - - i18n.merge_file( -- polkit, - input: polkit + '.in', - output: polkit, - po_dir: po_dir, -diff --git a/panels/wacom/meson.build b/panels/wacom/meson.build -index 5f62220..88a9137 100644 ---- a/panels/wacom/meson.build -+++ b/panels/wacom/meson.build -@@ -30,7 +30,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type : 'desktop', - input : desktop_in, - output : desktop, -diff --git a/panels/wwan/meson.build b/panels/wwan/meson.build -index 8c1b02f..2ab238a 100644 ---- a/panels/wwan/meson.build -+++ b/panels/wwan/meson.build -@@ -11,7 +11,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type : 'desktop', - input : desktop_in, - output : desktop, -diff --git a/shell/appdata/meson.build b/shell/appdata/meson.build -index 3b36171..fdb8279 100644 ---- a/shell/appdata/meson.build -+++ b/shell/appdata/meson.build -@@ -1,7 +1,6 @@ - appdata = 'gnome-control-center.appdata.xml' - - i18n.merge_file( -- appdata, - input: appdata + '.in', - output: appdata, - po_dir: po_dir, -diff --git a/shell/meson.build b/shell/meson.build -index 89b9659..4667804 100644 ---- a/shell/meson.build -+++ b/shell/meson.build -@@ -23,7 +23,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type : 'desktop', - input : desktop_in, - output : desktop, -diff --git a/tests/interactive-panels/applications/meson.build b/tests/interactive-panels/applications/meson.build -index 2657f95..82eed4d 100644 ---- a/tests/interactive-panels/applications/meson.build -+++ b/tests/interactive-panels/applications/meson.build -@@ -12,7 +12,6 @@ desktop_files = [ - - foreach desktop_file : desktop_files - i18n.merge_file( -- desktop, - type : 'desktop', - input : 'gtp-@0@.desktop.in'.format(desktop_file), - output : 'gnome-@0@-panel.desktop'.format(desktop_file), diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_41.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_42.0.bb index 1cdc96ba0b..6fe999a191 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_41.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_42.0.bb @@ -26,23 +26,20 @@ DEPENDS = " \ libgtop \ gsound \ libpwquality \ - libhandy \ + libadwaita \ " REQUIRED_DISTRO_FEATURES += "polkit pulseaudio systemd x11" -SRC_URI[archive.sha256sum] = "8271fc6b33ec2418a578304dd3e57d665f0d7cc706a99a97be419848618fe248" +SRC_URI[archive.sha256sum] = "0732efa7c4171ce0a0ed4106580b4ce35a57b10152c0ea36d239134913777eda" SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch" -SRC_URI += " file://0001-meson-drop-unused-argument-for-i18n.merge_file.patch" PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" PACKAGECONFIG[ibus] = "-Dibus=true, -Dibus=false, ibus" PACKAGECONFIG[wayland] = "-Dwayland=true, -Dwayland=false, wayland" -# Once we have (lib)cheese we can make cheese a PACKAGECONFIG EXTRA_OEMESON = " \ -Doe_sysroot=${STAGING_DIR_HOST} \ - -Dcheese=false \ " do_install:append() { diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.42.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.44.0.bb index 13a68e3c80..1e357af875 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.42.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.44.0.bb @@ -14,11 +14,11 @@ DEPENDS += " \ metacity \ gdm \ gnome-desktop \ - gnome-bluetooth \ + gnome-bluetooth3 \ gnome-panel \ " -SRC_URI[archive.sha256sum] = "c8029220acf268c520dbb0750834b2ef4df868324d0e0fb6a80354c80ba8844e" +SRC_URI[archive.sha256sum] = "1df0838127c6246eecd89d1c50ff88fc82abf6de3b3068e52dde495a42bd550a" do_install:append() { # no oe-layer has compiz -> remove dead session @@ -27,6 +27,7 @@ do_install:append() { FILES:${PN} += " \ ${datadir}/desktop-directories \ + ${datadir}/gnome-control-center \ ${datadir}/gnome-panel \ ${datadir}/gnome-session \ ${datadir}/xsessions \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_3.42.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_3.44.0.bb index 2bcf145471..67bdf58f81 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_3.42.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_3.44.0.bb @@ -11,13 +11,13 @@ DEPENDS += " \ libwnck3 \ polkit \ dconf \ - libgweather \ + libgweather4 \ gnome-menus \ gnome-desktop \ gdm \ " -SRC_URI[archive.sha256sum] = "aea8c0efc2edba20e97ad4695179cd0a2538e64c2904702cc8c594e8e0898703" +SRC_URI[archive.sha256sum] = "99655f75d031876c130ed23c4da22c099e7bcc4048b0255a3c3a3bbc787b31aa" PACKAGECONFIG[eds] = "--enable-eds,--disable-eds,evolution-data-server" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-session/gnome-session_41.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-session/gnome-session_42.0.bb index 07f3634294..9407c25a55 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-session/gnome-session_41.3.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-session/gnome-session_42.0.bb @@ -22,7 +22,7 @@ inherit gnomebase gettext gsettings upstream-version-is-even features_check REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam gobject-introspection-data" -SRC_URI[archive.sha256sum] = "ee4a229053f522624054889609335b885287cf67bbde0dc9fd882b01ec9b5b39" +SRC_URI[archive.sha256sum] = "3cca06053ab682926920951a7da95f8cc6d72da74c682c46d0a0653332969caa" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'consolekit',d)}" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-build-remove-positional-i18n.merge_file-arguments.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-build-remove-positional-i18n.merge_file-arguments.patch deleted file mode 100644 index cb758c7c8d..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-build-remove-positional-i18n.merge_file-arguments.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 56535d2f1ec64e847e5fbd0613e78bd0dc046519 Mon Sep 17 00:00:00 2001 -From: Michal Vasilek <michal@vasilek.cz> -Date: Fri, 14 Jan 2022 23:55:06 +0100 -Subject: [PATCH] build: remove positional i18n.merge_file arguments - -otherwise building with meson 0.61+ fails: - - ERROR: Function does not take positional arguments. - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/281] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - plugins/power/meson.build | 1 - - plugins/wacom/meson.build | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/plugins/power/meson.build b/plugins/power/meson.build -index 69e619f..014bb6d 100644 ---- a/plugins/power/meson.build -+++ b/plugins/power/meson.build -@@ -76,7 +76,6 @@ if host_is_linux - ) - - i18n.merge_file( -- policy, - input: policy_in, - output: policy, - po_dir: po_dir, -diff --git a/plugins/wacom/meson.build b/plugins/wacom/meson.build -index d8dd0ec..c00323d 100644 ---- a/plugins/wacom/meson.build -+++ b/plugins/wacom/meson.build -@@ -7,7 +7,6 @@ policy_in = configure_file( - ) - - i18n.merge_file( -- policy, - input: policy_in, - output: policy, - po_dir: po_dir, diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_41.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_42.1.bb index cbc4c460c1..3d5913ac06 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_41.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_42.1.bb @@ -11,7 +11,7 @@ DEPENDS = " \ geocode-glib \ gcr \ gnome-desktop \ - libgweather \ + libgweather4 \ lcms \ libcanberra \ geoclue \ @@ -25,8 +25,7 @@ DEPENDS = " \ REQUIRED_DISTRO_FEATURES = "x11 polkit pulseaudio systemd gobject-introspection-data" GIR_MESON_OPTION = "" -SRC_URI += " file://0001-build-remove-positional-i18n.merge_file-arguments.patch" -SRC_URI[archive.sha256sum] = "e6ca6361fbd1deab2de1a1e390d4f14167cf47b1c547dbb8b65a5d89e9663884" +SRC_URI[archive.sha256sum] = "ed65851ae54adcd58a24c86837d624fc6a14bd84ab22e94df40a3a4cfd19ffdb" PACKAGECONFIG ??= " \ cups nm \ @@ -43,5 +42,5 @@ PACKAGECONFIG[wayland] = "-Dwayland=true,-Dwayland=false,wayland" FILES:${PN} += " \ ${systemd_user_unitdir} \ - ${libdir}/gnome-settings-daemon-41/libgsd.so \ + ${libdir}/gnome-settings-daemon-42/libgsd.so \ " diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions/0001-meson-Drop-unused-argument-for-i18n.merge_file.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions/0001-meson-Drop-unused-argument-for-i18n.merge_file.patch deleted file mode 100644 index df8fe0e6e6..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions/0001-meson-Drop-unused-argument-for-i18n.merge_file.patch +++ /dev/null @@ -1,30 +0,0 @@ -From cdaa837d48894737ca0b4e7d2dfb365119e53759 Mon Sep 17 00:00:00 2001 -From: Jan Beich <jbeich@FreeBSD.org> -Date: Tue, 25 Jan 2022 11:49:54 +0000 -Subject: [PATCH] meson: Drop unused argument for i18n.merge_file() - -Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. - -data/meson.build:23:0: ERROR: Function does not take positional arguments. - -Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/merge_requests/210> - -Upstream-Status: Backport[https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/commit/cdaa837d48894737ca0b4e7d2dfb365119e53759] ---- - data/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/meson.build b/data/meson.build -index 27f4287..a4bcd5e 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -1,5 +1,5 @@ - session_desktop = 'gnome-classic.desktop' --i18n.merge_file('', -+i18n.merge_file( - input: session_desktop + '.in', - output: session_desktop, - po_dir: '../po', --- -2.34.1 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_41.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_42.0.bb index f51ca9f918..e8c95d6fb2 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_41.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_42.0.bb @@ -8,8 +8,7 @@ inherit gnomebase gettext gsettings features_check REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam gobject-introspection-data" -SRC_URI[archive.sha256sum] = "d0e6f2273f08d52d925fc2bb66b47b28e5ef50d1b8a14020877c662423d507d3" -SRC_URI += "file://0001-meson-Drop-unused-argument-for-i18n.merge_file.patch" +SRC_URI[archive.sha256sum] = "3ee65b75b1afd8bcca0a2a03da9b2884787ed40e257a881d9aa6ef7c8727602f" DEPENDS += " \ sassc-native \ @@ -20,12 +19,6 @@ EXTRA_OEMESON += " \ -Dclassic_mode=true \ " -do_install:append() { - # enable gnome-classic session for wayland - install -d ${D}${datadir}/wayland-sessions - install -m644 ${D}${datadir}/xsessions/gnome-classic.desktop ${D}${datadir}/wayland-sessions/ -} - RDEPENDS:${PN} += "gnome-shell" FILES:${PN} += " \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gthumb/gthumb/0001-LINGUAS-removed-duplicated-entry.patch b/meta-openembedded/meta-gnome/recipes-gnome/gthumb/gthumb/0001-LINGUAS-removed-duplicated-entry.patch deleted file mode 100644 index b50b175e70..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gthumb/gthumb/0001-LINGUAS-removed-duplicated-entry.patch +++ /dev/null @@ -1,23 +0,0 @@ -From f3d399892e59a2e850be1d0de30c429417c78360 Mon Sep 17 00:00:00 2001 -From: Paolo Bacchilega <paobac@src.gnome.org> -Date: Tue, 11 Jan 2022 12:30:44 +0100 -Subject: [PATCH] LINGUAS: removed duplicated entry - -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - help/LINGUAS | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/help/LINGUAS b/help/LINGUAS -index 0e8a52d..fa1fc3e 100644 ---- a/help/LINGUAS -+++ b/help/LINGUAS -@@ -8,7 +8,6 @@ eu - fr - hu - id --id - nl - oc - sl diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gthumb/gthumb_3.12.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gthumb/gthumb_3.12.2.bb index 1459e0b434..0c5b71f5b6 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gthumb/gthumb_3.12.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gthumb/gthumb_3.12.2.bb @@ -26,7 +26,6 @@ DEPENDS = " \ inherit features_check gnomebase gnome-help gsettings itstool mime-xdg -SRC_URI += " file://0001-LINGUAS-removed-duplicated-entry.patch" -SRC_URI[archive.sha256sum] = "3deffc030384e64b57361c437c79b481ae1489ef44c87ae856e81bb10d8e383f" +SRC_URI[archive.sha256sum] = "97f8afe522535216541ebbf1e3b546d12a6beb38a8f0eb85f26e676934aad425" FILES:${PN} += "${datadir}/metainfo" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather4/0001-Allow-building-gir-in-cross-environments.patch b/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather4/0001-Allow-building-gir-in-cross-environments.patch new file mode 100644 index 0000000000..6c6a643edf --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather4/0001-Allow-building-gir-in-cross-environments.patch @@ -0,0 +1,33 @@ +From 179102310e9a3729fb5b00f2a7bf24b12f4a7a83 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Sat, 16 Apr 2022 20:04:14 +0200 +Subject: [PATCH] Allow building gir in cross environments +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +For us this works perfectly fine + +Upstream-Status: Inappropriate [OE-specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + libgweather/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libgweather/meson.build b/libgweather/meson.build +index 08311af..ef554f2 100644 +--- a/libgweather/meson.build ++++ b/libgweather/meson.build +@@ -208,7 +208,7 @@ lib_libgweather = library('gweather-4', + ) + + g_ir_scanner = find_program('g-ir-scanner', required: get_option('introspection')) +-build_gir = get_option('introspection') and g_ir_scanner.found() and not meson.is_cross_build() ++build_gir = get_option('introspection') and g_ir_scanner.found() + + enable_vala = get_option('enable_vala') + vapigen = find_program('vapigen', required: enable_vala == 'true') +-- +2.34.1 + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather4_4.0.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather4_4.0.0.bb index acfb97655a..708d27a61f 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather4_4.0.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather4_4.0.0.bb @@ -7,14 +7,11 @@ GNOMEBASEBUILDCLASS = "meson" GNOMEBN = "libgweather" S = "${WORKDIR}/${GNOMEBN}-${PV}" -inherit gnomebase gsettings gobject-introspection gettext gtk-doc vala features_check upstream-version-is-even +inherit gnomebase gsettings gobject-introspection gettext gtk-doc vala +SRC_URI += "file://0001-Allow-building-gir-in-cross-environments.patch" SRC_URI[archive.sha256sum] = "440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c" -# gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" -GIR_MESON_OPTION = "" - GTKDOC_MESON_OPTION = "gtk_doc" DEPENDS = " \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libportal/libportal_0.5.bb b/meta-openembedded/meta-gnome/recipes-gnome/libportal/libportal_0.6.bb index 6deac38fda..ec728d78b9 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libportal/libportal_0.5.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libportal/libportal_0.6.bb @@ -6,8 +6,8 @@ BUGTRACKER = "https://github.com/flatpak/libportal/issues" LICENSE = "LGPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=3000208d539ec061b899bce1d9ce9404" -SRC_URI = "git://github.com/flatpak/${BPN}.git;protocol=https;branch=master" -SRCREV = "467a397fd7996557f837cdc26ac07c01c62810e5" +SRC_URI = "git://github.com/flatpak/${BPN}.git;protocol=https;branch=main" +SRCREV = "13df0b887a7eb7b0f9b14069561a41f62e813155" S = "${WORKDIR}/git" inherit meson gtk-doc gobject-introspection diff --git a/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch new file mode 100644 index 0000000000..dc702a0e37 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch @@ -0,0 +1,30 @@ +From 19188367bee87b0084ab34869455155da5cb1731 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 13 Apr 2022 08:47:39 -0700 +Subject: [PATCH] meson: Check for libunwind instead of libunwind-generic + +This helps it to use llvm unwinder since libunwind-generic is specific +to nongnu libunwind. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 2835782..0fdb39a 100644 +--- a/meson.build ++++ b/meson.build +@@ -81,7 +81,7 @@ config_h.set10('HAVE_POLKIT_AGENT', polkit_agent_dep.found()) + config_h.set10('HAVE_POLKIT', polkit_dep.found()) + + if get_option('libunwind') +- libunwind_dep = dependency('libunwind-generic') ++ libunwind_dep = dependency('libunwind') + config_h.set('ENABLE_LIBUNWIND', libunwind_dep.found()) + config_h.set('HAVE_UNW_SET_CACHE_SIZE', libunwind_dep.found() and cc.has_header_symbol('libunwind.h', 'unw_set_cache_size', dependencies: [libunwind_dep])) + endif +-- +2.35.2 + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof_3.42.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof_3.44.0.bb index 99b3c60fa5..c9d32c3946 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof_3.42.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof_3.44.0.bb @@ -15,14 +15,19 @@ DEPENDS += " \ json-glib \ " -SRC_URI[archive.sha256sum] = "1796b81404ee75fd1ebacf54464ad7affebf62f2851eef524d9f8eac0c4a2001" +SRC_URI += "file://0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch" +SRC_URI[archive.sha256sum] = "ab5d9f5b71973b3088d58a1bfdf1dc23c39a02f5fce4e5e9c73e034b178b005b" + +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'sysprofd libsysprof', '', d)} \ + ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)} \ + libunwind" +# nongnu libunwind needs porting to RV32 +PACKAGECONFIG:remove:riscv32 = "libunwind" -PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'sysprofd', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'libsysprof', '', d)} \ - ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}" PACKAGECONFIG[gtk] = "-Denable_gtk=true,-Denable_gtk=false,gtk+3 libdazzle" PACKAGECONFIG[sysprofd] = "-Dwith_sysprofd=bundled,-Dwith_sysprofd=none,polkit" PACKAGECONFIG[libsysprof] = "-Dlibsysprof=true,-Dlibsysprof=false,polkit" +PACKAGECONFIG[libunwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind" EXTRA_OEMESON += "-Dsystemdunitdir=${systemd_unitdir}/system" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_3.2.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_3.3.0.bb index f81a84cd31..bb2396af7c 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_3.2.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_3.3.0.bb @@ -22,7 +22,7 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings gobject-introspection vala gtk-doc manpages bash-completion features_check python3native -SRC_URI[archive.sha256sum] = "1847e08b39e6e61d848735aa1f97f7d96c038201653fa0d7cb9e81b37eb9c03a" +SRC_URI[archive.sha256sum] = "0706f96fe7f95df42acec812c1de7b4593a0d648321ca83506a9d71e22417bda" # gobject-introspection is mandatory and cannot be configured REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" diff --git a/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.bb b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.bb index 2d733ce53e..be43d0d500 100644 --- a/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.bb +++ b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.bb @@ -15,8 +15,8 @@ EXTRA_OECONF += "--with-ucd-dir=${STAGING_DATADIR}/unicode/ucd" PACKAGECONFIG ??= " \ dconf vala \ - ${@bb.utils.contains_any('DISTRO_FEATURES', [ 'wayland', 'x11' ], 'gtk3', '', d)} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ + ${@bb.utils.contains_any('DISTRO_FEATURES', [ 'wayland', 'x11' ], 'gtk3 gtk4', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \ " do_configure:prepend() { @@ -29,6 +29,8 @@ FILES:${PN} += " \ ${datadir}/GConf \ ${datadir}/glib-2.0 \ ${libdir}/gtk-3.0 \ + ${libdir}/gtk-4.0 \ + ${systemd_user_unitdir} \ " FILES:${PN}-dev += " \ diff --git a/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc index 23f565f661..37a490abe0 100644 --- a/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc +++ b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" inherit autotools-brokensep pkgconfig gobject-introspection gettext gtk-doc vala -PV = "1.5.23+git${SRCPV}" +PV = "1.5.26" DEPENDS = "unicode-ucd" @@ -13,13 +13,15 @@ SRC_URI = " \ git://github.com/ibus/ibus.git;branch=master;protocol=https \ file://0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch \ " -SRCREV = "dd4cc5b028c35f9bb8fa9d3bdc8f26bcdfc43d40" +SRCREV = "6a70ab0338206bd1c7d01a4e1874ea0ee5b3a9d3" S = "${WORKDIR}/git" PACKAGECONFIG[appindicator] = "--enable-appindicator,--disable-appindicator,qtbase" PACKAGECONFIG[dconf] = "--enable-dconf,--disable-dconf,dconf" PACKAGECONFIG[gtk2] = "--enable-gtk2,--disable-gtk2,gtk+" PACKAGECONFIG[gtk3] = "--enable-gtk3,--disable-gtk3,gtk+3" +PACKAGECONFIG[gtk4] = "--enable-gtk4,--disable-gtk4,gtk4" +PACKAGECONFIG[systemd] = "--enable-systemd-services,--disable-systemd-services,systemd" PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland" PACKAGECONFIG[vala] = "--enable-vala,--disable-vala" PACKAGECONFIG[x11] = "--enable-xim --enable-ui,--disable-xim --disable-ui,virtual/libx11" diff --git a/meta-openembedded/meta-initramfs/README b/meta-openembedded/meta-initramfs/README index 119293a741..75c229dbf5 100644 --- a/meta-openembedded/meta-initramfs/README +++ b/meta-openembedded/meta-initramfs/README @@ -12,19 +12,19 @@ Dependencies This layer depends on: URI: git://git.openembedded.org/meta-openembedded -branch: master +branch: kirkstone Maintenance ----------- Send patches / pull requests to openembedded-devel@lists.openembedded.org -with '[meta-initramfs]' in the subject. +with '[meta-initramfs][kirkstone]' in the subject. When sending single patches, please using something like: -git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-initramfs][PATCH' +git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-initramfs][kirkstone][PATCH' -Interm layer maintainer: Khem Raj <raj.khem@gmail.com> +Interm layer maintainer: Armin Kuster <akuster808@gmail.com> License diff --git a/meta-openembedded/meta-multimedia/README b/meta-openembedded/meta-multimedia/README index 235c34331b..f76f45b101 100644 --- a/meta-openembedded/meta-multimedia/README +++ b/meta-openembedded/meta-multimedia/README @@ -1,17 +1,17 @@ This layer depends on: URI: git://git.openembedded.org/openembedded-core -branch: master +branch: kirkstone URI: git://git.openembedded.org/meta-openembedded layers: meta-oe -branch: master +branch: kirkstone -Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-multimedia]' in the subject +Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-multimedia][kirkstone]' in the subject When sending single patches, please use something like: -git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-multimedia][PATCH' +git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-multimedia][kirkstone][PATCH' You are encouraged to fork the mirror on github https://github.com/openembedded/meta-openembedded to share your patches, this is preferred for patch sets consisting of more than one patch. Other services like GitLab, repo.or.cz or self hosted setups are of course accepted as well, 'git fetch <remote>' works the same on all of them. We recommend github because it is free, easy to use, has been proven to be reliable and has a really good web GUI. -Layer maintainer: Andreas Müller <schnitzeltony@gmail.com> +Layer maintainer: Armin Kuster <akuster808@gmail.com> diff --git a/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-adjust-for-64bit-time_t.patch b/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-adjust-for-64bit-time_t.patch index 59bd4ef08f..ff2e789e32 100644 --- a/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-adjust-for-64bit-time_t.patch +++ b/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-adjust-for-64bit-time_t.patch @@ -146,12 +146,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> /* Failed */ --- a/src/epggrab/module/opentv.c +++ b/src/epggrab/module/opentv.c -@@ -486,7 +486,7 @@ opentv_parse_event_section_one +@@ -497,7 +497,7 @@ opentv_parse_event_section_one 1, &save, &changes); tvhdebug(LS_OPENTV, "find by time start %"PRItime_t " stop " - "%"PRItime_t " eid %d = %p", -- ev.start, ev.stop, ev.eid, ebc); -+ (intmax_t)ev.start, (intmax_t)ev.stop, ev.eid, ebc); + "%"PRItime_t " ch %"PRId64" eid %d = %p", +- ev.start, ev.stop, ch->ch_number, ev.eid, ebc); ++ (intmax_t)ev.start, (intmax_t)ev.stop, ch->ch_number, ev.eid, ebc); save |= epg_broadcast_set_dvb_eid(ebc, ev.eid, &changes); } else { ebc = epg_broadcast_find_by_eid(ch, ev.eid); diff --git a/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb b/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb index c278cf5994..b3d9d6bf7d 100644 --- a/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb +++ b/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb @@ -12,7 +12,7 @@ SRC_URI = "git://github.com/tvheadend/tvheadend.git;branch=master;protocol=https file://0001-adjust-for-64bit-time_t.patch \ " -SRCREV = "ce09077056f9c6558c188d135cec3be85cc9c200" +SRCREV = "9a51cea492e4a5579ca3ddf9233fecfa419de078" PV = "4.3+git${SRCPV}" PKGV = "4.3+git${GITPKGV}" @@ -26,5 +26,8 @@ EXTRA_OECONF += "--arch=${TARGET_ARCH} \ --disable-dvbscan \ " +EXTRA_OECONF:append:libc-musl = " --disable-execinfo" + +EXTRA_OEMAKE = "CFLAGS_NO_WERROR=yes" CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-networking/MAINTAINERS b/meta-openembedded/meta-networking/MAINTAINERS index ce53ec471b..0c569e5b9a 100644 --- a/meta-openembedded/meta-networking/MAINTAINERS +++ b/meta-openembedded/meta-networking/MAINTAINERS @@ -2,13 +2,13 @@ This file contains a list of maintainers for the meta-networking layer. Please submit any patches against meta-networking to the OpenEmbedded development mailing list (openembedded-devel@lists.openembedded.org) with -'[meta-networking]' in the subject. +'[meta-networking][kirkstone]' in the subject. When sending single patches, please use something like: git send-email -1 -M \ --to openembedded-devel@lists.openembedded.org \ - --subject-prefix='meta-networking][PATCH' + --subject-prefix='meta-networking][kirkstone][PATCH' You may also contact the maintainers directly. @@ -26,18 +26,9 @@ Please keep this list in alphabetical order. Maintainers List (try to look for most precise areas first) COMMON -M: Khem Raj <raj.khem@gmail.com> -M: "Joe MacDonald (backup)" <joe@deserted.net> +M: Armin Kuster <akuster808@gmail.com> L: openembedded-devel@lists.openembedded.org Q: https://patchwork.openembedded.org/project/oe/ S: Maintained F: conf F: recipes-* - -NETKIT -M: Armin Kuster <akuster808@gmail.com> -F: recipes-netkit - -OPENTHREAD -M: Stefan Schmidt <stefan@datenfreihafen.org> -F: recipes-connectivity/openthread/ diff --git a/meta-openembedded/meta-networking/README b/meta-openembedded/meta-networking/README index 34e11a96dd..e84bc66003 100644 --- a/meta-openembedded/meta-networking/README +++ b/meta-openembedded/meta-networking/README @@ -18,22 +18,21 @@ Dependencies This layer depends on: URI: git://git.openembedded.org/openembedded-core -branch: master +branch: kirkstone For some recipes, the meta-oe layer is required: URI: git://git.openembedded.org/meta-openembedded subdirectory: meta-oe -branch: master +branch: kirkstone URI: git://git.openembedded.org/meta-openembedded subdirectory: meta-python -branch: master +branch: kirkstone Maintenance ----------- -Layer maintainers: Khem Raj <raj.khem@gmail.com> - Armin Kuster <akuster808@gmail.com> (recipes-netkit) +Layer maintainers: Armin Kuster <akuster808@gmail.com> Please see the MAINTAINERS file for information on contacting the diff --git a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-aarch64.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-aarch64.txt index a89d9b358d..e91df71ea2 100644 --- a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-aarch64.txt +++ b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-aarch64.txt @@ -43,3 +43,4 @@ Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking whether fcntl supports flags to send direct I/O availability signals: NO Checking whether fcntl supports setting/geting hints: NO +Checking for readlink breakage: NO diff --git a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-aarch64_be.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-aarch64_be.txt index a89d9b358d..e91df71ea2 100644 --- a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-aarch64_be.txt +++ b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-aarch64_be.txt @@ -43,3 +43,4 @@ Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking whether fcntl supports flags to send direct I/O availability signals: NO Checking whether fcntl supports setting/geting hints: NO +Checking for readlink breakage: NO diff --git a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-arm.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-arm.txt index b32967539f..b670e4ac44 100644 --- a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-arm.txt +++ b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-arm.txt @@ -44,3 +44,4 @@ Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking whether fcntl supports flags to send direct I/O availability signals: NO Checking whether fcntl supports setting/geting hints: NO +Checking for readlink breakage: NO diff --git a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-armeb.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-armeb.txt index b32967539f..b670e4ac44 100644 --- a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-armeb.txt +++ b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-armeb.txt @@ -44,3 +44,4 @@ Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking whether fcntl supports flags to send direct I/O availability signals: NO Checking whether fcntl supports setting/geting hints: NO +Checking for readlink breakage: NO diff --git a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-i586.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-i586.txt index b32967539f..b670e4ac44 100644 --- a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-i586.txt +++ b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-i586.txt @@ -44,3 +44,4 @@ Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking whether fcntl supports flags to send direct I/O availability signals: NO Checking whether fcntl supports setting/geting hints: NO +Checking for readlink breakage: NO diff --git a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-i686.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-i686.txt index b32967539f..b670e4ac44 100644 --- a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-i686.txt +++ b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-i686.txt @@ -44,3 +44,4 @@ Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking whether fcntl supports flags to send direct I/O availability signals: NO Checking whether fcntl supports setting/geting hints: NO +Checking for readlink breakage: NO diff --git a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mips.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mips.txt index e8844981ee..ad52b4a9ab 100644 --- a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mips.txt +++ b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mips.txt @@ -44,3 +44,4 @@ Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking whether fcntl supports flags to send direct I/O availability signals: NO Checking whether fcntl supports setting/geting hints: NO +Checking for readlink breakage: NO diff --git a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mips64.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mips64.txt index e78761de6d..c799942d4b 100644 --- a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mips64.txt +++ b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mips64.txt @@ -43,3 +43,4 @@ Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking whether fcntl supports flags to send direct I/O availability signals: NO Checking whether fcntl supports setting/geting hints: NO +Checking for readlink breakage: NO diff --git a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mips64el.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mips64el.txt index e78761de6d..c799942d4b 100644 --- a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mips64el.txt +++ b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mips64el.txt @@ -43,3 +43,4 @@ Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking whether fcntl supports flags to send direct I/O availability signals: NO Checking whether fcntl supports setting/geting hints: NO +Checking for readlink breakage: NO diff --git a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mipsel.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mipsel.txt index e8844981ee..ad52b4a9ab 100644 --- a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mipsel.txt +++ b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mipsel.txt @@ -44,3 +44,4 @@ Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking whether fcntl supports flags to send direct I/O availability signals: NO Checking whether fcntl supports setting/geting hints: NO +Checking for readlink breakage: NO diff --git a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-powerpc.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-powerpc.txt index 4d2726139e..ac857d46ed 100644 --- a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-powerpc.txt +++ b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-powerpc.txt @@ -44,3 +44,4 @@ Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking whether fcntl supports flags to send direct I/O availability signals: NO Checking whether fcntl supports setting/geting hints: NO +Checking for readlink breakage: NO diff --git a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-powerpc64.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-powerpc64.txt index b32d30b34f..dfc48754cb 100644 --- a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-powerpc64.txt +++ b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-powerpc64.txt @@ -44,3 +44,4 @@ Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking whether fcntl supports flags to send direct I/O availability signals: NO Checking whether fcntl supports setting/geting hints: NO +Checking for readlink breakage: NO diff --git a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-powerpc64le.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-powerpc64le.txt index b32d30b34f..dfc48754cb 100644 --- a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-powerpc64le.txt +++ b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-powerpc64le.txt @@ -44,3 +44,4 @@ Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking whether fcntl supports flags to send direct I/O availability signals: NO Checking whether fcntl supports setting/geting hints: NO +Checking for readlink breakage: NO diff --git a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-riscv32.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-riscv32.txt index b32967539f..b670e4ac44 100644 --- a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-riscv32.txt +++ b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-riscv32.txt @@ -44,3 +44,4 @@ Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking whether fcntl supports flags to send direct I/O availability signals: NO Checking whether fcntl supports setting/geting hints: NO +Checking for readlink breakage: NO diff --git a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-riscv64.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-riscv64.txt index a89d9b358d..e91df71ea2 100644 --- a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-riscv64.txt +++ b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-riscv64.txt @@ -43,3 +43,4 @@ Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking whether fcntl supports flags to send direct I/O availability signals: NO Checking whether fcntl supports setting/geting hints: NO +Checking for readlink breakage: NO diff --git a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-x86_64.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-x86_64.txt index a89d9b358d..e91df71ea2 100644 --- a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-x86_64.txt +++ b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-x86_64.txt @@ -43,3 +43,4 @@ Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking whether fcntl supports flags to send direct I/O availability signals: NO Checking whether fcntl supports setting/geting hints: NO +Checking for readlink breakage: NO diff --git a/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-cmake-Disable-nonnull-compare-warning-on-gcc.patch b/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-cmake-Disable-nonnull-compare-warning-on-gcc.patch new file mode 100644 index 0000000000..f0bb392a9f --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-cmake-Disable-nonnull-compare-warning-on-gcc.patch @@ -0,0 +1,40 @@ +From aa706d714294b83db696de2beca9a722a512796f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 19 Apr 2022 14:04:40 -0700 +Subject: [PATCH] cmake: Disable nonnull-compare warning on gcc + +GCC finds a legit warning which clang does not on code like this + +class Message; +void SendResponse(Message & aMessage) +{ + if ((&aMessage) != nullptr) { return; } +} + +Perhaps it should be fixed upstream but for now disable treating this +warning as error when using gcc + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 59a567e729..3134740ff6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -57,6 +57,10 @@ endif() + + set(CMAKE_CXX_EXTENSIONS OFF) + ++if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") ++ add_compile_options(-Wno-error=nonnull-compare) ++endif() ++ + if (OTBR_COVERAGE AND CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") + message(STATUS "Coverage: ON") + target_compile_options(otbr-config INTERFACE -g -O0 --coverage) +-- +2.36.0 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix/Turn-off-sign-compare-for-musl-libc.patch b/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix/Turn-off-sign-compare-for-musl-libc.patch deleted file mode 100644 index df84550be0..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix/Turn-off-sign-compare-for-musl-libc.patch +++ /dev/null @@ -1,131 +0,0 @@ -From: Stefan Schmidt <stefan.schmidt@huawei.com> -Subject: Turn off sign compare for musl libc - -When building with musl and clang the usage of CMSG_NXTHDR results in -sign-compare error. Disable the check only in this specific part of the -code with a #pragma. - -| /home/stefan/huawei/yocto-upstream/yoe/workspace/sources/ot-br-posix/third_party/openthread/repo/src/posix/platform/udp.cpp:147:28: fatal error: comparison of integers of different signs: 'unsigned long' and 'long' [-Wsign-compare] -| cmsg = CMSG_NXTHDR(&msg, cmsg); -| ^~~~~~~~~~~~~~~~~~~~~~~ -| /home/stefan/huawei/yocto-upstream/yoe/build/tmp/work/cortexa57-yoe-linux-musl/ot-br-posix/0.3.0+git999-r0/recipe-sysroot/usr/include/sys/socket.h:358:44: note: expanded from macro 'CMSG_NXTHDR' -| __CMSG_LEN(cmsg) + sizeof(struct cmsghdr) >= __MHDR_END(mhdr) - (unsigned char *)(cmsg) \ -| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -| 1 error generated. - -Idea and fix taken from -recipes-devtools/breakpad/breakpad/0001-Turn-off-sign-compare-for-musl-libc.patch -by Khem Raj. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Stefan Schmidt <stefan.schmidt@huawei.com> - -diff --git a/src/backbone_router/nd_proxy.cpp b/src/backbone_router/nd_proxy.cpp -index 7136878c3d..8a223c95c7 100644 ---- a/src/backbone_router/nd_proxy.cpp -+++ b/src/backbone_router/nd_proxy.cpp -@@ -185,9 +185,18 @@ void NdProxyManager::ProcessMulticastNeighborSolicition() - VerifyOrExit(icmp6header->icmp6_type == ND_NEIGHBOR_SOLICIT, error = OTBR_ERROR_PARSE); - - otbrLogDebug("NdProxyManager: Received ND-NS from %s", src.ToString().c_str()); -- -+#ifndef __GLIBC__ -+ // In musl-libc, CMSG_NXTHDR typecasts char* to cmsghdr* which causes -+ // clang to throw sign-compare warning. This is to suppress the warning -+ // inline. -+ #pragma clang diagnostic push -+ #pragma clang diagnostic ignored "-Wsign-compare" -+#endif - for (cmsghdr = CMSG_FIRSTHDR(&msghdr); cmsghdr; cmsghdr = CMSG_NXTHDR(&msghdr, cmsghdr)) -- { -+#ifndef __GLIBC__ -+ #pragma clang diagnostic pop -+#endif -+ { - if (cmsghdr->cmsg_level != IPPROTO_IPV6) - { - continue; -Submodule third_party/openthread/repo contains modified content -diff --git a/third_party/openthread/repo/src/posix/platform/infra_if.cpp b/third_party/openthread/repo/src/posix/platform/infra_if.cpp -index 9f93d2b1c..1ed40fe50 100644 ---- a/third_party/openthread/repo/src/posix/platform/infra_if.cpp -+++ b/third_party/openthread/repo/src/posix/platform/infra_if.cpp -@@ -228,7 +228,17 @@ otError InfraNetif::SendIcmp6Nd(uint32_t aInfraIfIndex, - packetInfo->ipi6_ifindex = mInfraIfIndex; - - // Per section 6.1.2 of RFC 4861, we need to send the ICMPv6 message with IP Hop Limit 255. -+#ifndef __GLIBC__ -+ // In musl-libc, CMSG_NXTHDR typecasts char* to cmsghdr* which causes -+ // clang to throw sign-compare warning. This is to suppress the warning -+ // inline. -+ #pragma clang diagnostic push -+ #pragma clang diagnostic ignored "-Wsign-compare" -+#endif - cmsgPointer = CMSG_NXTHDR(&msgHeader, cmsgPointer); -+#ifndef __GLIBC__ -+ #pragma clang diagnostic pop -+#endif - cmsgPointer->cmsg_level = IPPROTO_IPV6; - cmsgPointer->cmsg_type = IPV6_HOPLIMIT; - cmsgPointer->cmsg_len = CMSG_LEN(sizeof(hopLimit)); -@@ -481,7 +491,17 @@ void InfraNetif::ReceiveIcmp6Message(void) - - bufferLength = static_cast<uint16_t>(rval); - -+#ifndef __GLIBC__ -+ // In musl-libc, CMSG_NXTHDR typecasts char* to cmsghdr* which causes -+ // clang to throw sign-compare warning. This is to suppress the warning -+ // inline. -+ #pragma clang diagnostic push -+ #pragma clang diagnostic ignored "-Wsign-compare" -+#endif - for (cmh = CMSG_FIRSTHDR(&msg); cmh; cmh = CMSG_NXTHDR(&msg, cmh)) -+#ifndef __GLIBC__ -+ #pragma clang diagnostic pop -+#endif - { - if (cmh->cmsg_level == IPPROTO_IPV6 && cmh->cmsg_type == IPV6_PKTINFO && - cmh->cmsg_len == CMSG_LEN(sizeof(struct in6_pktinfo))) -diff --git a/third_party/openthread/repo/src/posix/platform/udp.cpp b/third_party/openthread/repo/src/posix/platform/udp.cpp -index b7aacc5fa..a814fea70 100644 ---- a/third_party/openthread/repo/src/posix/platform/udp.cpp -+++ b/third_party/openthread/repo/src/posix/platform/udp.cpp -@@ -144,8 +144,18 @@ otError transmitPacket(int aFd, uint8_t *aPayload, uint16_t aLength, const otMes - { - struct in6_pktinfo pktinfo; - -+#ifndef __GLIBC__ -+ // In musl-libc, CMSG_NXTHDR typecasts char* to cmsghdr* which causes -+ // clang to throw sign-compare warning. This is to suppress the warning -+ // inline. -+ #pragma clang diagnostic push -+ #pragma clang diagnostic ignored "-Wsign-compare" -+#endif - cmsg = CMSG_NXTHDR(&msg, cmsg); -- cmsg->cmsg_level = IPPROTO_IPV6; -+#ifndef __GLIBC__ -+ #pragma clang diagnostic pop -+#endif -+ cmsg->cmsg_level = IPPROTO_IPV6; - cmsg->cmsg_type = IPV6_PKTINFO; - cmsg->cmsg_len = CMSG_LEN(sizeof(pktinfo)); - -@@ -200,7 +210,17 @@ otError receivePacket(int aFd, uint8_t *aPayload, uint16_t &aLength, otMessageIn - VerifyOrExit(rval > 0, perror("recvmsg")); - aLength = static_cast<uint16_t>(rval); - -+#ifndef __GLIBC__ -+ // In musl-libc, CMSG_NXTHDR typecasts char* to cmsghdr* which causes -+ // clang to throw sign-compare warning. This is to suppress the warning -+ // inline. -+ #pragma clang diagnostic push -+ #pragma clang diagnostic ignored "-Wsign-compare" -+#endif - for (struct cmsghdr *cmsg = CMSG_FIRSTHDR(&msg); cmsg != nullptr; cmsg = CMSG_NXTHDR(&msg, cmsg)) -+#ifndef __GLIBC__ -+ #pragma clang diagnostic pop -+#endif - { - if (cmsg->cmsg_level == IPPROTO_IPV6) - { diff --git a/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb index d9f558d792..a16b77849e 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb @@ -16,7 +16,7 @@ PV = "0.3.0+git${SRCPV}" SRC_URI = "gitsm://github.com/openthread/ot-br-posix.git;protocol=https;branch=main \ file://0001-otbr-agent.service.in-remove-pre-exec-hook-for-mdns-.patch \ - file://Turn-off-sign-compare-for-musl-libc.patch \ + file://0001-cmake-Disable-nonnull-compare-warning-on-gcc.patch \ " S = "${WORKDIR}/git" @@ -24,6 +24,8 @@ SYSTEMD_SERVICE:${PN} = "otbr-agent.service" inherit pkgconfig cmake systemd +CXXFLAGS:append:libc-musl:toolchain-clang = " -Wno-error=sign-compare" + EXTRA_OECMAKE = "-DBUILD_TESTING=OFF \ -DOTBR_DBUS=ON \ -DOTBR_REST=ON \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/openthread/wpantund_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/openthread/wpantund_git.bb index bb444d04f5..a7fcc202a4 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/openthread/wpantund_git.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/openthread/wpantund_git.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e7820bc7f7d1638a6b54fc2e8d7fb103 \ file://third_party/openthread/LICENSE;md5=543b6fe90ec5901a683320a36390c65f \ file://third_party/pt/LICENSE;md5=dcd598b69cad786beea33da7b1ae14b7 \ " -DEPENDS = "autoconf-archive dbus readline" +DEPENDS = "autoconf-archive dbus readline boost" SRCREV = "0fb1f57e4224e2df3e630e146702bfcf63fbf07a" PV = "0.07.01+git${SRCPV}" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.12.bb b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.13.bb index 3da397f5c7..49e93fc536 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.12.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.13.bb @@ -31,7 +31,7 @@ SRC_URI:append:libc-musl = " \ file://samba-fix-musl-lib-without-innetgr.patch \ " -SRC_URI[sha256sum] = "155d9c2dfb06a18104422987590858bfe5e9783ebebe63882e7e7f07eaaa512d" +SRC_URI[sha256sum] = "e1df792818a17d8d21faf33580d32939214694c92b84fb499464210d86a7ff75" UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.14(\.\d+)+).tar.gz" diff --git a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0001-include-missing-array-header.patch b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0001-include-missing-array-header.patch new file mode 100644 index 0000000000..e735d432a7 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0001-include-missing-array-header.patch @@ -0,0 +1,32 @@ +From 6168d43ddd353b92ad8bcd5c49dc68f18caa8a00 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 12 Apr 2022 17:07:49 -0700 +Subject: [PATCH 1/2] include missing <array> header + +Fixes +src/osaf/consensus/key_value.cc:25:30: error: aggregate 'std::array<char, 128> buffer' has incomplete type and cannot be defined + 25 | std::array<char, buf_size> buffer; + | ^~~~~~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/osaf/consensus/key_value.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/osaf/consensus/key_value.cc b/src/osaf/consensus/key_value.cc +index 692dd3f..6e16cbf 100644 +--- a/src/osaf/consensus/key_value.cc ++++ b/src/osaf/consensus/key_value.cc +@@ -18,7 +18,7 @@ + #include "base/getenv.h" + #include "base/logtrace.h" + #include "osaf/consensus/consensus.h" +- ++#include <array> + int KeyValue::Execute(const std::string& command, std::string& output) { + TRACE_ENTER(); + constexpr size_t buf_size = 128; +-- +2.35.1 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0002-configure-Disable-selected-warnings.patch b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0002-configure-Disable-selected-warnings.patch new file mode 100644 index 0000000000..a9953259ce --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0002-configure-Disable-selected-warnings.patch @@ -0,0 +1,28 @@ +From fe654d5340d18f04e4689ba19f843554909a0c00 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 12 Apr 2022 17:16:37 -0700 +Subject: [PATCH 2/2] configure: Disable selected warnings + +These warnings are emitted when compiling with gcc 11 and gcc 12 +Do not treat them as errors + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -601,7 +601,10 @@ if test -z "$OSAF_HARDEN_FLAGS"; then + fi + AC_SUBST(OSAF_HARDEN_FLAGS) + +-AX_CHECK_COMPILE_FLAG([-Werror=format-overflow],[NOWARNINGS=-Wno-error=format-overflow]) ++AX_CHECK_COMPILE_FLAG([-Werror=format-overflow],[NOWARNINGS='-Wno-error=format-overflow']) ++AX_CHECK_COMPILE_FLAG([-Wuse-after-free],[NOWARNINGS+=' -Wno-error=use-after-free']) ++AX_CHECK_COMPILE_FLAG([-Wstringop-truncation],[NOWARNINGS+=' -Wno-error=stringop-truncation']) ++AX_CHECK_COMPILE_FLAG([-Warray-bounds],[NOWARNINGS+=' -Wno-error=array-bounds']) + AC_SUBST(NOWARNINGS) + ############################################# + # List the output Makefiles diff --git a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.22.01.bb b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.22.01.bb index 8ce324d306..930755d624 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.22.01.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.22.01.bb @@ -28,6 +28,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \ file://0001-immom_python-convert-to-python3.patch \ file://0001-Fix-build-with-fno-common.patch \ file://0001-Use-correct-printf-format-for-__fsblkcnt_t.patch \ + file://0001-include-missing-array-header.patch \ + file://0002-configure-Disable-selected-warnings.patch \ " SRC_URI[sha256sum] = "f008d53c83087ce2014c6089bc4ef08e14c1b4091298b943f4ceade1aa6bf61e" @@ -48,8 +50,8 @@ PACKAGECONFIG[plm] = "--enable-ais-plm,--disable-ais-plm,libvirt openhpi" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}" -CPPFLAGS += "-Wno-error=stringop-overflow= -Wno-error=stringop-truncation" -CXXFLAGS += "-Wno-error=stringop-overflow= -Wno-error=stringop-truncation -Wno-error=format-truncation=" +CPPFLAGS += "-Wno-error" +CXXFLAGS += "-Wno-error" LDFLAGS += "-Wl,--as-needed -latomic -Wl,--no-as-needed" do_install:append() { diff --git a/meta-openembedded/meta-networking/recipes-extended/tgt/files/0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch b/meta-openembedded/meta-networking/recipes-extended/tgt/files/0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch new file mode 100644 index 0000000000..173ecb620d --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-extended/tgt/files/0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch @@ -0,0 +1,47 @@ +From 93fea40915d01be6d02587a0b8be85a642e6a8d5 Mon Sep 17 00:00:00 2001 +From: Zhenhua Luo <zhenhua.luo@freescale.com> +Date: Thu, 10 Apr 2014 11:26:39 +0800 +Subject: [PATCH] Correct the path of header files check in Yocto build env + +Upstream-Status: Inappropriate [the fix is specific to Yocto build env] + +Current Makefile will check headers on host instead of Yocto sysroot, following +error appears. Change the path of header check. +| bs_aio.c:34:20: fatal error: libaio.h: No such file or directory +| #include <libaio.h> +| ^ +| compilation terminated. + +Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com> + +--- + usr/Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/usr/Makefile b/usr/Makefile +index decf13c..9ff8f15 100644 +--- a/usr/Makefile ++++ b/usr/Makefile +@@ -1,11 +1,11 @@ + sbindir ?= $(PREFIX)/sbin + libdir ?= $(PREFIX)/lib/tgt + +-ifneq ($(shell test -e /usr/include/linux/signalfd.h && echo 1),) ++ifneq ($(shell test -e $(SYSROOT)/usr/include/linux/signalfd.h && echo 1),) + CFLAGS += -DUSE_SIGNALFD + endif + +-ifneq ($(shell test -n $(shell find /usr/include -name "timerfd.h" | head -n1) && echo 1),) ++ifneq ($(shell test -n $(shell find $(SYSROOT)/usr/include -name "timerfd.h" | head -n1) && echo 1),) + CFLAGS += -DUSE_TIMERFD + endif + +@@ -25,7 +25,7 @@ ifneq ($(SD_NOTIFY),) + CFLAGS += -DUSE_SYSTEMD + endif + +-ifneq ($(shell test -e /usr/include/sys/eventfd.h && test -e /usr/include/libaio.h && echo 1),) ++ifneq ($(shell test -e $(SYSROOT)/usr/include/sys/eventfd.h && test -e $(SYSROOT)/usr/include/libaio.h && echo 1),) + CFLAGS += -DUSE_EVENTFD + TGTD_OBJS += bs_aio.o + LIBS += -laio diff --git a/meta-openembedded/meta-networking/recipes-extended/tgt/files/0001-usr-Makefile-WARNING-fix.patch b/meta-openembedded/meta-networking/recipes-extended/tgt/files/0001-usr-Makefile-WARNING-fix.patch new file mode 100644 index 0000000000..078ba9ef50 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-extended/tgt/files/0001-usr-Makefile-WARNING-fix.patch @@ -0,0 +1,29 @@ +From 6f4e3b11c7dccf83e2d18635c84837b212dfcc1c Mon Sep 17 00:00:00 2001 +From: Li xin <lixin.fnst@cn.fujitsu.com> +Date: Sun, 26 Jul 2015 04:23:51 +0900 +Subject: [PATCH] usr/Makefile: WARNING fix WARNING: QA Issue: tgt: + /work/i586-oe-linux/tgt/1.0.60+gitAUTOINC+ab51727a36-r0/ + packages-split/tgt/usr/sbin/tgtd contains probably-redundant RPATH /usr/lib + [useless-rpaths] + +Upstream-Status: pending + +Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> + +--- + usr/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/usr/Makefile b/usr/Makefile +index 9ff8f15..cc8df11 100644 +--- a/usr/Makefile ++++ b/usr/Makefile +@@ -63,7 +63,7 @@ TGTD_OBJS += tgtd.o mgmt.o target.o scsi.o log.o driver.o util.o work.o \ + + TGTD_DEP = $(TGTD_OBJS:.o=.d) + +-LDFLAGS = -Wl,-E,-rpath=$(libdir) ++LDFLAGS += -Wl,-E + + .PHONY:all + all: $(PROGRAMS) $(MODULES) diff --git a/meta-openembedded/meta-networking/recipes-extended/tgt/files/tgtd b/meta-openembedded/meta-networking/recipes-extended/tgt/files/tgtd new file mode 100644 index 0000000000..64df6a3eb4 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-extended/tgt/files/tgtd @@ -0,0 +1,5 @@ +# options for tgtd +TGTD_OPTS="" + +# configuration file +TGTD_CONFIG=/etc/tgt/targets.conf diff --git a/meta-openembedded/meta-networking/recipes-extended/tgt/files/tgtd.init b/meta-openembedded/meta-networking/recipes-extended/tgt/files/tgtd.init new file mode 100644 index 0000000000..4b0ce9443f --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-extended/tgt/files/tgtd.init @@ -0,0 +1,116 @@ +#!/bin/sh + +### BEGIN INIT INFO +# Provides: tgtd +# Required-Start: $remote_fs $network $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 3 5 +# Default-Stop: 0 1 2 6 +# Short-Description: SCSI target daemon +# Description: Linux SCSI target framework (tgt) +### END INIT INFO + +DESC="tgtd" +DAEMON="/usr/sbin/tgtd" +TGTD_CONFIG=/etc/tgt/targets.conf + +start () +{ + echo -n "Starting $DESC..." + + # Ensure service isn't running + tgt-admin -s >/dev/null 2>&1 + RETVAL=$? + if [ "$RETVAL" -ne 107 ] ; then + echo "$DESC is already running." + exit 1 + fi + + # Start tgtd first + $DAEMON &>/dev/null + RETVAL=$? + if [ "$RETVAL" -ne 0 ]; then + echo "failed." + exit 1 + fi + + # Put tgtd into "offline" state until all the targets are configured. + # We don't want initiators to (re)connect and fail the connection + # if it's not ready. + tgtadm --op update --mode sys --name State -v offline + # Configure the targets. + tgt-admin -f -e -c $TGTD_CONFIG + # Put tgtd into "ready" state. + tgtadm --op update --mode sys --name State -v ready + + echo "done." +} + +stop () +{ + echo -n "Stopping $DESC..." + + # Remove all targets. It only removes targets which are not in use. + tgt-admin --update ALL -c /dev/null &>/dev/null + # tgtd will exit if all targets were removed + tgtadm --op delete --mode system &>/dev/null + RETVAL=$? + if [ "$RETVAL" -eq 107 ] ; then + if [ "$TASK" != "restart" ] ; then + return 1 + fi + elif [ "$RETVAL" -ne 0 ] ; then + echo "Some initiators are still connected - could not stop tgtd" + return 2 + fi + echo -n +} + +reload() +{ + echo "Reloading configuration of $DESC" "$NAME" + # Update configuration for targets. Only targets which + # are not in use will be updated. + tgt-admin --update ALL -c $TGTD_CONFIG &>/dev/null + RETVAL=$? + if [ "$RETVAL" -eq 107 ] ; then + echo "tgtd is not running" + exit 1 + fi +} + +status() +{ + tgt-admin -s >/dev/null 2>&1 + RETVAL=$? + if [ "$RETVAL" -eq 107 ] ; then + echo "tgtd is not running" + else + echo "tgtd is running" + fi +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart|force-reload) + stop + start + ;; + reload) + reload + ;; + status) + status + ;; + *) + echo "Usage: $0 {start|stop|force-reload|restart|status|reload}" + exit 1 + ;; +esac + +exit 0 diff --git a/meta-openembedded/meta-networking/recipes-extended/tgt/files/tgtd.service b/meta-openembedded/meta-networking/recipes-extended/tgt/files/tgtd.service new file mode 100755 index 0000000000..afbd4b4eaa --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-extended/tgt/files/tgtd.service @@ -0,0 +1,33 @@ +[Unit] +Description=tgtd iSCSI target daemon +After=network.target + +[Service] +EnvironmentFile=@SYSCONFDIR@/sysconfig/tgtd + +ExecStart=@SBINDIR@/tgtd -f $TGTD_OPTS +# see bz 848942. workaround for a race for now. +ExecStartPost=@BASE_BINDIR@/sleep 5 +# Put tgtd into "offline" state until all the targets are configured. +# We don't want initiators to (re)connect and fail the connection +# if it's not ready. +ExecStartPost=@SBINDIR@/tgtadm --op update --mode sys --name State -v offline +# Configure the targets. +ExecStartPost=@SBINDIR@/tgt-admin -e -c $TGTD_CONFIG +# Put tgtd into "ready" state. +ExecStartPost=@SBINDIR@/tgtadm --op update --mode sys --name State -v ready + +# Update configuration for targets. Only targets which +# are not in use will be updated. +ExecReload=@SBINDIR@/tgt-admin --update ALL -c $TGTD_CONFIG + +# NOTE: Shutdown of the iscsi target may cause data corruption +# for initiators that are connected. +ExecStop=@SBINDIR@/tgtadm --op update --mode sys --name State -v offline +# Remove all targets. It only removes targets which are not in use. +ExecStop=@SBINDIR@/tgt-admin --update ALL -c /dev/null +# tgtd will exit if all targets were removed +ExecStop=@SBINDIR@/tgtadm --op delete --mode system + +[Install] +WantedBy=multi-user.target diff --git a/meta-openembedded/meta-networking/recipes-extended/tgt/files/usr-Makefile-apply-LDFLAGS-to-all-executables.patch b/meta-openembedded/meta-networking/recipes-extended/tgt/files/usr-Makefile-apply-LDFLAGS-to-all-executables.patch new file mode 100644 index 0000000000..d480ef786e --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-extended/tgt/files/usr-Makefile-apply-LDFLAGS-to-all-executables.patch @@ -0,0 +1,35 @@ +From a815ac8ee16b344d9e24b445957f32bf2aafa532 Mon Sep 17 00:00:00 2001 +From: Mark Asselstine <mark.asselstine@windriver.com> +Date: Thu, 5 Jan 2017 11:07:51 -0500 +Subject: [PATCH] usr/Makefile: apply LDFLAGS to all executables + +Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> +--- + usr/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/usr/Makefile b/usr/Makefile +index cc8df11..c55fd68 100644 +--- a/usr/Makefile ++++ b/usr/Makefile +@@ -78,7 +78,7 @@ TGTADM_OBJS = tgtadm.o concat_buf.o + TGTADM_DEP = $(TGTADM_OBJS:.o=.d) + + tgtadm: $(TGTADM_OBJS) +- $(CC) $^ -o $@ ++ $(CC) $^ -o $@ $(LDFLAGS) + + -include $(TGTADM_DEP) + +@@ -86,7 +86,7 @@ TGTIMG_OBJS = tgtimg.o libssc.o libcrc32c.o + TGTIMG_DEP = $(TGTIMG_OBJS:.o=.d) + + tgtimg: $(TGTIMG_OBJS) +- $(CC) $^ -o $@ ++ $(CC) $^ -o $@ $(LDFLAGS) + + -include $(TGTIMG_DEP) + +-- +2.7.4 + diff --git a/meta-openembedded/meta-networking/recipes-extended/tgt/tgt_git.bb b/meta-openembedded/meta-networking/recipes-extended/tgt/tgt_git.bb new file mode 100644 index 0000000000..42141cb72d --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-extended/tgt/tgt_git.bb @@ -0,0 +1,94 @@ +DESCRIPTION = "Linux SCSI target framework (tgt)" +HOMEPAGE = "http://stgt.sourceforge.net" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://scripts/tgtd.spec;beginline=7;endline=7;md5=21c19ea7dad04648b9c2f791b6e29b4c" +DEPENDS = "sg3-utils libaio" + +SRCREV = "b43dbc6711e43c0a32cc4d9df22884841d911d51" +PV = "1.0.79+git${SRCPV}" + +SRC_URI = "git://github.com/fujita/tgt.git;branch=master;protocol=https \ + file://0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch \ + file://0001-usr-Makefile-WARNING-fix.patch \ + file://usr-Makefile-apply-LDFLAGS-to-all-executables.patch \ +" +SRC_URI += "file://tgtd.init \ + file://tgtd.service \ + file://tgtd \ +" + +S = "${WORKDIR}/git" + +COMPATIBLE_HOST:libc-musl = "null" + +CONFFILES:${PN} += "${sysconfdir}/tgt/targets.conf" + +inherit update-rc.d systemd + +SYSTEMD_SERVICE:${PN} = "tgtd.service" +SYSTEMD_AUTO_ENABLE:${PN} = "disable" + +CFLAGS += ' -I. -DUSE_SIGNALFD -DUSE_TIMERFD -D_GNU_SOURCE -DTGT_VERSION=\\"1.0.63\\" -DBSDIR=\\"${libdir}/backing-store\\"' + +#do_compile() { +# oe_runmake SYSROOT="${STAGING_DIR_TARGET}" -e programs conf scripts +#} +EXTRA_OEMAKE = "-e programs conf scripts" + +do_install() { + oe_runmake -e DESTDIR="${D}" install-programs install-conf install-scripts + + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/tgtd.init ${D}${sysconfdir}/init.d/tgtd + elif ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/tgtd.service ${D}${systemd_unitdir}/system/tgtd.service + install -d ${D}${sysconfdir}/sysconfig + install -m 0644 ${WORKDIR}/tgtd ${D}${sysconfdir}/sysconfig/tgtd + sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/tgtd.service + sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' ${D}${systemd_unitdir}/system/tgtd.service + sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/tgtd.service + fi +} + +FILES:${PN} += "${systemd_unitdir}/system/tgtd.service \ + ${sysconfdir}/sysconfig/tgtd \ +" + +RDEPENDS:${PN} = " \ + bash \ + libaio \ + libconfig-general-perl \ + perl \ + perl-module-english \ + perl-module-tie-hash-namedcapture \ + perl-module-xsloader \ + perl-module-carp \ + perl-module-exporter \ + perl-module-errno \ + perl-module-exporter-heavy \ + perl-module-symbol \ + perl-module-selectsaver \ + perl-module-dynaloader \ + perl-module-carp-heavy \ + perl-module-filehandle \ + perl-module-feature \ + perl-module-overload \ + perl-module-fcntl \ + perl-module-io \ + perl-module-io-file \ + perl-module-io-handle \ + perl-module-io-seekable \ + perl-module-file-glob \ + perl-module-base \ + perl-module-encoding-warnings \ + perl-module-file-spec-unix \ + perl-module-file-spec \ + perl-module-file-spec-functions \ + perl-module-getopt-long \ + perl-module-constant \ + " +INITSCRIPT_PACKAGES = "${PN}" +INITSCRIPT_NAME:${PN} = "tgtd" + diff --git a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables/run-ptest b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables/run-ptest new file mode 100644 index 0000000000..611b844853 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables/run-ptest @@ -0,0 +1,2 @@ +#!/bin/sh +tests/shell/run-tests.sh -v diff --git a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_1.0.2.bb b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_1.0.2.bb index fd8e26ed1a..e078be79a1 100644 --- a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_1.0.2.bb +++ b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_1.0.2.bb @@ -11,11 +11,12 @@ UPSTREAM_CHECK_REGEX = "nftables-(?P<pver>\d+(\.\d+){2,}).tar.bz2" SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.bz2 \ file://0001-examples-compile-with-make-check-and-add-AM_CPPFLAGS.patch \ + file://run-ptest \ " SRC_URI[sha256sum] = "0b28a36ffcf4567b841de7bd3f37918b1fed27859eb48bdec51e1f7a83954c02" -inherit autotools manpages pkgconfig +inherit autotools manpages pkgconfig ptest PACKAGECONFIG ??= "python readline json" PACKAGECONFIG[json] = "--with-json, --without-json, jansson" @@ -32,3 +33,21 @@ RRECOMMENDS:${PN} += "kernel-module-nf-tables" PACKAGES =+ "${PN}-python" FILES:${PN}-python = "${nonarch_libdir}/${PYTHON_DIR}" RDEPENDS:${PN}-python = "python3-core python3-json ${PN}" + +RDEPENDS:${PN}-ptest += " make bash python3-core python3-ctypes python3-json python3-misc util-linux" + +TESTDIR = "tests" + +PRIVATE_LIBS:${PN}-ptest:append = "libnftables.so.1" + +do_install_ptest() { + cp -rf ${S}/build-aux ${D}${PTEST_PATH} + cp -rf ${S}/src ${D}${PTEST_PATH} + mkdir -p ${D}${PTEST_PATH}/src/.libs + cp -rf ${B}/src/.libs/* ${D}${PTEST_PATH}/src/.libs + cp -rf ${B}/src/.libs/nft ${D}${PTEST_PATH}/src/ + cp -rf ${S}/py ${D}${PTEST_PATH} + cp -rf ${S}/${TESTDIR} ${D}${PTEST_PATH}/${TESTDIR} + sed -i 's#/usr/bin/python#/usr/bin/python3#' ${D}${PTEST_PATH}/${TESTDIR}/json_echo/run-test.py + sed -i 's#/usr/bin/env python#/usr/bin/env python3#' ${D}${PTEST_PATH}/${TESTDIR}/py/nft-test.py +} diff --git a/meta-openembedded/meta-networking/recipes-protocols/frr/frr/frr.pam b/meta-openembedded/meta-networking/recipes-protocols/frr/frr/frr.pam new file mode 100644 index 0000000000..3541a975ae --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-protocols/frr/frr/frr.pam @@ -0,0 +1,13 @@ +# +# The PAM configuration file for the quagga `vtysh' service +# + +# This allows root to change user infomation without being +# prompted for a password +auth sufficient pam_rootok.so + +# The standard Unix authentication modules, used with +# NIS (man nsswitch) as well as normal /etc/passwd and +# /etc/shadow entries. +auth include common-auth + diff --git a/meta-openembedded/meta-networking/recipes-protocols/frr/frr_8.2.2.bb b/meta-openembedded/meta-networking/recipes-protocols/frr/frr_8.2.2.bb new file mode 100644 index 0000000000..91e306f08b --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-protocols/frr/frr_8.2.2.bb @@ -0,0 +1,121 @@ +SUMMARY = "BGP/OSPF/RIP routing daemon" +DESCRIPTION = "FRRouting is a free and open source Internet routing protocol suite for Linux \ +and Unix platforms. It implements BGP, OSPF, RIP, IS-IS, PIM, LDP, BFD, Babel, PBR, OpenFabric \ +and VRRP, with alpha support for EIGRP and NHRP." +HOMEPAGE = "https://frrouting.org/" +SECTION = "net" + +LICENSE = "GPL-2.0-only & LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING-LGPLv2.1;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/8.2 \ + file://frr.pam \ + " + +SRCREV = "79188bf710e92acf42fb5b9b0a2e9593a5ee9b05" + +S = "${WORKDIR}/git" + +# Due to libyang not supported on these arches: +COMPATIBLE_HOST:riscv32 = "null" +COMPATIBLE_HOST:riscv64 = "null" +COMPATIBLE_HOST:armv5 = "null" + +# Fail to build on mips64 with error: +# Error: PC-relative reference to a different section +COMPATIBLE_HOST:mips64 = "null" + +inherit autotools python3native pkgconfig useradd systemd + +DEPENDS:class-native = "bison-native elfutils-native" +DEPENDS:class-target = "bison-native json-c readline c-ares libyang frr-native" + +RDEPENDS:${PN}:class-target = "iproute2 python3-core bash" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" +PACKAGECONFIG:class-native = "" + +PACKAGECONFIG[pam] = "--with-libpam,--without-libpam,libpam" +PACKAGECONFIG[grpc] = "--enable-grpc,--disable-grpc,grpc-native grpc" +PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp" +PACKAGECONFIG[zeromq] = "--enable-zeromq,--disable-zeromq,zeromq" +PACKAGECONFIG[protobuf] = "--enable-protobuf,--disable-protobuf,protobuf-c-native protobuf-c" +PACKAGECONFIG[capabilities] = "--enable-capabilities,--disable-capabilities,libcap" +PACKAGECONFIG[cumulus] = "--enable-cumulus,--disable-cumulus" +PACKAGECONFIG[datacenter] = "--enable-datacenter,--disable-datacenter" +PACKAGECONFIG[ospfclient] = "--enable-ospfapi --enable-ospfclient,--disable-ospfapi --disable-ospfclient" + +EXTRA_OECONF:class-native = "--enable-clippy-only" + +EXTRA_OECONF:class-target = "--sbindir=${libdir}/frr \ + --sysconfdir=${sysconfdir}/frr \ + --localstatedir=${localstatedir}/run/frr \ + --enable-vtysh \ + --enable-fpm \ + --enable-multipath=64 \ + --enable-user=frr \ + --enable-group=frr \ + --enable-vty-group=frrvty \ + --enable-configfile-mask=0640 \ + --enable-logfile-mask=0640 \ + --disable-doc \ + --with-clippy=${RECIPE_SYSROOT_NATIVE}/usr/lib/clippy \ + " + +LDFLAGS:append:mips = " -latomic" +LDFLAGS:append:mipsel = " -latomic" +LDFLAGS:append:powerpc = " -latomic" + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN} = "frr.service" +SYSTEMD_AUTO_ENABLE = "disable" + +do_compile:class-native () { + oe_runmake clippy-only +} + +do_install:class-native () { + install -d ${D}${libdir} + install -m 755 ${WORKDIR}/build/lib/clippy ${D}${libdir}/clippy +} + +do_install:append:class-target () { + install -m 0755 -d ${D}${sysconfdir}/frr + install -m 0640 ${S}/tools/etc/frr/* ${D}${sysconfdir}/frr/ + chown frr:frrvty ${D}${sysconfdir}/frr + chown frr:frr ${D}${sysconfdir}/frr/* + chown frr:frrvty ${D}${sysconfdir}/frr/vtysh.conf + chmod 640 ${D}${sysconfdir}/frr/* + + if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then + install -d ${D}/${sysconfdir}/pam.d + install -m 644 ${WORKDIR}/frr.pam ${D}/${sysconfdir}/pam.d/frr + fi + + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${B}/tools/frrinit.sh ${D}${sysconfdir}/init.d/frr + + install -d ${D}${sysconfdir}/default/volatiles + echo "d frr frr 0755 ${localstatedir}/run/frr none" \ + > ${D}${sysconfdir}/default/volatiles/99_frr + fi + + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${B}/tools/frr*.service ${D}${systemd_system_unitdir} + + install -d ${D}${sysconfdir}/tmpfiles.d + echo "d /run/frr 0755 frr frr -" \ + > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf + fi +} + +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM:${PN} = "--system frr ; --system frrvty" +USERADD_PARAM:${PN} = "--system --home ${localstatedir}/run/frr/ -M -g frr -G frrvty --shell /bin/false frr" + +FILES:${PN} += "${datadir}/yang" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch index d976680e3b..84e3ad0968 100644 --- a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch @@ -1,18 +1,24 @@ -From 83764f5d57b3370e0b04a70f814ca49237a66eea Mon Sep 17 00:00:00 2001 +From 69011c7227ad1aaf08d5ab28e46f85dac951c597 Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> -Date: Thu, 5 Sep 2019 18:57:39 +0800 -Subject: [PATCH] drbd-utils: support usrmerge +Date: Thu, 21 Apr 2022 17:22:35 +0800 +Subject: [PATCH] drbd-utils: support usermerge Upstream-Status: Inappropriate[oe-specific] Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> --- - configure.ac | 2 +- - scripts/Makefile.in | 10 +++++----- - user/v83/Makefile.in | 14 +++++++------- - user/v84/Makefile.in | 14 +++++++------- - 4 files changed, 20 insertions(+), 20 deletions(-) + configure.ac | 2 +- + scripts/Makefile.in | 10 +++++----- + scripts/drbd-demote-or-escalate@.service | 2 +- + scripts/drbd-promote@.service | 4 ++-- + scripts/drbd-wait-promotable@.service | 2 +- + scripts/drbd.service | 6 +++--- + scripts/drbd@.service | 6 +++--- + scripts/ocf.ra@.service | 4 ++-- + user/v83/Makefile.in | 14 +++++++------- + user/v84/Makefile.in | 14 +++++++------- + 10 files changed, 32 insertions(+), 32 deletions(-) diff --git a/configure.ac b/configure.ac index ae575586..3d7deeae 100644 @@ -28,7 +34,7 @@ index ae575586..3d7deeae 100644 test x"$with_udev" = xyes ; then if test x"$PKG_CONFIG" != x; then diff --git a/scripts/Makefile.in b/scripts/Makefile.in -index fcd298e9..2521fb08 100644 +index fcd298e9..bab441a5 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -88,11 +88,11 @@ ifeq ($(subst both,systemd,$(initscripttype)),systemd) @@ -40,14 +46,97 @@ index fcd298e9..2521fb08 100644 - install -m 755 drbd-service-shim.sh $(DESTDIR)/lib/drbd/scripts - install -m 755 drbd-wait-promotable.sh $(DESTDIR)/lib/drbd/scripts - install -m 755 ocf.ra.wrapper.sh $(DESTDIR)/lib/drbd/scripts -+ install -d $(DESTDIR)/${nonarch_libdir}/drbdscripts -+ install -m 755 drbd $(DESTDIR)/${nonarch_libdir}/drbdscripts -+ install -m 755 drbd-service-shim.sh $(DESTDIR)/${nonarch_libdir}/drbdscripts -+ install -m 755 drbd-wait-promotable.sh $(DESTDIR)/${nonarch_libdir}/drbdscripts -+ install -m 755 ocf.ra.wrapper.sh $(DESTDIR)/${nonarch_libdir}/drbdscripts ++ install -d $(DESTDIR)/${nonarch_libdir}/drbd/scripts ++ install -m 755 drbd $(DESTDIR)/${nonarch_libdir}/drbd/scripts ++ install -m 755 drbd-service-shim.sh $(DESTDIR)/${nonarch_libdir}/drbd/scripts ++ install -m 755 drbd-wait-promotable.sh $(DESTDIR)/${nonarch_libdir}/drbd/scripts ++ install -m 755 ocf.ra.wrapper.sh $(DESTDIR)/${nonarch_libdir}/drbd/scripts install -d $(DESTDIR)$(tmpfilesdir)/ install -m 444 drbd.tmpfiles.conf $(DESTDIR)$(tmpfilesdir)/drbd.conf endif +diff --git a/scripts/drbd-demote-or-escalate@.service b/scripts/drbd-demote-or-escalate@.service +index 20932238..8b5ce4a2 100644 +--- a/scripts/drbd-demote-or-escalate@.service ++++ b/scripts/drbd-demote-or-escalate@.service +@@ -28,5 +28,5 @@ TimeoutSec=60 + # "Type=forking" would be an option to have it retry a number of times, + # and then only escalate to FailureAction if that did not help. + Type=oneshot +-ExecStart=/lib/drbd/scripts/drbd-service-shim.sh secondary-or-escalate %I ++ExecStart=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh secondary-or-escalate %I + ExecStopPost=-/bin/journalctl --sync +diff --git a/scripts/drbd-promote@.service b/scripts/drbd-promote@.service +index 71345d9b..678e0703 100644 +--- a/scripts/drbd-promote@.service ++++ b/scripts/drbd-promote@.service +@@ -24,5 +24,5 @@ RemainAfterExit=yes + # (ab)using systemd features + # if we cannot configure and promote, that's a condition, not a failure + # See the comment above wrt. FailureAction vs OnFailure +-ExecCondition=/lib/drbd/scripts/drbd-service-shim.sh primary %I +-ExecStop=/lib/drbd/scripts/drbd-service-shim.sh secondary %I ++ExecCondition=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh primary %I ++ExecStop=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh secondary %I +diff --git a/scripts/drbd-wait-promotable@.service b/scripts/drbd-wait-promotable@.service +index 81c3789f..3416abc6 100644 +--- a/scripts/drbd-wait-promotable@.service ++++ b/scripts/drbd-wait-promotable@.service +@@ -10,7 +10,7 @@ Type=oneshot + + # on first start, wait for access to "good data" + # let systemd handle timeouts +-ExecStart=/lib/drbd/scripts/drbd-wait-promotable.sh %I ++ExecStart=@nonarch_libdir@/drbd/scripts/drbd-wait-promotable.sh %I + RemainAfterExit=yes + + [Install] +diff --git a/scripts/drbd.service b/scripts/drbd.service +index 96c599e7..c81e95a6 100644 +--- a/scripts/drbd.service ++++ b/scripts/drbd.service +@@ -12,11 +12,11 @@ RemainAfterExit=yes + # A check for INIT_VERSION already exists, just set it to something. + Environment=INIT_VERSION=systemd + +-ExecStart=/lib/drbd/scripts/drbd start +-ExecStop=/lib/drbd/scripts/drbd stop ++ExecStart=@nonarch_libdir@/drbd/scripts/drbd start ++ExecStop=@nonarch_libdir@/drbd/scripts/drbd stop + + # Re-adjust everything on reload +-ExecReload=/lib/drbd/scripts/drbd reload ++ExecReload=@nonarch_libdir@/drbd/scripts/drbd reload + + [Install] + WantedBy=multi-user.target +diff --git a/scripts/drbd@.service b/scripts/drbd@.service +index 76514c5b..e2e500ba 100644 +--- a/scripts/drbd@.service ++++ b/scripts/drbd@.service +@@ -35,8 +35,8 @@ RemainAfterExit=yes + + # depends... do we want this as ExecCondition or as ExecStart + # failed start is "failed", failed condition is just "not startable yet" +-ExecStart=/lib/drbd/scripts/drbd-service-shim.sh adjust %I +-ExecReload=/lib/drbd/scripts/drbd-service-shim.sh adjust %I ++ExecStart=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh adjust %I ++ExecReload=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh adjust %I + + # can only succeed, if you first stop all depending services +-ExecStopPost=/lib/drbd/scripts/drbd-service-shim.sh down %I ++ExecStopPost=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh down %I +diff --git a/scripts/ocf.ra@.service b/scripts/ocf.ra@.service +index 9c2268a6..1666c482 100644 +--- a/scripts/ocf.ra@.service ++++ b/scripts/ocf.ra@.service +@@ -22,5 +22,5 @@ Environment=monitor_inverval=30 + # Only the first argument is used by the wrapper, + # the %n is just to identify which is which in the process list. + # All parameterization is done via Environment= in per instance override.conf +-ExecStart=/lib/drbd/scripts/ocf.ra.wrapper.sh start-and-monitor %n +-ExecStopPost=/lib/drbd/scripts/ocf.ra.wrapper.sh stop %n ++ExecStart=@nonarch_libdir@/drbd/scripts/ocf.ra.wrapper.sh start-and-monitor %n ++ExecStopPost=@nonarch_libdir@/drbd/scripts/ocf.ra.wrapper.sh stop %n diff --git a/user/v83/Makefile.in b/user/v83/Makefile.in index 08cfe574..4c4971b6 100644 --- a/user/v83/Makefile.in @@ -111,5 +200,5 @@ index 0fcefc5f..81f7d5ec 100644 spell: for f in drbdadm_adjust.c drbdadm_main.c drbdadm_parser.c drbdadm_usage_cnt.c drbdsetup.c drbdtool_common.c; do \ -- -2.33.0 +2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.20.2.bb b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.20.2.bb index 640e4e7858..deaab641e2 100644 --- a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.20.2.bb +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.20.2.bb @@ -10,9 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils;branch=${PV};protocol=https \ git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=git/drbd-headers;branch=master;protocol=https \ - ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-drbd-utils-support-usrmerge.patch','',d)} \ file://0001-drbdmon-add-LDFLAGS-when-linking.patch \ - " + ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-drbd-utils-support-usrmerge.patch','',d)} \ + " + SRCREV_drbd-utils = "087ee6b4961ca154d76e4211223b03149373bed8" SRCREV_drbd-headers = "f1529aa84e9d2f66c96ad283a1bbb708aabf03f7" @@ -47,6 +48,13 @@ do_install:append() { # don't install empty /var/lock and /var/run to avoid conflict with base-files rm -rf ${D}${localstatedir}/lock rm -rf ${D}${localstatedir}/run + + sed -i -e 's#@nonarch_libdir@#${nonarch_libdir}#g' ${D}${systemd_unitdir}/system/drbd-demote-or-escalate@.service + sed -i -e 's#@nonarch_libdir@#${nonarch_libdir}#g' ${D}${systemd_unitdir}/system/drbd-promote@.service + sed -i -e 's#@nonarch_libdir@#${nonarch_libdir}#g' ${D}${systemd_unitdir}/system/drbd-wait-promotable@.service + sed -i -e 's#@nonarch_libdir@#${nonarch_libdir}#g' ${D}${systemd_unitdir}/system/drbd.service + sed -i -e 's#@nonarch_libdir@#${nonarch_libdir}#g' ${D}${systemd_unitdir}/system/drbd@.service + sed -i -e 's#@nonarch_libdir@#${nonarch_libdir}#g' ${D}${systemd_unitdir}/system/ocf.ra@.service } RDEPENDS:${PN} += "bash perl-module-getopt-long perl-module-exporter perl-module-constant perl-module-overloading perl-module-exporter-heavy" diff --git a/meta-openembedded/meta-networking/recipes-support/htpdate/htpdate/0001-Make-environment-variables-assignments-to-be-weak.patch b/meta-openembedded/meta-networking/recipes-support/htpdate/htpdate/0001-Make-environment-variables-assignments-to-be-weak.patch deleted file mode 100644 index 0ee44c1621..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/htpdate/htpdate/0001-Make-environment-variables-assignments-to-be-weak.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 04603f52d793f964653e6a985944400fe4fa87ee Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 13 Jun 2018 17:50:20 -0700 -Subject: [PATCH] Make environment variables assignments to be weak - -So that OE can override them for cross builds - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - Makefile | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Makefile b/Makefile -index 1c80c09..884126c 100644 ---- a/Makefile -+++ b/Makefile -@@ -2,11 +2,11 @@ prefix = $(DESTDIR)/usr - bindir = ${prefix}/bin - mandir = ${prefix}/share/man - --CC = gcc -+CC ?= gcc - CFLAGS += -Wall -std=c99 -pedantic -O2 - --INSTALL = /usr/bin/install -c --STRIP = /usr/bin/strip -s -+INSTALL ?= /usr/bin/install -c -+STRIP ?= /usr/bin/strip -s - - all: htpdate - diff --git a/meta-openembedded/meta-networking/recipes-support/htpdate/htpdate/0001-Replace-ntp_adjtime-with-adjtimex.patch b/meta-openembedded/meta-networking/recipes-support/htpdate/htpdate/0001-Replace-ntp_adjtime-with-adjtimex.patch deleted file mode 100644 index cca8c6c364..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/htpdate/htpdate/0001-Replace-ntp_adjtime-with-adjtimex.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 75646a2d2df14fdbc4a01e222a779afac94861d1 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 14 Jun 2018 20:11:08 -0700 -Subject: [PATCH] Replace ntp_adjtime with adjtimex. - -ntp_adjtime in glibc is an alias to adjtimex and -musl does not provide ntp_adjtime at all - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - htpdate.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/htpdate.c b/htpdate.c -index 4171efe..ff0bf8d 100644 ---- a/htpdate.c -+++ b/htpdate.c -@@ -391,7 +391,7 @@ static int htpdate_adjtimex( double drift ) { - - /* Read current kernel frequency */ - tmx.modes = 0; -- ntp_adjtime(&tmx); -+ adjtimex(&tmx); - - /* Calculate new frequency */ - freq = (long)(65536e6 * drift); -@@ -406,7 +406,7 @@ static int htpdate_adjtimex( double drift ) { - - /* Become root */ - swuid(0); -- return( ntp_adjtime(&tmx) ); -+ return( adjtimex(&tmx) ); - - } - --- -2.17.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/htpdate/htpdate_1.2.2.bb b/meta-openembedded/meta-networking/recipes-support/htpdate/htpdate_1.3.3.bb index 156ea3c59b..d0cc414a64 100644 --- a/meta-openembedded/meta-networking/recipes-support/htpdate/htpdate_1.2.2.bb +++ b/meta-openembedded/meta-networking/recipes-support/htpdate/htpdate_1.3.3.bb @@ -1,8 +1,4 @@ -# Copyright (C) 2018 Khem Raj <raj.khem@gmail.com> -# Released under the MIT license (see COPYING.MIT for the terms) - SUMMARY = "HTTP based time synchronization tool" - DESCRIPTION = "The HTTP Time Protocol (HTP) is used to synchronize a computer's time with\ web servers as reference time source. This program can be used instead\ ntpdate or similar, in networks that has a firewall blocking the NTP port.\ @@ -12,18 +8,15 @@ DESCRIPTION = "The HTTP Time Protocol (HTP) is used to synchronize a computer's Htpdate works through proxy servers. Accuracy of htpdate will be usually\ within 0.5 seconds (better with multiple servers).\ " - -HOMEPAGE = "http://www.vervest.org/htp/" - +HOMEPAGE = "https://github.com/twekkel/htpdate" +BUGTRACKER = "https://github.com/twekkel/htpdate/issues" LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://htpdate.c;beginline=26;endline=30;md5=d7018a4d2c5a6eab392709a05e5e168a" +LIC_FILES_CHKSUM = "file://htpdate.c;beginline=26;endline=30;md5=2b6cdb94bd5349646d7e33f9f501eef7" + +SRC_URI = "http://www.vervest.org/htp/archive/c/htpdate-${PV}.tar.gz" +SRC_URI[sha256sum] = "74f34b013eba6f99369819fa4b3d48e9ab5e531ad04f6af59cc04e8777c76ed7" -SRC_URI = "http://www.vervest.org/htp/archive/c/htpdate-${PV}.tar.xz \ - file://0001-Make-environment-variables-assignments-to-be-weak.patch \ - file://0001-Replace-ntp_adjtime-with-adjtimex.patch \ - " -SRC_URI[md5sum] = "aad8c33933648532ac8716c809b15be1" -SRC_URI[sha256sum] = "5f1f959877852abb3153fa407e8532161a7abe916aa635796ef93f8e4119f955" +TARGET_CC_ARCH += "${LDFLAGS}" do_configure () { : @@ -36,4 +29,3 @@ do_compile () { do_install () { oe_runmake install 'INSTALL=install' 'STRIP=echo' 'DESTDIR=${D}' } - diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.3.2.bb b/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.3.3.bb index a9c6794bf5..c46a9784e3 100644 --- a/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.3.2.bb +++ b/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.3.3.bb @@ -32,8 +32,8 @@ LIC_FILES_CHKSUM = "file://pyldb.h;endline=24;md5=dfbd238cecad76957f7f860fbe9ada file://man/ldb.3.xml;beginline=261;endline=262;md5=137f9fd61040c1505d1aa1019663fd08 \ file://tools/ldbdump.c;endline=19;md5=a7d4fc5d1f75676b49df491575a86a42" -SRC_URI[md5sum] = "650a05f8a2b2e6455f590dc815a71879" -SRC_URI[sha256sum] = "1416c949dc4326e41c0d8a5ecf8ef784f8c0b6e9d3dad8fa971e84ad56227603" +SRC_URI[md5sum] = "6824f69ea3bb58cb8a3be4c179e7569a" +SRC_URI[sha256sum] = "9ef39700ff05b3e8f5801d2a39fe1ba023218650f81c9d377caca22f49076807" inherit pkgconfig waf-samba diff --git a/meta-openembedded/meta-networking/recipes-support/memcached/memcached/0002-stats_prefix.c-Check-for-NDEBUG-before-using-total_w.patch b/meta-openembedded/meta-networking/recipes-support/memcached/memcached/0002-stats_prefix.c-Check-for-NDEBUG-before-using-total_w.patch deleted file mode 100644 index 2979552a34..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/memcached/memcached/0002-stats_prefix.c-Check-for-NDEBUG-before-using-total_w.patch +++ /dev/null @@ -1,48 +0,0 @@ -From d6294e9166e4875a0572349aabcc5e51acbd2e3c Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 4 Jun 2021 11:33:12 -0700 -Subject: [PATCH] stats_prefix.c: Check for NDEBUG before using total_written - variable - -When using NDEBUG assert macro is ineffective which is caught by latest -clang and reports that total_written is set but unused. Therefore check -for NDEBUG to make sure assert is used only when its effective - -Fixes -error: variable 'total_written' set but not used [-Werror,-Wunused-but-set-variable] - size_t size = 0, written = 0, total_written = 0; - ^ -Upstream-Status: Submitted [https://github.com/memcached/memcached/pull/792] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - stats_prefix.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/stats_prefix.c b/stats_prefix.c -index 62f0d04..d72e514 100644 ---- a/stats_prefix.c -+++ b/stats_prefix.c -@@ -127,8 +127,10 @@ char *stats_prefix_dump(int *length) { - PREFIX_STATS *pfs; - char *buf; - int i, pos; -- size_t size = 0, written = 0, total_written = 0; -- -+ size_t size = 0, written = 0; -+#ifndef NDEBUG -+ size_t total_written = 0; -+#endif - /* - * Figure out how big the buffer needs to be. This is the sum of the - * lengths of the prefixes themselves, plus the size of one copy of -@@ -154,8 +156,10 @@ char *stats_prefix_dump(int *length) { - pfs->prefix, pfs->num_gets, pfs->num_hits, - pfs->num_sets, pfs->num_deletes); - pos += written; -+#ifndef NDEBUG - total_written += written; - assert(total_written < size); -+#endif - } - } - diff --git a/meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.6.9.bb b/meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.6.15.bb index adf3c34e11..b28bfe72b7 100644 --- a/meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.6.9.bb +++ b/meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.6.15.bb @@ -21,9 +21,8 @@ RDEPENDS:${PN} += "perl perl-module-posix perl-module-autoloader \ SRC_URI = "http://www.memcached.org/files/${BP}.tar.gz \ file://memcached-add-hugetlbfs-check.patch \ - file://0002-stats_prefix.c-Check-for-NDEBUG-before-using-total_w.patch \ " -SRC_URI[sha256sum] = "d5a62ce377314dbffdb37c4467e7763e3abae376a16171e613cbe69956f092d1" +SRC_URI[sha256sum] = "8d7abe3d649378edbba16f42ef1d66ca3f2ac075f2eb97145ce164388e6ed515" # set the same COMPATIBLE_HOST as libhugetlbfs COMPATIBLE_HOST = "(i.86|x86_64|powerpc|powerpc64|aarch64|arm).*-linux*" diff --git a/meta-openembedded/meta-networking/recipes-support/nbdkit/nbdkit_1.25.7.bb b/meta-openembedded/meta-networking/recipes-support/nbdkit/nbdkit_1.30.2.bb index 7eb99c1335..da24b1efd6 100644 --- a/meta-openembedded/meta-networking/recipes-support/nbdkit/nbdkit_1.25.7.bb +++ b/meta-openembedded/meta-networking/recipes-support/nbdkit/nbdkit_1.30.2.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f9dcc2d8acdde215fa4bd6ac12bb14f0" SRC_URI = "git://github.com/libguestfs/nbdkit.git;protocol=https;branch=master \ " -SRCREV = "babc2e2717c9025392dce613006a6ecae5886a57" +SRCREV = "b59380e061fdf0f114c13c226ea2a508f2c067d0" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_39.0.bb b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_40.0.bb index 5fb72c7acb..c567e3314b 100644 --- a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_39.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_40.0.bb @@ -6,7 +6,7 @@ DEPENDS = "libnl" RDEPENDS:${PN} = "bash perl" SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=master;protocol=https" -SRCREV = "b2fedc4b1b891afd2c26ebfd21f9e440e83c28ff" +SRCREV = "a3e69268892bbd5ab30123748e89a26509a25ac5" S = "${WORKDIR}/git" #Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md diff --git a/meta-openembedded/meta-networking/recipes-support/smcroute/smcroute_2.5.4.bb b/meta-openembedded/meta-networking/recipes-support/smcroute/smcroute_2.5.5.bb index 649e6d4e8e..b0b96bed8f 100644 --- a/meta-openembedded/meta-networking/recipes-support/smcroute/smcroute_2.5.4.bb +++ b/meta-openembedded/meta-networking/recipes-support/smcroute/smcroute_2.5.5.bb @@ -5,7 +5,7 @@ SECTION = "net" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SRCREV = "9b6e397595a154c84a329c55bed21e0c43e89ee6" +SRCREV = "9ca7441add4427a91fe90c34ae4a178ed9a50553" SRC_URI = "git://github.com/troglobit/smcroute.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.13.2.bb b/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.15.0.bb index 61a75d71f4..e5b649164d 100644 --- a/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.13.2.bb +++ b/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.15.0.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5308494bc0590c0cb036afd781d78f06" SRC_URI = "git://github.com/NLnetLabs/unbound.git;protocol=http;branch=master;protocol=https \ file://0001-contrib-add-yocto-compatible-init-script.patch \ " -SRCREV = "8e538dcaa8df2d0fab8ff3dcf94ac1f972450b66" +SRCREV = "c29b0e0a96c4d281aef40d69a11c564d6ed1a2c6" inherit autotools pkgconfig systemd update-rc.d diff --git a/meta-openembedded/meta-oe/README b/meta-openembedded/meta-oe/README index 676a2c8925..a7149f76bc 100644 --- a/meta-openembedded/meta-oe/README +++ b/meta-openembedded/meta-oe/README @@ -4,7 +4,7 @@ meta-oe This layer depends on: URI: git://github.com/openembedded/openembedded-core.git -branch: master +branch: kirkstone luajit recipe requires host compiler to be able to generate 32bit code when target is 32bit e.g. arm, so ensure that $CC -m32 is functional on build host, if building this recipe, needed @@ -16,10 +16,10 @@ pacman -S lib32-gcc-libs lib32-glibc Ubuntu sudo apt-get install gcc-multilib linux-libc-dev:i386 -Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-oe]' in the subject' +Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-oe][kirkstone]' in the subject' When sending single patches, please use something like: -'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix="meta-oe][PATCH"' +'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix="meta-oe][kirkstone][PATCH"' You are encouraged to fork the mirror on GitHub https://github.com/openembedded/meta-openembedded to share your patches, this is preferred for patch sets consisting of more than one patch. @@ -28,4 +28,4 @@ Other services like GitLab, repo.or.cz or self-hosted setups are of course accep 'git fetch <remote>' works the same on all of them. We recommend GitHub because it is free, easy to use, has been proven to be reliable and has a really good web GUI. -layer maintainer: Khem Raj <raj.khem@gmail.com> +layer maintainer: Armin Kuster <akuster808@gmail.com> diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_2.8.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_2.9.bb index 6ff98abe5f..82d515dfef 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_2.8.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_2.9.bb @@ -7,7 +7,7 @@ HOMEPAGE = "https://thingsboard.io/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -SRC_URI[sha256sum] = "35a8aa0268e61b15d689439927756934a28757dc77ad5f03ee6a9119edc37199" +SRC_URI[sha256sum] = "3341188a386726a5feb87e5fa04edb999de69e38ee8b4ea5b7d59165729ba0be" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Do-not-use-MINSIGSTKSZ.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Do-not-use-MINSIGSTKSZ.patch deleted file mode 100644 index 0ee64e9c6c..0000000000 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Do-not-use-MINSIGSTKSZ.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 027044a692b588ef586d495f65eb58b07cc711a3 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 11 May 2021 10:15:51 -0700 -Subject: [PATCH] Do not use MINSIGSTKSZ - -Since glibc 2.34+ MINSIGSTKSZ is no more a constant. So, -let's hardwire this for now until better fix is found. -64Kb should be good anyway - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/mongo/stdx/thread.h | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/src/mongo/stdx/thread.h b/src/mongo/stdx/thread.h -index f8058279e3..f31f309959 100644 ---- a/src/mongo/stdx/thread.h -+++ b/src/mongo/stdx/thread.h -@@ -104,10 +104,7 @@ private: - // . N Y : 4,344 | 13,048 | 7,352 - // . Y Y : 4,424 | 13,672 | 8,392 - // ( https://jira.mongodb.org/secure/attachment/233569/233569_stacktrace-writeup.txt ) -- static constexpr std::size_t kMongoMinSignalStackSize = std::size_t{64} << 10; -- -- static constexpr std::size_t kStackSize = -- std::max(kMongoMinSignalStackSize, std::size_t{MINSIGSTKSZ}); -+ static constexpr std::size_t kStackSize = std::size_t{64} << 10; - std::unique_ptr<std::byte[]> _stackStorage = std::make_unique<std::byte[]>(kStackSize); - - #else // !MONGO_HAS_SIGALTSTACK --- -2.31.1 - diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Use-explicit-typecast-to-size_t.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Use-explicit-typecast-to-size_t.patch deleted file mode 100644 index 5b724ff8aa..0000000000 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Use-explicit-typecast-to-size_t.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 6fdb2d304e05a17e57b2efd7f8252794a8722dbe Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 1 Jun 2021 08:25:36 -0700 -Subject: [PATCH] Use explicit typecast to size_t - -maxMemoryUsageBytes is size_t type which may not match long long value -internalDocumentSourceGroupMaxMemoryBytes.load() returns, so typecast it -to avoid narrowing warning from clang - -document_source_group.cpp:378:22: error: non-constant-expression cannot be narrowed from type 'long long' to 'size_t' (aka 'unsigned int') in initializer list [-Wc++11-narrowing] - maxMemoryUsageBytes ? *maxMemoryUsageBytes - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Upstream-Status: Submitted [https://github.com/mongodb/mongo/pull/1405] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/mongo/db/pipeline/document_source_group.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/mongo/db/pipeline/document_source_group.cpp b/src/mongo/db/pipeline/document_source_group.cpp -index c7bf44e72e..a52906a940 100644 ---- a/src/mongo/db/pipeline/document_source_group.cpp -+++ b/src/mongo/db/pipeline/document_source_group.cpp -@@ -376,7 +376,7 @@ DocumentSourceGroup::DocumentSourceGroup(const intrusive_ptr<ExpressionContext>& - _doingMerge(false), - _memoryTracker{pExpCtx->allowDiskUse && !pExpCtx->inMongos, - maxMemoryUsageBytes ? *maxMemoryUsageBytes -- : internalDocumentSourceGroupMaxMemoryBytes.load()}, -+ : (size_t)internalDocumentSourceGroupMaxMemoryBytes.load()}, - _initialized(false), - _groups(pExpCtx->getValueComparator().makeUnorderedValueMap<Accumulators>()), - _spilled(false) { --- -2.31.1 - diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-add-explict-static_cast-size_t-to-maxMemoryUsageByte.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-add-explict-static_cast-size_t-to-maxMemoryUsageByte.patch new file mode 100644 index 0000000000..de05624429 --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-add-explict-static_cast-size_t-to-maxMemoryUsageByte.patch @@ -0,0 +1,38 @@ +From ad37ee80b32a1f740a3197105174d74dff11e4e8 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 13 Apr 2022 13:56:32 -0700 +Subject: [PATCH] add explict static_cast<size_t> to maxMemoryUsageBytes + +Fixes +src/mongo/db/pipeline/document_source_group.cpp:377:22: error: non-constant-expression cannot be narrowed from type 'long long' to 'size_t' (aka 'unsigned int') in initializer list [-Wc++11-narrowing] + maxMemoryUsageBytes ? *maxMemoryUsageBytes + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +src/mongo/db/pipeline/document_source_group.cpp:377:22: note: insert an explicit cast to silence this issue + maxMemoryUsageBytes ? *maxMemoryUsageBytes + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/mongo/db/pipeline/document_source_group.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/mongo/db/pipeline/document_source_group.cpp b/src/mongo/db/pipeline/document_source_group.cpp +index 4a7b48d6cd2..9a6076c6041 100644 +--- a/src/mongo/db/pipeline/document_source_group.cpp ++++ b/src/mongo/db/pipeline/document_source_group.cpp +@@ -374,8 +374,8 @@ DocumentSourceGroup::DocumentSourceGroup(const intrusive_ptr<ExpressionContext>& + _usedDisk(false), + _doingMerge(false), + _memoryTracker{pExpCtx->allowDiskUse && !pExpCtx->inMongos, +- maxMemoryUsageBytes ? *maxMemoryUsageBytes +- : internalDocumentSourceGroupMaxMemoryBytes.load()}, ++ static_cast<size_t>(maxMemoryUsageBytes ? *maxMemoryUsageBytes ++ : internalDocumentSourceGroupMaxMemoryBytes.load())}, + // We spill to disk in debug mode, regardless of allowDiskUse, to stress the system. + _file(!pExpCtx->inMongos && (pExpCtx->allowDiskUse || kDebugBuild) + ? std::make_shared<Sorter<Value, Value>::File>(pExpCtx->tempDir + "/" + +-- +2.35.2 + diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-server-Adjust-the-cache-alignment-assumptions.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-server-Adjust-the-cache-alignment-assumptions.patch new file mode 100644 index 0000000000..bf083c85f4 --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-server-Adjust-the-cache-alignment-assumptions.patch @@ -0,0 +1,37 @@ +From 5c9e0d0fc9188bab0ae09c9c33df01938b0c1b6c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 14 Apr 2022 09:25:33 -0700 +Subject: [PATCH] server: Adjust the cache alignment assumptions + +aarch64 has 256 for hardware_destructive_interference_size and gcc 12 +has added a warning to complain about mismatches which results in +static_assert failures + +In file included from src/mongo/s/commands/cluster_find_cmd.cpp:39: +src/mongo/db/stats/counters.h:185:47: error: static assertion failed: cache line spill + 185 | static_assert(sizeof(decltype(_together)) <= stdx::hardware_constructive_interference_size, + | ~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The structure need to ensure true sharing for both the elements +so align it to hardware_constructive_interference_size instead + +Upstream-Status: Reported [https://jira.mongodb.org/browse/SERVER-65664] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/mongo/db/stats/counters.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/src/mongo/db/stats/counters.h ++++ b/src/mongo/db/stats/counters.h +@@ -182,8 +182,8 @@ private: + AtomicWord<long long> requests{0}; + }; + CacheAligned<Together> _together{}; +- static_assert(sizeof(decltype(_together)) <= stdx::hardware_constructive_interference_size, +- "cache line spill"); ++ static_assert(sizeof(Together) <= stdx::hardware_constructive_interference_size, ++ "cache line spill"); + + CacheAligned<AtomicWord<long long>> _logicalBytesOut{0}; + diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb index 1215344d97..7ea728aad4 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb @@ -11,9 +11,9 @@ DEPENDS = "openssl libpcap zlib boost curl python3 \ inherit scons dos2unix siteinfo python3native systemd useradd -PV = "4.4.7" -#v4.4.7 -SRCREV = "abb6b9c2bf675e9e2aeaecba05f0f8359d99e203" +PV = "4.4.13" +#v4.4.13 +SRCREV = "df25c71b8674a78e17468f48bcda5285decb9246" SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.4;protocol=https \ file://0001-Tell-scons-to-use-build-settings-from-environment-va.patch \ file://0001-Use-long-long-instead-of-int64_t.patch \ @@ -29,9 +29,9 @@ SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.4;protocol=https \ file://0001-include-needed-c-header.patch \ file://disable_runtime_check.patch \ file://ppc64_ARCH_BITS.patch \ - file://0001-Do-not-use-MINSIGSTKSZ.patch \ - file://0001-Use-explicit-typecast-to-size_t.patch \ file://PTHREAD_STACK_MIN.patch \ + file://0001-add-explict-static_cast-size_t-to-maxMemoryUsageByte.patch \ + file://0001-server-Adjust-the-cache-alignment-assumptions.patch \ " SRC_URI:append:libc-musl ="\ file://0001-Mark-one-of-strerror_r-implementation-glibc-specific.patch \ diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78_78.15.0.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78_78.15.0.bb index 3700d88c24..c23950301e 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78_78.15.0.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78_78.15.0.bb @@ -27,6 +27,7 @@ S = "${WORKDIR}/firefox-${@d.getVar("PV").replace("esr", "")}" DEPENDS = " \ autoconf-2.13-native \ icu-native \ + icu \ cargo-native \ zlib \ python3-six \ @@ -48,6 +49,7 @@ EXTRA_OECONF = " \ --without-system-icu \ --disable-tests --disable-strip --disable-optimize \ --disable-jemalloc \ + --with-system-icu \ ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', "--enable-gold", '--disable-gold', d)} \ ${JIT} \ " diff --git a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0001-libmatrix-Include-missing-utility-header.patch b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0001-libmatrix-Include-missing-utility-header.patch new file mode 100644 index 0000000000..959a18e5eb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0001-libmatrix-Include-missing-utility-header.patch @@ -0,0 +1,24 @@ +From 45cb02332b38b2059e7e44369c3d8684492a7def Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 12 Apr 2022 11:41:41 -0700 +Subject: [PATCH] libmatrix: Include missing <utility> header + +Fixes build with gcc12 +| ../git/src/libmatrix/program.h:43:21: error: 'exchange' is not a member of 'std' | 43 | ready_(std::exchange(shader.ready_, false)), | | ^~~~~~~~ + +Upstream-Status: Submitted [https://github.com/glmark2/glmark2/pull/174] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/libmatrix/program.h | 1 + + 1 file changed, 1 insertion(+) + +--- a/src/libmatrix/program.h ++++ b/src/libmatrix/program.h +@@ -13,6 +13,7 @@ + #define PROGRAM_H_ + + #include <string> ++#include <utility> + #include <vector> + #include <map> + #include "mat.h" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb index 47d927397c..1406f68b05 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb @@ -17,6 +17,7 @@ SRC_URI = " \ git://github.com/glmark2/glmark2.git;protocol=https;branch=master \ file://0001-fix-dispmanx-build.patch \ file://0002-run-dispmanx-fullscreen.patch \ + file://0001-libmatrix-Include-missing-utility-header.patch \ " SRCREV = "0858b450cd88c84a15b99dda9698d44e7f7e8c70" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_10.8.1.bb b/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_10.8.2.bb index 6d181a5bb5..825f7024e7 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_10.8.1.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_10.8.2.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SECTION = "console/tests" SRC_URI = "http://www.phoronix-test-suite.com/releases/${BP}.tar.gz" -SRC_URI[md5sum] = "9f107c080407b7ac195bb04e6cabb83b" -SRC_URI[sha256sum] = "3b58ea694419ca608d729fa6ce72ed2b4c51af444729eefbcdc6e670290caa7f" +SRC_URI[md5sum] = "459c3c45b39bb3d720ddc8ba5f944332" +SRC_URI[sha256sum] = "86681343d20415831ab16ef6c3d1c317e2345e771925e0698ae920a03a9eaab6" S = "${WORKDIR}/phoronix-test-suite" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.18.bb b/meta-openembedded/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.19.bb index 8a27cf9b90..b4cbb792ce 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.18.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.19.bb @@ -7,11 +7,10 @@ compliant operating systems" SUMMARY = "libmtp is an Initiator implementation of the Media Transfer Protocol (MTP)" HOMEPAGE = "http://libmtp.sourceforge.net/" LICENSE = "LGPL-2.1-or-later" -LIC_FILES_CHKSUM = "\ - file://COPYING;md5=0448d3676bc0de00406af227d341a4d1 \ - file://src/ptp.c;beginline=3;endline=22;md5=303cc4422fd549ef8689aded20434a9a \ - file://examples/albums.c;beginline=5;endline=21;md5=84f4e55dfec49e898b7f68a828c15620 \ -" +LIC_FILES_CHKSUM = "file://COPYING;md5=0448d3676bc0de00406af227d341a4d1 \ + file://src/ptp.c;beginline=3;endline=22;md5=80fd2d5904c4c1f5455d8f4bf515292f \ + file://examples/albums.c;beginline=5;endline=21;md5=84f4e55dfec49e898b7f68a828c15620 \ + " BBCLASSEXTEND = "native" @@ -21,8 +20,7 @@ DEPENDS:append:class-target = " ${BPN}-native" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" SRC_URI:append:class-target = " file://0001-Use-native-mtp-hotplug.patch" -SRC_URI[md5sum] = "7915496daa3f4ea3e095f0161f83d4d4" -SRC_URI[sha256sum] = "7280fe50c044c818a06667f45eabca884deab3193caa8682e0b581e847a281f0" +SRC_URI[sha256sum] = "deb4af6f63f5e71215cfa7fb961795262920b4ec6cb4b627f55b30b18aa33228" inherit autotools pkgconfig lib_package diff --git a/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh_1.3.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh_1.3.2.bb index 0921db5e01..b4b5aa78a0 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh_1.3.2.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh_1.3.2.bb @@ -36,7 +36,7 @@ NEEDED_PERL_MODULES = "\ # mosh uses SSH to authenticate and the client uses OpenSSH-specific features RDEPENDS:${PN} += "openssh-ssh ${NEEDED_PERL_MODULES}" # The server seemed not to work with dropbear either -RDEPENDS:${PN}-server += "openssh-sshd ${NEEDED_PERL_MODULES}" +RDEPENDS:${PN}-server += "openssh-sshd" # Fails to build with thumb-1 (qemuarm) #| {standard input}: Assembler messages: diff --git a/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift_0.14.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift_0.16.0.bb index 014613e5d6..2d601a2f9d 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift_0.14.2.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift_0.16.0.bb @@ -11,8 +11,7 @@ DEPENDS = "thrift-native boost flex-native bison-native openssl zlib" SRC_URI = "https://www-eu.apache.org/dist/thrift//${PV}/${BPN}-${PV}.tar.gz \ file://0001-DefineInstallationPaths.cmake-Define-libdir-in-terms.patch \ " -SRC_URI[md5sum] = "284a48df355aa3910687ee9b894d3ae8" -SRC_URI[sha256sum] = "4191bfc0b7490e20cc69f9f4dc6e991fbb612d4551aa9eef1dbf7f4c47ce554d" +SRC_URI[sha256sum] = "f460b5c1ca30d8918ff95ea3eb6291b3951cf518553566088f3f2be8981f6209" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb b/meta-openembedded/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb index 487681c92d..c8dabc5ead 100644 --- a/meta-openembedded/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb @@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4cf0188f02184e1e84b9586ac53c3f83" SRC_URI = "git://github.com/dbus-cxx/dbus-cxx.git;branch=master;protocol=https \ file://0001-Include-typeinfo-for-typeid.patch \ + file://0001-include-utility-header.patch \ " SRC_URI:append:libc-musl = "file://fix_build_musl.patch" SRCREV = "73532d6a5faae9c721c2cc9535b8ef32d4d18264" diff --git a/meta-openembedded/meta-oe/recipes-core/dbus-cxx/files/0001-include-utility-header.patch b/meta-openembedded/meta-oe/recipes-core/dbus-cxx/files/0001-include-utility-header.patch new file mode 100644 index 0000000000..0c8262af75 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/dbus-cxx/files/0001-include-utility-header.patch @@ -0,0 +1,32 @@ +From 63170cfcfbf483716ce2599e165db80713fc2706 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 12 Apr 2022 06:47:19 -0700 +Subject: [PATCH] include utility header + +Needed for exchange from std namespace + +Fixes +dbus-cxx/variant.cpp:135:25: error: 'exchange' is not a member of 'std' + +Upstream-Status: Submitted [https://github.com/dbus-cxx/dbus-cxx/pull/98] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + dbus-cxx/variant.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/dbus-cxx/variant.cpp b/dbus-cxx/variant.cpp +index bcf2684..97b622c 100644 +--- a/dbus-cxx/variant.cpp ++++ b/dbus-cxx/variant.cpp +@@ -11,6 +11,7 @@ + #include <dbus-cxx/dbus-cxx-private.h> + #include <dbus-cxx/signatureiterator.h> + #include <stdint.h> ++#include <utility> + #include "enums.h" + #include "path.h" + #include "signature.h" +-- +2.35.1 + diff --git a/meta-openembedded/meta-oe/recipes-core/opencl/ocl-icd_2.3.0.bb b/meta-openembedded/meta-oe/recipes-core/opencl/ocl-icd_2.3.1.bb index 1746e21dbf..ae9c5bc811 100644 --- a/meta-openembedded/meta-oe/recipes-core/opencl/ocl-icd_2.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-core/opencl/ocl-icd_2.3.1.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1238d5bccbb6bda30654e48dcc0a554b" SRC_URI = "git://github.com/OCL-dev/ocl-icd.git;protocol=https;branch=master" -SRCREV = "59c098b6b1f97a339e3e5308499aee6538ecea40" +SRCREV = "1165deedb2ae741cd76e60986f7c2cb5023059d9" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-core/safec/safec_3.5.1.bb b/meta-openembedded/meta-oe/recipes-core/safec/safec_3.7.1.bb index 4b121599e0..5ffe7d7528 100644 --- a/meta-openembedded/meta-oe/recipes-core/safec/safec_3.5.1.bb +++ b/meta-openembedded/meta-oe/recipes-core/safec/safec_3.7.1.bb @@ -7,8 +7,7 @@ SECTION = "lib" inherit autotools pkgconfig S = "${WORKDIR}/git" -# v08112019 -SRCREV = "ad76c7b1dbd0403b0c9decf54164fcce271c590f" +SRCREV = "f9add9245b97c7bda6e28cceb0ee37fb7e254fd8" SRC_URI = "git://github.com/rurban/safeclib.git;branch=master;protocol=https \ " diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_250.3.bb b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_250.3.bb index 6d72eb64b3..6bb5f7abb8 100644 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_250.3.bb +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_250.3.bb @@ -59,6 +59,8 @@ EXTRA_OEMESON += "-Dstatic-libsystemd=pic" S = "${WORKDIR}/git" +RDEPENDS:${PN}-dev = "" + do_compile() { ninja -v ${PARALLEL_MAKE} version.h ninja -v ${PARALLEL_MAKE} libsystemd.a diff --git a/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.8.5.bb b/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.8.6.bb index 705f531f10..50ce50d1c2 100644 --- a/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.8.5.bb +++ b/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.8.6.bb @@ -9,7 +9,7 @@ inherit cml1 update-alternatives SRC_URI = "http://www.landley.net/toybox/downloads/${BPN}-${PV}.tar.gz \ " -SRC_URI[sha256sum] = "bfd230c187726347f7e31a1fc5841705871dfe4f3cbc6628f512b54e57360949" +SRC_URI[sha256sum] = "4298c90a2b238348e4fdc9f89eb4988356c80da3f0cf78c279d2e82b9119034b" SECTION = "base" diff --git a/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-kcapi-kernel-if-Adjust-for-musl-msghdr-struct-compat.patch b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-kcapi-kernel-if-Adjust-for-musl-msghdr-struct-compat.patch deleted file mode 100644 index 687eb359cf..0000000000 --- a/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-kcapi-kernel-if-Adjust-for-musl-msghdr-struct-compat.patch +++ /dev/null @@ -1,81 +0,0 @@ -From d54e532821d40f8094a49742831d32ec7e76caed Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 16 Dec 2021 15:18:21 -0800 -Subject: [PATCH] kcapi-kernel-if: Adjust for musl msghdr struct compatibility - -musl sticks to POSIX and defines msg_iovlen and msg_controllen as int -and socklen_t types respectively whereas glibc and kernel mark them as -size_t which is them assumed as such in the code here as well, Make the -needed conversions to get it going on musl/linux also see [1] for more -info - -[1] https://git.musl-libc.org/cgit/musl/commit/?id=7168790763cdeb794df52be6e3b39fbb021c5a64 - -Upstream-Status: Submitted [https://github.com/smuellerDD/libkcapi/pull/131] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - lib/kcapi-kernel-if.c | 22 ++++++++++++++++++---- - 1 file changed, 18 insertions(+), 4 deletions(-) - -diff --git a/lib/kcapi-kernel-if.c b/lib/kcapi-kernel-if.c -index 739841e..e5d15d4 100644 ---- a/lib/kcapi-kernel-if.c -+++ b/lib/kcapi-kernel-if.c -@@ -168,10 +168,14 @@ ssize_t _kcapi_common_send_meta(struct kcapi_handle *handle, - } - - msg.msg_control = buffer_p; -- msg.msg_controllen = bufferlen; - msg.msg_iov = iov; -+#ifdef __GLIBC__ - msg.msg_iovlen = iovlen; -- -+ msg.msg_controllen = bufferlen; -+#else -+ msg.msg_iovlen = (int)iovlen; -+ msg.msg_controllen = (socklen_t)bufferlen; -+#endif - /* encrypt/decrypt operation */ - header = CMSG_FIRSTHDR(&msg); - if (!header) { -@@ -193,7 +197,11 @@ ssize_t _kcapi_common_send_meta(struct kcapi_handle *handle, - } - header->cmsg_level = SOL_ALG; - header->cmsg_type = ALG_SET_IV; -+#ifdef __GLIBC__ - header->cmsg_len = iv_msg_size; -+#else -+ header->cmsg_len = (socklen_t)iv_msg_size; -+#endif - alg_iv = (void*)CMSG_DATA(header); - alg_iv->ivlen = tfm->info.ivsize; - memcpy(alg_iv->iv, handle->cipher.iv, tfm->info.ivsize); -@@ -244,8 +252,11 @@ ssize_t _kcapi_common_send_data(struct kcapi_handle *handle, - msg.msg_controllen = 0; - msg.msg_flags = 0; - msg.msg_iov = iov; -+#ifdef __GLIBC__ - msg.msg_iovlen = iovlen; -- -+#else -+ msg.msg_iovlen = (int)iovlen; -+#endif - ret = sendmsg(*_kcapi_get_opfd(handle), &msg, (int)flags); - if (ret < 0) - ret = -errno; -@@ -542,8 +553,11 @@ ssize_t _kcapi_common_recv_data(struct kcapi_handle *handle, - msg.msg_controllen = 0; - msg.msg_flags = 0; - msg.msg_iov = iov; -+#ifdef __GLIBC__ - msg.msg_iovlen = iovlen; -- -+#else -+ msg.msg_iovlen = (int)iovlen; -+#endif - ret = recvmsg(*_kcapi_get_opfd(handle), &msg, 0); - if (ret < 0) - ret = -errno; --- -2.34.1 - diff --git a/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_1.3.1.bb b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_1.4.0.bb index 8ff5ddd175..3be8c76b54 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_1.3.1.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_1.4.0.bb @@ -1,12 +1,11 @@ SUMMARY = "Linux Kernel Crypto API User Space Interface Library" HOMEPAGE = "http://www.chronox.de/libkcapi.html" LICENSE = "BSD-3-Clause | GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=80c467906eb826339c7f09e61808ed23" +LIC_FILES_CHKSUM = "file://COPYING;md5=a2562899bc38f1735868f0bf0c1dd1a5" S = "${WORKDIR}/git" -SRCREV = "2936ecd060c299157ac880650ba2c9fd94d27bb1" +SRCREV = "1429ab42d48123cc8f73b96c69a87fb9c6d8a7c9" SRC_URI = "git://github.com/smuellerDD/libkcapi.git;branch=master;protocol=https \ - file://0001-kcapi-kernel-if-Adjust-for-musl-msghdr-struct-compat.patch \ " inherit autotools @@ -27,5 +26,7 @@ do_install:append() { } CPPFLAGS:append:libc-musl:toolchain-clang = " -Wno-error=sign-compare" +CPPFLAGS:remove:libc-musl:toolchain-clang = "-Wno-error=sign-conversion" +CPPFLAGS:append:libc-musl = " -Wno-error=sign-conversion" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.28.bb b/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.28.0.bb index 68ae94bdbe..68ae94bdbe 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.28.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.28.0.bb diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-Link-with-libatomic-on-rv32-rv64.patch b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-Link-with-libatomic-on-rv32-rv64.patch new file mode 100644 index 0000000000..c2afd4a92e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-Link-with-libatomic-on-rv32-rv64.patch @@ -0,0 +1,32 @@ +From 592a4aaba20818bcff9a1448c34b09aff9e0d2e9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 19 Apr 2022 16:07:19 -0700 +Subject: [PATCH] cmake: Link with libatomic on rv32/rv64 + +Fixes +riscv64-yoe-linux-musl/12.0.1/ld: libgrpc.so.23.0.0: undefined reference to `__atomic_exchange_1' +| collect2: error: ld returned 1 exit status + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a8fd3bf37b3..9f5b242683d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -303,6 +303,9 @@ if(UNIX) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) + set(_gRPC_ALLTARGETS_LIBRARIES ${_gRPC_ALLTARGETS_LIBRARIES} rt) + endif() ++ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv32") ++ set(_gRPC_ALLTARGETS_LIBRARIES ${_gRPC_ALLTARGETS_LIBRARIES} atomic) ++ endif() + endif() + + # configure ccache if requested +-- +2.36.0 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.45.2.bb b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.45.2.bb index 48d0f58e20..c2f952fc64 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.45.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.45.2.bb @@ -25,6 +25,7 @@ BRANCH = "v1.45.x" SRC_URI = "git://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \ file://0001-Revert-Changed-GRPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch \ file://0001-cmake-add-separate-export-for-plugin-targets.patch \ + file://0001-cmake-Link-with-libatomic-on-rv32-rv64.patch \ " # Fixes build with older compilers 4.8 especially on ubuntu 14.04 CXXFLAGS:append:class-native = " -Wl,--no-as-needed" diff --git a/meta-openembedded/meta-oe/recipes-devtools/lapack/lapack_3.9.0.bb b/meta-openembedded/meta-oe/recipes-devtools/lapack/lapack_3.10.0.bb index a87dbf0481..c82761ac34 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/lapack/lapack_3.9.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/lapack/lapack_3.10.0.bb @@ -1,7 +1,7 @@ SUMMARY = "Linear Algebra PACKage" URL = "http://www.netlib.org/lapack" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=930f8aa500a47c7dab0f8efb5a1c9a40" +LIC_FILES_CHKSUM = "file://LICENSE;md5=39902829ba0c2cbac1b0debfb75a416b" # Recipe needs FORTRAN support (copied from conf/local.conf.sample.extended) # Enabling FORTRAN @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=930f8aa500a47c7dab0f8efb5a1c9a40" DEPENDS = "libgfortran" -SRCREV = "6acc99d5f39130be7cec00fb835606042101a970" +SRCREV = "aa631b4b4bd13f6ae2dbab9ae9da209e1e05b0fc" SRC_URI = "git://github.com/Reference-LAPACK/lapack.git;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-ppc-plt-do-not-free-symbol-libsym.patch b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-ppc-plt-do-not-free-symbol-libsym.patch new file mode 100644 index 0000000000..4793e561c0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-ppc-plt-do-not-free-symbol-libsym.patch @@ -0,0 +1,29 @@ +From f47672bed5905ae382e80b09dafca9a8da45aa67 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 19 Apr 2022 18:44:36 -0700 +Subject: [PATCH] ppc/plt: do not free symbol libsym + +delete_symbol_chain() will call free as well if sybol is non-null +it also fixes use-after-free warnings that compiler emits + +Upstream-Status: Submitted [https://gitlab.com/cespedes/ltrace/-/merge_requests/2] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + sysdeps/linux-gnu/ppc/plt.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/sysdeps/linux-gnu/ppc/plt.c b/sysdeps/linux-gnu/ppc/plt.c +index 5f81889..7c1c025 100644 +--- a/sysdeps/linux-gnu/ppc/plt.c ++++ b/sysdeps/linux-gnu/ppc/plt.c +@@ -687,7 +687,6 @@ arch_elf_add_func_entry(struct process *proc, struct ltelf *lte, + if (libsym == NULL + || library_symbol_init(libsym, addr, full_name, 1, + LS_TOPLT_NONE) < 0) { +- free(libsym); + delete_symbol_chain(libsym); + libsym = NULL; + fprintf(stderr, "Couldn't add symbol %s" +-- +2.36.0 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb index ad58428718..72bec301fb 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb @@ -30,6 +30,7 @@ SRC_URI = "git://github.com/sparkleholic/ltrace.git;branch=master;protocol=http; file://0001-ensure-the-struct-pointers-are-null-initilized.patch \ file://0001-ppc-Remove-unused-host_powerpc64-function.patch \ file://0001-mips-Use-hardcodes-values-for-ABI-syscall-bases.patch \ + file://0001-ppc-plt-do-not-free-symbol-libsym.patch \ " SRC_URI:append:libc-musl = " file://add_ppc64le.patch" diff --git a/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_5.5.bb b/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_6.1.bb index 8049434109..3abecc3054 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_5.5.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_6.1.bb @@ -10,8 +10,7 @@ RDEPENDS:${PN} = "python3 python3-modules" inherit python3native SRC_URI = "https://www.mercurial-scm.org/release/${BP}.tar.gz" -SRC_URI[md5sum] = "17b21729cbc61dda80b2e3dfc046319f" -SRC_URI[sha256sum] = "c1ed28e1534304a7a4981ed59905286d1c56acd5b75755eedd184171a4a782b4" +SRC_URI[sha256sum] = "86f98645e4565a9256991dcde22b77b8e7d22ca6fbb60c1f4cdbd8469a38cc1f" S = "${WORKDIR}/mercurial-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_3.4.3.bb b/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_4.0.2.bb index 52648eb18b..d277f7e71c 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_3.4.3.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_4.0.2.bb @@ -6,7 +6,7 @@ LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=bd4d7ab13df98988b1ca2a4e01c8c163" SRC_URI = "http://www.mpich.org/static/downloads/${PV}/mpich-${PV}.tar.gz" -SRC_URI[sha256sum] = "8154d89f3051903181018166678018155f4c2b6f04a9bb6fe9515656452c4fd7" +SRC_URI[sha256sum] = "5a42f1a889d4a2d996c26e48cbf9c595cbf4316c6814f7c181e3320d21dedd42" RDEPENDS:${PN} += "bash perl libxml2" @@ -40,8 +40,8 @@ inherit autotools gettext pkgconfig do_configure() { for d in confdb test/mpi test/mpi/confdb src/pm/hydra/confdb \ src/pm/hydra/tools/topo/hwloc/hwloc/config src/pm/hydra/mpl/confdb \ - modules/yaksa/m4 modules/json-c modules/ucx test/mpi/dtpools/confdb \ - src/mpl/confdb src/mpi/romio/confdb; do + modules/yaksa/m4 modules/json-c modules/ucx modules/hwloc/config \ + test/mpi/dtpools/confdb src/mpl/confdb src/mpi/romio/confdb; do install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/$d install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/$d done diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-mips-Use-32bit-cast-for-operand-on-mips32.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-mips-Use-32bit-cast-for-operand-on-mips32.patch new file mode 100644 index 0000000000..a0242d8e18 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-mips-Use-32bit-cast-for-operand-on-mips32.patch @@ -0,0 +1,34 @@ +From e65dde8db17da5acddeef7eb9316199c4e5e0811 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 19 Apr 2022 12:40:25 -0700 +Subject: [PATCH] mips: Use 32bit cast for operand on mips32 + +Fixes +deps/v8/src/compiler/backend/mips/code-generator-mips.cc: In member function 'void v8::internal::compiler::CodeGenerator::AssembleReturn(v8::internal::compiler::InstructionOperand*)': +../deps/v8/src/compiler/backend/mips/code-generator-mips.cc:4233:48: error: call of overloaded 'Operand(int64_t)' is ambiguous + 4233 | Operand(static_cast<int64_t>(0))); + | ^ + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + deps/v8/src/compiler/backend/mips/code-generator-mips.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/deps/v8/src/compiler/backend/mips/code-generator-mips.cc b/deps/v8/src/compiler/backend/mips/code-generator-mips.cc +index 2b8197e..b226140 100644 +--- a/deps/v8/src/compiler/backend/mips/code-generator-mips.cc ++++ b/deps/v8/src/compiler/backend/mips/code-generator-mips.cc +@@ -4230,7 +4230,7 @@ void CodeGenerator::AssembleReturn(InstructionOperand* additional_pop_count) { + } else if (FLAG_debug_code) { + __ Assert(eq, AbortReason::kUnexpectedAdditionalPopValue, + g.ToRegister(additional_pop_count), +- Operand(static_cast<int64_t>(0))); ++ Operand(static_cast<int32_t>(0))); + } + } + // Functions with JS linkage have at least one parameter (the receiver). +-- +2.36.0 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_16.14.0.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_16.14.2.bb index 0ab68cc608..62188f94a7 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_16.14.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_16.14.2.bb @@ -26,6 +26,7 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ file://mips-less-memory.patch \ file://system-c-ares.patch \ file://0001-liftoff-Correct-function-signatures.patch \ + file://0001-mips-Use-32bit-cast-for-operand-on-mips32.patch \ " SRC_URI:append:class-target = " \ file://0002-Using-native-binaries.patch \ @@ -36,7 +37,7 @@ SRC_URI:append:toolchain-clang:x86 = " \ SRC_URI:append:toolchain-clang:powerpc64le = " \ file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \ " -SRC_URI[sha256sum] = "05eb64193e391fa8a2c159c0f60c171824715165f80c67fcab9dbc944e30c623" +SRC_URI[sha256sum] = "e922e215cc68eb5f94d33e8a0b61e2c863b7731cc8600ab955d3822da90ff8d1" S = "${WORKDIR}/node-v${PV}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/octave/octave_6.4.0.bb b/meta-openembedded/meta-oe/recipes-devtools/octave/octave_7.1.0.bb index a5b00ece8a..c9982a7bb2 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/octave/octave_6.4.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/octave/octave_7.1.0.bb @@ -32,7 +32,7 @@ SRC_URI = " \ ${GNU_MIRROR}/octave/${BPN}-${PV}.tar.gz \ file://fix-blas-library-integer-size.patch \ " -SRC_URI[sha256sum] = "b48f33d4fceaf394cfbea73a8c850000936d83a41739a24f7568b5b0a7b39acd" +SRC_URI[sha256sum] = "d4a9d81f3f67b4a6e07cb7a80dcb10ad5e9176fcc30762c70a81580a64b8b0b6" # Note: Qt5Help is required for gui -> qttools(-native) must be build with # clang in PACKAGECONFIG diff --git a/meta-openembedded/meta-oe/recipes-devtools/pax-utils/pax-utils_1.2.2.bb b/meta-openembedded/meta-oe/recipes-devtools/pax-utils/pax-utils_1.3.3.bb index 0eb2146265..d512c85704 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/pax-utils/pax-utils_1.2.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/pax-utils/pax-utils_1.3.3.bb @@ -8,8 +8,7 @@ LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" SRC_URI = "https://dev.gentoo.org/~vapier/dist/pax-utils-${PV}.tar.xz" -SRC_URI[md5sum] = "a580468318f0ff42edf4a8cd314cc942" -SRC_URI[sha256sum] = "7f4a7f8db6b4743adde7582fa48992ad01776796fcde030683732f56221337d9" +SRC_URI[sha256sum] = "eeca7fbd98bc66bead4a77000c2025d9f17ea8201b84245882406ce00b9b6b14" RDEPENDS:${PN} += "bash" diff --git a/meta-openembedded/meta-oe/recipes-devtools/perl/libconfig-general-perl_2.63.bb b/meta-openembedded/meta-oe/recipes-devtools/perl/libconfig-general-perl_2.63.bb new file mode 100644 index 0000000000..b12e2e4ba5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/perl/libconfig-general-perl_2.63.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Config file parser module" +HOMEPAGE = "http://search.cpan.org/dist/Config-General/" +LICENSE = "Artistic-1.0 | GPL-1.0-or-later" +SECTION = "libs" +LIC_FILES_CHKSUM = "file://README;beginline=90;endline=90;md5=3ba4bbac1e79a08332688196f637d2b2" + +SRCNAME = "Config-General" + +SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TL/TLINDEN/${SRCNAME}-${PV}.tar.gz" + +SRC_URI[md5sum] = "e3ea2a6dc76931cf638b5227aceabf60" +SRC_URI[sha256sum] = "0a9bf977b8aabe76343e88095d2296c8a422410fd2a05a1901f2b20e2e1f6fad" + +S = "${WORKDIR}/${SRCNAME}-${PV}" + +COMPATIBLE_HOST:libc-musl = "null" + +EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR}" + +inherit cpan + +do_compile() { + export LIBC="$(find ${STAGING_DIR_TARGET}/${base_libdir}/ -name 'libc-*.so')" + cpan_do_compile +} diff --git a/meta-openembedded/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.0.2.bb b/meta-openembedded/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.1.4.bb index 580c53a323..c57324d89c 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.0.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.1.4.bb @@ -1,7 +1,7 @@ SUMMARY = "New set of tools for working with SquashFS images" SECTION = "base" LICENSE = "GPL-3.0-or-later & LGPL-3.0-or-later & MIT & BSD-2-Clause & Zlib" -LIC_FILES_CHKSUM = "file://COPYING.md;md5=c0de2c0aca56349dab98e97992316f7e \ +LIC_FILES_CHKSUM = "file://COPYING.md;md5=5789fb0572753ed69014cd90a445cd74 \ file://licenses/GPLv3.txt;md5=1ebbd3e34237af26da5dc08a4e440464 \ file://licenses/hash_table.txt;md5=874823605326caeaabaa95bfbd0f9fb0 \ file://licenses/LGPLv3.txt;md5=3000208d539ec061b899bce1d9ce9404 \ @@ -9,9 +9,10 @@ LIC_FILES_CHKSUM = "file://COPYING.md;md5=c0de2c0aca56349dab98e97992316f7e \ file://licenses/xxhash.txt;md5=f042a9be092bd6d7fe6f217d8d00f4ca \ file://licenses/xz.txt;md5=1c389b9610ccfdb25f7abaea6a0bb5a4 \ file://licenses/zlib.txt;md5=ae27c72096606131f760e5f59cf98b06 \ - file://licenses/zstd.txt;md5=8df8137b630239cbdd4c0674124cb0c8" + file://licenses/zstd.txt;md5=8df8137b630239cbdd4c0674124cb0c8 \ + " -SRCREV = "b96f0fc154feef531be76034bf6e38925636146f" +SRCREV = "7667b84cc34707c28ca0db8d24f046ec34e8c25d" SRC_URI = "git://github.com/AgentD/squashfs-tools-ng.git;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-cmake-Link-with-libatomic-on-rv32-rv64.patch b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-cmake-Link-with-libatomic-on-rv32-rv64.patch new file mode 100644 index 0000000000..7b40b7a67e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-cmake-Link-with-libatomic-on-rv32-rv64.patch @@ -0,0 +1,45 @@ +From dd2d42a7f877d292f86e421dd9651f4b7c2abf18 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 19 Apr 2022 14:57:58 -0700 +Subject: [PATCH] cmake: Link with libatomic on rv32/rv64 + +Use of <atomic> needs to link in libatomic on riscv +Fixes + +undefined reference to `__atomic_exchange_1' + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/lib/CMakeLists.txt | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt +index 3293376..65018be 100644 +--- a/src/lib/CMakeLists.txt ++++ b/src/lib/CMakeLists.txt +@@ -37,6 +37,12 @@ else() + set(SOCKET_LIBRARY socket) + endif() + ++if(CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv32") ++ set(ATOMIC_LIBRARY atomic) ++else() ++ set(ATOMIC_LIBRARY "") ++endif() ++ + if(HAVE_FUNC_PTHREAD_SETNAME_NP) + add_definitions(-DDLT_USE_PTHREAD_SETNAME_NP) + message(STATUS "Using pthread_setname_np API to set thread name") +@@ -44,7 +50,7 @@ else() + message(STATUS "pthread_setname_np API not available on this platform") + endif() + +-target_link_libraries(dlt ${RT_LIBRARY} ${SOCKET_LIBRARY} Threads::Threads) ++target_link_libraries(dlt ${RT_LIBRARY} ${SOCKET_LIBRARY} ${ATOMIC_LIBRARY} Threads::Threads) + + target_include_directories(dlt + PUBLIC +-- +2.36.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.8.bb b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.8.bb index 014c773584..2cea50dfb0 100644 --- a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.8.bb +++ b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.8.bb @@ -17,6 +17,7 @@ DEPENDS = "zlib gzip-native json-c" SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https;branch=master \ file://0002-Don-t-execute-processes-as-a-specific-user.patch \ file://0004-Modify-systemd-config-directory.patch \ + file://0001-cmake-Link-with-libatomic-on-rv32-rv64.patch \ " SRCREV = "0138c00811c86eab4ff6bff3c6528163885ade19" @@ -24,6 +25,8 @@ PV .= "+2.18.9git${SRCPV}" S = "${WORKDIR}/git" +LDFLAGS:append:riscv64 = " -latomic" + PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd systemd-watchdog systemd-journal dlt-examples dlt-adaptor dlt-console ', '', d)} \ udp-connection dlt-system dlt-filetransfer " # dlt-dbus diff --git a/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb index 7343a08c7d..fe5e5c067d 100644 --- a/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb @@ -7,7 +7,7 @@ LICENSE = "gnuplot" LIC_FILES_CHKSUM = "file://Copyright;md5=243a186fc2fd3b992125d60d5b1bab8f" DEPENDS = "${BPN}-native virtual/libx11 gd readline" -inherit autotools features_check +inherit autotools features_check pkgconfig # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_2.9.0.bb b/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_2.9.6.bb index dac025de7c..2112b62769 100644 --- a/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_2.9.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_2.9.6.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4a26952467ef79a7efca4a9cf52d417b" SRC_URI = "https://github.com/ice-wm/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.lz \ file://0001-configure.ac-skip-running-test-program-when-cross-co.patch \ " -SRC_URI[sha256sum] = "c76a8c9965a1edde4f2446b47ee17c8564e0e20f3d8474465f6d4c54d1125ac4" +SRC_URI[sha256sum] = "f8f453fc1f0009e3e7f113fd128638770894d004a3b60202922e2c7347c30607" UPSTREAM_CHECK_URI = "https://github.com/ice-wm/${BPN}/releases" @@ -23,7 +23,7 @@ DEPENDS = "asciidoc-native fontconfig fribidi gdk-pixbuf imlib2 libxft libxpm li libxinerama libice libsm libx11 libxext libxrender libxcomposite libxdamage \ libxfixes" DEPENDS:append = " qemu-native" -RDEPENDS:${PN} = "perl fribidi" +RDEPENDS:${PN} = "perl fribidi imlib2 imlib2-loaders" do_compile:prepend:class-target() { diff --git a/meta-openembedded/meta-oe/recipes-extended/linuxconsole/linuxconsole/0001-utils-Use-name-of-the-first-prerequisite-in-rule.patch b/meta-openembedded/meta-oe/recipes-extended/linuxconsole/linuxconsole/0001-utils-Use-name-of-the-first-prerequisite-in-rule.patch new file mode 100644 index 0000000000..bbfed0fd82 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/linuxconsole/linuxconsole/0001-utils-Use-name-of-the-first-prerequisite-in-rule.patch @@ -0,0 +1,37 @@ +From 25f54c3359a0fa34890030662e9b02e0a9745f4f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 13 Apr 2022 20:57:38 -0700 +Subject: [PATCH] utils: Use name of the first prerequisite in rule + +Use $< instead of $^ because the latter will specify both pre-requisite +inputattach.c serio-ids.h files on same compiler cmdline and clang does +not like that and errors out like below + +clang-14: error: cannot specify -o when generating multiple output files + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + utils/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/utils/Makefile b/utils/Makefile +index 1fc51ab..a7434a9 100644 +--- a/utils/Makefile ++++ b/utils/Makefile +@@ -46,10 +46,10 @@ endif + evdev-joystick: evdev-joystick.c + + inputattach: inputattach.c serio-ids.h +- $(CC) $(CFLAGS) $(CPPFLAGS) -funsigned-char $^ $(LDFLAGS) $(SYSTEMDFLAGS) -lm -o $@ ++ $(CC) $(CFLAGS) $(CPPFLAGS) -funsigned-char $< $(LDFLAGS) $(SYSTEMDFLAGS) -lm -o $@ + + ffcfstress: ffcfstress.c bitmaskros.h +- $(CC) $(CFLAGS) $(CPPFLAGS) -funsigned-char $^ $(LDFLAGS) -lm -o $@ ++ $(CC) $(CFLAGS) $(CPPFLAGS) -funsigned-char $< $(LDFLAGS) -lm -o $@ + + ffmvforce.o: ffmvforce.c + $(CC) $(CFLAGS) $(CPPFLAGS) -c $^ -o $@ `$(PKG_CONFIG) --cflags sdl2` +-- +2.35.2 + diff --git a/meta-openembedded/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.0.bb b/meta-openembedded/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.1.bb index b706f634ed..5716817e95 100644 --- a/meta-openembedded/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.1.bb @@ -12,13 +12,14 @@ DEPENDS = "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" SRC_URI = "\ ${SOURCEFORGE_MIRROR}/linuxconsole/linuxconsoletools-${PV}.tar.bz2 \ + file://0001-utils-Use-name-of-the-first-prerequisite-in-rule.patch \ file://51-these-are-not-joysticks-rm.rules \ file://60-joystick.rules \ file://inputattachctl \ file://inputattach.service \ " -SRC_URI[sha256sum] = "95d112f06393806116341d593bda002c8bc44119c1538407623268fed90d8c34" +SRC_URI[sha256sum] = "bd4d4b7e37da02fc67e47ddf20b6f1243c0a7af7b02b918d5e72138ea8727547" S = "${WORKDIR}/linuxconsoletools-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-extended/logwatch/logwatch_7.5.3.bb b/meta-openembedded/meta-oe/recipes-extended/logwatch/logwatch_7.6.bb index b2fb7718e2..8cb88157db 100644 --- a/meta-openembedded/meta-oe/recipes-extended/logwatch/logwatch_7.5.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/logwatch/logwatch_7.6.bb @@ -8,12 +8,11 @@ the package on many systems.\ SECTION = "devel" HOMEPAGE = "http://www.logwatch.org/" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=ad199c8aca74e70f296f731ad9a1521c" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ba882fa9b4b6b217a51780be3f4db9c8" RDEPENDS:${PN} = "perl" SRC_URI = "http://jaist.dl.sourceforge.net/project/${BPN}/${BP}/${BP}.tar.gz" -SRC_URI[md5sum] = "8bcf3edc5a4687c8aad1b9c01e2be54b" -SRC_URI[sha256sum] = "1b2b96879dec01cd02754fe00f8989b11ff16158c3dc7c4aff0faa4b1d34974b" +SRC_URI[sha256sum] = "689f3c68b99ef7af7d3c7007c3ff0a55d5674bdbf9c01f69a9f187726d6d4baf" do_install() { install -m 0755 -d ${D}${sysconfdir}/logwatch/scripts diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91_91.4.0.bb b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91_91.8.0.bb index dd02ed94cb..af9256860c 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91_91.4.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-91_91.8.0.bb @@ -16,13 +16,14 @@ SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/fire file://0001-util.configure-fix-one-occasionally-reproduced-confi.patch \ file://0001-rewrite-cargo-host-linker-in-python3.patch \ " -SRC_URI[sha256sum] = "e722829db490f9332712a81c35996541737bbfb05232d47190fee779c4fcb327" +SRC_URI[sha256sum] = "d483a853cbf5c7f93621093432e3dc0b7ed847f2a5318b964828d19f9f087f3a" S = "${WORKDIR}/firefox-${@d.getVar("PV").replace("esr", "")}" inherit pkgconfig perlnative python3native rust -DEPENDS += "zlib cargo-native python3" +DEPENDS += "zlib cargo-native python3 icu" +DEPENDS:remove:mipsarch = "icu" B = "${WORKDIR}/build" @@ -39,8 +40,9 @@ export AS = "${CC}" export RUSTFLAGS JIT ?= "" - JIT:mipsarch = "--disable-jit" +ICU ?= "--with-system-icu" +ICU:mipsarch = "" do_configure() { cd ${B} @@ -51,8 +53,9 @@ do_configure() { --prefix=${prefix} \ --libdir=${libdir} \ --disable-jemalloc \ - ${JIT} - + --disable-strip \ + ${JIT} \ + ${ICU} } do_install() { diff --git a/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb/0001-include-stdexcept-for-std-invalid_argument.patch b/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb/0001-include-stdexcept-for-std-invalid_argument.patch deleted file mode 100644 index 0a93411533..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb/0001-include-stdexcept-for-std-invalid_argument.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3e97c9004f4ec58ca3696ee6298f91e6eeb76e04 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 23 Dec 2019 14:46:25 -0800 -Subject: [PATCH] include <stdexcept> for std::invalid_argument - -Upstream-Status: Submitted [https://github.com/rmbreak/pam_ldapdb/pull/11] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - pam_ldapdb.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/pam_ldapdb.cpp b/pam_ldapdb.cpp -index 9baf1e6..be5d85c 100644 ---- a/pam_ldapdb.cpp -+++ b/pam_ldapdb.cpp -@@ -1,5 +1,6 @@ - #include <map> - #include <string> -+#include <stdexcept> - #include <utility> - #include <syslog.h> - #include <pwd.h> --- -2.24.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb b/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.1.bb index 6985590068..d5137f80af 100644 --- a/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.1.bb @@ -10,10 +10,8 @@ DEPENDS = "libpam openldap" inherit features_check REQUIRED_DISTRO_FEATURES = "pam" -SRCREV = "84d7b260f1ae6857ae36e014c9a5968e8aa1cbe8" -SRC_URI = "git://github.com/rmbreak/pam_ldapdb;branch=master;protocol=https \ - file://0001-include-stdexcept-for-std-invalid_argument.patch \ -" +SRCREV = "3e026863cad1fd45c760ee1bc93ef4f0606cc852" +SRC_URI = "git://github.com/rmbreak/pam_ldapdb;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_3.2.1.bb b/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_3.2.5.bb index f0ae229414..b4e0d17b37 100644 --- a/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_3.2.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_3.2.5.bb @@ -3,8 +3,8 @@ HOMEPAGE="https://github.com/taocpp/PEGTL" LICENSE="MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=5b6701671289d12b7ffa69138832c006" -SRC_URI = "git://github.com/taocpp/PEGTL.git;protocol=https;branch=main" -SRCREV = "6d03c8decc22b4ddd51115e2170e0e82413c7104" +SRC_URI = "git://github.com/taocpp/PEGTL.git;protocol=https;branch=3.x" +SRCREV = "eeba7fa1180655bd683be620cc31be35607442ca" inherit cmake diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_7.0-rc1.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_7.0-rc3.bb index 1a95771548..e977d67f6b 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_7.0-rc1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_7.0-rc3.bb @@ -19,7 +19,7 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ file://GNU_SOURCE.patch \ file://0006-Define-correct-gregs-for-RISCV32.patch \ " -SRC_URI[sha256sum] = "9bd57d3c9ebba9dbbd6cd14b0c263ce151b0044fb6620b556449c2d82e06ef3d" +SRC_URI[sha256sum] = "66b2ecc2e4b53c62940589434ea8af3a85546df131001680ed294028cd84ecdc" inherit autotools-brokensep update-rc.d systemd useradd diff --git a/meta-openembedded/meta-oe/recipes-extended/s-nail/s-nail_14.9.23.bb b/meta-openembedded/meta-oe/recipes-extended/s-nail/s-nail_14.9.24.bb index 4dbb99b3d5..bc514b577a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/s-nail/s-nail_14.9.23.bb +++ b/meta-openembedded/meta-oe/recipes-extended/s-nail/s-nail_14.9.24.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=87266591c81260f10221f1f38872d023" SRC_URI = "https://ftp.sdaoden.eu/${BP}.tar.xz \ file://make-errors.patch" -SRC_URI[sha256sum] = "2c717b22f4cd8719b82b6618640da6031382d2bf8eb51283bca2c6266957bca8" +SRC_URI[sha256sum] = "2714d6b8fb2af3b363fc7c79b76d058753716345d1b6ebcd8870ecd0e4f7ef8c" DEPENDS = "coreutils-native" diff --git a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2022-1122.patch b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2022-1122.patch new file mode 100644 index 0000000000..8aa9c15e33 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2022-1122.patch @@ -0,0 +1,31 @@ +Upstream-Status: Backport [https://github.com/uclouvain/openjpeg/commit/0afbdcf3e6d0d2bd2e16a0c4d513ee3cf86e460d] +CVE: CVE-2022-1122 + +While this patch improves things re-CVE-2022-1122, the defect is undergoing re-analysis and there may be follow-up commits. + +From 0afbdcf3e6d0d2bd2e16a0c4d513ee3cf86e460d Mon Sep 17 00:00:00 2001 +From: xiaoxiaoafeifei <lliangliang2007@163.com> +Date: Wed, 14 Jul 2021 09:35:13 +0800 +Subject: [PATCH] Fix segfault in src/bin/jp2/opj_decompress.c due to + uninitialized pointer (fixes #1368) (#1369) + +--- + src/bin/jp2/opj_decompress.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/bin/jp2/opj_decompress.c b/src/bin/jp2/opj_decompress.c +index 0e028735..18ead672 100644 +--- a/src/bin/jp2/opj_decompress.c ++++ b/src/bin/jp2/opj_decompress.c +@@ -1356,7 +1356,7 @@ int main(int argc, char **argv) + int it_image; + num_images = get_num_images(img_fol.imgdirpath); + +- dirptr = (dircnt_t*)malloc(sizeof(dircnt_t)); ++ dirptr = (dircnt_t*)calloc(1, sizeof(dircnt_t)); + if (!dirptr) { + destroy_parameters(¶meters); + return EXIT_FAILURE; +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.4.0.bb b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.4.0.bb index b41bb9eb8a..f248619ec8 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.4.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.4.0.bb @@ -10,6 +10,7 @@ SRC_URI = " \ file://0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \ file://0001-This-patch-fixed-include-dir-to-usr-include-.-Obviou.patch \ file://CVE-2021-29338.patch \ + file://CVE-2022-1122.patch \ " SRCREV = "37ac30ceff6640bbab502388c5e0fa0bff23f505" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner/0001-memmove-and-memchr-are-C-APIs-not-C-std-namespace.patch b/meta-openembedded/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner/0001-memmove-and-memchr-are-C-APIs-not-C-std-namespace.patch new file mode 100644 index 0000000000..2316c1ffdf --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner/0001-memmove-and-memchr-are-C-APIs-not-C-std-namespace.patch @@ -0,0 +1,45 @@ +From 98bef35c010a9c7891634fe9bcc4b560abbcb4e9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 12 Apr 2022 11:29:50 -0700 +Subject: [PATCH] memmove and memchr are C APIs not C++ std namespace + +Fixes build error +../git/src/deqp-runner.cc: In member function 'Line_reader::read_status Line_reader::read(char**, double)': +../git/src/deqp-runner.cc:249:10: error: 'memmove' is not a member of 'std'; did you mean 'wmemmove'? + 249 | std::memmove(buf_.data(), buf_.data() + skip_sz_, valid_sz_); + | ^~~~~~~ + | wmemmove +../git/src/deqp-runner.cc:255:35: error: 'memchr' is not a member of 'std'; did you mean 'wmemchr'? + 255 | while (!(newline = (char *)std::memchr(buf_.data(), '\n', valid_sz_)) && + | ^~~~~~ + | wmemchr + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/parallel-deqp-runner/-/merge_requests/17] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/deqp-runner.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/deqp-runner.cc b/src/deqp-runner.cc +index 1cc8a55..55a15f9 100644 +--- a/src/deqp-runner.cc ++++ b/src/deqp-runner.cc +@@ -246,13 +246,13 @@ Line_reader::read_status Line_reader::read(char **text, double timeout) { + + if (skip_sz_) { + valid_sz_ -= skip_sz_; +- std::memmove(buf_.data(), buf_.data() + skip_sz_, valid_sz_); ++ memmove(buf_.data(), buf_.data() + skip_sz_, valid_sz_); + skip_sz_ = 0; + } + + char *newline; + bool end = false; +- while (!(newline = (char *)std::memchr(buf_.data(), '\n', valid_sz_)) && ++ while (!(newline = (char *)memchr(buf_.data(), '\n', valid_sz_)) && + !end && valid_sz_ + 1 < (int)buf_.size()) { + for (;;) { + struct pollfd p = {}; +-- +2.35.1 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb b/meta-openembedded/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb index 52723d7af1..eff6ad8f83 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb @@ -3,6 +3,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4f59d6446bf2e004e80df1a0937129fa" SRC_URI = "git://gitlab.freedesktop.org/mesa/parallel-deqp-runner.git;protocol=https;branch=master \ file://0001-meson.build-WORKAROUND-Remove-vulkan-dependency.patch \ + file://0001-memmove-and-memchr-are-C-APIs-not-C-std-namespace.patch \ " # Modify these as desired diff --git a/meta-openembedded/meta-oe/recipes-graphics/suckless/st_0.8.4.bb b/meta-openembedded/meta-oe/recipes-graphics/suckless/st_0.8.5.bb index acd4cab965..e88c2c0f09 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/suckless/st_0.8.4.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/suckless/st_0.8.5.bb @@ -7,7 +7,7 @@ inherit pkgconfig features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[sha256sum] = "d42d3ceceb4d6a65e32e90a5336e3d446db612c3fbd9ebc1780bc6c9a03346a6" +SRC_URI[sha256sum] = "ea6832203ed02ff74182bcb8adaa9ec454c8f989e79232cb859665e2f544ab37" DEPENDS += "libx11 libxft fontconfig ncurses-native" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/twm_1.0.11.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/twm_1.0.12.bb index 0c259dc3a0..91b1abc211 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/twm_1.0.11.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/twm_1.0.12.bb @@ -6,8 +6,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=4c6d42ef60e8166aa26606524c0b9586" SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "48e83210b39a7bfb492604ba0bcfb19e" -SRC_URI[sha256sum] = "410ecabac54e6db7afd5c20a78d89c0134f3c74b149bee71b1fec775e6e060cc" +SRC_URI[sha256sum] = "4150c9ec595520167ab8c4efcb5cf82641a4c4db78ce0a1cb4834e6aeb7c87fb" FILES:${PN} += "${datadir}/X11/twm/system.twmrc" ALTERNATIVE_NAME = "x-window-manager" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_368.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_372.bb index 8f6a7ef766..3e1e9d7042 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_368.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_372.bb @@ -2,13 +2,13 @@ require recipes-graphics/xorg-app/xorg-app-common.inc SUMMARY = "xterm is the standard terminal emulator for the X Window System" DEPENDS = "libxaw xorgproto libxext libxau libxinerama libxpm ncurses desktop-file-utils-native" -LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=987de9787175385203a1ea2482246a17" +LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=5ec6748ed90e588caa9318b780a0d498" SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ file://0001-Add-configure-time-check-for-setsid.patch \ " -SRC_URI[sha256sum] = "2ff5169930b6b49ef0bafb5e1331c94f1a98c310442bba7798add821c76ae712" +SRC_URI[sha256sum] = "c6d08127cb2409c3a04bcae559b7025196ed770bb7bf26630abcb45d95f60ab1" PACKAGECONFIG ?= "" PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native" diff --git a/meta-openembedded/meta-oe/recipes-kernel/libbpf/libbpf_0.5.0.bb b/meta-openembedded/meta-oe/recipes-kernel/libbpf/libbpf_0.7.0.bb index 067f58b79d..461e6b05ed 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/libbpf/libbpf_0.5.0.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/libbpf/libbpf_0.7.0.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://../LICENSE.LGPL-2.1;md5=b370887980db5dd40659b50909238 DEPENDS = "zlib elfutils" SRC_URI = "git://github.com/libbpf/libbpf.git;protocol=https;branch=master" -SRCREV = "5579664205e42194e1921d69d0839f660c801a4d" +SRCREV = "2cd2d03f63242c048a896179398c68d2dbefe3d6" PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_HOST = "(x86_64|i.86|aarch64|riscv64|powerpc64).*-linux" diff --git a/meta-openembedded/meta-oe/recipes-kernel/libpfm/libpfm4_4.11.0.bb b/meta-openembedded/meta-oe/recipes-kernel/libpfm/libpfm4_4.11.0.bb index e476370e05..d2d2512b2c 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/libpfm/libpfm4_4.11.0.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/libpfm/libpfm4_4.11.0.bb @@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "5da5f8872bde14b3634c9688d980f68bda28b510268723cc12973eedba UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/perfmon2/files/libpfm4/" -EXTRA_OEMAKE = "DESTDIR=\"${D}\" PREFIX=\"${prefix}\" LIBDIR=\"${libdir}\" LDCONFIG=\"true\"" +EXTRA_OEMAKE = "DESTDIR=\"${D}\" PREFIX=\"${prefix}\" LIBDIR=\"${libdir}\" LDCONFIG=\"true\" DBG='-g -Wall -Wextra -Wno-unused-parameter'" EXTRA_OEMAKE:append:powerpc = " ARCH=\"powerpc\"" EXTRA_OEMAKE:append:powerpc64 = " ARCH=\"powerpc\" BITMODE=\"64\"" EXTRA_OEMAKE:append:powerpc64le = " ARCH=\"powerpc\" BITMODE=\"64\"" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.8.2.bb b/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.11.0.bb index 0e12587a20..8fd4f698d7 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.8.2.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.11.0.bb @@ -7,9 +7,9 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=d5b04755015be901744a78cc30d390d4" -SRCREV = "7ec7a33a081aeeb53fed1a8d87e4cbd189152527" -SRC_URI += "git://chromium.googlesource.com/webm/libvpx;protocol=https;branch=master \ - file://libvpx-configure-support-blank-prefix.patch \ +SRCREV = "626ff35955c2c35b806b3e0ecf551a1a8611cdbf" +SRC_URI += "git://chromium.googlesource.com/webm/libvpx;protocol=https;branch=main \ + file://libvpx-configure-support-blank-prefix.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.23.1.bb b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.23.1.bb index c11d4c76d6..410db92bd0 100644 --- a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.23.1.bb +++ b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.23.1.bb @@ -73,11 +73,13 @@ do_install:append() { install -m 0644 ${S}/packaging/deb/etc_default_gpsd ${D}${sysconfdir}/default/gpsd.default # Support for python - install -d ${D}${PYTHON_SITEPACKAGES_DIR}/gps - install -m 755 ${D}${libdir}/gps/*.py ${D}${PYTHON_SITEPACKAGES_DIR}/gps + if [ -d ${D}${libdir}/gps ]; then + install -d ${D}${PYTHON_SITEPACKAGES_DIR}/gps + install -m 755 ${D}${libdir}/gps/*.py ${D}${PYTHON_SITEPACKAGES_DIR}/gps + fi } -PACKAGES =+ "libgps python3-pygps gpsd-udev gpsd-conf gpsd-gpsctl gps-utils" +PACKAGES =+ "libgps python3-pygps gpsd-udev gpsd-conf gpsd-gpsctl gps-utils gps-utils-python" RPROVIDES:${PN}-dbg += "python-pygps-dbg" @@ -103,34 +105,38 @@ SUMMARY:gpsd-gpsctl = "Tool for tweaking GPS modes" FILES:gpsd-gpsctl = "${bindir}/gpsctl" SUMMARY:gps-utils = "Utils used for simulating, monitoring,... a GPS" -# Python files are required for gps/fake, required for gpsfake. FILES:gps-utils = "\ ${bindir}/cgps \ - ${bindir}/gegps \ ${bindir}/gps2udp \ - ${bindir}/gpscat \ - ${bindir}/gpscsv \ ${bindir}/gpsctl \ ${bindir}/gpsdebuginfo \ ${bindir}/gpsdecode \ - ${bindir}/gpsfake \ ${bindir}/gpsmon \ ${bindir}/gpspipe \ - ${bindir}/gpsplot \ - ${bindir}/gpsprof \ ${bindir}/gpsrinex \ ${bindir}/gpssnmp \ - ${bindir}/gpssubframe \ ${bindir}/gpxlogger \ ${bindir}/lcdgps \ ${bindir}/ntpshmmon \ ${bindir}/ppscheck \ +" +RRECOMMENDS:gps-utils = "gps-utils-python" + +SUMMARY:gps-utils-python = "Python utils used for simulating, monitoring,... a GPS" +FILES:gps-utils-python = "\ + ${bindir}/gegps \ + ${bindir}/gpscat \ + ${bindir}/gpscsv \ + ${bindir}/gpsfake \ + ${bindir}/gpsplot \ + ${bindir}/gpsprof \ + ${bindir}/gpssubframe \ ${bindir}/ubxtool \ ${bindir}/xgps \ ${bindir}/xgpsspeed \ ${bindir}/zerk \ " -RDEPENDS:gps-utils = "python3-pygps" +RDEPENDS:gps-utils-python = "python3-pygps" SUMMARY:python3-pygps = "Python bindings to gpsd" FILES:python3-pygps = "${PYTHON_SITEPACKAGES_DIR}/* ${libdir}/gps/*.py ${libdir}/*.egg-info" diff --git a/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_10.5.0.bb b/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_10.6.3.bb index 9644c653ee..fa33daf52d 100644 --- a/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_10.5.0.bb +++ b/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_10.6.3.bb @@ -5,7 +5,7 @@ SECTION = "libs" DEPENDS = "libpcre zlib libjpeg-turbo" SRC_URI = "${SOURCEFORGE_MIRROR}/qpdf/qpdf-${PV}.tar.gz" -SRC_URI[sha256sum] = "88257d36a44fd5c50b2879488324dd9cafc11686ae49d8c4922a4872203ce006" +SRC_URI[sha256sum] = "e8fc23b2a584ea68c963a897515d3eb3129186741dd19d13c86d31fa33493811" LIC_FILES_CHKSUM = "file://Artistic-2.0;md5=7806296b9fae874361e6fb10072b7ee3" diff --git a/meta-openembedded/meta-oe/recipes-security/audit/audit_3.0.6.bb b/meta-openembedded/meta-oe/recipes-security/audit/audit_3.0.7.bb index d99d9a87c9..d77aec2964 100644 --- a/meta-openembedded/meta-oe/recipes-security/audit/audit_3.0.6.bb +++ b/meta-openembedded/meta-oe/recipes-security/audit/audit_3.0.7.bb @@ -15,7 +15,7 @@ SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=master;proto " S = "${WORKDIR}/git" -SRCREV = "b1b2728ccd83eeb0dffe29c01a5c97e14e6a0d8a" +SRCREV = "f60b2d8f55c74be798a7f5bcbd6c587987f2578a" inherit autotools python3native update-rc.d systemd @@ -70,7 +70,6 @@ FILES:${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/*/.debug" FILES:${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}" CONFFILES:auditd = "${sysconfdir}/audit/audit.rules" -RDEPENDS:auditd = "bash" do_install:append() { rm -f ${D}/${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.a diff --git a/meta-openembedded/meta-oe/recipes-support/boost-sml/boost-sml_git.bb b/meta-openembedded/meta-oe/recipes-support/boost-sml/boost-sml_git.bb index 97c04899bf..e22eddb72d 100644 --- a/meta-openembedded/meta-oe/recipes-support/boost-sml/boost-sml_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/boost-sml/boost-sml_git.bb @@ -19,7 +19,8 @@ S = "${WORKDIR}/git" inherit cmake # Building benchmarks takes a lot of time and requires additional headers (euml2.hpp) -EXTRA_OECMAKE:append = " -DSML_BUILD_BENCHMARKS:bool=OFF" +# Building examples fail with gcc-12 +EXTRA_OECMAKE:append = " -DSML_BUILD_BENCHMARKS:bool=OFF -DSML_BUILD_EXAMPLES=OFF" # [boost::ext].XML is a header only C++ library, so the main package will be empty. ALLOW_EMPTY:${PN} = "1" diff --git a/meta-openembedded/meta-oe/recipes-support/gnulib/gnulib_2018-03-07.03.bb b/meta-openembedded/meta-oe/recipes-support/gnulib/gnulib_2018-03-07.03.bb index 2aab68e6a5..a27968079e 100644 --- a/meta-openembedded/meta-oe/recipes-support/gnulib/gnulib_2018-03-07.03.bb +++ b/meta-openembedded/meta-oe/recipes-support/gnulib/gnulib_2018-03-07.03.bb @@ -13,18 +13,15 @@ LICENSE = "LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=56a22a6e5bcce45e2c8ac184f81412b5" SRCREV = "0d6e3307bbdb8df4d56043d5f373eeeffe4cbef3" -SRC_URI = "git://git.sv.gnu.org/gnulib.git;branch=master \ +SRC_URI = "git://git.savannah.gnu.org/git/gnulib.git;branch=master \ " S = "${WORKDIR}/git" -inherit utils - do_install () { - cd ${S} - check_git_config - git checkout master - git clone ${S} ${D}/${datadir}/gnulib + install -d ${D}/${datadir}/gnulib + cp --no-preserve=ownership --recursive ${S}/* ${D}/${datadir}/gnulib/ + cp --no-preserve=ownership --recursive ${S}/.git ${D}/${datadir}/gnulib/ } do_patch[noexec] = "1" diff --git a/meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb b/meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb index 0bb06c1d1f..fc4fad708a 100644 --- a/meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb @@ -26,8 +26,8 @@ S = "${WORKDIR}/git" inherit cmake pkgconfig ptest -LIBATOMIC:mips:toolchain-clang = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCEREAL_THREAD_LIBS="-latomic"', '', d)}" -LIBATOMIC:riscv32:toolchain-clang = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCEREAL_THREAD_LIBS="-latomic"', '', d)}" +LIBATOMIC:mips = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCEREAL_THREAD_LIBS="-latomic"', '', d)}" +LIBATOMIC:riscv32 = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCEREAL_THREAD_LIBS="-latomic"', '', d)}" PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'with-tests', '', d)}" PACKAGECONFIG[with-tests] = "-DWITH_WERROR=OFF -DBUILD_TESTS=ON ${LIBATOMIC},," diff --git a/meta-openembedded/meta-oe/recipes-support/opencl/clinfo_2.2.18.04.06.bb b/meta-openembedded/meta-oe/recipes-support/opencl/clinfo_3.0.21.02.21.bb index 831b15a455..35b5a000e1 100644 --- a/meta-openembedded/meta-oe/recipes-support/opencl/clinfo_2.2.18.04.06.bb +++ b/meta-openembedded/meta-oe/recipes-support/opencl/clinfo_3.0.21.02.21.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=fd8857f774dfb0eefe1e80c8f9240a7e" SRC_URI = "git://github.com/Oblomov/clinfo.git;protocol=https;branch=master" -SRCREV = "59d0daf898e48d76ccbb788acbba258fa0a8ba7c" +SRCREV = "d34bc1a3bdc148e2e1fe64998398e1a0552ab04c" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-core-vsx-update-vec_absd-workaround-condition.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-core-vsx-update-vec_absd-workaround-condition.patch new file mode 100644 index 0000000000..d2d3b81fbe --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-core-vsx-update-vec_absd-workaround-condition.patch @@ -0,0 +1,28 @@ +From c7ce902eed0eb7926c0973b1127037fdd27b99ca Mon Sep 17 00:00:00 2001 +From: Alexander Alekhin <alexander.a.alekhin@gmail.com> +Date: Tue, 15 Feb 2022 07:23:32 +0300 +Subject: [PATCH] core(vsx): update vec_absd() workaround condition + +Upstream-Status: Backport [https://github.com/opencv/opencv/commit/8d88bb06b230b5c4b5bca78d84102f5d1adf48cf] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + modules/core/include/opencv2/core/vsx_utils.hpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/modules/core/include/opencv2/core/vsx_utils.hpp b/modules/core/include/opencv2/core/vsx_utils.hpp +index 68863ffb36..5cbc066784 100644 +--- a/modules/core/include/opencv2/core/vsx_utils.hpp ++++ b/modules/core/include/opencv2/core/vsx_utils.hpp +@@ -684,7 +684,8 @@ VSX_IMPL_LOAD_L8(vec_double2, double) + #endif + + // absolute difference +-#ifndef vec_absd ++#ifndef _ARCH_PWR9 ++# undef vec_absd + # define vec_absd(a, b) vec_sub(vec_max(a, b), vec_min(a, b)) + #endif + +-- +2.36.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.5.bb b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.5.bb index 4449596dae..e4fb676f7e 100644 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.5.bb @@ -51,6 +51,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol file://0001-Dont-use-isystem.patch \ file://download.patch \ file://0001-Make-ts-module-external.patch \ + file://0001-core-vsx-update-vec_absd-workaround-condition.patch \ " SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib" diff --git a/meta-openembedded/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.5.8.bb b/meta-openembedded/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.6.0.bb index 1600bbf94a..c9e7eae279 100644 --- a/meta-openembedded/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.5.8.bb +++ b/meta-openembedded/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.6.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=94d55d512a9ba36caa9b7df079bae19f" SRC_URI = "git://github.com/LudovicRousseau/pcsc-tools;protocol=https;branch=master" -SRCREV = "53923ef8e98062c478f99e3bfcc8eb4654996c27" +SRCREV = "c6e9fa746d00e08fc71c57c79e305669ff2e3106" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/poco/poco_1.11.1.bb b/meta-openembedded/meta-oe/recipes-support/poco/poco_1.11.2.bb index 3cfd49fcdd..8694983e7c 100644 --- a/meta-openembedded/meta-oe/recipes-support/poco/poco_1.11.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/poco/poco_1.11.2.bb @@ -12,7 +12,7 @@ SRC_URI = " \ git://github.com/pocoproject/poco.git;branch=master;protocol=https \ file://run-ptest \ " -SRCREV = "de61f0049175a941cc83c2615c3bdc5e947b89f9" +SRCREV = "9d1c428c861f2e5ccf09149bbe8d2149720c5896" UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P<pver>\d+(\.\d+)+)" diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_22.04.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_22.04.0.bb index 9c9122160c..b7cdb4f1be 100644 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_22.04.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_22.04.0.bb @@ -33,9 +33,11 @@ EXTRA_OECMAKE += " \ -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \ -DBUILD_GTK_TESTS=OFF \ -DENABLE_ZLIB=ON \ + -DRUN_GPERF_IF_PRESENT=OFF \ -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}' \ ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_GOBJECT_INTROSPECTION=ON', '-DENABLE_GOBJECT_INTROSPECTION=OFF', d)} \ " +EXTRA_OECMAKE:append:class-native = " -DENABLE_CPP=OFF" do_configure:append() { # poppler macro uses pkg-config to check for g-ir runtimes. Something @@ -49,3 +51,5 @@ FILES:libpoppler = "${libdir}/libpoppler.so.*" FILES:libpoppler-glib = "${libdir}/libpoppler-glib.so.*" RDEPENDS:libpoppler = "poppler-data" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/unixodbc/unixodbc_2.3.7.bb b/meta-openembedded/meta-oe/recipes-support/unixodbc/unixodbc_2.3.9.bb index b91c22e919..c194739cb1 100644 --- a/meta-openembedded/meta-oe/recipes-support/unixodbc/unixodbc_2.3.7.bb +++ b/meta-openembedded/meta-oe/recipes-support/unixodbc/unixodbc_2.3.9.bb @@ -11,8 +11,7 @@ DEPENDS = "libtool readline" SRC_URI = "http://ftp.unixodbc.org/unixODBC-${PV}.tar.gz \ file://do-not-use-libltdl-source-directory.patch \ " -SRC_URI[md5sum] = "274a711b0c77394e052db6493840c6f9" -SRC_URI[sha256sum] = "45f169ba1f454a72b8fcbb82abd832630a3bf93baa84731cf2949f449e1e3e77" +SRC_URI[sha256sum] = "52833eac3d681c8b0c9a5a65f2ebd745b3a964f208fc748f977e44015a31b207" UPSTREAM_CHECK_REGEX = "unixODBC-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/meta-openembedded/meta-perl/README b/meta-openembedded/meta-perl/README index 13014b0ff3..91c4f5b9bf 100644 --- a/meta-openembedded/meta-perl/README +++ b/meta-openembedded/meta-perl/README @@ -52,7 +52,7 @@ Dependencies This layer depends on: URI: git://git.openembedded.org/openembedded-core - branch: master + branch: kirkstone Adding the meta-perl layer to your build --------------------------------------- @@ -73,14 +73,13 @@ Maintenance ----------- Send patches / pull requests to openembedded-devel@lists.openembedded.org with -'[meta-perl]' in the subject. +'[meta-perl][kirkstone]' in the subject. When sending single patches, please using something like: -git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-perl][PATCH' +git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-perl][kirkstone][PATCH' -Layer maintainers: - Hongxu Jia <hongxu.jia@windriver.com> - Tim "moto-timo" Orling <ticotimo@gmail.com> +Layer maintainers: Armin Kuster <akuster808@gmail.com> + License ------- diff --git a/meta-openembedded/meta-python/README b/meta-openembedded/meta-python/README index 8b62ad32b3..d2d363f337 100644 --- a/meta-openembedded/meta-python/README +++ b/meta-openembedded/meta-python/README @@ -13,11 +13,11 @@ The meta-python layer depends on: URI: git://git.openembedded.org/openembedded-core layers: meta - branch: master + branch: kirkstone URI: git://git.openembedded.org/meta-openembedded layers: meta-oe - branch: master + branch: kirkstone Please follow the recommended setup procedures of your OE distribution. For Angstrom that is: @@ -33,15 +33,12 @@ comments and patch review. It is subscriber only, so please register before posting. Send pull requests to openembedded-devel@lists.openembedded.org with -'[meta-python]' in the subject. +'[meta-python][kirkstone]' in the subject. When sending single patches, please use something like: -git send-email -M -1 --to=openembedded-devel@lists.openembedded.org --subject-prefix='meta-python][PATCH' +git send-email -M -1 --to=openembedded-devel@lists.openembedded.org --subject-prefix='meta-python][kirkstone][PATCH' Maintenance ------------------------- -Layer maintainers: - Tim "moto-timo" Orling <TicoTimo@gmail.com> - Derek Straka <derek@asterius.io> - Trevor Gamblin <trevor.gamblin@windriver.com> +Layer maintainers: Armin Kuster <akuster808@gmail.com> diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_3.1.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_3.1.11.bb index 86217c5fc9..b2fba6f010 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_3.1.8.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_3.1.11.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://pypi.org/project/aenum/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://aenum/LICENSE;md5=c6a85477543f8b8591b9c1f82abebbe9" -SRC_URI[sha256sum] = "8dbe15f446eb8264b788dfeca163fb0a043d408d212152397dc11377b851e4ae" +SRC_URI[sha256sum] = "aed2c273547ae72a0d5ee869719c02a643da16bf507c80958faadc7e038e3f73" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.5.2.bb index 0b2181e4fe..35d061f5e6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.5.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.5.2.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "\ file://LICENSE.txt;md5=9ac49901b833e769c7d6f21e8dbd7b30 \ file://AWSIoTPythonSDK/core/protocol/paho/client.py;endline=14;md5=5a3c8a1a4bb71bd934f450ecff972ad9 \ " -SRCREV = "6ca6c73775c953114f83240a850a0d1ab49b68ac" +SRCREV = "0ea1a2d013529839fc1e7448d19dadff25d581b4" SRC_URI = "git://github.com/aws/aws-iot-device-sdk-python;branch=master;protocol=https \ file://0001-setup.py-Use-setuptools-instead-of-distutils.patch \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.13.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.14.0.bb index 954c9ab46c..f0aa321231 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.13.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.14.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/eerimoq/bitstruct" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=d9aa4ec07de78abae21c490c9ffe61bd" -SRC_URI[sha256sum] = "7b87d9e41ff552a8cae06ea2368c3772b6f3102bdab4b65e793be7590d69f03b" +SRC_URI[sha256sum] = "230c191c75f1526f6922cdb08eab6f52c055452e2239bf5638f02e9cfd382c91" PYPI_PACKAGE = "bitstruct" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_2.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_2.4.1.bb index bc3fedd37e..8e3883b4f9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_2.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_2.4.1.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=209e288518b0668115f58c3929af9ff1" DEPENDS += "${PYTHON_PN}-setuptools-scm-native" -SRC_URI[sha256sum] = "090909ab6c8ecee40813cec759e61dd6e70c8227a1a8e96082f5f2b0d394bc77" +SRC_URI[sha256sum] = "f3b0467daca18fca0dc7838de7726a72ab64127a018a377a86a6ed8ebfdbb25f" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cppy/0001-Fix-build-error-as-following.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-cppy/0001-Fix-build-error-as-following.patch new file mode 100644 index 0000000000..5a613c827a --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cppy/0001-Fix-build-error-as-following.patch @@ -0,0 +1,28 @@ +From a6ba15048bbb660abfa094b581862b4936ac4005 Mon Sep 17 00:00:00 2001 +From: Lei Maohui <leimaohui@fujitsu.com> +Date: Mon, 18 Apr 2022 12:19:35 +0900 +Subject: [PATCH] Fix build error as following: + +flit_core.config.ConfigError: description must be specified under [project] or listed as a dynamic field. + +Upstream-Status: Pending +Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> +--- + pyproject.toml | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/pyproject.toml b/pyproject.toml +index 2d2ac74..66fcee0 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -8,6 +8,7 @@ + + [project] + name = "cppy" ++description = "A small C++ header library" + readme = "README.rst" + requires-python = ">=3.7" + license = {file = "LICENSE"} +-- +2.25.1 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cppy_1.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cppy_1.2.1.bb index f86f571938..57ef3b2776 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cppy_1.2.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cppy_1.2.1.bb @@ -3,10 +3,15 @@ HOMEPAGE = "https://cppy.readthedocs.io/en/latest/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=0bfb3e39b13587f0028f17baf0e42371" -SRC_URI[sha256sum] = "95e8862e4f826c3f2a6b7b658333b162f80cbe9f943aa0d0a7a6b2ef850aeffc" +SRC_URI[sha256sum] = "83b43bf17b1085ac15c5debdb42154f138b928234b21447358981f69d0d6fe1b" RDEPENDS:${PN} += "python3-setuptools python3-distutils" -inherit pypi setuptools3 +inherit pypi python_flit_core + +SRC_URI += " file://0001-Fix-build-error-as-following.patch \ + " + +DEPENDS += "python3-setuptools-native" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-django_2.2.27.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-django_2.2.28.bb index 786afab248..9ef988176e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-django_2.2.27.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-django_2.2.28.bb @@ -5,7 +5,7 @@ UPSTREAM_CHECK_REGEX = "/${PYPI_PACKAGE}/(?P<pver>(2\.2\.\d*)+)/" inherit setuptools3 -SRC_URI[sha256sum] = "1ee37046b0bf2b61e83b3a01d067323516ec3b6f2b17cd49b1326dd4ba9dc913" +SRC_URI[sha256sum] = "0200b657afbf1bc08003845ddda053c7641b9b24951e52acd51f6abda33a7413" RDEPENDS:${PN} += "\ ${PYTHON_PN}-sqlparse \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.42.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.43.0.bb index 8fcf669952..b6456869f2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.42.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.43.0.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/googleapis/google-api-python-client" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI[sha256sum] = "7bf58b665b635d06adb47797a9a4f73482e739e02ed036cd960dc7c183361f67" +SRC_URI[sha256sum] = "ccd16b3aa92070d3777c4b188669820aacdd70695a87cfc8dbb330f6be9578f7" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.54.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.56.0.bb index afc6dcbfe9..0a3547ee97 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.54.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.56.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7ca inherit pypi setuptools3 -SRC_URI[sha256sum] = "a4031d6ec6c2b1b6dc3e0be7e10a1bd72fb0b18b07ef9be7b51f2c1004ce2437" +SRC_URI[sha256sum] = "4007500795bcfc269d279f0f7d253ae18d6dc1ff5d5a73613ffe452038b1ec5f" RDEPENDS:${PN} += "\ ${PYTHON_PN}-grpcio \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-graphviz_0.19.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-graphviz_0.19.2.bb index f1246b4b21..3cae19673f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-graphviz_0.19.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-graphviz_0.19.2.bb @@ -1,9 +1,9 @@ DESCRIPTION = "Graphviz protocol implementation" HOMEPAGE = "https://graphviz.readthedocs.io/en/stable/" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=87cd8818b7e63c6a9c580034e80d7521" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=951dd0868a9606c867ffda0ea3ea6da2" -SRC_URI[sha256sum] = "09ed0cde452d015fe77c4845a210eb642f28d245f5bc250d4b97808cb8f49078" +SRC_URI[sha256sum] = "7c90cebc147c18bcdffcd3c76db58cbface5d45fe0247a2f3bfb144d32a8c77c" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-imageio_2.16.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-imageio_2.17.0.bb index d1d318d5ae..53f61e8827 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-imageio_2.16.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-imageio_2.17.0.bb @@ -3,9 +3,9 @@ write a wide range of image data, including animated images, video, \ volumetric data, and scientific formats." SECTION = "devel/python" LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=7b9bbbb543b6af3e6b53f9b7fb68f71d" +LIC_FILES_CHKSUM = "file://LICENSE;md5=24cb9a367a9e641b459a01c4d15256ba" -SRC_URI[sha256sum] = "7f123cb23a77ac5abe8ed4e7ad6a60831a82de2c5d123463dcf1d4278c4779d2" +SRC_URI[sha256sum] = "b21f009e52eb22b02b839f3bf2ae5374aaf0886317313c1358c6014e5383b539" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-imgtool/cbor2.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-imgtool/cbor2.patch deleted file mode 100644 index 3e8c202bce..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-imgtool/cbor2.patch +++ /dev/null @@ -1,67 +0,0 @@ -Upstream-Status: Submitted [https://github.com/mcu-tools/mcuboot/pull/1190] -Signed-off-by: Ross Burton <ross.burton@arm.com> - -From f9c6f31b936d34df9a6551609cb16ed9c348be88 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@arm.com> -Date: Tue, 2 Nov 2021 11:12:04 +0000 -Subject: [PATCH] imgtool: prefer cbor2 over cbor - -The cbor module is unmaintained, with the last release in 2016[1]. The -cbor2 module however is under active development and was last released -just last month[2]. - -As the APIs are identical, we can import cbor2 and if that fails fall -back to cbor. - -[1] https://pypi.org/project/cbor/#history -[2] https://pypi.org/project/cbor2/#history - -Closes #1189 - -Signed-off-by: Ross Burton <ross.burton@arm.com> ---- - scripts/imgtool.nix | 2 +- - scripts/imgtool/boot_record.py | 7 +++++-- - scripts/requirements.txt | 2 +- - scripts/setup.py | 2 +- - 4 files changed, 8 insertions(+), 5 deletions(-) - -diff --git a/scripts/imgtool/boot_record.py b/scripts/imgtool/boot_record.py -index ac433aa..6f0045e 100644 ---- a/scripts/imgtool/boot_record.py -+++ b/scripts/imgtool/boot_record.py -@@ -16,8 +16,11 @@ - # limitations under the License. - - from enum import Enum --import cbor - -+try: -+ from cbor2 import dumps -+except ImportError: -+ from cbor import dumps - - class SwComponent(int, Enum): - """ -@@ -46,4 +49,4 @@ def create_sw_component_data(sw_type, sw_version, sw_measurement_description, - # list because later it will be modified by the bootloader. - properties[SwComponent.MEASUREMENT_VALUE] = sw_measurement_value - -- return cbor.dumps(properties) -+ return dumps(properties) -diff --git a/scripts/setup.py b/scripts/setup.py -index a228ea3..692cfb7 100644 ---- a/scripts/setup.py -+++ b/scripts/setup.py -@@ -17,7 +17,7 @@ setuptools.setup( - 'cryptography>=2.4.2', - 'intelhex>=2.2.1', - 'click', -- 'cbor>=1.0.0', -+ 'cbor2', - ], - entry_points={ - "console_scripts": ["imgtool=imgtool.main:imgtool"] --- -2.25.1 - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-imgtool_1.8.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-imgtool_1.9.0.bb index c957fce3ac..1e5efbe187 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-imgtool_1.8.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-imgtool_1.9.0.bb @@ -3,9 +3,7 @@ SUMMARY = "MCUboot's image signing and key management tool" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://imgtool/main.py;beginline=3;endline=18;md5=9965f09ae52c04886a1f04e13ccdce57" -SRC_URI += "file://cbor2.patch;striplevel=2" - -SRC_URI[sha256sum] = "4858f5c5f48cfa4a0bb99e60d00aa291172a7ecc2afe4fb77ed96121f59b6e2f" +SRC_URI[sha256sum] = "7fa7f6bd6bf069b5ffa07ea47478e16b6206bd2fc5b7607def999de0e9134a43" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-kivy_2.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-kivy_2.1.0..bb index 38f5216f56..684bca03e1 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-kivy_2.0.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-kivy_2.1.0..bb @@ -2,7 +2,7 @@ SUMMARY = "Open source Python library for rapid development of applications \ that make use of innovative user interfaces, such as multi-touch apps." HOMEPAGE = "https://kivy.org/" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f0c851d60495c7e27225a819e179208a" +LIC_FILES_CHKSUM = "file://LICENSE;md5=22e7b4dd8140eec57fd7edfd9fa23dfc" inherit setuptools3 pkgconfig features_check PIP_INSTALL_PACKAGE = "Kivy" @@ -18,7 +18,7 @@ SRC_URI = "\ SRC_URI += " \ file://0001-add-support-for-glesv2.patch \ " -SRCREV = "dedcb6bcabe3d8d6758dcee607e8c33b174d782b" +SRCREV = "960b95dc666753f59eff1b449124490fbec10184" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-marshmallow_3.14.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-marshmallow_3.15.0.bb index dc5f173888..c8e0fa4dd3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-marshmallow_3.14.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-marshmallow_3.15.0.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "\ SRC_URI = "git://github.com/marshmallow-code/marshmallow.git;protocol=https;branch=dev" -SRCREV = "41afdefd93afd1b95f48f45fd284ff8add3e91b7" +SRCREV = "f251dfb08d79c755c2e95371f2c5580bf5937e60" S = "${WORKDIR}/git" @@ -17,4 +17,12 @@ inherit setuptools3 PIP_INSTALL_PACKAGE = "marshmallow" -RDEPENDS:${PN} += "python3-core" +RDEPENDS:${PN} += " \ + python3-core \ + python3-datetime \ + python3-netclient \ + python3-numbers \ + python3-json \ + python3-pprint \ + python3-packaging \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-nocasedict_1.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-nocasedict_1.0.3.bb index 591b9c6b8d..a47c4a455f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-nocasedict_1.0.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-nocasedict_1.0.3.bb @@ -1,8 +1,8 @@ SUMMARY = "A case-insensitive ordered dictionary for Python" HOMEPAGE = "https://github.com/pywbem/nocasedict" LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a87a7059d580c45495c1218f53e3610d" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742" -SRC_URI[sha256sum] = "86e2dae49e34de7c31b65b486c8f9aa58b66dc2e8ee9b34c390c6c58885c85a0" +SRC_URI[sha256sum] = "8220b97ba06b08eb2deded774c406c77e0ca0d5352ae71249f6f9d1f2a17bd7b" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-nocaselist_1.0.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-nocaselist_1.0.4.bb deleted file mode 100644 index 60c79c22a8..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-nocaselist_1.0.4.bb +++ /dev/null @@ -1,8 +0,0 @@ -SUMMARY = "A case-insensitive list for Python" -HOMEPAGE = "https://nocaselist.readthedocs.io/en/latest/" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d229da563da18fe5d58cd95a6467d584" - -SRC_URI[sha256sum] = "73a9c0659e7135c66e46a6ab06e2cb637ce9248d73c690ebd31afb72a4e03ac0" - -inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-nocaselist_1.0.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-nocaselist_1.0.5.bb new file mode 100644 index 0000000000..22b8825801 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-nocaselist_1.0.5.bb @@ -0,0 +1,8 @@ +SUMMARY = "A case-insensitive list for Python" +HOMEPAGE = "https://nocaselist.readthedocs.io/en/latest/" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" + +SRC_URI[sha256sum] = "e1c12ca2ae9d345b34948f2c8f60e3894619e2be2ed28b4ecc5e7f1dea117d1d" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_2.13.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_2.13.5.bb index 9c699f8f2f..f64d976b46 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_2.13.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_2.13.5.bb @@ -3,7 +3,7 @@ HOMEPAGE= "http://www.pylint.org/" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=c107cf754550e65755c42985a5d4e9c9" -SRC_URI[sha256sum] = "0c6dd0e53e6e17f2d0d62660905f3868611e734e9d9b310dc651a4b9f3dc70da" +SRC_URI[sha256sum] = "dab221658368c7a05242e673c275c488670144123f4bd262b2777249c1c0de9b" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.2.2.bb index 9370cbab67..1e70cf4843 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.2.2.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://github.com/andymccurdy/redis-py" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=51d9ad56299ab60ba7be65a621004f27" -SRC_URI[sha256sum] = "fe45513881229dbee610620b9e0817b1f48c47ba635870320fd44a712204bbdd" +SRC_URI[sha256sum] = "0107dc8e98a4f1d1d4aa00100e044287f77121a1e6d2085545c4b7fa94a7a27f" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.5.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.5.8.bb index 1594fb5dd7..cf1337e2b1 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.5.7.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.5.8.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0c79f8d3c91fc847350efd28bfe0a341" RDEPENDS:${PN} += "python3-urllib3" -SRC_URI[sha256sum] = "aa52da941c56b5a76fd838f8e9e92a850bf893a9eb1e33ffce6c21431d07ee30" +SRC_URI[sha256sum] = "38fd16a92b5ef94203db3ece10e03bdaa291481dd7e00e77a148aa0302267d47" PYPI_PACKAGE = "sentry-sdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.34.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.35.bb index b99ed83f6f..5d199dbedb 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.34.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.35.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sqlalchemy.org/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=f4001d1ca15b69d096fa1b4fd1bdce79" -SRC_URI[sha256sum] = "623bac2d6bdca3f3e61cf1e1c466c5fb9f5cf08735736ee1111187b7a4108891" +SRC_URI[sha256sum] = "2ffc813b01dc6473990f5e575f210ca5ac2f5465ace3908b78ffd6d20058aab5" PYPI_PACKAGE = "SQLAlchemy" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui/0002-Use-symbolic-list-add-and-edit-icons.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui/0002-Use-symbolic-list-add-and-edit-icons.patch new file mode 100644 index 0000000000..3a95859ad7 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui/0002-Use-symbolic-list-add-and-edit-icons.patch @@ -0,0 +1,56 @@ +Upstream-Status: Backport [https://github.com/storaged-project/blivet-gui/commit/eb8ec968] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> + +From eb8ec968d1ee8b4b710568b1eb8536296f90751e Mon Sep 17 00:00:00 2001 +From: Adam Williamson <awilliam@redhat.com> +Date: Thu, 17 Feb 2022 11:16:22 -0800 +Subject: [PATCH] Use symbolic list-add and edit- icons (Adwaita dropped old + ones) + +adwaita-icon-theme 42 no longer includes the non-symbolic icons +for these names. The choices are to switch to symbolic ones or +carry the non-symbolic ones downstream. + +Signed-off-by: Adam Williamson <awilliam@redhat.com> +--- + blivetgui/list_actions.py | 8 ++++---- + blivetgui/processing_window.py | 6 +++--- + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/blivetgui/list_actions.py b/blivetgui/list_actions.py +index b7c1f9c..5388feb 100644 +--- a/blivetgui/list_actions.py ++++ b/blivetgui/list_actions.py +@@ -48,10 +48,10 @@ def __init__(self, blivet_gui): + self.blivet_gui = blivet_gui + + icon_theme = Gtk.IconTheme.get_default() # pylint: disable=no-value-for-parameter +- icon_add = Gtk.IconTheme.load_icon(icon_theme, "list-add", 16, 0) +- icon_delete = Gtk.IconTheme.load_icon(icon_theme, "edit-delete", 16, 0) +- icon_edit = Gtk.IconTheme.load_icon(icon_theme, "edit-select-all", 16, 0) +- icon_misc = Gtk.IconTheme.load_icon(icon_theme, "edit-paste", 16, 0) ++ icon_add = Gtk.IconTheme.load_icon(icon_theme, "list-add-symbolic", 16, 0) ++ icon_delete = Gtk.IconTheme.load_icon(icon_theme, "edit-delete-symbolic", 16, 0) ++ icon_edit = Gtk.IconTheme.load_icon(icon_theme, "edit-select-all-symbolic", 16, 0) ++ icon_misc = Gtk.IconTheme.load_icon(icon_theme, "edit-paste-symbolic", 16, 0) + + self.action_icons = {"add": icon_add, "delete": icon_delete, "edit": icon_edit, + "misc": icon_misc} +diff --git a/blivetgui/processing_window.py b/blivetgui/processing_window.py +index c400f90..a020ae8 100644 +--- a/blivetgui/processing_window.py ++++ b/blivetgui/processing_window.py +@@ -93,9 +93,9 @@ def add_action_view(self): + """ + + icon_theme = Gtk.IconTheme.get_default() # pylint: disable=no-value-for-parameter +- icon_add = Gtk.IconTheme.load_icon(icon_theme, "list-add", 16, 0) +- icon_delete = Gtk.IconTheme.load_icon(icon_theme, "edit-delete", 16, 0) +- icon_edit = Gtk.IconTheme.load_icon(icon_theme, "edit-select-all", 16, 0) ++ icon_add = Gtk.IconTheme.load_icon(icon_theme, "list-add-symbolic", 16, 0) ++ icon_delete = Gtk.IconTheme.load_icon(icon_theme, "edit-delete-symbolic", 16, 0) ++ icon_edit = Gtk.IconTheme.load_icon(icon_theme, "edit-select-all-symbolic", 16, 0) + + actions_list = Gtk.ListStore(GdkPixbuf.Pixbuf, str, GdkPixbuf.Pixbuf) + diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb index c26ae1fe98..29e7a267d2 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb @@ -11,7 +11,8 @@ B = "${S}" SRCREV = "42512ee48494cee71febf04078d9774f0146a085" SRC_URI = "git://github.com/storaged-project/blivet-gui.git;branch=master;protocol=https \ file://0001-Use-setuptools-instead-of-distutils-in-setup.py.patch \ - " + file://0002-Use-symbolic-list-add-and-edit-icons.patch \ + " inherit features_check REQUIRED_DISTRO_FEATURES = "x11 systemd" diff --git a/meta-openembedded/meta-webserver/README b/meta-openembedded/meta-webserver/README index d23f6cc65c..57bd0a72c6 100644 --- a/meta-openembedded/meta-webserver/README +++ b/meta-openembedded/meta-webserver/README @@ -13,13 +13,13 @@ This layer depends on: URI: git://git.openembedded.org/openembedded-core subdirectory: meta -branch: master +branch: kirkstone For some recipes, the meta-oe layer is required: URI: git://git.openembedded.org/meta-openembedded subdirectory: meta-oe -branch: master +branch: kirkstone @@ -50,9 +50,12 @@ Maintenance ----------- Send patches / pull requests to openembedded-devel@lists.openembedded.org -with '[meta-webserver]' in the subject. +with '[meta-webserver][kirkstone]' in the subject. -Layer maintainer: Derek Straka <derek@asterius.io> +When sending single patches, please using something like: +git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-webserver][kirkstone][PATCH' + +Layer maintainer: Armin Kuster <akuster808@gmail.com> License diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.33.1.bb b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.34.1.bb index f575a4cbaf..71fb0783b6 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.33.1.bb +++ b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.34.1.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=fc9b848046ef54b5eaee6071947abd24" DEPENDS += "libuv util-linux zlib" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BPN}-v${PV}.tar.gz" -SRC_URI[sha256sum] = "20ba8695d87187787b27128ac3aab9b09aa29ca6b508c48542e0f7d50ec9322b" +SRC_URI[sha256sum] = "8ea0786df0e952209c14efeb02e25339a0769aa3edc029e12816b8ead24a82d7" # default netdata.conf for netdata configuration SRC_URI += "file://netdata.conf" diff --git a/meta-openembedded/meta-xfce/README b/meta-openembedded/meta-xfce/README index 3d6158628f..03d23a9ad5 100644 --- a/meta-openembedded/meta-xfce/README +++ b/meta-openembedded/meta-xfce/README @@ -1,10 +1,10 @@ This layer depends on: URI: git://git.openembedded.org/openembedded-core -branch: master +branch: kirkstone URI: git://git.openembedded.org/meta-openembedded -branch: master +branch: kirkstone meta-xfce depends on meta-oe, meta-gnome and meta-multimedia in this repository. @@ -13,10 +13,9 @@ this to local.conf: BBMASK = "meta-xfce/recipes-multimedia" -Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-xfce]' in the subject' +Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-xfce][kirkstone]' in the subject' When sending single patches, please using something like: -git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-xfce][PATCH' +git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-xfce][kirkstone][PATCH' -Layer maintainer: Kai Kang <kai.kang@windriver.com> -Layer maintainer: Andreas Müller <schnitzeltony@gmail.com> +Layer maintainer: Armin Kuster <akuster808@gmail.com> diff --git a/meta-raspberrypi/.github/workflows/yocto-builds.yml b/meta-raspberrypi/.github/workflows/yocto-builds.yml index 2d35b9f781..3dba5e9cbd 100644 --- a/meta-raspberrypi/.github/workflows/yocto-builds.yml +++ b/meta-raspberrypi/.github/workflows/yocto-builds.yml @@ -25,7 +25,7 @@ jobs: - raspberrypi4 - raspberrypi-cm3 - raspberrypi-cm - image: [core-image-base] + image: [rpi-test-image] distro: [poky] runs-on: [self-hosted, Linux] name: ${{ matrix.machine }}/${{ matrix.image }}/poky/systemd diff --git a/meta-raspberrypi/README.md b/meta-raspberrypi/README.md index a7a04b49f6..712b9a28c5 100644 --- a/meta-raspberrypi/README.md +++ b/meta-raspberrypi/README.md @@ -68,7 +68,7 @@ local_conf_header: To configure the machine, you have to update the `machine` variable. And the same for the `distro`. -For further information, you can read more at <https://kas.readthedocs.io/en/1.0/index.html> +For further information, you can read more at <https://kas.readthedocs.io/en/latest/index.html> ## Contributing diff --git a/meta-raspberrypi/conf/machine/include/rpi-base.inc b/meta-raspberrypi/conf/machine/include/rpi-base.inc index b25997ab74..a2edf064b6 100644 --- a/meta-raspberrypi/conf/machine/include/rpi-base.inc +++ b/meta-raspberrypi/conf/machine/include/rpi-base.inc @@ -39,6 +39,7 @@ RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \ overlays/iqaudio-dacplus.dtbo \ overlays/mcp2515-can0.dtbo \ overlays/mcp2515-can1.dtbo \ + overlays/mcp3008.dtbo \ overlays/miniuart-bt.dtbo \ overlays/pitft22.dtbo \ overlays/pitft28-capacitive.dtbo \ diff --git a/meta-raspberrypi/docs/conf.py b/meta-raspberrypi/docs/conf.py index 5c6ae4b064..e7a2491dde 100644 --- a/meta-raspberrypi/docs/conf.py +++ b/meta-raspberrypi/docs/conf.py @@ -50,7 +50,7 @@ master_doc = 'index' # General information about the project. project = 'meta-raspberrypi' -copyright = '2021, meta-raspberrypi contributors' +copyright = '2022, meta-raspberrypi contributors' author = 'meta-raspberrypi contributors' # The version info for the project you're documenting, acts as replacement for diff --git a/meta-raspberrypi/docs/layer-contents.md b/meta-raspberrypi/docs/layer-contents.md index 7383630c1e..d12cb88f81 100644 --- a/meta-raspberrypi/docs/layer-contents.md +++ b/meta-raspberrypi/docs/layer-contents.md @@ -23,8 +23,7 @@ Note: The raspberrypi3 machines include support for Raspberry Pi 3B+. layer and some media samples. For other uses it's recommended to base images on `core-image-minimal` or -`core-image-base` as appropriate. The old image names (`rpi-hwup-image` and -`rpi-basic-image`) are deprecated. +`core-image-base` as appropriate. ## WiFi and Bluetooth Firmware diff --git a/meta-raspberrypi/dynamic-layers/meta-python/recipes-devtools/python/python3-sense-hat_2.2.0.bb b/meta-raspberrypi/dynamic-layers/meta-python/recipes-devtools/python/python3-sense-hat_2.2.0.bb index dba63d9c49..fd67580f3f 100644 --- a/meta-raspberrypi/dynamic-layers/meta-python/recipes-devtools/python/python3-sense-hat_2.2.0.bb +++ b/meta-raspberrypi/dynamic-layers/meta-python/recipes-devtools/python/python3-sense-hat_2.2.0.bb @@ -1,7 +1,7 @@ SUMMARY = "Python module to control the Raspberry Pi Sense HAT used in the Astro Pi mission" HOMEPAGE = "https://github.com/RPi-Distro/python-sense-hat" SECTION = "devel/python" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENCE.txt;md5=d80fe312e1ff5fbd97369b093bf21cda" inherit setuptools3 pypi diff --git a/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc b/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc index eca2664623..e5974e49d0 100644 --- a/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc +++ b/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc @@ -1,9 +1,9 @@ -RPIFW_DATE ?= "20220328" +RPIFW_DATE ?= "20220331" RPIFW_SRC_URI ?= "https://archive.raspberrypi.com/debian/pool/main/r/raspberrypi-firmware/raspberrypi-firmware_1.${RPIFW_DATE}.orig.tar.xz" RPIFW_S ?= "${WORKDIR}/raspberrypi-firmware-1.${RPIFW_DATE}" SRC_URI = "${RPIFW_SRC_URI}" -SRC_URI[sha256sum] = "8ab5949b9da1e2a2da18acc203946698737efe3e5d98286dcb7a8b0d0e92564e" +SRC_URI[sha256sum] = "8758f10797bd52a7373cc5b39bd46d0d9f882d501ccb9535a72a3fe8a8d329c3" PV = "${RPIFW_DATE}" diff --git a/meta-raspberrypi/recipes-bsp/u-boot/files/0001-dm-core-Move-ofdata_to_platdata-call-earlier.patch b/meta-raspberrypi/recipes-bsp/u-boot/files/0001-dm-core-Move-ofdata_to_platdata-call-earlier.patch deleted file mode 100644 index 996ad10740..0000000000 --- a/meta-raspberrypi/recipes-bsp/u-boot/files/0001-dm-core-Move-ofdata_to_platdata-call-earlier.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 336d86ebd146905cf4384912f4f27699b6e37c72 Mon Sep 17 00:00:00 2001 -From: Simon Glass <sjg@chromium.org> -Date: Sun, 29 Dec 2019 21:19:17 -0700 -Subject: [PATCH] dm: core: Move ofdata_to_platdata() call earlier - -This method is supposed to extract platform data from the device tree. It -should be done before the device itself is probed. Move it earlier in the -device_probe() function. - -Upstream-Status: Backport - -Signed-off-by: Simon Glass <sjg@chromium.org> ---- - drivers/core/device.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/drivers/core/device.c b/drivers/core/device.c -index 4e03708..291ff4c 100644 ---- a/drivers/core/device.c -+++ b/drivers/core/device.c -@@ -375,6 +375,13 @@ int device_probe(struct udevice *dev) - return 0; - } - -+ if (drv->ofdata_to_platdata && -+ (CONFIG_IS_ENABLED(OF_PLATDATA) || dev_has_of_node(dev))) { -+ ret = drv->ofdata_to_platdata(dev); -+ if (ret) -+ goto fail; -+ } -+ - seq = uclass_resolve_seq(dev); - if (seq < 0) { - ret = seq; -@@ -411,13 +418,6 @@ int device_probe(struct udevice *dev) - goto fail; - } - -- if (drv->ofdata_to_platdata && -- (CONFIG_IS_ENABLED(OF_PLATDATA) || dev_has_of_node(dev))) { -- ret = drv->ofdata_to_platdata(dev); -- if (ret) -- goto fail; -- } -- - /* Only handle devices that have a valid ofnode */ - if (dev_of_valid(dev)) { - /* --- -2.7.4 - diff --git a/meta-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend index 4587d3da91..e50acf5fb3 100644 --- a/meta-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/meta-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend @@ -6,9 +6,6 @@ SRC_URI:append:rpi = " \ SRC_URI:append:rpi = " file://0001-rpi-always-set-fdt_addr-with-firmware-provided-FDT-address.patch" -# special fix for raspberrypi-cm3 -SRC_URI:append:raspberrypi-cm3 = " file://0001-dm-core-Move-ofdata_to_platdata-call-earlier.patch" - DEPENDS:append:rpi = " u-boot-default-script" do_install:append:rpi () { diff --git a/meta-raspberrypi/recipes-core/images/rpi-basic-image.bb b/meta-raspberrypi/recipes-core/images/rpi-basic-image.bb deleted file mode 100644 index 1bbbb50b3c..0000000000 --- a/meta-raspberrypi/recipes-core/images/rpi-basic-image.bb +++ /dev/null @@ -1,15 +0,0 @@ -# Base this image on core-image-minimal -include recipes-core/images/core-image-minimal.bb - -# Include modules in rootfs -IMAGE_INSTALL += " \ - kernel-modules \ - " - -SPLASH = "psplash-raspberrypi" - -IMAGE_FEATURES += "ssh-server-dropbear splash" - -do_image:prepend() { - bb.warn("The image 'rpi-basic-image' is deprecated, please use 'core-image-base' instead") -} diff --git a/meta-raspberrypi/recipes-core/images/rpi-hwup-image.bb b/meta-raspberrypi/recipes-core/images/rpi-hwup-image.bb deleted file mode 100644 index eacec0ed49..0000000000 --- a/meta-raspberrypi/recipes-core/images/rpi-hwup-image.bb +++ /dev/null @@ -1,11 +0,0 @@ -# Base this image on core-image-minimal -include recipes-core/images/core-image-minimal.bb - -# Include modules in rootfs -IMAGE_INSTALL += " \ - kernel-modules \ - " - -do_image:prepend() { - bb.warn("The image 'rpi-hwup-image' is deprecated, please use 'core-image-base' instead") -} diff --git a/meta-raspberrypi/recipes-core/packagegroups/packagegroup-rpi-test.bb b/meta-raspberrypi/recipes-core/packagegroups/packagegroup-rpi-test.bb index 265dfc5095..ff8f8a4d62 100644 --- a/meta-raspberrypi/recipes-core/packagegroups/packagegroup-rpi-test.bb +++ b/meta-raspberrypi/recipes-core/packagegroups/packagegroup-rpi-test.bb @@ -13,9 +13,13 @@ OMXPLAYER = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'omxpl RDEPENDS:${PN} = "\ ${OMXPLAYER} \ bcm2835-tests \ + raspi-gpio \ rpio \ rpi-gpio \ pi-blaster \ + python3-adafruit-circuitpython-register \ + python3-adafruit-platformdetect \ + python3-adafruit-pureio \ python3-rtimu \ connman \ connman-client \ diff --git a/meta-raspberrypi/recipes-devtools/bcm2835/bcm2835_1.52.bb b/meta-raspberrypi/recipes-devtools/bcm2835/bcm2835_1.52.bb deleted file mode 100644 index 6538f6a03b..0000000000 --- a/meta-raspberrypi/recipes-devtools/bcm2835/bcm2835_1.52.bb +++ /dev/null @@ -1,42 +0,0 @@ -DESCRIPTION = "Package that provides access to GPIO and other IO\ -functions on the Broadcom BCM 2835 chip, allowing access to the\ -GPIO pins on the 26 pin IDE plug on the RPi board" -SECTION = "base" -HOMEPAGE = "http://www.open.com.au/mikem/bcm2835" -AUTHOR = "Mike McCauley (mikem@open.com.au)" - -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -COMPATIBLE_MACHINE = "^rpi$" - -SRC_URI = "http://www.airspayce.com/mikem/bcm2835/bcm2835-${PV}.tar.gz" - -SRC_URI[md5sum] = "b5dc426b4ff258bb1397442f98e40236" -SRC_URI[sha256sum] = "b9fd10f7a80aadaed28a77168709b7c519568a63b6e98d0a50e9c5fe31bea6bb" - -inherit autotools - -do_compile:append() { - # Now compiling the examples provided by the package - mkdir -p ${B}/examples - for file in `ls ${S}/examples`; do - ${CC} ${LDFLAGS} ${S}/examples/${file}/${file}.c -o ${B}/examples/${file} -Bstatic -L${B}/src -lbcm2835 -I${S}/src - done -} - -do_install:append() { - install -d ${D}/${libdir}/${BPN} - for file in ${B}/examples/* - do - install -m 0755 ${file} ${D}/${libdir}/${BPN} - done -} - -PACKAGES += "${PN}-tests" - -RDEPENDS:${PN}-dev = "" - -FILES:${PN} = "" -FILES:${PN}-tests = "${libdir}/${BPN}" -FILES:${PN}-dbg += "${libdir}/${BPN}/.debug" diff --git a/meta-raspberrypi/recipes-devtools/bcm2835/bcm2835_1.71.bb b/meta-raspberrypi/recipes-devtools/bcm2835/bcm2835_1.71.bb new file mode 100644 index 0000000000..5171205427 --- /dev/null +++ b/meta-raspberrypi/recipes-devtools/bcm2835/bcm2835_1.71.bb @@ -0,0 +1,50 @@ +DESCRIPTION = "Package that provides access to GPIO and other IO\ +functions on the Broadcom BCM 2835 chip, allowing access to the\ +GPIO pins on the 26 pin IDE plug on the RPi board" +SECTION = "base" +HOMEPAGE = "http://www.open.com.au/mikem/bcm2835" +AUTHOR = "Mike McCauley (mikem@open.com.au)" + +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=e49f4652534af377a713df3d9dec60cb" + +COMPATIBLE_MACHINE = "^rpi$" + +SRC_URI = "http://www.airspayce.com/mikem/bcm2835/bcm2835-${PV}.tar.gz" + +SRC_URI[md5sum] = "9bd2d39bf4b3a9e81dce799ca51c826a" +SRC_URI[sha256sum] = "564920d205977d7e2846e434947708455d468d3a952feca9faef643abd03a227" + +inherit autotools + +do_compile:append() { + # Now compiling the examples provided by the package + mkdir -p ${B}/examples/spiram + for file in `ls ${S}/examples`; do + example="$file" + if [ "$file" = "spiram" ]; then + # This includes a tiny library + EXAMPLE_LDFLAGS="-L${B}/examples/spiram -lspiram" + example="spiram_test" + ${CC} ${CFLAGS} -c ${S}/examples/spiram/spiram.c -o ${B}/examples/spiram/libspiram.o -I${S}/src -I${S}/examples/spiram + rm -f ${B}/examples/spiram/libspiram.a && ${BUILD_AR} crD ${B}/examples/spiram/libspiram.a ${B}/examples/spiram/libspiram.o + fi + ${CC} ${LDFLAGS} ${S}/examples/${file}/${example}.c -o ${B}/examples/${example} -Bstatic -L${B}/src -lbcm2835 ${EXAMPLE_LDFLAGS} -I${S}/src + done +} + +do_install:append() { + install -d ${D}/${libdir}/${BPN} + for example in $(find ${B}/examples -type f -maxdepth 1) + do + install -m 0755 ${example} ${D}/${libdir}/${BPN} + done +} + +PACKAGES += "${PN}-tests" + +RDEPENDS:${PN}-dev = "" + +FILES:${PN} = "" +FILES:${PN}-tests = "${libdir}/${BPN}" +FILES:${PN}-dbg += "${libdir}/${BPN}/.debug" diff --git a/meta-raspberrypi/recipes-devtools/pi-blaster/pi-blaster_git.bb b/meta-raspberrypi/recipes-devtools/pi-blaster/pi-blaster_git.bb index 1d21089350..d02fa92670 100644 --- a/meta-raspberrypi/recipes-devtools/pi-blaster/pi-blaster_git.bb +++ b/meta-raspberrypi/recipes-devtools/pi-blaster/pi-blaster_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "This project enables PWM on the GPIO pins you request of a Raspbe HOMEPAGE = "https://github.com/sarfata/pi-blaster/" SECTION = "devel/libs" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://README.md;beginline=268;endline=292;md5=86d10e4bcf4b4014d306dde7c1d2a80d" +LIC_FILES_CHKSUM = "file://README.md;beginline=295;endline=319;md5=86d10e4bcf4b4014d306dde7c1d2a80d" SRC_URI = "git://github.com/sarfata/pi-blaster;branch=master;protocol=https \ file://remove-initscript-lsb-dependency.patch \ @@ -10,7 +10,7 @@ SRC_URI = "git://github.com/sarfata/pi-blaster;branch=master;protocol=https \ S = "${WORKDIR}/git" -SRCREV = "befd8ef36e5066e4d444ef47fe4020787e541248" +SRCREV = "fbba9a7dcef0f352a11f8a2a5f6cbc15b62c0829" inherit update-rc.d autotools diff --git a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-register_1.9.4.bb b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-register_1.9.8.bb index 1f745e73e9..1a609f5ea7 100644 --- a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-register_1.9.4.bb +++ b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-register_1.9.8.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=6ec69d6e9e6c85adfb7799d7f8cf044e" SRC_URI = "git://github.com/adafruit/Adafruit_CircuitPython_Register.git;branch=main;protocol=https" S = "${WORKDIR}/git" -SRCREV = "5fee6e0c3878110844bc51e16063eeae7d94c457" +SRCREV = "49ab415d6b601c99979262f9e91c21dcb3a927a7" DEPENDS += "python3-setuptools-scm-native" diff --git a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-platformdetect_3.1.1.bb b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-platformdetect_3.22.1.bb index 170cd98643..e19b58e2dc 100644 --- a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-platformdetect_3.1.1.bb +++ b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-platformdetect_3.22.1.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=fccd531dce4b989c05173925f0bbb76c" SRC_URI = "git://github.com/adafruit/Adafruit_Python_PlatformDetect.git;branch=main;protocol=https" -SRCREV = "e0fe1b012898fa824944d6805ca74be0fa027968" +SRCREV = "7af3af87037cf1e6697471a3a83c56a0f852b959" S = "${WORKDIR}/git" diff --git a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-pureio_1.1.8.bb b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-pureio_1.1.9.bb index e38a483572..cdbe4b4b25 100644 --- a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-pureio_1.1.8.bb +++ b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-pureio_1.1.9.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=2a21fcca821a506d4c36f7bbecc0d009" SRC_URI = "git://github.com/adafruit/Adafruit_Python_PureIO.git;branch=main;protocol=https" -SRCREV = "f4d0973da05b8b21905ff6bab69cdb652128f342" +SRCREV = "383b615ce9ff5bbefdf77652799f380016fda353" S = "${WORKDIR}/git" diff --git a/meta-raspberrypi/recipes-devtools/python/python3-rtimu_git.bb b/meta-raspberrypi/recipes-devtools/python/python3-rtimu_7.2.1.bb index 1afbb5f169..1afbb5f169 100644 --- a/meta-raspberrypi/recipes-devtools/python/python3-rtimu_git.bb +++ b/meta-raspberrypi/recipes-devtools/python/python3-rtimu_7.2.1.bb diff --git a/meta-raspberrypi/recipes-devtools/python/rpio/0001-include-sys-types.h-explicitly-for-getting-caddr_t-d.patch b/meta-raspberrypi/recipes-devtools/python/rpio/0001-include-sys-types.h-explicitly-for-getting-caddr_t-d.patch deleted file mode 100644 index bed97493d3..0000000000 --- a/meta-raspberrypi/recipes-devtools/python/rpio/0001-include-sys-types.h-explicitly-for-getting-caddr_t-d.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c86bfacc98d58244f532626954ed00d84ecfa82d Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 30 Jan 2016 17:12:37 -0800 -Subject: [PATCH] include sys/types.h explicitly for getting caddr_t definition - -Helps fixing build on musl where sys/types.h is not included indirectly -as happening on glibc - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - - source/c_gpio/c_gpio.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/source/c_gpio/c_gpio.c b/source/c_gpio/c_gpio.c -index 25a04ca..70df632 100644 ---- a/source/c_gpio/c_gpio.c -+++ b/source/c_gpio/c_gpio.c -@@ -29,6 +29,7 @@ - #include <stdint.h> - #include <stdlib.h> - #include <fcntl.h> -+#include <sys/types.h> - #include <sys/mman.h> - #include "c_gpio.h" - --- -2.7.0 - diff --git a/meta-raspberrypi/recipes-devtools/python/rpio_0.10.0.bb b/meta-raspberrypi/recipes-devtools/python/rpio_0.10.1.bb index f75806e3f6..176646d2bf 100644 --- a/meta-raspberrypi/recipes-devtools/python/rpio_0.10.0.bb +++ b/meta-raspberrypi/recipes-devtools/python/rpio_0.10.1.bb @@ -3,12 +3,13 @@ GPIO interrups, TCP socket interrupts, command line tools and more" HOMEPAGE = "https://github.com/metachris/RPIO" SECTION = "devel/python" LICENSE = "LGPL-3.0-or-later" -LIC_FILES_CHKSUM = "file://README.rst;beginline=41;endline=53;md5=d5d95d7486a4d98c999675c23196b25a" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=bb3ca60759f3202f1ae42e3519cd06bc" -PYPI_PACKAGE = "RPIO" -inherit pypi - -SRC_URI += "file://0001-include-sys-types.h-explicitly-for-getting-caddr_t-d.patch" +SRC_URI = "\ + git://github.com/metachris/RPIO.git;protocol=https;branch=master \ + " +SRCREV = "be1942a69b2592ddacd9dc833d2668a19aafd8d2" +S = "${WORKDIR}/git" inherit setuptools3 diff --git a/meta-raspberrypi/recipes-devtools/raspi-gpio/raspi-gpio_git.bb b/meta-raspberrypi/recipes-devtools/raspi-gpio/raspi-gpio_git.bb index 02a3f5585b..8ea4be17d7 100644 --- a/meta-raspberrypi/recipes-devtools/raspi-gpio/raspi-gpio_git.bb +++ b/meta-raspberrypi/recipes-devtools/raspi-gpio/raspi-gpio_git.bb @@ -8,7 +8,7 @@ COMPATIBLE_MACHINE = "^rpi$" inherit autotools -SRCREV = "4edfde183ff3ac9ed66cdc015ae25e45f3a5502d" +SRCREV = "22b44e4765b4b78dc5b22394fff484e353d5914d" SRC_URI = "git://github.com/RPi-Distro/raspi-gpio.git;protocol=https;branch=master \ " diff --git a/meta-raspberrypi/recipes-kernel/bluez-firmware-rpidistro/bluez-firmware-rpidistro_git.bb b/meta-raspberrypi/recipes-kernel/bluez-firmware-rpidistro/bluez-firmware-rpidistro_git.bb index 2e3d1ccf19..b26e80e3e6 100644 --- a/meta-raspberrypi/recipes-kernel/bluez-firmware-rpidistro/bluez-firmware-rpidistro_git.bb +++ b/meta-raspberrypi/recipes-kernel/bluez-firmware-rpidistro/bluez-firmware-rpidistro_git.bb @@ -39,7 +39,7 @@ do_extract_lic() { } # Must be before both do_install and do_populate_lic. Putting it before # their common ancestor works; other approaches do not. -addtask extract_lic after do_unpack before do_patch +addtask extract_lic after do_unpack before do_patch do_create_spdx do_compile() { : diff --git a/meta-raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb b/meta-raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb index 95cd9c1647..ec59970657 100644 --- a/meta-raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb +++ b/meta-raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb @@ -33,8 +33,8 @@ NO_GENERIC_LICENSE[Firmware-broadcom_bcm43xx-rpidistro] = "debian/config/brcm802 SRC_URI = "git://github.com/RPi-Distro/firmware-nonfree;branch=bullseye;protocol=https" -SRCREV = "b3eec612566ca08913f0830d299f4df70297428f" -PV = "20210315-3+rpt3" +SRCREV = "99d5c588e95ec9c9b86d7e88d3cf85b4f729d2bc" +PV = "20210315-3+rpt4" S = "${WORKDIR}/git" @@ -58,6 +58,7 @@ do_install() { cp -R --no-dereference --preserve=mode,links -v debian/config/brcm80211/brcm/${fw}.* ${D}${nonarch_base_libdir}/firmware/brcm/ done cp -R --no-dereference --preserve=mode,links -v debian/config/brcm80211/cypress/* ${D}${nonarch_base_libdir}/firmware/cypress/ + rm ${D}${nonarch_base_libdir}/firmware/cypress/README.txt # add compat links. Fixes errors like # brcmfmac mmc1:0001:1: Direct firmware load for brcm/brcmfmac43455-sdio.raspberrypi,4-model-compute-module.txt failed with error -2 ln -s brcmfmac43455-sdio.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module.txt @@ -79,10 +80,10 @@ LICENSE:${PN}-bcm43455 = "Firmware-broadcom_bcm43xx-rpidistro" LICENSE:${PN}-bcm43456 = "Firmware-broadcom_bcm43xx-rpidistro" LICENSE:${PN}-broadcom-license = "Firmware-broadcom_bcm43xx-rpidistro" FILES:${PN}-broadcom-license = "${nonarch_base_libdir}/firmware/LICENSE.broadcom_bcm43xx-rpidistro" -FILES:${PN}-bcm43430 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430* ${nonarch_base_libdir}/firmware/cypress/cyfmac43430-sdio.bin" +FILES:${PN}-bcm43430 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430* ${nonarch_base_libdir}/firmware/cypress/cyfmac43430-sdio.bin ${nonarch_base_libdir}/firmware/cypress/cyfmac43430-sdio.clm_blob" FILES:${PN}-bcm43436 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43436-*" FILES:${PN}-bcm43436s = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43436s*" -FILES:${PN}-bcm43455 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43455* ${nonarch_base_libdir}/firmware/cypress/cyfmac43455-sdio.*" +FILES:${PN}-bcm43455 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43455* ${nonarch_base_libdir}/firmware/cypress/cyfmac43455-sdio*" FILES:${PN}-bcm43456 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43456*" RDEPENDS:${PN}-bcm43430 += "${PN}-broadcom-license" RDEPENDS:${PN}-bcm43436 += "${PN}-broadcom-license" diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.10.bb b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.10.bb index 6ea132dadf..8dade0b99f 100644 --- a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.10.bb +++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.10.bb @@ -1,8 +1,8 @@ -LINUX_VERSION ?= "5.10.95" +LINUX_VERSION ?= "5.10.110" LINUX_RPI_BRANCH ?= "rpi-5.10.y" LINUX_RPI_KMETA_BRANCH ?= "yocto-5.10" -SRCREV_machine = "a538fd26f82b101cb6fb963042f3242768e628d4" +SRCREV_machine = "89c0af71c9cf157a865afb526e9ebc21aadd531b" SRCREV_meta = "e1979ceb171bc91ef2cb71cfcde548a101dab687" KMETA = "kernel-meta" diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.15.bb b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.15.bb index 5b15d01c22..77d4a980a3 100644 --- a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.15.bb +++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.15.bb @@ -1,8 +1,8 @@ -LINUX_VERSION ?= "5.15.32" +LINUX_VERSION ?= "5.15.34" LINUX_RPI_BRANCH ?= "rpi-5.15.y" LINUX_RPI_KMETA_BRANCH ?= "yocto-5.15" -SRCREV_machine = "720e66a1a1f9bbe666cf1551cfd8d122640e9eca" +SRCREV_machine = "0086da6acd41600d47b87b05874f99704216426f" SRCREV_meta = "e1b976ee4fb5af517cf01a9f2dd4a32f560ca894" KMETA = "kernel-meta" diff --git a/meta-security/meta-parsec/README.md b/meta-security/meta-parsec/README.md index 85e0d10f4f..97026ea602 100644 --- a/meta-security/meta-parsec/README.md +++ b/meta-security/meta-parsec/README.md @@ -43,20 +43,34 @@ local.conf: IMAGE_INSTALL:append = " parsec-service" By default the Parsec service will be deployed into the image with -TPM, PKCS11, MBED-CRYPTO and CRYPTOAUTHLIB providers build in -and with the default config file from the Parsec repository: -https://github.com/parallaxsecond/parsec/blob/main/config.toml +PKCS11 and MBED-CRYPTO providers build-in. + The TPM provider will also be built by default if: +- DISTRO_FEATURES contains "tmp2" and +- "tpm-layer" (meta-tpm) is included in BBLAYERS - You can use PACKAGECONFIG for Parsec servic recipe to define -what providers should be built in. For example, - PACKAGECONFIG:pn-parsec-service = "TPM" +You can use PACKAGECONFIG for Parsec servic recipe to define +what providers should be built in. For example: - The default Parsec service config file contains the MbedCrypto provider -enabled. The config file needs to be updated to use the Parsec service -with other providers like TPM or PKCS11. The required procedures are -covered in Parsec documentation. -https://parallaxsecond.github.io/parsec-book/ + PACKAGECONFIG:pn-parsec-service = "TS" + + +The default Parsec service config file is taken from the Parsec repository: +https://github.com/parallaxsecond/parsec/blob/main/config.toml +This config file contains the MbedCrypto provider enabled. +The config needs to be updated to use the Parsec service +with other providers like TPM or PKCS11. The required changes are +covered in Parsec documentation https://parallaxsecond.github.io/parsec-book/ + + PARSEC_CONFIG can be used in a bbappend file to replace the default config. +For example: + +``` +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +SRC_URI += "file://config-TS.toml \ + " +PARSEC_CONFIG = "${WORKDIR}/config-TS.toml" +``` Updating recipes ================ diff --git a/meta-security/meta-parsec/recipes-parsec/parsec-service/files/systemd.patch b/meta-security/meta-parsec/recipes-parsec/parsec-service/files/systemd.patch index c01ff065c9..25258985a9 100644 --- a/meta-security/meta-parsec/recipes-parsec/parsec-service/files/systemd.patch +++ b/meta-security/meta-parsec/recipes-parsec/parsec-service/files/systemd.patch @@ -4,16 +4,25 @@ Run the Parsec service as parsec user in /var/lib/parsec/ working directory. Signed-off-by: Anton Antonov <Anton.Antonov@arm.com> Upstream-Status: Inappropriate [deployment configuration] ---- a/systemd-daemon/parsec.service 2021-03-28 18:34:18.703196235 +0100 -+++ b/systemd-daemon/parsec.service 2021-03-28 18:35:14.279830299 +0100 -@@ -3,7 +3,9 @@ +diff --git a/systemd-daemon/parsec.service b/systemd-daemon/parsec.service +index c07c3b9..a6fe6a3 100644 +--- a/systemd-daemon/parsec.service ++++ b/systemd-daemon/parsec.service +@@ -3,13 +3,15 @@ Description=Parsec Service Documentation=https://parallaxsecond.github.io/parsec-book/parsec_service/install_parsec_linux.html - + [Service] -WorkingDirectory=/home/parsec/ +User=parsec +Group=parsec +WorkingDirectory=/var/lib/parsec/ ExecStart=/usr/libexec/parsec/parsec --config /etc/parsec/config.toml - - [Install] + # Systemd hardening + ProtectSystem=full + ProtectHome=true + ProtectHostname=true +-ProtectKernelTunables=true ++#ProtectKernelTunables=true + ProtectKernelModules=true + ProtectKernelLogs=true + ProtectControlGroups=true diff --git a/meta-security/meta-parsec/recipes-parsec/parsec-service/parsec-service_0.8.1.inc b/meta-security/meta-parsec/recipes-parsec/parsec-service/parsec-service_0.8.1.inc deleted file mode 100644 index fd88e87176..0000000000 --- a/meta-security/meta-parsec/recipes-parsec/parsec-service/parsec-service_0.8.1.inc +++ /dev/null @@ -1,246 +0,0 @@ -# This file is created from parsec-service repository Cargo.lock using cargo-bitbake tool - -SRC_URI += " \ - crate://crates.io/addr2line/0.15.2 \ - crate://crates.io/adler/1.0.2 \ - crate://crates.io/aho-corasick/0.7.15 \ - crate://crates.io/ansi_term/0.11.0 \ - crate://crates.io/anyhow/1.0.41 \ - crate://crates.io/arrayvec/0.5.2 \ - crate://crates.io/atty/0.2.14 \ - crate://crates.io/autocfg/1.0.1 \ - crate://crates.io/backtrace/0.3.59 \ - crate://crates.io/base64/0.12.3 \ - crate://crates.io/base64/0.13.0 \ - crate://crates.io/bincode/1.3.3 \ - crate://crates.io/bindgen/0.56.0 \ - crate://crates.io/bindgen/0.57.0 \ - crate://crates.io/bitfield/0.13.2 \ - crate://crates.io/bitflags/1.2.1 \ - crate://crates.io/bitvec/0.19.5 \ - crate://crates.io/boringssl-src/0.3.0+688fc5c \ - crate://crates.io/bumpalo/3.7.0 \ - crate://crates.io/bytes/0.5.6 \ - crate://crates.io/bytes/1.0.1 \ - crate://crates.io/cc/1.0.68 \ - crate://crates.io/cexpr/0.4.0 \ - crate://crates.io/cfg-if/1.0.0 \ - crate://crates.io/chrono/0.4.19 \ - crate://crates.io/clang-sys/1.2.0 \ - crate://crates.io/clap/2.33.3 \ - crate://crates.io/cmake/0.1.45 \ - crate://crates.io/const-oid/0.6.0 \ - crate://crates.io/cryptoauthlib-sys/0.2.0 \ - crate://crates.io/cryptoki-sys/0.1.2 \ - crate://crates.io/cryptoki/0.2.0 \ - crate://crates.io/data-encoding/2.3.2 \ - crate://crates.io/der-oid-macro/0.4.0 \ - crate://crates.io/der-parser/5.1.0 \ - crate://crates.io/der/0.4.0 \ - crate://crates.io/derivative/2.2.0 \ - crate://crates.io/either/1.6.1 \ - crate://crates.io/enumflags2/0.6.4 \ - crate://crates.io/enumflags2_derive/0.6.4 \ - crate://crates.io/env_logger/0.8.4 \ - crate://crates.io/failure/0.1.8 \ - crate://crates.io/failure_derive/0.1.8 \ - crate://crates.io/fixedbitset/0.2.0 \ - crate://crates.io/form_urlencoded/1.0.1 \ - crate://crates.io/funty/1.1.0 \ - crate://crates.io/futures-channel/0.3.15 \ - crate://crates.io/futures-core/0.3.15 \ - crate://crates.io/futures-executor/0.3.15 \ - crate://crates.io/futures-io/0.3.15 \ - crate://crates.io/futures-macro/0.3.15 \ - crate://crates.io/futures-sink/0.3.15 \ - crate://crates.io/futures-task/0.3.15 \ - crate://crates.io/futures-util/0.3.15 \ - crate://crates.io/futures/0.3.15 \ - crate://crates.io/generic-array/0.14.4 \ - crate://crates.io/getrandom/0.2.3 \ - crate://crates.io/gimli/0.24.0 \ - crate://crates.io/glob/0.3.0 \ - crate://crates.io/grpcio-compiler/0.7.0 \ - crate://crates.io/grpcio-sys/0.9.0+1.38.0 \ - crate://crates.io/grpcio/0.9.0 \ - crate://crates.io/hamming/0.1.3 \ - crate://crates.io/hashbrown/0.9.1 \ - crate://crates.io/heck/0.3.3 \ - crate://crates.io/hermit-abi/0.1.18 \ - crate://crates.io/hex/0.4.3 \ - crate://crates.io/hostname-validator/1.1.0 \ - crate://crates.io/humantime/2.1.0 \ - crate://crates.io/idna/0.2.3 \ - crate://crates.io/indexmap/1.6.2 \ - crate://crates.io/instant/0.1.9 \ - crate://crates.io/itertools/0.8.2 \ - crate://crates.io/itertools/0.9.0 \ - crate://crates.io/itoa/0.4.7 \ - crate://crates.io/js-sys/0.3.51 \ - crate://crates.io/jsonwebkey/0.3.2 \ - crate://crates.io/jsonwebtoken/7.2.0 \ - crate://crates.io/lazy_static/1.4.0 \ - crate://crates.io/lazycell/1.3.0 \ - crate://crates.io/lexical-core/0.7.6 \ - crate://crates.io/libc/0.2.97 \ - crate://crates.io/libloading/0.7.0 \ - crate://crates.io/libz-sys/1.1.3 \ - crate://crates.io/lock_api/0.4.4 \ - crate://crates.io/log/0.4.14 \ - crate://crates.io/matches/0.1.8 \ - crate://crates.io/mbox/0.5.0 \ - crate://crates.io/memchr/2.3.4 \ - crate://crates.io/miniz_oxide/0.4.4 \ - crate://crates.io/multimap/0.8.3 \ - crate://crates.io/nom/5.1.2 \ - crate://crates.io/nom/6.2.0 \ - crate://crates.io/num-bigint/0.2.6 \ - crate://crates.io/num-bigint/0.3.2 \ - crate://crates.io/num-bigint/0.4.0 \ - crate://crates.io/num-complex/0.3.1 \ - crate://crates.io/num-derive/0.3.3 \ - crate://crates.io/num-integer/0.1.44 \ - crate://crates.io/num-iter/0.1.42 \ - crate://crates.io/num-rational/0.3.2 \ - crate://crates.io/num-traits/0.2.14 \ - crate://crates.io/num/0.3.1 \ - crate://crates.io/num_cpus/1.13.0 \ - crate://crates.io/object/0.24.0 \ - crate://crates.io/oid-registry/0.1.3 \ - crate://crates.io/oid/0.1.1 \ - crate://crates.io/once_cell/1.8.0 \ - crate://crates.io/parking_lot/0.11.1 \ - crate://crates.io/parking_lot_core/0.8.3 \ - crate://crates.io/parsec-interface/0.25.0 \ - crate://crates.io/peeking_take_while/0.1.2 \ - crate://crates.io/pem/0.8.3 \ - crate://crates.io/percent-encoding/2.1.0 \ - crate://crates.io/petgraph/0.5.1 \ - crate://crates.io/picky-asn1-der/0.2.4 \ - crate://crates.io/picky-asn1-x509/0.4.0 \ - crate://crates.io/picky-asn1/0.3.1 \ - crate://crates.io/pin-project-lite/0.2.6 \ - crate://crates.io/pin-utils/0.1.0 \ - crate://crates.io/pkcs8/0.7.0 \ - crate://crates.io/pkg-config/0.3.19 \ - crate://crates.io/ppv-lite86/0.2.10 \ - crate://crates.io/primal-bit/0.3.0 \ - crate://crates.io/primal-check/0.3.1 \ - crate://crates.io/primal-estimate/0.3.1 \ - crate://crates.io/primal-sieve/0.3.1 \ - crate://crates.io/primal/0.3.0 \ - crate://crates.io/proc-macro-error-attr/1.0.4 \ - crate://crates.io/proc-macro-error/1.0.4 \ - crate://crates.io/proc-macro-hack/0.5.19 \ - crate://crates.io/proc-macro-nested/0.1.7 \ - crate://crates.io/proc-macro2/1.0.27 \ - crate://crates.io/prost-build/0.7.0 \ - crate://crates.io/prost-derive/0.6.1 \ - crate://crates.io/prost-derive/0.7.0 \ - crate://crates.io/prost-types/0.7.0 \ - crate://crates.io/prost/0.6.1 \ - crate://crates.io/prost/0.7.0 \ - crate://crates.io/protobuf-codegen/2.24.1 \ - crate://crates.io/protobuf/2.24.1 \ - crate://crates.io/protoc-grpcio/3.0.0 \ - crate://crates.io/protoc/2.24.1 \ - crate://crates.io/psa-crypto-sys/0.9.0 \ - crate://crates.io/psa-crypto/0.9.0 \ - crate://crates.io/quote/1.0.9 \ - crate://crates.io/radium/0.5.3 \ - crate://crates.io/rand/0.8.4 \ - crate://crates.io/rand_chacha/0.3.1 \ - crate://crates.io/rand_core/0.6.3 \ - crate://crates.io/rand_hc/0.3.1 \ - crate://crates.io/redox_syscall/0.2.9 \ - crate://crates.io/regex-syntax/0.6.25 \ - crate://crates.io/regex/1.4.6 \ - crate://crates.io/remove_dir_all/0.5.3 \ - crate://crates.io/ring/0.16.20 \ - crate://crates.io/rust-cryptoauthlib/0.4.0 \ - crate://crates.io/rustc-demangle/0.1.20 \ - crate://crates.io/rustc-hash/1.1.0 \ - crate://crates.io/rustc_version/0.2.3 \ - crate://crates.io/rusticata-macros/3.0.1 \ - crate://crates.io/rustversion/1.0.5 \ - crate://crates.io/ryu/1.0.5 \ - crate://crates.io/same-file/1.0.6 \ - crate://crates.io/scopeguard/1.1.0 \ - crate://crates.io/sd-notify/0.2.0 \ - crate://crates.io/secrecy/0.7.0 \ - crate://crates.io/semver-parser/0.7.0 \ - crate://crates.io/semver/0.9.0 \ - crate://crates.io/serde/1.0.126 \ - crate://crates.io/serde_bytes/0.11.5 \ - crate://crates.io/serde_derive/1.0.126 \ - crate://crates.io/serde_json/1.0.64 \ - crate://crates.io/shlex/0.1.1 \ - crate://crates.io/signal-hook-registry/1.4.0 \ - crate://crates.io/signal-hook/0.3.9 \ - crate://crates.io/simple_asn1/0.4.1 \ - crate://crates.io/simple_asn1/0.5.3 \ - crate://crates.io/slab/0.4.3 \ - crate://crates.io/smallvec/1.6.1 \ - crate://crates.io/spiffe/0.1.1 \ - crate://crates.io/spin/0.5.2 \ - crate://crates.io/spki/0.4.0 \ - crate://crates.io/stable_deref_trait/1.2.0 \ - crate://crates.io/static_assertions/1.1.0 \ - crate://crates.io/strsim/0.8.0 \ - crate://crates.io/structopt-derive/0.4.14 \ - crate://crates.io/structopt/0.3.21 \ - crate://crates.io/strum_macros/0.19.4 \ - crate://crates.io/syn/1.0.73 \ - crate://crates.io/synstructure/0.12.4 \ - crate://crates.io/tap/1.0.1 \ - crate://crates.io/target-lexicon/0.12.0 \ - crate://crates.io/tempfile/3.2.0 \ - crate://crates.io/termcolor/1.1.2 \ - crate://crates.io/textwrap/0.11.0 \ - crate://crates.io/thiserror-impl/1.0.25 \ - crate://crates.io/thiserror/1.0.25 \ - crate://crates.io/threadpool/1.8.1 \ - crate://crates.io/time/0.1.44 \ - crate://crates.io/tinyvec/1.2.0 \ - crate://crates.io/tinyvec_macros/0.1.0 \ - crate://crates.io/toml/0.5.8 \ - crate://crates.io/tss-esapi-sys/0.2.0 \ - crate://crates.io/tss-esapi/7.0.0-alpha.1 \ - crate://crates.io/typenum/1.13.0 \ - crate://crates.io/unicode-bidi/0.3.5 \ - crate://crates.io/unicode-normalization/0.1.19 \ - crate://crates.io/unicode-segmentation/1.7.1 \ - crate://crates.io/unicode-width/0.1.8 \ - crate://crates.io/unicode-xid/0.2.2 \ - crate://crates.io/untrusted/0.7.1 \ - crate://crates.io/url/2.2.2 \ - crate://crates.io/users/0.11.0 \ - crate://crates.io/uuid/0.8.2 \ - crate://crates.io/vcpkg/0.2.15 \ - crate://crates.io/vec_map/0.8.2 \ - crate://crates.io/version/3.0.0 \ - crate://crates.io/version_check/0.9.3 \ - crate://crates.io/walkdir/2.3.2 \ - crate://crates.io/wasi/0.10.0+wasi-snapshot-preview1 \ - crate://crates.io/wasm-bindgen-backend/0.2.74 \ - crate://crates.io/wasm-bindgen-macro-support/0.2.74 \ - crate://crates.io/wasm-bindgen-macro/0.2.74 \ - crate://crates.io/wasm-bindgen-shared/0.2.74 \ - crate://crates.io/wasm-bindgen/0.2.74 \ - crate://crates.io/web-sys/0.3.51 \ - crate://crates.io/which/3.1.1 \ - crate://crates.io/which/4.1.0 \ - crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ - crate://crates.io/winapi-util/0.1.5 \ - crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ - crate://crates.io/winapi/0.3.9 \ - crate://crates.io/wyz/0.2.0 \ - crate://crates.io/x509-parser/0.9.2 \ - crate://crates.io/yasna/0.3.2 \ - crate://crates.io/zeroize/1.3.0 \ - crate://crates.io/zeroize_derive/1.1.0 \ -" - -LIC_FILES_CHKSUM = " \ - file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ -" diff --git a/meta-security/meta-parsec/recipes-parsec/parsec-service/parsec-service_0.8.1.bb b/meta-security/meta-parsec/recipes-parsec/parsec-service/parsec-service_1.0.0.bb index 3f12139b7a..d1d6c07ad0 100644 --- a/meta-security/meta-parsec/recipes-parsec/parsec-service/parsec-service_0.8.1.bb +++ b/meta-security/meta-parsec/recipes-parsec/parsec-service/parsec-service_1.0.0.bb @@ -2,7 +2,8 @@ SUMMARY = "Platform AbstRaction for SECurity Daemon" HOMEPAGE = "https://github.com/parallaxsecond/parsec" LICENSE = "Apache-2.0" -inherit cargo +inherit cargo pkgconfig +DEPENDS = "clang-native" SRC_URI += "crate://crates.io/parsec-service/${PV} \ file://parsec_init \ @@ -10,14 +11,10 @@ SRC_URI += "crate://crates.io/parsec-service/${PV} \ file://parsec-tmpfiles.conf \ " -DEPENDS = "clang-native" - -PACKAGECONFIG ??= "PKCS11 MBED-CRYPTO CRYPTOAUTHLIB" - +PACKAGECONFIG ??= "PKCS11 MBED-CRYPTO" have_TPM = "${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', 'TPM', '', d)}" PACKAGECONFIG:append = " ${@bb.utils.contains('BBFILE_COLLECTIONS', 'tpm-layer', '${have_TPM}', '', d)}" - PACKAGECONFIG[ALL] = "all-providers cryptoki/generate-bindings tss-esapi/generate-bindings,,tpm2-tss libts,libts" PACKAGECONFIG[TPM] = "tpm-provider tss-esapi/generate-bindings,,tpm2-tss" PACKAGECONFIG[PKCS11] = "pkcs11-provider cryptoki/generate-bindings," @@ -28,7 +25,7 @@ PACKAGECONFIG[TS] = "trusted-service-provider,,libts,libts" PARSEC_FEATURES = "${@d.getVar('PACKAGECONFIG_CONFARGS',True).strip().replace(' ', ',')}" CARGO_BUILD_FLAGS += " --features ${PARSEC_FEATURES}" -inherit pkgconfig systemd +inherit systemd SYSTEMD_SERVICE:${PN} = "parsec.service" inherit update-rc.d @@ -73,6 +70,7 @@ FILES:${PN} += " \ ${sysconfdir}/parsec/config.toml \ ${libexecdir}/parsec/parsec \ ${systemd_unitdir}/system/parsec.service \ + ${localstatedir}/lib/parsec \ ${libdir}/tmpfiles.d/parsec-tmpfiles.conf \ ${sysconfdir}/init.d/parsec \ " diff --git a/meta-security/meta-parsec/recipes-parsec/parsec-service/parsec-service_1.0.0.inc b/meta-security/meta-parsec/recipes-parsec/parsec-service/parsec-service_1.0.0.inc new file mode 100644 index 0000000000..b6934f8147 --- /dev/null +++ b/meta-security/meta-parsec/recipes-parsec/parsec-service/parsec-service_1.0.0.inc @@ -0,0 +1,232 @@ +# This file is created from parsec repository Cargo.lock using cargo-bitbake tool + +SRC_URI += " \ + crate://crates.io/ahash/0.7.6 \ + crate://crates.io/aho-corasick/0.7.18 \ + crate://crates.io/ansi_term/0.12.1 \ + crate://crates.io/anyhow/1.0.56 \ + crate://crates.io/arrayvec/0.5.2 \ + crate://crates.io/atty/0.2.14 \ + crate://crates.io/autocfg/1.1.0 \ + crate://crates.io/base64/0.12.3 \ + crate://crates.io/base64/0.13.0 \ + crate://crates.io/bincode/1.3.3 \ + crate://crates.io/bindgen/0.57.0 \ + crate://crates.io/bindgen/0.59.2 \ + crate://crates.io/bitfield/0.13.2 \ + crate://crates.io/bitflags/1.3.2 \ + crate://crates.io/bitvec/0.19.6 \ + crate://crates.io/bumpalo/3.9.1 \ + crate://crates.io/bytes/1.1.0 \ + crate://crates.io/cc/1.0.73 \ + crate://crates.io/cexpr/0.4.0 \ + crate://crates.io/cexpr/0.6.0 \ + crate://crates.io/cfg-if/1.0.0 \ + crate://crates.io/chrono/0.4.19 \ + crate://crates.io/clang-sys/1.3.1 \ + crate://crates.io/clap/2.34.0 \ + crate://crates.io/cmake/0.1.45 \ + crate://crates.io/const-oid/0.6.2 \ + crate://crates.io/cryptoauthlib-sys/0.2.2 \ + crate://crates.io/cryptoki-sys/0.1.3 \ + crate://crates.io/cryptoki/0.2.1 \ + crate://crates.io/data-encoding/2.3.2 \ + crate://crates.io/der-oid-macro/0.4.0 \ + crate://crates.io/der-parser/5.1.2 \ + crate://crates.io/der/0.4.5 \ + crate://crates.io/derivative/2.2.0 \ + crate://crates.io/either/1.6.1 \ + crate://crates.io/enumflags2/0.7.3 \ + crate://crates.io/enumflags2_derive/0.7.3 \ + crate://crates.io/env_logger/0.8.4 \ + crate://crates.io/env_logger/0.9.0 \ + crate://crates.io/fallible-iterator/0.2.0 \ + crate://crates.io/fallible-streaming-iterator/0.1.9 \ + crate://crates.io/fastrand/1.7.0 \ + crate://crates.io/fixedbitset/0.2.0 \ + crate://crates.io/form_urlencoded/1.0.1 \ + crate://crates.io/funty/1.1.0 \ + crate://crates.io/futures-channel/0.3.21 \ + crate://crates.io/futures-core/0.3.21 \ + crate://crates.io/futures-executor/0.3.21 \ + crate://crates.io/futures-io/0.3.21 \ + crate://crates.io/futures-macro/0.3.21 \ + crate://crates.io/futures-sink/0.3.21 \ + crate://crates.io/futures-task/0.3.21 \ + crate://crates.io/futures-util/0.3.21 \ + crate://crates.io/futures/0.3.21 \ + crate://crates.io/generic-array/0.14.5 \ + crate://crates.io/getrandom/0.2.5 \ + crate://crates.io/glob/0.3.0 \ + crate://crates.io/grpcio-sys/0.9.1+1.38.0 \ + crate://crates.io/grpcio/0.9.1 \ + crate://crates.io/hashbrown/0.11.2 \ + crate://crates.io/hashlink/0.7.0 \ + crate://crates.io/heck/0.3.3 \ + crate://crates.io/hermit-abi/0.1.19 \ + crate://crates.io/hex/0.4.3 \ + crate://crates.io/hostname-validator/1.1.0 \ + crate://crates.io/humantime/2.1.0 \ + crate://crates.io/idna/0.2.3 \ + crate://crates.io/indexmap/1.8.0 \ + crate://crates.io/instant/0.1.12 \ + crate://crates.io/itertools/0.10.3 \ + crate://crates.io/itoa/1.0.1 \ + crate://crates.io/js-sys/0.3.56 \ + crate://crates.io/jsonwebkey/0.3.2 \ + crate://crates.io/jsonwebtoken/7.2.0 \ + crate://crates.io/lazy_static/1.4.0 \ + crate://crates.io/lazycell/1.3.0 \ + crate://crates.io/lexical-core/0.7.6 \ + crate://crates.io/libc/0.2.120 \ + crate://crates.io/libloading/0.7.3 \ + crate://crates.io/libsqlite3-sys/0.23.2 \ + crate://crates.io/libz-sys/1.1.5 \ + crate://crates.io/lock_api/0.4.6 \ + crate://crates.io/log/0.4.14 \ + crate://crates.io/matches/0.1.9 \ + crate://crates.io/mbox/0.6.0 \ + crate://crates.io/memchr/2.4.1 \ + crate://crates.io/minimal-lexical/0.2.1 \ + crate://crates.io/multimap/0.8.3 \ + crate://crates.io/nom/5.1.2 \ + crate://crates.io/nom/6.1.2 \ + crate://crates.io/nom/7.1.1 \ + crate://crates.io/num-bigint/0.2.6 \ + crate://crates.io/num-bigint/0.3.3 \ + crate://crates.io/num-bigint/0.4.3 \ + crate://crates.io/num-complex/0.3.1 \ + crate://crates.io/num-derive/0.3.3 \ + crate://crates.io/num-integer/0.1.44 \ + crate://crates.io/num-iter/0.1.42 \ + crate://crates.io/num-rational/0.3.2 \ + crate://crates.io/num-traits/0.2.14 \ + crate://crates.io/num/0.3.1 \ + crate://crates.io/num_cpus/1.13.1 \ + crate://crates.io/oid-registry/0.1.5 \ + crate://crates.io/oid/0.2.1 \ + crate://crates.io/once_cell/1.10.0 \ + crate://crates.io/parking_lot/0.11.2 \ + crate://crates.io/parking_lot_core/0.8.5 \ + crate://crates.io/parsec-interface/0.26.0 \ + crate://crates.io/peeking_take_while/0.1.2 \ + crate://crates.io/pem/0.8.3 \ + crate://crates.io/percent-encoding/2.1.0 \ + crate://crates.io/pest/2.1.3 \ + crate://crates.io/petgraph/0.5.1 \ + crate://crates.io/picky-asn1-der/0.2.5 \ + crate://crates.io/picky-asn1-x509/0.6.1 \ + crate://crates.io/picky-asn1/0.3.3 \ + crate://crates.io/pin-project-lite/0.2.8 \ + crate://crates.io/pin-utils/0.1.0 \ + crate://crates.io/pkcs8/0.7.6 \ + crate://crates.io/pkg-config/0.3.24 \ + crate://crates.io/ppv-lite86/0.2.16 \ + crate://crates.io/proc-macro-error-attr/1.0.4 \ + crate://crates.io/proc-macro-error/1.0.4 \ + crate://crates.io/proc-macro2/1.0.36 \ + crate://crates.io/prost-build/0.8.0 \ + crate://crates.io/prost-derive/0.8.0 \ + crate://crates.io/prost-types/0.8.0 \ + crate://crates.io/prost/0.8.0 \ + crate://crates.io/protobuf/2.27.1 \ + crate://crates.io/psa-crypto-sys/0.9.2 \ + crate://crates.io/psa-crypto/0.9.1 \ + crate://crates.io/quote/1.0.15 \ + crate://crates.io/radium/0.5.3 \ + crate://crates.io/rand/0.8.5 \ + crate://crates.io/rand_chacha/0.3.1 \ + crate://crates.io/rand_core/0.6.3 \ + crate://crates.io/redox_syscall/0.2.11 \ + crate://crates.io/regex-syntax/0.6.25 \ + crate://crates.io/regex/1.5.5 \ + crate://crates.io/remove_dir_all/0.5.3 \ + crate://crates.io/ring/0.16.20 \ + crate://crates.io/rusqlite/0.26.3 \ + crate://crates.io/rust-cryptoauthlib/0.4.5 \ + crate://crates.io/rustc-hash/1.1.0 \ + crate://crates.io/rustc_version/0.3.3 \ + crate://crates.io/rusticata-macros/3.2.0 \ + crate://crates.io/rustversion/1.0.6 \ + crate://crates.io/ryu/1.0.9 \ + crate://crates.io/same-file/1.0.6 \ + crate://crates.io/scopeguard/1.1.0 \ + crate://crates.io/sd-notify/0.2.0 \ + crate://crates.io/secrecy/0.7.0 \ + crate://crates.io/semver-parser/0.10.2 \ + crate://crates.io/semver/0.11.0 \ + crate://crates.io/serde/1.0.136 \ + crate://crates.io/serde_bytes/0.11.5 \ + crate://crates.io/serde_derive/1.0.136 \ + crate://crates.io/serde_json/1.0.79 \ + crate://crates.io/shlex/0.1.1 \ + crate://crates.io/shlex/1.1.0 \ + crate://crates.io/signal-hook-registry/1.4.0 \ + crate://crates.io/signal-hook/0.3.13 \ + crate://crates.io/simple_asn1/0.4.1 \ + crate://crates.io/simple_asn1/0.5.4 \ + crate://crates.io/slab/0.4.5 \ + crate://crates.io/smallvec/1.8.0 \ + crate://crates.io/spiffe/0.2.0 \ + crate://crates.io/spin/0.5.2 \ + crate://crates.io/spki/0.4.1 \ + crate://crates.io/stable_deref_trait/1.2.0 \ + crate://crates.io/static_assertions/1.1.0 \ + crate://crates.io/strsim/0.8.0 \ + crate://crates.io/structopt-derive/0.4.18 \ + crate://crates.io/structopt/0.3.26 \ + crate://crates.io/strum_macros/0.21.1 \ + crate://crates.io/syn/1.0.88 \ + crate://crates.io/synstructure/0.12.6 \ + crate://crates.io/tap/1.0.1 \ + crate://crates.io/target-lexicon/0.12.3 \ + crate://crates.io/tempfile/3.3.0 \ + crate://crates.io/termcolor/1.1.3 \ + crate://crates.io/textwrap/0.11.0 \ + crate://crates.io/thiserror-impl/1.0.30 \ + crate://crates.io/thiserror/1.0.30 \ + crate://crates.io/threadpool/1.8.1 \ + crate://crates.io/time/0.1.44 \ + crate://crates.io/tinyvec/1.5.1 \ + crate://crates.io/tinyvec_macros/0.1.0 \ + crate://crates.io/toml/0.5.8 \ + crate://crates.io/tss-esapi-sys/0.3.0 \ + crate://crates.io/tss-esapi/7.0.1 \ + crate://crates.io/typenum/1.15.0 \ + crate://crates.io/ucd-trie/0.1.3 \ + crate://crates.io/unicode-bidi/0.3.7 \ + crate://crates.io/unicode-normalization/0.1.19 \ + crate://crates.io/unicode-segmentation/1.9.0 \ + crate://crates.io/unicode-width/0.1.9 \ + crate://crates.io/unicode-xid/0.2.2 \ + crate://crates.io/untrusted/0.7.1 \ + crate://crates.io/url/2.2.2 \ + crate://crates.io/users/0.11.0 \ + crate://crates.io/uuid/0.8.2 \ + crate://crates.io/vcpkg/0.2.15 \ + crate://crates.io/vec_map/0.8.2 \ + crate://crates.io/version/3.0.0 \ + crate://crates.io/version_check/0.9.4 \ + crate://crates.io/walkdir/2.3.2 \ + crate://crates.io/wasi/0.10.0+wasi-snapshot-preview1 \ + crate://crates.io/wasm-bindgen-backend/0.2.79 \ + crate://crates.io/wasm-bindgen-macro-support/0.2.79 \ + crate://crates.io/wasm-bindgen-macro/0.2.79 \ + crate://crates.io/wasm-bindgen-shared/0.2.79 \ + crate://crates.io/wasm-bindgen/0.2.79 \ + crate://crates.io/web-sys/0.3.56 \ + crate://crates.io/which/4.2.4 \ + crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ + crate://crates.io/winapi-util/0.1.5 \ + crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ + crate://crates.io/winapi/0.3.9 \ + crate://crates.io/wyz/0.2.0 \ + crate://crates.io/x509-parser/0.9.2 \ + crate://crates.io/yasna/0.3.2 \ + crate://crates.io/zeroize/1.3.0 \ + crate://crates.io/zeroize_derive/1.3.2 \ +" + +LIC_FILES_CHKSUM = " \ + file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ +" diff --git a/meta-security/meta-parsec/recipes-parsec/parsec-tool/parsec-tool_0.5.1.bb b/meta-security/meta-parsec/recipes-parsec/parsec-tool/parsec-tool_0.5.2.bb index 4b053b9ca3..4b053b9ca3 100644 --- a/meta-security/meta-parsec/recipes-parsec/parsec-tool/parsec-tool_0.5.1.bb +++ b/meta-security/meta-parsec/recipes-parsec/parsec-tool/parsec-tool_0.5.2.bb diff --git a/meta-security/meta-parsec/recipes-parsec/parsec-tool/parsec-tool_0.5.1.inc b/meta-security/meta-parsec/recipes-parsec/parsec-tool/parsec-tool_0.5.2.inc index 567cc378aa..d17ec25d73 100644 --- a/meta-security/meta-parsec/recipes-parsec/parsec-tool/parsec-tool_0.5.1.inc +++ b/meta-security/meta-parsec/recipes-parsec/parsec-tool/parsec-tool_0.5.2.inc @@ -1,31 +1,30 @@ # This file is created from parsec-tool repository Cargo.lock using cargo-bitbake tool SRC_URI += " \ - crate://crates.io/aho-corasick/0.7.15 \ - crate://crates.io/ansi_term/0.11.0 \ + crate://crates.io/aho-corasick/0.7.18 \ crate://crates.io/ansi_term/0.12.1 \ - crate://crates.io/anyhow/1.0.44 \ + crate://crates.io/anyhow/1.0.56 \ crate://crates.io/arrayvec/0.5.2 \ crate://crates.io/atty/0.2.14 \ - crate://crates.io/autocfg/1.0.1 \ + crate://crates.io/autocfg/1.1.0 \ crate://crates.io/base64/0.12.3 \ crate://crates.io/base64/0.13.0 \ crate://crates.io/bincode/1.3.3 \ crate://crates.io/bindgen/0.57.0 \ crate://crates.io/bitflags/1.3.2 \ - crate://crates.io/bitvec/0.19.5 \ + crate://crates.io/bitvec/0.19.6 \ crate://crates.io/block-buffer/0.9.0 \ - crate://crates.io/bumpalo/3.7.1 \ + crate://crates.io/bumpalo/3.9.1 \ crate://crates.io/bytes/1.1.0 \ - crate://crates.io/cc/1.0.70 \ + crate://crates.io/cc/1.0.73 \ crate://crates.io/cexpr/0.4.0 \ crate://crates.io/cfg-if/1.0.0 \ crate://crates.io/chrono/0.4.19 \ - crate://crates.io/clang-sys/1.2.2 \ - crate://crates.io/clap/2.33.3 \ - crate://crates.io/clap/3.0.0-beta.4 \ - crate://crates.io/clap_derive/3.0.0-beta.4 \ - crate://crates.io/cmake/0.1.45 \ + crate://crates.io/clang-sys/1.3.1 \ + crate://crates.io/clap/2.34.0 \ + crate://crates.io/clap/3.0.0-beta.5 \ + crate://crates.io/clap_derive/3.0.0-beta.5 \ + crate://crates.io/cmake/0.1.48 \ crate://crates.io/const-oid/0.6.2 \ crate://crates.io/cpufeatures/0.2.1 \ crate://crates.io/data-encoding/2.3.2 \ @@ -38,16 +37,16 @@ SRC_URI += " \ crate://crates.io/env_logger/0.8.4 \ crate://crates.io/form_urlencoded/1.0.1 \ crate://crates.io/funty/1.1.0 \ - crate://crates.io/futures-channel/0.3.17 \ - crate://crates.io/futures-core/0.3.17 \ - crate://crates.io/futures-executor/0.3.17 \ - crate://crates.io/futures-io/0.3.17 \ - crate://crates.io/futures-macro/0.3.17 \ - crate://crates.io/futures-sink/0.3.17 \ - crate://crates.io/futures-task/0.3.17 \ - crate://crates.io/futures-util/0.3.17 \ - crate://crates.io/futures/0.3.17 \ - crate://crates.io/generic-array/0.14.4 \ + crate://crates.io/futures-channel/0.3.21 \ + crate://crates.io/futures-core/0.3.21 \ + crate://crates.io/futures-executor/0.3.21 \ + crate://crates.io/futures-io/0.3.21 \ + crate://crates.io/futures-macro/0.3.21 \ + crate://crates.io/futures-sink/0.3.21 \ + crate://crates.io/futures-task/0.3.21 \ + crate://crates.io/futures-util/0.3.21 \ + crate://crates.io/futures/0.3.21 \ + crate://crates.io/generic-array/0.14.5 \ crate://crates.io/glob/0.3.0 \ crate://crates.io/grpcio-sys/0.9.1+1.38.0 \ crate://crates.io/grpcio/0.9.1 \ @@ -56,28 +55,28 @@ SRC_URI += " \ crate://crates.io/hermit-abi/0.1.19 \ crate://crates.io/humantime/2.1.0 \ crate://crates.io/idna/0.2.3 \ - crate://crates.io/indexmap/1.7.0 \ - crate://crates.io/instant/0.1.11 \ - crate://crates.io/itertools/0.10.1 \ - crate://crates.io/itoa/0.4.8 \ - crate://crates.io/js-sys/0.3.55 \ + crate://crates.io/indexmap/1.8.0 \ + crate://crates.io/instant/0.1.12 \ + crate://crates.io/itertools/0.10.3 \ + crate://crates.io/itoa/1.0.1 \ + crate://crates.io/js-sys/0.3.56 \ crate://crates.io/jsonwebkey/0.3.2 \ crate://crates.io/jsonwebtoken/7.2.0 \ crate://crates.io/lazy_static/1.4.0 \ crate://crates.io/lazycell/1.3.0 \ crate://crates.io/lexical-core/0.7.6 \ - crate://crates.io/libc/0.2.103 \ - crate://crates.io/libloading/0.7.0 \ - crate://crates.io/libz-sys/1.1.3 \ - crate://crates.io/lock_api/0.4.5 \ + crate://crates.io/libc/0.2.120 \ + crate://crates.io/libloading/0.7.3 \ + crate://crates.io/libz-sys/1.1.5 \ + crate://crates.io/lock_api/0.4.6 \ crate://crates.io/log/0.4.14 \ crate://crates.io/matches/0.1.9 \ - crate://crates.io/memchr/2.3.4 \ + crate://crates.io/memchr/2.4.1 \ crate://crates.io/nom/5.1.2 \ - crate://crates.io/nom/6.2.1 \ + crate://crates.io/nom/6.1.2 \ crate://crates.io/num-bigint/0.2.6 \ crate://crates.io/num-bigint/0.3.3 \ - crate://crates.io/num-bigint/0.4.2 \ + crate://crates.io/num-bigint/0.4.3 \ crate://crates.io/num-complex/0.3.1 \ crate://crates.io/num-derive/0.3.3 \ crate://crates.io/num-integer/0.1.44 \ @@ -85,83 +84,84 @@ SRC_URI += " \ crate://crates.io/num-rational/0.3.2 \ crate://crates.io/num-traits/0.2.14 \ crate://crates.io/num/0.3.1 \ + crate://crates.io/num_threads/0.1.5 \ crate://crates.io/oid-registry/0.1.5 \ crate://crates.io/oid/0.2.1 \ - crate://crates.io/once_cell/1.8.0 \ + crate://crates.io/once_cell/1.10.0 \ crate://crates.io/opaque-debug/0.3.0 \ - crate://crates.io/os_str_bytes/3.1.0 \ + crate://crates.io/os_str_bytes/4.1.1 \ crate://crates.io/parking_lot/0.11.2 \ crate://crates.io/parking_lot_core/0.8.5 \ crate://crates.io/parsec-client/0.14.0 \ crate://crates.io/parsec-interface/0.26.0 \ crate://crates.io/peeking_take_while/0.1.2 \ crate://crates.io/pem/0.8.3 \ - crate://crates.io/pem/1.0.1 \ + crate://crates.io/pem/1.0.2 \ crate://crates.io/percent-encoding/2.1.0 \ crate://crates.io/picky-asn1-der/0.2.5 \ crate://crates.io/picky-asn1-x509/0.6.1 \ crate://crates.io/picky-asn1/0.3.3 \ - crate://crates.io/pin-project-lite/0.2.7 \ + crate://crates.io/pin-project-lite/0.2.8 \ crate://crates.io/pin-utils/0.1.0 \ crate://crates.io/pkcs8/0.7.6 \ - crate://crates.io/pkg-config/0.3.20 \ + crate://crates.io/pkg-config/0.3.24 \ crate://crates.io/proc-macro-error-attr/1.0.4 \ crate://crates.io/proc-macro-error/1.0.4 \ - crate://crates.io/proc-macro-hack/0.5.19 \ - crate://crates.io/proc-macro-nested/0.1.7 \ - crate://crates.io/proc-macro2/1.0.29 \ + crate://crates.io/proc-macro2/1.0.36 \ crate://crates.io/prost-derive/0.8.0 \ crate://crates.io/prost/0.8.0 \ - crate://crates.io/protobuf/2.25.1 \ + crate://crates.io/protobuf/2.27.1 \ crate://crates.io/psa-crypto-sys/0.9.2 \ crate://crates.io/psa-crypto/0.9.1 \ - crate://crates.io/quote/1.0.9 \ + crate://crates.io/quote/1.0.15 \ crate://crates.io/radium/0.5.3 \ - crate://crates.io/rcgen/0.8.14 \ - crate://crates.io/redox_syscall/0.2.10 \ + crate://crates.io/rcgen/0.9.2 \ + crate://crates.io/redox_syscall/0.2.11 \ crate://crates.io/regex-syntax/0.6.25 \ - crate://crates.io/regex/1.4.6 \ + crate://crates.io/regex/1.5.5 \ crate://crates.io/ring/0.16.20 \ crate://crates.io/rustc-hash/1.1.0 \ crate://crates.io/rusticata-macros/3.2.0 \ - crate://crates.io/rustversion/1.0.5 \ - crate://crates.io/ryu/1.0.5 \ + crate://crates.io/rustversion/1.0.6 \ + crate://crates.io/ryu/1.0.9 \ crate://crates.io/same-file/1.0.6 \ crate://crates.io/scopeguard/1.1.0 \ crate://crates.io/secrecy/0.7.0 \ - crate://crates.io/serde/1.0.130 \ + crate://crates.io/serde/1.0.136 \ crate://crates.io/serde_bytes/0.11.5 \ - crate://crates.io/serde_derive/1.0.130 \ - crate://crates.io/serde_json/1.0.68 \ + crate://crates.io/serde_derive/1.0.136 \ + crate://crates.io/serde_json/1.0.79 \ crate://crates.io/sha2/0.9.9 \ crate://crates.io/shlex/0.1.1 \ crate://crates.io/simple_asn1/0.4.1 \ crate://crates.io/simple_asn1/0.5.4 \ - crate://crates.io/slab/0.4.4 \ - crate://crates.io/smallvec/1.6.1 \ + crate://crates.io/slab/0.4.5 \ + crate://crates.io/smallvec/1.8.0 \ crate://crates.io/spiffe/0.2.0 \ crate://crates.io/spin/0.5.2 \ crate://crates.io/spki/0.4.1 \ crate://crates.io/static_assertions/1.1.0 \ crate://crates.io/strsim/0.10.0 \ crate://crates.io/strsim/0.8.0 \ - crate://crates.io/structopt-derive/0.4.16 \ - crate://crates.io/structopt/0.3.23 \ - crate://crates.io/syn/1.0.77 \ - crate://crates.io/synstructure/0.12.5 \ + crate://crates.io/structopt-derive/0.4.18 \ + crate://crates.io/structopt/0.3.26 \ + crate://crates.io/syn/1.0.89 \ + crate://crates.io/synstructure/0.12.6 \ crate://crates.io/tap/1.0.1 \ - crate://crates.io/termcolor/1.1.2 \ + crate://crates.io/termcolor/1.1.3 \ crate://crates.io/textwrap/0.11.0 \ crate://crates.io/textwrap/0.14.2 \ - crate://crates.io/thiserror-impl/1.0.29 \ - crate://crates.io/thiserror/1.0.29 \ + crate://crates.io/thiserror-impl/1.0.30 \ + crate://crates.io/thiserror/1.0.30 \ crate://crates.io/time/0.1.44 \ - crate://crates.io/tinyvec/1.5.0 \ + crate://crates.io/time/0.3.7 \ + crate://crates.io/tinyvec/1.5.1 \ crate://crates.io/tinyvec_macros/0.1.0 \ - crate://crates.io/typenum/1.14.0 \ - crate://crates.io/unicode-bidi/0.3.6 \ + crate://crates.io/typenum/1.15.0 \ + crate://crates.io/unicase/2.6.0 \ + crate://crates.io/unicode-bidi/0.3.7 \ crate://crates.io/unicode-normalization/0.1.19 \ - crate://crates.io/unicode-segmentation/1.8.0 \ + crate://crates.io/unicode-segmentation/1.9.0 \ crate://crates.io/unicode-width/0.1.9 \ crate://crates.io/unicode-xid/0.2.2 \ crate://crates.io/untrusted/0.7.1 \ @@ -170,15 +170,15 @@ SRC_URI += " \ crate://crates.io/uuid/0.8.2 \ crate://crates.io/vcpkg/0.2.15 \ crate://crates.io/vec_map/0.8.2 \ - crate://crates.io/version_check/0.9.3 \ + crate://crates.io/version_check/0.9.4 \ crate://crates.io/walkdir/2.3.2 \ crate://crates.io/wasi/0.10.0+wasi-snapshot-preview1 \ - crate://crates.io/wasm-bindgen-backend/0.2.78 \ - crate://crates.io/wasm-bindgen-macro-support/0.2.78 \ - crate://crates.io/wasm-bindgen-macro/0.2.78 \ - crate://crates.io/wasm-bindgen-shared/0.2.78 \ - crate://crates.io/wasm-bindgen/0.2.78 \ - crate://crates.io/web-sys/0.3.55 \ + crate://crates.io/wasm-bindgen-backend/0.2.79 \ + crate://crates.io/wasm-bindgen-macro-support/0.2.79 \ + crate://crates.io/wasm-bindgen-macro/0.2.79 \ + crate://crates.io/wasm-bindgen-shared/0.2.79 \ + crate://crates.io/wasm-bindgen/0.2.79 \ + crate://crates.io/web-sys/0.3.56 \ crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ crate://crates.io/winapi-util/0.1.5 \ crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ @@ -186,9 +186,9 @@ SRC_URI += " \ crate://crates.io/wyz/0.2.0 \ crate://crates.io/x509-parser/0.9.2 \ crate://crates.io/yasna/0.3.2 \ - crate://crates.io/yasna/0.4.0 \ + crate://crates.io/yasna/0.5.0 \ crate://crates.io/zeroize/1.3.0 \ - crate://crates.io/zeroize_derive/1.2.0 \ + crate://crates.io/zeroize_derive/1.3.2 \ " LIC_FILES_CHKSUM = " \ diff --git a/meta-security/meta-security-compliance/recipes-auditors/lynis/lynis_3.0.0.bb b/meta-security/meta-security-compliance/recipes-auditors/lynis/lynis_3.0.0.bb index 947c27e365..f665e29ed4 100644 --- a/meta-security/meta-security-compliance/recipes-auditors/lynis/lynis_3.0.0.bb +++ b/meta-security/meta-security-compliance/recipes-auditors/lynis/lynis_3.0.0.bb @@ -3,7 +3,7 @@ SUMMARY = "Lynis is a free and open source security and auditing tool." HOMEDIR = "https://cisofy.com/" -LICENSE = "GPL-3.0" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=3edd6782854304fd11da4975ab9799c1" SRC_URI = "https://cisofy.com/files/${BPN}-${PV}.tar.gz" diff --git a/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap.inc b/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap.inc index c236641746..4babcf946a 100644 --- a/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap.inc +++ b/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap.inc @@ -4,7 +4,7 @@ SUMARRY = "NIST Certified SCAP 1.2 toolkit" HOME_URL = "https://www.open-scap.org/tools/openscap-base/" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" -LICENSE = "LGPL-2.1" +LICENSE = "LGPL-2.1-only" DEPENDS = "dbus acl bzip2 pkgconfig gconf procps curl libxml2 libxslt libcap swig" DEPENDS:class-native = "pkgconfig-native swig-native curl-native libxml2-native libxslt-native libcap-native" diff --git a/meta-security/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide.inc b/meta-security/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide.inc index 0c651f16fe..6f29eda791 100644 --- a/meta-security/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide.inc +++ b/meta-security/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide.inc @@ -4,7 +4,7 @@ SUMARRY = "SCAP content for various platforms" HOME_URL = "https://www.open-scap.org/security-policies/scap-security-guide/" LIC_FILES_CHKSUM = "file://LICENSE;md5=97662e4486d9a1d09f358851d9f41a1a" -LICENSE = "LGPL-2.1" +LICENSE = "LGPL-2.1-only" DEPENDS = "openscap-native python3 python3-pyyaml-native python3-jinja2-native libxml2-native expat-native" diff --git a/meta-security/meta-tpm/recipes-tpm/openssl-tpm-engine/openssl-tpm-engine_0.5.0.bb b/meta-security/meta-tpm/recipes-tpm/openssl-tpm-engine/openssl-tpm-engine_0.5.0.bb index 2b969edd44..e3e643e005 100644 --- a/meta-security/meta-tpm/recipes-tpm/openssl-tpm-engine/openssl-tpm-engine_0.5.0.bb +++ b/meta-security/meta-tpm/recipes-tpm/openssl-tpm-engine/openssl-tpm-engine_0.5.0.bb @@ -2,7 +2,7 @@ DESCRIPTION = "OpenSSL secure engine based on TPM hardware" HOMEPAGE = "https://github.com/mgerstner/openssl_tpm_engine" SECTION = "security/tpm" -LICENSE = "openssl" +LICENSE = "OpenSSL" LIC_FILES_CHKSUM = "file://LICENSE;md5=11f0ee3af475c85b907426e285c9bb52" DEPENDS += "openssl trousers" diff --git a/meta-security/meta-tpm/recipes-tpm/pcr-extend/pcr-extend_git.bb b/meta-security/meta-tpm/recipes-tpm/pcr-extend/pcr-extend_git.bb index 77f65aefd6..45da416a78 100644 --- a/meta-security/meta-tpm/recipes-tpm/pcr-extend/pcr-extend_git.bb +++ b/meta-security/meta-tpm/recipes-tpm/pcr-extend/pcr-extend_git.bb @@ -1,7 +1,7 @@ SUMMARY = "Command line utility to extend hash of arbitrary data into a TPMs PCR." HOMEPAGE = "https://github.com/flihp/pcr-extend" SECTION = "security/tpm" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "libtspi" diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/tpm2-abrmd_2.4.0.bb b/meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/tpm2-abrmd_2.4.1.bb index 18181712cd..daafae33cb 100644 --- a/meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/tpm2-abrmd_2.4.0.bb +++ b/meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/tpm2-abrmd_2.4.1.bb @@ -13,14 +13,12 @@ DEPENDS = "autoconf-archive dbus glib-2.0 tpm2-tss glib-2.0-native \ libtss2 libtss2-mu libtss2-tcti-device libtss2-tcti-mssim" SRC_URI = "\ - git://github.com/tpm2-software/tpm2-abrmd.git;branch=master;protocol=https \ + https://github.com/tpm2-software/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz \ file://tpm2-abrmd-init.sh \ file://tpm2-abrmd.default \ " -SRCREV = "4f332013a02c422e186c4aaf127ab6a40b996028" - -S = "${WORKDIR}/git" +SRC_URI[sha256sum] = "a7844a257eaf5176f612fe9620018edc0880cca7036465ad2593f83ae0ad6673" inherit autotools pkgconfig systemd update-rc.d useradd diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-openssl/tpm2-openssl_1.0.bb b/meta-security/meta-tpm/recipes-tpm2/tpm2-openssl/tpm2-openssl_1.0.bb deleted file mode 100644 index f6a694ce7a..0000000000 --- a/meta-security/meta-tpm/recipes-tpm2/tpm2-openssl/tpm2-openssl_1.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "Provider for integration of TPM 2.0 to OpenSSL 3.0" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b75785ac083d3c3ca04d99d9e4e1fbab" - -SRC_URI = "git://github.com/tpm2-software/tpm2-openssl.git;protocol=https;branch=master" - -SRCREV = "66e34f9e45c3697590cced1e4d3f35993a822f8b" - -S = "${WORKDIR}/git" - -inherit pkgconfig diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-openssl/tpm2-openssl_1.1.0.bb b/meta-security/meta-tpm/recipes-tpm2/tpm2-openssl/tpm2-openssl_1.1.0.bb new file mode 100644 index 0000000000..55061c9103 --- /dev/null +++ b/meta-security/meta-tpm/recipes-tpm2/tpm2-openssl/tpm2-openssl_1.1.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "Provider for integration of TPM 2.0 to OpenSSL 3.0" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b75785ac083d3c3ca04d99d9e4e1fbab" + +DEPENDS = "autoconf-archive-native tpm2-tss openssl" + +SRC_URI = "https://github.com/tpm2-software/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz" + +SRC_URI[sha256sum] = "eedcc0b72ad6d232e6f9f55a780290c4d33a4d06efca9314f8a36d7384eb1dfc" + +inherit autotools pkgconfig + +do_configure:prepend() { + # do not extract the version number from git + sed -i -e 's/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/' ${S}/configure.ac +} + +FILES:${PN} = "\ + ${libdir}/ossl-modules/tpm2.so" diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-pkcs11/files/0001-remove-local-binary-checkes.patch b/meta-security/meta-tpm/recipes-tpm2/tpm2-pkcs11/files/0001-remove-local-binary-checkes.patch deleted file mode 100644 index 9d3f073e0a..0000000000 --- a/meta-security/meta-tpm/recipes-tpm2/tpm2-pkcs11/files/0001-remove-local-binary-checkes.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 9e3ef6f253f9427596baf3e7d748a79854cadfa9 Mon Sep 17 00:00:00 2001 -From: Armin Kuster <akuster808@gmail.com> -Date: Wed, 14 Oct 2020 08:55:33 -0700 -Subject: [PATCH] remove local binary checkes - -Signed-off-by: Armin Kuster <akuster808@gmail.com> - -Upsteam-Status: Inappropriate -These are only needed to run on the tartget so we add an RDPENDS. -Not needed for building. - ---- - configure.ac | 48 ------------------------------------------------ - 1 file changed, 48 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 50e7d4b..2b9abcf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -219,54 +219,6 @@ AX_PROG_JAVAC() - AX_PROG_JAVA() - m4_popdef([AC_MSG_ERROR]) - --AC_CHECK_PROG([tpm2_createprimary], [tpm2_createprimary], [yes], [no]) -- AS_IF([test "x$tpm2_createprimary" != "xyes"], -- [AC_MSG_ERROR([tpm2_ptool requires tpm2_createprimary, but executable not found.])]) -- --AC_CHECK_PROG([tpm2_create], [tpm2_create], [yes], [no]) -- AS_IF([test "x$tpm2_create" != "xyes"], -- [AC_MSG_ERROR([tpm2_ptool requires tpm2_create, but executable not found.])]) -- --AC_CHECK_PROG([tpm2_evictcontrol], [tpm2_evictcontrol], [yes], [no]) -- AS_IF([test "x$tpm2_evictcontrol" != "xyes"], -- [AC_MSG_ERROR([tpm2_ptool requires tpm2_evictcontrol, but executable not found.])]) -- --AC_CHECK_PROG([tpm2_readpublic], [tpm2_readpublic], [yes], [no]) -- AS_IF([test "x$tpm2_readpublic" != "xyes"], -- [AC_MSG_ERROR([tpm2_ptool requires tpm2_readpublic, but executable not found.])]) -- --AC_CHECK_PROG([tpm2_load], [tpm2_load], [yes], [no]) -- AS_IF([test "x$tpm2_load" != "xyes"], -- [AC_MSG_ERROR([tpm2_ptool requires tpm2_load, but executable not found.])]) -- --AC_CHECK_PROG([tpm2_loadexternal], [tpm2_loadexternal], [yes], [no]) -- AS_IF([test "x$tpm2_loadexternal" != "xyes"], -- [AC_MSG_ERROR([tpm2_ptool requires tpm2_loadexternal, but executable not found.])]) -- --AC_CHECK_PROG([tpm2_unseal], [tpm2_unseal], [yes], [no]) -- AS_IF([test "x$tpm2_unseal" != "xyes"], -- [AC_MSG_ERROR([tpm2_ptool requires tpm2_unseal, but executable not found.])]) -- --AC_CHECK_PROG([tpm2_encryptdecrypt], [tpm2_encryptdecrypt], [yes], [no]) -- AS_IF([test "x$tpm2_encryptdecrypt" != "xyes"], -- [AC_MSG_ERROR([tpm2_ptool requires tpm2_encryptdecrypt, but executable not found.])]) -- --AC_CHECK_PROG([tpm2_sign], [tpm2_sign], [yes], [no]) -- AS_IF([test "x$tpm2_sign" != "xyes"], -- [AC_MSG_ERROR([tpm2_ptool requires tpm2_sign, but executable not found.])]) -- --AC_CHECK_PROG([tpm2_getcap], [tpm2_getcap], [yes], [no]) -- AS_IF([test "x$tpm2_getcap" != "xyes"], -- [AC_MSG_ERROR([tpm2_ptool requires tpm2_getcap, but executable not found.])]) -- --AC_CHECK_PROG([tpm2_import], [tpm2_import], [yes], [no]) -- AS_IF([test "x$tpm2_import" != "xyes"], -- [AC_MSG_ERROR([tpm2_ptool requires tpm2_import, but executable not found.])]) -- --AC_CHECK_PROG([tpm2_changeauth], [tpm2_changeauth], [yes], [no]) -- AS_IF([test "x$tpm2_changeauth" != "xyes"], -- [AC_MSG_ERROR([tpm2_ptool requires tpm2_changeauth, but executable not found.])]) -- - AC_DEFUN([integration_test_checks], [ - - PKG_CHECK_MODULES([OPENSC_PKCS11],[opensc-pkcs11],, --- -2.17.1 - diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-pkcs11/files/0001-ssl-compile-against-OSSL-3.0.patch b/meta-security/meta-tpm/recipes-tpm2/tpm2-pkcs11/files/0001-ssl-compile-against-OSSL-3.0.patch deleted file mode 100644 index ac2f92c90e..0000000000 --- a/meta-security/meta-tpm/recipes-tpm2/tpm2-pkcs11/files/0001-ssl-compile-against-OSSL-3.0.patch +++ /dev/null @@ -1,1305 +0,0 @@ -From f7a2e90e80fd8b4c43042f8099e821b4118234d1 Mon Sep 17 00:00:00 2001 -From: William Roberts <william.c.roberts@intel.com> -Date: Fri, 3 Sep 2021 11:24:40 -0500 -Subject: [PATCH 1/2] ssl: compile against OSSL 3.0 - -Compile against OpenSSL. This moves functions non-deprecated things if -possible and ignores deprecation warnings when not. Padding manipulation -routines seem to have been marked deprecated in OSSL 3.0, so we need to -figure out a porting strategy here. - -Fixes: #686 - -Signed-off-by: William Roberts <william.c.roberts@intel.com> - -Upstream-Status: Backport -Signed-off-by: Armin Kuster <akuster808@gmail.com> - ---- - src/lib/backend_esysdb.c | 5 +- - src/lib/backend_fapi.c | 5 +- - src/lib/encrypt.c | 2 +- - src/lib/mech.c | 72 +--- - src/lib/object.c | 3 +- - src/lib/sign.c | 2 +- - src/lib/ssl_util.c | 531 ++++++++++++++++-------- - src/lib/ssl_util.h | 31 +- - src/lib/tpm.c | 6 +- - src/lib/utils.c | 35 +- - src/lib/utils.h | 13 - - test/integration/pkcs-sign-verify.int.c | 94 ++--- - 12 files changed, 441 insertions(+), 358 deletions(-) - -Index: git/src/lib/backend_esysdb.c -=================================================================== ---- git.orig/src/lib/backend_esysdb.c -+++ git/src/lib/backend_esysdb.c -@@ -3,6 +3,7 @@ - #include "config.h" - #include "backend_esysdb.h" - #include "db.h" -+#include "ssl_util.h" - #include "tpm.h" - - CK_RV backend_esysdb_init(void) { -@@ -308,7 +309,7 @@ CK_RV backend_esysdb_token_unseal_wrappi - } - - twist sealsalt = user ? sealobj->userauthsalt : sealobj->soauthsalt; -- twist sealobjauth = utils_hash_pass(tpin, sealsalt); -+ twist sealobjauth = ssl_util_hash_pass(tpin, sealsalt); - if (!sealobjauth) { - rv = CKR_HOST_MEMORY; - goto error; -@@ -372,7 +373,7 @@ CK_RV backend_esysdb_token_changeauth(to - */ - twist oldsalt = !user ? tok->esysdb.sealobject.soauthsalt : tok->esysdb.sealobject.userauthsalt; - -- twist oldauth = utils_hash_pass(toldpin, oldsalt); -+ twist oldauth = ssl_util_hash_pass(toldpin, oldsalt); - if (!oldauth) { - goto out; - } -Index: git/src/lib/backend_fapi.c -=================================================================== ---- git.orig/src/lib/backend_fapi.c -+++ git/src/lib/backend_fapi.c -@@ -11,6 +11,7 @@ - #include "backend_fapi.h" - #include "emitter.h" - #include "parser.h" -+#include "ssl_util.h" - #include "utils.h" - - #ifdef HAVE_FAPI -@@ -793,7 +794,7 @@ CK_RV backend_fapi_token_unseal_wrapping - } - - twist sealsalt = user ? tok->fapi.userauthsalt : tok->fapi.soauthsalt; -- twist sealobjauth = utils_hash_pass(tpin, sealsalt); -+ twist sealobjauth = ssl_util_hash_pass(tpin, sealsalt); - if (!sealobjauth) { - rv = CKR_HOST_MEMORY; - goto error; -@@ -889,7 +890,7 @@ CK_RV backend_fapi_token_changeauth(toke - } - rv = CKR_GENERAL_ERROR; - -- oldauth = utils_hash_pass(toldpin, user ? tok->fapi.userauthsalt : tok->fapi.soauthsalt); -+ oldauth = ssl_util_hash_pass(toldpin, user ? tok->fapi.userauthsalt : tok->fapi.soauthsalt); - if (!oldauth) { - goto out; - } -Index: git/src/lib/encrypt.c -=================================================================== ---- git.orig/src/lib/encrypt.c -+++ git/src/lib/encrypt.c -@@ -59,7 +59,7 @@ void encrypt_op_data_free(encrypt_op_dat - CK_RV sw_encrypt_data_init(mdetail *mdtl, CK_MECHANISM *mechanism, tobject *tobj, sw_encrypt_data **enc_data) { - - EVP_PKEY *pkey = NULL; -- CK_RV rv = ssl_util_tobject_to_evp(&pkey, tobj); -+ CK_RV rv = ssl_util_attrs_to_evp(tobj->attrs, &pkey); - if (rv != CKR_OK) { - return rv; - } -Index: git/src/lib/mech.c -=================================================================== ---- git.orig/src/lib/mech.c -+++ git/src/lib/mech.c -@@ -693,7 +693,7 @@ CK_RV ecc_keygen_validator(mdetail *m, C - } - - int nid = 0; -- CK_RV rv = ec_params_to_nid(a, &nid); -+ CK_RV rv = ssl_util_params_to_nid(a, &nid); - if (rv != CKR_OK) { - return rv; - } -@@ -857,11 +857,11 @@ CK_RV rsa_pkcs_synthesizer(mdetail *mdtl - } - - /* Apply the PKCS1.5 padding */ -- int rc = RSA_padding_add_PKCS1_type_1(outbuf, padded_len, -- inbuf, inlen); -- if (!rc) { -+ CK_RV rv = ssl_util_add_PKCS1_TYPE_1(inbuf, inlen, -+ outbuf, padded_len); -+ if (rv != CKR_OK) { - LOGE("Applying RSA padding failed"); -- return CKR_GENERAL_ERROR; -+ return rv; - } - - *outlen = padded_len; -@@ -893,22 +893,21 @@ CK_RV rsa_pkcs_unsynthesizer(mdetail *md - size_t key_bytes = *keybits / 8; - - unsigned char buf[4096]; -- int rc = RSA_padding_check_PKCS1_type_2(buf, sizeof(buf), -- inbuf, inlen, -- key_bytes); -- if (rc < 0) { -+ CK_ULONG buflen = sizeof(buf); -+ CK_RV rv = ssl_util_check_PKCS1_TYPE_2(inbuf, inlen, key_bytes, -+ buf, &buflen); -+ if (rv != CKR_OK) { - LOGE("Could not recover CKM_RSA_PKCS Padding"); -- return CKR_GENERAL_ERROR; -+ return rv; - } - -- /* cannot be < 0 because of check above */ -- if (!outbuf || (unsigned)rc > *outlen) { -- *outlen = rc; -+ if (!outbuf || buflen > *outlen) { -+ *outlen = buflen; - return outbuf ? CKR_BUFFER_TOO_SMALL : CKR_OK; - } - -- *outlen = rc; -- memcpy(outbuf, buf, rc); -+ *outlen = buflen; -+ memcpy(outbuf, buf, buflen); - - return CKR_OK; - } -@@ -944,50 +943,21 @@ CK_RV rsa_pss_synthesizer(mdetail *mdtl, - return CKR_GENERAL_ERROR; - } - -- CK_ATTRIBUTE_PTR exp_attr = attr_get_attribute_by_type(attrs, CKA_PUBLIC_EXPONENT); -- if (!exp_attr) { -- LOGE("Signing key has no CKA_PUBLIC_EXPONENT"); -- return CKR_GENERAL_ERROR; -- } -- - if (modulus_attr->ulValueLen > *outlen) { - LOGE("Output buffer is too small, got: %lu, required at least %lu", - *outlen, modulus_attr->ulValueLen); - return CKR_GENERAL_ERROR; - } - -- BIGNUM *e = BN_bin2bn(exp_attr->pValue, exp_attr->ulValueLen, NULL); -- if (!e) { -- LOGE("Could not convert exponent to bignum"); -- return CKR_GENERAL_ERROR; -- } -- -- BIGNUM *n = BN_bin2bn(modulus_attr->pValue, modulus_attr->ulValueLen, NULL); -- if (!n) { -- LOGE("Could not convert modulus to bignum"); -- BN_free(e); -- return CKR_GENERAL_ERROR; -- } -- -- RSA *rsa = RSA_new(); -- if (!rsa) { -- LOGE("oom"); -- return CKR_HOST_MEMORY; -- } -- -- int rc = RSA_set0_key(rsa, n, e, NULL); -- if (!rc) { -- LOGE("Could not set modulus and exponent to OSSL RSA key"); -- BN_free(n); -- BN_free(e); -- RSA_free(rsa); -- return CKR_GENERAL_ERROR; -+ EVP_PKEY *pkey = NULL; -+ rv = ssl_util_attrs_to_evp(attrs, &pkey); -+ if (rv != CKR_OK) { -+ return rv; - } - -- rc = RSA_padding_add_PKCS1_PSS(rsa, outbuf, -- inbuf, md, -1); -- RSA_free(rsa); -- if (!rc) { -+ rv = ssl_util_add_PKCS1_PSS(pkey, inbuf, md, outbuf); -+ EVP_PKEY_free(pkey); -+ if (rv != CKR_OK) { - LOGE("Applying RSA padding failed"); - return CKR_GENERAL_ERROR; - } -Index: git/src/lib/object.c -=================================================================== ---- git.orig/src/lib/object.c -+++ git/src/lib/object.c -@@ -15,6 +15,7 @@ - #include "object.h" - #include "pkcs11.h" - #include "session_ctx.h" -+#include "ssl_util.h" - #include "token.h" - #include "utils.h" - -@@ -121,7 +122,7 @@ CK_RV tobject_get_min_buf_size(tobject * - } - - int nid = 0; -- CK_RV rv = ec_params_to_nid(a, &nid); -+ CK_RV rv = ssl_util_params_to_nid(a, &nid); - if (rv != CKR_OK) { - return rv; - } -Index: git/src/lib/sign.c -=================================================================== ---- git.orig/src/lib/sign.c -+++ git/src/lib/sign.c -@@ -74,7 +74,7 @@ static sign_opdata *sign_opdata_new(mdet - } - - EVP_PKEY *pkey = NULL; -- rv = ssl_util_tobject_to_evp(&pkey, tobj); -+ rv = ssl_util_attrs_to_evp(tobj->attrs, &pkey); - if (rv != CKR_OK) { - return NULL; - } -Index: git/src/lib/ssl_util.c -=================================================================== ---- git.orig/src/lib/ssl_util.c -+++ git/src/lib/ssl_util.c -@@ -10,6 +10,7 @@ - #include <openssl/rsa.h> - #include <openssl/sha.h> - -+#include "attrs.h" - #include "log.h" - #include "pkcs11.h" - #include "ssl_util.h" -@@ -19,194 +20,228 @@ - #include <openssl/evperr.h> - #endif - --#if defined(LIB_TPM2_OPENSSL_OPENSSL_PRE11) -+#if defined(LIB_TPM2_OPENSSL_OPENSSL_POST300) -+#include <openssl/core_names.h> -+#endif - - /* -- * Pre openssl 1.1 doesn't have EC_POINT_point2buf, so use EC_POINT_point2oct to -- * create an API compatible version of it. -+ * TODO Port these routines -+ * Deprecated function block to port -+ * -+ * There are no padding routine replacements in OSSL 3.0. -+ * - per Matt Caswell (maintainer) on mailing list. -+ * Signature verification can likely be done with EVP Verify interface. - */ --size_t EC_POINT_point2buf(const EC_GROUP *group, const EC_POINT *point, -- point_conversion_form_t form, -- unsigned char **pbuf, BN_CTX *ctx) { -- -- /* Get the required buffer length */ -- size_t len = EC_POINT_point2oct(group, point, form, NULL, 0, NULL); -- if (!len) { -- return 0; -- } -+#if defined(LIB_TPM2_OPENSSL_OPENSSL_POST300) -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wdeprecated-declarations" -+#endif - -- /* allocate it */ -- unsigned char *buf = OPENSSL_malloc(len); -- if (!buf) { -- return 0; -- } -+CK_RV ssl_util_add_PKCS1_PSS(EVP_PKEY *pkey, -+ const CK_BYTE_PTR inbuf, const EVP_MD *md, -+ CK_BYTE_PTR outbuf) { - -- /* convert it */ -- len = EC_POINT_point2oct(group, point, form, buf, len, ctx); -- if (!len) { -- OPENSSL_free(buf); -- return 0; -+ RSA *rsa = (RSA *)EVP_PKEY_get0_RSA(pkey); -+ if (!rsa) { -+ return CKR_GENERAL_ERROR; - } - -- *pbuf = buf; -- return len; --} -+ int rc = RSA_padding_add_PKCS1_PSS(rsa, outbuf, -+ inbuf, md, -1); - --size_t OBJ_length(const ASN1_OBJECT *obj) { -+ return rc == 1 ? CKR_OK : CKR_GENERAL_ERROR; -+} - -- if (!obj) { -- return 0; -- } -+CK_RV ssl_util_add_PKCS1_TYPE_1(const CK_BYTE_PTR inbuf, CK_ULONG inlen, -+ CK_BYTE_PTR outbuf, CK_ULONG outbuflen) { - -- return obj->length; -+ return RSA_padding_add_PKCS1_type_1(outbuf, outbuflen, -+ inbuf, inlen) == 1 ? CKR_OK : CKR_GENERAL_ERROR; - } - --const unsigned char *OBJ_get0_data(const ASN1_OBJECT *obj) { -+CK_RV ssl_util_check_PKCS1_TYPE_2(const CK_BYTE_PTR inbuf, CK_ULONG inlen, CK_ULONG rsa_len, -+ CK_BYTE_PTR outbuf, CK_ULONG_PTR outbuflen) { - -- if (!obj) { -- return NULL; -+ int rc = RSA_padding_check_PKCS1_type_2(outbuf, *outbuflen, -+ inbuf, inlen, rsa_len); -+ if (rc < 0) { -+ return CKR_GENERAL_ERROR; - } - -- return obj->data; -+ /* cannot be negative due to check above */ -+ *outbuflen = rc; -+ return CKR_OK; - } - --const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *x) { -- return ASN1_STRING_data((ASN1_STRING *)x); --} -+#if defined(LIB_TPM2_OPENSSL_OPENSSL_POST300) -+#pragma GCC diagnostic pop -+#endif - --int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) { -+#if defined(LIB_TPM2_OPENSSL_OPENSSL_POST300) - -- if ((r->n == NULL && n == NULL) || (r->e == NULL && e == NULL)) { -- return 0; -- } -+static CK_RV get_RSA_evp_pubkey(CK_ATTRIBUTE_PTR e_attr, CK_ATTRIBUTE_PTR n_attr, EVP_PKEY **out_pkey) { -+ -+ OSSL_PARAM params[] = { -+ OSSL_PARAM_BN("n", n_attr->pValue, n_attr->ulValueLen), -+ OSSL_PARAM_BN("e", e_attr->pValue, e_attr->ulValueLen), -+ OSSL_PARAM_END -+ }; - -- if (n != NULL) { -- BN_free(r->n); -- r->n = n; -+ /* convert params to EVP key */ -+ EVP_PKEY_CTX *evp_ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_RSA, NULL); -+ if (!evp_ctx) { -+ SSL_UTIL_LOGE("EVP_PKEY_CTX_new_id"); -+ return CKR_GENERAL_ERROR; - } - -- if (e != NULL) { -- BN_free(r->e); -- r->e = e; -+ int rc = EVP_PKEY_fromdata_init(evp_ctx); -+ if (rc != 1) { -+ SSL_UTIL_LOGE("EVP_PKEY_fromdata_init"); -+ EVP_PKEY_CTX_free(evp_ctx); -+ return CKR_GENERAL_ERROR; - } - -- if (d != NULL) { -- BN_free(r->d); -- r->d = d; -+ rc = EVP_PKEY_fromdata(evp_ctx, out_pkey, EVP_PKEY_PUBLIC_KEY, params); -+ if (rc != 1) { -+ SSL_UTIL_LOGE("EVP_PKEY_fromdata"); -+ EVP_PKEY_CTX_free(evp_ctx); -+ return CKR_GENERAL_ERROR; - } - -- return 1; -+ EVP_PKEY_CTX_free(evp_ctx); -+ -+ return CKR_OK; - } - --int ECDSA_SIG_set0(ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s) { -+static CK_RV get_EC_evp_pubkey(CK_ATTRIBUTE_PTR ecparams, CK_ATTRIBUTE_PTR ecpoint, EVP_PKEY **out_pkey) { -+ -+ /* -+ * The simplest way I have found to deal with this is to convert the ASN1 object in -+ * the ecparams attribute (was done previously with d2i_ECParameters) is to a nid and -+ * then take the int nid and convert it to a friendly name like prime256v1. -+ * EVP_PKEY_fromdata can handle group by name. -+ * -+ * Per the spec this is "DER-encoding of an ANSI X9.62 Parameters value". -+ */ -+ int curve_id = 0; -+ CK_RV rv = ssl_util_params_to_nid(ecparams, &curve_id); -+ if (rv != CKR_OK) { -+ LOGE("Could not get nid from params"); -+ return rv; -+ } - -- if (!r || !s) { -- return 0; -+ /* Per the spec CKA_EC_POINT attribute is the "DER-encoding of ANSI X9.62 ECPoint value Q */ -+ const unsigned char *x = ecpoint->pValue; -+ ASN1_OCTET_STRING *os = d2i_ASN1_OCTET_STRING(NULL, &x, ecpoint->ulValueLen); -+ if (!os) { -+ SSL_UTIL_LOGE("d2i_ASN1_OCTET_STRING: %s"); -+ return CKR_GENERAL_ERROR; - } - -- BN_free(sig->r); -- BN_free(sig->s); -+ OSSL_PARAM params[] = { -+ OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_GROUP_NAME, (char *)OBJ_nid2sn(curve_id), 0), -+ OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_PUB_KEY, os->data, os->length), -+ OSSL_PARAM_END -+ }; - -- sig->r = r; -- sig->s = s; -+ /* convert params to EVP key */ -+ EVP_PKEY_CTX *evp_ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_EC, NULL); -+ if (!evp_ctx) { -+ SSL_UTIL_LOGE("EVP_PKEY_CTX_new_id"); -+ OPENSSL_free(os); -+ return CKR_GENERAL_ERROR; -+ } - -- return 1; --} -+ int rc = EVP_PKEY_fromdata_init(evp_ctx); -+ if (rc != 1) { -+ SSL_UTIL_LOGE("EVP_PKEY_fromdata_init: %s"); -+ EVP_PKEY_CTX_free(evp_ctx); -+ OPENSSL_free(os); -+ return CKR_GENERAL_ERROR; -+ } - --EC_KEY *EVP_PKEY_get0_EC_KEY(EVP_PKEY *pkey) { -- if (pkey->type != EVP_PKEY_EC) { -- return NULL; -+ rc = EVP_PKEY_fromdata(evp_ctx, out_pkey, EVP_PKEY_PUBLIC_KEY, params); -+ if (rc != 1) { -+ SSL_UTIL_LOGE("EVP_PKEY_fromdata"); -+ EVP_PKEY_CTX_free(evp_ctx); -+ OPENSSL_free(os); -+ return CKR_GENERAL_ERROR; - } - -- return pkey->pkey.ec; -+ EVP_PKEY_CTX_free(evp_ctx); -+ OPENSSL_free(os); -+ -+ return CKR_OK; - } --#endif - --static CK_RV convert_pubkey_RSA(RSA **outkey, attr_list *attrs) { -+#else - -- RSA *rsa = NULL; -- BIGNUM *e = NULL, *n = NULL; -+static CK_RV get_RSA_evp_pubkey(CK_ATTRIBUTE_PTR e_attr, CK_ATTRIBUTE_PTR n_attr, EVP_PKEY **out_pkey) { - -- CK_ATTRIBUTE_PTR exp = attr_get_attribute_by_type(attrs, CKA_PUBLIC_EXPONENT); -- if (!exp) { -- LOGE("RSA Object must have attribute CKA_PUBLIC_EXPONENT"); -+ BIGNUM *e = BN_bin2bn(e_attr->pValue, e_attr->ulValueLen, NULL); -+ if (!e) { -+ LOGE("Could not convert exponent to bignum"); - return CKR_GENERAL_ERROR; - } - -- CK_ATTRIBUTE_PTR mod = attr_get_attribute_by_type(attrs, CKA_MODULUS); -- if (!mod) { -- LOGE("RSA Object must have attribute CKA_MODULUS"); -+ BIGNUM *n = BN_bin2bn(n_attr->pValue, n_attr->ulValueLen, NULL); -+ if (!n) { -+ LOGE("Could not convert modulus to bignum"); -+ BN_free(e); - return CKR_GENERAL_ERROR; - } - -- rsa = RSA_new(); -+ RSA *rsa = RSA_new(); - if (!rsa) { -- SSL_UTIL_LOGE("Failed to allocate OpenSSL RSA structure"); -- goto error; -+ LOGE("oom"); -+ return CKR_HOST_MEMORY; - } - -- e = BN_bin2bn(exp->pValue, exp->ulValueLen, NULL); -- if (!e) { -- SSL_UTIL_LOGE("Failed to convert exponent to SSL internal format"); -- goto error; -+ int rc = RSA_set0_key(rsa, n, e, NULL); -+ if (!rc) { -+ LOGE("Could not set modulus and exponent to OSSL RSA key"); -+ BN_free(n); -+ BN_free(e); -+ RSA_free(rsa); -+ return CKR_GENERAL_ERROR; - } - -- n = BN_bin2bn(mod->pValue, mod->ulValueLen, NULL); -- if (!n) { -- SSL_UTIL_LOGE("Failed to convert modulus to SSL internal format"); -- goto error; -+ /* assigned to RSA key */ -+ n = e = NULL; -+ -+ EVP_PKEY *pkey = EVP_PKEY_new(); -+ if (!pkey) { -+ SSL_UTIL_LOGE("EVP_PKEY_new"); -+ RSA_free(rsa); -+ return CKR_GENERAL_ERROR; - } - -- if (!RSA_set0_key(rsa, n, e, NULL)) { -- SSL_UTIL_LOGE("Failed to set RSA modulus and exponent components"); -+ rc = EVP_PKEY_assign_RSA(pkey, rsa); -+ if (rc != 1) { - RSA_free(rsa); -- BN_free(e); -- BN_free(n); -- goto error; -+ EVP_PKEY_free(pkey); -+ return CKR_GENERAL_ERROR; - } - -- *outkey = rsa; -+ *out_pkey = pkey; - - return CKR_OK; -- --error: -- RSA_free(rsa); -- if (e) { -- BN_free(e); -- } -- if (n) { -- BN_free(n); -- } -- -- return CKR_GENERAL_ERROR; - } - --static CK_RV convert_pubkey_ECC(EC_KEY **outkey, attr_list *attrs) { -+static CK_RV get_EC_evp_pubkey(CK_ATTRIBUTE_PTR ecparams, CK_ATTRIBUTE_PTR ecpoint, EVP_PKEY **out_pkey) { - -- EC_KEY *key = EC_KEY_new(); -- if (!key) { -+ EC_KEY *ecc = EC_KEY_new(); -+ if (!ecc) { - LOGE("oom"); - return CKR_HOST_MEMORY; - } - -- CK_ATTRIBUTE_PTR ecparams = attr_get_attribute_by_type(attrs, CKA_EC_PARAMS); -- if (!ecparams) { -- LOGE("ECC Key must have attribute CKA_EC_PARAMS"); -- return CKR_GENERAL_ERROR; -- } -- -- CK_ATTRIBUTE_PTR ecpoint = attr_get_attribute_by_type(attrs, CKA_EC_POINT); -- if (!ecpoint) { -- LOGE("ECC Key must have attribute CKA_EC_POINT"); -- return CKR_GENERAL_ERROR; -- } -- - /* set params */ - const unsigned char *x = ecparams->pValue; -- EC_KEY *k = d2i_ECParameters(&key, &x, ecparams->ulValueLen); -+ EC_KEY *k = d2i_ECParameters(&ecc, &x, ecparams->ulValueLen); - if (!k) { - SSL_UTIL_LOGE("Could not update key with EC Parameters"); -- EC_KEY_free(key); -+ EC_KEY_free(ecc); - return CKR_GENERAL_ERROR; - } - -@@ -215,22 +250,38 @@ static CK_RV convert_pubkey_ECC(EC_KEY * - ASN1_OCTET_STRING *os = d2i_ASN1_OCTET_STRING(NULL, &x, ecpoint->ulValueLen); - if (os) { - x = os->data; -- k = o2i_ECPublicKey(&key, &x, os->length); -+ k = o2i_ECPublicKey(&ecc, &x, os->length); - ASN1_STRING_free(os); - if (!k) { - SSL_UTIL_LOGE("Could not update key with EC Points"); -- EC_KEY_free(key); -+ EC_KEY_free(ecc); - return CKR_GENERAL_ERROR; - } - } - -- *outkey = key; -+ EVP_PKEY *pkey = EVP_PKEY_new(); -+ if (!pkey) { -+ SSL_UTIL_LOGE("EVP_PKEY_new"); -+ EC_KEY_free(ecc); -+ return CKR_GENERAL_ERROR; -+ } -+ -+ int rc = EVP_PKEY_assign_EC_KEY(pkey, ecc); -+ if (!rc) { -+ SSL_UTIL_LOGE("Could not set pkey with ec key"); -+ EC_KEY_free(ecc); -+ EVP_PKEY_free(pkey); -+ return CKR_GENERAL_ERROR; -+ } -+ -+ *out_pkey = pkey; - return CKR_OK; - } -+#endif - --CK_RV ssl_util_tobject_to_evp(EVP_PKEY **outpkey, tobject *obj) { -+CK_RV ssl_util_attrs_to_evp(attr_list *attrs, EVP_PKEY **outpkey) { - -- CK_ATTRIBUTE_PTR a = attr_get_attribute_by_type(obj->attrs, CKA_KEY_TYPE); -+ CK_ATTRIBUTE_PTR a = attr_get_attribute_by_type(attrs, CKA_KEY_TYPE); - if (!a) { - LOGE("Expected object to have attribute CKA_KEY_TYPE"); - return CKR_KEY_TYPE_INCONSISTENT; -@@ -253,44 +304,52 @@ CK_RV ssl_util_tobject_to_evp(EVP_PKEY * - return CKR_OK; - } - -- EVP_PKEY *pkey = EVP_PKEY_new(); -- if (!pkey) { -- LOGE("oom"); -- return CKR_HOST_MEMORY; -- } -+ EVP_PKEY *pkey = NULL; - - if (key_type == CKK_EC) { -- EC_KEY *e = NULL; -- rv = convert_pubkey_ECC(&e, obj->attrs); -- if (rv != CKR_OK) { -- return rv; -+ -+ CK_ATTRIBUTE_PTR ecparams = attr_get_attribute_by_type(attrs, CKA_EC_PARAMS); -+ if (!ecparams) { -+ LOGE("ECC Key must have attribute CKA_EC_PARAMS"); -+ return CKR_GENERAL_ERROR; - } -- int rc = EVP_PKEY_assign_EC_KEY(pkey, e); -- if (!rc) { -- SSL_UTIL_LOGE("Could not set pkey with ec key"); -- EC_KEY_free(e); -- EVP_PKEY_free(pkey); -+ -+ CK_ATTRIBUTE_PTR ecpoint = attr_get_attribute_by_type(attrs, CKA_EC_POINT); -+ if (!ecpoint) { -+ LOGE("ECC Key must have attribute CKA_EC_POINT"); - return CKR_GENERAL_ERROR; - } -- } else if (key_type == CKK_RSA) { -- RSA *r = NULL; -- rv = convert_pubkey_RSA(&r, obj->attrs); -+ -+ rv = get_EC_evp_pubkey(ecparams, ecpoint, &pkey); - if (rv != CKR_OK) { - return rv; - } -- int rc = EVP_PKEY_assign_RSA(pkey, r); -- if (!rc) { -- SSL_UTIL_LOGE("Could not set pkey with rsa key"); -- RSA_free(r); -- EVP_PKEY_free(pkey); -+ -+ } else if (key_type == CKK_RSA) { -+ -+ CK_ATTRIBUTE_PTR exp = attr_get_attribute_by_type(attrs, CKA_PUBLIC_EXPONENT); -+ if (!exp) { -+ LOGE("RSA Object must have attribute CKA_PUBLIC_EXPONENT"); - return CKR_GENERAL_ERROR; - } -+ -+ CK_ATTRIBUTE_PTR mod = attr_get_attribute_by_type(attrs, CKA_MODULUS); -+ if (!mod) { -+ LOGE("RSA Object must have attribute CKA_MODULUS"); -+ return CKR_GENERAL_ERROR; -+ } -+ -+ rv = get_RSA_evp_pubkey(exp, mod, &pkey); -+ if (rv != CKR_OK) { -+ return rv; -+ } -+ - } else { - LOGE("Invalid CKA_KEY_TYPE, got: %lu", key_type); -- EVP_PKEY_free(pkey); - return CKR_KEY_TYPE_INCONSISTENT; - } - -+ assert(pkey); - *outpkey = pkey; - - return CKR_OK; -@@ -406,10 +465,12 @@ CK_RV ssl_util_setup_evp_pkey_ctx(EVP_PK - } - } - -- rc = EVP_PKEY_CTX_set_signature_md(pkey_ctx, md); -- if (!rc) { -- SSL_UTIL_LOGE("EVP_PKEY_CTX_set_signature_md failed"); -- goto error; -+ if (md) { -+ rc = EVP_PKEY_CTX_set_signature_md(pkey_ctx, md); -+ if (!rc) { -+ SSL_UTIL_LOGE("EVP_PKEY_CTX_set_signature_md failed"); -+ goto error; -+ } - } - - *outpkey_ctx = pkey_ctx; -@@ -421,21 +482,12 @@ error: - return CKR_GENERAL_ERROR; - } - --static CK_RV do_sig_verify_rsa(EVP_PKEY *pkey, -- int padding, const EVP_MD *md, -- CK_BYTE_PTR digest, CK_ULONG digest_len, -- CK_BYTE_PTR signature, CK_ULONG signature_len) { -+static CK_RV sig_verify(EVP_PKEY_CTX *ctx, -+ const unsigned char *sig, size_t siglen, -+ const unsigned char *tbs, size_t tbslen) { - - CK_RV rv = CKR_GENERAL_ERROR; -- -- EVP_PKEY_CTX *pkey_ctx = NULL; -- rv = ssl_util_setup_evp_pkey_ctx(pkey, padding, md, -- EVP_PKEY_verify_init, &pkey_ctx); -- if (rv != CKR_OK) { -- return rv; -- } -- -- int rc = EVP_PKEY_verify(pkey_ctx, signature, signature_len, digest, digest_len); -+ int rc = EVP_PKEY_verify(ctx, sig, siglen, tbs, tbslen); - if (rc < 0) { - SSL_UTIL_LOGE("EVP_PKEY_verify failed"); - } else if (rc == 1) { -@@ -444,11 +496,11 @@ static CK_RV do_sig_verify_rsa(EVP_PKEY - rv = CKR_SIGNATURE_INVALID; - } - -- EVP_PKEY_CTX_free(pkey_ctx); - return rv; - } - --static CK_RV create_ecdsa_sig(CK_BYTE_PTR sig, CK_ULONG siglen, ECDSA_SIG **outsig) { -+static CK_RV create_ecdsa_sig(CK_BYTE_PTR sig, CK_ULONG siglen, -+ unsigned char **outbuf, size_t *outlen) { - - if (siglen & 1) { - LOGE("Expected ECDSA signature length to be even, got : %lu", -@@ -487,21 +539,48 @@ static CK_RV create_ecdsa_sig(CK_BYTE_PT - return CKR_GENERAL_ERROR; - } - -- *outsig = ossl_sig; -+ int sig_len =i2d_ECDSA_SIG(ossl_sig, NULL); -+ if (sig_len <= 0) { -+ if (rc < 0) { -+ SSL_UTIL_LOGE("ECDSA_do_verify failed"); -+ } else { -+ LOGE("Expected length to be greater than 0"); -+ } -+ ECDSA_SIG_free(ossl_sig); -+ return CKR_GENERAL_ERROR; -+ } -+ -+ unsigned char *buf = calloc(1, sig_len); -+ if (!buf) { -+ LOGE("oom"); -+ ECDSA_SIG_free(ossl_sig); -+ return CKR_HOST_MEMORY; -+ } -+ -+ unsigned char *p = buf; -+ int sig_len2 = i2d_ECDSA_SIG(ossl_sig, &p); -+ if (sig_len2 < 0) { -+ SSL_UTIL_LOGE("ECDSA_do_verify failed"); -+ ECDSA_SIG_free(ossl_sig); -+ free(buf); -+ return CKR_GENERAL_ERROR; -+ } -+ -+ assert(sig_len == sig_len2); -+ -+ ECDSA_SIG_free(ossl_sig); -+ -+ *outbuf = buf; -+ *outlen = sig_len; - - return CKR_OK; - } - - static CK_RV do_sig_verify_ec(EVP_PKEY *pkey, -+ const EVP_MD *md, - CK_BYTE_PTR digest, CK_ULONG digest_len, - CK_BYTE_PTR signature, CK_ULONG signature_len) { - -- EC_KEY *eckey = EVP_PKEY_get0_EC_KEY(pkey); -- if (!eckey) { -- LOGE("Expected EC Key"); -- return CKR_GENERAL_ERROR; -- } -- - /* - * OpenSSL expects ASN1 framed signatures, PKCS11 does flat - * R + S signatures, so convert it to ASN1 framing. -@@ -509,21 +588,47 @@ static CK_RV do_sig_verify_ec(EVP_PKEY * - * https://github.com/tpm2-software/tpm2-pkcs11/issues/277 - * For details. - */ -- ECDSA_SIG *ossl_sig = NULL; -- CK_RV rv = create_ecdsa_sig(signature, signature_len, &ossl_sig); -+ unsigned char *buf = NULL; -+ size_t buflen = 0; -+ CK_RV rv = create_ecdsa_sig(signature, signature_len, &buf, &buflen); - if (rv != CKR_OK) { - return rv; - } - -- int rc = ECDSA_do_verify(digest, digest_len, ossl_sig, eckey); -- if (rc < 0) { -- ECDSA_SIG_free(ossl_sig); -- SSL_UTIL_LOGE("ECDSA_do_verify failed"); -- return CKR_GENERAL_ERROR; -+ EVP_PKEY_CTX *pkey_ctx = NULL; -+ rv = ssl_util_setup_evp_pkey_ctx(pkey, 0, md, -+ EVP_PKEY_verify_init, &pkey_ctx); -+ if (rv != CKR_OK) { -+ free(buf); -+ return rv; - } -- ECDSA_SIG_free(ossl_sig); - -- return rc == 1 ? CKR_OK : CKR_SIGNATURE_INVALID; -+ rv = sig_verify(pkey_ctx, buf, buflen, digest, digest_len); -+ -+ EVP_PKEY_CTX_free(pkey_ctx); -+ free(buf); -+ -+ return rv; -+} -+ -+static CK_RV do_sig_verify_rsa(EVP_PKEY *pkey, -+ int padding, const EVP_MD *md, -+ CK_BYTE_PTR digest, CK_ULONG digest_len, -+ CK_BYTE_PTR signature, CK_ULONG signature_len) { -+ -+ CK_RV rv = CKR_GENERAL_ERROR; -+ -+ EVP_PKEY_CTX *pkey_ctx = NULL; -+ rv = ssl_util_setup_evp_pkey_ctx(pkey, padding, md, -+ EVP_PKEY_verify_init, &pkey_ctx); -+ if (rv != CKR_OK) { -+ return rv; -+ } -+ -+ rv = sig_verify(pkey_ctx, signature, signature_len, digest, digest_len); -+ -+ EVP_PKEY_CTX_free(pkey_ctx); -+ return rv; - } - - CK_RV ssl_util_sig_verify(EVP_PKEY *pkey, -@@ -538,7 +643,7 @@ CK_RV ssl_util_sig_verify(EVP_PKEY *pkey - digest, digest_len, - signature, signature_len); - case EVP_PKEY_EC: -- return do_sig_verify_ec(pkey, digest, digest_len, -+ return do_sig_verify_ec(pkey, md, digest, digest_len, - signature, signature_len); - default: - LOGE("Unknown PKEY type, got: %d", type); -@@ -577,3 +682,65 @@ CK_RV ssl_util_verify_recover(EVP_PKEY * - EVP_PKEY_CTX_free(pkey_ctx); - return rv; - } -+ -+twist ssl_util_hash_pass(const twist pin, const twist salt) { -+ -+ -+ twist out = NULL; -+ unsigned char md[SHA256_DIGEST_LENGTH]; -+ -+ EVP_MD_CTX *ctx = EVP_MD_CTX_new(); -+ if (!ctx) { -+ SSL_UTIL_LOGE("EVP_MD_CTX_new"); -+ return NULL; -+ } -+ -+ int rc = EVP_DigestInit(ctx, EVP_sha256()); -+ if (rc != 1) { -+ SSL_UTIL_LOGE("EVP_DigestInit"); -+ goto error; -+ } -+ -+ rc = EVP_DigestUpdate(ctx, pin, twist_len(pin)); -+ if (rc != 1) { -+ SSL_UTIL_LOGE("EVP_DigestUpdate"); -+ goto error; -+ } -+ -+ rc = EVP_DigestUpdate(ctx, salt, twist_len(salt)); -+ if (rc != 1) { -+ SSL_UTIL_LOGE("EVP_DigestUpdate"); -+ goto error; -+ } -+ -+ unsigned int len = sizeof(md); -+ rc = EVP_DigestFinal(ctx, md, &len); -+ if (rc != 1) { -+ SSL_UTIL_LOGE("EVP_DigestFinal"); -+ goto error; -+ } -+ -+ /* truncate the password to 32 characters */ -+ out = twist_hex_new((char *)md, sizeof(md)/2); -+ -+error: -+ EVP_MD_CTX_free(ctx); -+ -+ return out; -+} -+ -+CK_RV ssl_util_params_to_nid(CK_ATTRIBUTE_PTR ecparams, int *nid) { -+ -+ const unsigned char *p = ecparams->pValue; -+ -+ ASN1_OBJECT *a = d2i_ASN1_OBJECT(NULL, &p, ecparams->ulValueLen); -+ if (!a) { -+ LOGE("Unknown CKA_EC_PARAMS value"); -+ return CKR_ATTRIBUTE_VALUE_INVALID; -+ } -+ -+ *nid = OBJ_obj2nid(a); -+ ASN1_OBJECT_free(a); -+ -+ return CKR_OK; -+} -Index: git/src/lib/ssl_util.h -=================================================================== ---- git.orig/src/lib/ssl_util.h -+++ git/src/lib/ssl_util.h -@@ -11,8 +11,8 @@ - - #include "pkcs11.h" - -+#include "attrs.h" - #include "log.h" --#include "object.h" - #include "twist.h" - - #if (OPENSSL_VERSION_NUMBER < 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) /* OpenSSL 1.1.0 */ -@@ -22,6 +22,10 @@ - #define LIB_TPM2_OPENSSL_OPENSSL_POST111 0x1010100f - #endif - -+#if (OPENSSL_VERSION_NUMBER >= 0x30000000) /* OpenSSL 3.0.0 */ -+#define LIB_TPM2_OPENSSL_OPENSSL_POST300 0x1010100f -+#endif -+ - /* OpenSSL Backwards Compat APIs */ - #if defined(LIB_TPM2_OPENSSL_OPENSSL_PRE11) - #include <string.h> -@@ -58,7 +62,7 @@ static inline void *OPENSSL_memdup(const - - #define SSL_UTIL_LOGE(m) LOGE("%s: %s", m, ERR_error_string(ERR_get_error(), NULL)); - --CK_RV ssl_util_tobject_to_evp(EVP_PKEY **outpkey, tobject *obj); -+CK_RV ssl_util_attrs_to_evp(attr_list *attrs, EVP_PKEY **outpkey); - - CK_RV ssl_util_encrypt(EVP_PKEY *pkey, - int padding, twist label, const EVP_MD *md, -@@ -82,4 +86,27 @@ CK_RV ssl_util_setup_evp_pkey_ctx(EVP_PK - fn_EVP_PKEY_init init_fn, - EVP_PKEY_CTX **outpkey_ctx); - -+CK_RV ssl_util_add_PKCS1_PSS(EVP_PKEY *pkey, -+ const CK_BYTE_PTR inbuf, const EVP_MD *md, -+ CK_BYTE_PTR outbuf); -+ -+CK_RV ssl_util_add_PKCS1_TYPE_1(const CK_BYTE_PTR inbuf, CK_ULONG inlen, -+ CK_BYTE_PTR outbuf, CK_ULONG outbuflen); -+ -+CK_RV ssl_util_check_PKCS1_TYPE_2(const CK_BYTE_PTR inbuf, CK_ULONG inlen, CK_ULONG rsa_len, -+ CK_BYTE_PTR outbuf, CK_ULONG_PTR outbuflen); -+ -+twist ssl_util_hash_pass(const twist pin, const twist salt); -+ -+/** -+ * Given an attribute of CKA_EC_PARAMS returns the nid value. -+ * @param ecparams -+ * The DER X9.62 parameters value -+ * @param nid -+ * The nid to set -+ * @return -+ * CKR_OK on success. -+ */ -+CK_RV ssl_util_params_to_nid(CK_ATTRIBUTE_PTR ecparams, int *nid); -+ - #endif /* SRC_LIB_SSL_UTIL_H_ */ -Index: git/src/lib/tpm.c -=================================================================== ---- git.orig/src/lib/tpm.c -+++ git/src/lib/tpm.c -@@ -3099,7 +3099,7 @@ static CK_RV handle_ecparams(CK_ATTRIBUT - tpm_key_data *keydat = (tpm_key_data *)udata; - - int nid = 0; -- CK_RV rv = ec_params_to_nid(attr, &nid); -+ CK_RV rv = ssl_util_params_to_nid(attr, &nid); - if (rv != CKR_OK) { - return rv; - } -@@ -3451,7 +3451,7 @@ static EC_POINT *tpm_pub_to_ossl_pub(EC_ - goto out; - } - -- int rc = EC_POINT_set_affine_coordinates_GFp(group, -+ int rc = EC_POINT_set_affine_coordinates(group, - pub_key_point_tmp, - bn_x, - bn_y, -@@ -4579,7 +4579,7 @@ CK_RV tpm_get_pss_sig_state(tpm_ctx *tct - goto out; - } - -- rv = ssl_util_tobject_to_evp(&pkey, tobj); -+ rv = ssl_util_attrs_to_evp(tobj->attrs, &pkey); - if (rv != CKR_OK) { - goto out; - } -Index: git/src/lib/utils.c -=================================================================== ---- git.orig/src/lib/utils.c -+++ git/src/lib/utils.c -@@ -7,6 +7,7 @@ - #include <openssl/sha.h> - - #include "log.h" -+#include "ssl_util.h" - #include "token.h" - #include "utils.h" - -@@ -45,7 +46,7 @@ CK_RV utils_setup_new_object_auth(twist - pin_to_use = newpin; - } - -- *newauthhex = utils_hash_pass(pin_to_use, salt_to_use); -+ *newauthhex = ssl_util_hash_pass(pin_to_use, salt_to_use); - if (!*newauthhex) { - goto out; - } -@@ -330,22 +331,6 @@ out: - - } - --twist utils_hash_pass(const twist pin, const twist salt) { -- -- -- unsigned char md[SHA256_DIGEST_LENGTH]; -- -- SHA256_CTX sha256; -- SHA256_Init(&sha256); -- -- SHA256_Update(&sha256, pin, twist_len(pin)); -- SHA256_Update(&sha256, salt, twist_len(salt)); -- SHA256_Final(md, &sha256); -- -- /* truncate the password to 32 characters */ -- return twist_hex_new((char *)md, sizeof(md)/2); --} -- - size_t utils_get_halg_size(CK_MECHANISM_TYPE mttype) { - - switch(mttype) { -@@ -448,22 +433,6 @@ CK_RV utils_ctx_wrap_objauth(twist wrapp - - return CKR_OK; - } -- --CK_RV ec_params_to_nid(CK_ATTRIBUTE_PTR ecparams, int *nid) { -- -- const unsigned char *p = ecparams->pValue; -- -- ASN1_OBJECT *a = d2i_ASN1_OBJECT(NULL, &p, ecparams->ulValueLen); -- if (!a) { -- LOGE("Unknown CKA_EC_PARAMS value"); -- return CKR_ATTRIBUTE_VALUE_INVALID; -- } -- -- *nid = OBJ_obj2nid(a); -- ASN1_OBJECT_free(a); -- -- return CKR_OK; --} - - CK_RV apply_pkcs7_pad(const CK_BYTE_PTR in, CK_ULONG inlen, - CK_BYTE_PTR out, CK_ULONG_PTR outlen) { -Index: git/src/lib/utils.h -=================================================================== ---- git.orig/src/lib/utils.h -+++ git/src/lib/utils.h -@@ -45,8 +45,6 @@ static inline void _str_padded_copy(CK_U - memcpy(dst, src, src_len); - } - --twist utils_hash_pass(const twist pin, const twist salt); -- - twist aes256_gcm_decrypt(const twist key, const twist objauth); - - twist aes256_gcm_encrypt(twist keybin, twist plaintextbin); -@@ -77,17 +75,6 @@ CK_RV utils_ctx_unwrap_objauth(twist wra - CK_RV utils_ctx_wrap_objauth(twist wrappingkey, twist objauth, twist *wrapped_auth); - - /** -- * Given an attribute of CKA_EC_PARAMS returns the nid value. -- * @param ecparams -- * The DER X9.62 parameters value -- * @param nid -- * The nid to set -- * @return -- * CKR_OK on success. -- */ --CK_RV ec_params_to_nid(CK_ATTRIBUTE_PTR ecparams, int *nid); -- --/** - * Removes a PKCS7 padding on a 16 byte block. - * @param in - * The PKCS5 padded input. -Index: git/test/integration/pkcs-sign-verify.int.c -=================================================================== ---- git.orig/test/integration/pkcs-sign-verify.int.c -+++ git/test/integration/pkcs-sign-verify.int.c -@@ -1061,70 +1061,13 @@ static void test_double_sign_final_call_ - assert_int_equal(rv, CKR_OK); - } - --static CK_ATTRIBUTE_PTR get_attr(CK_ATTRIBUTE_TYPE type, CK_ATTRIBUTE_PTR attrs, CK_ULONG attr_len) { -- -- CK_ULONG i; -- for (i=0; i < attr_len; i++) { -- CK_ATTRIBUTE_PTR a = &attrs[i]; -- if (a->type == type) { -- return a; -- } -- } -- -- return NULL; --} -- --#if (OPENSSL_VERSION_NUMBER < 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) /* OpenSSL 1.1.0 */ --#define LIB_TPM2_OPENSSL_OPENSSL_PRE11 --#endif -- --RSA *template_to_rsa_pub_key(CK_ATTRIBUTE_PTR attrs, CK_ULONG attr_len) { -- -- RSA *ssl_rsa_key = NULL; -- BIGNUM *e = NULL, *n = NULL; -- -- /* get the exponent */ -- CK_ATTRIBUTE_PTR a = get_attr(CKA_PUBLIC_EXPONENT, attrs, attr_len); -- assert_non_null(a); -- -- e = BN_bin2bn((void*)a->pValue, a->ulValueLen, NULL); -- assert_non_null(e); -- -- /* get the modulus */ -- a = get_attr(CKA_MODULUS, attrs, attr_len); -- assert_non_null(a); -- -- n = BN_bin2bn(a->pValue, a->ulValueLen, -- NULL); -- assert_non_null(n); -- -- ssl_rsa_key = RSA_new(); -- assert_non_null(ssl_rsa_key); -- --#if defined(LIB_TPM2_OPENSSL_OPENSSL_PRE11) -- ssl_rsa_key->e = e; -- ssl_rsa_key->n = n; --#else -- int rc = RSA_set0_key(ssl_rsa_key, n, e, NULL); -- assert_int_equal(rc, 1); --#endif -- -- return ssl_rsa_key; --} -- --static void verify(RSA *pub, CK_BYTE_PTR msg, CK_ULONG msg_len, CK_BYTE_PTR sig, CK_ULONG sig_len) { -- -- EVP_PKEY *pkey = EVP_PKEY_new(); -- assert_non_null(pkey); -- -- int rc = EVP_PKEY_set1_RSA(pkey, pub); -- assert_int_equal(rc, 1); -+static void verify(EVP_PKEY *pkey, CK_BYTE_PTR msg, CK_ULONG msg_len, CK_BYTE_PTR sig, CK_ULONG sig_len) { - - EVP_MD_CTX *ctx = EVP_MD_CTX_create(); - const EVP_MD* md = EVP_get_digestbyname("SHA256"); - assert_non_null(md); - -- rc = EVP_DigestInit_ex(ctx, md, NULL); -+ int rc = EVP_DigestInit_ex(ctx, md, NULL); - assert_int_equal(rc, 1); - - rc = EVP_DigestVerifyInit(ctx, NULL, md, NULL, pkey); -@@ -1136,7 +1079,6 @@ static void verify(RSA *pub, CK_BYTE_PTR - rc = EVP_DigestVerifyFinal(ctx, sig, sig_len); - assert_int_equal(rc, 1); - -- EVP_PKEY_free(pkey); - EVP_MD_CTX_destroy(ctx); - } - -@@ -1170,20 +1112,38 @@ static void test_sign_verify_public(void - assert_int_equal(siglen, 256); - - /* build an OSSL RSA key from parts */ -- CK_BYTE _tmp_bufs[2][1024]; -+ CK_BYTE _tmp_bufs[3][1024]; - CK_ATTRIBUTE attrs[] = { -- { .type = CKA_PUBLIC_EXPONENT, .ulValueLen = sizeof(_tmp_bufs[0]), .pValue = &_tmp_bufs[0] }, -- { .type = CKA_MODULUS, .ulValueLen = sizeof(_tmp_bufs[1]), .pValue = &_tmp_bufs[1] }, -+ { .type = CKA_KEY_TYPE, .ulValueLen = sizeof(_tmp_bufs[0]), .pValue = &_tmp_bufs[0] }, -+ { .type = CKA_PUBLIC_EXPONENT, .ulValueLen = sizeof(_tmp_bufs[0]), .pValue = &_tmp_bufs[1] }, -+ { .type = CKA_MODULUS, .ulValueLen = sizeof(_tmp_bufs[1]), .pValue = &_tmp_bufs[2] }, - }; - - rv = C_GetAttributeValue(session, pub_handle, attrs, ARRAY_LEN(attrs)); - assert_int_equal(rv, CKR_OK); - -- RSA *r = template_to_rsa_pub_key(attrs, ARRAY_LEN(attrs)); -- assert_non_null(r); -+ CK_KEY_TYPE key_type = CKA_KEY_TYPE_BAD; -+ rv = attr_CK_KEY_TYPE(&attrs[0], &key_type); -+ assert_int_equal(rv, CKR_OK); -+ -+ EVP_PKEY *pkey = NULL; -+ attr_list *l = attr_list_new(); -+ -+ bool res = attr_list_add_int(l, CKA_KEY_TYPE, key_type); -+ assert_true(res); - -- verify(r, msg, sizeof(msg) - 1, sig, siglen); -- RSA_free(r); -+ res = attr_list_add_buf(l, attrs[1].type, attrs[1].pValue, attrs[1].ulValueLen); -+ assert_true(res); -+ -+ res = attr_list_add_buf(l, attrs[2].type, attrs[2].pValue, attrs[2].ulValueLen); -+ assert_true(res); -+ -+ rv = ssl_util_attrs_to_evp(l, &pkey); -+ assert_int_equal(rv, CKR_OK); -+ attr_list_free(l); -+ -+ verify(pkey, msg, sizeof(msg) - 1, sig, siglen); -+ EVP_PKEY_free(pkey); - } - - static void test_sign_verify_context_specific_good(void **state) { diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-pkcs11/files/0002-ossl-require-version-1.1.0-or-greater.patch b/meta-security/meta-tpm/recipes-tpm2/tpm2-pkcs11/files/0002-ossl-require-version-1.1.0-or-greater.patch deleted file mode 100644 index ef0a6dcde9..0000000000 --- a/meta-security/meta-tpm/recipes-tpm2/tpm2-pkcs11/files/0002-ossl-require-version-1.1.0-or-greater.patch +++ /dev/null @@ -1,93 +0,0 @@ -From d33e5ef0b11125fe4683d7bfa17023e24997f587 Mon Sep 17 00:00:00 2001 -From: William Roberts <william.c.roberts@intel.com> -Date: Fri, 3 Sep 2021 11:30:50 -0500 -Subject: [PATCH 2/2] ossl: require version 1.1.0 or greater - -THIS DROPS SUPPORT FOR OSSL 1.0.2. - -Signed-off-by: William Roberts <william.c.roberts@intel.com> - -Upstream-Status: Backport -Signed-off-by: Armin Kuster <akuster808@gmail.com> ---- - configure.ac | 2 +- - src/lib/ssl_util.h | 43 +++++-------------------------------------- - 2 files changed, 6 insertions(+), 39 deletions(-) - -diff --git a/configure.ac b/configure.ac -index a7aeaf5..94fb5d4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -55,7 +55,7 @@ PKG_CHECK_EXISTS([tss2-esys >= 3.0], - # require sqlite3 and libcrypto - PKG_CHECK_MODULES([SQLITE3], [sqlite3]) - PKG_CHECK_MODULES([YAML], [yaml-0.1]) --PKG_CHECK_MODULES([CRYPTO], [libcrypto >= 1.0.2g]) -+PKG_CHECK_MODULES([CRYPTO], [libcrypto >= 1.1.0]) - - # check for pthread - AX_PTHREAD([],[AC_MSG_ERROR([Cannot find pthread])]) -diff --git a/src/lib/ssl_util.h b/src/lib/ssl_util.h -index 9909fd6..2591728 100644 ---- a/src/lib/ssl_util.h -+++ b/src/lib/ssl_util.h -@@ -15,51 +15,18 @@ - #include "log.h" - #include "twist.h" - --#if (OPENSSL_VERSION_NUMBER < 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) /* OpenSSL 1.1.0 */ --#define LIB_TPM2_OPENSSL_OPENSSL_PRE11 --/* LibreSSL does not appear to have evperr.h, so their is no need to define this otherwise */ --#elif (OPENSSL_VERSION_NUMBER >= 0x1010100fL) /* OpenSSL 1.1.1 */ -+#if (OPENSSL_VERSION_NUMBER >= 0x1010100fL) /* OpenSSL 1.1.1 */ - #define LIB_TPM2_OPENSSL_OPENSSL_POST111 0x1010100f - #endif - --#if (OPENSSL_VERSION_NUMBER >= 0x30000000) /* OpenSSL 3.0.0 */ --#define LIB_TPM2_OPENSSL_OPENSSL_POST300 0x1010100f -+#if defined(LIB_TPM2_OPENSSL_OPENSSL_POST111) -+#include <openssl/evperr.h> - #endif - --/* OpenSSL Backwards Compat APIs */ --#if defined(LIB_TPM2_OPENSSL_OPENSSL_PRE11) --#include <string.h> --size_t EC_POINT_point2buf(const EC_GROUP *group, const EC_POINT *point, -- point_conversion_form_t form, -- unsigned char **pbuf, BN_CTX *ctx); -- --const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *x); -- --int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d); -- --int ECDSA_SIG_set0(ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s); -- --EC_KEY *EVP_PKEY_get0_EC_KEY(EVP_PKEY *pkey); -- --static inline void *OPENSSL_memdup(const void *dup, size_t l) { -- -- void *p = OPENSSL_malloc(l); -- if (!p) { -- return NULL; -- } -- -- memcpy(p, dup, l); -- return p; --} -- --#endif -- --#ifndef RSA_PSS_SALTLEN_DIGEST --#define RSA_PSS_SALTLEN_DIGEST -1 -+#if (OPENSSL_VERSION_NUMBER >= 0x30000000) /* OpenSSL 3.0.0 */ -+#define LIB_TPM2_OPENSSL_OPENSSL_POST300 0x1010100f - #endif - --/* Utility APIs */ -- - #define SSL_UTIL_LOGE(m) LOGE("%s: %s", m, ERR_error_string(ERR_get_error(), NULL)); - - CK_RV ssl_util_attrs_to_evp(attr_list *attrs, EVP_PKEY **outpkey); --- -2.25.1 - diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-pkcs11/files/bootstrap_fixup.patch b/meta-security/meta-tpm/recipes-tpm2/tpm2-pkcs11/files/bootstrap_fixup.patch deleted file mode 100644 index d38e23777c..0000000000 --- a/meta-security/meta-tpm/recipes-tpm2/tpm2-pkcs11/files/bootstrap_fixup.patch +++ /dev/null @@ -1,12 +0,0 @@ -Upstream-Status: OE specific -Signed-off-by: Armin Kuster <akuster808@gmail.com> - -Index: git/bootstrap -=================================================================== ---- git.orig/bootstrap -+++ git/bootstrap -@@ -27,4 +27,3 @@ echo "Generating file lists: ${VARS_FILE - ) > ${VARS_FILE} - - mkdir -p m4 --${AUTORECONF} --install --sym $@ diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_1.7.0.bb b/meta-security/meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_1.8.0.bb index 177c3c3777..a9174e6717 100644 --- a/meta-security/meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_1.7.0.bb +++ b/meta-security/meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_1.8.0.bb @@ -6,21 +6,17 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0fc19f620a102768d6dbd1e7166e78ab" DEPENDS = "autoconf-archive pkgconfig sqlite3 openssl libtss2-dev tpm2-tools libyaml p11-kit python3-setuptools-native" -SRC_URI = "git://github.com/tpm2-software/tpm2-pkcs11.git;branch=master;protocol=https \ - file://bootstrap_fixup.patch \ - file://0001-remove-local-binary-checkes.patch \ - file://0001-ssl-compile-against-OSSL-3.0.patch \ - file://0002-ossl-require-version-1.1.0-or-greater.patch \ - " +SRC_URI = "https://github.com/tpm2-software/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz" -SRCREV = "11fd2532ce10e97834a57dfb25bff6c613a5a851" - -S = "${WORKDIR}/git" +SRC_URI[sha256sum] = "79f28899047defd6b4b72b7268dd56abf27774954022315f818c239af33e05bd" inherit autotools-brokensep pkgconfig python3native -do_configure:prepend () { - ${S}/bootstrap +EXTRA_OECONF += "--disable-ptool-checks" + +do_configure:prepend() { + # do not extract the version number from git + sed -i -e 's/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/' ${S}/configure.ac } do_compile:append() { diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-tools/tpm2-tools_5.2.bb b/meta-security/meta-tpm/recipes-tpm2/tpm2-tools/tpm2-tools_5.2.bb index 6e95a0e8fe..f924038bdb 100644 --- a/meta-security/meta-tpm/recipes-tpm2/tpm2-tools/tpm2-tools_5.2.bb +++ b/meta-security/meta-tpm/recipes-tpm2/tpm2-tools/tpm2-tools_5.2.bb @@ -11,3 +11,8 @@ SRC_URI = "https://github.com/tpm2-software/${BPN}/releases/download/${PV}/${BPN SRC_URI[sha256sum] = "c0b402f6a7b3456e8eb2445211e2d41c46c7e769e05fe4d8909ff64119f7a630" inherit autotools pkgconfig bash-completion + +do_configure:prepend() { + # do not extract the version number from git + sed -i -e 's/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/' ${S}/configure.ac +} diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-tss-engine/tpm2-tss-engine_1.1.0.bb b/meta-security/meta-tpm/recipes-tpm2/tpm2-tss-engine/tpm2-tss-engine_1.1.0.bb index 4d1f425d8e..efe62a8209 100644 --- a/meta-security/meta-tpm/recipes-tpm2/tpm2-tss-engine/tpm2-tss-engine_1.1.0.bb +++ b/meta-security/meta-tpm/recipes-tpm2/tpm2-tss-engine/tpm2-tss-engine_1.1.0.bb @@ -8,16 +8,23 @@ SECTION = "security/tpm" DEPENDS = "autoconf-archive-native bash-completion libtss2 libgcrypt openssl" -SRCREV = "6f387a4efe2049f1b4833e8f621c77231bc1eef4" -SRC_URI = "git://github.com/tpm2-software/tpm2-tss-engine.git;branch=v1.1.x;protocol=https" +SRC_URI = "https://github.com/tpm2-software/${BPN}/releases/download/v${PV}/${BPN}-${PV}.tar.gz" + +SRC_URI[sha256sum] = "ea2941695ac221d23a7f3e1321140e75b1495ae6ade876f2f4c2ed807c65e2a5" inherit autotools-brokensep pkgconfig systemd -S = "${WORKDIR}/git" +# It uses the API deprecated since the OpenSSL 3.0 +CFLAGS:append = ' -Wno-deprecated-declarations -Wno-unused-parameter' + +do_configure:prepend() { + # do not extract the version number from git + sed -i -e 's/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/' ${S}/configure.ac +} PACKAGES += "${PN}-engines ${PN}-engines-staticdev ${PN}-bash-completion" -FILES:${PN}-dev = "${libdir}/engines-1.1/tpm2tss.so ${includedir}/*" -FILES:${PN}-engines = "${libdir}/engines-1.1/lib*.so*" -FILES:${PN}-engines-staticdev = "${libdir}/engines-1.1/libtpm2tss.a" +FILES:${PN}-dev = "${libdir}/engines-3/tpm2tss.so ${includedir}/*" +FILES:${PN}-engines = "${libdir}/engines-3/lib*.so*" +FILES:${PN}-engines-staticdev = "${libdir}/engines-3/libtpm2tss.a" FILES:${PN}-bash-completion += "${datadir}/bash-completion/completions" diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/ax_pthread.m4 b/meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/ax_pthread.m4 deleted file mode 100644 index d383ad5c6d..0000000000 --- a/meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/ax_pthread.m4 +++ /dev/null @@ -1,332 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_pthread.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) -# -# DESCRIPTION -# -# This macro figures out how to build C programs using POSIX threads. It -# sets the PTHREAD_LIBS output variable to the threads library and linker -# flags, and the PTHREAD_CFLAGS output variable to any special C compiler -# flags that are needed. (The user can also force certain compiler -# flags/libs to be tested by setting these environment variables.) -# -# Also sets PTHREAD_CC to any special C compiler that is needed for -# multi-threaded programs (defaults to the value of CC otherwise). (This -# is necessary on AIX to use the special cc_r compiler alias.) -# -# NOTE: You are assumed to not only compile your program with these flags, -# but also link it with them as well. e.g. you should link with -# $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS -# -# If you are only building threads programs, you may wish to use these -# variables in your default LIBS, CFLAGS, and CC: -# -# LIBS="$PTHREAD_LIBS $LIBS" -# CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -# CC="$PTHREAD_CC" -# -# In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant -# has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name -# (e.g. PTHREAD_CREATE_UNDETACHED on AIX). -# -# Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the -# PTHREAD_PRIO_INHERIT symbol is defined when compiling with -# PTHREAD_CFLAGS. -# -# ACTION-IF-FOUND is a list of shell commands to run if a threads library -# is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it -# is not found. If ACTION-IF-FOUND is not specified, the default action -# will define HAVE_PTHREAD. -# -# Please let the authors know if this macro fails on any platform, or if -# you have any other suggestions or comments. This macro was based on work -# by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help -# from M. Frigo), as well as ac_pthread and hb_pthread macros posted by -# Alejandro Forero Cuervo to the autoconf macro repository. We are also -# grateful for the helpful feedback of numerous users. -# -# Updated for Autoconf 2.68 by Daniel Richard G. -# -# LICENSE -# -# Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu> -# Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG> -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see <http://www.gnu.org/licenses/>. -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 21 - -AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD]) -AC_DEFUN([AX_PTHREAD], [ -AC_REQUIRE([AC_CANONICAL_HOST]) -AC_LANG_PUSH([C]) -ax_pthread_ok=no - -# We used to check for pthread.h first, but this fails if pthread.h -# requires special compiler flags (e.g. on True64 or Sequent). -# It gets checked for in the link test anyway. - -# First of all, check if the user has set any of the PTHREAD_LIBS, -# etcetera environment variables, and if threads linking works using -# them: -if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS]) - AC_TRY_LINK_FUNC([pthread_join], [ax_pthread_ok=yes]) - AC_MSG_RESULT([$ax_pthread_ok]) - if test x"$ax_pthread_ok" = xno; then - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" - fi - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" -fi - -# We must check for the threads library under a number of different -# names; the ordering is very important because some systems -# (e.g. DEC) have both -lpthread and -lpthreads, where one of the -# libraries is broken (non-POSIX). - -# Create a list of thread flags to try. Items starting with a "-" are -# C compiler flags, and other items are library names, except for "none" -# which indicates that we try without any flags at all, and "pthread-config" -# which is a program returning the flags for the Pth emulation library. - -ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" - -# The ordering *is* (sometimes) important. Some notes on the -# individual items follow: - -# pthreads: AIX (must check this before -lpthread) -# none: in case threads are in libc; should be tried before -Kthread and -# other compiler flags to prevent continual compiler warnings -# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) -# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) -# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) -# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) -# -pthreads: Solaris/gcc -# -mthreads: Mingw32/gcc, Lynx/gcc -# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it -# doesn't hurt to check since this sometimes defines pthreads too; -# also defines -D_REENTRANT) -# ... -mt is also the pthreads flag for HP/aCC -# pthread: Linux, etcetera -# --thread-safe: KAI C++ -# pthread-config: use pthread-config program (for GNU Pth library) - -case ${host_os} in - solaris*) - - # On Solaris (at least, for some versions), libc contains stubbed - # (non-functional) versions of the pthreads routines, so link-based - # tests will erroneously succeed. (We need to link with -pthreads/-mt/ - # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather - # a function called by this macro, so we could check for that, but - # who knows whether they'll stub that too in a future libc.) So, - # we'll just look for -pthreads and -lpthread first: - - ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags" - ;; - - darwin*) - ax_pthread_flags="-pthread $ax_pthread_flags" - ;; -esac - -# Clang doesn't consider unrecognized options an error unless we specify -# -Werror. We throw in some extra Clang-specific options to ensure that -# this doesn't happen for GCC, which also accepts -Werror. - -AC_MSG_CHECKING([if compiler needs -Werror to reject unknown flags]) -save_CFLAGS="$CFLAGS" -ax_pthread_extra_flags="-Werror" -CFLAGS="$CFLAGS $ax_pthread_extra_flags -Wunknown-warning-option -Wsizeof-array-argument" -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int foo(void);],[foo()])], - [AC_MSG_RESULT([yes])], - [ax_pthread_extra_flags= - AC_MSG_RESULT([no])]) -CFLAGS="$save_CFLAGS" - -if test x"$ax_pthread_ok" = xno; then -for flag in $ax_pthread_flags; do - - case $flag in - none) - AC_MSG_CHECKING([whether pthreads work without any flags]) - ;; - - -*) - AC_MSG_CHECKING([whether pthreads work with $flag]) - PTHREAD_CFLAGS="$flag" - ;; - - pthread-config) - AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no]) - if test x"$ax_pthread_config" = xno; then continue; fi - PTHREAD_CFLAGS="`pthread-config --cflags`" - PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" - ;; - - *) - AC_MSG_CHECKING([for the pthreads library -l$flag]) - PTHREAD_LIBS="-l$flag" - ;; - esac - - save_LIBS="$LIBS" - save_CFLAGS="$CFLAGS" - LIBS="$PTHREAD_LIBS $LIBS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS $ax_pthread_extra_flags" - - # Check for various functions. We must include pthread.h, - # since some functions may be macros. (On the Sequent, we - # need a special flag -Kthread to make this header compile.) - # We check for pthread_join because it is in -lpthread on IRIX - # while pthread_create is in libc. We check for pthread_attr_init - # due to DEC craziness with -lpthreads. We check for - # pthread_cleanup_push because it is one of the few pthread - # functions on Solaris that doesn't have a non-functional libc stub. - # We try pthread_create on general principles. - AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h> - static void routine(void *a) { a = 0; } - static void *start_routine(void *a) { return a; }], - [pthread_t th; pthread_attr_t attr; - pthread_create(&th, 0, start_routine, 0); - pthread_join(th, 0); - pthread_attr_init(&attr); - pthread_cleanup_push(routine, 0); - pthread_cleanup_pop(0) /* ; */])], - [ax_pthread_ok=yes], - []) - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - AC_MSG_RESULT([$ax_pthread_ok]) - if test "x$ax_pthread_ok" = xyes; then - break; - fi - - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" -done -fi - -# Various other checks: -if test "x$ax_pthread_ok" = xyes; then - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - - # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. - AC_MSG_CHECKING([for joinable pthread attribute]) - attr_name=unknown - for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do - AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>], - [int attr = $attr; return attr /* ; */])], - [attr_name=$attr; break], - []) - done - AC_MSG_RESULT([$attr_name]) - if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then - AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE], [$attr_name], - [Define to necessary symbol if this constant - uses a non-standard name on your system.]) - fi - - AC_MSG_CHECKING([if more special flags are required for pthreads]) - flag=no - case ${host_os} in - aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";; - osf* | hpux*) flag="-D_REENTRANT";; - solaris*) - if test "$GCC" = "yes"; then - flag="-D_REENTRANT" - else - # TODO: What about Clang on Solaris? - flag="-mt -D_REENTRANT" - fi - ;; - esac - AC_MSG_RESULT([$flag]) - if test "x$flag" != xno; then - PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" - fi - - AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT], - [ax_cv_PTHREAD_PRIO_INHERIT], [ - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]], - [[int i = PTHREAD_PRIO_INHERIT;]])], - [ax_cv_PTHREAD_PRIO_INHERIT=yes], - [ax_cv_PTHREAD_PRIO_INHERIT=no]) - ]) - AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"], - [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])]) - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - # More AIX lossage: compile with *_r variant - if test "x$GCC" != xyes; then - case $host_os in - aix*) - AS_CASE(["x/$CC"], - [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6], - [#handle absolute path differently from PATH based program lookup - AS_CASE(["x$CC"], - [x/*], - [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])], - [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])]) - ;; - esac - fi -fi - -test -n "$PTHREAD_CC" || PTHREAD_CC="$CC" - -AC_SUBST([PTHREAD_LIBS]) -AC_SUBST([PTHREAD_CFLAGS]) -AC_SUBST([PTHREAD_CC]) - -# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: -if test x"$ax_pthread_ok" = xyes; then - ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1]) - : -else - ax_pthread_ok=no - $2 -fi -AC_LANG_POP -])dnl AX_PTHREAD diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/fix_musl_select_include.patch b/meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/fix_musl_select_include.patch deleted file mode 100644 index ecaca6ea57..0000000000 --- a/meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/fix_musl_select_include.patch +++ /dev/null @@ -1,31 +0,0 @@ -This fixes musl build issue do to missing FD_* defines. -Add sys/select.h - -Upstream-Status: Pending - -Signed-off-by: Armin Kuster <akuster@mvista.com> - -Index: TPM2.0-TSS/tcti/tcti_socket.cpp -=================================================================== ---- TPM2.0-TSS.orig/tcti/tcti_socket.cpp -+++ TPM2.0-TSS/tcti/tcti_socket.cpp -@@ -28,6 +28,7 @@ - #include <stdio.h> - #include <stdlib.h> // Needed for _wtoi - -+#include "sys/select.h" - #include <sapi/tpm20.h> - #include <tcti/tcti_socket.h> - #include "sysapi_util.h" -Index: TPM2.0-TSS/resourcemgr/resourcemgr.c -=================================================================== ---- TPM2.0-TSS.orig/resourcemgr/resourcemgr.c -+++ TPM2.0-TSS/resourcemgr/resourcemgr.c -@@ -28,6 +28,7 @@ - #include <stdio.h> - #include <stdlib.h> // Needed for _wtoi - -+#include "sys/select.h" - #include <sapi/tpm20.h> - #include <tcti/tcti_device.h> - #include <tcti/tcti_socket.h> diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/fixup_hosttools.patch b/meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/fixup_hosttools.patch index b5579e1b93..450698ff64 100644 --- a/meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/fixup_hosttools.patch +++ b/meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/fixup_hosttools.patch @@ -5,22 +5,25 @@ Not appropriate for cross build env. Upstream-Status: OE [inappropriate] Signed-off-by: Armin Kuster <akuster808@gmail.com> -Index: tpm2-tss-3.1.0/configure.ac +Index: tpm2-tss-3.2.0/configure.ac =================================================================== ---- tpm2-tss-3.1.0.orig/configure.ac -+++ tpm2-tss-3.1.0/configure.ac -@@ -471,14 +471,6 @@ AM_CONDITIONAL(SYSD_SYSUSERS, test "x$sy +--- tpm2-tss-3.2.0.orig/configure.ac ++++ tpm2-tss-3.2.0/configure.ac +@@ -488,17 +488,6 @@ AC_CHECK_PROG(systemd_tmpfiles, systemd-tmpfiles, yes) AM_CONDITIONAL(SYSD_TMPFILES, test "x$systemd_tmpfiles" = "xyes") - # Check all tools used by make install --AS_IF([test "$HOSTOS" = "Linux"], -- [ERROR_IF_NO_PROG([groupadd]) -- ERROR_IF_NO_PROG([useradd]) -- ERROR_IF_NO_PROG([id]) -- ERROR_IF_NO_PROG([chown]) -- ERROR_IF_NO_PROG([chmod]) -- ERROR_IF_NO_PROG([mkdir]) -- ERROR_IF_NO_PROG([setfacl])]) +-# Check all tools used by make install +-AS_IF([test "$HOSTOS" = "Linux"], +- [ AC_CHECK_PROG(useradd, useradd, yes) +- AC_CHECK_PROG(groupadd, groupadd, yes) +- AC_CHECK_PROG(adduser, adduser, yes) +- AC_CHECK_PROG(addgroup, addgroup, yes) +- AS_IF([test "x$addgroup" != "xyes" && test "x$groupadd" != "xyes" ], +- [AC_MSG_ERROR([addgroup or groupadd are needed.])]) +- AS_IF([test "x$adduser" != "xyes" && test "x$useradd" != "xyes" ], +- [AC_MSG_ERROR([adduser or useradd are needed.])])]) +- AC_SUBST([PATH]) + dnl --------- Doxy Gen ----------------------- diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_3.1.0.bb b/meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_3.2.0.bb index ddcfb58ea8..8440bb9e9f 100644 --- a/meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_3.1.0.bb +++ b/meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_3.2.0.bb @@ -10,7 +10,7 @@ SRC_URI = "https://github.com/tpm2-software/${BPN}/releases/download/${PV}/${BPN file://fixup_hosttools.patch \ " -SRC_URI[sha256sum] = "8900a6603f74310b749b65f23c3461cde6e2a23a5f61058b21004c25f9cf19e8" +SRC_URI[sha256sum] = "48305e4144dcf6d10f3b25b7bccf0189fd2d1186feafd8cd68c6b17ecf0d7912" inherit autotools pkgconfig systemd useradd @@ -26,6 +26,11 @@ USERADD_PACKAGES = "${PN}" GROUPADD_PARAM:${PN} = "--system tss" USERADD_PARAM:${PN} = "--system -M -d /var/lib/tpm -s /bin/false -g tss tss" +do_configure:prepend() { + # do not extract the version number from git + sed -i -e 's/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/' ${S}/configure.ac +} + do_install:append() { # Remove /run as it is created on startup rm -rf ${D}/run diff --git a/meta-security/recipes-ids/aide/aide_0.17.3.bb b/meta-security/recipes-ids/aide/aide_0.17.3.bb index fbfa8a7d07..b1fb58db3e 100644 --- a/meta-security/recipes-ids/aide/aide_0.17.3.bb +++ b/meta-security/recipes-ids/aide/aide_0.17.3.bb @@ -1,7 +1,7 @@ SUMMARY = "Advanced Intrusion Detection Environment" HOMEPAGE = "https://aide.github.io" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" DEPENDS = "bison-native libpcre" diff --git a/meta-security/recipes-ids/ossec/ossec-hids_3.6.0.bb b/meta-security/recipes-ids/ossec/ossec-hids_3.6.0.bb index 853facf38e..b0759b10ef 100644 --- a/meta-security/recipes-ids/ossec/ossec-hids_3.6.0.bb +++ b/meta-security/recipes-ids/ossec/ossec-hids_3.6.0.bb @@ -1,5 +1,5 @@ SUMMARY = "A full platform to monitor and control your systems" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=d625d1520b5e38faefb81cf9772badc9" diff --git a/meta-security/recipes-ids/samhain/samhain.inc b/meta-security/recipes-ids/samhain/samhain.inc index 5c1d6f57a7..df9e215b8c 100644 --- a/meta-security/recipes-ids/samhain/samhain.inc +++ b/meta-security/recipes-ids/samhain/samhain.inc @@ -1,6 +1,6 @@ DESCRIPTION = "Provides file integrity checking and log file monitoring/analysis" HOMEPAGE = "http://www.la-samhna.de/samhain/" -LICENSE = "GPL-2.0-or-later" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=8ca43cbc842c2336e835926c2166c28b" PV = "4.4.7" diff --git a/meta-security/recipes-ids/tripwire/tripwire_2.4.3.7.bb b/meta-security/recipes-ids/tripwire/tripwire_2.4.3.7.bb index 5bb0e3e209..9149e89232 100644 --- a/meta-security/recipes-ids/tripwire/tripwire_2.4.3.7.bb +++ b/meta-security/recipes-ids/tripwire/tripwire_2.4.3.7.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Open Source Tripwire® software is a security and data \ integrity tool useful for monitoring and alerting on specific file change(s) on a range of systems" HOMEPAGE="http://sourceforge.net/projects/tripwire" SECTION = "security Monitor/Admin" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=1c069be8dbbe48e89b580ab4ed86c127" SRCREV = "6e64a9e5b70a909ec439bc5a099e3fcf38c614b0" diff --git a/meta-security/recipes-mac/AppArmor/apparmor_3.0.4.bb b/meta-security/recipes-mac/AppArmor/apparmor_3.0.4.bb index 8ad3c76ae1..046a3a0915 100644 --- a/meta-security/recipes-mac/AppArmor/apparmor_3.0.4.bb +++ b/meta-security/recipes-mac/AppArmor/apparmor_3.0.4.bb @@ -8,7 +8,7 @@ DESCRIPTION = "user-space parser utility for AppArmor \ HOMEAPAGE = "http://apparmor.net/" SECTION = "admin" -LICENSE = "GPLv2 & GPLv2+ & BSD-3-Clause & LGPLv2.1+" +LICENSE = "GPL-2.0-only & GPL-2.0-or-later & BSD-3-Clause & LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=fd57a4b0bc782d7b80fd431f10bbf9d0" DEPENDS = "bison-native apr gettext-native coreutils-native swig-native" diff --git a/meta-security/recipes-mac/ccs-tools/ccs-tools_1.8.4.bb b/meta-security/recipes-mac/ccs-tools/ccs-tools_1.8.4.bb index 08da24ad2c..8d148bb379 100644 --- a/meta-security/recipes-mac/ccs-tools/ccs-tools_1.8.4.bb +++ b/meta-security/recipes-mac/ccs-tools/ccs-tools_1.8.4.bb @@ -2,7 +2,7 @@ SUMMARY = "Tomoyo" DESCRIPTION = "TOMOYO Linux is a Mandatory Access Control (MAC) implementation for Linux that can be used to increase the security of a system, while also being useful purely as a system analysis tool. \nTo start via command line add: \nsecurity=tomoyo TOMOYO_trigger=/usr/lib/systemd/systemd \nTo initialize: \n/usr/lib/ccs/init_policy" SECTION = "security" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING.ccs;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "ncurses" diff --git a/meta-security/recipes-mac/smack/smack_1.3.1.bb b/meta-security/recipes-mac/smack/smack_1.3.1.bb index 7a8ca7859d..6c52392908 100644 --- a/meta-security/recipes-mac/smack/smack_1.3.1.bb +++ b/meta-security/recipes-mac/smack/smack_1.3.1.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Selection of tools for developers working with Smack" HOMEPAGE = "https://github.com/smack-team/smack" SECTION = "Security/Access Control" -LICENSE = "LGPL-2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" diff --git a/meta-security/recipes-perl/perl/lib-perl_0.63.bb b/meta-security/recipes-perl/perl/lib-perl_0.63.bb index 7895864be1..4c964d5c1b 100644 --- a/meta-security/recipes-perl/perl/lib-perl_0.63.bb +++ b/meta-security/recipes-perl/perl/lib-perl_0.63.bb @@ -4,7 +4,7 @@ directories to Perl's search path so that later 'use' or 'require' statements \ will find modules which are not located in the default search path." SECTION = "libs" -LICENSE = "Artistic-1.0 | GPL-1.0+" +LICENSE = "Artistic-1.0 | GPL-1.0-or-later" PR = "r0" LIC_FILES_CHKSUM = "file://README;beginline=26;endline=30;md5=94b119f1a7b8d611efc89b5d562a1a50" diff --git a/meta-security/recipes-scanners/buck-security/buck-security_0.7.bb b/meta-security/recipes-scanners/buck-security/buck-security_0.7.bb index 63e4d7a8b8..881c2a3948 100644 --- a/meta-security/recipes-scanners/buck-security/buck-security_0.7.bb +++ b/meta-security/recipes-scanners/buck-security/buck-security_0.7.bb @@ -2,7 +2,7 @@ SUMMARY = "Linux security scanner" DESCRIPTION = "Buck-Security is a security scanner for Debian and Ubuntu Linux. It runs a couple of important checks and helps you to harden your Linux \ system. This enables you to quickly overview the security status of your Linux system." SECTION = "security" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" SRC_URI = "http://sourceforge.net/projects/buck-security/files/buck-security/buck-security_${PV}/${BPN}_${PV}.tar.gz" diff --git a/meta-security/recipes-scanners/checksecurity/checksecurity_2.0.15.bb b/meta-security/recipes-scanners/checksecurity/checksecurity_2.0.15.bb index 9a1d77a0c1..e053a150b8 100644 --- a/meta-security/recipes-scanners/checksecurity/checksecurity_2.0.15.bb +++ b/meta-security/recipes-scanners/checksecurity/checksecurity_2.0.15.bb @@ -1,7 +1,7 @@ SUMMARY = "basic system security checks" DESCRIPTION = "checksecurity is a simple package which will scan your system for several simple security holes." SECTION = "security" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" SRC_URI = "http://ftp.de.debian.org/debian/pool/main/c/checksecurity/checksecurity_${PV}.tar.gz \ diff --git a/meta-security/recipes-security/aircrack-ng/aircrack-ng_1.6.bb b/meta-security/recipes-security/aircrack-ng/aircrack-ng_1.6.bb index f76f1df292..d3722c05f1 100644 --- a/meta-security/recipes-security/aircrack-ng/aircrack-ng_1.6.bb +++ b/meta-security/recipes-security/aircrack-ng/aircrack-ng_1.6.bb @@ -1,7 +1,7 @@ SUMMARY = "Aircrack-ng is a set of tools for auditing wireless networks" DESCRIPTION = "Aircrack-ng is an 802.11 WEP and WPA-PSK keys cracking program that can recover keys once enough data packets have been captured. It implements the standard FMS attack along with some optimizations like KoreK attacks, as well as the PTW attack, thus making the attack much faster compared to other WEP cracking tools." SECTION = "security" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=2;md5=1fbd81241fe252ec0f5658a521ab7dd8" diff --git a/meta-security/recipes-security/chipsec/chipsec_git.bb b/meta-security/recipes-security/chipsec/chipsec_git.bb index 156be09fc7..d6c3ff28af 100644 --- a/meta-security/recipes-security/chipsec/chipsec_git.bb +++ b/meta-security/recipes-security/chipsec/chipsec_git.bb @@ -4,7 +4,7 @@ DESCRIPTION = "CHIPSEC is a framework for analyzing the security \ of PC platforms including hardware, system firmware \ (BIOS/UEFI), and platform components." -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=bc2d1f9b427be5fb63f6af9da56f7c5d" SRC_URI = "git://github.com/chipsec/chipsec.git;branch=master;protocol=https \ diff --git a/meta-security/recipes-security/libmspack/libmspack_1.9.1.bb b/meta-security/recipes-security/libmspack/libmspack_1.9.1.bb index 65db10f976..1b91f46b6c 100644 --- a/meta-security/recipes-security/libmspack/libmspack_1.9.1.bb +++ b/meta-security/recipes-security/libmspack/libmspack_1.9.1.bb @@ -1,7 +1,7 @@ SUMMARY = "A library for Microsoft compression formats" HOMEPAGE = "http://www.cabextract.org.uk/libmspack/" SECTION = "lib" -LICENSE = "LGPL-2.1" +LICENSE = "LGPL-2.1-only" DEPENDS = "" LIC_FILES_CHKSUM = "file://COPYING.LIB;beginline=1;endline=2;md5=5b1fd1f66ef926b3c8a5bb00a72a28dd" diff --git a/meta-security/recipes-security/ncrack/ncrack_0.7.bb b/meta-security/recipes-security/ncrack/ncrack_0.7.bb index f151e4e139..8e6b444a2f 100644 --- a/meta-security/recipes-security/ncrack/ncrack_0.7.bb +++ b/meta-security/recipes-security/ncrack/ncrack_0.7.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Ncrack is designed for high-speed parallel testing of network dev HOMEPAGE = "https://nmap.org/ncrack" SECTION = "security" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;beginline=7;endline=12;md5=66938a7e5b4c118eda78271de14874c2" SRCREV = "dc570e7e3cec1fb176c0168eaedc723084bd0426" diff --git a/meta-security/recipes-security/paxctl/paxctl_0.9.bb b/meta-security/recipes-security/paxctl/paxctl_0.9.bb index 55a0dcac9e..5c9aff1558 100644 --- a/meta-security/recipes-security/paxctl/paxctl_0.9.bb +++ b/meta-security/recipes-security/paxctl/paxctl_0.9.bb @@ -3,7 +3,7 @@ DESCRIPTION = "paxctl is a tool that allows PaX flags to be modified on a \ kernel patches and secure distributions, such as \ GrSecurity or Adamantix and Hardened Gen-too, respectively." HOMEPAGE = "https://pax.grsecurity.net/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://paxctl.c;beginline=1;endline=5;md5=0ddd065c61020dda79729e6bedaed2c7 \ file://paxctl-elf.c;beginline=1;endline=5;md5=99f453ce7f6d1687ee808982e2924813 \ " diff --git a/meta-security/recipes-security/redhat-security/redhat-security_1.0.bb b/meta-security/recipes-security/redhat-security/redhat-security_1.0.bb index d6d4cea18f..c47688fa79 100644 --- a/meta-security/recipes-security/redhat-security/redhat-security_1.0.bb +++ b/meta-security/recipes-security/redhat-security/redhat-security_1.0.bb @@ -1,7 +1,7 @@ SUMMARY = "redhat security tools" DESCRIPTION = "Tools used by redhat linux distribution for security checks" SECTION = "security" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" SRC_URI = "file://find-chroot-py.sh \ diff --git a/poky/bitbake/lib/bb/checksum.py b/poky/bitbake/lib/bb/checksum.py index fb8a77f6ab..557793d366 100644 --- a/poky/bitbake/lib/bb/checksum.py +++ b/poky/bitbake/lib/bb/checksum.py @@ -11,10 +11,13 @@ import os import stat import bb.utils import logging +import re from bb.cache import MultiProcessCache logger = logging.getLogger("BitBake.Cache") +filelist_regex = re.compile(r'(?:(?<=:True)|(?<=:False))\s+') + # mtime cache (non-persistent) # based upon the assumption that files do not change during bitbake run class FileMtimeCache(object): @@ -109,7 +112,12 @@ class FileChecksumCache(MultiProcessCache): return dirchecksums checksums = [] - for pth in filelist.split(): + for pth in filelist_regex.split(filelist): + if not pth: + continue + pth = pth.strip() + if not pth: + continue exist = pth.split(":")[1] if exist == "False": continue diff --git a/poky/bitbake/lib/bb/fetch2/__init__.py b/poky/bitbake/lib/bb/fetch2/__init__.py index 5dfe5ff360..ac557176d7 100644 --- a/poky/bitbake/lib/bb/fetch2/__init__.py +++ b/poky/bitbake/lib/bb/fetch2/__init__.py @@ -839,6 +839,7 @@ FETCH_EXPORT_VARS = ['HOME', 'PATH', 'ALL_PROXY', 'all_proxy', 'GIT_PROXY_COMMAND', 'GIT_SSH', + 'GIT_SSH_COMMAND', 'GIT_SSL_CAINFO', 'GIT_SMART_HTTP', 'SSH_AUTH_SOCK', 'SSH_AGENT_PID', diff --git a/poky/bitbake/lib/bb/fetch2/crate.py b/poky/bitbake/lib/bb/fetch2/crate.py index f7e2354afb..aac1221c87 100644 --- a/poky/bitbake/lib/bb/fetch2/crate.py +++ b/poky/bitbake/lib/bb/fetch2/crate.py @@ -72,7 +72,7 @@ class Crate(Wget): ud.parm['downloadfilename'] = "%s-%s.crate" % (name, version) ud.parm['name'] = name - logger.debug(2, "Fetching %s to %s" % (ud.url, ud.parm['downloadfilename'])) + logger.debug("Fetching %s to %s" % (ud.url, ud.parm['downloadfilename'])) def unpack(self, ud, rootdir, d): """ diff --git a/poky/bitbake/lib/bb/fetch2/git.py b/poky/bitbake/lib/bb/fetch2/git.py index 4d06a57198..b3eb8248d0 100644 --- a/poky/bitbake/lib/bb/fetch2/git.py +++ b/poky/bitbake/lib/bb/fetch2/git.py @@ -464,7 +464,7 @@ class Git(FetchMethod): with create_atomic(ud.fullmirror) as tfile: mtime = runfetchcmd("git log --all -1 --format=%cD", d, quiet=True, workdir=ud.clonedir) - runfetchcmd("tar -czf %s --owner pokybuild --group users --mtime \"%s\" ." + runfetchcmd("tar -czf %s --owner oe:0 --group oe:0 --mtime \"%s\" ." % (tfile, mtime), d, workdir=ud.clonedir) runfetchcmd("touch %s.done" % ud.fullmirror, d) diff --git a/poky/bitbake/lib/bb/parse/ast.py b/poky/bitbake/lib/bb/parse/ast.py index 4b1b44ce19..9e0a0f5c98 100644 --- a/poky/bitbake/lib/bb/parse/ast.py +++ b/poky/bitbake/lib/bb/parse/ast.py @@ -223,7 +223,7 @@ class ExportFuncsNode(AstNode): for flag in [ "func", "python" ]: if data.getVarFlag(calledfunc, flag, False): data.setVarFlag(func, flag, data.getVarFlag(calledfunc, flag, False)) - for flag in [ "dirs" ]: + for flag in ["dirs", "cleandirs", "fakeroot"]: if data.getVarFlag(func, flag, False): data.setVarFlag(calledfunc, flag, data.getVarFlag(func, flag, False)) data.setVarFlag(func, "filename", "autogenerated") diff --git a/poky/bitbake/lib/bb/siggen.py b/poky/bitbake/lib/bb/siggen.py index 1612b4efa1..130b38d8a7 100644 --- a/poky/bitbake/lib/bb/siggen.py +++ b/poky/bitbake/lib/bb/siggen.py @@ -991,8 +991,8 @@ def compare_sigfiles(a, b, recursecb=None, color=False, collapsed=False): if 'runtaskhashes' in a_data and 'runtaskhashes' in b_data: - a = a_data['runtaskhashes'] - b = b_data['runtaskhashes'] + a = clean_basepaths(a_data['runtaskhashes']) + b = clean_basepaths(b_data['runtaskhashes']) changed, added, removed = dict_diff(a, b) if added: for dep in sorted(added): @@ -1003,7 +1003,7 @@ def compare_sigfiles(a, b, recursecb=None, color=False, collapsed=False): #output.append("Dependency on task %s was replaced by %s with same hash" % (dep, bdep)) bdep_found = True if not bdep_found: - output.append(color_format("{color_title}Dependency on task %s was added{color_default} with hash %s") % (clean_basepath(dep), b[dep])) + output.append(color_format("{color_title}Dependency on task %s was added{color_default} with hash %s") % (dep, b[dep])) if removed: for dep in sorted(removed): adep_found = False @@ -1013,11 +1013,11 @@ def compare_sigfiles(a, b, recursecb=None, color=False, collapsed=False): #output.append("Dependency on task %s was replaced by %s with same hash" % (adep, dep)) adep_found = True if not adep_found: - output.append(color_format("{color_title}Dependency on task %s was removed{color_default} with hash %s") % (clean_basepath(dep), a[dep])) + output.append(color_format("{color_title}Dependency on task %s was removed{color_default} with hash %s") % (dep, a[dep])) if changed: for dep in sorted(changed): if not collapsed: - output.append(color_format("{color_title}Hash for task dependency %s changed{color_default} from %s to %s") % (clean_basepath(dep), a[dep], b[dep])) + output.append(color_format("{color_title}Hash for task dependency %s changed{color_default} from %s to %s") % (dep, a[dep], b[dep])) if callable(recursecb): recout = recursecb(dep, a[dep], b[dep]) if recout: diff --git a/poky/bitbake/lib/bb/tests/fetch.py b/poky/bitbake/lib/bb/tests/fetch.py index 233ecae737..1152e89c0d 100644 --- a/poky/bitbake/lib/bb/tests/fetch.py +++ b/poky/bitbake/lib/bb/tests/fetch.py @@ -653,8 +653,10 @@ class CleanTarballTest(FetcherTest): archive = tarfile.open(os.path.join(self.dldir, self.recipe_tarball)) self.assertNotEqual(len(archive.members), 0) for member in archive.members: - self.assertEqual(member.uname, 'pokybuild') - self.assertEqual(member.gname, 'users') + self.assertEqual(member.uname, 'oe') + self.assertEqual(member.uid, 0) + self.assertEqual(member.gname, 'oe') + self.assertEqual(member.gid, 0) self.assertEqual(member.mtime, mtime) diff --git a/poky/bitbake/lib/pyinotify.py b/poky/bitbake/lib/pyinotify.py index 5c9b6d0fe2..3c5dab0312 100644 --- a/poky/bitbake/lib/pyinotify.py +++ b/poky/bitbake/lib/pyinotify.py @@ -595,24 +595,23 @@ class _ProcessEvent: @type event: Event object @return: By convention when used from the ProcessEvent class: - Returning False or None (default value) means keep on - executing next chained functors (see chain.py example). + executing next chained functors (see chain.py example). - Returning True instead means do not execute next processing functions. @rtype: bool @raise ProcessEventError: Event object undispatchable, unknown event. """ - stripped_mask = event.mask - (event.mask & IN_ISDIR) - # Bitbake hack - we see event masks of 0x6, IN_MODIFY & IN_ATTRIB + stripped_mask = event.mask & ~IN_ISDIR + # Bitbake hack - we see event masks of 0x6, i.e., IN_MODIFY & IN_ATTRIB. # The kernel inotify code can set more than one of the bits in the mask, # fsnotify_change() in linux/fsnotify.h is quite clear that IN_ATTRIB, # IN_MODIFY and IN_ACCESS can arrive together. # This breaks the code below which assume only one mask bit is ever - # set in an event. We don't care about attrib or access in bitbake so drop those - if (stripped_mask & IN_MODIFY) and (stripped_mask & IN_ATTRIB): - stripped_mask = stripped_mask - (stripped_mask & IN_ATTRIB) - if (stripped_mask & IN_MODIFY) and (stripped_mask & IN_ACCESS): - stripped_mask = stripped_mask - (stripped_mask & IN_ACCESS) + # set in an event. We don't care about attrib or access in bitbake so + # drop those. + if stripped_mask & IN_MODIFY: + stripped_mask &= ~(IN_ATTRIB | IN_ACCESS) maskname = EventsCodes.ALL_VALUES.get(stripped_mask) if maskname is None: diff --git a/poky/documentation/brief-yoctoprojectqs/index.rst b/poky/documentation/brief-yoctoprojectqs/index.rst index ad5d8a950c..12cab1db76 100644 --- a/poky/documentation/brief-yoctoprojectqs/index.rst +++ b/poky/documentation/brief-yoctoprojectqs/index.rst @@ -250,7 +250,7 @@ an entire Linux distribution, including the toolchain, from source. This is relevant only when your network and the server that you use can download these artifacts faster than you would be able to build them. - To use such mirrors, uncomment the below lines in your ``local.conf`` + To use such mirrors, uncomment the below lines in your ``conf/local.conf`` file in the :term:`Build Directory`:: BB_SIGNATURE_HANDLER = "OEEquivHash" diff --git a/poky/documentation/conf.py b/poky/documentation/conf.py index a5d7c0cd88..a7cdf415f8 100644 --- a/poky/documentation/conf.py +++ b/poky/documentation/conf.py @@ -90,7 +90,7 @@ rst_prolog = """ # external links and substitutions extlinks = { - 'cve': ('https://nvd.nist.gov/vuln/detail/CVE-%s', 'CVE-%s'), + 'cve': ('https://nvd.nist.gov/vuln/detail/CVE-%s', 'CVE-'), 'yocto_home': ('https://www.yoctoproject.org%s', None), 'yocto_wiki': ('https://wiki.yoctoproject.org/wiki%s', None), 'yocto_dl': ('https://downloads.yoctoproject.org%s', None), diff --git a/poky/documentation/dev-manual/common-tasks.rst b/poky/documentation/dev-manual/common-tasks.rst index 9d4aaa5a67..b228c75aab 100644 --- a/poky/documentation/dev-manual/common-tasks.rst +++ b/poky/documentation/dev-manual/common-tasks.rst @@ -10595,7 +10595,8 @@ Preparing Changes for Submission following these accepted conventions: - Be sure to include a "Signed-off-by:" line in the same style as - required by the Linux kernel. Adding this line signifies that you, + required by the Linux kernel. This can be done by using the + ``git commit -s`` command. Adding this line signifies that you, the submitter, have agreed to the Developer's Certificate of Origin 1.1 as follows: diff --git a/poky/documentation/migration-guides/index.rst b/poky/documentation/migration-guides/index.rst index d45ba31e7e..4597506d05 100644 --- a/poky/documentation/migration-guides/index.rst +++ b/poky/documentation/migration-guides/index.rst @@ -12,8 +12,8 @@ to move to one release of the Yocto Project from the previous one. .. toctree:: migration-general - migration-3.5 - migration-3.4 + release-4.0 + release-3.4 migration-3.3 migration-3.2 migration-3.1 diff --git a/poky/documentation/migration-guides/migration-3.4.rst b/poky/documentation/migration-guides/migration-3.4.rst index 139b2bf9c0..d57c955eb4 100644 --- a/poky/documentation/migration-guides/migration-3.4.rst +++ b/poky/documentation/migration-guides/migration-3.4.rst @@ -1,6 +1,3 @@ -Release 3.4 (honister) -====================== - Migration notes for 3.4 (honister) ---------------------------------- @@ -265,6 +262,12 @@ Miscellaneous built-in override support in the fetcher or overrides in general instead. -.. include:: release-notes-3.4.rst -.. include:: release-notes-3.4.1.rst -.. include:: release-notes-3.4.2.rst +- The ``-P`` (``--clear-password``) option can no longer be used with + ``useradd`` and ``usermod`` entries in :term:`EXTRA_USERS_PARAMS`. + It was being implemented using a custom patch to the ``shadow`` recipe + which clashed with a ``-P`` option that was added upstream in + ``shadow`` version 4.9, and in any case is fundamentally insecure. + Hardcoded passwords are still supported but they need to be hashed, see + examples in :term:`EXTRA_USERS_PARAMS`. + + diff --git a/poky/documentation/migration-guides/migration-3.5.rst b/poky/documentation/migration-guides/migration-3.5.rst deleted file mode 100644 index 8a4c568743..0000000000 --- a/poky/documentation/migration-guides/migration-3.5.rst +++ /dev/null @@ -1,170 +0,0 @@ -Release 3.5 (kirkstone) -======================= - -This section provides migration information for moving to the Yocto -Project 3.5 Release (codename "kirkstone") from the prior release. - -Recipe changes --------------- - -- To use more `inclusive language <https://inclusivenaming.org/>`__ - in the code and documentation, some variables have been renamed or even - deleted. BitBake will stop with an error when renamed or removed variables - still exist in your recipes or configuration. - - Please note that the change applies also to environmental variables, so - make sure you use a fresh environment for your build. - - The following variables have changed their names: - - - ``BB_ENV_WHITELIST`` became :term:`BB_ENV_PASSTHROUGH` - - ``BB_ENV_EXTRAWHITE`` became :term:`BB_ENV_PASSTHROUGH_ADDITIONS` - - ``BB_HASHBASE_WHITELIST`` became :term:`BB_BASEHASH_IGNORE_VARS` - - ``BB_HASHCONFIG_WHITELIST`` became :term:`BB_HASHCONFIG_IGNORE_VARS` - - ``BB_HASHTASK_WHITELIST`` became ``BB_TASKHASH_IGNORE_TASKS`` - - ``BB_SETSCENE_ENFORCE_WHITELIST`` became ``BB_SETSCENE_ENFORCE_IGNORE_TASKS`` - - ``CVE_CHECK_PN_WHITELIST`` became :term:`CVE_CHECK_SKIP_RECIPE` - - ``CVE_CHECK_WHITELIST`` became :term:`CVE_CHECK_IGNORE` - - ``ICECC_USER_CLASS_BL`` became :term:`ICECC_CLASS_DISABLE` - - ``ICECC_SYSTEM_CLASS_BL`` became :term:`ICECC_CLASS_DISABLE` - - ``ICECC_USER_PACKAGE_WL`` became :term:`ICECC_RECIPE_ENABLE` - - ``ICECC_USER_PACKAGE_BL`` became :term:`ICECC_RECIPE_DISABLE` - - ``ICECC_SYSTEM_PACKAGE_BL`` became :term:`ICECC_RECIPE_DISABLE` - - ``LICENSE_FLAGS_WHITELIST`` became :term:`LICENSE_FLAGS_ACCEPTED` - - ``MULTI_PROVIDER_WHITELIST`` became :term:`BB_MULTI_PROVIDER_ALLOWED` - - ``PNBLACKLIST`` became :term:`SKIP_RECIPE` - - ``SDK_LOCAL_CONF_BLACKLIST`` became :term:`ESDK_LOCALCONF_REMOVE` - - ``SDK_LOCAL_CONF_WHITELIST`` became :term:`ESDK_LOCALCONF_ALLOW` - - ``SDK_INHERIT_BLACKLIST`` became :term:`ESDK_CLASS_INHERIT_DISABLE` - - ``SSTATE_DUPWHITELIST`` became ``SSTATE_ALLOW_OVERLAP_FILES`` - - ``SYSROOT_DIRS_BLACKLIST`` became :term:`SYSROOT_DIRS_IGNORE` - - ``UNKNOWN_CONFIGURE_WHITELIST`` became :term:`UNKNOWN_CONFIGURE_OPT_IGNORE` - - In addition, ``BB_STAMP_WHITELIST``, ``BB_STAMP_POLICY``, ``INHERIT_BLACKLIST`` - and ``TUNEABI_WHITELIST`` have been removed. - - Many internal variable names have been also renamed accordingly. - - In addition, in the ``cve-check`` output, the CVE issue status ``Whitelisted`` - has been renamed to ``Ignored``. - - A :oe_git:`convert-variable-renames.py - </openembedded-core/tree/scripts/contrib/convert-variable-renames.py>` - script is provided to convert your recipes and configuration, - and also warns you about the use of problematic words. The script performs - changes and you need to review them before committing. An example warning - looks like:: - - poky/scripts/lib/devtool/upgrade.py needs further work at line 275 since it contains abort - -- Because of the uncertainty in future default branch names in git repositories, - it is now required to add a branch name to all URLs described - by ``git://`` and ``gitsm://`` :term:`SRC_URI` entries. For example:: - - SRC_URI = "git://git.denx.de/u-boot.git;branch=master" - - A :oe_git:`convert-srcuri </openembedded-core/tree/scripts/contrib/convert-srcuri.py>` - script to convert your recipes is available in :term:`OpenEmbedded-Core (OE-Core)` - and in :term:`Poky`. - -- Because of `GitHub dropping support for the git: - protocol <https://github.blog/2021-09-01-improving-git-protocol-security-github/>`__, - recipes now need to use ``;protocol=https`` at the end of GitHub - URLs. The same script as above can be used to convert the recipes. - -- Network access from tasks is now disabled by default on kernels which support - this feature (on most recent distros such as CentOS 8 and Debian 11 onwards). - This means that tasks accessing the network need to be marked as such with the ``network`` - flag. For example:: - - do_mytask[network] = "1" - - This is allowed by default from ``do_fetch`` but not from any of our other standard - tasks. Recipes shouldn't be accessing the network outside of ``do_fetch`` as it - usually undermines fetcher source mirroring, image and licence manifests, software - auditing and supply chain security. - -- The :term:`TOPDIR` variable and the current working directory are no longer modified - when parsing recipes. Any code depending on that behaviour will no longer work. - -- The ``append``, ``prepend`` and ``remove`` operators can now only be combined with - ``=`` and ``:=`` operators. To the exception of the ``append`` plus ``+=`` and - ``prepend`` plus ``=+`` combinations, all combinations could be factored up to the - ``append``, ``prepend`` or ``remove`` in the combination. This brought a lot of - confusion on how the override style syntax operators work and should be used. - Therefore, those combinations can simply be replaced by a single ``append``, - ``prepend`` or ``remove`` operator without any additional change. - For the ``append`` plus ``+=`` (and ``prepend`` plus ``=+``) combinations, - the content should be prefixed (respectively suffixed) by a space to maintain - the same behavior. You can learn more about override style syntax operators - (``append``, ``prepend`` and ``remove``) in the BitBake documentation: - :ref:`bitbake:bitbake-user-manual/bitbake-user-manual-metadata:appending and prepending (override style syntax)` - and :ref:`bitbake:bitbake-user-manual/bitbake-user-manual-metadata:removal (override style syntax)`. - -- :ref:`allarch <ref-classes-allarch>` packagegroups can no longer depend on packages - which use :term:`PKG` renaming such as :ref:`ref-classes-debian`. - -- :term:`LICENSE` definitions now have to use `SPDX identifiers <https://spdx.org/licenses/>`__. - A :oe_git:`convert-spdx-licenses.py </openembedded-core/tree/scripts/contrib/convert-spdx-licenses.py>` - script can be used to update your recipes. - -- :term:`SRC_URI`: a new :ref:`bitbake:bitbake-user-manual/bitbake-user-manual-fetching:crate fetcher (\`\`crate://\`\`)` - is available for Rust packages. - -Class changes -------------- - -- The ``distutils*.bbclasses`` have been moved to ``meta-python``. The classes and - `DISTUTILS*` variables have been removed from the documentation. - -- ``blacklist.bbclass`` is removed and the functionality moved to the - :ref:`base <ref-classes-base>` class with a more descriptive - ``varflag`` named :term:`SKIP_RECIPE` which will use the `SkipRecipe()` - function. The usage will remain the same:: - - SKIP_RECIPE[my-recipe] = "Reason for skipping recipe" - -- The Python package build process based on `wheels <https://pythonwheels.com/>`__. - Here are the new Python packaging classes that should be used: - :ref:`python-flit_core <ref-classes-python_flit_core>`, - :ref:`setuptools_python-build_meta <ref-classes-python_setuptools_build_meta>` - and :ref:`python_poetry_core <ref-classes-python_poetry_core>`. - -- ``image-prelink.bbclass`` class is removed. - -- New :ref:`overlayfs <ref-classes-overlayfs>` and - :ref:`overlayfs-etc <ref-classes-overlayfs-etc>` classes are available - to make it easier to overlay read-only filesystems (for example) - with `OverlayFS <https://en.wikipedia.org/wiki/OverlayFS>`__. - -Configuration changes ---------------------- - -- The Yocto Project now allows to reuse Shared State from its autobuilder. - If the network connection between our server and your machine is faster - than you would build recipes, you can try to speed up your builds - by using such Share State and Hash Equivalence by setting:: - - BB_SIGNATURE_HANDLER = "OEEquivHash" - BB_HASHSERVE = "auto" - BB_HASHSERVE_UPSTREAM = "typhoon.yocto.io:8687" - SSTATE_MIRRORS ?= "file://.* https://sstate.yoctoproject.org/&YOCTO_DOC_VERSION;/PATH;downloadfilename=PATH" - -Supported host distribution changes ------------------------------------ - -- New support for `AlmaLinux <https://en.wikipedia.org/wiki/AlmaLinux>`__ - hosts replacing `CentOS <https://en.wikipedia.org/wiki/CentOS>`__. - The following distribution versions were dropped: CentOS 8, Ubuntu 16.04 and Fedora 30, 31 and 32. - -Changes for release notes -------------------------- - -- Share State cache: now using `ZStandard (zstd) <https://en.wikipedia.org/wiki/Zstd>`__ - instead of Gzip compression, for better performance. - -- BitBake has an improved ``setscene`` task display. - -- This release fixes the reproducibility issues with ``rust-llvm`` and ``golang``. - Recipes in OpenEmbedded-Core are now fully reproducible. - diff --git a/poky/documentation/migration-guides/migration-4.0.rst b/poky/documentation/migration-guides/migration-4.0.rst new file mode 100644 index 0000000000..a8e6b4c331 --- /dev/null +++ b/poky/documentation/migration-guides/migration-4.0.rst @@ -0,0 +1,267 @@ +Release 4.0 (kirkstone) +======================= + +Migration notes for 4.0 (kirkstone) +----------------------------------- + +This section provides migration information for moving to the Yocto +Project 4.0 Release (codename "kirkstone") from the prior release. + +.. _migration-4.0-inclusive-language: + +Inclusive language improvements +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +To use more `inclusive language <https://inclusivenaming.org/>`__ +in the code and documentation, some variables have been renamed, and +some have been deleted where they are no longer needed. In many cases the +new names are also easier to understand. BitBake will stop with an error when +renamed or removed variables still exist in your recipes or configuration. + +Please note that the change applies also to environmental variables, so +make sure you use a fresh environment for your build. + +The following variables have changed their names: + +- ``BB_ENV_WHITELIST`` became :term:`BB_ENV_PASSTHROUGH` +- ``BB_ENV_EXTRAWHITE`` became :term:`BB_ENV_PASSTHROUGH_ADDITIONS` +- ``BB_HASHBASE_WHITELIST`` became :term:`BB_BASEHASH_IGNORE_VARS` +- ``BB_HASHCONFIG_WHITELIST`` became :term:`BB_HASHCONFIG_IGNORE_VARS` +- ``BB_HASHTASK_WHITELIST`` became ``BB_TASKHASH_IGNORE_TASKS`` +- ``BB_SETSCENE_ENFORCE_WHITELIST`` became ``BB_SETSCENE_ENFORCE_IGNORE_TASKS`` +- ``CVE_CHECK_PN_WHITELIST`` became :term:`CVE_CHECK_SKIP_RECIPE` +- ``CVE_CHECK_WHITELIST`` became :term:`CVE_CHECK_IGNORE` +- ``ICECC_USER_CLASS_BL`` became :term:`ICECC_CLASS_DISABLE` +- ``ICECC_SYSTEM_CLASS_BL`` became :term:`ICECC_CLASS_DISABLE` +- ``ICECC_USER_PACKAGE_WL`` became :term:`ICECC_RECIPE_ENABLE` +- ``ICECC_USER_PACKAGE_BL`` became :term:`ICECC_RECIPE_DISABLE` +- ``ICECC_SYSTEM_PACKAGE_BL`` became :term:`ICECC_RECIPE_DISABLE` +- ``LICENSE_FLAGS_WHITELIST`` became :term:`LICENSE_FLAGS_ACCEPTED` +- ``MULTI_PROVIDER_WHITELIST`` became :term:`BB_MULTI_PROVIDER_ALLOWED` +- ``PNBLACKLIST`` became :term:`SKIP_RECIPE` +- ``SDK_LOCAL_CONF_BLACKLIST`` became :term:`ESDK_LOCALCONF_REMOVE` +- ``SDK_LOCAL_CONF_WHITELIST`` became :term:`ESDK_LOCALCONF_ALLOW` +- ``SDK_INHERIT_BLACKLIST`` became :term:`ESDK_CLASS_INHERIT_DISABLE` +- ``SSTATE_DUPWHITELIST`` became ``SSTATE_ALLOW_OVERLAP_FILES`` +- ``SYSROOT_DIRS_BLACKLIST`` became :term:`SYSROOT_DIRS_IGNORE` +- ``UNKNOWN_CONFIGURE_WHITELIST`` became :term:`UNKNOWN_CONFIGURE_OPT_IGNORE` +- ``WHITELIST_<license>`` became ``INCOMPATIBLE_LICENSE_EXCEPTIONS`` + +In addition, ``BB_STAMP_WHITELIST``, ``BB_STAMP_POLICY``, ``INHERIT_BLACKLIST``, +``TUNEABI``, ``TUNEABI_WHITELIST``, and ``TUNEABI_OVERRIDE`` have been removed. + +Many internal variable names have been also renamed accordingly. + +In addition, in the ``cve-check`` output, the CVE issue status ``Whitelisted`` +has been renamed to ``Ignored``. + +The :term:`BB_DISKMON_DIRS` variable value now uses the term ``HALT`` +instead of ``ABORT``. + +A :oe_git:`convert-variable-renames.py +</openembedded-core/tree/scripts/contrib/convert-variable-renames.py>` +script is provided to convert your recipes and configuration, +and also warns you about the use of problematic words. The script performs +changes and you need to review them before committing. An example warning +looks like:: + + poky/scripts/lib/devtool/upgrade.py needs further work at line 275 since it contains abort + +Fetching changes +~~~~~~~~~~~~~~~~ + +- Because of the uncertainty in future default branch names in git repositories, + it is now required to add a branch name to all URLs described + by ``git://`` and ``gitsm://`` :term:`SRC_URI` entries. For example:: + + SRC_URI = "git://git.denx.de/u-boot.git;branch=master" + + A :oe_git:`convert-srcuri </openembedded-core/tree/scripts/contrib/convert-srcuri.py>` + script to convert your recipes is available in :term:`OpenEmbedded-Core (OE-Core)` + and in :term:`Poky`. + +- Because of `GitHub dropping support for the git: + protocol <https://github.blog/2021-09-01-improving-git-protocol-security-github/>`__, + recipes now need to use ``;protocol=https`` at the end of GitHub + URLs. The same ``convert-srcuri`` script mentioned above can be used to convert + your recipes. + +- Network access from tasks is now disabled by default on kernels which support + this feature (on most recent distros such as CentOS 8 and Debian 11 onwards). + This means that tasks accessing the network need to be marked as such with the ``network`` + flag. For example:: + + do_mytask[network] = "1" + + This is allowed by default from ``do_fetch`` but not from any of our other standard + tasks. Recipes shouldn't be accessing the network outside of ``do_fetch`` as it + usually undermines fetcher source mirroring, image and licence manifests, software + auditing and supply chain security. + +License changes +~~~~~~~~~~~~~~~ + +- The ambiguous "BSD" license has been removed from the ``common-licenses`` directory. + Each recipe that fetches or builds BSD-licensed code should specify the proper + version of the BSD license in its :term:`LICENSE` value. + +- :term:`LICENSE` variable values should now use `SPDX identifiers <https://spdx.org/licenses/>`__. + If they do not, by default a warning will be shown. A + :oe_git:`convert-spdx-licenses.py </openembedded-core/tree/scripts/contrib/convert-spdx-licenses.py>` + script can be used to update your recipes. + +- :term:`INCOMPATIBLE_LICENSE` should now use `SPDX identifiers <https://spdx.org/licenses/>`__. + Additionally, wildcarding is now limited to specifically supported values - + see the :term:`INCOMPATIBLE_LICENSE` documentation for further information. + +- The ``AVAILABLE_LICENSES`` variable has been removed. This variable was a performance + liability and is highly dependent on which layers are added to the configuration, + which can cause signature issues for users. In addition the ``available_licenses()`` + function has been removed from the :ref:`license <ref-classes-license>` class as + it is no longer needed. + +Removed recipes +~~~~~~~~~~~~~~~ + +The following recipes have been removed in this release: + +- ``dbus-test``: merged into main dbus recipe +- ``libid3tag``: moved to meta-oe - no longer needed by anything in OE-Core +- ``libportal``: moved to meta-gnome - no longer needed by anything in OE-Core +- ``linux-yocto``: removed version 5.14 recipes (5.15 and 5.10 still provided) +- ``python3-nose``: has not changed since 2016 upstream, and no longer needed by anything in OE-Core +- ``rustfmt``: not especially useful as a standalone recipe + +Python changes +~~~~~~~~~~~~~~ + +- ``distutils`` has been deprecated upstream in Python 3.10 and thus the ``distutils*`` + classes have been moved to ``meta-python``. Recipes that inherit the ``distutils*`` + classes should be updated to inherit ``setuptools*`` equivalents instead. + +- The Python package build process is now based on `wheels <https://pythonwheels.com/>`__. + Here are the new Python packaging classes that should be used: + :ref:`python_flit_core <ref-classes-python_flit_core>`, + :ref:`python_setuptools_build_meta <ref-classes-python_setuptools_build_meta>` + and :ref:`python_poetry_core <ref-classes-python_poetry_core>`. + +- The :ref:`setuptools3 <ref-classes-setuptools3>` class ``do_install()`` task now + installs the ``wheel`` binary archive. In current versions of ``setuptools`` the + legacy ``setup.py install`` method is deprecated. If the ``setup.py`` cannot be used + with wheels, for example it creates files outside of the Python module or standard + entry points, then :ref:`setuptools3_legacy <ref-classes-setuptools3_legacy>` should + be used instead. + +Prelink removed +~~~~~~~~~~~~~~~ + +Prelink has been dropped by ``glibc`` upstream in 2.36. It already caused issues with +binary corruption, has a number of open bugs and is of questionable benefit +without disabling load address randomization and PIE executables. + +We disabled prelinking by default in the honister (3.4) release, but left it able +to be enabled if desired. However, without glibc support it cannot be maintained +any further, so all of the prelinking functionality has been removed in this release. +If you were enabling the ``image-prelink`` class in :term:`INHERIT`, :term:`IMAGE_CLASSES`, +:term:`USER_CLASSES` etc in your configuration, then you will need to remove the +reference(s). + +Reproducible as standard +~~~~~~~~~~~~~~~~~~~~~~~~ + +Reproducibility is now considered as standard functionality, thus the +``reproducible`` class has been removed and its previous contents merged into the +:ref:`base <ref-classes-base>` class. If you have references in your configuration to +``reproducible`` in :term:`INHERIT`, :term:`USER_CLASSES` etc. then they should be +removed. + +Additionally, the ``BUILD_REPRODUCIBLE_BINARIES`` variable is no longer used. +Specifically for the kernel, if you wish to enable build timestamping functionality +that is normally disabled for reproducibility reasons, you can do so by setting +a new :term:`KERNEL_DEBUG_TIMESTAMPS` variable to "1". + +Supported host distribution changes +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +- Support for `AlmaLinux <https://en.wikipedia.org/wiki/AlmaLinux>`__ + hosts replacing `CentOS <https://en.wikipedia.org/wiki/CentOS>`__. + The following distribution versions were dropped: CentOS 8, Ubuntu 16.04 and Fedora 30, 31 and 32. + +- ``gcc`` version 7.5 is now required at minimum on the build host. For older + host distributions where this is not available, you can use the + ``buildtools-extended-tarball`` (easily installable using + ``scripts/install-buildtools``). + +:append/:prepend in combination with other operators +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The ``append``, ``prepend`` and ``remove`` operators can now only be combined with +``=`` and ``:=`` operators. To the exception of the ``append`` plus ``+=`` and +``prepend`` plus ``=+`` combinations, all combinations could be factored up to the +``append``, ``prepend`` or ``remove`` in the combination. This brought a lot of +confusion on how the override style syntax operators work and should be used. +Therefore, those combinations should be replaced by a single ``append``, +``prepend`` or ``remove`` operator without any additional change. +For the ``append`` plus ``+=`` (and ``prepend`` plus ``=+``) combinations, +the content should be prefixed (respectively suffixed) by a space to maintain +the same behavior. You can learn more about override style syntax operators +(``append``, ``prepend`` and ``remove``) in the BitBake documentation: +:ref:`bitbake:bitbake-user-manual/bitbake-user-manual-metadata:appending and prepending (override style syntax)` +and :ref:`bitbake:bitbake-user-manual/bitbake-user-manual-metadata:removal (override style syntax)`. + +Miscellaneous changes +~~~~~~~~~~~~~~~~~~~~~ + +- ``blacklist.bbclass`` is removed and the functionality moved to the + :ref:`base <ref-classes-base>` class with a more descriptive + ``varflag`` variable named :term:`SKIP_RECIPE` which will use the `bb.parse.SkipRecipe()` + function. The usage remains the same, for example:: + + SKIP_RECIPE[my-recipe] = "Reason for skipping recipe" + +- :ref:`allarch <ref-classes-allarch>` packagegroups can no longer depend on packages + which use :term:`PKG` renaming such as :ref:`ref-classes-debian`. Such packagegroups + recipes should be changed to avoid inheriting :ref:`allarch <ref-classes-allarch>`. + +- The ``lnr`` script has been removed. ``lnr`` implemented the same behaviour as `ln --relative --symbolic`, + since at the time of creation `--relative` was only available in coreutils 8.16 + onwards which was too new for the older supported distros. Current supported host + distros have a new enough version of coreutils, so it is no longer needed. If you have + any calls to ``lnr`` in your recipes or classes, they should be replaced with + `ln --relative --symbolic` or `ln -rs` if you prefer the short version. + +- The ``package_qa_handle_error()`` function formerly in the :ref:`insane <ref-classes-insane>` + class has been moved and renamed - if you have any references in your own custom + classes they should be changed to ``oe.qa.handle_error()``. + +- When building ``perl``, Berkeley db support is no longer enabled by default, since + Berkeley db is largely obsolete. If you wish to reenable it, you can append ``bdb`` + to :term:`PACKAGECONFIG` in a ``perl`` bbappend or ``PACKAGECONFIG:pn-perl`` at + the configuration level. + +- For the ``xserver-xorg`` recipe, the ``xshmfence``, ``xmlto`` and ``systemd`` options + previously supported in :term:`PACKAGECONFIG` have been removed, as they are no + longer supported since the move from building it with autotools to meson in this release. + +- For the ``libsdl2`` recipe, various X11 features are now disabled by default (primarily + for reproducibility purposes in the native case) with options in :term:`EXTRA_OECMAKE` + within the recipe. These can be changed within a bbappend if desired. See the + ``libsdl2`` recipe for more details. + +- The ``cortexa72-crc`` and ``cortexa72-crc-crypto`` tunes have been removed since + the crc extension is now enabled by default for cortexa72. Replace any references to + these with ``cortexa72`` and ``cortexa72-crypto`` respectively. + +- The Python development shell (previously known as ``devpyshell``) feature has been + renamed to ``pydevshell``. To start it you should now run:: + + bitbake <target> -c pydevshell + +- The ``packagegroups-core-full-cmdline-libs`` packagegroup is no longer produced, as + libraries should normally be brought in via dependencies. If you have any references + to this then remove them. + +- The :term:`TOPDIR` variable and the current working directory are no longer modified + when parsing recipes. Any code depending on the previous behaviour will no longer + work - change any such code to explicitly use appropriate path variables instead. + diff --git a/poky/documentation/migration-guides/release-3.4.rst b/poky/documentation/migration-guides/release-3.4.rst new file mode 100644 index 0000000000..81476c4adb --- /dev/null +++ b/poky/documentation/migration-guides/release-3.4.rst @@ -0,0 +1,10 @@ +Release 3.4 (honister) +====================== + +.. toctree:: + + migration-3.4 + release-notes-3.4 + release-notes-3.4.1 + release-notes-3.4.2 + diff --git a/poky/documentation/migration-guides/release-4.0.rst b/poky/documentation/migration-guides/release-4.0.rst new file mode 100644 index 0000000000..7062f9d241 --- /dev/null +++ b/poky/documentation/migration-guides/release-4.0.rst @@ -0,0 +1,7 @@ +Release 4.0 (kirkstone) +======================= + +.. toctree:: + + migration-4.0 + release-notes-4.0 diff --git a/poky/documentation/migration-guides/release-notes-4.0.rst b/poky/documentation/migration-guides/release-notes-4.0.rst new file mode 100644 index 0000000000..eaa40f9317 --- /dev/null +++ b/poky/documentation/migration-guides/release-notes-4.0.rst @@ -0,0 +1,933 @@ +Release notes for 4.0 (kirkstone) +--------------------------------- + +This is a Long Term Support release, published in April 2022, and supported at least for two years (April 2024). + +New Features / Enhancements in 4.0 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +- Linux kernel 5.15, glibc 2.35 and ~300 other recipe upgrades + +- Reproducibility: this release fixes the reproducibility issues with ``rust-llvm`` and + ``golang``. Recipes in OpenEmbedded-Core are now fully reproducible. Functionality + previously in the optional "reproducible" class has been merged into the base class. + +- Network access is now disabled by default for tasks other than where it is expected to ensure build integrity (where host kernel supports it) + +- The Yocto Project now allows you to reuse the Shared State cache from + its autobuilder. If the network connection between our server and your + machine is faster than you would build recipes from source, you can + try to speed up your builds by using such Shared State and Hash + Equivalence by setting:: + + BB_SIGNATURE_HANDLER = "OEEquivHash" + BB_HASHSERVE = "auto" + BB_HASHSERVE_UPSTREAM = "typhoon.yocto.io:8687" + SSTATE_MIRRORS ?= "file://.* https://sstate.yoctoproject.org/&YOCTO_DOC_VERSION;/PATH;downloadfilename=PATH" + +- The Python package build process is now based on `wheels <https://pythonwheels.com/>`__ + in line with the upstream direction. + +- New :ref:`overlayfs <ref-classes-overlayfs>` and + :ref:`overlayfs-etc <ref-classes-overlayfs-etc>` classes and + ``overlayroot`` support in the initramfs framework to make it easier to + overlay read-only filesystems (for example) with + `OverlayFS <https://en.wikipedia.org/wiki/OverlayFS>`__. + +- Inclusive language adjustments to some variable names - see the + :ref:`4.0 migration guide <migration-4.0-inclusive-language>` for details. + +- New recipes: + + - ``buildtools-docs-tarball`` + - ``libptytty`` + - ``libxcvt`` + - ``lua`` + - ``nghttp2`` + - ``python3-alabaster`` + - ``python3-asn1crypto`` + - ``python3-babel`` + - ``python3-bcrypt`` + - ``python3-certifi`` + - ``python3-cffi`` + - ``python3-chardet`` + - ``python3-cryptography`` + - ``python3-cryptography-vectors`` + - ``python3-dtschema`` + - ``python3-flit-core`` + - ``python3-idna`` + - ``python3-imagesize`` + - ``python3-installer`` + - ``python3-iso8601`` + - ``python3-jsonpointer`` + - ``python3-jsonschema`` + - ``python3-ndg-httpsclient`` + - ``python3-ply`` + - ``python3-poetry-core`` + - ``python3-pretend`` + - ``python3-psutil`` + - ``python3-pyasn1`` + - ``python3-pycparser`` + - ``python3-pyopenssl`` + - ``python3-pyrsistent`` + - ``python3-pysocks`` + - ``python3-pytest-runner`` + - ``python3-pytest-subtests`` + - ``python3-pytz`` + - ``python3-requests`` + - ``python3-rfc3339-validator`` + - ``python3-rfc3986-validator`` + - ``python3-rfc3987`` + - ``python3-ruamel-yaml`` + - ``python3-semantic-version`` + - ``python3-setuptools-rust-native`` + - ``python3-snowballstemmer`` + - ``python3-sphinx`` + - ``python3-sphinxcontrib-applehelp`` + - ``python3-sphinxcontrib-devhelp`` + - ``python3-sphinxcontrib-htmlhelp`` + - ``python3-sphinxcontrib-jsmath`` + - ``python3-sphinxcontrib-qthelp`` + - ``python3-sphinxcontrib-serializinghtml`` + - ``python3-sphinx-rtd-theme`` + - ``python3-strict-rfc3339`` + - ``python3-tomli`` + - ``python3-typing-extensions`` + - ``python3-urllib3`` + - ``python3-vcversioner`` + - ``python3-webcolors`` + - ``python3-wheel`` + - ``repo`` + - ``seatd`` + +- Extended recipes to ``native``: ``wayland``, ``wayland-protocols`` + +- Shared state (sstate) improvements: + + - Switched to `ZStandard (zstd) <https://en.wikipedia.org/wiki/Zstd>`__ instead + of Gzip, for better performance. + - Allow validation of sstate signatures against a list of keys + - Improved error messages and exception handling + +- BitBake enhancements: + + - Fetcher enhancements: + + - New :ref:`bitbake:bitbake-user-manual/bitbake-user-manual-fetching:crate fetcher (\`\`crate://\`\`)` for Rust packages + - Added striplevel support to unpack + - git: Add a warning asking users to set a branch in git urls + - git: Allow git fetcher to support subdir param + - git: canonicalize ids in generated tarballs + - git: stop generated tarballs from leaking info + - npm: Put all downloaded files in the npm2 directory + - npmsw: Add support for duplicate dependencies without url + - npmsw: Add support for github prefix in npm shrinkwrap version + - ssh: now supports checkstatus, allows : in URLs (both required for use with sstate) and no longer requires username + - wget: add redirectauth parameter + - wget: add 30s timeout for checkstatus calls + + - Show warnings for append/prepend/remove operators combined with +=/.= + - Add bb.warnonce() and bb.erroronce() log methods + - Improved setscene task display + - Show elapsed time also for tasks with progress bars + - Improved cleanup on forced shutdown (either because of errors or Ctrl+C) + - contrib: Add Dockerfile for building PR service container + - Change file format of siginfo files to use zstd compressed json + - Display active tasks when printing keep-alive message to help debugging + +- Architecture-specific enhancements: + + - ARM: + + - tune-cortexa72: Enable the crc extension by default for cortexa72 + - qemuarm64: Add tiny ktype to qemuarm64 bsp + - armv9a/tune: Add the support for the Neoverse N2 core + - arch-armv8-5a.inc: Add tune include for armv8.5a + - grub-efi: Add xen_boot support when 'xen' is in DISTRO_FEATURES for aarch64 + - tune-cortexa73: Introduce cortexa73-crypto tune + - libacpi: Build libacpi also for 'aarch64' machines + - core-image-tiny-initramfs: Mark recipe as 32 bit ARM compatible + + - PowerPC: + + - weston-init: Use pixman rendering for qemuppc64 + - rust: add support for big endian 64-bit PowerPC + - rust: Add snapshot checksums for powerpc64le + + - RISC-V: + + - libunwind: Enable for rv64 + - systemtap: Enable for riscv64 + - linux-yocto-dev: add qemuriscv32 + - packagegroup-core-tools-profile: Enable systemtap for riscv64 + - qemuriscv: Use virtio-tablet-pci for mouse + + - x86: + + - kernel-yocto: conditionally enable stack protection checking on x86-64 + +- Kernel-related enhancements: + + - Allow initramfs to be built from a separate multiconfig + - Make kernel-base recommend kernel-image, not depend (allowing images containing kernel modules without kernel image) + - linux-yocto: split vtpm for more granular inclusion + - linux-yocto: cfg/debug: add configs for kcsan + - linux-yocto: cfg: add kcov feature fragment + - linux-yocto: export pkgconfig variables to devshell + - linux-yocto-dev: use versioned branch as default + - New ``KERNEL_DEBUG_TIMESTAMPS`` variable (to replace removed ``BUILD_REPRODUCIBLE_BINARIES`` for the kernel) + - Introduce python3-dtschema-wrapper in preparation for mandatory schema checking on dtb files in 5.16 + - Allow disabling kernel artifact symlink creation + - Allow changing default .bin kernel artifact extension + +- FIT image related enhancements: + + - New ``FIT_SUPPORTED_INITRAMFS_FSTYPES`` variable to allow extending initramfs image types to look for + - New ``FIT_CONF_PREFIX`` variable to allow overriding FIT configuration prefix + - Use 'bbnote' for better logging + +- New :term:`PACKAGECONFIG` options in ``curl``, ``dtc``, ``epiphany``, ``git``, ``git``, ``gstreamer1.0-plugins-bad``, ``linux-yocto-dev``, ``kmod``, ``mesa``, ``piglit``, ``qemu``, ``rpm``, ``systemd``, ``webkitgtk``, ``weston-init`` +- ptest enhancements in ``findutils``, ``lttng-tools``, ``openssl``, ``gawk``, ``strace``, ``lttng-tools``, ``valgrind``, ``perl``, ``libxml-parser-perl``, ``openssh``, ``python3-cryptography``, ``popt`` + +- Sysroot dependencies have been further optimised +- Significant effort to upstream / rationalise patches across a variety of recipes +- Allow the creation of block devices on top of UBI volumes +- archiver: new ARCHIVER_MODE[compression] to set tarball compression, and switch default to xz +- yocto-check-layer: add ability to perform tests from a global bbclass +- yocto-check-layer: improved README checks +- cve-check: add json output format +- cve-check: add coverage statistics on recipes with/without CVEs +- Added mirrors for kernel sources and uninative binaries on kernel.org +- glibc and binutils recipes now use shallow mirror tarballs for faster fetching +- When patching fails, show more information on the fatal error + +- wic Image Creator enhancements: + + - Support rootdev identified by partition label + - rawcopy: Add support for packed images + - partition: Support valueless keys in sourceparams + +- QA check enhancements: + + - Allow treating license issues as errors + - Added a check that Upstream-Status patch tag is present and correctly formed + - Added a check for directories that are expected to be empty + - Ensure addition of patch-fuzz retriggers do_qa_patch + - Added a sanity check for allarch packagegroups + +- create-spdx class improvements: + + - Get SPDX-License-Identifier from source files + - Generate manifest also for SDKs + - New SPDX_ORG variable to allow changing the Organization field value + - Added packageSupplier field + - Added create_annotation function + +- devtool add / recipetool create enhancements: + + - Extend curl detection when creating recipes + - Handle GitLab URLs like we do GitHub + - Recognize more standard license text variants + - Separate licenses with & operator + - Detect more known licenses in Python code + - Move license md5sums data into CSV files + - npm: Use README as license fallback + +- SDK-related enhancements: + + - Extended recipes to ``nativesdk``: ``cargo``, ``librsvg``, ``libstd-rs``, ``libva``, ``python3-docutil``, ``python3-packaging`` + - Enabled nativesdk recipes to find a correct version of the rust cross compiler + - Support creating per-toolchain cmake file in SDK + +- Rust enhancements: + + - New python_setuptools3_rust class to enable building python extensions in Rust + - classes/meson: Add optional rust definitions + +- QEMU / runqemu enhancements: + + - qemu: Add knob for enabling PMDK pmem support + - qemu: add tpm string section to qemu acpi table + - qemu: Build on musl targets + - runqemu: support rootfs mounted ro + - runqemu: add :term:`DEPLOY_DIR_IMAGE` replacement in QB_OPT_APPEND + - runqemu: Allow auto-detection of the correct graphics options + +- Capped ``cpu_count()`` (used to set parallelisation defaults) to 64 since any higher usually hurts parallelisation +- Adjust some GL-using recipes so that they only require virtual/egl +- package_rpm: use zstd instead of xz +- npm: new ``EXTRA_OENPM`` variable (to set node-gyp variables for example) +- npm: new ``NPM_NODEDIR`` variable +- perl: Enable threading +- u-boot: Convert ${UBOOT_ENV}.cmd into ${UBOOT_ENV}.scr +- u-boot: Split do_configure logic into separate file +- go.bbclass: Allow adding parameters to go ldflags +- go: log build id computations +- scons: support out-of-tree builds +- scripts: Add a conversion script to use SPDX license names +- scripts: Add convert-variable-renames script for inclusive language variable renaming +- binutils-cross-canadian: enable gold for mingw +- grub-efi: Add option to include all available modules +- bitbake.conf: allow wayland distro feature through for native/SDK builds +- weston-init: Pass --continue-without-input when launching weston +- weston: wrapper for weston modules argument +- weston: Add a knob to control simple clients +- uninative: Add version to uninative tarball name +- volatile-binds: SELinux and overlayfs extensions in mount-copybind +- gtk-icon-cache: Allow using gtk4 +- kmod: Add an exclude directive to depmod +- os-release: add os-release-initrd package for use in systemd-based initramfs images +- gstreamer1.0-plugins-base: add support for graphene +- gpg-sign: Add parameters to gpg signature function +- package_manager: sign DEB package feeds +- zstd: add libzstd package +- libical: build gobject and vala introspection +- dhcpcd: add option to set DBDIR location +- rpcbind: install rpcbind.conf +- mdadm: install mdcheck +- boost: add json lib +- libxkbcommon: allow building of API documentation +- libxkbcommon: split libraries and xkbcli into separate packages +- systemd: move systemd shared library into its own package +- systemd: Minimize udev package size if DISTRO_FEATURES doen't contain sysvinit + +Known Issues in 4.0 +~~~~~~~~~~~~~~~~~~~ + +- ``make`` version 4.2.1 is known to be buggy on non-Ubuntu systems. If this ``make`` + version is detected on host distributions other than Ubuntu at build start time, + then a warning will be displayed. + +Recipe License changes in 4.0 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The following corrections have been made to the LICENSE values set by recipes: + +* cmake: add BSD-1-Clause & MIT & BSD-2-Clause to LICENSE due to additional vendored libraries in native/target context +* gettext: extend LICENSE conditional upon PACKAGECONFIG (due to vendored libraries) +* gstreamer1.0: update licenses of all modules to LGPL-2.1-or-later (with some exceptions that are GPL-2.0-or-later) +* gstreamer1.0-plugins-bad/ugly: use the GPL-2.0-or-later only when it is in use +* kern-tools-native: add missing MIT license due to Kconfiglib +* libcap: add pam_cap license to LIC_FILES_CHKSUM if pam is enabled +* libidn2: add Unicode-DFS-2016 license +* libsdl2: add BSD-2-Clause to LICENSE due to default yuv2rgb and hidapi inclusion +* libx11-compose-data: update LICENSE to "MIT & MIT-style & BSD-1-Clause & HPND & HPND-sell-variant" to better reflect reality +* libx11: update LICENSE to "MIT & MIT-style & BSD-1-Clause & HPND & HPND-sell-variant" to better reflect reality +* libxshmfence: correct LICENSE - MIT -> HPND +* newlib: add BSD-3-Clause to LICENSE +* python3-idna: correct LICENSE - Unicode -> Unicode-TOU +* python3-pip: add "Apache-2.0 & MPL-2.0 & LGPL-2.1-only & BSD-3-Clause & PSF-2.0 & BSD-2-Clause" to LICENSE due to vendored libraries + +Other license-related notes: + +- The ambiguous "BSD" license has been removed from the ``common-licenses`` directory. + Each recipe that fetches or builds BSD-licensed code should specify the proper + version of the BSD license in its :term:`LICENSE` value. + +- :term:`LICENSE` definitions now have to use `SPDX identifiers <https://spdx.org/licenses/>`__. + A :oe_git:`convert-spdx-licenses.py </openembedded-core/tree/scripts/contrib/convert-spdx-licenses.py>` + script can be used to update your recipes. + + + +Security Fixes in 4.0 +~~~~~~~~~~~~~~~~~~~~~ + +- binutils: :cve:`2021-42574`, :cve:`2021-45078` +- curl: :cve:`2021-22945`, :cve:`2021-22946`, :cve:`2021-22947` +- epiphany: :cve:`2021-45085`, :cve:`2021-45086`, :cve:`2021-45087`, :cve:`2021-45088` +- expat: :cve:`2021-45960`, :cve:`2021-46143`, :cve:`2022-22822`, :cve:`2022-22823`, :cve:`2022-22824`, :cve:`2022-22825`, :cve:`2022-22826`, :cve:`2022-22827`, :cve:`2022-23852`, :cve:`2022-23990`, :cve:`2022-25235`, :cve:`2022-25236`, :cve:`2022-25313`, :cve:`2022-25314`, :cve:`2022-25315` +- ffmpeg: :cve:`2021-38114` +- gcc: :cve:`2021-35465`, :cve:`2021-42574`, :cve:`2021-46195`, :cve:`2022-24765` +- glibc: :cve:`2021-3998`, :cve:`2021-3999`, :cve:`2021-43396`, :cve:`2022-23218`, :cve:`2022-23219` +- gmp: :cve:`2021-43618` +- go: :cve:`2021-41771` and :cve:`2021-41772` +- grub2: :cve:`2021-3981` +- gzip: :cve:`2022-1271` +- libarchive : :cve:`2021-31566`, :cve:`2021-36976` +- libxml2: :cve:`2022-23308` +- libxslt: :cve:`2021-30560` +- lighttpd: :cve:`2022-22707` +- linux-yocto/5.10: amdgpu: :cve:`2021-42327` +- lua: :cve:`2021-43396` +- openssl: :cve:`2021-4044`, :cve:`2022-0778` +- qemu: :cve:`2022-1050`, :cve:`2022-26353`, :cve:`2022-26354` +- rpm: :cve:`2021-3521` +- seatd: :cve:`2022-25643` +- speex: :cve:`2020-23903` +- squashfs-tools: :cve:`2021-41072` +- systemd: :cve:`2021-4034` +- tiff: :cve:`2022-0561`, :cve:`2022-0562`, :cve:`2022-0865`, :cve:`2022-0891`, :cve:`2022-0907`, :cve:`2022-0908`, :cve:`2022-0909`, :cve:`2022-0924`, :cve:`2022-1056`, :cve:`2022-22844` +- unzip: :cve:`2021-4217` +- vim: :cve:`2021-3796`, :cve:`2021-3872`, :cve:`2021-3875`, :cve:`2021-3927`, :cve:`2021-3928`, :cve:`2021-3968`, :cve:`2021-3973`, :cve:`2021-4187`, :cve:`2022-0128`, :cve:`2022-0156`, :cve:`2022-0158`, :cve:`2022-0261`, :cve:`2022-0318`, :cve:`2022-0319`, :cve:`2022-0554`, :cve:`2022-0696`, :cve:`2022-0714`, :cve:`2022-0729`, :cve:`2022-0943` +- virglrenderer: :cve:`2022-0135`, :cve:`2022-0175` +- webkitgtk: :cve:`2022-22589`, :cve:`2022-22590`, :cve:`2022-22592` +- xz: :cve:`2022-1271` +- zlib: :cve:`2018-25032` + + + +Recipe Upgrades in 4.0 +~~~~~~~~~~~~~~~~~~~~~~ + +- acpica: upgrade 20210730 -> 20211217 +- acpid: upgrade 2.0.32 -> 2.0.33 +- adwaita-icon-theme: update 3.34/38 -> 41.0 +- alsa-ucm-conf: upgrade 1.2.6.2 -> 1.2.6.3 +- alsa: upgrade 1.2.5 -> 1.2.6 +- apt: upgrade 2.2.4 -> 2.4.3 +- asciidoc: upgrade 9.1.0 -> 10.0.0 +- atk: upgrade 2.36.0 -> 2.38.0 +- at-spi2-core: upgrade 2.40.3 -> 2.42.0 +- at: update 3.2.2 -> 3.2.5 +- autoconf-archive: upgrade 2021.02.19 -> 2022.02.11 +- automake: update 1.16.3 -> 1.16.5 +- bash: upgrade 5.1.8 -> 5.1.16 +- bind: upgrade 9.16.20 -> 9.18.1 +- binutils: Bump to latest 2.38 release branch +- bison: upgrade 3.7.6 -> 3.8.2 +- bluez5: upgrade 5.61 -> 5.64 +- boost: update 1.77.0 -> 1.78.0 +- btrfs-tools: upgrade 5.13.1 -> 5.16.2 +- buildtools-installer: Update to use 3.4 +- busybox: 1.34.0 -> 1.35.0 +- ca-certificates: update 20210119 -> 20211016 +- cantarell-fonts: update 0.301 -> 0.303.1 +- ccache: upgrade 4.4 -> 4.6 +- cmake: update 3.21.1 -> 3.22.3 +- connman: update 1.40 -> 1.41 +- coreutils: update 8.32 -> 9.0 +- cracklib: update 2.9.5 -> 2.9.7 +- createrepo-c: upgrade 0.17.4 -> 0.19.0 +- cronie: upgrade 1.5.7 -> 1.6.0 +- cups: update 2.3.3op2 -> 2.4.1 +- curl: update 7.78.0 -> 7.82.0 +- dbus: upgrade 1.12.20 -> 1.14.0 +- debianutils: update 4.11.2 -> 5.7 +- dhcpcd: upgrade 9.4.0 -> 9.4.1 +- diffoscope: upgrade 181 -> 208 +- dnf: upgrade 4.8.0 -> 4.11.1 +- dpkg: update 1.20.9 -> 1.21.4 +- e2fsprogs: upgrade 1.46.4 -> 1.46.5 +- ed: upgrade 1.17 -> 1.18 +- efivar: update 37 -> 38 +- elfutils: update 0.185 -> 0.186 +- ell: upgrade 0.43 -> 0.49 +- enchant2: upgrade 2.3.1 -> 2.3.2 +- epiphany: update 40.3 -> 42.0 +- erofs-utils: update 1.3 -> 1.4 +- ethtool: update to 5.16 +- expat: upgrade 2.4.1 -> 2.4.7 +- ffmpeg: update 4.4 -> 5.0 +- file: upgrade 5.40 -> 5.41 +- findutils: upgrade 4.8.0 -> 4.9.0 +- flac: upgrade 1.3.3 -> 1.3.4 +- freetype: upgrade 2.11.0 -> 2.11.1 +- fribidi: upgrade 1.0.10 -> 1.0.11 +- gawk: update 5.1.0 -> 5.1.1 +- gcompat: Update to latest +- gdbm: upgrade 1.19 -> 1.23 +- gdb: Upgrade to 11.2 +- ghostscript: update 9.54.0 -> 9.55.0 +- gi-docgen: upgrade 2021.7 -> 2022.1 +- git: update 2.33.0 -> 2.35.2 +- glib-2.0: update 2.68.4 -> 2.72.0 +- glibc: Upgrade to 2.35 +- glib-networking: update 2.68.2 -> 2.72.0 +- glslang: update 11.5.0 -> 11.8.0 +- gnu-config: update to latest revision +- gnupg: update 2.3.1 -> 2.3.4 +- gnutls: update 3.7.2 -> 3.7.4 +- gobject-introspection: upgrade 1.68.0 -> 1.72.0 +- go-helloworld: update to latest revision +- go: update 1.16.7 -> 1.17.8 +- gpgme: upgrade 1.16.0 -> 1.17.1 +- gsettings-desktop-schemas: upgrade 40.0 -> 42.0 +- gst-devtools: 1.18.4 -> 1.20.1 +- gst-examples: 1.18.4 -> 1.18.6 +- gstreamer1.0: 1.18.4 -> 1.20.1 +- gstreamer1.0-libav: 1.18.4 -> 1.20.1 +- gstreamer1.0-omx: 1.18.4 -> 1.20.1 +- gstreamer1.0-plugins-bad: 1.18.4 1.20.1 +- gstreamer1.0-plugins-base: 1.18.4 -> 1.20.1 +- gstreamer1.0-plugins-good: 1.18.4 -> 1.20.1 +- gstreamer1.0-plugins-ugly: 1.18.4 -> 1.20.1 +- gstreamer1.0-python: 1.18.4 -> 1.20.1 +- gstreamer1.0-rtsp-server: 1.18.4 -> 1.20.1 +- gstreamer1.0-vaapi: 1.18.4 -> 1.20.1 +- gtk+3: upgrade 3.24.30 -> 3.24.33 +- gzip: upgrade 1.10 -> 1.12 +- harfbuzz: upgrade 2.9.0 -> 4.0.1 +- hdparm: upgrade 9.62 -> 9.63 +- help2man: upgrade 1.48.4 -> 1.49.1 +- icu: update 69.1 -> 70.1 +- ifupdown: upgrade 0.8.36 -> 0.8.37 +- inetutils: update 2.1 -> 2.2 +- init-system-helpers: upgrade 1.60 -> 1.62 +- iproute2: update to 5.17.0 +- iputils: update 20210722 to 20211215 +- iso-codes: upgrade 4.6.0 -> 4.9.0 +- itstool: update 2.0.6 -> 2.0.7 +- iw: upgrade 5.9 -> 5.16 +- json-glib: upgrade 1.6.4 -> 1.6.6 +- kea: update 1.8.2 -> 2.0.2 +- kexec-tools: update 2.0.22 -> 2.0.23 +- less: upgrade 590 -> 600 +- libarchive: upgrade 3.5.1 -> 3.6.1 +- libatomic-ops: upgrade 7.6.10 -> 7.6.12 +- libbsd: upgrade 0.11.3 -> 0.11.5 +- libcap: update 2.51 -> 2.63 +- libcgroup: upgrade 2.0 -> 2.0.1 +- libcomps: upgrade 0.1.17 -> 0.1.18 +- libconvert-asn1-perl: upgrade 0.31 -> 0.33 +- libdazzle: upgrade 3.40.0 -> 3.44.0 +- libdnf: update 0.63.1 -> 0.66.0 +- libdrm: upgrade 2.4.107 -> 2.4.110 +- libedit: upgrade 20210714-3.1 -> 20210910-3.1 +- liberation-fonts: update 2.1.4 -> 2.1.5 +- libevdev: upgrade 1.11.0 -> 1.12.1 +- libexif: update 0.6.22 -> 0.6.24 +- libgit2: update 1.1.1 -> 1.4.2 +- libgpg-error: update 1.42 -> 1.44 +- libhandy: update 1.2.3 -> 1.5.0 +- libical: upgrade 3.0.10 -> 3.0.14 +- libinput: update to 1.19.3 +- libjitterentropy: update 3.1.0 -> 3.4.0 +- libjpeg-turbo: upgrade 2.1.1 -> 2.1.3 +- libmd: upgrade 1.0.3 -> 1.0.4 +- libmicrohttpd: upgrade 0.9.73 -> 0.9.75 +- libmodulemd: upgrade 2.13.0 -> 2.14.0 +- libpam: update 1.5.1 -> 1.5.2 +- libpcre2: upgrade 10.37 -> 10.39 +- libpipeline: upgrade 1.5.3 -> 1.5.5 +- librepo: upgrade 1.14.1 -> 1.14.2 +- librsvg: update 2.40.21 -> 2.52.7 +- libsamplerate0: update 0.1.9 -> 0.2.2 +- libsdl2: update 2.0.16 -> 2.0.20 +- libseccomp: update to 2.5.3 +- libsecret: upgrade 0.20.4 -> 0.20.5 +- libsndfile1: bump to version 1.0.31 +- libsolv: upgrade 0.7.19 -> 0.7.22 +- libsoup-2.4: upgrade 2.72.0 -> 2.74.2 +- libsoup: add a recipe for 3.0.5 +- libssh2: update 1.9.0 -> 1.10.0 +- libtasn1: upgrade 4.17.0 -> 4.18.0 +- libtool: Upgrade 2.4.6 -> 2.4.7 +- libucontext: Upgrade to 1.2 release +- libunistring: update 0.9.10 -> 1.0 +- libunwind: upgrade 1.5.0 -> 1.6.2 +- liburcu: upgrade 0.13.0 -> 0.13.1 +- libusb1: upgrade 1.0.24 -> 1.0.25 +- libuv: update 1.42.0 -> 1.44.1 +- libva: update 2.12.0 -> 2.14.0 +- libva-utils: upgrade 2.13.0 -> 2.14.0 +- libwebp: 1.2.1 -> 1.2.2 +- libwpe: upgrade 1.10.1 -> 1.12.0 +- libx11: update to 1.7.3.1 +- libxcrypt: upgrade 4.4.26 -> 4.4.27 +- libxcrypt-compat: upgrade 4.4.26 -> 4.4.27 +- libxi: update to 1.8 +- libxkbcommon: update to 1.4.0 +- libxml2: update to 2.9.13 +- libxslt: update to v1.1.35 +- lighttpd: update 1.4.59 -> 1.4.64 +- linux-firmware: upgrade 20210818 -> 20220310 +- linux-libc-headers: update to v5.16 +- linux-yocto/5.10: update to v5.10.109 +- linux-yocto/5.15: introduce recipes (v5.15.32) +- linux-yocto-dev: update to v5.18+ +- linux-yocto-rt/5.10: update to -rt61 +- linux-yocto-rt/5.15: update to -rt34 +- llvm: update 12.0.1 -> 13.0.1 +- logrotate: update 3.18.1 -> 3.19.0 +- lsof: update 4.91 -> 4.94.0 +- ltp: update 20210927 -> 20220121 +- ltp: Update to 20210927 +- lttng-modules: update devupstream to latest 2.13 +- lttng-modules: update to 2.13.3 +- lttng-tools: upgrade 2.13.0 -> 2.13.4 +- lttng-ust: upgrade 2.13.0 -> 2.13.2 +- lua: update 5.3.6 -> 5.4.4 +- lzip: upgrade 1.22 -> 1.23 +- man-db: upgrade 2.9.4 -> 2.10.2 +- man-pages: update to 5.13 +- mdadm: update 4.1 -> 4.2 +- mesa: upgrade 21.2.1 -> 22.0.0 +- meson: update 0.58.1 -> 0.61.3 +- minicom: Upgrade 2.7.1 -> 2.8 +- mmc-utils: upgrade to latest revision +- mobile-broadband-provider-info: upgrade 20210805 -> 20220315 +- mpg123: upgrade 1.28.2 -> 1.29.3 +- msmtp: upgrade 1.8.15 -> 1.8.20 +- mtd-utils: upgrade 2.1.3 -> 2.1.4 +- mtools: upgrade 4.0.35 -> 4.0.38 +- musl: Update to latest master +- ncurses: update 6.2 -> 6.3 +- newlib: Upgrade 4.1.0 -> 4.2.0 +- nfs-utils: upgrade 2.5.4 -> 2.6.1 +- nghttp2: upgrade 1.45.1 -> 1.47.0 +- ofono: upgrade 1.32 -> 1.34 +- opensbi: Upgrade to 1.0 +- openssh: upgrade 8.7p1 -> 8.9 +- openssl: update 1.1.1l -> 3.0.2 +- opkg: upgrade 0.4.5 -> 0.5.0 +- opkg-utils: upgrade 0.4.5 -> 0.5.0 +- ovmf: update 202105 -> 202202 +- p11-kit: update 0.24.0 -> 0.24.1 +- pango: upgrade 1.48.9 -> 1.50.4 +- patchelf: upgrade 0.13 -> 0.14.5 +- perl-cross: update 1.3.6 -> 1.3.7 +- perl: update 5.34.0 -> 5.34.1 +- piglit: upgrade to latest revision +- pigz: upgrade 2.6 -> 2.7 +- pinentry: update 1.1.1 -> 1.2.0 +- pkgconfig: Update to latest +- psplash: upgrade to latest revision +- puzzles: upgrade to latest revision +- python3-asn1crypto: upgrade 1.4.0 -> 1.5.1 +- python3-attrs: upgrade 21.2.0 -> 21.4.0 +- python3-cryptography: Upgrade to 36.0.2 +- python3-cryptography-vectors: upgrade to 36.0.2 +- python3-cython: upgrade 0.29.24 -> 0.29.28 +- python3-dbusmock: update to 0.27.3 +- python3-docutils: upgrade 0.17.1 0.18.1 +- python3-dtschema: upgrade 2021.10 -> 2022.1 +- python3-gitdb: upgrade 4.0.7 -> 4.0.9 +- python3-git: update to 3.1.27 +- python3-hypothesis: upgrade 6.15.0 -> 6.39.5 +- python3-imagesize: upgrade 1.2.0 -> 1.3.0 +- python3-importlib-metadata: upgrade 4.6.4 -> 4.11.3 +- python3-jinja2: upgrade 3.0.1 -> 3.1.1 +- python3-jsonschema: upgrade 3.2.0 -> 4.4.0 +- python3-libarchive-c: upgrade 3.1 -> 4.0 +- python3-magic: upgrade 0.4.24 -> 0.4.25 +- python3-mako: upgrade 1.1.5 -> 1.1.6 +- python3-markdown: upgrade 3.3.4 -> 3.3.6 +- python3-markupsafe: upgrade 2.0.1 -> 2.1.1 +- python3-more-itertools: upgrade 8.8.0 -> 8.12.0 +- python3-numpy: upgrade 1.21.2 -> 1.22.3 +- python3-packaging: upgrade 21.0 -> 21.3 +- python3-pathlib2: upgrade 2.3.6 -> 2.3.7 +- python3-pbr: upgrade 5.6.0 -> 5.8.1 +- python3-pip: update 21.2.4 -> 22.0.3 +- python3-pycairo: upgrade 1.20.1 -> 1.21.0 +- python3-pycryptodome: upgrade 3.10.1 -> 3.14.1 +- python3-pyelftools: upgrade 0.27 -> 0.28 +- python3-pygments: upgrade 2.10.0 -> 2.11.2 +- python3-pygobject: upgrade 3.40.1 -> 3.42.0 +- python3-pyparsing: update to 3.0.7 +- python3-pyrsistent: upgrade 0.18.0 -> 0.18.1 +- python3-pytest-runner: upgrade 5.3.1 -> 6.0.0 +- python3-pytest-subtests: upgrade 0.6.0 -> 0.7.0 +- python3-pytest: upgrade 6.2.4 -> 7.1.1 +- python3-pytz: upgrade 2021.3 -> 2022.1 +- python3-py: upgrade 1.10.0 -> 1.11.0 +- python3-pyyaml: upgrade 5.4.1 -> 6.0 +- python3-ruamel-yaml: upgrade 0.17.16 -> 0.17.21 +- python3-scons: upgrade 4.2.0 -> 4.3.0 +- python3-setuptools-scm: upgrade 6.0.1 -> 6.4.2 +- python3-setuptools: update to 59.5.0 +- python3-smmap: update to 5.0.0 +- python3-tomli: upgrade 1.2.1 -> 2.0.1 +- python3: update to 3.10.3 +- python3-urllib3: upgrade 1.26.8 -> 1.26.9 +- python3-zipp: upgrade 3.5.0 -> 3.7.0 +- qemu: update 6.0.0 -> 6.2.0 +- quilt: upgrade 0.66 -> 0.67 +- re2c: upgrade 2.2 -> 3.0 +- readline: upgrade 8.1 -> 8.1.2 +- repo: upgrade 2.17.3 -> 2.22 +- resolvconf: update 1.87 -> 1.91 +- rng-tools: upgrade 6.14 -> 6.15 +- rpcsvc-proto: upgrade 1.4.2 -> 1.4.3 +- rpm: update 4.16.1.3 -> 4.17.0 +- rt-tests: update 2.1 -> 2.3 +- ruby: update 3.0.2 -> 3.1.1 +- rust: update 1.54.0 -> 1.59.0 +- rxvt-unicode: upgrade 9.26 -> 9.30 +- screen: upgrade 4.8.0 -> 4.9.0 +- shaderc: update 2021.1 -> 2022.1 +- shadow: upgrade 4.9 -> 4.11.1 +- socat: upgrade 1.7.4.1 -> 1.7.4.3 +- spirv-headers: bump to b42ba6 revision +- spirv-tools: update 2021.2 -> 2022.1 +- sqlite3: upgrade 3.36.0 -> 3.38.2 +- strace: update 5.14 -> 5.16 +- stress-ng: upgrade 0.13.00 -> 0.13.12 +- sudo: update 1.9.7p2 -> 1.9.10 +- sysklogd: upgrade 2.2.3 -> 2.3.0 +- sysstat: upgrade 12.4.3 -> 12.4.5 +- systemd: update 249.3 -> 250.4 +- systemtap: upgrade 4.5 -> 4.6 +- sysvinit: upgrade 2.99 -> 3.01 +- tzdata: update to 2022a +- u-boot: upgrade 2021.07 -> 2022.01 +- uninative: Upgrade to 3.6 with gcc 12 support +- util-linux: update 2.37.2 -> 2.37.4 +- vala: upgrade 0.52.5 -> 0.56.0 +- valgrind: update 3.17.0 -> 3.18.1 +- vim: upgrade to 8.2 patch 4681 +- vte: upgrade 0.64.2 -> 0.66.2 +- vulkan-headers: upgrade 1.2.182 -> 1.2.191 +- vulkan-loader: upgrade 1.2.182 -> 1.2.198.1 +- vulkan-samples: update to latest revision +- vulkan-tools: upgrade 1.2.182 -> 1.2.191 +- vulkan: update 1.2.191.0 -> 1.3.204.1 +- waffle: update 1.6.1 -> 1.7.0 +- wayland-protocols: upgrade 1.21 -> 1.25 +- wayland: upgrade 1.19.0 -> 1.20.0 +- webkitgtk: upgrade 2.34.0 -> 2.36.0 +- weston: upgrade 9.0.0 -> 10.0.0 +- wget: update 1.21.1 -> 1.21.3 +- wireless-regdb: upgrade 2021.07.14 -> 2022.02.18 +- wpa-supplicant: update 2.9 -> 2.10 +- wpebackend-fdo: upgrade 1.10.0 -> 1.12.0 +- xauth: upgrade 1.1 -> 1.1.1 +- xf86-input-libinput: update to 1.2.1 +- xf86-video-intel: update to latest commit +- xkeyboard-config: update to 2.35.1 +- xorgproto: update to 2021.5 +- xserver-xorg: update 1.20.13 -> 21.1.3 +- xwayland: update 21.1.2 -> 22.1.0 +- xxhash: upgrade 0.8.0 -> 0.8.1 +- zstd: update 1.5.0 -> 1.5.2 + + + +Contributors to 4.0 +~~~~~~~~~~~~~~~~~~~ + +Thanks to the following people who contributed to this release: + +- Abongwa Amahnui Bonalais +- Adriaan Schmidt +- Adrian Freihofer +- Ahmad Fatoum +- Ahmed Hossam +- Ahsan Hussain +- Alejandro Hernandez Samaniego +- Alessio Igor Bogani +- Alexander Kanavin +- Alexandre Belloni +- Alexandru Ardelean +- Alexey Brodkin +- Alex Stewart +- Andreas Müller +- Andrei Gherzan +- Andrej Valek +- Andres Beltran +- Andrew Jeffery +- Andrey Zhizhikin +- Anton Mikanovich +- Anuj Mittal +- Bill Pittman +- Bruce Ashfield +- Caner Altinbasak +- Carlos Rafael Giani +- Chaitanya Vadrevu +- Changhyeok Bae +- Changqing Li +- Chen Qi +- Christian Eggers +- Claudius Heine +- Claus Stovgaard +- Daiane Angolini +- Daniel Ammann +- Daniel Gomez +- Daniel McGregor +- Daniel Müller +- Daniel Wagenknecht +- David Joyner +- David Reyna +- Denys Dmytriyenko +- Dhruva Gole +- Diego Sueiro +- Dmitry Baryshkov +- Ferry Toth +- Florian Amstutz +- Henry Kleynhans +- He Zhe +- Hongxu Jia +- Hsia-Jun(Randy) Li +- Ian Ray +- Jacob Kroon +- Jagadeesh Krishnanjanappa +- Jasper Orschulko +- Jim Wilson +- Joel Winarske +- Joe Slater +- Jon Mason +- Jose Quaresma +- Joshua Watt +- Justin Bronder +- Kai Kang +- Kamil Dziezyk +- Kevin Hao +- Khairul Rohaizzat Jamaluddin +- Khem Raj +- Kiran Surendran +- Konrad Weihmann +- Kory Maincent +- Lee Chee Yang +- Leif Middelschulte +- Lei Maohui +- Li Wang +- Liwei Song +- Luca Boccassi +- Lukasz Majewski +- Luna Gräfje +- Manuel Leonhardt +- Marek Vasut +- Mark Hatle +- Markus Niebel +- Markus Volk +- Marta Rybczynska +- Martin Beeger +- Martin Jansa +- Matthias Klein +- Matt Madison +- Maximilian Blenk +- Max Krummenacher +- Michael Halstead +- Michael Olbrich +- Michael Opdenacker +- Mike Crowe +- Ming Liu +- Mingli Yu +- Minjae Kim +- Nicholas Sielicki +- Olaf Mandel +- Oleh Matiusha +- Oleksandr Kravchuk +- Oleksandr Ocheretnyi +- Oleksandr Suvorov +- Oleksiy Obitotskyy +- Otavio Salvador +- Pablo Saavedra +- Paul Barker +- Paul Eggleton +- Pavel Zhukov +- Peter Hoyes +- Peter Kjellerstedt +- Petr Vorel +- Pgowda +- Quentin Schulz +- Ralph Siemsen +- Randy Li +- Randy MacLeod +- Rasmus Villemoes +- Ricardo Salveti +- Richard Neill +- Richard Purdie +- Robert Joslyn +- Robert P. J. Day +- Robert Yang +- Ross Burton +- Rudolf J Streif +- Sakib Sajal +- Samuli Piippo +- Saul Wold +- Scott Murray +- Sean Anderson +- Simone Weiss +- Simon Kuhnle +- S. Lockwood-Childs +- Stefan Herbrechtsmeier +- Steve Sakoman +- Sundeep KOKKONDA +- Tamizharasan Kumar +- Tean Cunningham +- Teoh Jay Shen +- Thomas Perrot +- Tim Orling +- Tobias Kaufmann +- Tom Hochstein +- Tony McDowell +- Trevor Gamblin +- Ulrich Ölmann +- Valerii Chernous +- Vivien Didelot +- Vyacheslav Yurkov +- Wang Mingyu +- Xavier Berger +- Yi Zhao +- Yongxin Liu +- Yureka +- Zev Weiss +- Zheng Ruoqin +- Zoltán Böszörményi +- Zygmunt Krynicki + + + +Repositories / Downloads for 4.0 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + +poky + +- Repository Location: https://git.yoctoproject.org/git/poky +- Branch: :yocto_git:`kirkstone </poky/log/?h=kirkstone>` +- Tag: :yocto_git:`yocto-4.0 </poky/tag/?h=yocto-4.0>` +- Git Revision: :yocto_git:`00cfdde791a0176c134f31e5a09eff725e75b905 </poky/commit/?id=00cfdde791a0176c134f31e5a09eff725e75b905>` +- Release Artefact: poky-00cfdde791a0176c134f31e5a09eff725e75b905 +- sha: 4cedb491b7bf0d015768c61690f30d7d73f4266252d6fba907bba97eac83648c +- Download Locations: + http://downloads.yoctoproject.org/releases/yocto/yocto-4.0/poky-00cfdde791a0176c134f31e5a09eff725e75b905.tar.bz2 + http://mirrors.kernel.org/yocto/yocto/yocto-4.0/poky-00cfdde791a0176c134f31e5a09eff725e75b905.tar.bz2 + +openembedded-core + +- Repository Location: :oe_git:`/openembedded-core` +- Branch: :oe_git:`kirkstone </openembedded-core/log/?h=kirkstone>` +- Tag: :oe_git:`yocto-4.0 </openembedded-core/tag/?h=yocto-4.0>` +- Git Revision: :oe_git:`92fcb6570bddd0c5717d8cfdf38ecf3e44942b0f </openembedded-core/commit/?id=92fcb6570bddd0c5717d8cfdf38ecf3e44942b0f>` +- Release Artefact: oecore-92fcb6570bddd0c5717d8cfdf38ecf3e44942b0f +- sha: c042629752543a10b0384b2076b1ee8742fa5e8112aef7b00b3621f8387a51c6 +- Download Locations: + http://downloads.yoctoproject.org/releases/yocto/yocto-4.0/oecore-92fcb6570bddd0c5717d8cfdf38ecf3e44942b0f.tar.bz2 + http://mirrors.kernel.org/yocto/yocto/yocto-4.0/oecore-92fcb6570bddd0c5717d8cfdf38ecf3e44942b0f.tar.bz2 + +meta-mingw + +- Repository Location: https://git.yoctoproject.org/git/meta-mingw +- Branch: :yocto_git:`kirkstone </meta-mingw/log/?h=kirkstone>` +- Tag: :yocto_git:`yocto-4.0 </meta-mingw/tag/?h=yocto-4.0>` +- Git Revision: :yocto_git:`a90614a6498c3345704e9611f2842eb933dc51c1 </meta-mingw/commit/?id=a90614a6498c3345704e9611f2842eb933dc51c1>` +- Release Artefact: meta-mingw-a90614a6498c3345704e9611f2842eb933dc51c1 +- sha: 49f9900bfbbc1c68136f8115b314e95d0b7f6be75edf36a75d9bcd1cca7c6302 +- Download Locations: + http://downloads.yoctoproject.org/releases/yocto/yocto-4.0/meta-mingw-a90614a6498c3345704e9611f2842eb933dc51c1.tar.bz2 + http://mirrors.kernel.org/yocto/yocto/yocto-4.0/meta-mingw-a90614a6498c3345704e9611f2842eb933dc51c1.tar.bz2 + +meta-gplv2 + +- Repository Location: https://git.yoctoproject.org/git/meta-gplv2 +- Branch: :yocto_git:`kirkstone </meta-gplv2/log/?h=kirkstone>` +- Tag: :yocto_git:`yocto-4.0 </meta-gplv2/tag/?h=yocto-4.0>` +- Git Revision: :yocto_git:`d2f8b5cdb285b72a4ed93450f6703ca27aa42e8a </meta-mingw/commit/?id=d2f8b5cdb285b72a4ed93450f6703ca27aa42e8a>` +- Release Artefact: meta-gplv2-d2f8b5cdb285b72a4ed93450f6703ca27aa42e8a +- sha: c386f59f8a672747dc3d0be1d4234b6039273d0e57933eb87caa20f56b9cca6d +- Download Locations: + http://downloads.yoctoproject.org/releases/yocto/yocto-4.0/meta-gplv2-d2f8b5cdb285b72a4ed93450f6703ca27aa42e8a.tar.bz2 + http://mirrors.kernel.org/yocto/yocto/yocto-4.0/meta-gplv2-d2f8b5cdb285b72a4ed93450f6703ca27aa42e8a.tar.bz2 + +bitbake + +- Repository Location: :oe_git:`/bitbake` +- Branch: :oe_git:`2.0 </bitbake/log/?h=2.0>` +- Tag: :oe_git:`yocto-4.0 </bitbake/tag/?h=yocto-4.0>` +- Git Revision: :oe_git:`c212b0f3b542efa19f15782421196b7f4b64b0b9 </bitbake/commit/?id=c212b0f3b542efa19f15782421196b7f4b64b0b9>` +- Release Artefact: bitbake-c212b0f3b542efa19f15782421196b7f4b64b0b9 +- sha: 6872095c7d7be5d791ef3e18b6bab2d1e0e237962f003d2b00dc7bd6fb6d2ef7 +- Download Locations: + http://downloads.yoctoproject.org/releases/yocto/yocto-4.0/bitbake-c212b0f3b542efa19f15782421196b7f4b64b0b9.tar.bz2 + http://mirrors.kernel.org/yocto/yocto/yocto-4.0/bitbake-c212b0f3b542efa19f15782421196b7f4b64b0b9.tar.bz2 + +yocto-docs + +- Repository Location: https://git.yoctoproject.org/git/yocto-docs +- Branch: :yocto_git:`kirkstone </yocto-docs/log/?h=kirkstone>` +- Tag: :yocto_git:`yocto-4.0 </yocto-docs/tag/?h=yocto-4.0>` +- Git Revision: :yocto_git:`a6f571ad5b087385cad8765ed455c4b4eaeebca6 </yocto-docs/commit/?id=a6f571ad5b087385cad8765ed455c4b4eaeebca6>` + diff --git a/poky/documentation/poky.yaml.in b/poky/documentation/poky.yaml.in index 849eede289..1e1d6c83ed 100644 --- a/poky/documentation/poky.yaml.in +++ b/poky/documentation/poky.yaml.in @@ -1,10 +1,10 @@ -DISTRO : "3.4.3" -DISTRO_NAME_NO_CAP : "honister" -DISTRO_NAME : "Honister" -DISTRO_NAME_NO_CAP_MINUS_ONE : "hardknott" +DISTRO : "4.0" +DISTRO_NAME_NO_CAP : "kirkstone" +DISTRO_NAME : "Kirkstone" +DISTRO_NAME_NO_CAP_MINUS_ONE : "honister" DISTRO_NAME_NO_CAP_LTS : "dunfell" -YOCTO_DOC_VERSION : "3.4.3" -DISTRO_REL_TAG : "yocto-3.4.3" +YOCTO_DOC_VERSION : "4.0" +DISTRO_REL_TAG : "yocto-4.0" DOCCONF_VERSION : "dev" BITBAKE_SERIES : "" YOCTO_DL_URL : "https://downloads.yoctoproject.org" diff --git a/poky/documentation/ref-manual/classes.rst b/poky/documentation/ref-manual/classes.rst index 6ba792d3f9..a6dafe8f90 100644 --- a/poky/documentation/ref-manual/classes.rst +++ b/poky/documentation/ref-manual/classes.rst @@ -576,6 +576,14 @@ Finally, here is an example that sets the root password:: usermod -p '${PASSWD}' root; \ " +.. note:: + + From a security perspective, hardcoding a default password is not + generally a good idea or even legal in some jurisdictions. It is + recommended that you do not do this if you are building a production + image. + + .. _ref-classes-features_check: ``features_check.bbclass`` @@ -1032,6 +1040,11 @@ Here are the tests you can list with the :term:`WARN_QA` and cases, such as dynamically loaded modules, these symlinks are needed instead in the main package. +- ``empty-dirs:`` Checks that packages are not installing files to + directories that are normally expected to be empty (such as ``/tmp``) + The list of directories that are checked is specified by the + :term:`QA_EMPTY_DIRS` variable. + - ``file-rdeps:`` Checks that file-level dependencies identified by the OpenEmbedded build system at packaging time are satisfied. For example, a shell script might start with the line ``#!/bin/bash``. diff --git a/poky/documentation/ref-manual/qa-checks.rst b/poky/documentation/ref-manual/qa-checks.rst index 3364311219..8c475d0f72 100644 --- a/poky/documentation/ref-manual/qa-checks.rst +++ b/poky/documentation/ref-manual/qa-checks.rst @@ -154,7 +154,16 @@ Errors and Warnings ``FILES:${PN}-dbg``. See :term:`FILES` for additional information on :term:`FILES`. -  +.. _qa-check-empty-dirs: + +- ``<packagename> installs files in <path>, but it is expected to be empty [empty-dirs]`` + + The specified package is installing files into a directory that is + normally expected to be empty (such as ``/tmp``). These files may + be more appropriately installed to a different location, or + perhaps alternatively not installed at all, usually by updating the + ``do_install`` task/function. + .. _qa-check-arch: - ``Architecture did not match (<file_arch>, expected <machine_arch>) in <file> [arch]`` diff --git a/poky/documentation/ref-manual/variables.rst b/poky/documentation/ref-manual/variables.rst index f9fd551478..f8808cc052 100644 --- a/poky/documentation/ref-manual/variables.rst +++ b/poky/documentation/ref-manual/variables.rst @@ -1485,6 +1485,13 @@ system and gives an overview of their function and contents. CVE_PRODUCT = "oracle_berkeley_db berkeley_db" + Sometimes the product name is not specific enough, for example + "tar" has been matching CVEs for the GNU ``tar`` package and also + the ``node-tar`` node.js extension. To avoid this problem, use the + vendor name as a prefix. The syntax for this is:: + + CVE_PRODUCT = "vendor:package" + :term:`CVSDIR` The directory in which files checked out under the CVS system are stored. @@ -2331,6 +2338,37 @@ system and gives an overview of their function and contents. # usermod -s /bin/sh tester; \ # " + Hardcoded passwords are supported via the ``-p`` parameters for + ``useradd`` or ``usermod``, but only hashed. + + Here is an example that adds two users named "tester-jim" and "tester-sue" and assigns + passwords. First on host, create the (escaped) password hash:: + + printf "%q" $(mkpasswd -m sha256crypt tester01) + + The resulting hash is set to a variable and used in ``useradd`` command parameters:: + + inherit extrausers + PASSWD = "\$X\$ABC123\$A-Long-Hash" + EXTRA_USERS_PARAMS = "\ + useradd -p '${PASSWD}' tester-jim; \ + useradd -p '${PASSWD}' tester-sue; \ + " + + Finally, here is an example that sets the root password:: + + inherit extrausers + EXTRA_USERS_PARAMS = "\ + usermod -p '${PASSWD}' root; \ + " + + .. note:: + + From a security perspective, hardcoding a default password is not + generally a good idea or even legal in some jurisdictions. It is + recommended that you do not do this if you are building a production + image. + Additionally there is a special ``passwd-expire`` command that will cause the password for a user to be expired and thus force changing it on first login, for example:: @@ -3485,6 +3523,14 @@ system and gives an overview of their function and contents. incompatible licenses are not built. Packages that are individually licensed with the specified incompatible licenses will be deleted. + There is some support for wildcards in this variable's value, + however it is restricted to specific licenses. Currently only + these wildcards are allowed and expand as follows: + + - ``AGPL-3.0*"``: ``AGPL-3.0-only``, ``AGPL-3.0-or-later`` + - ``GPL-3.0*``: ``GPL-3.0-only``, ``GPL-3.0-or-later`` + - ``LGPL-3.0*``: ``LGPL-3.0-only``, ``LGPL-3.0-or-later`` + .. note:: This functionality is only regularly tested using the following @@ -3938,6 +3984,11 @@ system and gives an overview of their function and contents. custom kernel image types with the :ref:`kernel <ref-classes-kernel>` class using this variable. + :term:`KERNEL_DEBUG_TIMESTAMPS` + If set to "1", enables timestamping functionality during building + the kernel. The default is "0" to disable this for reproducibility + reasons. + :term:`KERNEL_DEVICETREE` Specifies the name of the generated Linux kernel device tree (i.e. the ``.dtb``) file. @@ -6064,6 +6115,28 @@ system and gives an overview of their function and contents. In the previous example, the version of the dependency is :term:`PYTHON_PN`. + :term:`QA_EMPTY_DIRS` + Specifies a list of directories that are expected to be empty when + packaging; if ``empty-dirs`` appears in :term:`ERROR_QA` or + :term:`WARN_QA` these will be checked and an error or warning + (respectively) will be produced. + + The default :term:`QA_EMPTY_DIRS` value is set in + :ref:`insane.bbclass <ref-classes-insane>`. + + :term:`QA_EMPTY_DIRS_RECOMMENDATION` + Specifies a recommendation for why a directory must be empty, + which will be included in the error message if a specific directory + is found to contain files. Must be overridden with the directory + path to match on. + + If no recommendation is specified for a directory, then the default + "but it is expected to be empty" will be used. + + An example message shows if files were present in '/dev':: + + QA_EMPTY_DIRS_RECOMMENDATION:/dev = "but all devices must be created at runtime" + :term:`RANLIB` The minimal command and arguments to run ``ranlib``. @@ -8717,4 +8790,36 @@ system and gives an overview of their function and contents. The default value of :term:`XSERVER`, if not specified in the machine configuration, is "xserver-xorg xf86-video-fbdev xf86-input-evdev". - + + :term:`XZ_THREADS` + Specifies the number of parallel threads that should be used when + using xz compression. + + By default this scales with core count, but is never set less than 2 + to ensure that multi-threaded mode is always used so that the output + file contents are deterministic. Builds will work with a value of 1 + but the output will differ compared to the output from the compression + generated when more than one thread is used. + + On systems where many tasks run in parallel, setting a limit to this + can be helpful in controlling system resource usage. + + :term:`XZ_MEMLIMIT` + Specifies the maximum memory the xz compression should use as a percentage + of system memory. If unconstrained the xz compressor can use large amounts of + memory and become problematic with parallelism elsewhere in the build. + "50%" has been found to be a good value. + + :term:`ZSTD_THREADS` + Specifies the number of parallel threads that should be used when + using ZStandard compression. + + By default this scales with core count, but is never set less than 2 + to ensure that multi-threaded mode is always used so that the output + file contents are deterministic. Builds will work with a value of 1 + but the output will differ compared to the output from the compression + generated when more than one thread is used. + + On systems where many tasks run in parallel, setting a limit to this + can be helpful in controlling system resource usage. + diff --git a/poky/documentation/releases.rst b/poky/documentation/releases.rst index 80eca2a401..c9f3bc799e 100644 --- a/poky/documentation/releases.rst +++ b/poky/documentation/releases.rst @@ -12,6 +12,12 @@ =========================== ****************************** +Release Series 4.0 (kirkstone) +****************************** + +- :yocto_docs:`4.0 Documentation </4.0>` + +****************************** Release Series 3.4 (honister) ****************************** diff --git a/poky/documentation/set_versions.py b/poky/documentation/set_versions.py index fceff4dbce..33d9da55ea 100755 --- a/poky/documentation/set_versions.py +++ b/poky/documentation/set_versions.py @@ -23,13 +23,12 @@ ourversion = None if len(sys.argv) == 2: ourversion = sys.argv[1] -activereleases = ["honister", "hardknott", "dunfell"] -#devbranch = "langdale" -devbranch = "kirkstone" +activereleases = ["kirkstone", "honister", "hardknott", "dunfell"] +devbranch = "langdale" ltsseries = ["kirkstone", "dunfell"] release_series = collections.OrderedDict() -#release_series["langdale"] = "4.1" +release_series["langdale"] = "4.1" release_series["kirkstone"] = "4.0" release_series["honister"] = "3.4" release_series["hardknott"] = "3.3" @@ -57,8 +56,8 @@ release_series["bernard"] = "1.0" release_series["laverne"] = "0.9" -# "langdale" : "2.2", bitbake_mapping = { + "langdale" : "2.2", "kirkstone" : "2.0", "honister" : "1.52", "hardknott" : "1.50", @@ -128,7 +127,7 @@ else: if branch == "master": ourseries = devbranch docconfver = "dev" - bitbakeversion = "" + bitbakeversion = "dev" elif branch in release_series: ourseries = branch if branch in bitbake_mapping: @@ -199,29 +198,29 @@ if os.path.exists("poky.yaml.in"): # - current doc version # (with duplicates removed) -if ourseries not in activereleases: - activereleases.append(ourseries) - versions = [] with open("sphinx-static/switchers.js.in", "r") as r, open("sphinx-static/switchers.js", "w") as w: lines = r.readlines() for line in lines: + if "ALL_RELEASES_PLACEHOLDER" in line: + w.write(str(list(release_series.keys()))) + continue if "VERSIONS_PLACEHOLDER" in line: - w.write(" 'dev': 'dev (%s)',\n" % release_series[devbranch]) - for branch in activereleases: + w.write(" 'dev': { 'title': 'dev (%s)', 'obsolete': false,},\n" % release_series[devbranch]) + for branch in activereleases + ([ourseries] if ourseries not in activereleases else []): if branch == devbranch: continue - versions = subprocess.run('git tag --list yocto-%s*' % (release_series[branch]), shell=True, capture_output=True, text=True).stdout.split() - versions = sorted([v.replace("yocto-" + release_series[branch] + ".", "").replace("yocto-" + release_series[branch], "0") for v in versions], key=int) - if not versions: + branch_versions = subprocess.run('git tag --list yocto-%s*' % (release_series[branch]), shell=True, capture_output=True, text=True).stdout.split() + branch_versions = sorted([v.replace("yocto-" + release_series[branch] + ".", "").replace("yocto-" + release_series[branch], "0") for v in branch_versions], key=int) + if not branch_versions: continue version = release_series[branch] - if versions[-1] != "0": - version = version + "." + versions[-1] + if branch_versions[-1] != "0": + version = version + "." + branch_versions[-1] versions.append(version) - w.write(" '%s': '%s',\n" % (version, version)) + w.write(" '%s': {'title': '%s', 'obsolete': %s,},\n" % (version, version, str(branch not in activereleases).lower())) if ourversion not in versions and ourseries != devbranch: - w.write(" '%s': '%s',\n" % (ourversion, ourversion)) + w.write(" '%s': {'title': '%s', 'obsolete': %s,},\n" % (ourversion, ourversion, str(ourseries not in activereleases).lower())) else: w.write(line) diff --git a/poky/documentation/sphinx-static/switchers.js.in b/poky/documentation/sphinx-static/switchers.js.in index 5d3a4d7935..8c016859bc 100644 --- a/poky/documentation/sphinx-static/switchers.js.in +++ b/poky/documentation/sphinx-static/switchers.js.in @@ -9,7 +9,11 @@ by https://git.yoctoproject.org/yocto-autobuilder-helper/tree/scripts/run-docs-b (function() { 'use strict'; - var all_versions = { + var all_releases = + ALL_RELEASES_PLACEHOLDER + ; + + var switcher_versions = { VERSIONS_PLACEHOLDER }; @@ -65,18 +69,15 @@ by https://git.yoctoproject.org/yocto-autobuilder-helper/tree/scripts/run-docs-b function build_version_select(current_series, current_version) { var buf = ['<select>']; - $.each(all_versions, function(version, title) { + $.each(switcher_versions, function(version, vers_data) { var series = version.substr(0, 3); if (series == current_series) { if (version == current_version) - buf.push('<option value="' + version + '" selected="selected">' + title + '</option>'); - else - buf.push('<option value="' + version + '">' + title + '</option>'); - - if (version != current_version) - buf.push('<option value="' + current_version + '" selected="selected">' + current_version + '</option>'); + buf.push('<option value="' + version + '" selected="selected">' + vers_data["title"] + '</option>'); + else + buf.push('<option value="' + version + '">' + vers_data["title"] + '</option>'); } else { - buf.push('<option value="' + version + '">' + title + '</option>'); + buf.push('<option value="' + version + '">' + vers_data["title"] + '</option>'); } }); @@ -152,14 +153,20 @@ by https://git.yoctoproject.org/yocto-autobuilder-helper/tree/scripts/run-docs-b var docroot = get_docroot_url() var new_versionpath = selected_version + '/'; - if (selected_version == "dev") - new_versionpath = ''; - // dev versions have no version prefix - if (current_version == "dev") { + // latest tag is also the default page (without version information) + if (docroot.endsWith(current_version + '/') == false) { var new_url = docroot + new_versionpath + url.replace(docroot, ""); var fallback_url = docroot + new_versionpath; } else { + // check for named releases (e.g. dunfell) in the subpath + $.each(all_releases, function(idx, release) { + if (docroot.endsWith('/' + release + '/')) { + current_version = release; + return false; + } + }); + var new_url = url.replace('/' + current_version + '/', '/' + new_versionpath); var fallback_url = new_url.replace(url.replace(docroot, ""), ""); } @@ -222,15 +229,20 @@ by https://git.yoctoproject.org/yocto-autobuilder-helper/tree/scripts/run-docs-b $('.doctype_switcher_placeholder').html(doctype_select); $('.doctype_switcher_placeholder select').bind('change', on_doctype_switch); - if (ver_compare(release, "3.1") < 0) { - $('#outdated-warning').html('Version ' + release + ' of the project is now considered obsolete, please select and use a more recent version'); - $('#outdated-warning').css('padding', '.5em'); - } else if (release != "dev") { - $.each(all_versions, function(version, title) { + if (release != "dev") { + $.each(switcher_versions, function(version, vers_data) { var series = version.substr(0, 3); - if (series == current_series && version != release) { - $('#outdated-warning').html('This document is for outdated version ' + release + ', you should select the latest release version in this series, ' + version + '.'); - $('#outdated-warning').css('padding', '.5em'); + if (series == current_series) { + if (version != release && release.endsWith('.999') == false) { + $('#outdated-warning').html('This document is for outdated version ' + release + ', you should select the latest release version in this series, ' + version + '.'); + $('#outdated-warning').css('padding', '.5em'); + return false; + } + if (vers_data["obsolete"]) { + $('#outdated-warning').html('Version ' + release + ' of the project is now considered obsolete, please select and use a more recent version'); + $('#outdated-warning').css('padding', '.5em'); + return false; + } } }); } diff --git a/poky/meta-poky/conf/local.conf.sample b/poky/meta-poky/conf/local.conf.sample index 17cbf3a3b3..d92aa0ef87 100644 --- a/poky/meta-poky/conf/local.conf.sample +++ b/poky/meta-poky/conf/local.conf.sample @@ -230,7 +230,7 @@ BB_DISKMON_DIRS ??= "\ # Note: For this to work you also need hash-equivalence passthrough to the matching server # #BB_HASHSERVE_UPSTREAM = "typhoon.yocto.io:8687" -#SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/3.4/PATH;downloadfilename=PATH" +#SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/4.0/PATH;downloadfilename=PATH" # # Qemu configuration diff --git a/poky/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb b/poky/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb index 062d6a7a05..ad9f475d15 100644 --- a/poky/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb +++ b/poky/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb @@ -2,7 +2,7 @@ SUMMARY = "Test recipe for recipeutils.patch_recipe()" require recipeutils-test.inc -LICENSE = "Proprietary" +LICENSE = "HPND" LIC_FILES_CHKSUM = "file://${WORKDIR}/somefile;md5=d41d8cd98f00b204e9800998ecf8427e" DEPENDS += "zlib" diff --git a/poky/meta/classes/create-spdx.bbclass b/poky/meta/classes/create-spdx.bbclass index 137db81a5b..47a8764bf0 100644 --- a/poky/meta/classes/create-spdx.bbclass +++ b/poky/meta/classes/create-spdx.bbclass @@ -835,16 +835,14 @@ python image_combine_spdx() { combine_spdx(d, image_name, imgdeploydir, img_spdxid, packages) - if image_link_name: - image_spdx_path = imgdeploydir / (image_name + ".spdx.json") - image_spdx_link = imgdeploydir / (image_link_name + ".spdx.json") - image_spdx_link.symlink_to(os.path.relpath(image_spdx_path, image_spdx_link.parent)) - def make_image_link(target_path, suffix): if image_link_name: link = imgdeploydir / (image_link_name + suffix) - link.symlink_to(os.path.relpath(target_path, link.parent)) + if link != target_path: + link.symlink_to(os.path.relpath(target_path, link.parent)) + image_spdx_path = imgdeploydir / (image_name + ".spdx.json") + make_image_link(image_spdx_path, ".spdx.json") spdx_tar_path = imgdeploydir / (image_name + ".spdx.tar.zst") make_image_link(spdx_tar_path, ".spdx.tar.zst") spdx_index_path = imgdeploydir / (image_name + ".spdx.index.json") diff --git a/poky/meta/classes/externalsrc.bbclass b/poky/meta/classes/externalsrc.bbclass index abfe24bace..b2f216f361 100644 --- a/poky/meta/classes/externalsrc.bbclass +++ b/poky/meta/classes/externalsrc.bbclass @@ -90,15 +90,16 @@ python () { # Since configure will likely touch ${S}, ensure only we lock so one task has access at a time d.appendVarFlag(task, "lockfiles", " ${S}/singletask.lock") - # We do not want our source to be wiped out, ever (kernel.bbclass does this for do_clean) - cleandirs = oe.recipeutils.split_var_value(d.getVarFlag(task, 'cleandirs', False) or '') - setvalue = False - for cleandir in cleandirs[:]: - if oe.path.is_path_parent(externalsrc, d.expand(cleandir)): - cleandirs.remove(cleandir) - setvalue = True - if setvalue: - d.setVarFlag(task, 'cleandirs', ' '.join(cleandirs)) + for funcname in [task, "base_" + task, "kernel_" + task]: + # We do not want our source to be wiped out, ever (kernel.bbclass does this for do_clean) + cleandirs = oe.recipeutils.split_var_value(d.getVarFlag(funcname, 'cleandirs', False) or '') + setvalue = False + for cleandir in cleandirs[:]: + if oe.path.is_path_parent(externalsrc, d.expand(cleandir)): + cleandirs.remove(cleandir) + setvalue = True + if setvalue: + d.setVarFlag(funcname, 'cleandirs', ' '.join(cleandirs)) fetch_tasks = ['do_fetch', 'do_unpack'] # If we deltask do_patch, there's no dependency to ensure do_unpack gets run, so add one diff --git a/poky/meta/classes/kernel.bbclass b/poky/meta/classes/kernel.bbclass index bc52419e09..8299b394a7 100644 --- a/poky/meta/classes/kernel.bbclass +++ b/poky/meta/classes/kernel.bbclass @@ -221,8 +221,6 @@ export CMDLINE_CONSOLE = "console=${@d.getVar("KERNEL_CONSOLE") or "ttyS0"}" KERNEL_VERSION = "${@get_kernelversion_headers('${B}')}" -KERNEL_LOCALVERSION ?= "" - # kernels are generally machine specific PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/poky/meta/classes/sanity.bbclass b/poky/meta/classes/sanity.bbclass index be956fbcd6..c385d92e8b 100644 --- a/poky/meta/classes/sanity.bbclass +++ b/poky/meta/classes/sanity.bbclass @@ -467,6 +467,12 @@ def check_make_version(sanity_data): os.remove("makefile_test_b.c") if os.path.exists("makefile_test.a"): os.remove("makefile_test.a") + + if bb.utils.vercmp_string_op(version, "4.2.1", "=="): + distro = oe.lsb.distro_identifier() + if "ubuntu" 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/sign_package_feed.bbclass b/poky/meta/classes/sign_package_feed.bbclass index 16bcd147aa..f1504c2225 100644 --- a/poky/meta/classes/sign_package_feed.bbclass +++ b/poky/meta/classes/sign_package_feed.bbclass @@ -27,6 +27,7 @@ inherit sanity PACKAGE_FEED_SIGN = '1' PACKAGE_FEED_GPG_BACKEND ?= 'local' PACKAGE_FEED_GPG_SIGNATURE_TYPE ?= 'ASC' +PACKAGEINDEXDEPS += "gnupg-native:do_populate_sysroot" # Make feed signing key to be present in rootfs FEATURE_PACKAGES_package-management:append = " signing-keys-packagefeed" diff --git a/poky/meta/conf/bitbake.conf b/poky/meta/conf/bitbake.conf index 3fa2bee053..0e939aca4f 100644 --- a/poky/meta/conf/bitbake.conf +++ b/poky/meta/conf/bitbake.conf @@ -950,8 +950,8 @@ BB_HASHCONFIG_IGNORE_VARS ?= "${BB_HASHEXCLUDE_COMMON} DATE TIME SSH_AGENT_PID \ HTTP_PROXY http_proxy HTTPS_PROXY https_proxy SOCKS5_USER SOCKS5_PASSWD \ BB_SETSCENE_ENFORCE BB_CMDLINE BB_SERVER_TIMEOUT" BB_SIGNATURE_EXCLUDE_FLAGS ?= "doc deps depends \ - lockfiles type vardepsexclude vardeps vardepvalue vardepvalueexclude \ - file-checksums python func task export unexport noexec nostamp dirs cleandirs \ + lockfiles vardepsexclude vardeps vardepvalue vardepvalueexclude \ + file-checksums python task nostamp \ sstate-lockfile-shared prefuncs postfuncs export_func deptask rdeptask \ recrdeptask nodeprrecs stamp-extra-info sstate-outputdirs filename lineno \ progress mcdepends number_threads" diff --git a/poky/meta/conf/machine/qemuarm64.conf b/poky/meta/conf/machine/qemuarm64.conf index f245152168..ffc51c803f 100644 --- a/poky/meta/conf/machine/qemuarm64.conf +++ b/poky/meta/conf/machine/qemuarm64.conf @@ -23,9 +23,9 @@ QB_GRAPHICS = "-device virtio-gpu-pci" QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd" # Virtio Networking support QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" -QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@" +QB_NETWORK_DEVICE = "-device virtio-net-pci,netdev=net0,mac=@MAC@" # Virtio block device -QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=none,format=raw -device virtio-blk-device,drive=disk0" +QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=none,format=raw -device virtio-blk-pci,drive=disk0" # Virtio serial console -QB_SERIAL_OPT = "-device virtio-serial-device -chardev null,id=virtcon -device virtconsole,chardev=virtcon" -QB_TCPSERIAL_OPT = "-device virtio-serial-device -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1 -device virtconsole,chardev=virtcon" +QB_SERIAL_OPT = "-device virtio-serial-pci -chardev null,id=virtcon -device virtconsole,chardev=virtcon" +QB_TCPSERIAL_OPT = "-device virtio-serial-pci -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1 -device virtconsole,chardev=virtcon" diff --git a/poky/meta/lib/oeqa/runtime/cases/apt.py b/poky/meta/lib/oeqa/runtime/cases/apt.py index 53745df93f..574a34f148 100644 --- a/poky/meta/lib/oeqa/runtime/cases/apt.py +++ b/poky/meta/lib/oeqa/runtime/cases/apt.py @@ -21,7 +21,7 @@ class AptRepoTest(AptTest): @classmethod def setUpClass(cls): - service_repo = os.path.join(cls.tc.td['DEPLOY_DIR_DEB'], 'all') + service_repo = os.path.join(cls.tc.td['DEPLOY_DIR_DEB'], '') cls.repo_server = HTTPService(service_repo, '0.0.0.0', port=cls.tc.target.server_port, logger=cls.tc.logger) @@ -34,20 +34,44 @@ class AptRepoTest(AptTest): def setup_source_config_for_package_install(self): apt_get_source_server = 'http://%s:%s/' % (self.tc.target.server_ip, self.repo_server.port) apt_get_sourceslist_dir = '/etc/apt/' - self.target.run('cd %s; echo deb [ allow-insecure=yes ] %s ./ > sources.list' % (apt_get_sourceslist_dir, apt_get_source_server)) + self.target.run('cd %s; echo deb [ allow-insecure=yes ] %s/all ./ > sources.list' % (apt_get_sourceslist_dir, apt_get_source_server)) + + def setup_source_config_for_package_install_signed(self): + apt_get_source_server = 'http:\/\/%s:%s' % (self.tc.target.server_ip, self.repo_server.port) + apt_get_sourceslist_dir = '/etc/apt/' + self.target.run("cd %s; cp sources.list sources.list.bak; sed -i 's/\[trusted=yes\] http:\/\/bogus_ip:bogus_port/%s/g' sources.list" % (apt_get_sourceslist_dir, apt_get_source_server)) def cleanup_source_config_for_package_install(self): apt_get_sourceslist_dir = '/etc/apt/' self.target.run('cd %s; rm sources.list' % (apt_get_sourceslist_dir)) + def cleanup_source_config_for_package_install_signed(self): + apt_get_sourceslist_dir = '/etc/apt/' + self.target.run('cd %s; mv sources.list.bak sources.list' % (apt_get_sourceslist_dir)) + + def setup_key(self): + # the key is found on the target /etc/pki/packagefeed-gpg/ + # named PACKAGEFEED-GPG-KEY-poky-branch + self.target.run('cd %s; apt-key add P*' % ('/etc/pki/packagefeed-gpg')) + @skipIfNotFeature('package-management', 'Test requires package-management to be in IMAGE_FEATURES') @skipIfNotDataVar('IMAGE_PKGTYPE', 'deb', 'DEB is not the primary package manager') @OEHasPackage(['apt']) def test_apt_install_from_repo(self): - self.setup_source_config_for_package_install() - self.pkg('update') - self.pkg('remove --yes run-postinsts-dev') - self.pkg('install --yes --allow-unauthenticated run-postinsts-dev') - self.cleanup_source_config_for_package_install() + if not self.tc.td.get('PACKAGE_FEED_GPG_NAME'): + self.setup_source_config_for_package_install() + self.pkg('update') + self.pkg('remove --yes run-postinsts-dev') + self.pkg('install --yes --allow-unauthenticated run-postinsts-dev') + self.cleanup_source_config_for_package_install() + else: + # when we are here a key has been set to sign the package feed and + # public key and gnupg installed on the image by test_testimage_apt + self.setup_source_config_for_package_install_signed() + self.setup_key() + self.pkg('update') + self.pkg('install --yes run-postinsts-dev') + self.pkg('remove --yes run-postinsts-dev') + self.cleanup_source_config_for_package_install_signed() diff --git a/poky/meta/lib/oeqa/selftest/cases/lic_checksum.py b/poky/meta/lib/oeqa/selftest/cases/lic_checksum.py index f8681ed755..8f1226e6a5 100644 --- a/poky/meta/lib/oeqa/selftest/cases/lic_checksum.py +++ b/poky/meta/lib/oeqa/selftest/cases/lic_checksum.py @@ -4,12 +4,30 @@ import os import tempfile +import urllib from oeqa.selftest.case import OESelftestTestCase from oeqa.utils.commands import bitbake class LicenseTests(OESelftestTestCase): + def test_checksum_with_space(self): + bitbake_cmd = '-c populate_lic emptytest' + + lic_file, lic_path = tempfile.mkstemp(" -afterspace") + os.close(lic_file) + #self.track_for_cleanup(lic_path) + + self.write_config("INHERIT:remove = \"report-error\"") + + self.write_recipeinc('emptytest', """ +INHIBIT_DEFAULT_DEPS = "1" +LIC_FILES_CHKSUM = "file://%s;md5=d41d8cd98f00b204e9800998ecf8427e" +SRC_URI = "file://%s;md5=d41d8cd98f00b204e9800998ecf8427e" +""" % (urllib.parse.quote(lic_path), urllib.parse.quote(lic_path))) + result = bitbake(bitbake_cmd) + + # Verify that changing a license file that has an absolute path causes # the license qa to fail due to a mismatched md5sum. def test_nonmatching_checksum(self): diff --git a/poky/meta/lib/oeqa/selftest/cases/runtime_test.py b/poky/meta/lib/oeqa/selftest/cases/runtime_test.py index 2ad89490fc..3ece617cb0 100644 --- a/poky/meta/lib/oeqa/selftest/cases/runtime_test.py +++ b/poky/meta/lib/oeqa/selftest/cases/runtime_test.py @@ -162,6 +162,44 @@ class TestImage(OESelftestTestCase): bitbake('core-image-full-cmdline socat') bitbake('-c testimage core-image-full-cmdline') + def test_testimage_apt(self): + """ + Summary: Check package feeds functionality for apt + Expected: 1. Check that remote package feeds can be accessed + Product: oe-core + Author: Ferry Toth <fntoth@gmail.com> + """ + if get_bb_var('DISTRO') == 'poky-tiny': + self.skipTest('core-image-full-cmdline not buildable for poky-tiny') + + features = 'INHERIT += "testimage"\n' + features += 'TEST_SUITES = "ping ssh apt.AptRepoTest.test_apt_install_from_repo"\n' + # We don't yet know what the server ip and port will be - they will be patched + # in at the start of the on-image test + features += 'PACKAGE_FEED_URIS = "http://bogus_ip:bogus_port"\n' + features += 'EXTRA_IMAGE_FEATURES += "package-management"\n' + features += 'PACKAGE_CLASSES = "package_deb"\n' + # We need gnupg on the target to install keys + features += 'IMAGE_INSTALL:append:pn-core-image-full-cmdline = " gnupg"\n' + + bitbake('gnupg-native -c addto_recipe_sysroot') + + # Enable package feed signing + self.gpg_home = tempfile.mkdtemp(prefix="oeqa-feed-sign-") + self.track_for_cleanup(self.gpg_home) + signing_key_dir = os.path.join(self.testlayer_path, 'files', 'signing') + runCmd('gpgconf --list-dirs --homedir %s; gpg -v --batch --homedir %s --import %s' % (self.gpg_home, self.gpg_home, os.path.join(signing_key_dir, 'key.secret')), native_sysroot=get_bb_var("RECIPE_SYSROOT_NATIVE", "gnupg-native"), shell=True) + features += 'INHERIT += "sign_package_feed"\n' + features += 'PACKAGE_FEED_GPG_NAME = "testuser"\n' + features += 'PACKAGE_FEED_GPG_PASSPHRASE_FILE = "%s"\n' % os.path.join(signing_key_dir, 'key.passphrase') + features += 'GPG_PATH = "%s"\n' % self.gpg_home + features += 'PSEUDO_IGNORE_PATHS .= ",%s"\n' % self.gpg_home + self.write_config(features) + + # Build core-image-sato and testimage + bitbake('core-image-full-cmdline socat') + bitbake('-c testimage core-image-full-cmdline') + def test_testimage_virgl_gtk_sdl(self): """ Summary: Check host-assisted accelerate OpenGL functionality in qemu with gtk and SDL frontends diff --git a/poky/meta/recipes-bsp/u-boot/u-boot-common.inc b/poky/meta/recipes-bsp/u-boot/u-boot-common.inc index 8e78ea4a75..d366f10398 100644 --- a/poky/meta/recipes-bsp/u-boot/u-boot-common.inc +++ b/poky/meta/recipes-bsp/u-boot/u-boot-common.inc @@ -14,9 +14,11 @@ PE = "1" # repo during parse SRCREV = "d637294e264adfeb29f390dfc393106fd4d41b17" -SRC_URI = "git://git.denx.de/u-boot.git;branch=master \ - " +SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master" S = "${WORKDIR}/git" B = "${WORKDIR}/build" + +inherit pkgconfig + do_configure[cleandirs] = "${B}" diff --git a/poky/meta/recipes-connectivity/bluez5/bluez5.inc b/poky/meta/recipes-connectivity/bluez5/bluez5.inc index 79d4645ca8..22dd07b348 100644 --- a/poky/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/poky/meta/recipes-connectivity/bluez5/bluez5.inc @@ -53,6 +53,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch', d)} \ file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \ file://0001-test-gatt-Fix-hung-issue.patch \ + file://fix_service.patch \ " S = "${WORKDIR}/bluez-${PV}" diff --git a/poky/meta/recipes-connectivity/bluez5/bluez5/fix_service.patch b/poky/meta/recipes-connectivity/bluez5/bluez5/fix_service.patch new file mode 100644 index 0000000000..96fdf6b299 --- /dev/null +++ b/poky/meta/recipes-connectivity/bluez5/bluez5/fix_service.patch @@ -0,0 +1,30 @@ +The systemd bluetooth service failed to start because the /var/lib/bluetooth +path of ReadWritePaths= is created by the bluetooth daemon itself. + +The commit systemd: Add more filesystem lockdown (442d211) add ReadWritePaths=/etc/bluetooth +and ReadOnlyPaths=/var/lib/bluetooth options to the bluetooth systemd service. +The existing ProtectSystem=full option mounts the /usr, the boot loader +directories and /etc read-only. This means the two option are useless and could be removed. + +Upstream-Status: Submitted [https://github.com/bluez/bluez/issues/329] + +Index: bluez-5.64/src/bluetooth.service.in +=================================================================== +--- bluez-5.64.orig/src/bluetooth.service.in ++++ bluez-5.64/src/bluetooth.service.in +@@ -15,12 +15,12 @@ LimitNPROC=1 + + # Filesystem lockdown + ProtectHome=true +-ProtectSystem=full ++ProtectSystem=strict + PrivateTmp=true + ProtectKernelTunables=true + ProtectControlGroups=true +-ReadWritePaths=@statedir@ +-ReadOnlyPaths=@confdir@ ++ConfigurationDirectory=bluetooth ++StateDirectory=bluetooth + + # Execute Mappings + MemoryDenyWriteExecute=true diff --git a/poky/meta/recipes-core/busybox/busybox/0001-libbb-sockaddr2str-ensure-only-printable-characters-.patch b/poky/meta/recipes-core/busybox/busybox/0001-libbb-sockaddr2str-ensure-only-printable-characters-.patch new file mode 100644 index 0000000000..4635250170 --- /dev/null +++ b/poky/meta/recipes-core/busybox/busybox/0001-libbb-sockaddr2str-ensure-only-printable-characters-.patch @@ -0,0 +1,41 @@ +From 0c8da1bead8ffaf270b4b723ead2c517371405d7 Mon Sep 17 00:00:00 2001 +From: Ariadne Conill <ariadne@dereferenced.org> +Date: Sun, 3 Apr 2022 12:14:33 +0000 +Subject: [PATCH 1/2] libbb: sockaddr2str: ensure only printable characters are + returned for the hostname part + +CVE: CVE-2022-28391 +Upstream-Status: Pending +Signed-off-by: Ariadne Conill <ariadne@dereferenced.org> +Signed-off-by: Steve Sakoman <steve@sakoman.com> +--- + libbb/xconnect.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/libbb/xconnect.c b/libbb/xconnect.c +index 0e0b247b8..02c061e67 100644 +--- a/libbb/xconnect.c ++++ b/libbb/xconnect.c +@@ -497,8 +497,9 @@ static char* FAST_FUNC sockaddr2str(const struct sockaddr *sa, int flags) + ); + if (rc) + return NULL; ++ /* ensure host contains only printable characters */ + if (flags & IGNORE_PORT) +- return xstrdup(host); ++ return xstrdup(printable_string(host)); + #if ENABLE_FEATURE_IPV6 + if (sa->sa_family == AF_INET6) { + if (strchr(host, ':')) /* heh, it's not a resolved hostname */ +@@ -509,7 +510,7 @@ static char* FAST_FUNC sockaddr2str(const struct sockaddr *sa, int flags) + #endif + /* For now we don't support anything else, so it has to be INET */ + /*if (sa->sa_family == AF_INET)*/ +- return xasprintf("%s:%s", host, serv); ++ return xasprintf("%s:%s", printable_string(host), serv); + /*return xstrdup(host);*/ + } + +-- +2.35.1 + diff --git a/poky/meta/recipes-core/busybox/busybox/0002-nslookup-sanitize-all-printed-strings-with-printable.patch b/poky/meta/recipes-core/busybox/busybox/0002-nslookup-sanitize-all-printed-strings-with-printable.patch new file mode 100644 index 0000000000..0d7409ddc3 --- /dev/null +++ b/poky/meta/recipes-core/busybox/busybox/0002-nslookup-sanitize-all-printed-strings-with-printable.patch @@ -0,0 +1,69 @@ +From 812b407e545b70b16cf32aade135b5c32eaf674f Mon Sep 17 00:00:00 2001 +From: Ariadne Conill <ariadne@dereferenced.org> +Date: Sun, 3 Apr 2022 12:16:45 +0000 +Subject: [PATCH 2/2] nslookup: sanitize all printed strings with + printable_string + +Otherwise, terminal sequences can be injected, which enables various terminal injection +attacks from DNS results. + +CVE: CVE-2022-28391 +Upstream-Status: Pending +Signed-off-by: Ariadne Conill <ariadne@dereferenced.org> +Signed-off-by: Steve Sakoman <steve@sakoman.com> +--- + networking/nslookup.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/networking/nslookup.c b/networking/nslookup.c +index 6da97baf4..4bdcde1b8 100644 +--- a/networking/nslookup.c ++++ b/networking/nslookup.c +@@ -407,7 +407,7 @@ static NOINLINE int parse_reply(const unsigned char *msg, size_t len) + //printf("Unable to uncompress domain: %s\n", strerror(errno)); + return -1; + } +- printf(format, ns_rr_name(rr), dname); ++ printf(format, ns_rr_name(rr), printable_string(dname)); + break; + + case ns_t_mx: +@@ -422,7 +422,7 @@ static NOINLINE int parse_reply(const unsigned char *msg, size_t len) + //printf("Cannot uncompress MX domain: %s\n", strerror(errno)); + return -1; + } +- printf("%s\tmail exchanger = %d %s\n", ns_rr_name(rr), n, dname); ++ printf("%s\tmail exchanger = %d %s\n", ns_rr_name(rr), n, printable_string(dname)); + break; + + case ns_t_txt: +@@ -434,7 +434,7 @@ static NOINLINE int parse_reply(const unsigned char *msg, size_t len) + if (n > 0) { + memset(dname, 0, sizeof(dname)); + memcpy(dname, ns_rr_rdata(rr) + 1, n); +- printf("%s\ttext = \"%s\"\n", ns_rr_name(rr), dname); ++ printf("%s\ttext = \"%s\"\n", ns_rr_name(rr), printable_string(dname)); + } + break; + +@@ -454,7 +454,7 @@ static NOINLINE int parse_reply(const unsigned char *msg, size_t len) + } + + printf("%s\tservice = %u %u %u %s\n", ns_rr_name(rr), +- ns_get16(cp), ns_get16(cp + 2), ns_get16(cp + 4), dname); ++ ns_get16(cp), ns_get16(cp + 2), ns_get16(cp + 4), printable_string(dname)); + break; + + case ns_t_soa: +@@ -483,7 +483,7 @@ static NOINLINE int parse_reply(const unsigned char *msg, size_t len) + return -1; + } + +- printf("\tmail addr = %s\n", dname); ++ printf("\tmail addr = %s\n", printable_string(dname)); + cp += n; + + printf("\tserial = %lu\n", ns_get32(cp)); +-- +2.35.1 + diff --git a/poky/meta/recipes-core/busybox/busybox_1.35.0.bb b/poky/meta/recipes-core/busybox/busybox_1.35.0.bb index ab11f3d89a..f2f1b35902 100644 --- a/poky/meta/recipes-core/busybox/busybox_1.35.0.bb +++ b/poky/meta/recipes-core/busybox/busybox_1.35.0.bb @@ -47,6 +47,8 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0001-testsuite-use-www.example.org-for-wget-test-cases.patch \ file://0001-du-l-works-fix-to-use-145-instead-of-144.patch \ file://0001-sysctl-ignore-EIO-of-stable_secret-below-proc-sys-ne.patch \ + file://0001-libbb-sockaddr2str-ensure-only-printable-characters-.patch \ + file://0002-nslookup-sanitize-all-printed-strings-with-printable.patch \ " SRC_URI:append:libc-musl = " file://musl.cfg " diff --git a/poky/meta/recipes-core/gettext/gettext_0.21.bb b/poky/meta/recipes-core/gettext/gettext_0.21.bb index 30c1955d86..364e6a52a1 100644 --- a/poky/meta/recipes-core/gettext/gettext_0.21.bb +++ b/poky/meta/recipes-core/gettext/gettext_0.21.bb @@ -8,6 +8,15 @@ SECTION = "libs" LICENSE = "GPL-3.0-or-later & LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e" +# without libxml in PACKAGECONFIG vendor copy of the lib will be used +LICENSE:append = " ${@bb.utils.contains('PACKAGECONFIG', 'libxml', '', '& MIT', d)}" +LIC_FILES_CHKSUM:append = " ${@bb.utils.contains('PACKAGECONFIG', 'libxml', '', 'file://libtextstyle/lib/libxml/COPYING;md5=2044417e2e5006b65a8b9067b683fcf1', d)}" +# without croco in PACKAGECONFIG vendor copy of the lib will be used +LIC_FILES_CHKSUM:append = " ${@bb.utils.contains('PACKAGECONFIG', 'croco', '', 'file://libtextstyle/lib/libcroco/libcroco.h;md5=915a46e7307c2f7f8d2b9c503fc434ed;beginline=10;endline=28', d)}" +# without glib in PACKAGECONFIG vendor copy of the lib will be used +LIC_FILES_CHKSUM:append = " ${@bb.utils.contains('PACKAGECONFIG', 'glib', '', 'file://libtextstyle/lib/glib/ghash.c;md5=af89a160226edf0b276b6183888037d0;beginline=10;endline=27', d)}" + + DEPENDS = "gettext-native virtual/libiconv" DEPENDS:class-native = "gettext-minimal-native" PROVIDES = "virtual/libintl virtual/gettext" diff --git a/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb b/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb index 703e721a2b..dfb9690a60 100644 --- a/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb +++ b/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb @@ -24,8 +24,8 @@ IMAGE_FSTYPES = "wic.vmdk wic.vhd wic.vhdx" inherit core-image setuptools3 -SRCREV ?= "0b4231b597618e18668b8340f4209cd364b2b2d0" -SRC_URI = "git://git.yoctoproject.org/poky;branch=master \ +SRCREV ?= "0674ae7bc46ebfa90c55bbedec6b22dc5f48dacf" +SRC_URI = "git://git.yoctoproject.org/poky;branch=kirkstone \ file://Yocto_Build_Appliance.vmx \ file://Yocto_Build_Appliance.vmxf \ file://README_VirtualBox_Guest_Additions.txt \ diff --git a/poky/meta/recipes-core/meta/buildtools-tarball.bb b/poky/meta/recipes-core/meta/buildtools-tarball.bb index f9f36e68c4..6b59e4934d 100644 --- a/poky/meta/recipes-core/meta/buildtools-tarball.bb +++ b/poky/meta/recipes-core/meta/buildtools-tarball.bb @@ -69,8 +69,10 @@ create_sdk_files:append () { touch $script echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:${SDKPATHNATIVE}${sbindir_nativesdk}:${SDKPATHNATIVE}${base_bindir_nativesdk}:${SDKPATHNATIVE}${base_sbindir_nativesdk}:$PATH' >> $script echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script - echo 'export GIT_SSL_CAINFO="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script - echo 'export SSL_CERT_FILE="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script + if [ -e "${SDK_OUTPUT}${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt" ]; then + echo 'export GIT_SSL_CAINFO="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script + echo 'export SSL_CERT_FILE="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script + fi toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${SDK_SYS} diff --git a/poky/meta/recipes-core/ncurses/ncurses.inc b/poky/meta/recipes-core/ncurses/ncurses.inc index a0ecd8a80b..7a7c7dd227 100644 --- a/poky/meta/recipes-core/ncurses/ncurses.inc +++ b/poky/meta/recipes-core/ncurses/ncurses.inc @@ -2,7 +2,7 @@ SUMMARY = "The New Curses library" DESCRIPTION = "SVr4 and XSI-Curses compatible curses library and terminfo tools including tic, infocmp, captoinfo. Supports color, multiple highlights, forms-drawing characters, and automatic recognition of keypad and function-key sequences. Extensions include resizable windows and mouse support on both xterm and Linux console using the gpm library." HOMEPAGE = "http://www.gnu.org/software/ncurses/ncurses.html" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=5526f2f3a29edc95538b368a4771edda" +LIC_FILES_CHKSUM = "file://COPYING;md5=9529289636145d1bf093c96af067695a;endline=27" SECTION = "libs" DEPENDS = "ncurses-native" DEPENDS:class-native = "" diff --git a/poky/meta/recipes-core/systemd/systemd-boot_250.4.bb b/poky/meta/recipes-core/systemd/systemd-boot_250.4.bb index 23a64bf30d..b67706b731 100644 --- a/poky/meta/recipes-core/systemd/systemd-boot_250.4.bb +++ b/poky/meta/recipes-core/systemd/systemd-boot_250.4.bb @@ -19,7 +19,6 @@ objcopy = ${@meson_array('OBJCOPY', d)} EOF } -# need to use ${HOST_PREFIX} here, otherwise ld.bfd could be used from HOSTTOOLS_NONFATAL EFI_LD = "bfd" EXTRA_OEMESON += "-Defi=true \ diff --git a/poky/meta/recipes-core/systemd/systemd_250.4.bb b/poky/meta/recipes-core/systemd/systemd_250.4.bb index 2b346113b5..15e2185dff 100644 --- a/poky/meta/recipes-core/systemd/systemd_250.4.bb +++ b/poky/meta/recipes-core/systemd/systemd_250.4.bb @@ -337,10 +337,6 @@ do_install() { # create link for existing udev rules ln -s ${base_bindir}/udevadm ${D}${base_sbindir}/udevadm - # duplicate udevadm for postinst script - install -d ${D}${libexecdir} - ln ${D}${base_bindir}/udevadm ${D}${libexecdir}/${MLPREFIX}udevadm - # install default policy for presets # https://www.freedesktop.org/wiki/Software/systemd/Preset/#howto install -Dm 0644 ${WORKDIR}/99-default.preset ${D}${systemd_unitdir}/system-preset/99-default.preset @@ -718,7 +714,6 @@ FILES:udev += "${base_sbindir}/udevd \ ${base_bindir}/systemd-hwdb \ ${base_bindir}/udevadm \ ${base_sbindir}/udevadm \ - ${libexecdir}/${MLPREFIX}udevadm \ ${datadir}/bash-completion/completions/udevadm \ ${systemd_system_unitdir}/systemd-hwdb-update.service \ " diff --git a/poky/meta/recipes-core/udev/eudev_3.2.10.bb b/poky/meta/recipes-core/udev/eudev_3.2.10.bb index dec16be046..ccc66ae131 100644 --- a/poky/meta/recipes-core/udev/eudev_3.2.10.bb +++ b/poky/meta/recipes-core/udev/eudev_3.2.10.bb @@ -51,10 +51,6 @@ do_install:append() { # hid2hci has moved to bluez4. removed in udev as of version 169 rm -f ${D}${base_libdir}/udev/hid2hci - - # duplicate udevadm for postinst script - install -d ${D}${libexecdir} - ln ${D}${bindir}/udevadm ${D}${libexecdir}/${MLPREFIX}udevadm } do_install:prepend:class-target () { diff --git a/poky/meta/recipes-devtools/apt/apt_2.4.3.bb b/poky/meta/recipes-devtools/apt/apt_2.4.4.bb index 27e455747f..9faf1e7ea9 100644 --- a/poky/meta/recipes-devtools/apt/apt_2.4.3.bb +++ b/poky/meta/recipes-devtools/apt/apt_2.4.4.bb @@ -25,7 +25,7 @@ SRC_URI:append:class-nativesdk = " \ file://0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch \ " -SRC_URI[sha256sum] = "5a7215ca924302da0b2205862cd2d651326eea222a589184ec6ce663885729f7" +SRC_URI[sha256sum] = "d6d83d122ddd7cc83b2c2f839a55940c13ab93e5cf6024a010d6a6b4110dcf0e" LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263" # the package is taken from snapshots.debian.org; that source is static and goes stale diff --git a/poky/meta/recipes-devtools/cmake/cmake-native_3.22.3.bb b/poky/meta/recipes-devtools/cmake/cmake-native_3.22.3.bb index 8293fe5e56..ee1f7761c4 100644 --- a/poky/meta/recipes-devtools/cmake/cmake-native_3.22.3.bb +++ b/poky/meta/recipes-devtools/cmake/cmake-native_3.22.3.bb @@ -9,6 +9,14 @@ SRC_URI += "file://OEToolchainConfig.cmake \ file://0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch \ " +LICENSE:append = " & BSD-1-Clause & MIT & BSD-2-Clause" +LIC_FILES_CHKSUM:append = " \ + file://Utilities/cmjsoncpp/LICENSE;md5=fa2a23dd1dc6c139f35105379d76df2b \ + file://Utilities/cmlibarchive/COPYING;md5=d499814247adaee08d88080841cb5665 \ + file://Utilities/cmexpat/COPYING;md5=9e2ce3b3c4c0f2670883a23bbd7c37a9 \ + file://Utilities/cmlibrhash/COPYING;md5=a8c2a557a5c53b1c12cddbee98c099af \ + file://Utilities/cmlibuv/LICENSE;md5=a68902a430e32200263d182d44924d47 \ +" B = "${WORKDIR}/build" do_configure[cleandirs] = "${B}" diff --git a/poky/meta/recipes-devtools/cmake/cmake_3.22.3.bb b/poky/meta/recipes-devtools/cmake/cmake_3.22.3.bb index e111dd3c5a..752c37ba7d 100644 --- a/poky/meta/recipes-devtools/cmake/cmake_3.22.3.bb +++ b/poky/meta/recipes-devtools/cmake/cmake_3.22.3.bb @@ -12,6 +12,13 @@ SRC_URI:append:class-nativesdk = " \ file://0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch \ " +LICENSE:append = " & BSD-1-Clause & MIT" +LIC_FILES_CHKSUM:append = " \ + file://Utilities/cmjsoncpp/LICENSE;md5=fa2a23dd1dc6c139f35105379d76df2b \ + file://Utilities/cmlibrhash/COPYING;md5=a8c2a557a5c53b1c12cddbee98c099af \ + file://Utilities/cmlibuv/LICENSE;md5=a68902a430e32200263d182d44924d47 \ +" + # Strip ${prefix} from ${docdir}, set result into docdir_stripped python () { prefix=d.getVar("prefix") diff --git a/poky/meta/recipes-devtools/git/git_2.35.1.bb b/poky/meta/recipes-devtools/git/git_2.35.3.bb index 47c2211864..68981d4fde 100644 --- a/poky/meta/recipes-devtools/git/git_2.35.1.bb +++ b/poky/meta/recipes-devtools/git/git_2.35.3.bb @@ -2,7 +2,7 @@ SUMMARY = "Distributed version control system" HOMEPAGE = "http://git-scm.com" DESCRIPTION = "Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency." SECTION = "console/utils" -LICENSE = "GPL-2.0-only" +LICENSE = "GPL-2.0-only & GPL-2.0-or-later & BSD-3-Clause & MIT & BSL-1.0 & LGPL-2.1-or-later" DEPENDS = "openssl zlib" PROVIDES:append:class-native = " git-replacement-native" @@ -14,10 +14,24 @@ SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.gz;name=tarball \ S = "${WORKDIR}/git-${PV}" -LIC_FILES_CHKSUM = "file://COPYING;md5=7c0d7ef03a7eb04ce795b0f60e68e7e1" +LIC_FILES_CHKSUM = "\ + file://COPYING;md5=7c0d7ef03a7eb04ce795b0f60e68e7e1 \ + file://reftable/LICENSE;md5=1a6424cafc4c9c88c689848e165af33b \ + file://sha1dc/LICENSE.txt;md5=9bbe4c990a9e98ea4b98ef5d3bcb8a7a \ + file://compat/nedmalloc/License.txt;md5=e4224ccaecb14d942c71d31bef20d78c \ + file://compat/inet_ntop.c;md5=76593c6f74e8ced5b24520175688d59b;endline=16 \ + file://compat/obstack.h;md5=08ad25fee5428cd879ceef451ce3a22e;endline=18 \ + file://compat/poll/poll.h;md5=9fc00170a53b8e3e52157c91ac688dd1;endline=19 \ + file://compat/regex/regex.h;md5=30cc8af0e6f0f8a25acec6d8783bb763;beginline=4;endline=22 \ +" CVE_PRODUCT = "git-scm:git" +# This is about a manpage not mentioning --mirror may "leak" information +# in mirrored git repos. Most OE users wouldn't build the docs and +# we don't see this as a major issue for our general users/usecases. +CVE_CHECK_IGNORE += "CVE-2022-24975" + PACKAGECONFIG ??= "expat curl" PACKAGECONFIG[cvsserver] = "" PACKAGECONFIG[svn] = "" @@ -151,4 +165,4 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ " EXTRA_OEMAKE += "NO_GETTEXT=1" -SRC_URI[tarball.sha256sum] = "9845a37dd01f9faaa7d8aa2078399d3aea91b43819a5efea6e2877b0af09bd43" +SRC_URI[tarball.sha256sum] = "cad708072d5c0b390c71651f5edb44143f00b357766973470bf9adebc0944c03" diff --git a/poky/meta/recipes-devtools/lua/lua/CVE-2022-28805.patch b/poky/meta/recipes-devtools/lua/lua/CVE-2022-28805.patch new file mode 100644 index 0000000000..3680c715a7 --- /dev/null +++ b/poky/meta/recipes-devtools/lua/lua/CVE-2022-28805.patch @@ -0,0 +1,26 @@ +From 1f3c6f4534c6411313361697d98d1145a1f030fa Mon Sep 17 00:00:00 2001 +From: Roberto Ierusalimschy <roberto@inf.puc-rio.br> +Date: Tue, 15 Feb 2022 12:28:46 -0300 +Subject: [PATCH] Bug: Lua can generate wrong code when _ENV is <const> + +CVE: CVE-2022-28805 + +Upstream-Status: Backport [https://github.com/lua/lua/commit/1f3c6f4534c6411313361697d98d1145a1f030fa] + +Signed-off-by: Steve Sakoman <steve@sakoman.com> +--- + src/lparser.c | 1 + + 1 files changed, 1 insertions(+) + +diff --git a/src/lparser.c b/src/lparser.c +index 3abe3d751..a5cd55257 100644 +--- a/src/lparser.c ++++ b/src/lparser.c +@@ -468,6 +468,7 @@ static void singlevar (LexState *ls, expdesc *var) { + expdesc key; + singlevaraux(fs, ls->envn, var, 1); /* get environment variable */ + lua_assert(var->k != VVOID); /* this one must exist */ ++ luaK_exp2anyregup(fs, var); /* but could be a constant */ + codestring(&key, varname); /* key is variable name */ + luaK_indexed(fs, var, &key); /* env[varname] */ + } diff --git a/poky/meta/recipes-devtools/lua/lua_5.4.4.bb b/poky/meta/recipes-devtools/lua/lua_5.4.4.bb index f50328ecfd..d704841378 100644 --- a/poky/meta/recipes-devtools/lua/lua_5.4.4.bb +++ b/poky/meta/recipes-devtools/lua/lua_5.4.4.bb @@ -6,6 +6,7 @@ HOMEPAGE = "http://www.lua.org/" SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz;name=tarballsrc \ file://lua.pc.in \ + file://CVE-2022-28805.patch \ ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'http://www.lua.org/tests/lua-${PV_testsuites}-tests.tar.gz;name=tarballtest file://run-ptest ', '', d)} \ " diff --git a/poky/meta/recipes-devtools/python/python3-pip_22.0.3.bb b/poky/meta/recipes-devtools/python/python3-pip_22.0.3.bb index ee3e578b2c..09a305edf8 100644 --- a/poky/meta/recipes-devtools/python/python3-pip_22.0.3.bb +++ b/poky/meta/recipes-devtools/python/python3-pip_22.0.3.bb @@ -1,8 +1,36 @@ SUMMARY = "The PyPA recommended tool for installing Python packages" HOMEPAGE = "https://pypi.org/project/pip" SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=63ec52baf95163b597008bb46db68030" +LICENSE = "MIT & Apache-2.0 & MPL-2.0 & LGPL-2.1-only & BSD-3-Clause & PSF-2.0 & BSD-2-Clause" +LIC_FILES_CHKSUM = "\ + file://LICENSE.txt;md5=63ec52baf95163b597008bb46db68030 \ + file://src/pip/_vendor/cachecontrol/LICENSE.txt;md5=6572692148079ebbbd800be4b9f36c6d \ + file://src/pip/_vendor/certifi/LICENSE;md5=67da0714c3f9471067b729eca6c9fbe8 \ + file://src/pip/_vendor/chardet/LICENSE;md5=a6f89e2100d9b6cdffcea4f398e37343 \ + file://src/pip/_vendor/colorama/LICENSE.txt;md5=b4936429a56a652b84c5c01280dcaa26 \ + file://src/pip/_vendor/distlib/LICENSE.txt;md5=f6a11430d5cd6e2cd3832ee94f22ddfc \ + file://src/pip/_vendor/distro.LICENSE;md5=d2794c0df5b907fdace235a619d80314 \ + file://src/pip/_vendor/html5lib/LICENSE;md5=1ba5ada9e6fead1fdc32f43c9f10ba7c \ + file://src/pip/_vendor/idna/LICENSE.md;md5=239668a7c6066d9e0c5382e9c8c6c0e1 \ + file://src/pip/_vendor/msgpack/COPYING;md5=cd9523181d9d4fbf7ffca52eaa2a5751 \ + file://src/pip/_vendor/packaging/LICENSE;md5=faadaedca9251a90b205c9167578ce91 \ + file://src/pip/_vendor/packaging/LICENSE.APACHE;md5=2ee41112a44fe7014dce33e26468ba93 \ + file://src/pip/_vendor/pep517/LICENSE;md5=aad69c93f605003e3342b174d9b0708c \ + file://src/pip/_vendor/pkg_resources/LICENSE;md5=9a33897f1bca1160d7aad3835152e158 \ + file://src/pip/_vendor/platformdirs/LICENSE.txt;md5=282c970bb844954c8535dd6e9733db7f \ + file://src/pip/_vendor/progress/LICENSE;md5=00ab78a4113b09aacf63d762a7bb9644 \ + file://src/pip/_vendor/pygments/LICENSE;md5=98419e351433ac106a24e3ad435930bc \ + file://src/pip/_vendor/pyparsing/LICENSE;md5=657a566233888513e1f07ba13e2f47f1 \ + file://src/pip/_vendor/requests/LICENSE;md5=34400b68072d710fecd0a2940a0d1658 \ + file://src/pip/_vendor/resolvelib/LICENSE;md5=78e1c0248051c32a38a7f820c30bd7a5 \ + file://src/pip/_vendor/rich/LICENSE;md5=b5f0b94fbc94f5ad9ae4efcf8a778303 \ + file://src/pip/_vendor/six.LICENSE;md5=43cfc9e4ac0e377acfb9b76f56b8415d \ + file://src/pip/_vendor/tenacity/LICENSE;md5=175792518e4ac015ab6696d16c4f607e \ + file://src/pip/_vendor/tomli/LICENSE;md5=aaaaf0879d17df0110d1aa8c8c9f46f5 \ + file://src/pip/_vendor/typing_extensions.LICENSE;md5=64fc2b30b67d0a8423c250e0386ed72f \ + file://src/pip/_vendor/urllib3/LICENSE.txt;md5=c2823cb995439c984fd62a973d79815c \ + file://src/pip/_vendor/webencodings/LICENSE;md5=81fb24cd7823cce23b69f721993dce4d \ +" inherit pypi python_setuptools_build_meta diff --git a/poky/meta/recipes-devtools/python/python3/0001-setup.py-Do-not-detect-multiarch-paths-when-cross-co.patch b/poky/meta/recipes-devtools/python/python3/0001-setup.py-Do-not-detect-multiarch-paths-when-cross-co.patch new file mode 100644 index 0000000000..1844e0efa3 --- /dev/null +++ b/poky/meta/recipes-devtools/python/python3/0001-setup.py-Do-not-detect-multiarch-paths-when-cross-co.patch @@ -0,0 +1,42 @@ +From dc966f1278c1077938626d682666767d2c8d0c72 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 9 Apr 2022 18:29:47 +0000 +Subject: [PATCH] setup.py: Do not detect multiarch paths when cross-compiling + +add_multiarch_paths() function relies on host tools like dpkg-configure +to operate, which is not good when cross compiling, since it ends up +adding native paths in includes in certain cases, e.g. when building +for aarch64 targets using aarch64 build hosts running debian-like +distributions e.g. ubuntu, it ends up adding native multiarch paths +-I/usr/include/aarch64-linux-gnu during cross compile and since arches +are so similar, cross compiler (epecially clang) is inhererently configured +with multiarch ends up adding these paths to compiler cmdline which +works ok with gcc since headers are similar but clang barfs on some gcc +extentions and build fails due to missing gnu extentions but it silently +compiles when using cross gcc. + +Fixes python3 cross build by not running this funciton when cross compiling + +Upstream-Status: Inappropriate [OE-Specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + setup.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 2e7f263..f7a3d39 100644 +--- a/setup.py ++++ b/setup.py +@@ -840,7 +840,8 @@ class PyBuildExt(build_ext): + # only change this for cross builds for 3.3, issues on Mageia + if CROSS_COMPILING: + self.add_cross_compiling_paths() +- self.add_multiarch_paths() ++ if not CROSS_COMPILING: ++ self.add_multiarch_paths() + self.add_ldflags_cppflags() + + def init_inc_lib_dirs(self): +-- +2.25.1 + diff --git a/poky/meta/recipes-devtools/python/python3_3.10.4.bb b/poky/meta/recipes-devtools/python/python3_3.10.4.bb index 522f0d71ee..7eaafe34ad 100644 --- a/poky/meta/recipes-devtools/python/python3_3.10.4.bb +++ b/poky/meta/recipes-devtools/python/python3_3.10.4.bb @@ -32,6 +32,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://makerace.patch \ file://0001-sysconfig.py-use-platlibdir-also-for-purelib.patch \ file://0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch \ + file://0001-setup.py-Do-not-detect-multiarch-paths-when-cross-co.patch \ " SRC_URI:append:class-native = " \ diff --git a/poky/meta/recipes-devtools/qemu/qemu.inc b/poky/meta/recipes-devtools/qemu/qemu.inc index 9f2fa4322e..4e94c4b2bf 100644 --- a/poky/meta/recipes-devtools/qemu/qemu.inc +++ b/poky/meta/recipes-devtools/qemu/qemu.inc @@ -32,6 +32,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0001-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch \ file://0001-vhost-vsock-detach-the-virqueue-element-in-case-of-e.patch \ file://0002-virtio-net-fix-map-leaking-on-error-during-receive.patch \ + file://pvrdma.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/poky/meta/recipes-devtools/qemu/qemu/pvrdma.patch b/poky/meta/recipes-devtools/qemu/qemu/pvrdma.patch new file mode 100644 index 0000000000..7b0335b1dc --- /dev/null +++ b/poky/meta/recipes-devtools/qemu/qemu/pvrdma.patch @@ -0,0 +1,45 @@ +hw/pvrdma: Protect against buggy or malicious guest driver + +Guest driver might execute HW commands when shared buffers are not yet +allocated. +This might happen on purpose (malicious guest) or because some other +guest/host address mapping. +We need to protect againts such case. + +Reported-by: Mauro Matteo Cascella <mcascell@redhat.com> +Signed-off-by: Yuval Shaia <yuval.shaia.ml@gmail.com> + +CVE: CVE-2022-1050 +Upstream-Status: Submitted [https://lists.nongnu.org/archive/html/qemu-devel/2022-03/msg05197.html] + +Index: qemu-6.2.0/hw/rdma/vmw/pvrdma_cmd.c +=================================================================== +--- qemu-6.2.0.orig/hw/rdma/vmw/pvrdma_cmd.c ++++ qemu-6.2.0/hw/rdma/vmw/pvrdma_cmd.c +@@ -796,6 +796,12 @@ int pvrdma_exec_cmd(PVRDMADev *dev) + + dsr_info = &dev->dsr_info; + ++ if (!dsr_info->dsr) { ++ /* Buggy or malicious guest driver */ ++ rdma_error_report("Exec command without dsr, req or rsp buffers"); ++ goto out; ++ } ++ + if (dsr_info->req->hdr.cmd >= sizeof(cmd_handlers) / + sizeof(struct cmd_handler)) { + rdma_error_report("Unsupported command"); +Index: qemu-6.2.0/hw/rdma/vmw/pvrdma_main.c +=================================================================== +--- qemu-6.2.0.orig/hw/rdma/vmw/pvrdma_main.c ++++ qemu-6.2.0/hw/rdma/vmw/pvrdma_main.c +@@ -249,7 +249,8 @@ static void init_dsr_dev_caps(PVRDMADev + { + struct pvrdma_device_shared_region *dsr; + +- if (dev->dsr_info.dsr == NULL) { ++ if (!dev->dsr_info.dsr) { ++ /* Buggy or malicious guest driver */ + rdma_error_report("Can't initialized DSR"); + return; + } diff --git a/poky/meta/recipes-devtools/ruby/ruby_3.1.1.bb b/poky/meta/recipes-devtools/ruby/ruby_3.1.2.bb index d8fddfa520..38ba46731b 100644 --- a/poky/meta/recipes-devtools/ruby/ruby_3.1.1.bb +++ b/poky/meta/recipes-devtools/ruby/ruby_3.1.2.bb @@ -14,7 +14,7 @@ SRC_URI += " \ file://0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch \ " -SRC_URI[sha256sum] = "fe6e4782de97443978ddba8ba4be38d222aa24dc3e3f02a6a8e7701c0eeb619d" +SRC_URI[sha256sum] = "61843112389f02b735428b53bb64cf988ad9fb81858b8248e22e57336f24a83e" PACKAGECONFIG ??= "" PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" diff --git a/poky/meta/recipes-extended/libidn/libidn2_2.3.2.bb b/poky/meta/recipes-extended/libidn/libidn2_2.3.2.bb index 7316c031ce..e1b25b4b8c 100644 --- a/poky/meta/recipes-extended/libidn/libidn2_2.3.2.bb +++ b/poky/meta/recipes-extended/libidn/libidn2_2.3.2.bb @@ -2,10 +2,11 @@ SUMMARY = "Internationalized Domain Name support library" DESCRIPTION = "Implementation of the Stringprep, Punycode and IDNA specifications defined by the IETF Internationalized Domain Names (IDN) working group." HOMEPAGE = "http://www.gnu.org/software/libidn/" SECTION = "libs" -LICENSE = "(GPL-2.0-or-later | LGPL-3.0-only) & GPL-3.0-or-later" +LICENSE = "(GPL-2.0-or-later | LGPL-3.0-only) & GPL-3.0-or-later & Unicode-DFS-2016" LIC_FILES_CHKSUM = "file://COPYING;md5=2d834ea7d480438ada04e5d846152395 \ file://COPYING.LESSERv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.unicode;md5=684cf5f7e3fded3546679424528261a9 \ file://src/idn2.c;endline=16;md5=e4b6d628a84a55f1fd8ae4c76c5f6509 \ file://lib/idn2.h.in;endline=27;md5=d0fc8ec628be130a1d5b889107e92477" @@ -25,7 +26,7 @@ do_install:append() { sed -i -e 's|-L${STAGING_LIBDIR}||' -e 's/ */ /g' ${D}${libdir}/pkgconfig/libidn2.pc } -LICENSE:${PN} = "(GPL-2.0-or-later | LGPL-3.0-only)" +LICENSE:${PN} = "(GPL-2.0-or-later | LGPL-3.0-only) & Unicode-DFS-2016" LICENSE:${PN}-bin = "GPL-3.0-or-later" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-extended/mdadm/mdadm_4.2.bb b/poky/meta/recipes-extended/mdadm/mdadm_4.2.bb index 1c2fc8c37a..19035caaec 100644 --- a/poky/meta/recipes-extended/mdadm/mdadm_4.2.bb +++ b/poky/meta/recipes-extended/mdadm/mdadm_4.2.bb @@ -35,8 +35,6 @@ DEPENDS = "udev" SYSTEMD_SERVICE:${PN} = "mdmonitor.service" SYSTEMD_AUTO_ENABLE = "disable" -CFLAGS:append:toolchain-clang = " -Wno-error=address-of-packed-member" - # PPC64 and MIPS64 uses long long for u64 in the kernel, but powerpc's asm/types.h # prevents 64-bit userland from seeing this definition, instead defaulting # to u64 == long in userspace. Define __SANE_USERSPACE_TYPES__ to get diff --git a/poky/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch b/poky/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch index 4bb6be43ed..628db42136 100644 --- a/poky/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch +++ b/poky/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch @@ -1,4 +1,7 @@ -Disable use of syslog for shadow-native tools +From 8b845fff891798a03bdf21354b52e4487c2c0200 Mon Sep 17 00:00:00 2001 +From: Richard Purdie <richard.purdie@linuxfoundation.org> +Date: Thu, 14 Apr 2022 23:11:53 +0000 +Subject: [PATCH] Disable use of syslog for shadow-native tools Disable use of syslog to prevent sysroot user and group additions from writing entries to the host's syslog. This patch should only be used @@ -6,17 +9,44 @@ with the shadow-native recipe. Upstream-Status: Inappropriate [OE specific configuration] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> +Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> -Index: shadow-4.11.1/configure.ac -=================================================================== ---- shadow-4.11.1.orig/configure.ac -+++ shadow-4.11.1/configure.ac -@@ -204,7 +204,7 @@ AC_DEFINE_UNQUOTED(PASSWD_PROGRAM, "$sha +--- + configure.ac | 2 +- + src/login_nopam.c | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 5dcae19..b2c58f5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -204,7 +204,7 @@ AC_DEFINE_UNQUOTED(PASSWD_PROGRAM, "$shadow_cv_passwd_dir/passwd", [Path to passwd program.]) dnl XXX - quick hack, should disappear before anyone notices :). -AC_DEFINE(USE_SYSLOG, 1, [Define to use syslog().]) -+AC_DEFINE(USE_SYSLOG, 0, [Define to use syslog().]) ++#AC_DEFINE(USE_SYSLOG, 1, [Define to use syslog().]) if test "$ac_cv_func_ruserok" = "yes"; then AC_DEFINE(RLOGIN, 1, [Define if login should support the -r flag for rlogind.]) AC_DEFINE(RUSEROK, 0, [Define to the ruserok() "success" return value (0 or 1).]) +diff --git a/src/login_nopam.c b/src/login_nopam.c +index df6ba88..fc24e13 100644 +--- a/src/login_nopam.c ++++ b/src/login_nopam.c +@@ -29,7 +29,6 @@ + #ifndef USE_PAM + #ident "$Id$" + +-#include "prototypes.h" + /* + * This module implements a simple but effective form of login access + * control based on login names and on host (or domain) names, internet +@@ -57,6 +56,8 @@ + #include <netinet/in.h> + #include <arpa/inet.h> /* for inet_ntoa() */ + ++#include "prototypes.h" ++ + #if !defined(MAXHOSTNAMELEN) || (MAXHOSTNAMELEN < 64) + #undef MAXHOSTNAMELEN + #define MAXHOSTNAMELEN 256 diff --git a/poky/meta/recipes-gnome/epiphany/epiphany_41.3.bb b/poky/meta/recipes-gnome/epiphany/epiphany_42.0.bb index 6dca6a7305..1cf731c7d6 100644 --- a/poky/meta/recipes-gnome/epiphany/epiphany_41.3.bb +++ b/poky/meta/recipes-gnome/epiphany/epiphany_42.0.bb @@ -16,6 +16,7 @@ DEPENDS = " \ libdazzle \ libhandy \ glib-2.0-native \ + coreutils-native \ " GNOMEBASEBUILDCLASS = "meson" @@ -24,11 +25,10 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl" SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@oe.utils.trim_version("${PV}", 1)}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ file://0002-help-meson.build-disable-the-use-of-yelp.patch \ - file://bfbb5f7bab38301d8a4a444173acdae8d9692146.patch \ file://migrator.patch \ file://distributor.patch \ " -SRC_URI[archive.sha256sum] = "ba01268ee54f318dfdac2e01eba38a3fc96940c1cbf640ed2613ae29f8bcb9ad" +SRC_URI[archive.sha256sum] = "3dbfa8c00e45b7f44e1824d01f0febe83707b5fb9330c261173f68b7f03cd5e3" PACKAGECONFIG_SOUP ?= "soup2" PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}" diff --git a/poky/meta/recipes-gnome/epiphany/files/bfbb5f7bab38301d8a4a444173acdae8d9692146.patch b/poky/meta/recipes-gnome/epiphany/files/bfbb5f7bab38301d8a4a444173acdae8d9692146.patch deleted file mode 100644 index f20975c3bd..0000000000 --- a/poky/meta/recipes-gnome/epiphany/files/bfbb5f7bab38301d8a4a444173acdae8d9692146.patch +++ /dev/null @@ -1,35 +0,0 @@ -From bfbb5f7bab38301d8a4a444173acdae8d9692146 Mon Sep 17 00:00:00 2001 -From: rvalue <i@rvalue.moe> -Date: Wed, 24 Nov 2021 04:52:42 +0000 -Subject: [PATCH] Remove incorrect args for i18n.merge_file - -Part-of: <https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1031> -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - data/meson.build | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index 46df3fd80..eac6b8224 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -16,7 +16,6 @@ install_data( - desktop_conf = configuration_data() - desktop_conf.set('icon', application_id) - desktop = i18n.merge_file( -- 'desktop', - input: configure_file( - input: files('org.gnome.Epiphany.desktop.in.in'), - output: 'org.gnome.Epiphany.desktop.in', -@@ -32,7 +31,6 @@ desktop = i18n.merge_file( - appdata_conf = configuration_data() - appdata_conf.set('appid', application_id) - appdata = i18n.merge_file( -- 'appdata', - input: configure_file( - input: files('org.gnome.Epiphany.appdata.xml.in.in'), - output: 'org.gnome.Epiphany.appdata.xml.in', --- -GitLab - diff --git a/poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch b/poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch index 32f98e049b..5afba3c644 100644 --- a/poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch +++ b/poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch @@ -1,4 +1,4 @@ -From 15ffd817b3e334dc7c0508761c7ef417d76379c5 Mon Sep 17 00:00:00 2001 +From 63d97fefdbc90f5c68f67bdc30844776d9a1b720 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <jussi.kukkonen@intel.com> Date: Tue, 30 May 2017 14:55:49 +0300 Subject: [PATCH] Don't use AC_CANONICAL_HOST @@ -14,12 +14,12 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> 1 file changed, 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 040975e..5f7b53a 100644 +index f2659a5..1e8b016 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,6 @@ AC_PREREQ(2.53) - AC_INIT([adwaita-icon-theme], [42.0], + AC_INIT([adwaita-icon-theme], [41.0], [http://bugzilla.gnome.org/enter_bug.cgi?product=adwaita-icon-theme]) -AC_CANONICAL_HOST AC_CONFIG_MACRO_DIR([m4]) diff --git a/poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch b/poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch new file mode 100644 index 0000000000..a1d39cf558 --- /dev/null +++ b/poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch @@ -0,0 +1,84 @@ +From 79da031e9811f3eef34b14cce419be93fea34319 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Tue, 13 Jun 2017 18:10:06 +0300 +Subject: [PATCH] Run installation commands as shell jobs + +This greatly speeds up installation time on multi-core systems. + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/merge_requests/39] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + +--- + src/fullcolor/Makefile.am | 5 +++-- + src/spinner/Makefile.am | 7 ++++--- + src/symbolic/Makefile.am | 11 ++++++----- + 3 files changed, 13 insertions(+), 10 deletions(-) + +diff --git a/src/fullcolor/Makefile.am b/src/fullcolor/Makefile.am +index d73529b..b7d0808 100644 +--- a/src/fullcolor/Makefile.am ++++ b/src/fullcolor/Makefile.am +@@ -9,9 +9,10 @@ install-data-local: + for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size && find . -name "*.png"`; do \ + context="`dirname $$file`"; \ + $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \ +- $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \ ++ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \ + done; \ +- done; ++ done; \ ++ wait + + ## FIXME we should add a way to remove links generated by icon mapping + uninstall-local: +diff --git a/src/spinner/Makefile.am b/src/spinner/Makefile.am +index c14caf6..322dc0d 100644 +--- a/src/spinner/Makefile.am ++++ b/src/spinner/Makefile.am +@@ -24,13 +24,14 @@ install-data-local: + for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size; find . -name "*.png"`; do \ + context="`dirname $$file`"; \ + $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \ +- $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \ ++ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \ + done; \ + for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32; find . -name "*.svg"`; do \ + context="`dirname $$file`"; \ + $(mkdir_p) $(DESTDIR)$(themedir)/scalable-up-to-32/$$context; \ +- $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32/$$file $(DESTDIR)$(themedir)/scalable-up-to-32/$$file; \ +- done ++ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32/$$file $(DESTDIR)$(themedir)/scalable-up-to-32/$$file & \ ++ done; \ ++ wait + + uninstall-local: + for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32; find . -name "*.svg"`; do \ +diff --git a/src/symbolic/Makefile.am b/src/symbolic/Makefile.am +index 957c0ee..e1f8818 100644 +--- a/src/symbolic/Makefile.am ++++ b/src/symbolic/Makefile.am +@@ -34,18 +34,19 @@ install-data-local: + for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size; find . -name "*.png"`; do \ + context="`dirname $$file`"; \ + $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \ +- $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \ ++ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \ + done; \ +- done ++ done; \ + for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable; find . -name "*.svg"`; do \ + context="`dirname $$file`"; \ + $(mkdir_p) $(DESTDIR)$(themedir)/scalable/$$context; \ +- $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $(DESTDIR)$(themedir)/scalable/$$file; \ ++ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $(DESTDIR)$(themedir)/scalable/$$file & \ + for size in $(symbolic_encode_sizes); do \ + $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \ +- $(GTK_ENCODE_SYMBOLIC_SVG) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $$size -o $(DESTDIR)$(themedir)/$$size/$$context; \ ++ $(GTK_ENCODE_SYMBOLIC_SVG) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $$size -o $(DESTDIR)$(themedir)/$$size/$$context & \ + done \ +- done ++ done; \ ++ wait + + uninstall-local: + for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable; find . -name "*.svg"`; do \ diff --git a/poky/meta/recipes-gnome/gnome/adwaita-icon-theme_42.0.bb b/poky/meta/recipes-gnome/gnome/adwaita-icon-theme_41.0.bb index c4f3b1c999..46f9f4772c 100644 --- a/poky/meta/recipes-gnome/gnome/adwaita-icon-theme_42.0.bb +++ b/poky/meta/recipes-gnome/gnome/adwaita-icon-theme_41.0.bb @@ -12,9 +12,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c \ inherit allarch autotools pkgconfig gettext gtk-icon-cache gnomebase -SRC_URI += " file://0001-Don-t-use-AC_CANONICAL_HOST.patch" +SRC_URI += " \ + file://0001-Don-t-use-AC_CANONICAL_HOST.patch \ + file://0001-Run-installation-commands-as-shell-jobs.patch \ + " -SRC_URI[archive.sha256sum] = "5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0" +SRC_URI[archive.sha256sum] = "ef5339d8c35fcad5d10481b70480803f0fa20b3d3cbc339238fcaceeaee01eba" DEPENDS += "librsvg-native" diff --git a/poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.20.bb b/poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.20.bb index 4ba22c1fe6..c1c827af79 100644 --- a/poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.20.bb +++ b/poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.20.bb @@ -7,8 +7,13 @@ BUGTRACKER = "http://bugzilla.libsdl.org/" SECTION = "libs" -LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=68a088513da90254b2fbe664f42af315" +LICENSE = "Zlib & BSD-2-Clause" +LIC_FILES_CHKSUM = "\ + file://LICENSE.txt;md5=68a088513da90254b2fbe664f42af315 \ + file://src/hidapi/LICENSE.txt;md5=7c3949a631240cb6c31c50f3eb696077 \ + file://src/hidapi/LICENSE-bsd.txt;md5=b5fa085ce0926bb50d0621620a82361f \ + file://src/video/yuv2rgb/LICENSE;md5=79f8f3418d91531e05f0fc94ca67e071 \ +" # arm-neon adds MIT license LICENSE:append = " ${@bb.utils.contains('PACKAGECONFIG', 'arm-neon', '& MIT', '', d)}" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb b/poky/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb index f465266672..b0b6cb6b56 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb @@ -6,7 +6,7 @@ using file descriptor passing." require xorg-lib-common.inc -LICENSE = "MIT" +LICENSE = "HPND" LIC_FILES_CHKSUM = "file://COPYING;md5=47e508ca280fde97906eacb77892c3ac" DEPENDS += "virtual/libx11" diff --git a/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-render-Fix-build-with-gcc-12.patch b/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-render-Fix-build-with-gcc-12.patch new file mode 100644 index 0000000000..df9332fae7 --- /dev/null +++ b/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-render-Fix-build-with-gcc-12.patch @@ -0,0 +1,90 @@ +From 12041ad0610f1345d6b9994c32943fd4dd01f65d Mon Sep 17 00:00:00 2001 +From: Olivier Fourdan <ofourdan@redhat.com> +Date: Thu, 20 Jan 2022 10:20:38 +0100 +Subject: [PATCH] render: Fix build with gcc 12 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The xserver fails to compile with the latest gcc 12: + + render/picture.c: In function ‘CreateSolidPicture’: + render/picture.c:874:26: error: array subscript ‘union _SourcePict[0]’ is partly outside array bounds of ‘unsigned char[16]’ [-Werror=array-bounds] + 874 | pPicture->pSourcePict->type = SourcePictTypeSolidFill; + | ^~ + render/picture.c:868:45: note: object of size 16 allocated by ‘malloc’ + 868 | pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictSolidFill)); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + render/picture.c: In function ‘CreateLinearGradientPicture’: + render/picture.c:906:26: error: array subscript ‘union _SourcePict[0]’ is partly outside array bounds of ‘unsigned char[32]’ [-Werror=array-bounds] + 906 | pPicture->pSourcePict->linear.type = SourcePictTypeLinear; + | ^~ + render/picture.c:899:45: note: object of size 32 allocated by ‘malloc’ + 899 | pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictLinearGradient)); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + render/picture.c: In function ‘CreateConicalGradientPicture’: + render/picture.c:989:26: error: array subscript ‘union _SourcePict[0]’ is partly outside array bounds of ‘unsigned char[32]’ [-Werror=array-bounds] + 989 | pPicture->pSourcePict->conical.type = SourcePictTypeConical; + | ^~ + render/picture.c:982:45: note: object of size 32 allocated by ‘malloc’ + 982 | pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictConicalGradient)); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + cc1: some warnings being treated as errors + ninja: build stopped: subcommand failed. + +This is because gcc 12 has become stricter and raises a warning now. + +Fix the warning/error by allocating enough memory to store the union +struct. + +Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/xserver/-/commit/c6b0dcb82d4db07a2f32c09a8c09c85a5f57248e] +Signed-off-by: Olivier Fourdan <ofourdan@redhat.com> +Acked-by: Michel Dänzer <mdaenzer@redhat.com> +Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1256 +--- + render/picture.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/render/picture.c b/render/picture.c +index afa0d25..2be4b19 100644 +--- a/render/picture.c ++++ b/render/picture.c +@@ -865,7 +865,7 @@ CreateSolidPicture(Picture pid, xRenderColor * color, int *error) + } + + pPicture->id = pid; +- pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictSolidFill)); ++ pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict)); + if (!pPicture->pSourcePict) { + *error = BadAlloc; + free(pPicture); +@@ -896,7 +896,7 @@ CreateLinearGradientPicture(Picture pid, xPointFixed * p1, xPointFixed * p2, + } + + pPicture->id = pid; +- pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictLinearGradient)); ++ pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict)); + if (!pPicture->pSourcePict) { + *error = BadAlloc; + free(pPicture); +@@ -936,7 +936,7 @@ CreateRadialGradientPicture(Picture pid, xPointFixed * inner, + } + + pPicture->id = pid; +- pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictRadialGradient)); ++ pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict)); + if (!pPicture->pSourcePict) { + *error = BadAlloc; + free(pPicture); +@@ -979,7 +979,7 @@ CreateConicalGradientPicture(Picture pid, xPointFixed * center, xFixed angle, + } + + pPicture->id = pid; +- pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictConicalGradient)); ++ pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict)); + if (!pPicture->pSourcePict) { + *error = BadAlloc; + free(pPicture); +-- +2.35.1 + diff --git a/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.3.bb b/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.3.bb index 3e076ecca7..1f53ab5177 100644 --- a/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.3.bb +++ b/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.3.bb @@ -2,6 +2,7 @@ require xserver-xorg.inc SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \ file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \ + file://0001-render-Fix-build-with-gcc-12.patch \ " SRC_URI[sha256sum] = "61d6aad5b6b47a116b960bd7f0cba4ee7e6da95d6bb0b127bde75d7d1acdebe5" diff --git a/poky/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/poky/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index 0dcf1281f0..a6ab9ca56d 100644 --- a/poky/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/poky/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -3,8 +3,11 @@ DESCRIPTION = "Powerful set of tools or managing Yocto Linux kernel sources \ and configuration data. You can use these tools to make a single configuration \ change, apply multiple patches, or work with your own kernel sources." HOMEPAGE = "https://www.yoctoproject.org/" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249624278c3e343e501" +LICENSE = "GPL-2.0-only & MIT" +LIC_FILES_CHKSUM = "\ + file://tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249624278c3e343e501 \ + file://Kconfiglib/LICENSE.txt;md5=712177a72a3937909543eda3ad1bfb7c \ +" DEPENDS = "git-native" diff --git a/poky/meta/recipes-kernel/linux-firmware/linux-firmware_20220310.bb b/poky/meta/recipes-kernel/linux-firmware/linux-firmware_20220411.bb index fa0f906db0..c7d9e1126e 100644 --- a/poky/meta/recipes-kernel/linux-firmware/linux-firmware_20220310.bb +++ b/poky/meta/recipes-kernel/linux-firmware/linux-firmware_20220411.bb @@ -132,7 +132,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ - file://WHENCE;md5=45a9c4a92d152e9495db81e1192f2bdc \ + file://WHENCE;md5=4cf67d71a21887c682c3989a4318745e \ " # These are not common licenses, set NO_GENERIC_LICENSE for them @@ -205,7 +205,7 @@ PE = "1" SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/firmware/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "5938ee717b2023b48f6bfcf344b40ddc947e3e22c0bc36d4c3418f90fea68182" +SRC_URI[sha256sum] = "020b11f6412f4956f5a6f98de7d41867d2b30ea0ce81b1e2d206ec9840363849" inherit allarch diff --git a/poky/meta/recipes-kernel/linux/kernel-devsrc.bb b/poky/meta/recipes-kernel/linux/kernel-devsrc.bb index 8d360ed3f3..9654488a54 100644 --- a/poky/meta/recipes-kernel/linux/kernel-devsrc.bb +++ b/poky/meta/recipes-kernel/linux/kernel-devsrc.bb @@ -112,7 +112,9 @@ do_install() { fi if [ "${ARCH}" = "arm64" -o "${ARCH}" = "riscv" ]; then - cp -a --parents arch/${ARCH}/kernel/vdso/vdso.lds $kerneldir/build/ + if [ -e arch/${ARCH}/kernel/vdso/vdso.lds ]; then + cp -a --parents arch/${ARCH}/kernel/vdso/vdso.lds $kerneldir/build/ + fi fi if [ "${ARCH}" = "powerpc" ]; then cp -a --parents arch/powerpc/kernel/vdso32/vdso32.lds $kerneldir/build 2>/dev/null || : @@ -190,7 +192,9 @@ do_install() { if [ "${ARCH}" = "riscv" ]; then cp -a --parents arch/riscv/kernel/vdso/*gettimeofday.* $kerneldir/build/ cp -a --parents arch/riscv/kernel/vdso/note.S $kerneldir/build/ - cp -a --parents arch/riscv/kernel/vdso/gen_vdso_offsets.sh $kerneldir/build/ + if [ -e arch/riscv/kernel/vdso/gen_vdso_offsets.sh ]; then + cp -a --parents arch/riscv/kernel/vdso/gen_vdso_offsets.sh $kerneldir/build/ + fi cp -a --parents arch/riscv/kernel/vdso/* $kerneldir/build/ 2>/dev/null || : fi diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb b/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb index c7f9b102c7..d35632071b 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb @@ -16,7 +16,7 @@ inherit pkgconfig # provide this .inc to set specific revisions include recipes-kernel/linux/linux-yocto-dev-revisions.inc -KBRANCH = "v5.17/standard/base" +KBRANCH = "v5.18/standard/base" KMETA = "kernel-meta" SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name=machine \ @@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name SRCREV_machine ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}' SRCREV_meta ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}' -LINUX_VERSION ?= "5.17+" +LINUX_VERSION ?= "5.18+" LINUX_VERSION_EXTENSION ?= "-yoctodev-${LINUX_KERNEL_TYPE}" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/poky/meta/recipes-kernel/linux/linux-yocto_5.10.bb index 0cf14b748f..06242ade68 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto_5.10.bb @@ -25,9 +25,6 @@ SRCREV_machine:qemumips64 ?= "279f142932679a8ba212ebae4b9db851636a1fab" SRCREV_machine ?= "d2f7a595bf0b752275d503046494b668549cb151" SRCREV_meta ?= "2278ed571c14df6e87d8e01ac26f649d98020623" -# remap qemuarm to qemuarma15 for the 5.8 kernel -# KMACHINE:qemuarm ?= "qemuarma15" - SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/poky/meta/recipes-kernel/linux/linux-yocto_5.15.bb index 54157fd245..5cfa0c37d7 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto_5.15.bb @@ -34,9 +34,6 @@ SRCREV_machine:class-devupstream ?= "e29be6724adbc9c3126d2a9550ec21f927f22f6d" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v5.15/base" -# remap qemuarm to qemuarma15 for the 5.8 kernel -# KMACHINE:qemuarm ?= "qemuarma15" - SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" diff --git a/poky/meta/recipes-kernel/lttng/babeltrace2_2.0.4.bb b/poky/meta/recipes-kernel/lttng/babeltrace2_2.0.4.bb index 248b84e98d..b48f07ea0d 100644 --- a/poky/meta/recipes-kernel/lttng/babeltrace2_2.0.4.bb +++ b/poky/meta/recipes-kernel/lttng/babeltrace2_2.0.4.bb @@ -19,7 +19,7 @@ S = "${WORKDIR}/git" inherit autotools pkgconfig ptest python3targetconfig -EXTRA_OECONF = "--disable-debug-info" +EXTRA_OECONF = "--disable-debug-info --disable-Werror" PACKAGECONFIG ??= "manpages" PACKAGECONFIG[manpages] = ", --disable-man-pages, asciidoc-native xmlto-native" diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-compaction-migratepages-event-name.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-compaction-migratepages-event-name.patch new file mode 100644 index 0000000000..e988f7a3d5 --- /dev/null +++ b/poky/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-compaction-migratepages-event-name.patch @@ -0,0 +1,37 @@ +From c312bda00d2dc10ce5f6c1189acbefee5c6c8c6c Mon Sep 17 00:00:00 2001 +From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> +Date: Tue, 29 Mar 2022 16:34:07 -0400 +Subject: [PATCH 01/10] Fix: compaction migratepages event name + +The commit "fix: mm: compaction: fix the migration stats in trace_mm_compaction_migratepages() (v5.17)" + +Triggers this warning: + + LTTng: event provider mismatch: The event name needs to start with provider name + _ + one or more letter, provider: compaction, event name: mm_compaction_migratepages + +Upstream-Status: Backport + +Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> +Change-Id: I01c7485af765084dafb33bf33ae392e60bfbf1e7 +--- + include/instrumentation/events/compaction.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/include/instrumentation/events/compaction.h b/include/instrumentation/events/compaction.h +index 340e41f5..15964537 100644 +--- a/include/instrumentation/events/compaction.h ++++ b/include/instrumentation/events/compaction.h +@@ -98,7 +98,9 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(compaction_isolate_template, + #endif /* #else #if LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,0,0) */ + + #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0)) +-LTTNG_TRACEPOINT_EVENT(mm_compaction_migratepages, ++LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages, ++ ++ compaction_migratepages, + + TP_PROTO(unsigned long nr_all, + unsigned int nr_succeeded), +-- +2.19.1 + diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-tracepoint-event-allow-same-provider-and-event-n.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-tracepoint-event-allow-same-provider-and-event-n.patch new file mode 100644 index 0000000000..00367eebf8 --- /dev/null +++ b/poky/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-tracepoint-event-allow-same-provider-and-event-n.patch @@ -0,0 +1,48 @@ +From a7eb2e3d0a4beb1ee80b132927641dd05ef2d542 Mon Sep 17 00:00:00 2001 +From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> +Date: Mon, 4 Apr 2022 15:49:32 -0400 +Subject: [PATCH 02/10] Fix: tracepoint event: allow same provider and event + name + +Using the same name for the provider (TRACE_SYSTEM) and event name +causes a compilation error because the same identifiers are emitted +twice. + +Fix this by prefixing the provider identifier with +"__provider_event_desc___". + +Upstream-Status: Backport + +Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> +Change-Id: I8cdf8f859e35b8bd5c19737860d12f1ed546dfc2 +--- + include/lttng/tracepoint-event-impl.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/include/lttng/tracepoint-event-impl.h b/include/lttng/tracepoint-event-impl.h +index 38b1dc43..dcb22247 100644 +--- a/include/lttng/tracepoint-event-impl.h ++++ b/include/lttng/tracepoint-event-impl.h +@@ -1255,7 +1255,7 @@ static const struct lttng_kernel_event_desc __event_desc___##_map = { \ + #define TP_ID1(_token, _system) _token##_system + #define TP_ID(_token, _system) TP_ID1(_token, _system) + +-static const struct lttng_kernel_event_desc * const TP_ID(__event_desc___, TRACE_SYSTEM)[] = { ++static const struct lttng_kernel_event_desc * const TP_ID(__provider_event_desc___, TRACE_SYSTEM)[] = { + #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) + }; + +@@ -1274,8 +1274,8 @@ static const struct lttng_kernel_event_desc * const TP_ID(__event_desc___, TRACE + /* non-const because list head will be modified when registered. */ + static __used struct lttng_kernel_probe_desc TP_ID(__probe_desc___, TRACE_SYSTEM) = { + .provider_name = __stringify(TRACE_SYSTEM), +- .event_desc = TP_ID(__event_desc___, TRACE_SYSTEM), +- .nr_events = ARRAY_SIZE(TP_ID(__event_desc___, TRACE_SYSTEM)), ++ .event_desc = TP_ID(__provider_event_desc___, TRACE_SYSTEM), ++ .nr_events = ARRAY_SIZE(TP_ID(__provider_event_desc___, TRACE_SYSTEM)), + .head = { NULL, NULL }, + .lazy_init_head = { NULL, NULL }, + .lazy = 0, +-- +2.19.1 + diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0003-fix-sched-tracing-Don-t-re-read-p-state-when-emittin.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0003-fix-sched-tracing-Don-t-re-read-p-state-when-emittin.patch new file mode 100644 index 0000000000..afe514de82 --- /dev/null +++ b/poky/meta/recipes-kernel/lttng/lttng-modules/0003-fix-sched-tracing-Don-t-re-read-p-state-when-emittin.patch @@ -0,0 +1,183 @@ +From 8e52fd71e693619f7a58de2692e59f0c826e9988 Mon Sep 17 00:00:00 2001 +From: Michael Jeanson <mjeanson@efficios.com> +Date: Mon, 4 Apr 2022 13:52:57 -0400 +Subject: [PATCH 03/10] fix: sched/tracing: Don't re-read p->state when + emitting sched_switch event (v5.18) + +See upstream commit : + + commit fa2c3254d7cfff5f7a916ab928a562d1165f17bb + Author: Valentin Schneider <valentin.schneider@arm.com> + Date: Thu Jan 20 16:25:19 2022 +0000 + + sched/tracing: Don't re-read p->state when emitting sched_switch event + + As of commit + + c6e7bd7afaeb ("sched/core: Optimize ttwu() spinning on p->on_cpu") + + the following sequence becomes possible: + + p->__state = TASK_INTERRUPTIBLE; + __schedule() + deactivate_task(p); + ttwu() + READ !p->on_rq + p->__state=TASK_WAKING + trace_sched_switch() + __trace_sched_switch_state() + task_state_index() + return 0; + + TASK_WAKING isn't in TASK_REPORT, so the task appears as TASK_RUNNING in + the trace event. + + Prevent this by pushing the value read from __schedule() down the trace + event. + +Upstream-Status: Backport + +Change-Id: I46743cd006be4b4d573cae2d77df7d6d16744d04 +Signed-off-by: Michael Jeanson <mjeanson@efficios.com> +Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> +--- + include/instrumentation/events/sched.h | 88 +++++++++++++++++++++++--- + 1 file changed, 78 insertions(+), 10 deletions(-) + +diff --git a/include/instrumentation/events/sched.h b/include/instrumentation/events/sched.h +index 91953a6f..339bec94 100644 +--- a/include/instrumentation/events/sched.h ++++ b/include/instrumentation/events/sched.h +@@ -20,7 +20,37 @@ + #ifndef _TRACE_SCHED_DEF_ + #define _TRACE_SCHED_DEF_ + +-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,15,0)) ++#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0)) ++ ++static inline long __trace_sched_switch_state(bool preempt, ++ unsigned int prev_state, ++ struct task_struct *p) ++{ ++ unsigned int state; ++ ++#ifdef CONFIG_SCHED_DEBUG ++ BUG_ON(p != current); ++#endif /* CONFIG_SCHED_DEBUG */ ++ ++ /* ++ * Preemption ignores task state, therefore preempted tasks are always ++ * RUNNING (we will not have dequeued if state != RUNNING). ++ */ ++ if (preempt) ++ return TASK_REPORT_MAX; ++ ++ /* ++ * task_state_index() uses fls() and returns a value from 0-8 range. ++ * Decrement it by 1 (except TASK_RUNNING state i.e 0) before using ++ * it for left shift operation to get the correct task->state ++ * mapping. ++ */ ++ state = __task_state_index(prev_state, p->exit_state); ++ ++ return state ? (1 << (state - 1)) : state; ++} ++ ++#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,15,0)) + + static inline long __trace_sched_switch_state(bool preempt, struct task_struct *p) + { +@@ -321,43 +351,81 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_wakeup_template, sched_wakeup_new, + /* + * Tracepoint for task switches, performed by the scheduler: + */ ++ ++#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0)) + LTTNG_TRACEPOINT_EVENT(sched_switch, + +-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,4,0)) + TP_PROTO(bool preempt, +- struct task_struct *prev, +- struct task_struct *next), ++ unsigned int prev_state, ++ struct task_struct *prev, ++ struct task_struct *next), + +- TP_ARGS(preempt, prev, next), ++ TP_ARGS(preempt, prev_state, prev, next), ++ ++ TP_FIELDS( ++ ctf_array_text(char, prev_comm, prev->comm, TASK_COMM_LEN) ++ ctf_integer(pid_t, prev_tid, prev->pid) ++ ctf_integer(int, prev_prio, prev->prio - MAX_RT_PRIO) ++#ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM ++ ctf_enum(task_state, long, prev_state, __trace_sched_switch_state(preempt, prev_state, prev)) + #else +- TP_PROTO(struct task_struct *prev, ++ ctf_integer(long, prev_state, __trace_sched_switch_state(preempt, prev_state, prev)) ++#endif ++ ctf_array_text(char, next_comm, next->comm, TASK_COMM_LEN) ++ ctf_integer(pid_t, next_tid, next->pid) ++ ctf_integer(int, next_prio, next->prio - MAX_RT_PRIO) ++ ) ++) ++ ++#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,4,0)) ++ ++LTTNG_TRACEPOINT_EVENT(sched_switch, ++ ++ TP_PROTO(bool preempt, ++ struct task_struct *prev, + struct task_struct *next), + +- TP_ARGS(prev, next), +-#endif /* #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,4,0)) */ ++ TP_ARGS(preempt, prev, next), + + TP_FIELDS( + ctf_array_text(char, prev_comm, prev->comm, TASK_COMM_LEN) + ctf_integer(pid_t, prev_tid, prev->pid) + ctf_integer(int, prev_prio, prev->prio - MAX_RT_PRIO) +-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,4,0)) + #ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM + ctf_enum(task_state, long, prev_state, __trace_sched_switch_state(preempt, prev)) + #else + ctf_integer(long, prev_state, __trace_sched_switch_state(preempt, prev)) + #endif ++ ctf_array_text(char, next_comm, next->comm, TASK_COMM_LEN) ++ ctf_integer(pid_t, next_tid, next->pid) ++ ctf_integer(int, next_prio, next->prio - MAX_RT_PRIO) ++ ) ++) ++ + #else ++ ++LTTNG_TRACEPOINT_EVENT(sched_switch, ++ ++ TP_PROTO(struct task_struct *prev, ++ struct task_struct *next), ++ ++ TP_ARGS(prev, next), ++ ++ TP_FIELDS( ++ ctf_array_text(char, prev_comm, prev->comm, TASK_COMM_LEN) ++ ctf_integer(pid_t, prev_tid, prev->pid) ++ ctf_integer(int, prev_prio, prev->prio - MAX_RT_PRIO) + #ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM + ctf_enum(task_state, long, prev_state, __trace_sched_switch_state(prev)) + #else + ctf_integer(long, prev_state, __trace_sched_switch_state(prev)) +-#endif + #endif + ctf_array_text(char, next_comm, next->comm, TASK_COMM_LEN) + ctf_integer(pid_t, next_tid, next->pid) + ctf_integer(int, next_prio, next->prio - MAX_RT_PRIO) + ) + ) ++#endif + + /* + * Tracepoint for a task being migrated: +-- +2.19.1 + diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0004-fix-block-remove-genhd.h-v5.18.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0004-fix-block-remove-genhd.h-v5.18.patch new file mode 100644 index 0000000000..9248ffe4ff --- /dev/null +++ b/poky/meta/recipes-kernel/lttng/lttng-modules/0004-fix-block-remove-genhd.h-v5.18.patch @@ -0,0 +1,45 @@ +From 868e0b6db59159197c2cec3550fa4ad5e6572bc5 Mon Sep 17 00:00:00 2001 +From: Michael Jeanson <mjeanson@efficios.com> +Date: Mon, 4 Apr 2022 13:54:59 -0400 +Subject: [PATCH 04/10] fix: block: remove genhd.h (v5.18) + +See upstream commit : + + commit 322cbb50de711814c42fb088f6d31901502c711a + Author: Christoph Hellwig <hch@lst.de> + Date: Mon Jan 24 10:39:13 2022 +0100 + + block: remove genhd.h + + There is no good reason to keep genhd.h separate from the main blkdev.h + header that includes it. So fold the contents of genhd.h into blkdev.h + and remove genhd.h entirely. + +Upstream-Status: Backport + +Change-Id: I7cf2aaa3a4c133320b95f2edde49f790f9515dbd +Signed-off-by: Michael Jeanson <mjeanson@efficios.com> +Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> +--- + include/wrapper/genhd.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/include/wrapper/genhd.h b/include/wrapper/genhd.h +index 3c6dbcbe..4a59b68e 100644 +--- a/include/wrapper/genhd.h ++++ b/include/wrapper/genhd.h +@@ -12,7 +12,11 @@ + #ifndef _LTTNG_WRAPPER_GENHD_H + #define _LTTNG_WRAPPER_GENHD_H + ++#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0)) ++#include <linux/blkdev.h> ++#else + #include <linux/genhd.h> ++#endif + + #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0)) + #define LTTNG_GENHD_FL_HIDDEN GENHD_FL_HIDDEN +-- +2.19.1 + diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0005-fix-scsi-block-Remove-REQ_OP_WRITE_SAME-support-v5.1.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0005-fix-scsi-block-Remove-REQ_OP_WRITE_SAME-support-v5.1.patch new file mode 100644 index 0000000000..0751827613 --- /dev/null +++ b/poky/meta/recipes-kernel/lttng/lttng-modules/0005-fix-scsi-block-Remove-REQ_OP_WRITE_SAME-support-v5.1.patch @@ -0,0 +1,79 @@ +From 2bc7cb7193124d20aa4e1b5dbad0410bfb97a470 Mon Sep 17 00:00:00 2001 +From: Michael Jeanson <mjeanson@efficios.com> +Date: Mon, 4 Apr 2022 14:12:13 -0400 +Subject: [PATCH 05/10] fix: scsi: block: Remove REQ_OP_WRITE_SAME support + (v5.18) + +See upstream commit : + + commit 73bd66d9c834220579c881a3eb020fd8917075d8 + Author: Christoph Hellwig <hch@lst.de> + Date: Wed Feb 9 09:28:28 2022 +0100 + + scsi: block: Remove REQ_OP_WRITE_SAME support + + No more users of REQ_OP_WRITE_SAME or drivers implementing it are left, + so remove the infrastructure. + +Upstream-Status: Backport + +Change-Id: Ifbff71f79f8b590436fc7cb79f82d90c6e033d84 +Signed-off-by: Michael Jeanson <mjeanson@efficios.com> +Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> +--- + include/instrumentation/events/block.h | 32 ++++++++++++++++++++++++++ + 1 file changed, 32 insertions(+) + +diff --git a/include/instrumentation/events/block.h b/include/instrumentation/events/block.h +index 3e1104d7..050a59a2 100644 +--- a/include/instrumentation/events/block.h ++++ b/include/instrumentation/events/block.h +@@ -66,6 +66,37 @@ LTTNG_TRACEPOINT_ENUM(block_rq_type, + #define lttng_bio_op(bio) bio_op(bio) + #define lttng_bio_rw(bio) ((bio)->bi_opf) + ++#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0)) ++#ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM ++#define blk_rwbs_ctf_integer(type, rwbs, op, rw, bytes) \ ++ ctf_enum(block_rq_type, type, rwbs, \ ++ ( (op) == REQ_OP_WRITE ? RWBS_FLAG_WRITE : \ ++ ( (op) == REQ_OP_DISCARD ? RWBS_FLAG_DISCARD : \ ++ ( (op) == REQ_OP_SECURE_ERASE ? (RWBS_FLAG_DISCARD | RWBS_FLAG_SECURE) : \ ++ ( (op) == REQ_OP_FLUSH ? RWBS_FLAG_FLUSH : \ ++ ( (op) == REQ_OP_READ ? RWBS_FLAG_READ : \ ++ ( 0 )))))) \ ++ | ((rw) & REQ_RAHEAD ? RWBS_FLAG_RAHEAD : 0) \ ++ | ((rw) & REQ_SYNC ? RWBS_FLAG_SYNC : 0) \ ++ | ((rw) & REQ_META ? RWBS_FLAG_META : 0) \ ++ | ((rw) & REQ_PREFLUSH ? RWBS_FLAG_PREFLUSH : 0) \ ++ | ((rw) & REQ_FUA ? RWBS_FLAG_FUA : 0)) ++#else ++#define blk_rwbs_ctf_integer(type, rwbs, op, rw, bytes) \ ++ ctf_integer(type, rwbs, \ ++ ( (op) == REQ_OP_WRITE ? RWBS_FLAG_WRITE : \ ++ ( (op) == REQ_OP_DISCARD ? RWBS_FLAG_DISCARD : \ ++ ( (op) == REQ_OP_SECURE_ERASE ? (RWBS_FLAG_DISCARD | RWBS_FLAG_SECURE) : \ ++ ( (op) == REQ_OP_FLUSH ? RWBS_FLAG_FLUSH : \ ++ ( (op) == REQ_OP_READ ? RWBS_FLAG_READ : \ ++ ( 0 )))))) \ ++ | ((rw) & REQ_RAHEAD ? RWBS_FLAG_RAHEAD : 0) \ ++ | ((rw) & REQ_SYNC ? RWBS_FLAG_SYNC : 0) \ ++ | ((rw) & REQ_META ? RWBS_FLAG_META : 0) \ ++ | ((rw) & REQ_PREFLUSH ? RWBS_FLAG_PREFLUSH : 0) \ ++ | ((rw) & REQ_FUA ? RWBS_FLAG_FUA : 0)) ++#endif /* CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM */ ++#else + #ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM + #define blk_rwbs_ctf_integer(type, rwbs, op, rw, bytes) \ + ctf_enum(block_rq_type, type, rwbs, \ +@@ -95,6 +126,7 @@ LTTNG_TRACEPOINT_ENUM(block_rq_type, + | ((rw) & REQ_PREFLUSH ? RWBS_FLAG_PREFLUSH : 0) \ + | ((rw) & REQ_FUA ? RWBS_FLAG_FUA : 0)) + #endif /* CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM */ ++#endif + + #elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,1,0)) + +-- +2.19.1 + diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0006-fix-random-remove-unused-tracepoints-v5.18.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0006-fix-random-remove-unused-tracepoints-v5.18.patch new file mode 100644 index 0000000000..9c2f70d4af --- /dev/null +++ b/poky/meta/recipes-kernel/lttng/lttng-modules/0006-fix-random-remove-unused-tracepoints-v5.18.patch @@ -0,0 +1,47 @@ +From 369d82bb1746447514c877088d7c5fd0f39140f8 Mon Sep 17 00:00:00 2001 +From: Michael Jeanson <mjeanson@efficios.com> +Date: Mon, 4 Apr 2022 14:33:42 -0400 +Subject: [PATCH 06/10] fix: random: remove unused tracepoints (v5.18) + +See upstream commit : + + commit 14c174633f349cb41ea90c2c0aaddac157012f74 + Author: Jason A. Donenfeld <Jason@zx2c4.com> + Date: Thu Feb 10 16:40:44 2022 +0100 + + random: remove unused tracepoints + + These explicit tracepoints aren't really used and show sign of aging. + It's work to keep these up to date, and before I attempted to keep them + up to date, they weren't up to date, which indicates that they're not + really used. These days there are better ways of introspecting anyway. + +Upstream-Status: Backport + +Change-Id: I3b8c3e2732e7efdd76ce63204ac53a48784d0df6 +Signed-off-by: Michael Jeanson <mjeanson@efficios.com> +Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> +--- + src/probes/Kbuild | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/probes/Kbuild b/src/probes/Kbuild +index e26b4359..8d6ff0f2 100644 +--- a/src/probes/Kbuild ++++ b/src/probes/Kbuild +@@ -187,8 +187,11 @@ ifneq ($(CONFIG_FRAME_WARN),0) + CFLAGS_lttng-probe-printk.o += -Wframe-larger-than=2200 + endif + ++# Introduced in v3.6, remove in v5.18 + obj-$(CONFIG_LTTNG) += $(shell \ +- if [ $(VERSION) -ge 4 \ ++ if [ \( ! \( $(VERSION) -ge 6 -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -ge 18 \) \) \) \ ++ -a \ ++ $(VERSION) -ge 4 \ + -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 6 \) \ + -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -eq 5 -a $(SUBLEVEL) -ge 2 \) \ + -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -eq 4 -a $(SUBLEVEL) -ge 9 \) \ +-- +2.19.1 + diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0007-fix-kprobes-Use-rethook-for-kretprobe-if-possible-v5.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0007-fix-kprobes-Use-rethook-for-kretprobe-if-possible-v5.patch new file mode 100644 index 0000000000..effd37ffe1 --- /dev/null +++ b/poky/meta/recipes-kernel/lttng/lttng-modules/0007-fix-kprobes-Use-rethook-for-kretprobe-if-possible-v5.patch @@ -0,0 +1,72 @@ +From 3c46ddc134621dba65030263aa321dd6bdae3ba3 Mon Sep 17 00:00:00 2001 +From: Michael Jeanson <mjeanson@efficios.com> +Date: Mon, 4 Apr 2022 15:02:10 -0400 +Subject: [PATCH 07/10] fix: kprobes: Use rethook for kretprobe if possible + (v5.18) + +See upstream commit : + + commit 73f9b911faa74ac5107879de05c9489c419f41bb + Author: Masami Hiramatsu <mhiramat@kernel.org> + Date: Sat Mar 26 11:27:05 2022 +0900 + + kprobes: Use rethook for kretprobe if possible + + Use rethook for kretprobe function return hooking if the arch sets + CONFIG_HAVE_RETHOOK=y. In this case, CONFIG_KRETPROBE_ON_RETHOOK is + set to 'y' automatically, and the kretprobe internal data fields + switches to use rethook. If not, it continues to use kretprobe + specific function return hooks. + +Upstream-Status: Backport + +Change-Id: I2b7670dc04e4769c1e3c372582ad2f555f6d7a66 +Signed-off-by: Michael Jeanson <mjeanson@efficios.com> +Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> +--- + include/wrapper/kprobes.h | 17 +++++++++++++++++ + src/probes/lttng-kretprobes.c | 2 +- + 2 files changed, 18 insertions(+), 1 deletion(-) + +diff --git a/include/wrapper/kprobes.h b/include/wrapper/kprobes.h +index b546d615..51d32b7c 100644 +--- a/include/wrapper/kprobes.h ++++ b/include/wrapper/kprobes.h +@@ -29,4 +29,21 @@ struct kretprobe *lttng_get_kretprobe(struct kretprobe_instance *ri) + + #endif /* LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0) */ + ++ ++#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0)) ++static inline ++unsigned long lttng_get_kretprobe_retaddr(struct kretprobe_instance *ri) ++{ ++ return get_kretprobe_retaddr(ri); ++} ++ ++#else ++ ++static inline ++unsigned long lttng_get_kretprobe_retaddr(struct kretprobe_instance *ri) ++{ ++ return (unsigned long) ri->ret_addr; ++} ++#endif ++ + #endif /* _LTTNG_WRAPPER_KPROBES_H */ +diff --git a/src/probes/lttng-kretprobes.c b/src/probes/lttng-kretprobes.c +index 5cb2e953..565df739 100644 +--- a/src/probes/lttng-kretprobes.c ++++ b/src/probes/lttng-kretprobes.c +@@ -81,7 +81,7 @@ int _lttng_kretprobes_handler(struct kretprobe_instance *krpi, + int ret; + + payload.ip = (unsigned long) lttng_get_kretprobe(krpi)->kp.addr; +- payload.parent_ip = (unsigned long) krpi->ret_addr; ++ payload.parent_ip = lttng_get_kretprobe_retaddr(krpi); + + lib_ring_buffer_ctx_init(&ctx, event_recorder, sizeof(payload), + lttng_alignof(payload), <tng_probe_ctx); +-- +2.19.1 + diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0008-fix-scsi-core-Remove-scsi-scsi_request.h-v5.18.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0008-fix-scsi-core-Remove-scsi-scsi_request.h-v5.18.patch new file mode 100644 index 0000000000..13c504b859 --- /dev/null +++ b/poky/meta/recipes-kernel/lttng/lttng-modules/0008-fix-scsi-core-Remove-scsi-scsi_request.h-v5.18.patch @@ -0,0 +1,44 @@ +From e8d2f286b5b208ac8870d0a9c167b170e96169b3 Mon Sep 17 00:00:00 2001 +From: Michael Jeanson <mjeanson@efficios.com> +Date: Mon, 4 Apr 2022 15:08:48 -0400 +Subject: [PATCH 08/10] fix: scsi: core: Remove <scsi/scsi_request.h> (v5.18) + +See upstream commit : + + commit 26440303310591e29121964ede0048583cb3126d + Author: Christoph Hellwig <hch@lst.de> + Date: Thu Feb 24 18:55:52 2022 +0100 + + scsi: core: Remove <scsi/scsi_request.h> + + This header is empty now except for an include of <linux/blk-mq.h>, so + remove it. + +Upstream-Status: Backport + +Change-Id: Ic8ee3352f1e8bddfcd44c31be9b788db82f183aa +Signed-off-by: Michael Jeanson <mjeanson@efficios.com> +Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> +--- + include/instrumentation/events/block.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/instrumentation/events/block.h b/include/instrumentation/events/block.h +index 050a59a2..882e6e08 100644 +--- a/include/instrumentation/events/block.h ++++ b/include/instrumentation/events/block.h +@@ -11,9 +11,9 @@ + #include <linux/trace_seq.h> + #include <lttng/kernel-version.h> + +-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,11,0)) ++#if LTTNG_KERNEL_RANGE(4,11,0, 5,18,0) + #include <scsi/scsi_request.h> +-#endif /* (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,11,0)) */ ++#endif /* LTTNG_KERNEL_RANGE(4,11,0, 5,18,0) */ + + #ifndef _TRACE_BLOCK_DEF_ + #define _TRACE_BLOCK_DEF_ +-- +2.19.1 + diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0009-Rename-genhd-wrapper-to-blkdev.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0009-Rename-genhd-wrapper-to-blkdev.patch new file mode 100644 index 0000000000..90fec9dc58 --- /dev/null +++ b/poky/meta/recipes-kernel/lttng/lttng-modules/0009-Rename-genhd-wrapper-to-blkdev.patch @@ -0,0 +1,76 @@ +From 82fbf9d383ff9069808fb0f5f75c660098dbae52 Mon Sep 17 00:00:00 2001 +From: Michael Jeanson <mjeanson@efficios.com> +Date: Tue, 5 Apr 2022 14:57:41 -0400 +Subject: [PATCH 09/10] Rename genhd wrapper to blkdev + +The genhd.h header was folded into blkdev.h in v5.18, rename our wrapper +to follow upstream. + +Upstream-Status: Backport + +Change-Id: I4ec94fb94d11712dd20f0680aea1de77fbfa9d17 +Signed-off-by: Michael Jeanson <mjeanson@efficios.com> +Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> +--- + include/wrapper/{genhd.h => blkdev.h} | 10 +++++----- + src/lttng-statedump-impl.c | 2 +- + 2 files changed, 6 insertions(+), 6 deletions(-) + rename include/wrapper/{genhd.h => blkdev.h} (93%) + +diff --git a/include/wrapper/genhd.h b/include/wrapper/blkdev.h +similarity index 93% +rename from include/wrapper/genhd.h +rename to include/wrapper/blkdev.h +index 4a59b68e..0d5ad90f 100644 +--- a/include/wrapper/genhd.h ++++ b/include/wrapper/blkdev.h +@@ -1,6 +1,6 @@ + /* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) + * +- * wrapper/genhd.h ++ * wrapper/blkdev.h + * + * wrapper around block layer functions and data structures. Using + * KALLSYMS to get its address when available, else we need to have a +@@ -9,8 +9,8 @@ + * Copyright (C) 2011-2014 Mathieu Desnoyers <mathieu.desnoyers@efficios.com> + */ + +-#ifndef _LTTNG_WRAPPER_GENHD_H +-#define _LTTNG_WRAPPER_GENHD_H ++#ifndef _LTTNG_WRAPPER_BLKDEV_H ++#define _LTTNG_WRAPPER_BLKDEV_H + + #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0)) + #include <linux/blkdev.h> +@@ -45,7 +45,7 @@ struct class *wrapper_get_block_class(void) + /* + * Canary function to check for 'block_class' at compile time. + * +- * From 'include/linux/genhd.h': ++ * From 'include/linux/blkdev.h': + * + * extern struct class block_class; + */ +@@ -104,4 +104,4 @@ struct device_type *wrapper_get_disk_type(void) + + #endif + +-#endif /* _LTTNG_WRAPPER_GENHD_H */ ++#endif /* _LTTNG_WRAPPER_BLKDEV_H */ +diff --git a/src/lttng-statedump-impl.c b/src/lttng-statedump-impl.c +index 4d7b2921..0e753090 100644 +--- a/src/lttng-statedump-impl.c ++++ b/src/lttng-statedump-impl.c +@@ -41,7 +41,7 @@ + #include <wrapper/namespace.h> + #include <wrapper/irq.h> + #include <wrapper/tracepoint.h> +-#include <wrapper/genhd.h> ++#include <wrapper/blkdev.h> + #include <wrapper/file.h> + #include <wrapper/fdtable.h> + #include <wrapper/sched.h> +-- +2.19.1 + diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0010-fix-mm-compaction-cleanup-the-compaction-trace-event.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0010-fix-mm-compaction-cleanup-the-compaction-trace-event.patch new file mode 100644 index 0000000000..892d3f0d23 --- /dev/null +++ b/poky/meta/recipes-kernel/lttng/lttng-modules/0010-fix-mm-compaction-cleanup-the-compaction-trace-event.patch @@ -0,0 +1,106 @@ +From f9208dc00756dfa0a2f191799722030bdf3f793d Mon Sep 17 00:00:00 2001 +From: Michael Jeanson <mjeanson@efficios.com> +Date: Mon, 4 Apr 2022 15:14:01 -0400 +Subject: [PATCH 10/10] fix: mm: compaction: cleanup the compaction trace + events (v5.18) + +See upstream commit : + + commit abd4349ff9b8d242376b67711254221f64f447c7 + Author: Baolin Wang <baolin.wang@linux.alibaba.com> + Date: Tue Mar 22 14:45:56 2022 -0700 + + mm: compaction: cleanup the compaction trace events + + As Steven suggested [1], we should access the pointers from the trace + event to avoid dereferencing them to the tracepoint function when the + tracepoint is disabled. + + [1] https://lkml.org/lkml/2021/11/3/409 + +Upstream-Status: Backport + +Change-Id: I6c08250df8596e8dbc76780ae5d95c899c12e6fe +Signed-off-by: Michael Jeanson <mjeanson@efficios.com> +Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> +--- + include/instrumentation/events/compaction.h | 17 ++++++++++++++++- + src/probes/Kbuild | 17 ++++++++++++++++- + src/probes/lttng-probe-compaction.c | 5 +++++ + 3 files changed, 37 insertions(+), 2 deletions(-) + +diff --git a/include/instrumentation/events/compaction.h b/include/instrumentation/events/compaction.h +index 15964537..ecae39a8 100644 +--- a/include/instrumentation/events/compaction.h ++++ b/include/instrumentation/events/compaction.h +@@ -97,7 +97,22 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(compaction_isolate_template, + + #endif /* #else #if LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,0,0) */ + +-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0)) ++#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0)) ++LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages, ++ ++ compaction_migratepages, ++ ++ TP_PROTO(struct compact_control *cc, ++ unsigned int nr_succeeded), ++ ++ TP_ARGS(cc, nr_succeeded), ++ ++ TP_FIELDS( ++ ctf_integer(unsigned long, nr_migrated, nr_succeeded) ++ ctf_integer(unsigned long, nr_failed, cc->nr_migratepages - nr_succeeded) ++ ) ++) ++#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0)) + LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages, + + compaction_migratepages, +diff --git a/src/probes/Kbuild b/src/probes/Kbuild +index 8d6ff0f2..54784477 100644 +--- a/src/probes/Kbuild ++++ b/src/probes/Kbuild +@@ -167,7 +167,22 @@ ifneq ($(CONFIG_BTRFS_FS),) + endif # $(wildcard $(btrfs_dep)) + endif # CONFIG_BTRFS_FS + +-obj-$(CONFIG_LTTNG) += lttng-probe-compaction.o ++# A dependency on internal header 'mm/internal.h' was introduced in v5.18 ++compaction_dep = $(srctree)/mm/internal.h ++compaction_dep_wildcard = $(wildcard $(compaction_dep)) ++compaction_dep_check = $(shell \ ++if [ \( $(VERSION) -ge 6 \ ++ -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -ge 18 \) \) -a \ ++ -z "$(compaction_dep_wildcard)" ] ; then \ ++ echo "warn" ; \ ++else \ ++ echo "ok" ; \ ++fi ;) ++ifeq ($(compaction_dep_check),ok) ++ obj-$(CONFIG_LTTNG) += lttng-probe-compaction.o ++else ++ $(warning Files $(compaction_dep) not found. Probe "compaction" is disabled. Use full kernel source tree to enable it.) ++endif # $(wildcard $(compaction_dep)) + + ifneq ($(CONFIG_EXT4_FS),) + ext4_dep = $(srctree)/fs/ext4/*.h +diff --git a/src/probes/lttng-probe-compaction.c b/src/probes/lttng-probe-compaction.c +index f8ddf384..ffaf45f0 100644 +--- a/src/probes/lttng-probe-compaction.c ++++ b/src/probes/lttng-probe-compaction.c +@@ -10,6 +10,11 @@ + + #include <linux/module.h> + #include <lttng/tracer.h> ++#include <lttng/kernel-version.h> ++ ++#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0)) ++#include "../mm/internal.h" ++#endif + + /* + * Create the tracepoint static inlines from the kernel to validate that our +-- +2.19.1 + diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules_2.13.3.bb b/poky/meta/recipes-kernel/lttng/lttng-modules_2.13.3.bb index b6f8ac1315..2b00534e53 100644 --- a/poky/meta/recipes-kernel/lttng/lttng-modules_2.13.3.bb +++ b/poky/meta/recipes-kernel/lttng/lttng-modules_2.13.3.bb @@ -9,7 +9,19 @@ inherit module include lttng-platforms.inc -SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2" +SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ + file://0001-Fix-compaction-migratepages-event-name.patch \ + file://0002-Fix-tracepoint-event-allow-same-provider-and-event-n.patch \ + file://0003-fix-sched-tracing-Don-t-re-read-p-state-when-emittin.patch \ + file://0004-fix-block-remove-genhd.h-v5.18.patch \ + file://0005-fix-scsi-block-Remove-REQ_OP_WRITE_SAME-support-v5.1.patch \ + file://0006-fix-random-remove-unused-tracepoints-v5.18.patch \ + file://0007-fix-kprobes-Use-rethook-for-kretprobe-if-possible-v5.patch \ + file://0008-fix-scsi-core-Remove-scsi-scsi_request.h-v5.18.patch \ + file://0009-Rename-genhd-wrapper-to-blkdev.patch \ + file://0010-fix-mm-compaction-cleanup-the-compaction-trace-event.patch \ + " + # Use :append here so that the patch is applied also when using devupstream SRC_URI:append = " file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch" diff --git a/poky/meta/recipes-kernel/systemtap/systemtap/0001-gcc12-c-compatibility-re-tweak-for-rhel6-use-functio.patch b/poky/meta/recipes-kernel/systemtap/systemtap/0001-gcc12-c-compatibility-re-tweak-for-rhel6-use-functio.patch new file mode 100644 index 0000000000..f885c44460 --- /dev/null +++ b/poky/meta/recipes-kernel/systemtap/systemtap/0001-gcc12-c-compatibility-re-tweak-for-rhel6-use-functio.patch @@ -0,0 +1,49 @@ +From f199d1982ef8a6c6d5c06c082d057b8793bcc6aa Mon Sep 17 00:00:00 2001 +From: Serhei Makarov <serhei@serhei.io> +Date: Fri, 21 Jan 2022 18:21:46 -0500 +Subject: [PATCH] gcc12 c++ compatibility re-tweak for rhel6: use function + pointer instead of lambdas instead of ptr_fun<> + +Saving 2 lines in ltrim/rtrim is probably not a good reason to drop +compatibility with the RHEL6 system compiler. Actually declaring a +named function and passing the function pointer is compatible with +everything. + +Upstream-Status: Backport [https://sourceware.org/git/?p=systemtap.git;a=commit;h=f199d1982ef8a6c6d5c06c082d057b8793bcc6aa] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + util.cxx | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +--- a/util.cxx ++++ b/util.cxx +@@ -1757,21 +1757,24 @@ flush_to_stream (const string &fname, os + return 1; // Failure + } + ++int ++not_isspace(unsigned char c) ++{ ++ return !std::isspace(c); ++} ++ + // trim from start (in place) + void + ltrim(std::string &s) + { +- s.erase(s.begin(), +- std::find_if(s.begin(), s.end(), +- std::not1(std::ptr_fun<int, int>(std::isspace)))); ++ s.erase(s.begin(), std::find_if(s.begin(), s.end(), not_isspace)); + } + + // trim from end (in place) + void + rtrim(std::string &s) + { +- s.erase(std::find_if(s.rbegin(), s.rend(), +- std::not1(std::ptr_fun<int, int>(std::isspace))).base(), s.end()); ++ s.erase(std::find_if(s.rbegin(), s.rend(), not_isspace).base(), s.end()); + } + + // trim from both ends (in place) diff --git a/poky/meta/recipes-kernel/systemtap/systemtap_git.bb b/poky/meta/recipes-kernel/systemtap/systemtap_git.bb index 04f7e03ab5..ce86d5274d 100644 --- a/poky/meta/recipes-kernel/systemtap/systemtap_git.bb +++ b/poky/meta/recipes-kernel/systemtap/systemtap_git.bb @@ -7,7 +7,8 @@ HOMEPAGE = "https://sourceware.org/systemtap/" require systemtap_git.inc SRC_URI += "file://0001-improve-reproducibility-for-c-compiling.patch \ - file://0001-staprun-address-ncurses-6.3-failures.patch \ + file://0001-staprun-address-ncurses-6.3-failures.patch \ + file://0001-gcc12-c-compatibility-re-tweak-for-rhel6-use-functio.patch \ " DEPENDS = "elfutils" diff --git a/poky/meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.02.18.bb b/poky/meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.04.08.bb index 801a6f0584..cd42039680 100644 --- a/poky/meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.02.18.bb +++ b/poky/meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.04.08.bb @@ -5,7 +5,7 @@ LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=07c4f6dea3845b02a18dc00c8c87699c" SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz" -SRC_URI[sha256sum] = "8828c25a4ee25020044004f57374bb9deac852809fad70f8d3d01770bf9ac97f" +SRC_URI[sha256sum] = "884ba2e3c1e8b98762b6dc25ff60b5ec75c8d33a39e019b3ed4aa615491460d3" inherit bin_package allarch diff --git a/poky/meta/recipes-multimedia/alsa/alsa-tools_1.2.5.bb b/poky/meta/recipes-multimedia/alsa/alsa-tools_1.2.5.bb index b0832f93c1..56acc84559 100644 --- a/poky/meta/recipes-multimedia/alsa/alsa-tools_1.2.5.bb +++ b/poky/meta/recipes-multimedia/alsa/alsa-tools_1.2.5.bb @@ -71,6 +71,7 @@ python do_compile() { } python do_install() { + d.delVarFlag("autotools_do_install", "cleandirs") for subdir in d.getVar("PACKAGECONFIG").split(): subdir = subdir.replace("--", "/") bb.note("Installing %s" % subdir) diff --git a/poky/meta/recipes-multimedia/libtiff/tiff/0002-tiffcrop-fix-issue-380-and-382-heap-buffer-overflow-.patch b/poky/meta/recipes-multimedia/libtiff/tiff/0002-tiffcrop-fix-issue-380-and-382-heap-buffer-overflow-.patch index d31e9650d1..812ffb232d 100644 --- a/poky/meta/recipes-multimedia/libtiff/tiff/0002-tiffcrop-fix-issue-380-and-382-heap-buffer-overflow-.patch +++ b/poky/meta/recipes-multimedia/libtiff/tiff/0002-tiffcrop-fix-issue-380-and-382-heap-buffer-overflow-.patch @@ -1,4 +1,5 @@ CVE: CVE-2022-0891 +CVE: CVE-2022-1056 Upstream-Status: Backport Signed-off-by: Ross Burton <ross.burton@arm.com> diff --git a/poky/meta/recipes-sato/puzzles/puzzles_git.bb b/poky/meta/recipes-sato/puzzles/puzzles_git.bb index 381d3cc456..0104f2672a 100644 --- a/poky/meta/recipes-sato/puzzles/puzzles_git.bb +++ b/poky/meta/recipes-sato/puzzles/puzzles_git.bb @@ -23,6 +23,7 @@ DEPENDS += "gtk+3" do_install:append () { # net conflicts with Samba, so rename it mv ${D}${bindir}/net ${D}${bindir}/puzzles-net + rm ${D}/${datadir}/applications/net.desktop # Create desktop shortcuts install -d ${D}/${datadir}/applications/ diff --git a/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.desktop b/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.desktop index 882ea41136..6b7978afc9 100644 --- a/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.desktop +++ b/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.desktop @@ -3,7 +3,7 @@ Version=1.0 Name=Terminal Comment=A unicode capable rxvt clone Exec=rxvt -Icon=terminal +Icon=utilities-terminal Terminal=false Type=Application Categories=Utility;TerminalEmulator; diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch index 54d34b1c69..2379924cc9 100644 --- a/poky/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch +++ b/poky/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch @@ -1,27 +1,38 @@ -From 317a5ac120c44987219bc03486cd2f2d1842c9b9 Mon Sep 17 00:00:00 2001 +From e0bf97eecfa601e08b9578f00b1000890284241a Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Tue, 27 Oct 2015 16:02:19 +0200 Subject: [PATCH] FindGObjectIntrospection.cmake: prefix variables obtained from pkg-config with PKG_CONFIG_SYSROOT_DIR -Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=232933] +See discussion at https://bugs.webkit.org/show_bug.cgi?id=232933 for +reasons why this is not approproiate for upstream submission. + +Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- - Source/cmake/FindGObjectIntrospection.cmake | 1 + - 1 file changed, 1 insertion(+) + Source/cmake/FindGObjectIntrospection.cmake | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/cmake/FindGObjectIntrospection.cmake b/Source/cmake/FindGObjectIntrospection.cmake -index e1f49b4..03a4446 100644 +index be96814a..ae67b593 100644 --- a/Source/cmake/FindGObjectIntrospection.cmake +++ b/Source/cmake/FindGObjectIntrospection.cmake -@@ -26,6 +26,7 @@ macro(_GIR_GET_PKGCONFIG_VAR _outvar _varname _extra_args) - else () - string(REGEX REPLACE "[\r\n]" " " _result "${_result}") - string(REGEX REPLACE " +$" "" _result "${_result}") -+ string(CONCAT _result $ENV{PKG_CONFIG_SYSROOT_DIR} "${_result}") - separate_arguments(_result) - set(${_outvar} ${_result} CACHE INTERNAL "") - endif () --- -2.1.4 - +@@ -16,7 +16,6 @@ + # Redistribution and use is allowed according to the terms of the BSD license. + + +- + find_package(PkgConfig QUIET) + if (PKG_CONFIG_FOUND) + if (PACKAGE_FIND_VERSION_COUNT GREATER 0) +@@ -30,6 +29,9 @@ if (PKG_CONFIG_FOUND) + pkg_get_variable(INTROSPECTION_GENERATE gobject-introspection-1.0 g_ir_generate) + pkg_get_variable(INTROSPECTION_GIRDIR gobject-introspection-1.0 girdir) + pkg_get_variable(INTROSPECTION_TYPELIBDIR gobject-introspection-1.0 typelibdir) ++ set(INTROSPECTION_SCANNER "$ENV{PKG_CONFIG_SYSROOT_DIR}${INTROSPECTION_SCANNER}") ++ set(INTROSPECTION_COMPILER "$ENV{PKG_CONFIG_SYSROOT_DIR}${INTROSPECTION_COMPILER}") ++ set(INTROSPECTION_GENERATE "$ENV{PKG_CONFIG_SYSROOT_DIR}${INTROSPECTION_GENERATE}") + set(INTROSPECTION_VERSION "${_pc_gir_VERSION}") + if (${INTROSPECTION_VERSION} VERSION_GREATER_EQUAL "1.59.1") + set(INTROSPECTION_HAVE_SOURCES_TOP_DIRS YES) diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch deleted file mode 100644 index e06607ba2b..0000000000 --- a/poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 4718888071e29deb8b245b88c81577fd5bac4e5e Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Mon, 29 Aug 2016 16:38:11 +0300 -Subject: [PATCH] Fix racy parallel build of WebKit2-4.0.gir - -Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=232935] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - ---- - Source/WebKit/PlatformGTK.cmake | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake -index a069c5f6..ea2f542b 100644 ---- a/Source/WebKit/PlatformGTK.cmake -+++ b/Source/WebKit/PlatformGTK.cmake -@@ -650,8 +650,9 @@ if (ENABLE_INTROSPECTION) - set(GIR_SOURCES_TOP_DIRS "--sources-top-dirs=${CMAKE_BINARY_DIR}") - endif () - -- add_custom_command( -- OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir -+ # This is a target and not a command because it's used to build another .gir -+ # and a .typelib, which would trigger two racy parallel builds when using command -+ add_custom_target(WebKit2-${WEBKITGTK_API_VERSION}-gir - DEPENDS WebKit - DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir - COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= -@@ -699,7 +700,7 @@ if (ENABLE_INTROSPECTION) - add_custom_command( - OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir - DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir -- DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir -+ DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir - COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} - LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" - ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" -@@ -761,7 +762,7 @@ if (ENABLE_INTROSPECTION) - - add_custom_command( - OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib -- DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir -+ DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir - COMMAND ${INTROSPECTION_COMPILER} --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir -o ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib - ) - diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch deleted file mode 100644 index 9e2bf09dd7..0000000000 --- a/poky/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 8f1e170a6de8036ab50eb35834a77f2c79412ee3 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Wed, 28 Oct 2015 14:18:57 +0200 -Subject: [PATCH] When building introspection files, add CMAKE_C_FLAGS to the - compiler flags. - -g-ir-compiler is using a C compiler internally, so it needs to set -the proper flags for it. - -Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=232936] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - ---- - Source/JavaScriptCore/PlatformGTK.cmake | 2 +- - Source/WebKit/PlatformGTK.cmake | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Source/JavaScriptCore/PlatformGTK.cmake b/Source/JavaScriptCore/PlatformGTK.cmake -index 0b2968d2..2742ad80 100644 ---- a/Source/JavaScriptCore/PlatformGTK.cmake -+++ b/Source/JavaScriptCore/PlatformGTK.cmake -@@ -71,7 +71,7 @@ if (ENABLE_INTROSPECTION) - add_custom_command( - OUTPUT ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir - DEPENDS JavaScriptCore -- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS= -+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= - ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" - ${INTROSPECTION_SCANNER} - --quiet -diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake -index e36e4c35..943f9794 100644 ---- a/Source/WebKit/PlatformGTK.cmake -+++ b/Source/WebKit/PlatformGTK.cmake -@@ -742,7 +742,7 @@ if (ENABLE_INTROSPECTION) - OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir - DEPENDS WebKit - DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir -- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS= -+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= - ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" - ${INTROSPECTION_SCANNER} - --quiet -@@ -786,7 +786,7 @@ if (ENABLE_INTROSPECTION) - OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir - DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir - DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir -- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations -+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} - LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" - ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" - ${INTROSPECTION_SCANNER} diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-do-not-quote-CFLAG.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-do-not-quote-CFLAG.patch new file mode 100644 index 0000000000..3d02be9894 --- /dev/null +++ b/poky/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-do-not-quote-CFLAG.patch @@ -0,0 +1,78 @@ +From 01f5ab0edf3dd8f76d37fd36c2dcd3108be33a7b Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Mon, 4 Apr 2022 21:20:05 +0200 +Subject: [PATCH] When building introspection files, do not quote CFLAGS. + +This does not seem to be propagated to the compiler correctly: + +In file included from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot-native/usr/lib/x86_64-poky-linux/gcc/x86_64-poky-linux/11.2.0/include-fixed/syslimits.h:7, + from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot-native/usr/lib/x86_64-poky-linux/gcc/x86_64-poky-linux/11.2.0/include-fixed/limits.h:34, + from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot/usr/lib/glib-2.0/include/glibconfig.h:11, + from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot/usr/include/glib-2.0/glib/gtypes.h:32, + from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot/usr/include/glib-2.0/glib/galloca.h:32, + from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot/usr/include/glib-2.0/glib.h:30, + from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/build/Source/JavaScriptCore/tmp-introspectb51ks33n/JavaScriptCore-4.0.c:2: +/srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot-native/usr/lib/x86_64-poky-linux/gcc/x86_64-poky-linux/11.2.0/include-fixed/limits.h:203:75: error: no include path in which to search for limits.h + 203 | #include_next <limits.h> /* recurse down to the real one */ + | ^ +In file included from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot/usr/include/glib-2.0/glib/galloca.h:32, + from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot/usr/include/glib-2.0/glib.h:30, + from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/build/Source/JavaScriptCore/tmp-introspectb51ks33n/JavaScriptCore-4.0.c:2: +/srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot/usr/include/glib-2.0/glib/gtypes.h:35:10: fatal error: time.h: No such file or directory + 35 | #include <time.h> + | ^~~~~~~~ +compilation terminated. +Traceback (most recent call last): + File "/srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot-native/usr/lib/python3.10/distutils/unixccompiler.py", line 117, in _compile + self.spawn(compiler_so + cc_args + [src, '-o', obj] + + File "/srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot-native/usr/lib/python3.10/distutils/ccompiler.py", line 910, in spawn + spawn(cmd, dry_run=self.dry_run) + File "/srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot-native/usr/lib/python3.10/distutils/spawn.py", line 91, in spawn + raise DistutilsExecError( +distutils.errors.DistutilsExecError: command '/srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot-native/usr/bin/x86_64-poky-linux/x86_64-poky-linux-gcc' failed with exit code 1 + +Upstream-Status: Inappropriate [upstream has rewritten the whole thing as of https://github.com/WebKit/WebKit/commit/b0ae032850bb6b2672051bab8032fc9f9ef5eb97] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + Source/JavaScriptCore/PlatformGTK.cmake | 2 +- + Source/WebKit/PlatformGTK.cmake | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Source/JavaScriptCore/PlatformGTK.cmake b/Source/JavaScriptCore/PlatformGTK.cmake +index 1c3c8fb7..efd18807 100644 +--- a/Source/JavaScriptCore/PlatformGTK.cmake ++++ b/Source/JavaScriptCore/PlatformGTK.cmake +@@ -71,7 +71,7 @@ if (ENABLE_INTROSPECTION) + add_custom_command( + OUTPUT ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir + DEPENDS JavaScriptCore +- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS="-Wno-deprecated-declarations ${CMAKE_C_FLAGS}" LDFLAGS= ++ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= + ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" + ${INTROSPECTION_SCANNER} + --quiet +diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake +index 48d1820d..ded05035 100644 +--- a/Source/WebKit/PlatformGTK.cmake ++++ b/Source/WebKit/PlatformGTK.cmake +@@ -675,7 +675,7 @@ if (ENABLE_INTROSPECTION) + add_custom_target(WebKit2-${WEBKITGTK_API_VERSION}-gir + DEPENDS WebKit + DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir +- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS="-Wno-deprecated-declarations ${CMAKE_C_FLAGS}" LDFLAGS= ++ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= + ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" + ${INTROSPECTION_SCANNER} + --quiet +@@ -721,7 +721,7 @@ if (ENABLE_INTROSPECTION) + OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir + DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir + DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir +- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS="-Wno-deprecated-declarations ${CMAKE_C_FLAGS}" ++ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} + LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" + ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" + ${INTROSPECTION_SCANNER} +-- +2.30.2 + diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/add_missing_include.patch b/poky/meta/recipes-sato/webkit/webkitgtk/add_missing_include.patch new file mode 100644 index 0000000000..8f59db3130 --- /dev/null +++ b/poky/meta/recipes-sato/webkit/webkitgtk/add_missing_include.patch @@ -0,0 +1,19 @@ +Include locale.h for LC_MESSAGE definition + +This fixes build error +Source/WebCore/accessibility/atspi/AccessibilityRootAtspi.cpp:115:51: error: use of undeclared identifier 'LC_MESSAGES' + return g_variant_new_string(setlocale(LC_MESSAGES, nullptr)); + ^ +Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=239030] +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- a/Source/WebCore/accessibility/atspi/AccessibilityRootAtspi.cpp ++++ b/Source/WebCore/accessibility/atspi/AccessibilityRootAtspi.cpp +@@ -30,6 +30,7 @@ + #include "FrameView.h" + #include "Page.h" + #include <glib/gi18n-lib.h> ++#include <locale.h> + + namespace WebCore { + diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/reduce-memory-overheads.patch b/poky/meta/recipes-sato/webkit/webkitgtk/reduce-memory-overheads.patch deleted file mode 100644 index 907d36c4cd..0000000000 --- a/poky/meta/recipes-sato/webkit/webkitgtk/reduce-memory-overheads.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ec6045fcf5a46123b54029a675d08d89a5e30f21 Mon Sep 17 00:00:00 2001 -From: Alberto Garcia <berto@igalia.com> -Date: Sun, 25 Apr 2021 18:45:13 +0000 -Subject: [PATCH] Reduce memory usage when not using the Gold linker - -Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=232938] -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - Source/cmake/OptionsCommon.cmake | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/Source/cmake/OptionsCommon.cmake b/Source/cmake/OptionsCommon.cmake -index dd4da682..71ad6106 100644 ---- a/Source/cmake/OptionsCommon.cmake -+++ b/Source/cmake/OptionsCommon.cmake -@@ -101,6 +101,11 @@ option(GCC_OFFLINEASM_SOURCE_MAP - ${GCC_OFFLINEASM_SOURCE_MAP_DEFAULT}) - - option(USE_APPLE_ICU "Use Apple's internal ICU" ${APPLE}) -+# Pass --reduce-memory-overheads to the bfd linker in order to save memory -+if (NOT USE_LD_GOLD) -+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--reduce-memory-overheads") -+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--reduce-memory-overheads") -+endif () - - # Enable the usage of OpenMP. - # - At this moment, OpenMP is only used as an alternative implementation diff --git a/poky/meta/recipes-sato/webkit/webkitgtk_2.34.6.bb b/poky/meta/recipes-sato/webkit/webkitgtk_2.36.0.bb index 6870eed525..db8a565511 100644 --- a/poky/meta/recipes-sato/webkit/webkitgtk_2.34.6.bb +++ b/poky/meta/recipes-sato/webkit/webkitgtk_2.36.0.bb @@ -11,15 +11,14 @@ LIC_FILES_CHKSUM = "file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d842 SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ - file://0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch \ - file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \ file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \ - file://reduce-memory-overheads.patch \ file://0001-Fix-build-without-opengl-or-es.patch \ file://reproducibility.patch \ + file://0001-When-building-introspection-files-do-not-quote-CFLAG.patch \ + file://add_missing_include.patch \ " -SRC_URI[sha256sum] = "6bc8fd034aad0432a2459ce4fc7ee25ad65a4924c618bf8d93b52b0c1a84c1f6" +SRC_URI[sha256sum] = "b877cca1f105235f5dd57c7ac2b2c2be3c6b691ff444f93925c7254cf156c64d" inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc @@ -47,7 +46,7 @@ DEPENDS = " \ PACKAGECONFIG_SOUP ?= "soup2" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2 angle', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl-or-es', '', d)} \ enchant \ libsecret \ @@ -72,6 +71,7 @@ PACKAGECONFIG[reduce-size] = "-DCMAKE_BUILD_TYPE=MinSizeRel,-DCMAKE_BUILD_TYPE=R PACKAGECONFIG[lcms] = "-DUSE_LCMS=ON,-DUSE_LCMS=OFF,lcms" PACKAGECONFIG[soup2] = "-DUSE_SOUP2=ON,-DUSE_SOUP2=OFF,libsoup-2.4,,,soup3" PACKAGECONFIG[soup3] = ",,libsoup,,,soup2" +PACKAGECONFIG[journald] = "-DENABLE_JOURNALD_LOG=ON,-DENABLE_JOURNALD_LOG=OFF,systemd" # webkitgtk is full of /usr/bin/env python, particular for generating docs do_configure[postfuncs] += "setup_python_link" diff --git a/poky/meta/recipes-support/gmp/gmp_6.2.1.bb b/poky/meta/recipes-support/gmp/gmp_6.2.1.bb index 72fbf4eefe..29055492c2 100644 --- a/poky/meta/recipes-support/gmp/gmp_6.2.1.bb +++ b/poky/meta/recipes-support/gmp/gmp_6.2.1.bb @@ -2,9 +2,11 @@ require gmp.inc LICENSE = "GPL-2.0-or-later | LGPL-3.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6 \ - file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ +LIC_FILES_CHKSUM = "\ + file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6 \ + file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYINGv3;md5=11cc2d3ee574f9d6b7ee797bdce4d423 \ " REVISION = "" diff --git a/poky/meta/recipes-support/gnupg/gnupg_2.3.4.bb b/poky/meta/recipes-support/gnupg/gnupg_2.3.4.bb index 81361d902c..d27bddb8bd 100644 --- a/poky/meta/recipes-support/gnupg/gnupg_2.3.4.bb +++ b/poky/meta/recipes-support/gnupg/gnupg_2.3.4.bb @@ -83,3 +83,6 @@ PACKAGECONFIG[gnutls] = "--enable-gnutls, --disable-gnutls, gnutls" PACKAGECONFIG[sqlite3] = "--enable-sqlite, --disable-sqlite, sqlite3" BBCLASSEXTEND = "native nativesdk" + +lcl_maybe_fortify:mipsarch = "" + diff --git a/poky/meta/recipes-support/itstool/itstool_2.0.7.bb b/poky/meta/recipes-support/itstool/itstool_2.0.7.bb index 5af16995d7..ddbc49b6cf 100644 --- a/poky/meta/recipes-support/itstool/itstool_2.0.7.bb +++ b/poky/meta/recipes-support/itstool/itstool_2.0.7.bb @@ -5,7 +5,10 @@ XML files. It determines what to translate and how to chunk it into \ messages using the W3C Internationalization Tag Set (ITS). " HOMEPAGE = "http://itstool.org/" LICENSE = "GPL-3.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=59c57b95fd7d0e9e238ebbc7ad47c5a5" +LIC_FILES_CHKSUM = "\ + file://COPYING;md5=59c57b95fd7d0e9e238ebbc7ad47c5a5 \ + file://COPYING.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ +" inherit autotools python3native @@ -13,6 +16,8 @@ DEPENDS = "libxml2-native" SRC_URI = "http://files.itstool.org/${BPN}/${BPN}-${PV}.tar.bz2 \ " +UPSTREAM_CHECK_URI = "https://itstool.org/download.html" + SRC_URI:append:class-native = " file://0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch" SRC_URI:append:class-nativesdk = " file://0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch" SRC_URI:append:class-target = " file://0002-Don-t-use-build-time-hardcoded-python-binary-path.patch" diff --git a/poky/meta/recipes-support/libcap/libcap_2.63.bb b/poky/meta/recipes-support/libcap/libcap_2.63.bb index f3133f9ded..9e341c4bd0 100644 --- a/poky/meta/recipes-support/libcap/libcap_2.63.bb +++ b/poky/meta/recipes-support/libcap/libcap_2.63.bb @@ -5,7 +5,11 @@ users, without giving them full root permissions." HOMEPAGE = "http://sites.google.com/site/fullycapable/" # no specific GPL version required LICENSE = "BSD-3-Clause | GPL-2.0-only" -LIC_FILES_CHKSUM = "file://License;md5=e2370ba375efe9e1a095c26d37e483b8" +LIC_FILES_CHKSUM_PAM = "file://pam_cap/License;md5=0ad4c9c052b9719ee4fce1bfc7c7dee4" +LIC_FILES_CHKSUM = "\ + file://License;md5=e2370ba375efe9e1a095c26d37e483b8 \ + ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${LIC_FILES_CHKSUM_PAM}', '', d)} \ +" DEPENDS = "hostperl-runtime-native gperf-native" diff --git a/poky/meta/recipes-support/libgit2/libgit2_1.4.2.bb b/poky/meta/recipes-support/libgit2/libgit2_1.4.3.bb index 88bf5a8520..7e27b5b018 100644 --- a/poky/meta/recipes-support/libgit2/libgit2_1.4.2.bb +++ b/poky/meta/recipes-support/libgit2/libgit2_1.4.3.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e5a9227de4cb6afb5d35ed7b0fdf480d" DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2" SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.4;protocol=https" -SRCREV = "182d0d1ee933de46bf0b5a6ec269bafa77aba9a2" +SRCREV = "465bbf88ea939a965fbcbade72870c61f815e457" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-support/libsoup/libsoup_3.0.5.bb b/poky/meta/recipes-support/libsoup/libsoup_3.0.6.bb index d2535c91a2..17825ae6a4 100644 --- a/poky/meta/recipes-support/libsoup/libsoup_3.0.5.bb +++ b/poky/meta/recipes-support/libsoup/libsoup_3.0.6.bb @@ -12,7 +12,7 @@ DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3 libpsl nghttp2" SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz" -SRC_URI[sha256sum] = "f5d143db6830b3825edc2a1c4449d639273b0bfa017a4970871962d9bca22145" +SRC_URI[sha256sum] = "b45d59f840b9acf9bb45fd45854e3ef672f57e3ab957401c3ad8d7502ac23da6" PROVIDES = "libsoup-3.0" CVE_PRODUCT = "libsoup" diff --git a/poky/meta/recipes-support/libusb/libusb1_1.0.25.bb b/poky/meta/recipes-support/libusb/libusb1_1.0.26.bb index 64cc19e47d..fd63e7adc2 100644 --- a/poky/meta/recipes-support/libusb/libusb1_1.0.25.bb +++ b/poky/meta/recipes-support/libusb/libusb1_1.0.26.bb @@ -16,7 +16,7 @@ SRC_URI = "https://github.com/libusb/libusb/releases/download/v${PV}/libusb-${PV UPSTREAM_CHECK_URI = "https://github.com/libusb/libusb/releases" -SRC_URI[sha256sum] = "8a28ef197a797ebac2702f095e81975e2b02b2eeff2774fa909c78a74ef50849" +SRC_URI[sha256sum] = "12ce7a61fc9854d1d2a1ffe095f7b5fac19ddba095c259e6067a46500381b5a5" S = "${WORKDIR}/libusb-${PV}" diff --git a/poky/scripts/postinst-intercepts/update_udev_hwdb b/poky/scripts/postinst-intercepts/update_udev_hwdb index 8076b8ae6f..8b3f5de791 100644 --- a/poky/scripts/postinst-intercepts/update_udev_hwdb +++ b/poky/scripts/postinst-intercepts/update_udev_hwdb @@ -9,14 +9,17 @@ case "${PREFERRED_PROVIDER_udev}" in systemd) UDEV_EXTRA_ARGS="--usr" UDEVLIBDIR="${rootlibexecdir}" + UDEVADM="${base_bindir}/udevadm" ;; *) UDEV_EXTRA_ARGS="" UDEVLIBDIR="${sysconfdir}" + UDEVADM="${bindir}/udevadm" ;; esac rm -f $D${UDEVLIBDIR}/udev/hwdb.bin -PSEUDO_UNLOAD=1 ${binprefix}qemuwrapper -L $D $D${libexecdir}/${binprefix}udevadm hwdb --update --root $D ${UDEV_EXTRA_ARGS} +PSEUDO_UNLOAD=1 ${binprefix}qemuwrapper -L $D $D${UDEVADM} hwdb --update --root $D ${UDEV_EXTRA_ARGS} || + PSEUDO_UNLOAD=1 qemuwrapper -L $D $D${UDEVADM} hwdb --update --root $D ${UDEV_EXTRA_ARGS} chown root:root $D${UDEVLIBDIR}/udev/hwdb.bin diff --git a/poky/scripts/runqemu b/poky/scripts/runqemu index 2f77a7bd0f..6e1f073ed2 100755 --- a/poky/scripts/runqemu +++ b/poky/scripts/runqemu @@ -182,6 +182,7 @@ class BaseConfig(object): self.gl = False self.gl_es = False self.egl_headless = False + self.publicvnc = False self.novga = False self.cleantap = False self.saved_stty = '' @@ -521,6 +522,7 @@ class BaseConfig(object): elif arg == 'snapshot': self.snapshot = True elif arg == 'publicvnc': + self.publicvnc = True self.qemu_opt_script += ' -vnc :0' elif arg.startswith('tcpserial='): self.tcpserial_portnum = '%s' % arg[len('tcpserial='):] @@ -1363,13 +1365,27 @@ class BaseConfig(object): if (self.gl_es == True or self.gl == True) and (self.sdl == False and self.gtk == False): raise RunQemuError('Option gl/gl-es needs gtk or sdl option.') - if self.sdl == True or self.gtk == True or self.egl_headless == True: - if self.gl or self.gl_es or self.egl_headless: - self.qemu_opt += ' -device virtio-vga-gl ' + # If we have no display option, we autodetect based upon what qemu supports. We + # need our font setup and show-cusor below so we need to see what qemu --help says + # is supported so we can pass our correct config in. + if not self.nographic and not self.sdl and not self.gtk and not self.publicvnc and not self.egl_headless == True: + output = subprocess.check_output([self.qemu_bin, "--help"], universal_newlines=True) + if "-display gtk" in output: + self.gtk = True + elif "-display sdl" in output: + self.sdl = True else: - self.qemu_opt += ' -device virtio-vga ' + self.qemu_opt += '-display none' - self.qemu_opt += '-display ' + if self.sdl == True or self.gtk == True or self.egl_headless == True: + + if self.qemu_system.endswith(('i386', 'x86_64')): + if self.gl or self.gl_es or self.egl_headless: + self.qemu_opt += ' -device virtio-vga-gl ' + else: + self.qemu_opt += ' -device virtio-vga ' + + self.qemu_opt += ' -display ' if self.egl_headless == True: self.set_dri_path() self.qemu_opt += 'egl-headless,' @@ -1415,7 +1431,7 @@ class BaseConfig(object): if serial_num < 2: self.qemu_opt += " -serial null" - def setup_final(self): + def find_qemu(self): qemu_bin = os.path.join(self.bindir_native, self.qemu_system) # It is possible to have qemu-native in ASSUME_PROVIDED, and it won't @@ -1434,8 +1450,13 @@ class BaseConfig(object): if not os.access(qemu_bin, os.X_OK): raise OEPathError("No QEMU binary '%s' could be found" % qemu_bin) + self.qemu_bin = qemu_bin + + def setup_final(self): + + self.find_qemu() - self.qemu_opt = "%s %s %s %s %s" % (qemu_bin, self.get('NETWORK_CMD'), self.get('QB_RNG'), self.get('ROOTFS_OPTIONS'), self.get('QB_OPT_APPEND').replace('@DEPLOY_DIR_IMAGE@', self.get('DEPLOY_DIR_IMAGE'))) + self.qemu_opt = "%s %s %s %s %s" % (self.qemu_bin, self.get('NETWORK_CMD'), self.get('QB_RNG'), self.get('ROOTFS_OPTIONS'), self.get('QB_OPT_APPEND').replace('@DEPLOY_DIR_IMAGE@', self.get('DEPLOY_DIR_IMAGE'))) for ovmf in self.ovmf_bios: format = ovmf.rsplit('.', 1)[-1] |