diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2023-06-26 00:20:36 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2023-07-05 23:14:51 +0300 |
| commit | 520786cc6f5e5078825972134b1ec6fd81a6022a (patch) | |
| tree | 07d3f525ee77fa94f7cd8792291b2d102be649a6 /poky/meta | |
| parent | 92a3faaa54f016e7e4f49961dc8c6d777b4bffd4 (diff) | |
| download | openbmc-520786cc6f5e5078825972134b1ec6fd81a6022a.tar.xz | |
subtree updates
meta-arm: 3fcafa3a94..d6fac49541:
Abdellatif El Khlifi (1):
arm-bsp/u-boot: corstone1000: upgrade NVMXIP support
Denys Dmytriyenko (1):
optee-os: do not explicitly set CFG_MAP_EXT_DT_SECURE=y
Emekcan Aras (8):
arm-bsp/u-boot: corstone1000: Fix EFI multiple protocol install failure
arm-bsp/u-boot: corstone1000: Enable EFI set/get time services
arm-bsp/trusted-services: corstone1000: GetNextVariableName Fix
arm-bsp/optee-os:corstone1000: Drop SPMC non secure interrupt patches
arm-bsp/u-boot: corstone1000: Fix u-boot compilation warnings
arm-bsp/trusted-services: corstone1000: Fix PSA_RAW_KEY agreement test
arm-bsp/trusted-services: corstone1000: Fix Capsule Update
arm-bsp/trusted-firmware-a: corstone1000: Fix Trusted-Firmware-A version for corstone1000
Jon Mason (3):
trusted-firmware-a: update to the latest TF-A LTS
arm-bsp/tc1: update to use the latest tf-a
arm/scp-firmware: update to v2.12.0
Khem Raj (2):
gn: update to latest
gn: Fix build with gcc13
Ross Burton (8):
arm/trusted-firmware-m: remove -fcanon-prefix-map from DEBUG_PREFIX_MAP
arm-bsp/external-system: remove -fcanon-prefix-map from DEBUG_PREFIX_MAP
arm-toolchain/external-arm: remove -fcanon-prefix-map from DEBUG_PREFIX_MAP
arm/scp-firmware: use concerete toolchain
arm-toolchain/gcc-arm-12.2: remove
arm/gn: fix build with GCC <13
CI: always put the build logs in an artifact
CI: print the name of the documentation when building
Sumit Garg (1):
external-arm-toolchain: Enforce absolute path check
meta-openembedded: def4759e95..2638d458a5:
Adrian Zaharia (2):
meta-python: Add stopit
python3-stopit: add missing run-time dependencies
Alex Kiernan (1):
ostree: Upgrade 2023.3 -> 2023.4
Bartosz Golaszewski (55):
python3-pywbemtools: remove build-time dependencies
python3-pywbem: drop unneeded class from RDEPENDS
python3-pywbem: don't use PYTHON_PN
python3-pywbem: order RDEPENDS alphabetically
python3-pywbem: add missing run-time dependencies
python3-padatious: add missing run-time dependencies
python3-pako: add missing run-time dependencies
python3-paramiko: stop using PYTHON_PN
python3-paramiko: add missing run-time dependencies
python3-path: fix coding style
python3-path: add missing run-time dependencies
python3-ecdsa: don't install tests
python3-et-xmlfile: fix coding style
python3-et-xmlfile: add missing run-time dependencies
python3-flask-user: fix coding style
python3-flask-user: add missing run-time dependencies
python3-isort: fix coding style
python3-isort: add missing run-time dependencies
python3-isodate: stop using PYTHON_PN
python3-isodate: add missing run-time dependencies
python-idna-ssl: add missing run-time dependencies
python3-hpack: add missing run-time dependencies
python3-h11: add missing run-time dependencies
python3-gsocketpool: drop unneeded DEPENDS
python3-gsocketpool: stop using PYTHON_PN
python3-gsocketpool: add missing run-time dependencies
python3-flask-mail: stop using PYTHON_PN
python3-flask-mail: add missing run-time dependencies
python3-flask-sijax: stop using PYTHON_PN
python3-flask-sijax: add missing run-time dependencies
python3-flask-script: remove recipe
python3-aioserial: fix coding style
python3-aioserial: add missing run-time dependencies
python3-aspectlib: add missing run-time dependencies
python3-asyncio-throttle: add missing run-time dependencies
python3-attrdict3: add missing run-time dependencies
python3-betamax: add missing run-time dependencies
python3-binwalk: add missing run-time dependencies
python3-can: fix coding style
python3-can: add missing run-time dependencies
python3-click-spinner: add missing run-time dependencies
python3-colorlog: add missing run-time dependencies
python3-colorzero: add missing run-time dependencies
python3-configobj: fix coding style
python3-configobj: add missing run-time dependencies
python3-configshell-fb: add missing run-time dependencies
python3-coverage: fix coding style and RDEPENDS
python3-custom-inherit: add missing run-time dependencies
python3-dateparser: fix coding style
python3-dateparser: add missing run-time dependencies
python3-tzlocal: fix coding style
python3-tzlocal: add missing run-time dependencies
python3-dbus-next: add missing run-time dependencies
python3-defusedxml: add missing run-time dependencies
python3-setuptools-scm-git-archive: add missing run-time dependencies
Beniamin Sandu (5):
lmsensors: do not pull in unneeded perl modules for run-time dependencies
mdns: remove unneeded headers
mbedtls: add support for v3.x
rasdaemon: upgrade to 0.8.0
unbound: add option to build with libevent
Chen Qi (1):
redis: use the files path correctly
Denys Dmytriyenko (1):
grpc: point to the native protobuf compiler binary
Enguerrand de Ribaucourt (4):
cukinia: remove trailing whitespaces
cukinia: upgrade 0.6.1 -> 0.6.2
cukinia: inherit allarch
cukinia: add libgpiod-tools to RRECOMMENDS
Etienne Cordonnier (1):
uutils-coreutils: upgrade 0.0.18 -> 0.0.19
Joe Slater (2):
libgpiod: modify test 'gpioset: toggle (continuous)'
python3-sqlparse: fix CVE-2023-30608
Johannes Kauffmann (3):
open62541: add multithreading PACKAGECONFIG option
open62541: allow disabling subscriptions
ntpd: switch service type from forking to simple
Khem Raj (16):
ply: Demand BFD linker explicitly
crucible: Upgrade to 2023.04.12 release
schroedinger: Fix building tests
fwts: Fix build issues found with lld linker
xfce4-sensors-plugin: Use bfd linker instead of lld
ostree: Fix build errors found with lld linker
spice-gtk: Fix build with lld linker
sblim-sfcb: Fix build with lld linker
libtracefs: Fix build with clang+musl
gosu: Upgrade to 1.16 release
layers: Move READMEs to markdown format
xdg-desktop-portal-wlr: Fix build with older mesa
geary: Fix build with vala >= 0.56.8
libforms: Replace hardcoded dep on mesa with virtual/libgl
syzkaller: Upgrade to latest tip of trunk
ristretto: Upgrade to 0.13.1 release
Markus Volk (1):
gnome-software: upgrade 44.1 -> 44.2
Martin Jansa (5):
asio: fix malformed Upstream-Status
libgpiod: fix malformed Upstream-Status
postfix: fix malformed Upstream-Status
*.patch: add Upstream-Status to all patches
postfix: remove 2nd Upstream-Status
Michael Heimpold (1):
php: drop explicite ARM_INSTRUCTION_SET
Patrick Williams (1):
libplist_2.3.0: compile fix for version
Peter Kjellerstedt (1):
glog: Correct the packaging of /usr/share/glog/cmake/FindUnwind.cmake
Peter Marko (1):
python3-stopit: fix override syntax
Randolph Sapp (1):
opengl-es-cts: 3.2.8.0 -> 3.2.9.3
Remi Peuvergne (2):
zeromq: consider license exception over LGPL-3.0
zeromq: consider license exception over LGPL-3.0
Sandeep Gundlupet Raju (1):
opencv: Revert fix runtime dependencies
Soumya (1):
opencv: Fix for CVE-2023-2617
Wang Mingyu (57):
ctags: upgrade 6.0.20230604.0 -> 6.0.20230611.0
gjs: upgrade 1.76.0 -> 1.76.1
ipcalc: upgrade 1.0.2 -> 1.0.3
libadwaita: upgrade 1.3.2 -> 1.3.3
libjcat: upgrade 0.1.13 -> 0.1.14
libqb: upgrade 2.0.6 -> 2.0.7
mbpoll: upgrade 1.5.0 -> 1.5.2
mpich: upgrade 4.1.1 -> 4.1.2
nautilus: upgrade 44.2 -> 44.2.1
ntp: upgrade 4.2.8p16 -> 4.2.8p17
python3-eth-account: upgrade 0.8.0 -> 0.9.0
python3-eth-hash: upgrade 0.5.1 -> 0.5.2
python3-eth-typing: upgrade 3.3.0 -> 3.4.0
python3-eth-utils: upgrade 2.1.0 -> 2.1.1
python3-platformdirs: upgrade 3.5.1 -> 3.5.3
pcsc-lite: upgrade 1.9.9 -> 2.0.0
php: upgrade 8.2.6 -> 8.2.7
python3-argcomplete: upgrade 3.0.8 -> 3.1.0
python3-autobahn: upgrade 23.1.2 -> 23.6.1
python3-cassandra-driver: upgrade 3.27.0 -> 3.28.0
python3-cmake: upgrade 3.26.3 -> 3.26.4
python3-django: upgrade 4.2.1 -> 4.2.2
python3-hexbytes: upgrade 0.3.0 -> 0.3.1
python3-imageio: upgrade 2.30.0 -> 2.31.0
python3-pykickstart: upgrade 3.47 -> 3.48
python3-pymisp: upgrade 2.4.171 -> 2.4.172
python3-pymodbus: upgrade 3.3.0 -> 3.3.1
python3-sentry-sdk: upgrade 1.25.0 -> 1.25.1
python3-websocket-client: upgrade 1.5.2 -> 1.5.3
python3-zeroconf: upgrade 0.63.0 -> 0.64.1
remmina: upgrade 1.4.30 -> 1.4.31
tio: upgrade 2.5 -> 2.6
libtracefs: upgrade 1.6.4 -> 1.7.0
adw-gtk3: upgrade 4.7 -> 4.8
evince: upgrade 44.1 -> 44.2
gensio: upgrade 2.6.5 -> 2.6.6
redis-plus-plus: upgrade 1.3.8 -> 1.3.9
python3-click-repl: upgrade 0.2.0 -> 0.3.0
python3-platformdirs: upgrade 3.5.3 -> 3.6.0
python3-pytest-mock: upgrade 3.10.0 -> 3.11.1
python3-croniter: upgrade 1.3.15 -> 1.4.1
python3-elementpath: upgrade 4.1.2 -> 4.1.3
python3-google-api-core: upgrade 2.11.0 -> 2.11.1
python3-google-api-python-client: upgrade 2.88.0 -> 2.89.0
python3-googleapis-common-protos: upgrade 1.59.0 -> 1.59.1
python3-google-auth: upgrade 2.19.1 -> 2.20.0
python3-imageio: upgrade 2.31.0 -> 2.31.1
python3-protobuf: upgrade 4.23.2 -> 4.23.3
python3-pyproj: upgrade 3.5.0 -> 3.6.0
python3-rich: upgrade 13.4.1 -> 13.4.2
python3-robotframework: upgrade 6.0.2 -> 6.1
python3-ujson: upgrade 5.7.0 -> 5.8.0
python3-xmlschema: upgrade 2.3.0 -> 2.3.1
python3-xmodem: upgrade 0.4.6 -> 0.4.7
python3-zeroconf: upgrade 0.64.1 -> 0.68.0
strongswan: upgrade 5.9.10 -> 5.9.11
rdfind: upgrade 1.5.0 -> 1.6.0
Xiangyu Chen (1):
meta-oe: add pahole to NON_MULTILIB_RECIPES
Zoltán Böszörményi (3):
mpich: Upgrade to 4.1.1
python3-meson-python: New recipe
python_mesonpy: New class
poky: 00f3d58064..13b646c0e1:
Adrian Freihofer (9):
runqemu-ifup: remove uid parameter
runqemu-ifup: configurable tap names
runqemu-ifup: fix tap index
runqemu-ifup: remove only our taps
runqemu-gen-tapdevs: remove staging dir parameter
runqemu-gen-tapdevs: remove uid parameter
runqemu-gen-tapdevs: configurable tap names
runqemu-gen-tapdevs: remove only our taps
runqemu: configurable tap names
Alberto Planas (2):
bitbake.conf: add unzstd in HOSTTOOLS
rpm2cpio.sh: update to the last 4.x version
Alejandro Hernandez Samaniego (2):
baremetal-helloworld: Update SRCREV to fix entry addresses for ARM architectures
runqemu: Stop passing bindir to the runqemu-ifup call
Alex Kiernan (1):
eudev: Upgrade 3.2.11 -> 3.2.12
Alexander Kanavin (60):
scripts/runqemu: split lock dir creation into a reusable function
scripts/runqemu: allocate unfsd ports in a way that doesn't race or clash with unrelated processes
apmd: remove recipe and apm MACHINE_FEATURE
qemu: a pending patch was submitted and accepted upstream
maintainers.inc: unassign Adrian Bunk from wireless-regdb
maintainers.inc: unassign Alistair Francis from opensbi
maintainers.inc: unassign Chase Qi from libc-test
maintainers.inc: unassign Oleksandr Kravchuk from python3 and all other items
maintainers.inc: unassign Ricardo Neri from ovmf
grub: submit determinism.patch upstream
apr: upgrade 1.7.3 -> 1.7.4
at-spi2-core: upgrade 2.48.0 -> 2.48.3
btrfs-tools: upgrade 6.3 -> 6.3.1
attr: package /etc/xattr.conf with the library that consumes it
glib-2.0: backport a patch to address ptest fails caused by coreutils 9.2+
diffoscope: upgrade 236 -> 242
dnf: upgrade 4.14.0 -> 4.16.1
ethtool: upgrade 6.2 -> 6.3
gawk: upgrade 5.2.1 -> 5.2.2
strace: upgrade 6.2 -> 6.3
coreutils: upgrade 9.1 -> 9.3
gnupg: upgrade 2.4.0 -> 2.4.2
gobject-introspection: upgrade 1.74.0 -> 1.76.1
kmscube: upgrade to latest revision
libmodulemd: upgrade 2.14.0 -> 2.15.0
libuv: license file was split in two in the 1.45.0 version update
libx11: upgrade 1.8.4 -> 1.8.5
libxslt: upgrade 1.1.37 -> 1.1.38
linux-firmware: upgrade 20230404 -> 20230515
ltp: upgrade 20230127 -> 20230516
mesa: upgrade 23.0.3 -> 23.1.1
meson: upgrade 1.1.0 -> 1.1.1
mmc-utils: upgrade to latest revision
nettle: upgrade 3.8.1 -> 3.9
nghttp2: upgrade 1.52.0 -> 1.53.0
parted: upgrade 3.5 -> 3.6
puzzles: upgrade to latest revision
python3: upgrade 3.11.2 -> 3.11.3
python3-certifi: upgrade 2022.12.7 -> 2023.5.7
python3-docutils: upgrade 0.19 -> 0.20.1
python3-flit-core: upgrade 3.8.0 -> 3.9.0
python3-importlib-metadata: upgrade 6.2.0 -> 6.6.0
python3-pyasn1: upgrade 0.4.8 -> 0.5.0
python3-pyopenssl: upgrade 23.1.1 -> 23.2.0
python3-sphinx: remove BSD-3-Clause from LICENSE
serf: upgrade 1.3.9 -> 1.3.10
shaderc: upgrade 2023.2 -> 2023.4
squashfs-tools: upgrade 4.5.1 -> 4.6.1
vala: upgrade 0.56.6 -> 0.56.8
vulkan: upgrade 1.3.243.0 -> 1.3.250.0
wget: upgrade 1.21.3 -> 1.21.4
wireless-regdb: upgrade 2023.02.13 -> 2023.05.03
xf86-input-libinput: upgrade 1.2.1 -> 1.3.0
xf86-input-mouse: upgrade 1.9.4 -> 1.9.5
zstd: upgrade 1.5.4 -> 1.5.5
gdb: upgrade 13.1 -> 13.2
libxcrypt: upgrade 4.4.33 -> 4.4.34
zstd: fix a reproducibility issue in 1.5.5
sysfsutils: fetch a supported fork from github
sysfsutils: update 2.1.0 -> 2.1.1
Alexandre Belloni (1):
base-passwd: fix patchreview warning
Alexis Lothoré (3):
oeqa/core/runner: add helper to know about expected failures
oeqa/target/ssh: update options for SCP
testimage: implement test artifacts retriever for failing tests
Anuj Mittal (1):
glib-2.0: upgrade 2.76.2 -> 2.76.3
BELOUARGA Mohamed (1):
meta: lib: oe: npm_registry: Add more safe caracters
Bruce Ashfield (4):
linux-yocto/6.1: update to v6.1.33
linux-yocto/6.1: fix intermittent x86 boot hangs
linux-yocto/6.1: update to v6.1.34
linux-yocto/6.1: update to v6.1.35
Charlie Wu (1):
devtool: Fix the wrong variable in srcuri_entry
Chen Qi (7):
sdk.py: error out when moving file fails
sdk.py: fix moving dnf contents
rpm: write macros under libdir
zip: fix configure check by using _Static_assert
zip: remove unnecessary LARGE_FILE_SUPPORT CLFAGS
unzip: fix configure check for cross compilation
unzip: remove hardcoded LARGE_FILE_SUPPORT
Denys Dmytriyenko (1):
binutils: move packaging of gprofng static lib into common .inc
Ed Beroset (1):
Add clarification for SRCREV
Fabien Mahot (2):
useradd-example: package typo correction
oeqa/selftest/bbtests: add non-existent prefile/postfile tests
Hannu Lounento (1):
profile-manual: fix blktrace remote usage instructions
Ian Ray (1):
systemd-systemctl: support instance expansion in WantedBy
Jermain Horsman (1):
logrotate: Do not create logrotate.status file
Jose Quaresma (1):
selftest/reproducible: Allow chose the package manager
Jörg Sommer (2):
runqemu-gen-tapdevs: Refactoring
runqemu-ifupdown/get-tapdevs: Add support for ip tuntap
Khem Raj (12):
llvm: Upgrade to 16.0.5
glibc: Pass linker choice via compiler flags
libgcc: Always use BFD linker
efivar: Upgrade to tip of trunk
babeltrace2: Always use BFD linker when building tests with ld-is-lld distro feature
parted: Add missing libuuid to linker cmdline for libparted-fs-resize.so
kernel: Add kernel specific STRIP variable
libxml2: Do not use lld linker when building with tests on rv64
llvm: Bump to 16.0.6
go-helloworld: Upgrade to tip of trunk
rpcsvc-proto: Upgrade to 1.4.4
python3-bcrypt: Use BFD linker when building tests
Louis Rannou (3):
rootfs-postcommands: change sysusers.d command
systemd: replace the sysusers.d basic configuration
base-passwd: add the wheel group
Luca Ceresoli (1):
ref-manual: classes: devicetree: fix sentence saying the same thing twice
Markus Volk (2):
gtk4: upgrade 4.10.3 -> 4.10.4
gstreamer1.0-plugins-bad: use oneVPL instead of intel-mediasdk for msdk
Martin Jansa (1):
libstd-rs, rust: use bfd linker instead of gold
Michael Opdenacker (5):
psplash: replace Yocto .h by .png splashscreen
migration-guides: release-notes-4.3: update documentation notes
bitbake: bitbake-user-manual: explicit variables taking a colon separated list
bitbake: bitbake-user-manual: revert change about PREFERRED_PROVIDERS
ref-manual: variables.rst: explicit variables accepting colon separated lists
Mikko Rapeli (4):
useradd-staticids.bbclass: improve error message
selftest reproducible.py: support different build targets
variables.rst: document OEQA_REPRODUCIBLE_TEST_TARGET and OEQA_REPRODUCIBLE_TEST_SSTATE_TARGETS
reproducible-builds.rst: document OEQA_REPRODUCIBLE_TEST_TARGET and OEQA_REPRODUCIBLE_TEST_SSTATE_TARGETS
Ming Liu (2):
weston-init: introduce xwayland PACKAGECONFIG
meta: introduce KCONFIG_CONFIG_ENABLE_MENUCONFIG
Mingli Yu (2):
qemu: Split the qemu package
u-boot-tools: Use PATH_MAX for path length
Petr Gotthard (1):
lighttpd: upgrade 1.4.69 -> 1.4.71
Quentin Schulz (5):
bitbake: docs: bitbake-user-manual: bitbake-user-manual-hello: add links and highlights for variables
docs: bsp-guide: bsp: fix typo
docs: ref-manual: terms: fix typos in SPDX term
docs: fix unnecessary double white space
docs: ref-manual: terms: fix incorrect note directive
Randolph Sapp (6):
weston-init: make sure the render group exists
weston-init: add weston user to the render group
weston-init: add the weston user to the wayland group
weston-init: fix the mixed indentation
weston-init: guard against systemd configs
weston-init: add profile to point users to global socket
Remi Peuvergne (1):
common-licenses: Add LGPL-3.0-with-zeromq-exception
Richard Purdie (18):
runqemu/qemu-helper: Drop tunctl
runqemu-if*: Rename confusing variable name
oeqa/selftest/oescripts: Fix qemu-helper selftest
oeqa/logparser: Fix ptest No-section exception
strace: Disable failing test
strace: Merge two similar patches
testimage: Only note missing target directories, don't warn
ptest-runner: Pull in sync fix to improve log warnings
scripts/runqemu-ifup: Fix extra parameter issue
scripts/runqemu-ifup: Fix 10 or more tap devices
bitbake: runqueue: Fix handling of virtual files in layername calculation
ptest-runner: Ensure data writes don't race
bitbake.conf: Add layer-<layername> override support
insane: Improve patch-status layer filtering
genericx86: Drop gma500-gfx-check
bitbake: doc: Document FILE_LAYERNAME
migration-guides: add notes on FILE_LAYERNAME
migration-guides: add notes on systemd/usrmerge changes
Ross Burton (15):
nettle: rewrite ptest integration
nettle: inherit lib_package
cve-extra-exclusions: add more ignores for 2023 kernel CVEs
cve-extra-exclusions: remove 2019 blanket ignores
poky-altconfig: enable usrmerge DISTRO_FEATURE
gi-docgen: correct comment
gobject-introspection: remove obsolete DEPENDS
coreutils: fix build when the host has fr_FR.
cve-extra-exclusions: call out an Ubuntu-specific issue explicitly
cve-extra-exclusions: CVE-2023-3141 was backported in Linux 6.1.30
erofs-utils: backport fixes for CVE-2023-33551 and CVE-2023-33552
ghostscript: mostly rewrite recipe
python3-dbusmock: only recommend python3-pygobject
sysfsutils: don't install to base_libdir
base: improve LICENSE_FLAGS_DETAILS output
Sakib Sajal (1):
go: Upgrade 1.20.4 -> 1.20.5
Soumya (1):
perl: fix CVE-2023-31484
Stefano Babic (2):
libubootenv: upgrade 0.3.3 -> 0.3.4
mtd-utils: export headers and libraries for MTD and UBI
Sudip Mukherjee (2):
dpkg: upgrade to v1.21.22
cmake: upgrade to v3.26.4
Tan Wen Yan (1):
linux-yocto/6.1: update genericx86* machines to v6.1.30
Tom Hochstein (1):
weston: Cleanup and fix x11 and xwayland dependencies
Trevor Gamblin (2):
runqemu-gen-tapdevs: fix missing variable quote
glib-networking: use correct error code in ptest
Vincent Davis Jr (4):
spirv-tools: fix INTERFACE_LINK_LIBRARIES cmake prop
vulkan-validation-layers: add new recipe v1.3.243.0
spirv-tools: Use baselib instead of base_libdir
vulkan-validation-layers: cleanup recipe
Xiangyu Chen (1):
dbus: upgrade 1.14.6 -> 1.14.8
nikhil (1):
libwebp: Fix CVE-2023-1999
schitrod=cisco.com@lists.openembedded.org (1):
cups: Fix CVE-2023-32324
meta-security: 180dac9aec..405cca4028:
Ahmed Abdelfattah (1):
swtpm: fix parser error when using USERADDEXTENSION="useradd-staticids"
Armin Kuster (25):
scap-security-guide: update to 0.1.67
scap-security-guide: update to tip
scap-security-guide_git: drop oe version
openscap-daemon: This is now obsolete
oe-scap: Not maintained nor upstreamed
openscap: Fix native build missing depends
openscap: Drop OE specific recipe
lynis: move to main meta-security layer
openscap: move to main meta-security layer
meta-security-compliance: remove layer
openscap: add support for OpenEmbedded nodistro and Poky
scap-security-guide: add OE support
packagegroup-core-security: add compliance pkg group
kas: ci changes do to meta-security-compliance being removed
meta-security-isafw: drop layer isafw project archived
openscap: Update to tip to get OE/Poky support
scap-security-guide: bump the number of test that pass
clamav: drop unused patch
isic: fine tune Upstream-Status
scap-security-guide: Add Poky
arpwatch: Fix typo in COMPATIBLE_HOST:libc-musl = "null"
scap-security-guide: add Upstream-Status
scap-security-guide: Does not build for musl
openscap: update to 1.3.8
packagegroup-core-security: add os-release
Chen Qi (1):
complicance/isafw: remove oeqa addpylib
Kevin Hao (1):
dmverity: Suppress the realpath errors
Martin Jansa (5):
*.patch: add Upstream-Status to all patches
meta-tpm: *.patch: fix malformed Upstream-Status lines
dynamic-layers: *.patch: fix malformed and missing Upstream-Status lines
*.patch: fix malformed Upstream-Status and SOB lines
.patch: remove probably unused patches
Paul Gortmaker (7):
dm-verity: add descriptive strings for "wic list images"
dm-verity: restructure the veritysetup arg parsing
dm-verity: save veritysetup args beside runtime environment
dm-verity: add support for hash storage on separate partition
dm-verity: add wks.in fragment with dynamic build hash data
dm-verity: hook separate hash into initramfs framework
dm-verity: add sample systemd separate hash example and doc
Samantha Jalabert (1):
buck-security: fix missing dependencies to perl modules
meta-raspberrypi: 8e07f0d328..dff85b9a9f:
Khem Raj (1):
linux-raspberrypi-6.1: Update to 6.1.34 release
Martin Jansa (1):
*.patch: add Upstream-Status to all patches
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: If34dfa008a81d778c7bc02627388238f5125d85c
Diffstat (limited to 'poky/meta')
236 files changed, 2028 insertions, 3919 deletions
diff --git a/poky/meta/classes-global/base.bbclass b/poky/meta/classes-global/base.bbclass index 976a2ddee4..cbda8d12f0 100644 --- a/poky/meta/classes-global/base.bbclass +++ b/poky/meta/classes-global/base.bbclass @@ -520,7 +520,7 @@ python () { message = "Has a restricted license '%s' which is not listed in your LICENSE_FLAGS_ACCEPTED." % unmatched details = d.getVarFlag("LICENSE_FLAGS_DETAILS", unmatched) if details: - message += " For further details, see %s." % details + message += details bb.debug(1, "Skipping %s: %s" % (pn, message)) raise bb.parse.SkipRecipe(message) diff --git a/poky/meta/classes-global/insane.bbclass b/poky/meta/classes-global/insane.bbclass index 8788f58fc5..a4dbc9a123 100644 --- a/poky/meta/classes-global/insane.bbclass +++ b/poky/meta/classes-global/insane.bbclass @@ -44,10 +44,11 @@ ERROR_QA ?= "dev-so debug-deps dev-deps debug-files arch pkgconfig la \ already-stripped installed-vs-shipped ldflags compile-host-path \ install-host-path pn-overrides unknown-configure-option \ useless-rpaths rpaths staticdev empty-dirs \ - patch-fuzz patch-status-core\ + patch-fuzz \ " # Add usrmerge QA check based on distro feature ERROR_QA:append = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', ' usrmerge', '', d)}" +ERROR_QA:append:layer-core = " patch-status" FAKEROOT_QA = "host-user-contaminated" FAKEROOT_QA[doc] = "QA tests which need to run under fakeroot. If any \ @@ -1334,24 +1335,13 @@ python do_qa_patch() { import re from oe import patch - allpatches = False - if bb.utils.filter('ERROR_QA', 'patch-status-noncore', d) or bb.utils.filter('WARN_QA', 'patch-status-noncore', d): - allpatches = True - coremeta_path = os.path.join(d.getVar('COREBASE'), 'meta', '') for url in patch.src_patches(d): (_, _, fullpath, _, _, _) = bb.fetch.decodeurl(url) - # skip patches not in oe-core - patchtype = "patch-status-core" - if not os.path.abspath(fullpath).startswith(coremeta_path): - patchtype = "patch-status-noncore" - if not allpatches: - continue - msg = oe.qa.check_upstream_status(fullpath) if msg: - oe.qa.handle_error(patchtype, msg, d) + oe.qa.handle_error("patch-status", msg, d) oe.qa.exit_if_errors(d) } diff --git a/poky/meta/classes-recipe/cml1.bbclass b/poky/meta/classes-recipe/cml1.bbclass index a09a042c3f..d87d8204e4 100644 --- a/poky/meta/classes-recipe/cml1.bbclass +++ b/poky/meta/classes-recipe/cml1.bbclass @@ -32,10 +32,15 @@ CROSS_CURSES_INC = '-DCURSES_LOC="<curses.h>"' TERMINFO = "${STAGING_DATADIR_NATIVE}/terminfo" KCONFIG_CONFIG_COMMAND ??= "menuconfig" +KCONFIG_CONFIG_ENABLE_MENUCONFIG ??= "true" KCONFIG_CONFIG_ROOTDIR ??= "${B}" python do_menuconfig() { import shutil + if not bb.utils.to_boolean(d.getVar("KCONFIG_CONFIG_ENABLE_MENUCONFIG")): + bb.fatal("do_menuconfig is disabled, please check KCONFIG_CONFIG_ENABLE_MENUCONFIG variable.") + return + config = os.path.join(d.getVar('KCONFIG_CONFIG_ROOTDIR'), ".config") configorig = os.path.join(d.getVar('KCONFIG_CONFIG_ROOTDIR'), ".config.orig") diff --git a/poky/meta/classes-recipe/gi-docgen.bbclass b/poky/meta/classes-recipe/gi-docgen.bbclass index eb30c6011f..b4d7b17761 100644 --- a/poky/meta/classes-recipe/gi-docgen.bbclass +++ b/poky/meta/classes-recipe/gi-docgen.bbclass @@ -8,8 +8,8 @@ # seems to be a successor to gtk-doc: # https://gitlab.gnome.org/GNOME/gi-docgen -# This variable is set to True if api-documentation is in -# DISTRO_FEATURES, and False otherwise. +# This variable is set to True if api-documentation and +# gobject-introspection-data are in DISTRO_FEATURES, False otherwise. GIDOCGEN_ENABLED ?= "${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation gobject-introspection-data', 'True', 'False', d)}" # When building native recipes, disable gi-docgen, as it is not necessary, diff --git a/poky/meta/classes-recipe/kernel-arch.bbclass b/poky/meta/classes-recipe/kernel-arch.bbclass index 5877048916..6e19dbbba8 100644 --- a/poky/meta/classes-recipe/kernel-arch.bbclass +++ b/poky/meta/classes-recipe/kernel-arch.bbclass @@ -70,10 +70,13 @@ TARGET_AR_KERNEL_ARCH ?= "" HOST_AR_KERNEL_ARCH ?= "${TARGET_AR_KERNEL_ARCH}" TARGET_OBJCOPY_KERNEL_ARCH ?= "" HOST_OBJCOPY_KERNEL_ARCH ?= "${TARGET_OBJCOPY_KERNEL_ARCH}" +TARGET_STRIP_KERNEL_ARCH ?= "" +HOST_STRIP_KERNEL_ARCH ?= "${TARGET_STRIP_KERNEL_ARCH}" KERNEL_CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_KERNEL_ARCH} -fuse-ld=bfd ${DEBUG_PREFIX_MAP} -fdebug-prefix-map=${STAGING_KERNEL_DIR}=${KERNEL_SRC_PATH} -fdebug-prefix-map=${STAGING_KERNEL_BUILDDIR}=${KERNEL_SRC_PATH}" KERNEL_LD = "${CCACHE}${HOST_PREFIX}ld.bfd ${HOST_LD_KERNEL_ARCH}" KERNEL_AR = "${CCACHE}${HOST_PREFIX}ar ${HOST_AR_KERNEL_ARCH}" KERNEL_OBJCOPY = "${CCACHE}${HOST_PREFIX}objcopy ${HOST_OBJCOPY_KERNEL_ARCH}" +KERNEL_STRIP = "${CCACHE}${HOST_PREFIX}strip ${HOST_STRIP_KERNEL_ARCH}" TOOLCHAIN ?= "gcc" diff --git a/poky/meta/classes-recipe/kernel-devicetree.bbclass b/poky/meta/classes-recipe/kernel-devicetree.bbclass index b3bae32f9e..1b60c14740 100644 --- a/poky/meta/classes-recipe/kernel-devicetree.bbclass +++ b/poky/meta/classes-recipe/kernel-devicetree.bbclass @@ -73,7 +73,7 @@ do_compile:append() { for dtbf in ${KERNEL_DEVICETREE}; do dtb=`normalize_dtb "$dtbf"` - oe_runmake $dtb CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" OBJCOPY="${KERNEL_OBJCOPY}" ${KERNEL_EXTRA_ARGS} + oe_runmake $dtb CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" OBJCOPY="${KERNEL_OBJCOPY}" STRIP="${KERNEL_STRIP}" ${KERNEL_EXTRA_ARGS} done } diff --git a/poky/meta/classes-recipe/kernel-yocto.bbclass b/poky/meta/classes-recipe/kernel-yocto.bbclass index 108b7e6752..4ac977b122 100644 --- a/poky/meta/classes-recipe/kernel-yocto.bbclass +++ b/poky/meta/classes-recipe/kernel-yocto.bbclass @@ -455,7 +455,7 @@ do_kernel_configme() { bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)" fi - CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" OBJCOPY="${KERNEL_OBJCOPY}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 + CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" OBJCOPY="${KERNEL_OBJCOPY}" STRIP="${KERNEL_STRIP}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 if [ $? -ne 0 -o ! -f ${B}/.config ]; then bberror "Could not generate a .config for ${KMACHINE}-${LINUX_KERNEL_TYPE}" if [ ${KCONF_AUDIT_LEVEL} -gt 1 ]; then @@ -490,6 +490,7 @@ python do_config_analysis() { env['LD'] = d.getVar('KERNEL_LD') env['CC'] = d.getVar('KERNEL_CC') env['OBJCOPY'] = d.getVar('KERNEL_OBJCOPY') + env['STRIP'] = d.getVar('KERNEL_STRIP') env['ARCH'] = d.getVar('ARCH') env['srctree'] = s @@ -552,6 +553,7 @@ python do_kernel_configcheck() { env['LD'] = d.getVar('KERNEL_LD') env['CC'] = d.getVar('KERNEL_CC') env['OBJCOPY'] = d.getVar('KERNEL_OBJCOPY') + env['STRIP'] = d.getVar('KERNEL_STRIP') env['ARCH'] = d.getVar('ARCH') env['srctree'] = s diff --git a/poky/meta/classes-recipe/kernel.bbclass b/poky/meta/classes-recipe/kernel.bbclass index 9c8036f4df..e82b696d1a 100644 --- a/poky/meta/classes-recipe/kernel.bbclass +++ b/poky/meta/classes-recipe/kernel.bbclass @@ -235,7 +235,7 @@ UBOOT_LOADADDRESS ?= "${UBOOT_ENTRYPOINT}" # Some Linux kernel configurations need additional parameters on the command line KERNEL_EXTRA_ARGS ?= "" -EXTRA_OEMAKE += ' CC="${KERNEL_CC}" LD="${KERNEL_LD}" OBJCOPY="${KERNEL_OBJCOPY}"' +EXTRA_OEMAKE += ' CC="${KERNEL_CC}" LD="${KERNEL_LD}" OBJCOPY="${KERNEL_OBJCOPY}" STRIP="${KERNEL_STRIP}"' EXTRA_OEMAKE += ' HOSTCC="${BUILD_CC}" HOSTCFLAGS="${BUILD_CFLAGS}" HOSTLDFLAGS="${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}"' EXTRA_OEMAKE += ' HOSTCXX="${BUILD_CXX}" HOSTCXXFLAGS="${BUILD_CXXFLAGS}"' @@ -334,6 +334,10 @@ kernel_do_transform_bundled_initramfs() { } do_transform_bundled_initramfs[dirs] = "${B}" +python do_package:prepend () { + os.environ['STRIP'] = d.getVar('KERNEL_STRIP') +} + python do_devshell:prepend () { os.environ["LDFLAGS"] = '' } diff --git a/poky/meta/classes-recipe/module.bbclass b/poky/meta/classes-recipe/module.bbclass index b3b852be5f..f2f0b25a2d 100644 --- a/poky/meta/classes-recipe/module.bbclass +++ b/poky/meta/classes-recipe/module.bbclass @@ -20,6 +20,10 @@ python __anonymous () { d.setVar('KBUILD_EXTRA_SYMBOLS', " ".join(extra_symbols)) } +python do_package:prepend () { + os.environ['STRIP'] = d.getVar('KERNEL_STRIP') +} + python do_devshell:prepend () { os.environ['CFLAGS'] = '' os.environ['CPPFLAGS'] = '' @@ -33,6 +37,7 @@ python do_devshell:prepend () { os.environ['LD'] = d.getVar('KERNEL_LD') os.environ['AR'] = d.getVar('KERNEL_AR') os.environ['OBJCOPY'] = d.getVar('KERNEL_OBJCOPY') + os.environ['STRIP'] = d.getVar('KERNEL_STRIP') os.environ['O'] = d.getVar('STAGING_KERNEL_BUILDDIR') kbuild_extra_symbols = d.getVar('KBUILD_EXTRA_SYMBOLS') if kbuild_extra_symbols: @@ -47,6 +52,7 @@ module_do_compile() { KERNEL_VERSION=${KERNEL_VERSION} \ CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ AR="${KERNEL_AR}" OBJCOPY="${KERNEL_OBJCOPY}" \ + STRIP="${KERNEL_STRIP}" \ O=${STAGING_KERNEL_BUILDDIR} \ KBUILD_EXTRA_SYMBOLS="${KBUILD_EXTRA_SYMBOLS}" \ ${MAKE_TARGETS} @@ -57,6 +63,7 @@ module_do_install() { oe_runmake DEPMOD=echo MODLIB="${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}" \ INSTALL_FW_PATH="${D}${nonarch_base_libdir}/firmware" \ CC="${KERNEL_CC}" LD="${KERNEL_LD}" OBJCOPY="${KERNEL_OBJCOPY}" \ + STRIP="${KERNEL_STRIP}" \ O=${STAGING_KERNEL_BUILDDIR} \ ${MODULES_INSTALL_TARGET} diff --git a/poky/meta/classes-recipe/rootfs-postcommands.bbclass b/poky/meta/classes-recipe/rootfs-postcommands.bbclass index 690fa976aa..652601b95f 100644 --- a/poky/meta/classes-recipe/rootfs-postcommands.bbclass +++ b/poky/meta/classes-recipe/rootfs-postcommands.bbclass @@ -43,7 +43,7 @@ ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest ; " POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log" # Set default target for systemd images SYSTEMD_DEFAULT_TARGET ?= '${@bb.utils.contains_any("IMAGE_FEATURES", [ "x11-base", "weston" ], "graphical.target", "multi-user.target", d)}' -ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("DISTRO_FEATURES", "systemd", "set_systemd_default_target; systemd_create_users;", "", d)}' +ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("DISTRO_FEATURES", "systemd", "set_systemd_default_target; systemd_sysusers_check;", "", d)}' ROOTFS_POSTPROCESS_COMMAND += 'empty_var_volatile;' @@ -69,29 +69,114 @@ python () { d.appendVar('ROOTFS_POSTPROCESS_COMMAND', 'rootfs_reproducible;') } -systemd_create_users () { - for conffile in ${IMAGE_ROOTFS}/usr/lib/sysusers.d/*.conf; do - [ -e $conffile ] || continue - grep -v "^#" $conffile | sed -e '/^$/d' | while read type name id comment; do - if [ "$type" = "u" ]; then - useradd_params="--shell /sbin/nologin" - [ "$id" != "-" ] && useradd_params="$useradd_params --uid $id" - [ "$comment" != "-" ] && useradd_params="$useradd_params --comment $comment" - useradd_params="$useradd_params --system $name" - eval useradd --root ${IMAGE_ROOTFS} $useradd_params || true - elif [ "$type" = "g" ]; then - groupadd_params="" - [ "$id" != "-" ] && groupadd_params="$groupadd_params --gid $id" - groupadd_params="$groupadd_params --system $name" - eval groupadd --root ${IMAGE_ROOTFS} $groupadd_params || true - elif [ "$type" = "m" ]; then - group=$id - eval groupadd --root ${IMAGE_ROOTFS} --system $group || true - eval useradd --root ${IMAGE_ROOTFS} --shell /sbin/nologin --system $name --no-user-group || true - eval usermod --root ${IMAGE_ROOTFS} -a -G $group $name - fi - done - done +# Resolve the ID as described in the sysusers.d(5) manual: ID can be a numeric +# uid, a couple uid:gid or uid:groupname or it is '-' meaning leaving it +# automatic or it can be a path. In the latter, the uid/gid matches the +# user/group owner of that file. +def resolve_sysusers_id(d, sid): + # If the id is a path, the uid/gid matchs to the target's uid/gid in the + # rootfs. + if '/' in sid: + try: + osstat = os.stat(os.path.join(d.getVar('IMAGE_ROOTFS'), sid)) + except FileNotFoundError: + bb.error('sysusers.d: file %s is required but it does not exist in the rootfs', sid) + return ('-', '-') + return (osstat.st_uid, osstat.st_gid) + # Else it is a uid:gid or uid:groupname syntax + if ':' in sid: + return sid.split(':') + else: + return (sid, '-') + +# Check a user exists in the rootfs password file and return its properties +def check_user_exists(d, uname=None, uid=None): + with open(os.path.join(d.getVar('IMAGE_ROOTFS'), 'etc/passwd'), 'r') as pwfile: + for line in pwfile: + (name, _, u_id, gid, comment, homedir, ushell) = line.strip().split(':') + if uname == name or uid == u_id: + return (name, u_id, gid, comment or '-', homedir or '/', ushell or '-') + return None + +# Check a group exists in the rootfs group file and return its properties +def check_group_exists(d, gname=None, gid=None): + with open(os.path.join(d.getVar('IMAGE_ROOTFS'), 'etc/group'), 'r') as gfile: + for line in gfile: + (name, _, g_id, _) = line.strip().split(':') + if name == gname or g_id == gid: + return (name, g_id) + return None + +def compare_users(user, e_user): + # user and e_user must not have None values. Unset values must be '-'. + (name, uid, gid, comment, homedir, ushell) = user + (e_name, e_uid, e_gid, e_comment, e_homedir, e_ushell) = e_user + # Ignore 'uid', 'gid' or 'comment' if they are not set + # Ignore 'shell' and 'ushell' if one is not set + return name == e_name \ + and (uid == '-' or uid == e_uid) \ + and (gid == '-' or gid == e_gid) \ + and (comment == '-' or e_comment == '-' or comment.lower() == e_comment.lower()) \ + and (homedir == '-' or e_homedir == '-' or homedir == e_homedir) \ + and (ushell == '-' or e_ushell == '-' or ushell == e_ushell) + +# Open sysusers.d configuration files and parse each line to check the users and +# groups are already defined in /etc/passwd and /etc/groups with similar +# properties. Refer to the sysusers.d(5) manual for its syntax. +python systemd_sysusers_check() { + import glob + import re + + pattern_comment = r'(-|\"[^:\"]+\")' + pattern_word = r'[^\s]+' + pattern_line = r'(' + pattern_word + r')\s+(' + pattern_word + r')\s+(' + pattern_word + r')(\s+' \ + + pattern_comment + r')?' + r'(\s+(' + pattern_word + r'))?' + r'(\s+(' + pattern_word + r'))?' + + for conffile in glob.glob(os.path.join(d.getVar('IMAGE_ROOTFS'), 'usr/lib/sysusers.d/*.conf')): + with open(conffile, 'r') as f: + for line in f: + line = line.strip() + if not len(line) or line[0] == '#': continue + ret = re.fullmatch(pattern_line, line.strip()) + if not ret: continue + (stype, sname, sid, _, scomment, _, shomedir, _, sshell) = ret.groups() + if stype == 'u': + if sid: + (suid, sgid) = resolve_sysusers_id(d, sid) + if sgid.isalpha(): + sgid = check_group_exists(d, gname=sgid) + elif sgid.isdigit(): + check_group_exists(d, gid=sgid) + else: + sgid = '-' + else: + suid = '-' + sgid = '-' + scomment = scomment.replace('"', '') if scomment else '-' + shomedir = shomedir or '-' + sshell = sshell or '-' + e_user = check_user_exists(d, uname=sname) + if not e_user: + bb.warn('User %s has never been defined' % sname) + elif not compare_users((sname, suid, sgid, scomment, shomedir, sshell), e_user): + bb.warn('User %s has been defined as (%s) but sysusers.d expects it as (%s)' + % (sname, ', '.join(e_user), + ', '.join((sname, suid, sgid, scomment, shomedir, sshell)))) + elif stype == 'g': + gid = sid or '-' + if '/' in gid: + (_, gid) = resolve_sysusers_id(d, sid) + e_group = check_group_exists(d, gname=sname) + if not e_group: + bb.warn('Group %s has never been defined' % sname) + elif gid != '-': + (_, e_gid) = e_group + if gid != e_gid: + bb.warn('Group %s has been defined with id (%s) but sysusers.d expects gid (%s)' + % (sname, e_gid, gid)) + elif stype == 'm': + check_user_exists(d, sname) + check_group_exists(d, sid) } # diff --git a/poky/meta/classes-recipe/testimage.bbclass b/poky/meta/classes-recipe/testimage.bbclass index b48cd96575..0f02eadf57 100644 --- a/poky/meta/classes-recipe/testimage.bbclass +++ b/poky/meta/classes-recipe/testimage.bbclass @@ -18,6 +18,15 @@ inherit image-artifact-names TESTIMAGE_AUTO ??= "0" +# When any test fails, TESTIMAGE_FAILED_QA ARTIFACTS will be parsed and for +# each entry in it, if artifact pointed by path description exists on target, +# it will be retrieved onto host + +TESTIMAGE_FAILED_QA_ARTIFACTS ??= "\ + ${localstatedir}/log \ + ${sysconfdir}/version \ + ${sysconfdir}/os-release" + # You can set (or append to) TEST_SUITES in local.conf to select the tests # which you want to run for your target. # The test names are the module names in meta/lib/oeqa/runtime/cases. @@ -192,6 +201,39 @@ def get_testimage_boot_patterns(d): boot_patterns[flag] = flagval.encode().decode('unicode-escape') return boot_patterns +def get_artifacts_list(target, raw_list): + result = [] + # Passed list may contains patterns in paths, expand them directly on target + for raw_path in raw_list.split(): + cmd = f"for p in {raw_path}; do if [ -e $p ]; then echo $p; fi; done" + try: + status, output = target.run(cmd) + if status != 0 or not output: + raise Exception() + result += output.split() + except: + bb.note(f"No file/directory matching path {raw_path}") + + return result + +def retrieve_test_artifacts(target, artifacts_list, target_dir): + import shutil + + local_artifacts_dir = os.path.join(target_dir, "artifacts") + if os.path.isdir(local_artifacts_dir): + shutil.rmtree(local_artifacts_dir) + + os.makedirs(local_artifacts_dir) + for artifact_path in artifacts_list: + if not os.path.isabs(artifact_path): + bb.warn(f"{artifact_path} is not an absolute path") + continue + try: + dest_dir = os.path.join(local_artifacts_dir, os.path.dirname(artifact_path[1:])) + os.makedirs(dest_dir, exist_ok=True) + target.copyFrom(artifact_path, dest_dir) + except: + bb.warn(f"Can not retrieve {artifact_path} from test target") def testimage_main(d): import os @@ -383,6 +425,12 @@ def testimage_main(d): pass results = tc.runTests() complete = True + if results.hasAnyFailingTest(): + artifacts_list = get_artifacts_list(tc.target, d.getVar("TESTIMAGE_FAILED_QA_ARTIFACTS")) + if not artifacts_list: + bb.warn("Could not load artifacts list, skip artifacts retrieval") + else: + retrieve_test_artifacts(tc.target, artifacts_list, get_testimage_json_result_dir(d)) except (KeyboardInterrupt, BlockingIOError) as err: if isinstance(err, KeyboardInterrupt): bb.error('testimage interrupted, shutting down...') diff --git a/poky/meta/classes-recipe/uboot-config.bbclass b/poky/meta/classes-recipe/uboot-config.bbclass index fb7a4bc498..9be1d64d3e 100644 --- a/poky/meta/classes-recipe/uboot-config.bbclass +++ b/poky/meta/classes-recipe/uboot-config.bbclass @@ -140,4 +140,10 @@ python () { if not found: raise bb.parse.SkipRecipe("The selected UBOOT_CONFIG key %s has no match in %s." % (ubootconfig, ubootconfigflags.keys())) + + if len(ubootconfig) == 1: + d.setVar('KCONFIG_CONFIG_ROOTDIR', os.path.join(d.getVar("B"), d.getVar("UBOOT_MACHINE").strip())) + else: + # Disable menuconfig for multiple configs + d.setVar('KCONFIG_CONFIG_ENABLE_MENUCONFIG', "false") } diff --git a/poky/meta/classes/useradd-staticids.bbclass b/poky/meta/classes/useradd-staticids.bbclass index abe484eb46..1dbcba2bf1 100644 --- a/poky/meta/classes/useradd-staticids.bbclass +++ b/poky/meta/classes/useradd-staticids.bbclass @@ -47,7 +47,7 @@ def update_useradd_static_config(d): def handle_missing_id(id, type, pkg, files, var, value): # For backwards compatibility we accept "1" in addition to "error" error_dynamic = d.getVar('USERADD_ERROR_DYNAMIC') - msg = "%s - %s: %sname %s does not have a static ID defined." % (d.getVar('PN'), pkg, type, id) + msg = 'Recipe %s, package %s: %sname "%s" does not have a static ID defined.' % (d.getVar('PN'), pkg, type, id) if files: msg += " Add %s to one of these files: %s" % (id, files) else: diff --git a/poky/meta/conf/bitbake.conf b/poky/meta/conf/bitbake.conf index e28df7478f..9625a6fef4 100644 --- a/poky/meta/conf/bitbake.conf +++ b/poky/meta/conf/bitbake.conf @@ -524,7 +524,7 @@ HOSTTOOLS += " \ python3 pzstd ranlib readelf readlink realpath rm rmdir rpcgen sed seq sh \ sha1sum sha224sum sha256sum sha384sum sha512sum \ sleep sort split stat strings strip tail tar tee test touch tr true uname \ - uniq wc wget which xargs zstd \ + uniq unzstd wc wget which xargs zstd \ " # Tools needed to run testimage runtime image testing @@ -806,7 +806,8 @@ DISTRO_NAME ??= "OpenEmbedded" # And finally '<foo>:forcevariable' overrides any standard variable, with the highest priority. # This works for functions as well, they are really just variables. # -OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}${LIBCOVERRIDE}:forcevariable" +OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:pn-${PN}:layer-${FILE_LAYERNAME}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}${LIBCOVERRIDE}:forcevariable" +FILE_LAYERNAME ??= "config" LIBCOVERRIDE ?= "" CLASSOVERRIDE ?= "class-target" DISTROOVERRIDES ?= "${@d.getVar('DISTRO') or ''}" diff --git a/poky/meta/conf/distro/include/cve-extra-exclusions.inc b/poky/meta/conf/distro/include/cve-extra-exclusions.inc index ff5d381523..1c3cc36c61 100644 --- a/poky/meta/conf/distro/include/cve-extra-exclusions.inc +++ b/poky/meta/conf/distro/include/cve-extra-exclusions.inc @@ -73,9 +73,23 @@ CVE_CHECK_IGNORE += "CVE-2011-0640 CVE-2014-2648 CVE-2014-8171 CVE-2016-0774 CVE CVE-2017-1000255 CVE-2017-1000377 CVE-2017-5897 CVE-2017-6264" # 2018 CVE_CHECK_IGNORE += "CVE-2018-1000026 CVE-2018-10840 CVE-2018-10876 CVE-2018-10882 CVE-2018-10901 CVE-2018-10902 \ - CVE-2018-14625 CVE-2018-16880 CVE-2018-16884 CVE-2018-5873 CVE-2018-6559" -# 2019 -CVE_CHECK_IGNORE += "CVE-2019-10126 CVE-2019-14899 CVE-2019-18910 CVE-2019-3016 CVE-2019-3819 CVE-2019-3846 CVE-2019-3887" + CVE-2018-14625 CVE-2018-16880 CVE-2018-16884 CVE-2018-5873" + +# This is specific to Ubuntu +CVE_CHECK_IGNORE += "CVE-2018-6559" + +# https://www.linuxkernelcves.com/cves/CVE-2019-3016 +# Fixed with 5.6 +CVE_CHECK_IGNORE += "CVE-2019-3016" + +# https://www.linuxkernelcves.com/cves/CVE-2019-3819 +# Fixed with 5.1 +CVE_CHECK_IGNORE += "CVE-2019-3819" + +# https://www.linuxkernelcves.com/cves/CVE-2019-3887 +# Fixed with 5.2 +CVE_CHECK_IGNORE += "CVE-2019-3887" + # 2020 CVE_CHECK_IGNORE += "CVE-2020-10732 CVE-2020-10742 CVE-2020-16119 CVE-2020-1749 CVE-2020-25672 CVE-2020-27820 CVE-2020-35501 CVE-2020-8834" @@ -591,6 +605,10 @@ CVE_CHECK_IGNORE += "CVE-2023-1990" # Fixed in 6.1.16 CVE_CHECK_IGNORE += "CVE-2023-1998" +# https://www.linuxkernelcves.com/cves/CVE-2023-2002 +# Fixed in 6.1.27 +CVE_CHECK_IGNORE += "CVE-2023-2002" + # https://www.linuxkernelcves.com/cves/CVE-2023-2156 # Fixed in 6.1.26 CVE_CHECK_IGNORE += "CVE-2023-2156" @@ -598,3 +616,54 @@ CVE_CHECK_IGNORE += "CVE-2023-2156" # https://www.linuxkernelcves.com/cves/CVE-2023-2162 # Fixed in 6.1.11 CVE_CHECK_IGNORE += "CVE-2023-2162" + +# https://www.linuxkernelcves.com/cves/CVE-2023-2194 +# Fixed with 6.1.22 +CVE_CHECK_IGNORE += "CVE-2023-2194" + +# https://www.linuxkernelcves.com/cves/CVE-2023-2235 +# Fixed with 6.1.21 +CVE_CHECK_IGNORE += "CVE-2023-2235" + +# https://www.linuxkernelcves.com/cves/CVE-2023-28328 +# Fixed with 6.1.2 +CVE_CHECK_IGNORE += "CVE-2023-28328" + +# https://www.linuxkernelcves.com/cves/CVE-2023-2985 +# Fixed in 6.1.16 +CVE_CHECK_IGNORE += "CVE-2023-2985" + +# https://www.linuxkernelcves.com/cves/CVE-2023-28866 +# Fixed with 6.1.22 +CVE_CHECK_IGNORE += "CVE-2023-28866" + +# https://www.linuxkernelcves.com/cves/CVE-2023-30456 +# Fixed with 6.1.21 +CVE_CHECK_IGNORE += "CVE-2023-30456" + +# https://www.linuxkernelcves.com/cves/CVE-2023-30772 +# Fixed with 6.1.22 +CVE_CHECK_IGNORE += "CVE-2023-30772" + +# https://www.linuxkernelcves.com/cves/CVE-2023-31436 +# Fixed with 6.1.26 +CVE_CHECK_IGNORE += "CVE-2023-31436" + +# https://www.linuxkernelcves.com/cves/CVE-2023-32233 +# Fixed with 6.1.28 +CVE_CHECK_IGNORE += "CVE-2023-32233" + +# https://www.linuxkernelcves.com/cves/CVE-2023-33203 +# Fixed with 6.1.22 +CVE_CHECK_IGNORE += "CVE-2023-33203" + +# https://www.linuxkernelcves.com/cves/CVE-2023-33288 +# Fixed with 6.1.22 +CVE_CHECK_IGNORE += "CVE-2023-33288" + +# https://www.linuxkernelcves.com/cves/CVE-2023-34256 +# Fixed in 6.1.29 +CVE_CHECK_IGNORE += "CVE-2023-34256" + +# Backported to 6.1.30 as 9a342d4 +CVE_CHECK_IGNORE += "CVE-2023-3141" diff --git a/poky/meta/conf/distro/include/default-providers.inc b/poky/meta/conf/distro/include/default-providers.inc index 3a4e989c1f..d18173c744 100644 --- a/poky/meta/conf/distro/include/default-providers.inc +++ b/poky/meta/conf/distro/include/default-providers.inc @@ -24,7 +24,6 @@ PREFERRED_PROVIDER_virtual/make-native ?= "make-native" # Default virtual runtime providers # VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-opkg" -VIRTUAL-RUNTIME_apm ?= "apm" VIRTUAL-RUNTIME_alsa-state ?= "alsa-state" VIRTUAL-RUNTIME_getopt ?= "util-linux-getopt" VIRTUAL-RUNTIME_base-utils ?= "busybox" diff --git a/poky/meta/conf/distro/include/maintainers.inc b/poky/meta/conf/distro/include/maintainers.inc index 0f7b7287bb..9bb5c5205c 100644 --- a/poky/meta/conf/distro/include/maintainers.inc +++ b/poky/meta/conf/distro/include/maintainers.inc @@ -38,7 +38,6 @@ RECIPE_MAINTAINER:pn-alsa-tools = "Michael Opdenacker <michael.opdenacker@bootli RECIPE_MAINTAINER:pn-alsa-topology-conf = "Michael Opdenacker <michael.opdenacker@bootlin.com>" RECIPE_MAINTAINER:pn-alsa-ucm-conf = "Michael Opdenacker <michael.opdenacker@bootlin.com>" RECIPE_MAINTAINER:pn-alsa-utils = "Michael Opdenacker <michael.opdenacker@bootlin.com>" -RECIPE_MAINTAINER:pn-apmd = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER:pn-apr = "Hongxu Jia <hongxu.jia@windriver.com>" RECIPE_MAINTAINER:pn-apr-util = "Hongxu Jia <hongxu.jia@windriver.com>" RECIPE_MAINTAINER:pn-apt = "Unassigned <unassigned@yoctoproject.org>" @@ -312,7 +311,7 @@ RECIPE_MAINTAINER:pn-libarchive = "Otavio Salvador <otavio.salvador@ossystems.co RECIPE_MAINTAINER:pn-libassuan = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER:pn-libatomic-ops = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER:pn-libbsd = "Yi Zhao <yi.zhao@windriver.com>" -RECIPE_MAINTAINER:pn-libc-test = "Chase Qi <chase.qi@linaro.org>" +RECIPE_MAINTAINER:pn-libc-test = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER:pn-libcap = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER:pn-libcap-ng = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER:pn-libcap-ng-python = "Yi Zhao <yi.zhao@windriver.com>" @@ -426,7 +425,7 @@ RECIPE_MAINTAINER:pn-libx11 = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER:pn-libx11-compose-data = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER:pn-libxau = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER:pn-libxcb = "Unassigned <unassigned@yoctoproject.org>" -RECIPE_MAINTAINER:pn-libxcvt = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" +RECIPE_MAINTAINER:pn-libxcvt = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER:pn-libxcomposite = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER:pn-libxcursor = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER:pn-libxcrypt = "Khem Raj <raj.khem@gmail.com>" @@ -555,7 +554,7 @@ RECIPE_MAINTAINER:pn-npth = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER:pn-nss-myhostname = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER:pn-numactl = "Richard Purdie <richard.purdie@linuxfoundation.org>" RECIPE_MAINTAINER:pn-ofono = "Ross Burton <ross.burton@arm.com>" -RECIPE_MAINTAINER:pn-opensbi = "Alistair Francis <alistair.francis@wdc.com>" +RECIPE_MAINTAINER:pn-opensbi = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER:pn-openssh = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER:pn-openssl = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER:pn-opkg = "Alex Stewart <alex.stewart@ni.com>" @@ -564,8 +563,8 @@ RECIPE_MAINTAINER:pn-opkg-keyrings = "Alex Stewart <alex.stewart@ni.com>" RECIPE_MAINTAINER:pn-opkg-utils = "Alex Stewart <alex.stewart@ni.com>" RECIPE_MAINTAINER:pn-orc = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER:pn-os-release = "Ross Burton <ross.burton@arm.com>" -RECIPE_MAINTAINER:pn-ovmf = "Ricardo Neri <ricardo.neri-calderon@linux.intel.com>" -RECIPE_MAINTAINER:pn-ovmf-shell-image = "Ricardo Neri <ricardo.neri-calderon@linux.intel.com>" +RECIPE_MAINTAINER:pn-ovmf = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER:pn-ovmf-shell-image = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER:pn-p11-kit = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER:pn-package-index = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER:pn-pango = "Ross Burton <ross.burton@arm.com>" @@ -599,7 +598,7 @@ RECIPE_MAINTAINER:pn-ptest-runner = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER:pn-pulseaudio = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER:pn-pulseaudio-client-conf-sato = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER:pn-puzzles = "Anuj Mittal <anuj.mittal@intel.com>" -RECIPE_MAINTAINER:pn-python3 = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" +RECIPE_MAINTAINER:pn-python3 = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER:pn-python3-alabaster = "Tim Orling <tim.orling@konsulko.com>" RECIPE_MAINTAINER:pn-python3-asn1crypto = "Tim Orling <tim.orling@konsulko.com>" RECIPE_MAINTAINER:pn-python3-atomicwrites = "Tim Orling <tim.orling@konsulko.com>" @@ -613,20 +612,20 @@ RECIPE_MAINTAINER:pn-python3-cffi = "Tim Orling <tim.orling@konsulko.com>" RECIPE_MAINTAINER:pn-python3-chardet = "Tim Orling <tim.orling@konsulko.com>" RECIPE_MAINTAINER:pn-python3-cryptography = "Tim Orling <tim.orling@konsulko.com>" RECIPE_MAINTAINER:pn-python3-cryptography-vectors = "Tim Orling <tim.orling@konsulko.com>" -RECIPE_MAINTAINER:pn-python3-cython = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" +RECIPE_MAINTAINER:pn-python3-cython = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER:pn-python3-dbus = "Zang Ruochen <zangruochen@loongson.cn>" -RECIPE_MAINTAINER:pn-python3-dbusmock = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" -RECIPE_MAINTAINER:pn-python3-docutils = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" +RECIPE_MAINTAINER:pn-python3-dbusmock = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER:pn-python3-docutils = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER:pn-python3-dtschema = "Bruce Ashfield <bruce.ashfield@gmail.com>" RECIPE_MAINTAINER:pn-python3-dtschema-wrapper = "Bruce Ashfield <bruce.ashfield@gmail.com>" RECIPE_MAINTAINER:pn-python3-editables = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER:pn-python3-pycryptodome = "Joshua Watt <JPEWhacker@gmail.com>" RECIPE_MAINTAINER:pn-python3-pycryptodomex = "Joshua Watt <JPEWhacker@gmail.com>" RECIPE_MAINTAINER:pn-python3-pyrsistent = "Bruce Ashfield <bruce.ashfield@gmail.com>" -RECIPE_MAINTAINER:pn-python3-extras = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" +RECIPE_MAINTAINER:pn-python3-extras = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER:pn-python3-flit-core = "Tim Orling <tim.orling@konsulko.com>" -RECIPE_MAINTAINER:pn-python3-git = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" -RECIPE_MAINTAINER:pn-python3-gitdb = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" +RECIPE_MAINTAINER:pn-python3-git = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER:pn-python3-gitdb = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER:pn-python3-hatchling = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER:pn-python3-hatch-fancy-pypi-readme = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER:pn-python3-hatch-vcs = "Ross Burton <ross.burton@arm.com>" @@ -635,7 +634,7 @@ RECIPE_MAINTAINER:pn-python3-idna = "Bruce Ashfield <bruce.ashfield@gmail.com>" RECIPE_MAINTAINER:pn-python3-imagesize = "Tim Orling <tim.orling@konsulko.com>" RECIPE_MAINTAINER:pn-python3-importlib-metadata = "Tim Orling <tim.orling@konsulko.com>" RECIPE_MAINTAINER:pn-python3-iniconfig = "Tim Orling <tim.orling@konsulko.com>" -RECIPE_MAINTAINER:pn-python3-iniparse = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" +RECIPE_MAINTAINER:pn-python3-iniparse = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER:pn-python3-iso8601 = "Tim Orling <tim.orling@konsulko.com>" RECIPE_MAINTAINER:pn-python3-installer = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER:pn-python3-jinja2 = "Richard Purdie <richard.purdie@linuxfoundation.org>" @@ -644,12 +643,12 @@ RECIPE_MAINTAINER:pn-python3-jsonschema = "Bruce Ashfield <bruce.ashfield@gmail. RECIPE_MAINTAINER:pn-python3-libarchive-c = "Joshua Watt <JPEWhacker@gmail.com>" RECIPE_MAINTAINER:pn-python3-lxml = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER:pn-python3-magic = "Joshua Watt <JPEWhacker@gmail.com>" -RECIPE_MAINTAINER:pn-python3-mako = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" +RECIPE_MAINTAINER:pn-python3-mako = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER:pn-python3-markdown = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER:pn-python3-markupsafe = "Richard Purdie <richard.purdie@linuxfoundation.org>" RECIPE_MAINTAINER:pn-python3-more-itertools = "Tim Orling <tim.orling@konsulko.com>" RECIPE_MAINTAINER:pn-python3-ndg-httpsclient = "Tim Orling <tim.orling@konsulko.com>" -RECIPE_MAINTAINER:pn-python3-numpy = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" +RECIPE_MAINTAINER:pn-python3-numpy = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER:pn-python3-packaging = "Tim Orling <tim.orling@konsulko.com>" RECIPE_MAINTAINER:pn-python3-pathlib2 = "Tim Orling <tim.orling@konsulko.com>" RECIPE_MAINTAINER:pn-python3-pathspec = "Ross Burton <ross.burton@arm.com>" @@ -665,10 +664,10 @@ RECIPE_MAINTAINER:pn-python3-pyasn1 = "Tim Orling <tim.orling@konsulko.com>" RECIPE_MAINTAINER:pn-python3-pycairo = "Zang Ruochen <zangruochen@loongson.cn>" RECIPE_MAINTAINER:pn-python3-pycparser = "Tim Orling <tim.orling@konsulko.com>" RECIPE_MAINTAINER:pn-python3-pyelftools = "Joshua Watt <JPEWhacker@gmail.com>" -RECIPE_MAINTAINER:pn-python3-pygments = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" +RECIPE_MAINTAINER:pn-python3-pygments = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER:pn-python3-pygobject = "Zang Ruochen <zangruochen@loongson.cn>" RECIPE_MAINTAINER:pn-python3-pyopenssl = "Tim Orling <tim.orling@konsulko.com>" -RECIPE_MAINTAINER:pn-python3-pyparsing = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" +RECIPE_MAINTAINER:pn-python3-pyparsing = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER:pn-python3-pyproject-hooks = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER:pn-python3-pysocks = "Tim Orling <tim.orling@konsulko.com>" RECIPE_MAINTAINER:pn-python3-pytest = "Tim Orling <tim.orling@konsulko.com>" @@ -683,12 +682,12 @@ RECIPE_MAINTAINER:pn-python3-rfc3987 = "Bruce Ashfield <bruce.ashfield@gmail.com RECIPE_MAINTAINER:pn-python3-ruamel-yaml = "Bruce Ashfield <bruce.ashfield@gmail.com>" RECIPE_MAINTAINER:pn-python3-scons = "Tim Orling <tim.orling@konsulko.com>" RECIPE_MAINTAINER:pn-python3-semantic-version = "Tim Orling <tim.orling@konsulko.com>" -RECIPE_MAINTAINER:pn-python3-setuptools = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" +RECIPE_MAINTAINER:pn-python3-setuptools = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER:pn-python3-setuptools-rust = "Tim Orling <tim.orling@konsulko.com>" RECIPE_MAINTAINER:pn-python3-setuptools-scm = "Tim Orling <tim.orling@konsulko.com>" RECIPE_MAINTAINER:pn-python3-six = "Zang Ruochen <zangruochen@loongson.cn>" RECIPE_MAINTAINER:pn-python3-smartypants = "Alexander Kanavin <alex.kanavin@gmail.com>" -RECIPE_MAINTAINER:pn-python3-smmap = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" +RECIPE_MAINTAINER:pn-python3-smmap = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER:pn-python3-snowballstemmer = "Tim Orling <tim.orling@konsulko.com>" RECIPE_MAINTAINER:pn-python3-sortedcontainers = "Tim Orling <tim.orling@konsulko.com>" RECIPE_MAINTAINER:pn-python3-sphinx = "Tim Orling <tim.orling@konsulko.com>" @@ -699,8 +698,8 @@ RECIPE_MAINTAINER:pn-python3-sphinxcontrib-serializinghtml = "Tim Orling <tim.or RECIPE_MAINTAINER:pn-python3-sphinxcontrib-jsmath = "Tim Orling <tim.orling@konsulko.com>" RECIPE_MAINTAINER:pn-python3-sphinxcontrib-applehelp = "Tim Orling <tim.orling@konsulko.com>" RECIPE_MAINTAINER:pn-python3-sphinx-rtd-theme = "Tim Orling <tim.orling@konsulko.com>" -RECIPE_MAINTAINER:pn-python3-subunit = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" -RECIPE_MAINTAINER:pn-python3-testtools = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" +RECIPE_MAINTAINER:pn-python3-subunit = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER:pn-python3-testtools = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER:pn-python3-toml = "Tim Orling <tim.orling@konsulko.com>" RECIPE_MAINTAINER:pn-python3-tomli = "Tim Orling <tim.orling@konsulko.com>" RECIPE_MAINTAINER:pn-python3-trove-classifiers = "Trevor Gamblin <tgamblin@baylibre.com>" @@ -827,6 +826,7 @@ RECIPE_MAINTAINER:pn-vulkan-headers = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER:pn-vulkan-loader = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER:pn-vulkan-samples = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER:pn-vulkan-tools = "Anuj Mittal <anuj.mittal@intel.com>" +RECIPE_MAINTAINER:pn-vulkan-validation-layers = "Vincent Davis Jr <vince@underview.tech>" RECIPE_MAINTAINER:pn-waffle = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER:pn-watchdog = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER:pn-watchdog-config = "Alexander Kanavin <alex.kanavin@gmail.com>" @@ -839,7 +839,7 @@ RECIPE_MAINTAINER:pn-weston-init = "Denys Dmytriyenko <denis@denix.org>" RECIPE_MAINTAINER:pn-wget = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER:pn-which = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER:pn-wic-tools = "Anuj Mittal <anuj.mittal@intel.com>" -RECIPE_MAINTAINER:pn-wireless-regdb = "Adrian Bunk <bunk@kernel.org>" +RECIPE_MAINTAINER:pn-wireless-regdb = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER:pn-wpa-supplicant = "Changhyeok Bae <changhyeok.bae@gmail.com>" RECIPE_MAINTAINER:pn-wpebackend-fdo = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER:pn-x11perf = "Unassigned <unassigned@yoctoproject.org>" diff --git a/poky/meta/files/common-licenses/LGPL-3.0-with-zeromq-exception b/poky/meta/files/common-licenses/LGPL-3.0-with-zeromq-exception new file mode 100644 index 0000000000..02e943c4ac --- /dev/null +++ b/poky/meta/files/common-licenses/LGPL-3.0-with-zeromq-exception @@ -0,0 +1,181 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + +-------------------------------------------------------------------------------- + + SPECIAL EXCEPTION GRANTED BY COPYRIGHT HOLDERS + +As a special exception, copyright holders give you permission to link this +library with independent modules to produce an executable, regardless of +the license terms of these independent modules, and to copy and distribute +the resulting executable under terms of your choice, provided that you also +meet, for each linked independent module, the terms and conditions of +the license of that module. An independent module is a module which is not +derived from or based on this library. If you modify this library, you must +extend this exception to your version of the library. + +Note: this exception relieves you of any obligations under sections 4 and 5 +of this license, and section 6 of the GNU General Public License. diff --git a/poky/meta/lib/oe/npm_registry.py b/poky/meta/lib/oe/npm_registry.py index db581e280e..d97ced7cda 100644 --- a/poky/meta/lib/oe/npm_registry.py +++ b/poky/meta/lib/oe/npm_registry.py @@ -11,7 +11,7 @@ import subprocess _ALWAYS_SAFE = frozenset('ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' '0123456789' - '_.-~') + '_.-~()') MISSING_OK = object() diff --git a/poky/meta/lib/oe/package_manager/rpm/__init__.py b/poky/meta/lib/oe/package_manager/rpm/__init__.py index fa218485f5..f40c880af4 100644 --- a/poky/meta/lib/oe/package_manager/rpm/__init__.py +++ b/poky/meta/lib/oe/package_manager/rpm/__init__.py @@ -386,11 +386,12 @@ class RpmPM(PackageManager): self.save_rpmpostinst(pkg) def extract(self, pkg): - output = self._invoke_dnf(["repoquery", "--queryformat", "%{location}", pkg]) + output = self._invoke_dnf(["repoquery", "--location", pkg]) pkg_name = output.splitlines()[-1] if not pkg_name.endswith(".rpm"): bb.fatal("dnf could not find package %s in repository: %s" %(pkg, output)) - pkg_path = oe.path.join(self.rpm_repo_dir, pkg_name) + # Strip file: prefix + pkg_path = pkg_name[5:] cpio_cmd = bb.utils.which(os.getenv("PATH"), "cpio") rpm2cpio_cmd = bb.utils.which(os.getenv("PATH"), "rpm2cpio") diff --git a/poky/meta/lib/oe/package_manager/rpm/sdk.py b/poky/meta/lib/oe/package_manager/rpm/sdk.py index 0726a18b91..85df6e949c 100644 --- a/poky/meta/lib/oe/package_manager/rpm/sdk.py +++ b/poky/meta/lib/oe/package_manager/rpm/sdk.py @@ -112,5 +112,6 @@ class PkgSdk(Sdk): for f in glob.glob(os.path.join(self.sdk_output, "etc", "rpm*")): self.movefile(f, native_sysconf_dir) for f in glob.glob(os.path.join(self.sdk_output, "etc", "dnf", "*")): - self.movefile(f, native_sysconf_dir) + self.mkdirhier(native_sysconf_dir + "/dnf") + self.movefile(f, native_sysconf_dir + "/dnf") self.remove(os.path.join(self.sdk_output, "etc"), True) diff --git a/poky/meta/lib/oe/sdk.py b/poky/meta/lib/oe/sdk.py index 81fcf15371..3dc3672210 100644 --- a/poky/meta/lib/oe/sdk.py +++ b/poky/meta/lib/oe/sdk.py @@ -70,7 +70,7 @@ class Sdk(object, metaclass=ABCMeta): #FIXME: using umbrella exc catching because bb.utils method raises it except Exception as e: bb.debug(1, "printing the stack trace\n %s" %traceback.format_exc()) - bb.error("unable to place %s in final SDK location" % sourcefile) + bb.fatal("unable to place %s in final SDK location" % sourcefile) def mkdirhier(self, dirpath): try: diff --git a/poky/meta/lib/oeqa/core/runner.py b/poky/meta/lib/oeqa/core/runner.py index d50690ab37..5077eb8e3e 100644 --- a/poky/meta/lib/oeqa/core/runner.py +++ b/poky/meta/lib/oeqa/core/runner.py @@ -229,6 +229,10 @@ class OETestResult(_TestResult): # Override as we unexpected successes aren't failures for us return (len(self.failures) == len(self.errors) == 0) + def hasAnyFailingTest(self): + # Account for expected failures + return not self.wasSuccessful() or len(self.expectedFailures) + class OEListTestsResult(object): def wasSuccessful(self): return True diff --git a/poky/meta/lib/oeqa/core/target/ssh.py b/poky/meta/lib/oeqa/core/target/ssh.py index 51079075b5..e650302052 100644 --- a/poky/meta/lib/oeqa/core/target/ssh.py +++ b/poky/meta/lib/oeqa/core/target/ssh.py @@ -40,8 +40,11 @@ class OESSHTarget(OETarget): '-o', 'StrictHostKeyChecking=no', '-o', 'LogLevel=ERROR' ] + scp_options = [ + '-r' + ] self.ssh = ['ssh', '-l', self.user ] + ssh_options - self.scp = ['scp'] + ssh_options + self.scp = ['scp'] + ssh_options + scp_options if port: self.ssh = self.ssh + [ '-p', port ] self.scp = self.scp + [ '-P', port ] diff --git a/poky/meta/lib/oeqa/selftest/cases/bbtests.py b/poky/meta/lib/oeqa/selftest/cases/bbtests.py index 1dd2839c8d..31aa5680f0 100644 --- a/poky/meta/lib/oeqa/selftest/cases/bbtests.py +++ b/poky/meta/lib/oeqa/selftest/cases/bbtests.py @@ -188,6 +188,10 @@ SSTATE_DIR = \"${TOPDIR}/download-selftest\" self.assertTrue(find, "No version returned for searched recipe. bitbake output: %s" % result.output) def test_prefile(self): + # Test when the prefile does not exist + result = runCmd('bitbake -r conf/prefile.conf', ignore_status=True) + self.assertEqual(1, result.status, "bitbake didn't error and should have when a specified prefile didn't exist: %s" % result.output) + # Test when the prefile exists preconf = os.path.join(self.builddir, 'conf/prefile.conf') self.track_for_cleanup(preconf) ftools.write_file(preconf ,"TEST_PREFILE=\"prefile\"") @@ -198,6 +202,10 @@ SSTATE_DIR = \"${TOPDIR}/download-selftest\" self.assertIn('localconf', result.output) def test_postfile(self): + # Test when the postfile does not exist + result = runCmd('bitbake -R conf/postfile.conf', ignore_status=True) + self.assertEqual(1, result.status, "bitbake didn't error and should have when a specified postfile didn't exist: %s" % result.output) + # Test when the postfile exists postconf = os.path.join(self.builddir, 'conf/postfile.conf') self.track_for_cleanup(postconf) ftools.write_file(postconf , "TEST_POSTFILE=\"postfile\"") diff --git a/poky/meta/lib/oeqa/selftest/cases/devtool.py b/poky/meta/lib/oeqa/selftest/cases/devtool.py index 397895c936..4c8e375d00 100644 --- a/poky/meta/lib/oeqa/selftest/cases/devtool.py +++ b/poky/meta/lib/oeqa/selftest/cases/devtool.py @@ -1469,6 +1469,7 @@ class DevtoolUpdateTests(DevtoolBase): def test_devtool_finish_modify_git_subdir(self): # Check preconditions testrecipe = 'dos2unix' + self.append_config('ERROR_QA:remove:pn-dos2unix = "patch-status"\n') bb_vars = get_bb_vars(['SRC_URI', 'S', 'WORKDIR', 'FILE'], testrecipe) self.assertIn('git://', bb_vars['SRC_URI'], 'This test expects the %s recipe to be a git recipe' % testrecipe) workdir_git = '%s/git/' % bb_vars['WORKDIR'] diff --git a/poky/meta/lib/oeqa/selftest/cases/kerneldevelopment.py b/poky/meta/lib/oeqa/selftest/cases/kerneldevelopment.py index 4325f38598..b1f78a0cd1 100644 --- a/poky/meta/lib/oeqa/selftest/cases/kerneldevelopment.py +++ b/poky/meta/lib/oeqa/selftest/cases/kerneldevelopment.py @@ -64,6 +64,7 @@ class KernelDev(OESelftestTestCase): recipe_append = os.path.join(self.recipeskernel_dir, 'linux-yocto_%.bbappend') with open(recipe_append, 'w+') as fh: fh.write('SRC_URI += "file://%s"\n' % patch_name) + fh.write('ERROR_QA:remove:pn-linux-yocto = "patch-status"\n') fh.write('FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"') runCmd('bitbake virtual/kernel -c clean') diff --git a/poky/meta/lib/oeqa/selftest/cases/oescripts.py b/poky/meta/lib/oeqa/selftest/cases/oescripts.py index 5b0691a9ff..7d3a00e2ab 100644 --- a/poky/meta/lib/oeqa/selftest/cases/oescripts.py +++ b/poky/meta/lib/oeqa/selftest/cases/oescripts.py @@ -123,8 +123,8 @@ class OEGitproxyTests(OEScriptTests): class OeRunNativeTest(OESelftestTestCase): def test_oe_run_native(self): bitbake("qemu-helper-native -c addto_recipe_sysroot") - result = runCmd("oe-run-native qemu-helper-native tunctl -h") - self.assertIn("Delete: tunctl -d device-name [-f tun-clone-device]", result.output) + result = runCmd("oe-run-native qemu-helper-native qemu-oe-bridge-helper --help") + self.assertIn("Helper function to find and exec qemu-bridge-helper", result.output) class OEListPackageconfigTests(OEScriptTests): #oe-core.scripts.List_all_the_PACKAGECONFIG's_flags diff --git a/poky/meta/lib/oeqa/selftest/cases/reproducible.py b/poky/meta/lib/oeqa/selftest/cases/reproducible.py index 1f0ed32fa0..0f7e6eb376 100644 --- a/poky/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/poky/meta/lib/oeqa/selftest/cases/reproducible.py @@ -128,15 +128,23 @@ class DiffoscopeTests(OESelftestTestCase): class ReproducibleTests(OESelftestTestCase): # Test the reproducibility of whatever is built between sstate_targets and targets - package_classes = ['deb', 'ipk', 'rpm'] + package_classes = get_bb_var("OEQA_REPRODUCIBLE_TEST_PACKAGE") + if package_classes: + package_classes = package_classes.split() + else: + package_classes = ['deb', 'ipk', 'rpm'] # Maximum report size, in bytes max_report_size = 250 * 1024 * 1024 # targets are the things we want to test the reproducibility of - targets = ['core-image-minimal', 'core-image-sato', 'core-image-full-cmdline', 'core-image-weston', 'world'] + targets = get_bb_var("OEQA_REPRODUCIBLE_TEST_TARGET") + if targets: + targets = targets.split() + else: + targets = ['core-image-minimal', 'core-image-sato', 'core-image-full-cmdline', 'core-image-weston', 'world'] # sstate targets are things to pull from sstate to potentially cut build/debugging time - sstate_targets = [] + sstate_targets = (get_bb_var("OEQA_REPRODUCIBLE_TEST_SSTATE_TARGETS") or "").split() save_results = False if 'OEQA_DEBUGGING_SAVED_OUTPUT' in os.environ: save_results = os.environ['OEQA_DEBUGGING_SAVED_OUTPUT'] diff --git a/poky/meta/lib/oeqa/utils/logparser.py b/poky/meta/lib/oeqa/utils/logparser.py index 60df754b36..8054acc853 100644 --- a/poky/meta/lib/oeqa/utils/logparser.py +++ b/poky/meta/lib/oeqa/utils/logparser.py @@ -77,7 +77,10 @@ class PtestParser(object): for t in test_regex: result = test_regex[t].search(line) if result: - self.results[current_section['name']][result.group(1).strip()] = t + try: + self.results[current_section['name']][result.group(1).strip()] = t + except KeyError: + bb.warn("Result with no section: %s - %s" % (t, result.group(1).strip())) # Python performance for repeatedly joining long strings is poor, do it all at once at the end. # For 2.1 million lines in a log this reduces 18 hours to 12s. diff --git a/poky/meta/recipes-bsp/apmd/apmd/apmd.service b/poky/meta/recipes-bsp/apmd/apmd/apmd.service deleted file mode 100644 index ffab82334f..0000000000 --- a/poky/meta/recipes-bsp/apmd/apmd/apmd.service +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=Advanced Power Management daemon -After=remote-fs.target - -[Service] -EnvironmentFile=-@SYSCONFDIR@/default/apmd -ExecStart=@SBINDIR@/apmd -P @SYSCONFDIR@/apm/apmd_proxy $APMD diff --git a/poky/meta/recipes-bsp/apmd/apmd/apmd_proxy b/poky/meta/recipes-bsp/apmd/apmd/apmd_proxy deleted file mode 100644 index c48ee4e5d5..0000000000 --- a/poky/meta/recipes-bsp/apmd/apmd/apmd_proxy +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/sh -# -# apmd_proxy - program dispatcher for APM daemon -# -# Written by Craig Markwardt (craigm@lheamail.gsfc.nasa.gov) 21 May 1999 -# Modified for Debian by Avery Pennarun -# -# This shell script is called by the APM daemon (apmd) when a power -# management event occurs. Its first and second arguments describe the -# event. For example, apmd will call "apmd_proxy suspend system" just -# before the system is suspended. -# -# Here are the possible arguments: -# -# start - APM daemon has started -# stop - APM daemon is shutting down -# suspend critical - APM system indicates critical suspend (++) -# suspend system - APM system has requested suspend mode -# suspend user - User has requested suspend mode -# standby system - APM system has requested standby mode -# standby user - User has requested standby mode -# resume suspend - System has resumed from suspend mode -# resume standby - System has resumed from standby mode -# resume critical - System has resumed from critical suspend -# change battery - APM system reported low battery -# change power - APM system reported AC/battery change -# change time - APM system reported time change (*) -# change capability - APM system reported config. change (+) -# -# (*) - APM daemon may be configured to not call these sequences -# (+) - Available if APM kernel supports it. -# (++) - "suspend critical" is never passed to apmd from the kernel, -# so we will never see it here. Scripts that process "resume -# critical" events need to take this into account. -# -# It is the proxy script's responsibility to examine the APM status -# (via /proc/apm) or other status and to take appropriate actions. -# For example, the script might unmount network drives before the -# machine is suspended. -# -# In Debian, the usual way of adding functionality to the proxy is to -# add a script to /etc/apm/event.d. This script will be called by -# apmd_proxy (via run-parts) with the same arguments. -# -# If it is important that a certain set of script be run in a certain -# order on suspend and in a different order on resume, then put all -# the scripts in /etc/apm/scripts.d instead of /etc/apm/event.d and -# symlink to these from /etc/apm/suspend.d, /etc/apm/resume.d and -# /etc/apm/other.d using names whose lexicographical order is the same -# as the desired order of execution. -# -# If the kernel's APM driver supports it, apmd_proxy can return a non-zero -# exit status on suspend and standby events, indicating that the suspend -# or standby event should be rejected. -# -# ******************************************************************* - -set -e - -# The following doesn't yet work, because current kernels (up to at least -# 2.4.20) do not support rejection of APM events. Supporting this would -# require substantial modifications to the APM driver. We will re-enable -# this feature if the driver is ever modified. -- cph@debian.org -# -#SUSPEND_ON_AC=false -#[ -r /etc/apm/apmd_proxy.conf ] && . /etc/apm/apmd_proxy.conf -# -#if [ "${SUSPEND_ON_AC}" = "false" -a "${2}" = "system" ] \ -# && on_ac_power >/dev/null; then -# # Reject system suspends and standbys if we are on AC power -# exit 1 # Reject (NOTE kernel support must be enabled) -#fi - -if [ "${1}" = "suspend" -o "${1}" = "standby" ]; then - run-parts -a "${1}" -a "${2}" /etc/apm/event.d - if [ -d /etc/apm/suspend.d ]; then - run-parts -a "${1}" -a "${2}" /etc/apm/suspend.d - fi -elif [ "${1}" = "resume" ]; then - if [ -d /etc/apm/resume.d ]; then - run-parts -a "${1}" -a "${2}" /etc/apm/resume.d - fi - run-parts -a "${1}" -a "${2}" /etc/apm/event.d -else - run-parts -a "${1}" -a "${2}" /etc/apm/event.d - if [ -d /etc/apm/other.d ]; then - run-parts -a "${1}" -a "${2}" /etc/apm/other.d - fi -fi - -exit 0 diff --git a/poky/meta/recipes-bsp/apmd/apmd/apmd_proxy.conf b/poky/meta/recipes-bsp/apmd/apmd/apmd_proxy.conf deleted file mode 100644 index 751145c522..0000000000 --- a/poky/meta/recipes-bsp/apmd/apmd/apmd_proxy.conf +++ /dev/null @@ -1,16 +0,0 @@ -# /etc/apm/apmd_proxy.conf: configuration file for apmd. -# -# This file is managed by debconf when installing or reconfiguring the -# package. It is generated by merging the answers gathered by debconf -# into the template file "/usr/share/apmd/apmd_proxy.conf". - -# The following doesn't yet work, because current kernels (up to at least -# 2.4.20) do not support rejection of APM events. Supporting this would -# require substantial modifications to the APM driver. We will re-enable -# this feature if the driver is ever modified. -- cph@debian.org -# -# Set the following to "false" if you want to reject system suspend or -# system standby requests when the computer is running on AC power. -# Otherwise set this to "true". Such requests are never rejected when -# the computer is running on battery power. -#SUSPEND_ON_AC=true diff --git a/poky/meta/recipes-bsp/apmd/apmd/default b/poky/meta/recipes-bsp/apmd/apmd/default deleted file mode 100644 index 4b7965abf8..0000000000 --- a/poky/meta/recipes-bsp/apmd/apmd/default +++ /dev/null @@ -1,8 +0,0 @@ -# -# Default for /etc/init.d/apmd -# - -# As apmd can be called with arguments, we use the following variable -# to store them, e.g., APMD="-w 5 -p 2". -# See the manual page apmd(8) for details. -APMD="--proxy-timeout 30" diff --git a/poky/meta/recipes-bsp/apmd/apmd/init b/poky/meta/recipes-bsp/apmd/apmd/init deleted file mode 100755 index c0b41aa9d1..0000000000 --- a/poky/meta/recipes-bsp/apmd/apmd/init +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: apmd -# Required-Start: $remote_fs -# Required-Stop: $remote_fs -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Advanced Power Management daemon -### END INIT INFO - -# Source function library. -. /etc/init.d/functions - -PATH=/bin:/usr/bin:/sbin:/usr/sbin - -[ -f /etc/default/rcS ] && . /etc/default/rcS -[ -f /etc/default/apmd ] && . /etc/default/apmd - -case "$1" in - start) - echo -n "Starting advanced power management daemon: " - start-stop-daemon -S -x /usr/sbin/apmd -- \ - -P /etc/apm/apmd_proxy $APMD - if [ $? = 0 ]; then - echo "apmd." - else - echo "(failed.)" - fi - ;; - stop) - echo -n "Stopping advanced power management daemon: " - start-stop-daemon -K \ - -x /usr/sbin/apmd - echo "apmd." - ;; - status) - status /usr/sbin/apmd; - exit $? - ;; - restart|force-reload) - $0 stop - $0 start - exit - ;; - *) - echo "Usage: /etc/init.d/apmd {start|stop|status|restart|force-reload}" - exit 1 - ;; -esac - -exit 0 diff --git a/poky/meta/recipes-bsp/apmd/apmd/legacy.patch b/poky/meta/recipes-bsp/apmd/apmd/legacy.patch deleted file mode 100644 index 8871311805..0000000000 --- a/poky/meta/recipes-bsp/apmd/apmd/legacy.patch +++ /dev/null @@ -1,133 +0,0 @@ -From 3595933d221f0ba836917debc0776b8723972ec9 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Tue, 11 Aug 2015 17:40:50 +0300 -Subject: [PATCH 1/3] Patch with fixes provided by Debian. - -This patch is taken from -ftp://ftp.debian.org/debian/pool/main/a/apmd/apmd_3.2.2-15.debian.tar.xz - -Upstream-Status: Inappropriate [upstream is dead] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - ---- - Makefile | 2 +- - apm.c | 3 ++- - apm.h | 9 +++++++++ - apmd.c | 15 ++++++++------- - 4 files changed, 20 insertions(+), 9 deletions(-) - -diff --git a/Makefile b/Makefile -index bf346d9..92fc0fd 100644 ---- a/Makefile -+++ b/Makefile -@@ -43,7 +43,7 @@ DESTDIR= - - CC=gcc - CFLAGS=-O -g --XTRACFLAGS=-Wall -pipe -I. -I/usr/src/linux/include \ -+XTRACFLAGS=-Wall -pipe -I. -I/usr/src/linux/include -I/usr/X11R6/include \ - -I/usr/src/linux-2.2/include -I /usr/src/linux-2.0/include \ - -DVERSION=\"$(VERSION)\" \ - -DDEFAULT_PROXY_NAME=\"$(PROXY_DIR)/apmd_proxy\" -diff --git a/apm.c b/apm.c -index b21c057..0359b1c 100644 ---- a/apm.c -+++ b/apm.c -@@ -219,12 +219,13 @@ int main(int argc, char **argv) - } - } - -- -+#if 0 - if (!(i.apm_flags & APM_32_BIT_SUPPORT)) - { - fprintf(stderr, "32-bit APM interface not supported\n"); - exit(1); - } -+#endif - - if (verbose && (i.apm_flags & 0x10)) - printf("APM BIOS Power Management is currently disabled\n"); -diff --git a/apm.h b/apm.h -index fb24dfd..824cc06 100644 ---- a/apm.h -+++ b/apm.h -@@ -20,6 +20,13 @@ - * $Id: apm.h,v 1.7 1999/07/05 22:31:11 apenwarr Exp $ - * - */ -+#ifndef _APM_H -+#define _APM_H 1 -+ -+#ifndef __KERNEL_STRICT_NAMES -+#define __KERNEL_STRICT_NAMES -+#endif -+ - #include <linux/apm_bios.h> - #include <sys/types.h> - -@@ -93,3 +100,5 @@ extern int apm_reject(int fd); - #else - #define apm_reject(fd) (-EINVAL) - #endif -+ -+#endif -diff --git a/apmd.c b/apmd.c -index 49ed3a1..560f536 100644 ---- a/apmd.c -+++ b/apmd.c -@@ -343,7 +343,7 @@ static int call_proxy(apm_event_t event) - /* parent */ - int status, retval; - ssize_t len; -- time_t time_limit; -+ time_t countdown; - - if (pid < 0) { - /* Couldn't fork */ -@@ -356,8 +356,9 @@ static int call_proxy(apm_event_t event) - /* Capture the child's output, if any, but only until it terminates */ - close(fds[1]); - fcntl(fds[0], F_SETFL, O_RDONLY|O_NONBLOCK); -- time_limit = time(0) + proxy_timeout; -+ countdown = proxy_timeout; - do { -+ countdown -= 1; - while ((len = read(fds[0], line, sizeof(line)-1)) > 0) { - line[len] = 0; - APMD_SYSLOG(LOG_INFO, "+ %s", line); -@@ -372,16 +373,16 @@ static int call_proxy(apm_event_t event) - goto proxy_done; - } - -- sleep(1); -+ while (sleep(1) > 0) ; - } while ( -- (time(0) < time_limit) -+ (countdown >= 0) - || (proxy_timeout < 0) - ); - - APMD_SYSLOG(LOG_NOTICE, "Proxy has been running more than %d seconds; killing it", proxy_timeout); - - kill(pid, SIGTERM); -- time_limit = time(0) + 5; -+ countdown = 5; - do { - retval = waitpid(pid, &status, WNOHANG); - if (retval == pid) -@@ -392,9 +393,9 @@ static int call_proxy(apm_event_t event) - goto proxy_done; - } - -- sleep(1); -+ while (sleep(1) > 0) ; - -- } while (time(0) < time_limit); -+ } while (countdown >= 0); - - kill(pid, SIGKILL); - status = __W_EXITCODE(0, SIGKILL); --- -2.1.4 - diff --git a/poky/meta/recipes-bsp/apmd/apmd/libtool.patch b/poky/meta/recipes-bsp/apmd/apmd/libtool.patch deleted file mode 100644 index fd0a952890..0000000000 --- a/poky/meta/recipes-bsp/apmd/apmd/libtool.patch +++ /dev/null @@ -1,41 +0,0 @@ -From d5dde7ca91a5aed273d8fe269e1a5194e85c8c79 Mon Sep 17 00:00:00 2001 -From: Scott Garman <scott.a.garman@intel.com> -Date: Tue, 13 Jul 2010 16:46:46 +0800 -Subject: [PATCH] apmd: upgrade to 3.2.2-14 - -Add by RP to address "unable to infer tagged configuration" error: - commit 35de05e61b88c0808a5e885bb0efdf420555d5ad - Author: Richard Purdie <rpurdie@rpsys.net> - Date: Sun Jun 1 16:13:38 2008 +0000 - - apmd: Use libtool --tag options to avoid problems with libtool 2.2.4 (from poky) - -However I didn't see same issue with current libtool-2.2.10. Also per my understanding, -the default tag, if not specified, falls back to CC. So disable it from patching, but -keep it here. If we encounter similar issue in the future, we could then push upstream - -Comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-16 - -Upstream-Status: Pending - -Signed-off-by: Scott Garman <scott.a.garman@intel.com> - ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 92fc0fd..8e283dc 100644 ---- a/Makefile -+++ b/Makefile -@@ -59,8 +59,8 @@ RANLIB=ranlib - #LDFLAGS=-s - - LIBTOOL=libtool --quiet --LT_COMPILE = $(LIBTOOL) --mode=compile $(CC) --LT_LINK = $(LIBTOOL) --mode=link $(CC) -+LT_COMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) -+LT_LINK = $(LIBTOOL) --tag=CC --mode=link $(CC) - LT_INSTALL = $(LIBTOOL) --mode=install install - LT_CLEAN = $(LIBTOOL) --mode=clean rm - diff --git a/poky/meta/recipes-bsp/apmd/apmd/linkage.patch b/poky/meta/recipes-bsp/apmd/apmd/linkage.patch deleted file mode 100644 index 3d32c49cd2..0000000000 --- a/poky/meta/recipes-bsp/apmd/apmd/linkage.patch +++ /dev/null @@ -1,53 +0,0 @@ -When building use the libtool intermediate .lo files instead of explicitly using -the .o files. Under libtool foo.lo is the libtool intermediate wrapper, foo.o is -a static build, and .libs/foo.o is a shared build. - -If static libraries have been disabled globally then libtool won't generate them -and explicit references to foo.o won't be satisfied. - -Upstream-Status: Pending -Signed-off-by: Ross Burton <ross.burton@intel.com> - -diff --git a/Makefile b/Makefile -index bb695c6..5f60146 100644 ---- a/Makefile -+++ b/Makefile -@@ -28,7 +28,7 @@ endif - - .SUFFIXES: - --OBJS=apmlib.o -+OBJS=apmlib.lo - EXES=apm apmd xapm apmsleep - HEADERS=apm.h - -@@ -66,22 +66,22 @@ all: $(EXES) - - $(OBJS): $(HEADERS) - --%.o: %.c -+%.lo: %.c - $(LT_COMPILE) -c $(CPPFLAGS) $(CFLAGS) $(XTRACFLAGS) $< - --%: %.o $(LIBAPM) -+%: %.lo $(LIBAPM) - $(LT_LINK) -o $@ $< $(LDFLAGS) $(LIBAPM) - --xapm.o: xapm.c -+xapm.lo: xapm.c - $(LT_COMPILE) -c $(CPPFLAGS) $(CFLAGS) $(XTRACFLAGS) -DNARROWPROTO $< - --apmd: apmd.o -+apmd: apmd.lo - --apmsleep: apmsleep.o -+apmsleep: apmsleep.lo - --apmexists: apmexists.o -+apmexists: apmexists.lo - --xapm: xapm.o $(LIBAPM) -+xapm: xapm.lo $(LIBAPM) - $(LT_LINK) -o $@ $< $(LDFLAGS) $(LIBAPM) $(XLDFLAGS) $(XLIBS) - - $(LIBAPM): apmlib.lo diff --git a/poky/meta/recipes-bsp/apmd/apmd/unlinux.patch b/poky/meta/recipes-bsp/apmd/apmd/unlinux.patch deleted file mode 100644 index ec8206cf17..0000000000 --- a/poky/meta/recipes-bsp/apmd/apmd/unlinux.patch +++ /dev/null @@ -1,25 +0,0 @@ -copy OE commit message here: - commit 9456cdc1cf43e3ba9e6d88c63560c1b6fdee4359 - Author: Michael Krelin <hacker@klever.net> - Date: Tue May 29 12:27:45 2007 +0000 - - apmd: prevent build from interferring with host kernel headers. Closes #1257 - -comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-13 - -Upstream-Status: Pending - -Signed-off-by: Scott Garman <scott.a.garman@intel.com> - ---- apmd-3.2.2.orig/Makefile -+++ apmd-3.2.2/Makefile -@@ -43,8 +43,7 @@ - - CC=gcc - CFLAGS=-O -g --XTRACFLAGS=-Wall -pipe -I. -I/usr/src/linux/include -I/usr/X11R6/include \ -- -I/usr/src/linux-2.2/include -I /usr/src/linux-2.0/include \ -+XTRACFLAGS=-Wall -pipe -I. \ - -DVERSION=\"$(VERSION)\" \ - -DDEFAULT_PROXY_NAME=\"$(PROXY_DIR)/apmd_proxy\" - LDFLAGS= diff --git a/poky/meta/recipes-bsp/apmd/apmd/wexitcode.patch b/poky/meta/recipes-bsp/apmd/apmd/wexitcode.patch deleted file mode 100644 index c5faa85fa7..0000000000 --- a/poky/meta/recipes-bsp/apmd/apmd/wexitcode.patch +++ /dev/null @@ -1,26 +0,0 @@ -Define non-posix W* funcitons - -C libraries like musl dont define them - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending - -Index: apmd-3.2.2.orig/apmd.c -=================================================================== ---- apmd-3.2.2.orig.orig/apmd.c -+++ apmd-3.2.2.orig/apmd.c -@@ -55,6 +55,14 @@ - #define MINIMUM_RATE_CALC_TIME 120 - #endif - -+#ifndef _POSIX_SOURCE -+ -+#define __WCOREFLAG 0200 -+#define __WCOREDUMP(x) (_W_INT(x) & __WCOREFLAG) -+#define __W_EXITCODE(ret, sig) ((ret) << 8 | (sig)) -+ -+#endif -+ - /* - * For the verbosity level feature to be useful, - * we rely on the fact that syslog.h assigns adjacent diff --git a/poky/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb b/poky/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb deleted file mode 100644 index 92c35c9896..0000000000 --- a/poky/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb +++ /dev/null @@ -1,85 +0,0 @@ -SUMMARY = "Utilities for Advanced Power Management" -DESCRIPTION = "The Advanced Power Management (APM) support provides \ -access to battery status information and a set of tools for managing \ -notebook power consumption." -HOMEPAGE = "http://apenwarr.ca/apmd/" -SECTION = "base" -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://apm.h;beginline=6;endline=18;md5=7d4acc1250910a89f84ce3cc6557c4c2" -DEPENDS = "libtool-cross" - -SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/a/${BPN}/${BPN}_3.2.2.orig.tar.gz;name=tarball \ - file://legacy.patch \ - file://libtool.patch \ - file://unlinux.patch \ - file://wexitcode.patch \ - file://linkage.patch \ - file://init \ - file://default \ - file://apmd_proxy \ - file://apmd_proxy.conf \ - file://apmd.service" - -SRC_URI[tarball.md5sum] = "b1e6309e8331e0f4e6efd311c2d97fa8" -SRC_URI[tarball.sha256sum] = "7f7d9f60b7766b852881d40b8ff91d8e39fccb0d1d913102a5c75a2dbb52332d" - -# for this package we're mostly interested in tracking debian patches, -# and not in the upstream version where all development has effectively stopped -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/a/apmd/" -UPSTREAM_CHECK_REGEX = "(?P<pver>((\d+\.*)+)-((\d+\.*)+))\.(diff|debian\.tar)\.(gz|xz)" - -S = "${WORKDIR}/apmd-3.2.2.orig" - -inherit update-rc.d systemd - -INITSCRIPT_NAME = "apmd" -INITSCRIPT_PARAMS = "defaults" - -SYSTEMD_SERVICE:${PN} = "apmd.service" -SYSTEMD_AUTO_ENABLE = "disable" - -EXTRA_OEMAKE = "-e MAKEFLAGS=" - -do_compile() { - # apmd doesn't use whole autotools. Just libtool for installation - oe_runmake apm apmd -} - -do_install() { - install -d ${D}${sysconfdir} - install -d ${D}${sysconfdir}/apm - install -d ${D}${sysconfdir}/apm/event.d - install -d ${D}${sysconfdir}/apm/other.d - install -d ${D}${sysconfdir}/apm/suspend.d - install -d ${D}${sysconfdir}/apm/resume.d - install -d ${D}${sysconfdir}/apm/scripts.d - install -d ${D}${sysconfdir}/default - install -d ${D}${sysconfdir}/init.d - install -d ${D}${sbindir} - install -d ${D}${bindir} - install -d ${D}${libdir} - install -d ${D}${datadir}/apmd - install -d ${D}${includedir} - - install -m 4755 ${S}/.libs/apm ${D}${bindir}/apm - install -m 0755 ${S}/.libs/apmd ${D}${sbindir}/apmd - install -m 0755 ${WORKDIR}/apmd_proxy ${D}${sysconfdir}/apm/ - install -m 0644 ${WORKDIR}/apmd_proxy.conf ${D}${datadir}/apmd/ - install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/apmd - oe_libinstall -so libapm ${D}${libdir} - install -m 0644 apm.h ${D}${includedir} - - sed -e 's,/usr/sbin,${sbindir},g; s,/etc,${sysconfdir},g;' ${WORKDIR}/init > ${D}${sysconfdir}/init.d/apmd - chmod 755 ${D}${sysconfdir}/init.d/apmd - - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/apmd.service ${D}${systemd_system_unitdir}/ - sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \ - -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/apmd.service -} - -PACKAGES =+ "libapm apm" - -FILES:libapm = "${libdir}/libapm${SOLIBS}" -FILES:apm = "${bindir}/apm*" diff --git a/poky/meta/recipes-bsp/efivar/efivar/0001-Fix-glibc-2.36-build-mount.h-conflicts.patch b/poky/meta/recipes-bsp/efivar/efivar/0001-Fix-glibc-2.36-build-mount.h-conflicts.patch deleted file mode 100644 index 28dadabe6b..0000000000 --- a/poky/meta/recipes-bsp/efivar/efivar/0001-Fix-glibc-2.36-build-mount.h-conflicts.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 7b0e7ba674321ec1ddd6b9cbb419e5fb44f88bb3 Mon Sep 17 00:00:00 2001 -From: Robbie Harwood <rharwood@redhat.com> -Date: Thu, 28 Jul 2022 16:11:24 -0400 -Subject: [PATCH] Fix glibc 2.36 build (mount.h conflicts) - -glibc has decided that sys/mount.h and linux/mount.h are no longer -usable at the same time. This broke the build, since linux/fs.h itself -includes linux/mount.h. For now, fix the build by only including -sys/mount.h where we need it. - -See-also: https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E -Resolves: #227 - -Upstream-Status: Backport [https://github.com/rhboot/efivar/commit/bc65d63ebf8fe6ac8a099ff15ca200986dba1565] -Signed-off-by: Robbie Harwood <rharwood@redhat.com> ---- - src/gpt.c | 1 + - src/linux.c | 1 + - src/util.h | 1 - - 3 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/gpt.c b/src/gpt.c -index 1eda049..21413c3 100644 ---- a/src/gpt.c -+++ b/src/gpt.c -@@ -17,6 +17,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> -+#include <sys/mount.h> - #include <sys/param.h> - #include <sys/stat.h> - #include <sys/utsname.h> -diff --git a/src/linux.c b/src/linux.c -index 47e45ae..1780816 100644 ---- a/src/linux.c -+++ b/src/linux.c -@@ -20,6 +20,7 @@ - #include <stdbool.h> - #include <stdio.h> - #include <sys/ioctl.h> -+#include <sys/mount.h> - #include <sys/socket.h> - #include <sys/sysmacros.h> - #include <sys/types.h> -diff --git a/src/util.h b/src/util.h -index 3300666..1e67e44 100644 ---- a/src/util.h -+++ b/src/util.h -@@ -23,7 +23,6 @@ - #include <stdio.h> - #include <string.h> - #include <sys/ioctl.h> --#include <sys/mount.h> - #include <sys/stat.h> - #include <sys/types.h> - #include <tgmath.h> --- -2.37.1 - diff --git a/poky/meta/recipes-bsp/efivar/efivar/0001-Fix-invalid-free-in-main.patch b/poky/meta/recipes-bsp/efivar/efivar/0001-Fix-invalid-free-in-main.patch deleted file mode 100644 index 7e63df578e..0000000000 --- a/poky/meta/recipes-bsp/efivar/efivar/0001-Fix-invalid-free-in-main.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 085f027e9e9f1478f68ddda705f83b244ee3bd88 Mon Sep 17 00:00:00 2001 -From: Robbie Harwood <rharwood@redhat.com> -Date: Mon, 18 Apr 2022 13:08:18 -0400 -Subject: [PATCH] Fix invalid free in main() - -data is allocated by mmap() in prepare_data(). - -Resolves: #173 -Signed-off-by: Robbie Harwood <rharwood@redhat.com> -Upstream-Status: Backport -Link: https://github.com/rhboot/efivar/commit/6be2cb1c0139ac177e754b0767abf1ca1533847f -Signed-off-by: Grygorii Tertychnyi <grygorii.tertychnyi@leica-geosystems.com> - ---- - src/efivar.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/efivar.c b/src/efivar.c -index 5cd1eb2bc73c..09f85edd0a38 100644 ---- a/src/efivar.c -+++ b/src/efivar.c -@@ -633,7 +633,7 @@ int main(int argc, char *argv[]) - if (sz < 0) - err(1, "Could not import data from \"%s\"", infile); - -- free(data); -+ munmap(data, data_size); - data = NULL; - data_size = 0; - diff --git a/poky/meta/recipes-bsp/efivar/efivar/0001-Use-off_t-instead-of-off64_t.patch b/poky/meta/recipes-bsp/efivar/efivar/0001-Use-off_t-instead-of-off64_t.patch deleted file mode 100644 index f47a457386..0000000000 --- a/poky/meta/recipes-bsp/efivar/efivar/0001-Use-off_t-instead-of-off64_t.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1eb0fa531301a5045af1b020fc093c4fcfd38680 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 14 Dec 2022 16:55:51 -0800 -Subject: [PATCH] Use off_t instead of off64_t - -Pass _FILE_OFFSET_BITS=64 to ensure 64bit off_t - -Upstream-Status: Submitted [https://github.com/rhboot/efivar/pull/237] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/error.c | 2 +- - src/include/defaults.mk | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/error.c b/src/error.c -index fcbba0d..9530e22 100644 ---- a/src/error.c -+++ b/src/error.c -@@ -191,7 +191,7 @@ dbglog_write(void *cookie, const char *buf, size_t size) - } - - static int --dbglog_seek(void *cookie UNUSED, off64_t *offset, int whence) -+dbglog_seek(void *cookie UNUSED, off_t *offset, int whence) - { - FILE *log = efi_errlog ? efi_errlog : stderr; - int rc; -diff --git a/src/include/defaults.mk b/src/include/defaults.mk -index 632b155..95be8be 100644 ---- a/src/include/defaults.mk -+++ b/src/include/defaults.mk -@@ -34,6 +34,7 @@ CPPFLAGS ?= - override _CPPFLAGS := $(CPPFLAGS) - override CPPFLAGS = $(_CPPFLAGS) -DLIBEFIVAR_VERSION=$(VERSION) \ - -D_GNU_SOURCE \ -+ -D_FILE_OFFSET_BITS=64 \ - -I$(TOPDIR)/src/include/ - CFLAGS ?= $(OPTIMIZE) $(DEBUGINFO) $(WARNINGS) $(ERRORS) - CFLAGS_GCC ?= -specs=$(TOPDIR)/src/include/gcc.specs \ diff --git a/poky/meta/recipes-bsp/efivar/efivar/0001-src-Makefile-build-util.c-separately-for-makeguids.patch b/poky/meta/recipes-bsp/efivar/efivar/0001-src-Makefile-build-util.c-separately-for-makeguids.patch deleted file mode 100644 index 02781eb67d..0000000000 --- a/poky/meta/recipes-bsp/efivar/efivar/0001-src-Makefile-build-util.c-separately-for-makeguids.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 80f11fcb46f6b52e13501cb323ca1a849c3f6e88 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex@linutronix.de> -Date: Tue, 18 Jan 2022 11:53:41 +0100 -Subject: [PATCH] src/Makefile: build util.c separately for makeguids - -util.c needs to be built twice when cross-compiling: -for the build machine to be able to link with -makeguids which then runs during the same build, -and then for the actual target. - -Upstream-Status: Submitted [https://github.com/rhboot/efivar/pull/203] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - src/Makefile | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/Makefile b/src/Makefile -index 0e423c4..b10051b 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -28,10 +28,13 @@ EFIVAR_OBJECTS = $(patsubst %.S,%.o,$(patsubst %.c,%.o,$(EFIVAR_SOURCES))) - EFISECDB_SOURCES = efisecdb.c guid-symbols.c secdb-dump.c util.c - EFISECDB_OBJECTS = $(patsubst %.S,%.o,$(patsubst %.c,%.o,$(EFISECDB_SOURCES))) - GENERATED_SOURCES = include/efivar/efivar-guids.h guid-symbols.c --MAKEGUIDS_SOURCES = makeguids.c util.c -+MAKEGUIDS_SOURCES = makeguids.c util-makeguids.c - MAKEGUIDS_OBJECTS = $(patsubst %.S,%.o,$(patsubst %.c,%.o,$(MAKEGUIDS_SOURCES))) - MAKEGUIDS_OUTPUT = $(GENERATED_SOURCES) guids.lds - -+util-makeguids.c : -+ cp util.c util-makeguids.c -+ - ALL_SOURCES=$(LIBEFISEC_SOURCES) $(LIBEFIBOOT_SOURCES) $(LIBEFIVAR_SOURCES) \ - $(MAKEGUIDS_SOURCES) $(GENERATED_SOURCES) $(EFIVAR_SOURCES) \ - $(sort $(wildcard include/efivar/*.h)) --- -2.20.1 - diff --git a/poky/meta/recipes-bsp/efivar/efivar/efisecdb-fix-build-with-musl-libc.patch b/poky/meta/recipes-bsp/efivar/efivar/efisecdb-fix-build-with-musl-libc.patch deleted file mode 100644 index ec5b285a06..0000000000 --- a/poky/meta/recipes-bsp/efivar/efivar/efisecdb-fix-build-with-musl-libc.patch +++ /dev/null @@ -1,184 +0,0 @@ -From cece3ffd5be2f8641eb694513f2b73e5eb97ffd3 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Fri, 28 Jan 2022 12:13:30 +0100 -Subject: [PATCH] efisecdb: fix build with musl libc - -Refactor code to use POSIX atexit(3) instead of the GNU specific -on_exit(3). - -Resolves: #197 -Resolves: #202 -Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> - -Upstream-Status: Backport -https://github.com/rhboot/efivar/commit/cece3ffd5be2f8641eb694513f2b73e5eb97ffd3 - -Signed-off-by: Davide Gardenal <davide.gardenal@huawei.com> ---- - src/compiler.h | 2 -- - src/efisecdb.c | 68 +++++++++++++++++++------------------------------- - 2 files changed, 26 insertions(+), 44 deletions(-) - -diff --git a/src/compiler.h b/src/compiler.h -index e2f18f0b..d95fb014 100644 ---- a/src/compiler.h -+++ b/src/compiler.h -@@ -7,8 +7,6 @@ - #ifndef COMPILER_H_ - #define COMPILER_H_ - --#include <sys/cdefs.h> -- - /* GCC version checking borrowed from glibc. */ - #if defined(__GNUC__) && defined(__GNUC_MINOR__) - # define GNUC_PREREQ(maj,min) \ -diff --git a/src/efisecdb.c b/src/efisecdb.c -index f8823737..6bd5ad90 100644 ---- a/src/efisecdb.c -+++ b/src/efisecdb.c -@@ -25,6 +25,10 @@ - extern char *optarg; - extern int optind, opterr, optopt; - -+static efi_secdb_t *secdb = NULL; -+static list_t infiles; -+static list_t actions; -+ - struct hash_param { - char *name; - efi_secdb_type_t algorithm; -@@ -187,12 +191,11 @@ add_action(list_t *list, action_type_t action_type, const efi_guid_t *owner, - } - - static void --free_actions(int status UNUSED, void *actionsp) -+free_actions(void) - { -- list_t *actions = (list_t *)actionsp; - list_t *pos, *tmp; - -- for_each_action_safe(pos, tmp, actions) { -+ for_each_action_safe(pos, tmp, &actions) { - action_t *action = list_entry(pos, action_t, list); - - list_del(&action->list); -@@ -202,12 +205,11 @@ free_actions(int status UNUSED, void *actionsp) - } - - static void --free_infiles(int status UNUSED, void *infilesp) -+free_infiles(void) - { -- list_t *infiles = (list_t *)infilesp; - list_t *pos, *tmp; - -- for_each_ptr_safe(pos, tmp, infiles) { -+ for_each_ptr_safe(pos, tmp, &infiles) { - ptrlist_t *entry = list_entry(pos, ptrlist_t, list); - - list_del(&entry->list); -@@ -216,27 +218,12 @@ free_infiles(int status UNUSED, void *infilesp) - } - - static void --maybe_free_secdb(int status UNUSED, void *voidp) -+maybe_free_secdb(void) - { -- efi_secdb_t **secdbp = (efi_secdb_t **)voidp; -- -- if (secdbp == NULL || *secdbp == NULL) -+ if (secdb == NULL) - return; - -- efi_secdb_free(*secdbp); --} -- --static void --maybe_do_unlink(int status, void *filep) --{ -- char **file = (char **)filep; -- -- if (status == 0) -- return; -- if (file == NULL || *file == NULL) -- return; -- -- unlink(*file); -+ efi_secdb_free(secdb); - } - - static void -@@ -323,15 +310,6 @@ parse_input_files(list_t *infiles, char **outfile, efi_secdb_t **secdb, - return status; - } - --/* -- * These need to be static globals so that they're not on main's stack when -- * on_exit() fires. -- */ --static efi_secdb_t *secdb = NULL; --static list_t infiles; --static list_t actions; --static char *outfile = NULL; -- - int - main(int argc, char *argv[]) - { -@@ -351,6 +329,7 @@ main(int argc, char *argv[]) - bool do_sort_data = false; - bool sort_descending = false; - int status = 0; -+ char *outfile = NULL; - - const char sopts[] = ":aAc:dfg:h:i:Lo:rs:t:v?"; - const struct option lopts[] = { -@@ -376,10 +355,9 @@ main(int argc, char *argv[]) - INIT_LIST_HEAD(&infiles); - INIT_LIST_HEAD(&actions); - -- on_exit(free_actions, &actions); -- on_exit(free_infiles, &infiles); -- on_exit(maybe_free_secdb, &secdb); -- on_exit(maybe_do_unlink, &outfile); -+ atexit(free_actions); -+ atexit(free_infiles); -+ atexit(maybe_free_secdb); - - /* - * parse the command line. -@@ -587,24 +565,30 @@ main(int argc, char *argv[]) - outfd = open(outfile, flags, 0600); - if (outfd < 0) { - char *tmpoutfile = outfile; -- if (errno == EEXIST) -- outfile = NULL; -+ if (errno != EEXIST) -+ unlink(outfile); - err(1, "could not open \"%s\"", tmpoutfile); - } - - rc = ftruncate(outfd, 0); -- if (rc < 0) -+ if (rc < 0) { -+ unlink(outfile); - err(1, "could not truncate output file \"%s\"", outfile); -+ } - - void *output; - size_t size = 0; - rc = efi_secdb_realize(secdb, &output, &size); -- if (rc < 0) -+ if (rc < 0) { -+ unlink(outfile); - secdb_err(1, "could not realize signature list"); -+ } - - rc = write(outfd, output, size); -- if (rc < 0) -+ if (rc < 0) { -+ unlink(outfile); - err(1, "could not write signature list"); -+ } - - close(outfd); - xfree(output); diff --git a/poky/meta/recipes-bsp/efivar/efivar_38.bb b/poky/meta/recipes-bsp/efivar/efivar_38.bb index 5523329699..87a1e665ca 100644 --- a/poky/meta/recipes-bsp/efivar/efivar_38.bb +++ b/poky/meta/recipes-bsp/efivar/efivar_38.bb @@ -9,13 +9,9 @@ COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" SRC_URI = "git://github.com/rhinstaller/efivar.git;branch=main;protocol=https \ file://0001-docs-do-not-build-efisecdb-manpage.patch \ - file://0001-src-Makefile-build-util.c-separately-for-makeguids.patch \ - file://efisecdb-fix-build-with-musl-libc.patch \ - file://0001-Fix-invalid-free-in-main.patch \ - file://0001-Fix-glibc-2.36-build-mount.h-conflicts.patch \ - file://0001-Use-off_t-instead-of-off64_t.patch \ " -SRCREV = "1753149d4176ebfb2b135ac0aaf79340bf0e7a93" +SRCREV = "90e88b221e8bc60dc50f3246051369b8f580c0d0" +PV .= "+39+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-bsp/grub/files/determinism.patch b/poky/meta/recipes-bsp/grub/files/determinism.patch index 2828e80975..852b95a856 100644 --- a/poky/meta/recipes-bsp/grub/files/determinism.patch +++ b/poky/meta/recipes-bsp/grub/files/determinism.patch @@ -14,7 +14,7 @@ missing sorting of the list used to generate it. Add such a sort. Also ensure the generated unidata.c file is deterministic by sorting the keys of the dict. -Upstream-Status: Pending +Upstream-Status: Submitted [https://lists.gnu.org/archive/html/grub-devel/2023-06/index.html] Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> --- diff --git a/poky/meta/recipes-bsp/u-boot/files/0001-mkimage-Use-PATH_MAX-for-path-length.patch b/poky/meta/recipes-bsp/u-boot/files/0001-mkimage-Use-PATH_MAX-for-path-length.patch new file mode 100644 index 0000000000..9f38736bcd --- /dev/null +++ b/poky/meta/recipes-bsp/u-boot/files/0001-mkimage-Use-PATH_MAX-for-path-length.patch @@ -0,0 +1,40 @@ +From dcd3d272975863128e25a4e25453cb6521cddc53 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Wed, 14 Jun 2023 16:09:59 +0800 +Subject: [PATCH] mkimage: Use PATH_MAX for path length + +Fixed when build xilinx_zynqmp in long directory ( >256): + | /buildarea1/testtest/wr_build/wr1023test_secureboot/test1-what/test2-what/test3-what/test4-what/test5-what/test6-what/test7-what/test8-what/test9-what/test10-what/test11-what/test12-what/build/tmp-glibc/work/xilinx_zynqmp-wrs-linux/u-boot-xlnx/1_v2023.01-xilinx-v2023.1+gitAUTOINC+40a08d69e7-r0/build/fitImage-linux: Image file name (uboot-mkimage) too long, can't create tmpfile. + | Error: Bad parameters for FIT image type + +Upstream-Status: Submitted [https://patchwork.ozlabs.org/project/uboot/patch/20230619062250.3244894-1-mingli.yu@eng.windriver.com/] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + tools/mkimage.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tools/mkimage.h b/tools/mkimage.h +index f5ca65e2ed..d92a3ff811 100644 +--- a/tools/mkimage.h ++++ b/tools/mkimage.h +@@ -17,6 +17,7 @@ + #include <sys/stat.h> + #include <time.h> + #include <unistd.h> ++#include <limits.h> + #include <u-boot/sha1.h> + #include "fdt_host.h" + #include "imagetool.h" +@@ -44,7 +45,7 @@ static inline ulong map_to_sysmem(void *ptr) + #define ALLOC_CACHE_ALIGN_BUFFER(type, name, size) type name[size] + + #define MKIMAGE_TMPFILE_SUFFIX ".tmp" +-#define MKIMAGE_MAX_TMPFILE_LEN 256 ++#define MKIMAGE_MAX_TMPFILE_LEN PATH_MAX + #define MKIMAGE_DEFAULT_DTC_OPTIONS "-I dts -O dtb -p 500" + #define MKIMAGE_MAX_DTC_CMDLINE_LEN 2 * MKIMAGE_MAX_TMPFILE_LEN + 35 + +-- +2.25.1 + diff --git a/poky/meta/recipes-bsp/u-boot/libubootenv_0.3.3.bb b/poky/meta/recipes-bsp/u-boot/libubootenv_0.3.4.bb index 55f91b6f05..ac1e03b8e9 100644 --- a/poky/meta/recipes-bsp/u-boot/libubootenv_0.3.3.bb +++ b/poky/meta/recipes-bsp/u-boot/libubootenv_0.3.4.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSES/LGPL-2.1-or-later.txt;md5=4fbd65380cdd255951 SECTION = "libs" SRC_URI = "git://github.com/sbabic/libubootenv;protocol=https;branch=master" -SRCREV = "108100622160bb0c7ef4b6186230fe1f26402791" +SRCREV = "4dfb5254fc0540a36e87914bc14644c047ea7678" S = "${WORKDIR}/git" @@ -19,7 +19,7 @@ inherit cmake lib_package EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release" -DEPENDS = "zlib" +DEPENDS = "zlib libyaml" PROVIDES += "u-boot-fw-utils" RPROVIDES:${PN}-bin += "u-boot-fw-utils" diff --git a/poky/meta/recipes-bsp/u-boot/u-boot-configure.inc b/poky/meta/recipes-bsp/u-boot/u-boot-configure.inc index 04e0894752..235623d25a 100644 --- a/poky/meta/recipes-bsp/u-boot/u-boot-configure.inc +++ b/poky/meta/recipes-bsp/u-boot/u-boot-configure.inc @@ -26,7 +26,6 @@ do_configure () { unset j done unset i - DEVTOOL_DISABLE_MENUCONFIG=true else if [ -n "${UBOOT_MACHINE}" ]; then oe_runmake -C ${S} O=${B} ${UBOOT_MACHINE} diff --git a/poky/meta/recipes-bsp/u-boot/u-boot-tools_2023.04.bb b/poky/meta/recipes-bsp/u-boot/u-boot-tools_2023.04.bb index 7eaf721ca8..b77a49af87 100644 --- a/poky/meta/recipes-bsp/u-boot/u-boot-tools_2023.04.bb +++ b/poky/meta/recipes-bsp/u-boot/u-boot-tools_2023.04.bb @@ -1,2 +1,6 @@ require u-boot-common.inc require u-boot-tools.inc + +SRC_URI += " \ + file://0001-mkimage-Use-PATH_MAX-for-path-length.patch \ +" diff --git a/poky/meta/recipes-connectivity/libuv/libuv_1.45.0.bb b/poky/meta/recipes-connectivity/libuv/libuv_1.45.0.bb index 45b3a96f12..456cb2f962 100644 --- a/poky/meta/recipes-connectivity/libuv/libuv_1.45.0.bb +++ b/poky/meta/recipes-connectivity/libuv/libuv_1.45.0.bb @@ -3,7 +3,8 @@ HOMEPAGE = "https://github.com/libuv/libuv" DESCRIPTION = "libuv is a multi-platform support library with a focus on asynchronous I/O. It was primarily developed for use by Node.js, but it's also used by Luvit, Julia, pyuv, and others." BUGTRACKER = "https://github.com/libuv/libuv/issues" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=74b6f2f7818a4e3a80d03556f71b129b" +LIC_FILES_CHKSUM = "file://LICENSE;md5=74b6f2f7818a4e3a80d03556f71b129b \ + file://LICENSE-extra;md5=f9307417749e19bd1d6d68a394b49324" SRCREV = "96e05543f53b19d9642b4b0dd73b86ad3cea313e" SRC_URI = "git://github.com/libuv/libuv.git;branch=master;protocol=https" diff --git a/poky/meta/recipes-core/base-passwd/base-passwd/0007-Add-wheel-group.patch b/poky/meta/recipes-core/base-passwd/base-passwd/0007-Add-wheel-group.patch new file mode 100644 index 0000000000..d77122789d --- /dev/null +++ b/poky/meta/recipes-core/base-passwd/base-passwd/0007-Add-wheel-group.patch @@ -0,0 +1,20 @@ + +We need to have a wheel group which has some system privileges to consult the +systemd journal or manage printers with cups. + +Upstream says the group does not exist by default. + +Upstream-Status: Inappropriate [enable feature] + +Signed-off-by: Louis Rannou <lrannou@baylibre.com> +Index: base-passwd-3.5.26/group.master +=================================================================== +--- base-passwd-3.5.29.orig/group.master ++++ base-passwd-3.5.29/group.master +@@ -38,5 +38,6 @@ + staff:*:50: + games:*:60: + shutdown:*:70: ++wheel:*:80: + users:*:100: + nogroup:*:65534: diff --git a/poky/meta/recipes-core/base-passwd/base-passwd_3.6.1.bb b/poky/meta/recipes-core/base-passwd/base-passwd_3.6.1.bb index 853717176d..204016b3e7 100644 --- a/poky/meta/recipes-core/base-passwd/base-passwd_3.6.1.bb +++ b/poky/meta/recipes-core/base-passwd/base-passwd_3.6.1.bb @@ -12,6 +12,7 @@ SRC_URI = "https://launchpad.net/debian/+archive/primary/+files/${BPN}_${PV}.tar file://0004-Add-an-input-group-for-the-dev-input-devices.patch \ file://0005-Add-kvm-group.patch \ file://0006-Make-it-possible-to-configure-whether-to-use-SELinux.patch \ + file://0007-Add-wheel-group.patch \ " SRC_URI[sha256sum] = "6ff369be59d586ba63c0c5fcb00f75f9953fe49db88bc6c6428f2c92866f79af" diff --git a/poky/meta/recipes-core/coreutils/coreutils/stdlib-mb-cur-max.patch b/poky/meta/recipes-core/coreutils/coreutils/stdlib-mb-cur-max.patch new file mode 100644 index 0000000000..732fa5b6f2 --- /dev/null +++ b/poky/meta/recipes-core/coreutils/coreutils/stdlib-mb-cur-max.patch @@ -0,0 +1,33 @@ +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@arm.com> + +From ca6c179226864bff23f2b062518cf885bb42ce56 Mon Sep 17 00:00:00 2001 +From: Bruno Haible <bruno@clisp.org> +Date: Thu, 27 Apr 2023 15:26:37 +0200 +Subject: [PATCH] stdlib: Fix error when cross-compiling. + +Reported by Pierre Labastie <pierre.labastie@neuf.fr> in +<https://lists.gnu.org/archive/html/bug-gnulib/2023-04/msg00220.html>. + +* m4/stdlib_h.m4 (gl_STDLIB_H): Provide a 4th argument to AC_RUN_IFELSE. +--- + ChangeLog | 7 +++++++ + m4/stdlib_h.m4 | 4 ++-- + 2 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4 +index 3274ea4948..f47c1eb37b 100644 +--- a/m4/stdlib_h.m4 ++++ b/m4/stdlib_h.m4 +@@ -66,7 +66,7 @@ int main () + return result; + }]])], + [gl_cv_macro_MB_CUR_MAX_good=yes], +- [gl_cv_macro_MB_CUR_MAX_good=no] ++ [gl_cv_macro_MB_CUR_MAX_good=no], + [:]) + fi + ]) +-- +2.34.1 + diff --git a/poky/meta/recipes-core/coreutils/coreutils_9.1.bb b/poky/meta/recipes-core/coreutils/coreutils_9.3.bb index e12a6d6797..25da988f50 100644 --- a/poky/meta/recipes-core/coreutils/coreutils_9.1.bb +++ b/poky/meta/recipes-core/coreutils/coreutils_9.3.bb @@ -6,7 +6,7 @@ HOMEPAGE = "http://www.gnu.org/software/coreutils/" BUGTRACKER = "http://debbugs.gnu.org/coreutils" LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ - file://src/ls.c;beginline=1;endline=15;md5=1fe89f62614b5e1f5475ec04d5899bc1 \ + file://src/ls.c;beginline=1;endline=15;md5=b720a8b317035d66c555fc6d89e3674c \ " DEPENDS = "gmp libcap" DEPENDS:class-native = "" @@ -16,10 +16,11 @@ inherit autotools gettext texinfo SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ file://remove-usr-local-lib-from-m4.patch \ file://0001-local.mk-fix-cross-compiling-problem.patch \ + file://stdlib-mb-cur-max.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "61a1f410d78ba7e7f37a5a4f50e6d1320aca33375484a3255eddf17a38580423" +SRC_URI[sha256sum] = "adbcfcfe899235b71e8768dcf07cd532520b7f54f9a8064843f8d199a904bbaa" # http://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=v8.27-101-gf5d7c0842 # runcon is not really a sandbox command, use `runcon ... setsid ...` to avoid this particular issue. diff --git a/poky/meta/recipes-core/dbus/dbus_1.14.6.bb b/poky/meta/recipes-core/dbus/dbus_1.14.8.bb index da25155773..b6c245d40b 100644 --- a/poky/meta/recipes-core/dbus/dbus_1.14.6.bb +++ b/poky/meta/recipes-core/dbus/dbus_1.14.8.bb @@ -16,7 +16,7 @@ SRC_URI = "https://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.xz \ file://dbus-1.init \ " -SRC_URI[sha256sum] = "fd2bdf1bb89dc365a46531bff631536f22b0d1c6d5ce2c5c5e59b55265b3d66b" +SRC_URI[sha256sum] = "a6bd5bac5cf19f0c3c594bdae2565a095696980a683a0ef37cb6212e093bde35" EXTRA_OECONF = "--disable-xml-docs \ --disable-doxygen-docs \ diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Avoid-having-g_futex_simple-inadvertently-modify-err.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Avoid-having-g_futex_simple-inadvertently-modify-err.patch deleted file mode 100644 index db63cfd91e..0000000000 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Avoid-having-g_futex_simple-inadvertently-modify-err.patch +++ /dev/null @@ -1,36 +0,0 @@ -From edd1e47f107410d9e4edb691335410026ae5a534 Mon Sep 17 00:00:00 2001 -From: Peter Kjellerstedt <peter.kjellerstedt@axis.com> -Date: Tue, 25 Apr 2023 20:02:31 +0200 -Subject: [PATCH] Avoid having g_futex_simple() inadvertently modify errno - -If both __NR_futex and __NR_futex_time64 are defined, g_futex_simple() -will first call futex_time64(). If that fails with ENOSYS, then -futex_time() is called instead. However, errno was not saved and -restored in this case, which would result in g_futex_simple() -returning with errno set to ENOSYS, even if futex_time() succeeded. - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/edd1e47f107410d9e4edb691335410026ae5a534] -Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> ---- - glib/gthreadprivate.h | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/glib/gthreadprivate.h b/glib/gthreadprivate.h -index 9c847e039..74d37ba32 100644 ---- a/glib/gthreadprivate.h -+++ b/glib/gthreadprivate.h -@@ -65,9 +65,13 @@ struct _GRealThread - #define g_futex_simple(uaddr, futex_op, ...) \ - G_STMT_START \ - { \ -+ int saved_errno = errno; \ - int res = syscall (__NR_futex_time64, uaddr, (gsize) futex_op, __VA_ARGS__); \ - if (res < 0 && errno == ENOSYS) \ -- syscall (__NR_futex, uaddr, (gsize) futex_op, __VA_ARGS__); \ -+ { \ -+ errno = saved_errno; \ -+ syscall (__NR_futex, uaddr, (gsize) futex_op, __VA_ARGS__); \ -+ } \ - } \ - G_STMT_END - #elif defined(__NR_futex_time64) diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-glocalfile-Sum-apparent-size-only-for-files-and-syml.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-glocalfile-Sum-apparent-size-only-for-files-and-syml.patch new file mode 100644 index 0000000000..a881b25ef3 --- /dev/null +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-glocalfile-Sum-apparent-size-only-for-files-and-syml.patch @@ -0,0 +1,105 @@ +From d1a2117dc18dbcf87685891de7e2898108b66fc9 Mon Sep 17 00:00:00 2001 +From: Joan Bruguera <joanbrugueram@gmail.com> +Date: Thu, 23 Mar 2023 02:24:30 +0000 +Subject: [PATCH] glocalfile: Sum apparent size only for files and symlinks + +Since GNU Coreutils 9.2 (commit 110bcd28386b1f47a4cd876098acb708fdcbbb25), +`du --apparent-size` (including `du --bytes`) no longer counts all kinds of +files (directories, FIFOs, etc.), but only those for which `st_size` in +`struct stat` is defined by POSIX, namely regular files and symlinks +(and also rarely supported memory objects). + +This aligns the behaviour of GLib's `G_FILE_MEASURE_APPARENT_SIZE` flag +with the new GNU Coreutils `du` and correct POSIX use. + +Note that this may be a breaking change for some uses. + +Link: https://lists.gnu.org/archive/html/bug-coreutils/2023-03/msg00007.html +Fixes: https://gitlab.gnome.org/GNOME/glib/-/issues/2965 + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + gio/gioenums.h | 3 +++ + gio/glocalfile.c | 37 +++++++++++++++++++++++++++++++++++++ + 2 files changed, 40 insertions(+) + +diff --git a/gio/gioenums.h b/gio/gioenums.h +index 7fd74a43e..c820cd36d 100644 +--- a/gio/gioenums.h ++++ b/gio/gioenums.h +@@ -224,6 +224,9 @@ typedef enum { + * sizes. Normally, the block-size is used, if available, as this is a + * more accurate representation of disk space used. + * Compare with `du --apparent-size`. ++ * Since GLib 2.78. and similarly to `du` since GNU Coreutils 9.2, this will ++ * ignore the sizes of file types other than regular files and links, as the ++ * sizes of other file types are not specified in a standard way. + * @G_FILE_MEASURE_NO_XDEV: Do not cross mount point boundaries. + * Compare with `du -x`. + * +diff --git a/gio/glocalfile.c b/gio/glocalfile.c +index 67d4b99fb..dbb56902d 100644 +--- a/gio/glocalfile.c ++++ b/gio/glocalfile.c +@@ -86,6 +86,9 @@ + #define FILE_READ_ONLY_VOLUME 0x00080000 + #endif + ++#ifndef S_ISREG ++#define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG) ++#endif + #ifndef S_ISDIR + #define S_ISDIR(m) (((m) & _S_IFMT) == _S_IFDIR) + #endif +@@ -2777,6 +2780,39 @@ g_local_file_measure_size_of_contents (gint fd, + MeasureState *state, + GError **error); + ++/* ++ * _g_stat_is_size_usable: ++ * @buf: a #GLocalFileStat. ++ * ++ * Checks if the file type is such that the `st_size` field of `struct stat` is ++ * well-defined by POSIX. ++ * (see https://pubs.opengroup.org/onlinepubs/009696799/basedefs/sys/stat.h.html) ++ * ++ * This behaviour is aligned with `du` from GNU Coreutils 9.2+ ++ * (see https://lists.gnu.org/archive/html/bug-coreutils/2023-03/msg00007.html) ++ * and makes apparent size sums well-defined; formerly, they depended on the ++ * implementation, and could differ across filesystems. ++ * ++ * Returns: %TRUE if the size field is well-defined, %FALSE otherwise. ++ **/ ++inline static gboolean ++_g_stat_is_size_usable (const GLocalFileStat *buf) ++{ ++#ifndef HAVE_STATX ++ /* Memory objects are defined by POSIX, but are not supported by statx nor Windows */ ++#ifdef S_TYPEISSHM ++ if (S_TYPEISSHM (buf)) ++ return TRUE; ++#endif ++#ifdef S_TYPEISTMO ++ if (S_TYPEISTMO (buf)) ++ return TRUE; ++#endif ++#endif ++ ++ return S_ISREG (_g_stat_mode (buf)) || S_ISLNK (_g_stat_mode (buf)); ++} ++ + static gboolean + g_local_file_measure_size_of_file (gint parent_fd, + GSList *name, +@@ -2836,6 +2872,7 @@ g_local_file_measure_size_of_file (gint parent_fd, + state->disk_usage += _g_stat_blocks (&buf) * G_GUINT64_CONSTANT (512); + else + #endif ++ if (_g_stat_is_size_usable (&buf)) + state->disk_usage += _g_stat_size (&buf); + + if (S_ISDIR (_g_stat_mode (&buf))) +-- +2.39.2 + diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0_2.76.2.bb b/poky/meta/recipes-core/glib-2.0/glib-2.0_2.76.3.bb index 6a9a5f359c..4327a13345 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0_2.76.2.bb +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0_2.76.3.bb @@ -14,12 +14,12 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://0001-Do-not-write-bindir-into-pkg-config-files.patch \ file://0001-meson-Run-atomics-test-on-clang-as-well.patch \ file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ - file://0001-Avoid-having-g_futex_simple-inadvertently-modify-err.patch \ file://0001-gio-tests-portal-support-Fix-snap-test-ordering-race.patch \ + file://0001-glocalfile-Sum-apparent-size-only-for-files-and-syml.patch \ " SRC_URI:append:class-native = " file://relocate-modules.patch" -SRC_URI[sha256sum] = "24f3847857b1d8674cdb0389a36edec0f13c666cd3ce727ecd340eb9da8aca9e" +SRC_URI[sha256sum] = "c0be444e403d7c3184d1f394f89f0b644710b5e9331b54fa4e8b5037813ad32a" # Find any meson cross files in FILESPATH that are relevant for the current # build (using siteinfo) and add them to EXTRA_OEMESON. diff --git a/poky/meta/recipes-core/glib-networking/glib-networking/eagain.patch b/poky/meta/recipes-core/glib-networking/glib-networking/eagain.patch index ac6592ffef..ee5b6a7beb 100644 --- a/poky/meta/recipes-core/glib-networking/glib-networking/eagain.patch +++ b/poky/meta/recipes-core/glib-networking/glib-networking/eagain.patch @@ -21,7 +21,7 @@ Index: glib-networking-2.74.0/tls/tests/connection.c MIN (TEST_DATA_LENGTH / 2, TEST_DATA_LENGTH - test->nread), NULL, &error); + -+ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_BUSY)) ++ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK)) + continue; + g_assert_no_error (error); diff --git a/poky/meta/recipes-core/glibc/glibc_2.37.bb b/poky/meta/recipes-core/glibc/glibc_2.37.bb index b27f98fb19..3387441cad 100644 --- a/poky/meta/recipes-core/glibc/glibc_2.37.bb +++ b/poky/meta/recipes-core/glibc/glibc_2.37.bb @@ -103,10 +103,12 @@ do_configure () { # version check and doesn't really help with anything (cd ${S} && gnu-configize) || die "failure in running gnu-configize" find ${S} -name "configure" | xargs touch - CPPFLAGS="" oe_runconf + CPPFLAGS="" LD="${HOST_PREFIX}ld.bfd ${TOOLCHAIN_OPTIONS}" oe_runconf } LDFLAGS += "-fuse-ld=bfd" +CC += "-fuse-ld=bfd" + do_compile () { base_do_compile echo "Adjust ldd script" diff --git a/poky/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.33.bb b/poky/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.34.bb index ec9f9f4fa3..ec9f9f4fa3 100644 --- a/poky/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.33.bb +++ b/poky/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.34.bb diff --git a/poky/meta/recipes-core/libxcrypt/libxcrypt.inc b/poky/meta/recipes-core/libxcrypt/libxcrypt.inc index 61b0381076..4d145cf3cc 100644 --- a/poky/meta/recipes-core/libxcrypt/libxcrypt.inc +++ b/poky/meta/recipes-core/libxcrypt/libxcrypt.inc @@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://LICENSING;md5=c0a30e2b1502c55a7f37e412cd6c6a4b \ inherit autotools pkgconfig SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH};protocol=https" -SRCREV = "d7fe1ac04c326dba7e0440868889d1dccb41a175" -SRCBRANCH ?= "develop" +SRCREV = "e80cfde51bb4fe4bcf27585810e0b4ea3d1e4d7d" +SRCBRANCH ?= "master" SRC_URI += "file://fix_cflags_handling.patch" diff --git a/poky/meta/recipes-core/libxcrypt/libxcrypt_4.4.33.bb b/poky/meta/recipes-core/libxcrypt/libxcrypt_4.4.34.bb index 79dba2f6dc..79dba2f6dc 100644 --- a/poky/meta/recipes-core/libxcrypt/libxcrypt_4.4.33.bb +++ b/poky/meta/recipes-core/libxcrypt/libxcrypt_4.4.34.bb diff --git a/poky/meta/recipes-core/libxml/libxml2_2.10.4.bb b/poky/meta/recipes-core/libxml/libxml2_2.10.4.bb index 288631504c..4f3b17093e 100644 --- a/poky/meta/recipes-core/libxml/libxml2_2.10.4.bb +++ b/poky/meta/recipes-core/libxml/libxml2_2.10.4.bb @@ -40,6 +40,8 @@ inherit autotools pkgconfig binconfig-disabled ptest inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3targetconfig', '', d)} +LDFLAGS:append:riscv64 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld ptest', ' -fuse-ld=bfd', '', d)}" + RDEPENDS:${PN}-ptest += "bash make locale-base-en-us ${@bb.utils.contains('PACKAGECONFIG', 'python', 'libgcc python3-core python3-logging python3-shell python3-stringold python3-threading python3-unittest ${PN}-python', '', d)}" RDEPENDS:${PN}-python += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-core', '', d)}" diff --git a/poky/meta/recipes-core/packagegroups/packagegroup-base.bb b/poky/meta/recipes-core/packagegroups/packagegroup-base.bb index d60e177471..eeb26ca588 100644 --- a/poky/meta/recipes-core/packagegroups/packagegroup-base.bb +++ b/poky/meta/recipes-core/packagegroups/packagegroup-base.bb @@ -16,7 +16,6 @@ PACKAGES = ' \ \ ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "packagegroup-base-acpi", "",d)} \ ${@bb.utils.contains("MACHINE_FEATURES", "alsa", "packagegroup-base-alsa", "", d)} \ - ${@bb.utils.contains("MACHINE_FEATURES", "apm", "packagegroup-base-apm", "", d)} \ ${@bb.utils.contains("MACHINE_FEATURES", "ext2", "packagegroup-base-ext2", "", d)} \ ${@bb.utils.contains("MACHINE_FEATURES", "vfat", "packagegroup-base-vfat", "", d)} \ ${@bb.utils.contains("MACHINE_FEATURES", "keyboard", "packagegroup-base-keyboard", "", d)} \ @@ -52,7 +51,6 @@ RDEPENDS:packagegroup-base = "\ packagegroup-machine-base \ \ module-init-tools \ - ${@bb.utils.contains('MACHINE_FEATURES', 'apm', 'packagegroup-base-apm', '',d)} \ ${@bb.utils.contains('MACHINE_FEATURES', 'acpi', 'packagegroup-base-acpi', '',d)} \ ${@bb.utils.contains('MACHINE_FEATURES', 'keyboard', 'packagegroup-base-keyboard', '',d)} \ ${@bb.utils.contains('MACHINE_FEATURES', 'phone', 'packagegroup-base-phone', '',d)} \ @@ -149,11 +147,6 @@ SUMMARY:packagegroup-base-acpi = "ACPI support" RDEPENDS:packagegroup-base-acpi = "\ acpid" -SUMMARY:packagegroup-base-apm = "APM support" -RDEPENDS:packagegroup-base-apm = "\ - ${VIRTUAL-RUNTIME_apm} \ - apmd" - SUMMARY:packagegroup-base-ext2 = "ext2 filesystem support" RDEPENDS:packagegroup-base-ext2 = "\ e2fsprogs-e2fsck \ diff --git a/poky/meta/recipes-core/psplash/files/psplash-poky-img.h b/poky/meta/recipes-core/psplash/files/psplash-poky-img.h deleted file mode 100644 index 8d56aa0201..0000000000 --- a/poky/meta/recipes-core/psplash/files/psplash-poky-img.h +++ /dev/null @@ -1,1259 +0,0 @@ -/* GdkPixbuf RGB C-Source image dump 1-byte-run-length-encoded */ - -#define POKY_IMG_ROWSTRIDE (1920) -#define POKY_IMG_WIDTH (640) -#define POKY_IMG_HEIGHT (480) -#define POKY_IMG_BYTES_PER_PIXEL (3) /* 3:RGB, 4:RGBA */ -#define POKY_IMG_RLE_PIXEL_DATA ((uint8*) \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\237\377\377\377\377\376\377\374\361\376\377\374\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\223\377\377\377\377\376\377\374\361\376" \ - "\377\374\377\377\377\377\377\377\377\377\377\377\377\377\223\377\377" \ - "\377\377\376\377\374\361\376\377\374\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\223\377\377\377\377\376\377\374\361\376\377\374\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\223\377\377\377\377\376" \ - "\377\374\361\376\377\374\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\223\377\377\377\377\376\377\374\361\376\377\374\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\223\377\377\377\377\376\377\374\361" \ - "\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377\223\377" \ - "\377\377\377\376\377\374\361\376\377\374\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\223\377\377\377\377\376\377\374\361\376\377\374" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\223\377\377\377\377" \ - "\376\377\374\361\376\377\374\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\223\377\377\377\377\376\377\374\361\376\377\374\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\223\377\377\377\377\376\377\374" \ - "\361\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377\223" \ - "\377\377\377\377\376\377\374\361\376\377\374\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\223\377\377\377\377\376\377\374\361\376\377" \ - "\374\377\377\377\377\377\377\377\377\377\377\377\377\223\377\377\377" \ - "\377\376\377\374\361\376\377\374\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\223\377\377\377\377\376\377\374\361\376\377\374\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\223\377\377\377\377\376\377" \ - "\374\361\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\223\377\377\377\377\376\377\374\361\376\377\374\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\223\377\377\377\363\376\377\374\3\373\375" \ - "\372\360\366\370\353\360\363\202\347\355\357\5\346\354\356\347\355\357" \ - "\351\356\360\360\366\370\371\373\370\363\376\377\374\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\223\377\377\377\353\376\377\374\10\356" \ - "\363\366\324\331\333\277\304\306\252\262\272\227\237\247}\220\233p\203" \ - "\216ew\202\212]oz\10dv\201n\201\214~\215\223\216\236\244\247\257\267" \ - "\274\301\303\320\326\330\352\357\362\353\376\377\374\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\223\377\377\377\346\376\377\374\5\366" \ - "\370\364\320\326\330\255\265\275\210\227\235j}\210\232]oz\5gy\204\204" \ - "\223\231\250\260\270\314\321\324\355\362\365\346\376\377\374\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\223\377\377\377\342\376\377" \ - "\374\5\373\375\372\327\334\337\253\263\273x\213\227^p{\243]oz\4q\204" \ - "\217\242\252\262\320\326\330\365\372\375\342\376\377\374\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\223\377\377\377\337\376\377\374" \ - "\4\371\373\370\317\324\327\225\245\253ew\202\252]oz\4bt\177\211\230\236" \ - "\306\314\316\367\371\366\337\376\377\374\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\223\377\377\377\335\376\377\374\3\333\340\343\236" \ - "\246\256fx\203\260]oz\3bt\177\225\235\245\320\326\330\335\376\377\374" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\223\377\377\377\332" \ - "\376\377\374\3\367\371\366\276\303\305u\210\224\266]oz\3m\200\213\257" \ - "\267\277\355\362\365\332\376\377\374\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\223\377\377\377\330\376\377\374\3\353\360\363\252\262" \ - "\272fx\203\272]oz\3as~\230\250\256\342\347\352\330\376\377\374\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\223\377\377\377\326\376\377" \ - "\374\3\352\357\362\236\246\256as~\276]oz\3^p{\216\236\244\341\346\351" \ - "\326\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377\223" \ - "\377\377\377\324\376\377\374\3\354\361\364\246\256\266as~\302]oz\3^p" \ - "{\227\237\247\346\354\356\324\376\377\374\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\223\377\377\377\322\376\377\374\3\372\374\371\265" \ - "\276\306fx\203\306]oz\3as~\250\260\270\362\367\371\322\376\377\374\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\223\377\377\377\321\376" \ - "\377\374\2\320\326\330p\203\216\312]oz\2hz\205\302\307\312\321\376\377" \ - "\374\377\377\377\377\377\377\377\377\377\377\377\377\223\377\377\377" \ - "\317\376\377\374\2\356\363\366\231\241\251\316]oz\2\204\223\231\345\352" \ - "\355\317\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\223\377\377\377\316\376\377\374\2\311\316\321i{\206\320]oz\2bt\177\264" \ - "\274\305\316\376\377\374\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\223\377\377\377\314\376\377\374\2\362\367\371\226\246\254\324]o" \ - "z\2\206\225\233\353\360\363\314\376\377\374\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\223\377\377\377\313\376\377\374\2\334\342\344o\202" \ - "\215\326]oz\2gy\204\315\322\325\313\376\377\374\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\223\377\377\377\312\376\377\374\2\302\307\312" \ - "as~\330]oz\3^p{\254\264\274\373\375\372\311\376\377\374\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\223\377\377\377\310\376\377\374\2\372" \ - "\374\371\236\246\256\334]oz\2\210\227\235\360\366\370\310\376\377\374" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\223\377\377\377\307" \ - "\376\377\374\2\360\366\370\205\224\232\336]oz\2s\206\221\347\355\357" \ - "\307\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377\223" \ - "\377\377\377\306\376\377\374\2\347\355\357t\207\222\340]oz\2i{\206\333" \ - "\340\343\306\376\377\374\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\223\377\377\377\305\376\377\374\2\343\350\353j}\210\251]oz\7bt\177" \ - "w\212\226\215\234\243\236\246\256\246\256\266\254\264\274\264\274\305" \ - "\202\300\305\310\7\264\274\305\255\265\275\250\260\270\233\252\261\222" \ - "\241\247~\215\223ew\202\251]oz\2cu\200\322\330\332\305\376\377\374\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\223\377\377\377\304\376" \ - "\377\374\2\337\344\346i{\206\245]oz\5j}\210\230\240\250\270\300\311\322" \ - "\330\332\351\356\360\220\376\377\374\5\354\361\364\326\333\335\300\305" \ - "\310\236\246\256p\203\216\245]oz\2as~\316\323\326\304\376\377\374\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\223\377\377\377\303\376" \ - "\377\374\2\335\343\345gy\204\242]oz\4ew\202\222\241\247\276\303\305\342" \ - "\347\352\232\376\377\374\4\352\357\362\304\311\314\233\243\253j}\210" \ - "\242]oz\2as~\313\320\322\303\376\377\374\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\223\377\377\377\302\376\377\374\2\341\346\351hz" \ - "\205\240]oz\4_q|\211\230\236\307\315\317\370\372\367\240\376\377\374" \ - "\4\373\375\372\320\326\330\231\241\251bt\177\240]oz\2as~\317\324\327" \ - "\302\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377\223" \ - "\377\377\377\301\376\377\374\2\343\350\353i{\206\237]oz\3q\204\217\266" \ - "\277\307\354\361\364\246\376\377\374\3\366\370\364\303\310\313\177\216" \ - "\224\237]oz\2bt\177\325\332\334\301\376\377\374\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\223\377\377\377\300\376\377\374\2\355\362\365" \ - "l\177\212\236]oz\3u\210\224\307\315\317\373\375\372\253\376\377\374\2" \ - "\324\331\333\204\223\231\236]oz\2ew\202\341\346\351\300\376\377\374\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\223\377\377\377\277\376" \ - "\377\374\2\365\372\375\177\216\224\235]oz\2~\215\223\315\322\325\260" \ - "\376\377\374\2\331\336\341\211\230\236\235]oz\2l\177\212\353\360\363" \ - "\277\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377\223" \ - "\377\377\377\277\376\377\374\1\214\233\242\234]oz\2i{\206\305\312\315" \ - "\264\376\377\374\2\324\331\333q\204\217\234]oz\2u\210\224\367\371\366" \ - "\276\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377\223" \ - "\377\377\377\276\376\377\374\1\257\267\277\233]oz\3^p{\242\252\262\362" \ - "\367\371\266\376\377\374\3\372\374\371\261\271\302bt\177\233]oz\1\225" \ - "\235\245\276\376\377\374\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\223\377\377\377\275\376\377\374\2\317\324\327^p{\232]oz\2w\212\226" \ - "\335\343\345\272\376\377\374\2\351\356\360\211\230\236\233]oz\1\264\274" \ - "\305\275\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\223\377\377\377\274\376\377\374\2\347\355\357ew\202\232]oz\2\242\252" \ - "\262\371\373\370\225\376\377\374\10\336\367\374\262\355\370\220\343\361" \ - "m\332\361G\317\353,\311\352(\307\350#\304\346\202\0\301\350\10\0\304" \ - "\352(\307\350,\311\352B\314\347i\326\356\207\341\364\260\353\366\333" \ - "\364\371\226\376\377\374\2\266\277\307as~\231]oz\2_q|\327\334\337\274" \ - "\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377\223\377" \ - "\377\377\273\376\377\374\2\373\375\372}\220\233\231]oz\2ew\202\313\320" \ - "\322\223\376\377\374\4\334\365\372\233\345\364M\323\357\0\304\352\222" \ - "\25\274\344\4\0\301\350J\321\355\211\342\365\314\361\372\223\376\377" \ - "\374\2\332\337\342m\200\213\231]oz\2l\177\212\360\366\370\273\376\377" \ - "\374\377\377\377\377\377\377\377\377\377\377\377\377\223\377\377\377" \ - "\273\376\377\374\1\257\267\277\231]oz\2x\213\227\347\355\357\221\376" \ - "\377\374\3\336\367\374\206\340\363*\310\351\232\25\274\344\3#\304\346" \ - "w\333\356\316\363\374\221\376\377\374\2\360\366\370\214\233\242\231]" \ - "oz\1\227\237\247\273\376\377\374\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\223\377\377\377\272\376\377\374\2\335\343\345_q|\230]oz" \ - "\2\210\227\235\364\371\374\217\376\377\374\3\370\376\377\256\350\364" \ - "B\314\347\240\25\274\344\3*\310\351\233\345\364\367\375\377\217\376\377" \ - "\374\2\373\375\372\242\252\262\231]oz\1\305\312\315\272\376\377\374\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\223\377\377\377\271\376" \ - "\377\374\2\372\374\371w\212\226\230]oz\2\231\241\251\372\374\371\216" \ - "\376\377\374\3\367\375\377\233\345\364(\307\350\244\25\274\344\3\0\302" \ - "\351\206\340\363\356\373\374\217\376\377\374\1\257\267\277\230]oz\2h" \ - "z\205\356\363\366\271\376\377\374\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\223\377\377\377\271\376\377\374\1\257\267\277\230]oz\1\246" \ - "\256\266\217\376\377\374\2\237\350\367\0\304\352\250\25\274\344\3\0\276" \ - "\345\207\341\364\370\376\377\216\376\377\374\2\277\304\306_q|\227]oz" \ - "\1\231\241\251\271\376\377\374\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\223\377\377\377\270\376\377\374\2\346\354\356bt\177\227]oz\1" \ - "\251\261\271\216\376\377\374\2\315\362\3731\313\354\254\25\274\344\2" \ - "(\307\350\262\355\370\216\376\377\374\2\305\312\315^p{\227]oz\1\322\330" \ - "\332\270\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\223\377\377\377\270\376\377\374\1\215\234\243\227]oz\1\233\252\261\215" \ - "\376\377\374\3\367\375\377m\332\361\0\276\345\257\25\274\344\2L\322\356" \ - "\356\373\374\215\376\377\374\1\274\301\303\227]oz\2t\207\222\373\375" \ - "\372\267\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\223\377\377\377\267\376\377\374\1\325\332\334\227]oz\2\214\233\242\373" \ - "\375\372\214\376\377\374\2\333\364\371,\311\352\262\25\274\344\2\0\304" \ - "\352\301\356\366\215\376\377\374\1\252\262\272\227]oz\1\274\301\303\267" \ - "\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377\223\377" \ - "\377\377\267\376\377\374\1v\211\225\226]oz\2\205\224\232\365\372\375" \ - "\214\376\377\374\2\236\347\366\0\276\345\264\25\274\344\3\0\276\345\203" \ - "\334\360\370\376\377\214\376\377\374\1\236\246\256\226]oz\2hz\205\362" \ - "\367\371\266\376\377\374\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\223\377\377\377\266\376\377\374\1\307\315\317\226]oz\2n\201\214" \ - "\360\366\370\214\376\377\374\1m\332\361\270\25\274\344\2I\320\354\366" \ - "\373\376\213\376\377\374\2\373\375\372\203\222\230\226]oz\1\254\264\274" \ - "\266\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377\223" \ - "\377\377\377\265\376\377\374\2\373\375\372s\206\221\225]oz\2as~\333\340" \ - "\343\213\376\377\374\2\370\376\377M\323\357\272\25\274\344\2""1\313\354" \ - "\356\373\374\213\376\377\374\2\353\360\363i{\206\225]oz\2ew\202\357\365" \ - "\367\265\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\223\377\377\377\265\376\377\374\1\305\312\315\226]oz\1\265\276\306\213" \ - "\376\377\374\2\366\373\376B\314\347\274\25\274\344\2(\307\350\336\367" \ - "\374\213\376\377\374\2\322\330\332^p{\225]oz\1\252\262\272\265\376\377" \ - "\374\377\377\377\377\377\377\377\377\377\377\377\377\223\377\377\377" \ - "\265\376\377\374\1u\210\224\225]oz\1\214\233\242\213\376\377\374\2\366" \ - "\373\376B\314\347\276\25\274\344\2#\304\346\337\370\375\213\376\377\374" \ - "\1\253\263\273\225]oz\2fx\203\367\371\366\264\376\377\374\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\223\377\377\377\264\376\377\374" \ - "\1\322\330\332\225]oz\2i{\206\360\366\370\212\376\377\374\2\370\376\377" \ - "I\320\354\300\25\274\344\2*\310\351\357\374\375\212\376\377\374\2\373" \ - "\375\372~\215\223\225]oz\1\264\274\305\264\376\377\374\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\223\377\377\377\264\376\377\374\1\210" \ - "\227\235\225]oz\1\303\310\313\213\376\377\374\1i\326\356\302\25\274\344" \ - "\2B\314\347\370\376\377\212\376\377\374\2\335\343\345^p{\224]oz\2m\200" \ - "\213\373\375\372\263\376\377\374\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\223\377\377\377\263\376\377\374\2\345\352\355^p{\224]oz" \ - "\1~\221\235\213\376\377\374\1y\336\360\304\25\274\344\1M\323\357\213" \ - "\376\377\374\1\242\252\262\225]oz\1\315\322\325\263\376\377\374\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\223\377\377\377\263\376\377" \ - "\374\1\252\262\272\224]oz\2_q|\341\346\351\212\376\377\374\2\274\355" \ - "\373\0\276\345\305\25\274\344\1\220\343\361\212\376\377\374\2\360\366" \ - "\370i{\206\224]oz\1\211\230\236\263\376\377\374\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\223\377\377\377\262\376\377\374\2\372\374\371" \ - "i{\206\224]oz\1\250\260\270\212\376\377\374\2\350\371\377\0\304\352\306" \ - "\25\274\344\2\0\276\345\316\363\374\212\376\377\374\1\303\310\313\224" \ - "]oz\2^p{\352\357\362\262\376\377\374\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\223\377\377\377\262\376\377\374\1\315\322\325\224]o" \ - "z\2dv\201\357\365\367\212\376\377\374\1G\317\353\240\25\274\344\3\0\302" \ - "\351,\311\352J\321\355\203L\322\356\2B\314\347#\304\346\240\25\274\344" \ - "\2*\310\351\367\375\377\212\376\377\374\1q\204\217\224]oz\1\257\267\277" \ - "\262\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377\223" \ - "\377\377\377\262\376\377\374\1\230\240\250\224]oz\1\247\257\267\212\376" \ - "\377\374\1\233\345\364\235\25\274\344\4*\310\351n\333\362\273\354\371" \ - "\360\375\376\210\376\377\374\4\357\374\375\303\361\370\206\340\363/\312" \ - "\353\235\25\274\344\1w\333\356\212\376\377\374\1\303\310\313\224]oz\1" \ - "v\211\225\262\376\377\374\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\223\377\377\377\261\376\377\374\2\365\372\375dv\201\223]oz\2as~" \ - "\353\360\363\211\376\377\374\2\356\373\374\0\302\351\232\25\274\344\3" \ - "\0\276\345m\332\361\335\366\373\220\376\377\374\2\336\367\374(\307\350" \ - "\232\25\274\344\2%\305\347\336\367\374\212\376\377\374\2\372\374\371" \ - "n\201\214\224]oz\1\343\350\353\261\376\377\374\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\223\377\377\377\261\376\377\374\1\313\320\322" \ - "\224]oz\1\233\252\261\212\376\377\374\1k\327\357\231\25\274\344\3\0\276" \ - "\345\206\340\363\357\374\375\222\376\377\374\1k\327\357\232\25\274\344" \ - "\2%\305\347\336\367\374\214\376\377\374\1\276\303\305\224]oz\1\257\267" \ - "\277\261\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\223\377\377\377\261\376\377\374\1\226\246\254\223]oz\2^p{\347\355\357" \ - "\211\376\377\374\2\316\363\374\0\276\345\230\25\274\344\2J\321\355\337" \ - "\370\375\223\376\377\374\1k\327\357\232\25\274\344\2%\305\347\336\367" \ - "\374\215\376\377\374\2\370\372\367i{\206\223]oz\1\177\216\224\261\376" \ - "\377\374\377\377\377\377\377\377\377\377\377\377\377\377\223\377\377" \ - "\377\261\376\377\374\1k~\211\223]oz\1\205\224\232\212\376\377\374\1J" \ - "\321\355\227\25\274\344\2\0\276\345\257\351\365\224\376\377\374\1m\332" \ - "\361\232\25\274\344\2%\305\347\336\367\374\217\376\377\374\1\246\256" \ - "\266\223]oz\2^p{\356\363\366\260\376\377\374\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\223\377\377\377\260\376\377\374\1\335\343\345" \ - "\224]oz\1\303\310\313\211\376\377\374\2\333\364\371\0\276\345\226\25" \ - "\274\344\2#\304\346\316\363\374\224\376\377\374\1m\332\361\232\25\274" \ - "\344\2%\305\347\336\367\374\220\376\377\374\1\335\343\345\224]oz\1\306" \ - "\314\316\260\376\377\374\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\223\377\377\377\260\376\377\374\1\264\274\305\223]oz\2cu\200\367" \ - "\371\366\211\376\377\374\1i\326\356\226\25\274\344\2,\311\352\347\370" \ - "\376\224\376\377\374\1m\332\361\232\25\274\344\2%\305\347\336\367\374" \ - "\222\376\377\374\1t\207\222\223]oz\1\236\246\256\260\376\377\374\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\223\377\377\377\260\376" \ - "\377\374\1\215\234\243\223]oz\1\231\241\251\211\376\377\374\2\347\370" \ - "\376\0\276\345\225\25\274\344\2*\310\351\357\374\375\224\376\377\374" \ - "\1m\332\361\232\25\274\344\2%\305\347\336\367\374\223\376\377\374\1\261" \ - "\271\302\223]oz\1q\204\217\260\376\377\374\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\223\377\377\377\260\376\377\374\1i{\206\223]oz\1" \ - "\317\324\327\211\376\377\374\1\207\341\364\225\25\274\344\2#\304\346" \ - "\337\370\375\224\376\377\374\1m\332\361\232\25\274\344\2%\305\347\336" \ - "\367\374\224\376\377\374\1\351\356\360\224]oz\1\356\363\366\257\376\377" \ - "\374\377\377\377\377\377\377\377\377\377\377\377\377\223\377\377\377" \ - "\257\376\377\374\1\345\352\355\223]oz\2as~\370\372\367\211\376\377\374" \ - "\1,\311\352\224\25\274\344\2\0\276\345\313\360\371\224\376\377\374\1" \ - "m\332\361\232\25\274\344\2%\305\347\336\367\374\226\376\377\374\1q\204" \ - "\217\223]oz\1\314\321\324\257\376\377\374\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\223\377\377\377\257\376\377\374\1\311\316\321\223" \ - "]oz\1\202\221\227\211\376\377\374\1\320\365\376\225\25\274\344\1\207" \ - "\341\364\224\376\377\374\1m\332\361\232\25\274\344\2%\305\347\336\367" \ - "\374\214\376\377\374\2\236\347\366\237\350\367\211\376\377\374\1\236" \ - "\246\256\223]oz\1\255\265\275\257\376\377\374\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\223\377\377\377\257\376\377\374\1\254\264\274" \ - "\223]oz\1\255\265\275\211\376\377\374\1y\336\360\224\25\274\344\2/\312" \ - "\353\370\376\377\223\376\377\374\1m\332\361\232\25\274\344\2%\305\347" \ - "\336\367\374\214\376\377\374\3\236\347\366\0\276\345J\321\355\211\376" \ - "\377\374\1\311\316\321\223]oz\1\215\234\243\257\376\377\374\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\223\377\377\377\257\376\377\374" \ - "\1\214\233\242\223]oz\1\326\333\335\211\376\377\374\1,\311\352\224\25" \ - "\274\344\1\312\357\370\223\376\377\374\1n\333\362\232\25\274\344\2%\305" \ - "\347\336\367\374\214\376\377\374\5\236\347\366\0\276\345\25\274\344\0" \ - "\276\345\367\375\377\210\376\377\374\2\356\363\366^p{\222]oz\1o\202\215" \ - "\257\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377\223" \ - "\377\377\377\257\376\377\374\1o\202\215\222]oz\2as~\366\373\376\210\376" \ - "\377\374\2\357\374\375\0\276\345\223\25\274\344\1J\321\355\223\376\377" \ - "\374\1n\333\362\232\25\274\344\2%\305\347\336\367\374\214\376\377\374" \ - "\2\236\347\366\0\276\345\203\25\274\344\1\274\355\373\211\376\377\374" \ - "\1u\210\224\222]oz\2^p{\370\372\367\256\376\377\374\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\223\377\377\377\256\376\377\374\2\373\375" \ - "\372_q|\222]oz\1u\210\224\211\376\377\374\1\261\354\367\224\25\274\344" \ - "\1\312\357\370\222\376\377\374\1n\333\362\232\25\274\344\2%\305\347\336" \ - "\367\374\214\376\377\374\2\236\347\366\0\276\345\204\25\274\344\1\204" \ - "\335\361\211\376\377\374\1\230\240\250\223]oz\1\342\347\352\256\376\377" \ - "\374\377\377\377\377\377\377\377\377\377\377\377\377\223\377\377\377" \ - "\256\376\377\374\1\351\356\360\223]oz\1\225\235\245\211\376\377\374\1" \ - "n\333\362\223\25\274\344\1,\311\352\222\376\377\374\1n\333\362\232\25" \ - "\274\344\2%\305\347\336\367\374\214\376\377\374\2\236\347\366\0\276\345" \ - "\205\25\274\344\1B\314\347\211\376\377\374\1\257\267\277\223]oz\1\317" \ - "\324\327\256\376\377\374\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\223\377\377\377\256\376\377\374\1\326\333\335\223]oz\1\253\263\273" \ - "\211\376\377\374\1B\314\347\223\25\274\344\1\211\342\365\221\376\377" \ - "\374\1n\333\362\232\25\274\344\2%\305\347\336\367\374\214\376\377\374" \ - "\2\236\347\366\0\276\345\206\25\274\344\1\0\302\351\211\376\377\374\1" \ - "\307\315\317\223]oz\1\276\303\305\256\376\377\374\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\223\377\377\377\256\376\377\374\1\306\314" \ - "\316\223]oz\1\305\312\315\211\376\377\374\1#\304\346\223\25\274\344\1" \ - "\337\370\375\220\376\377\374\1w\333\356\232\25\274\344\2%\305\347\336" \ - "\367\374\214\376\377\374\2\236\347\366\0\276\345\210\25\274\344\1\356" \ - "\373\374\210\376\377\374\1\337\344\346\223]oz\1\253\263\273\256\376\377" \ - "\374\377\377\377\377\377\377\377\377\377\377\377\377\223\377\377\377" \ - "\256\376\377\374\1\274\301\303\223]oz\1\333\340\343\210\376\377\374\2" \ - "\367\375\377\0\276\345\222\25\274\344\1(\307\350\220\376\377\374\1\231" \ - "\342\362\232\25\274\344\2%\305\347\336\367\374\214\376\377\374\2\236" \ - "\347\366\0\276\345\211\25\274\344\1\302\357\367\210\376\377\374\2\364" \ - "\371\374^p{\222]oz\1\236\246\256\256\376\377\374\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\223\377\377\377\256\376\377\374\1\257\267" \ - "\277\223]oz\1\353\360\363\210\376\377\374\1\316\363\374\223\25\274\344" \ - "\1\\\326\355\217\376\377\374\2\320\365\376\31\275\345\231\25\274\344" \ - "\2%\305\347\336\367\374\214\376\377\374\2\236\347\366\0\276\345\212\25" \ - "\274\344\1\237\350\367\211\376\377\374\1gy\204\222]oz\1\216\236\244\256" \ - "\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377\223\377" \ - "\377\377\256\376\377\374\1\242\252\262\223]oz\1\366\370\364\210\376\377" \ - "\374\1\262\355\370\223\25\274\344\1\220\343\361\217\376\377\374\1J\321" \ - "\355\231\25\274\344\2%\305\347\336\367\374\214\376\377\374\2\236\347" \ - "\366\0\276\345\213\25\274\344\1\211\342\365\211\376\377\374\1m\200\213" \ - "\222]oz\1\204\223\231\256\376\377\374\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\223\377\377\377\256\376\377\374\1\226\246\254\223]o" \ - "z\211\376\377\374\1\237\350\367\223\25\274\344\1\262\355\370\216\376" \ - "\377\374\2\350\371\377\0\276\345\230\25\274\344\2%\305\347\336\367\374" \ - "\214\376\377\374\2\236\347\366\0\276\345\214\25\274\344\1n\333\362\211" \ - "\376\377\374\1u\210\224\222]oz\1y\214\230\256\376\377\374\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\223\377\377\377\256\376\377\374" \ - "\1\231\241\251\222]oz\1cu\200\211\376\377\374\1\233\345\364\223\25\274" \ - "\344\1\316\363\374\216\376\377\374\1\235\346\365\230\25\274\344\2%\305" \ - "\347\336\367\374\214\376\377\374\2\236\347\366\0\276\345\215\25\274\344" \ - "\1k\327\357\211\376\377\374\1\200\217\225\222]oz\1u\210\224\256\376\377" \ - "\374\377\377\377\377\377\377\377\377\377\377\377\377\223\377\377\377" \ - "\256\376\377\374\1\222\241\247\222]oz\1j}\210\211\376\377\374\1\220\343" \ - "\361\223\25\274\344\1\336\367\374\216\376\377\374\1w\333\356\227\25\274" \ - "\344\2#\304\346\336\367\374\214\376\377\374\2\236\347\366\0\276\345\216" \ - "\25\274\344\1M\323\357\211\376\377\374\1\210\227\235\222]oz\1s\206\221" \ - "\256\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377\223" \ - "\377\377\377\256\376\377\374\1\211\230\236\222]oz\1n\201\214\211\376" \ - "\377\374\1\206\340\363\223\25\274\344\1\350\371\377\216\376\377\374\1" \ - "i\326\356\226\25\274\344\2#\304\346\336\367\374\214\376\377\374\2\236" \ - "\347\366\0\276\345\217\25\274\344\1M\323\357\211\376\377\374\1\215\234" \ - "\243\222]oz\1m\200\213\256\376\377\374\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\223\377\377\377\256\376\377\374\1\222\241\247\222]o" \ - "z\1l\177\212\211\376\377\374\1\207\341\364\223\25\274\344\1\336\367\374" \ - "\216\376\377\374\1n\333\362\225\25\274\344\2#\304\346\336\367\374\214" \ - "\376\377\374\2\235\346\365\0\276\345\220\25\274\344\1M\323\357\211\376" \ - "\377\374\1\211\230\236\222]oz\1s\206\221\256\376\377\374\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\223\377\377\377\256\376\377\374" \ - "\1\231\241\251\222]oz\1ew\202\211\376\377\374\1\231\342\362\223\25\274" \ - "\344\1\320\365\376\216\376\377\374\1\221\344\362\224\25\274\344\2#\304" \ - "\346\336\367\374\214\376\377\374\2\235\346\365\0\276\345\221\25\274\344" \ - "\1i\326\356\211\376\377\374\1\202\221\227\222]oz\1u\210\224\256\376\377" \ - "\374\377\377\377\377\377\377\377\377\377\377\377\377\223\377\377\377" \ - "\256\376\377\374\1\242\252\262\222]oz\1^p{\211\376\377\374\1\237\350" \ - "\367\223\25\274\344\1\301\356\366\216\376\377\374\1\333\364\371\223\25" \ - "\274\344\2#\304\346\336\367\374\214\376\377\374\2\356\373\374\0\276\345" \ - "\222\25\274\344\1n\333\362\211\376\377\374\1w\212\226\222]oz\1\202\221" \ - "\227\256\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\223\377\377\377\256\376\377\374\1\246\256\266\223]oz\1\370\372\367\210" \ - "\376\377\374\1\260\353\366\223\25\274\344\1\233\345\364\217\376\377\374" \ - "\1,\311\352\221\25\274\344\2#\304\346\336\367\374\215\376\377\374\1\312" \ - "\357\370\223\25\274\344\1\204\335\361\211\376\377\374\1o\202\215\222" \ - "]oz\1\205\224\232\256\376\377\374\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\223\377\377\377\256\376\377\374\1\252\262\272\223]oz\1\355" \ - "\362\365\210\376\377\374\1\314\361\372\223\25\274\344\1m\332\361\217" \ - "\376\377\374\1\273\354\371\220\25\274\344\2#\304\346\336\367\374\216" \ - "\376\377\374\1\233\345\364\223\25\274\344\1\236\347\366\211\376\377\374" \ - "\1i{\206\222]oz\1\211\230\236\256\376\377\374\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\223\377\377\377\256\376\377\374\1\266\277\307" \ - "\223]oz\1\340\345\350\210\376\377\374\1\356\373\374\223\25\274\344\1" \ - ",\311\352\220\376\377\374\1i\326\356\216\25\274\344\2#\304\346\336\367" \ - "\374\217\376\377\374\1\\\326\355\223\25\274\344\1\274\355\373\210\376" \ - "\377\374\2\372\374\371_q|\222]oz\1\226\246\254\256\376\377\374\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\223\377\377\377\256\376\377" \ - "\374\1\307\315\317\223]oz\1\313\320\322\211\376\377\374\1\0\302\351\222" \ - "\25\274\344\2\0\276\345\357\374\375\217\376\377\374\2\370\376\377G\317" \ - "\353\214\25\274\344\2(\307\350\336\367\374\220\376\377\374\1%\305\347" \ - "\223\25\274\344\1\336\367\374\210\376\377\374\1\343\350\353\223]oz\1" \ - "\254\264\274\256\376\377\374\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\223\377\377\377\256\376\377\374\1\327\334\337\223]oz\1\257\267" \ - "\277\211\376\377\374\1B\314\347\223\25\274\344\1\237\350\367\220\376" \ - "\377\374\3\370\376\377n\333\362\31\275\345\211\25\274\344\2J\321\355" \ - "\356\373\374\220\376\377\374\1\315\362\373\223\25\274\344\1\0\301\350" \ - "\211\376\377\374\1\316\323\326\223]oz\1\276\303\305\256\376\377\374\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\223\377\377\377\256\376" \ - "\377\374\1\346\354\356\223]oz\1\225\245\253\211\376\377\374\1k\327\357" \ - "\223\25\274\344\1G\317\353\222\376\377\374\3\320\365\376Z\325\354\0\301" \ - "\350\204\25\274\344\3\0\276\345G\317\353\274\355\373\222\376\377\374" \ - "\1w\333\356\223\25\274\344\1""3\314\355\211\376\377\374\1\264\274\305" \ - "\223]oz\1\315\322\325\256\376\377\374\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\223\377\377\377\256\376\377\374\1\366\373\376\223]o" \ - "z\1z\215\231\211\376\377\374\1\237\350\367\223\25\274\344\2\31\275\345" \ - "\335\366\373\223\376\377\374\2\370\376\377\316\363\374\202\261\354\367" \ - "\2\313\360\371\366\373\376\223\376\377\374\2\370\376\377\0\302\351\223" \ - "\25\274\344\1n\333\362\211\376\377\374\1\230\250\256\223]oz\1\334\342" \ - "\344\256\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\223\377\377\377\257\376\377\374\1m\200\213\222]oz\1ew\202\211\376\377" \ - "\374\1\347\370\376\224\25\274\344\1m\332\361\254\376\377\374\1\233\345" \ - "\364\224\25\274\344\1\261\354\367\211\376\377\374\1}\220\233\223]oz\1" \ - "\366\370\364\256\376\377\374\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\223\377\377\377\257\376\377\374\1\211\230\236\223]oz\1\335\343" \ - "\345\211\376\377\374\1%\305\347\223\25\274\344\2\0\276\345\336\367\374" \ - "\252\376\377\374\2\367\375\377#\304\346\223\25\274\344\2\31\275\345\357" \ - "\374\375\210\376\377\374\2\370\372\367as~\222]oz\1m\200\213\257\376\377" \ - "\374\377\377\377\377\377\377\377\377\377\377\377\377\223\377\377\377" \ - "\257\376\377\374\1\251\261\271\223]oz\1\264\274\305\211\376\377\374\1" \ - "k\327\357\224\25\274\344\1L\322\356\252\376\377\374\1\206\340\363\224" \ - "\25\274\344\1""3\314\355\211\376\377\374\1\322\330\332\223]oz\1\211\230" \ - "\236\257\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\223\377\377\377\257\376\377\374\1\305\312\315\223]oz\1\211\230\236\211" \ - "\376\377\374\1\301\356\366\225\25\274\344\1\262\355\370\250\376\377\374" \ - "\2\334\365\372\0\276\345\224\25\274\344\1\220\343\361\211\376\377\374" \ - "\1\252\262\272\223]oz\1\251\261\271\257\376\377\374\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\223\377\377\377\257\376\377\374\1\337\344" \ - "\346\223]oz\2ew\202\373\375\372\210\376\377\374\2\370\376\377#\304\346" \ - "\224\25\274\344\2\0\302\351\347\370\376\246\376\377\374\2\367\375\377" \ - ",\311\352\224\25\274\344\2\0\276\345\337\370\375\211\376\377\374\1\177" \ - "\216\224\223]oz\1\305\312\315\257\376\377\374\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\223\377\377\377\257\376\377\374\2\373\375\372" \ - "dv\201\223]oz\1\331\336\341\211\376\377\374\1n\333\362\225\25\274\344" \ - "\2B\314\347\370\376\377\245\376\377\374\1i\326\356\225\25\274\344\1B" \ - "\314\347\211\376\377\374\2\362\367\371_q|\223]oz\1\346\354\356\257\376" \ - "\377\374\377\377\377\377\377\377\377\377\377\377\377\377\223\377\377" \ - "\377\260\376\377\374\1\210\227\235\223]oz\1\246\256\266\211\376\377\374" \ - "\1\316\363\374\226\25\274\344\2M\323\357\370\376\377\243\376\377\374" \ - "\1\206\340\363\226\25\274\344\1\256\350\364\211\376\377\374\1\301\306" \ - "\311\223]oz\1k~\211\260\376\377\374\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\223\377\377\377\260\376\377\374\1\257\267\277\223]oz\2i" \ - "{\206\373\375\372\211\376\377\374\1G\317\353\226\25\274\344\2\\\326\355" \ - "\370\376\377\241\376\377\374\1\220\343\361\226\25\274\344\2\0\304\352" \ - "\370\376\377\211\376\377\374\1\204\223\231\223]oz\1\230\240\250\260\376" \ - "\377\374\377\377\377\377\377\377\377\377\377\377\377\377\223\377\377" \ - "\377\260\376\377\374\1\331\336\341\224]oz\1\317\324\327\211\376\377\374" \ - "\1\301\356\366\227\25\274\344\2J\321\355\367\375\377\237\376\377\374" \ - "\1w\333\356\227\25\274\344\1\206\340\363\211\376\377\374\2\351\356\360" \ - "^p{\223]oz\1\277\304\306\260\376\377\374\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\223\377\377\377\260\376\377\374\2\372\374\371cu" \ - "\200\223]oz\1\222\241\247\212\376\377\374\1/\312\353\227\25\274\344\2" \ - ",\311\352\334\365\372\234\376\377\374\2\356\373\374I\320\354\227\25\274" \ - "\344\2\0\301\350\366\373\376\211\376\377\374\1\261\271\302\224]oz\1\343" \ - "\350\353\260\376\377\374\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\223\377\377\377\261\376\377\374\1\216\236\244\223]oz\2cu\200\362" \ - "\367\371\211\376\377\374\1\261\354\367\230\25\274\344\3\0\276\345\233" \ - "\345\364\370\376\377\231\376\377\374\2\262\355\370\0\304\352\230\25\274" \ - "\344\1\206\340\363\212\376\377\374\1s\206\221\223]oz\1q\204\217\261\376" \ - "\377\374\377\377\377\377\377\377\377\377\377\377\377\377\223\377\377" \ - "\377\261\376\377\374\1\305\312\315\224]oz\1\257\267\277\212\376\377\374" \ - "\1B\314\347\231\25\274\344\2""1\313\354\303\361\370\226\376\377\374\2" \ - "\334\365\372J\321\355\231\25\274\344\2#\304\346\366\373\376\211\376\377" \ - "\374\1\315\322\325\224]oz\1\251\261\271\261\376\377\374\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\223\377\377\377\261\376\377\374\2\362" \ - "\367\371as~\223]oz\2hz\205\370\372\367\211\376\377\374\2\334\365\372" \ - "\0\276\345\232\25\274\344\3B\314\347\262\355\370\370\376\377\221\376" \ - "\377\374\3\313\360\371L\322\356\0\276\345\232\25\274\344\1\256\350\364" \ - "\212\376\377\374\1z\215\231\224]oz\1\333\340\343\261\376\377\374\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\223\377\377\377\262\376" \ - "\377\374\1\207\226\234\224]oz\1\270\300\311\212\376\377\374\1w\333\356" \ - "\234\25\274\344\4\0\304\352m\332\361\273\354\371\366\373\376\212\376" \ - "\377\374\4\370\376\377\302\357\367y\336\360(\307\350\234\25\274\344\1" \ - "B\314\347\212\376\377\374\1\324\331\333\224]oz\1k~\211\262\376\377\374" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\223\377\377\377\262" \ - "\376\377\374\1\301\306\311\224]oz\2k~\211\372\374\371\211\376\377\374" \ - "\2\366\373\376(\307\350\236\25\274\344\5\31\275\345,\311\352M\323\357" \ - "y\336\360\211\342\365\202\233\345\364\5\220\343\361\204\335\361Z\325" \ - "\3541\313\354\0\276\345\236\25\274\344\2\0\301\350\336\367\374\212\376" \ - "\377\374\1\205\224\232\224]oz\1\246\256\266\262\376\377\374\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\223\377\377\377\262\376\377\374" \ - "\2\367\371\366dv\201\224]oz\1\274\301\303\212\376\377\374\2\315\362\373" \ - "\0\276\345\307\25\274\344\1\236\347\366\212\376\377\374\1\325\332\334" \ - "\225]oz\1\341\346\351\262\376\377\374\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\223\377\377\377\263\376\377\374\1\236\246\256\224]o" \ - "z\2fx\203\356\363\366\212\376\377\374\1\221\344\362\306\25\274\344\1" \ - "M\323\357\212\376\377\374\2\372\374\371t\207\222\224]oz\1\177\216\224" \ - "\263\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377\223" \ - "\377\377\377\263\376\377\374\1\333\340\343\225]oz\1\226\246\254\213\376" \ - "\377\374\1L\322\356\304\25\274\344\2,\311\352\366\373\376\212\376\377" \ - "\374\1\265\276\306\225]oz\1\302\307\312\263\376\377\374\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\223\377\377\377\264\376\377\374\1u\210" \ - "\224\224]oz\2^p{\331\336\341\212\376\377\374\2\366\373\376/\312\353\302" \ - "\25\274\344\2\0\302\351\336\367\374\212\376\377\374\2\353\360\363dv\201" \ - "\224]oz\2dv\201\364\371\374\263\376\377\374\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\223\377\377\377\264\376\377\374\1\302\307\312\225" \ - "]oz\2w\212\226\372\374\371\212\376\377\374\2\350\371\377%\305\347\300" \ - "\25\274\344\2\0\301\350\314\361\372\213\376\377\374\1\227\237\247\225" \ - "]oz\1\246\256\266\264\376\377\374\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\223\377\377\377\264\376\377\374\2\372\374\371l\177\212\225" \ - "]oz\1\252\262\272\213\376\377\374\2\337\370\375\0\304\352\276\25\274" \ - "\344\2\0\276\345\274\355\373\213\376\377\374\1\305\312\315\225]oz\2a" \ - "s~\353\360\363\264\376\377\374\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\223\377\377\377\265\376\377\374\1\270\300\311\225]oz\2^p{\322" \ - "\330\332\213\376\377\374\2\332\363\370#\304\346\274\25\274\344\2\0\276" \ - "\345\273\354\371\213\376\377\374\2\343\350\353dv\201\225]oz\1\236\246" \ - "\256\265\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\223\377\377\377\265\376\377\374\2\365\372\375hz\205\225]oz\2i{\206\354" \ - "\361\364\213\376\377\374\2\337\370\375*\310\351\272\25\274\344\2\0\302" \ - "\351\314\361\372\213\376\377\374\2\371\373\370x\213\227\225]oz\2_q|\346" \ - "\354\356\265\376\377\374\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\223\377\377\377\266\376\377\374\1\261\271\302\226]oz\2\205\224\232" \ - "\373\375\372\213\376\377\374\2\356\373\374B\314\347\270\25\274\344\2" \ - "%\305\347\335\366\373\214\376\377\374\1\242\252\262\226]oz\1\231\241" \ - "\251\266\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\223\377\377\377\266\376\377\374\2\370\372\367m\200\213\226]oz\1\242" \ - "\252\262\214\376\377\374\2\367\375\377i\326\356\266\25\274\344\2B\314" \ - "\347\350\371\377\214\376\377\374\1\277\304\306\226]oz\2bt\177\351\356" \ - "\360\266\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\223\377\377\377\267\376\377\374\1\305\312\315\227]oz\1\261\271\302\215" \ - "\376\377\374\2\250\347\371\0\301\350\262\25\274\344\3\31\275\345\206" \ - "\340\363\370\376\377\214\376\377\374\2\316\323\326_q|\226]oz\1\251\261" \ - "\271\267\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\223\377\377\377\270\376\377\374\1y\214\230\226]oz\2^p{\301\306\311\215" \ - "\376\377\374\2\335\366\373/\312\353\260\25\274\344\2#\304\346\312\357" \ - "\370\215\376\377\374\2\330\335\340cu\200\226]oz\2hz\205\366\370\364\267" \ - "\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377\223\377" \ - "\377\377\270\376\377\374\1\332\337\342\230\222\241\247\1\353\360\363" \ - "\215\376\377\374\3\370\376\377\231\342\362\0\301\350\254\25\274\344\3" \ - "\0\276\345w\333\356\366\373\376\215\376\377\374\2\365\372\375\236\246" \ - "\256\227\222\241\247\1\307\315\317\270\376\377\374\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\223\377\377\377\341\376\377\374\3\356\373" \ - "\374i\326\356\0\276\345\251\25\274\344\2J\321\355\335\366\373\341\376" \ - "\377\374\377\377\377\377\377\377\377\377\377\377\377\377\223\377\377" \ - "\377\343\376\377\374\3\316\363\374Z\325\354\31\275\345\245\25\274\344" \ - "\2G\317\353\302\357\367\343\376\377\374\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\223\377\377\377\345\376\377\374\3\336\367\374m\332\361" \ - "\0\276\345\240\25\274\344\3\31\275\345M\323\357\316\363\374\345\376\377" \ - "\374\377\377\377\377\377\377\377\377\377\377\377\377\223\377\377\377" \ - "\347\376\377\374\4\366\373\376\237\350\367I\320\354\31\275\345\232\25" \ - "\274\344\4\0\276\345B\314\347\231\342\362\356\373\374\347\376\377\374" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\223\377\377\377\352" \ - "\376\377\374\4\356\373\374\235\346\365Z\325\354#\304\346\224\25\274\344" \ - "\4\0\302\351L\322\356\221\344\362\336\367\374\352\376\377\374\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\223\377\377\377\356\376\377" \ - "\374\6\336\367\374\237\350\367w\333\356M\323\357,\311\352\0\276\345\210" \ - "\25\274\344\6\0\276\345*\310\351J\321\355n\333\362\233\345\364\320\365" \ - "\376\356\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\223\377\377\377\364\376\377\374\10\367\375\377\356\373\374\335\366\373" \ - "\316\363\374\315\362\373\335\366\373\350\371\377\366\373\376\364\376" \ - "\377\374\377\377\377\377\377\377\377\377\377\377\377\377\223\377\377" \ - "\377\377\376\377\374\361\376\377\374\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\223\377\377\377\377\376\377\374\361\376\377\374\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\223\377\377\377\377\376" \ - "\377\374\361\376\377\374\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\223\377\377\377\377\376\377\374\361\376\377\374\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\223\377\377\377\375\376\377\374\202" \ - "\370\376\377\250\376\377\374\1\367\375\377\217\376\377\374\1\367\375" \ - "\377\237\376\377\374\1\367\375\377\230\376\377\374\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\223\377\377\377\374\376\377\374\4\237\350" \ - "\367\0\276\345\31\275\345\203\334\360\245\376\377\374\5\316\363\374#" \ - "\304\346\25\274\344G\317\353\367\375\377\213\376\377\374\5\335\366\373" \ - "(\307\350\25\274\344B\314\347\366\373\376\233\376\377\374\5\356\373\374" \ - "/\312\353\25\274\344*\310\351\337\370\375\226\376\377\374\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\223\377\377\377\374\376\377\374" \ - "\1#\304\346\203\25\274\344\1\357\374\375\244\376\377\374\1i\326\356\203" \ - "\25\274\344\1\260\353\366\213\376\377\374\1n\333\362\203\25\274\344\1" \ - "\235\346\365\233\376\377\374\1\231\342\362\203\25\274\344\1y\336\360" \ - "\226\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377\223" \ - "\377\377\377\374\376\377\374\1\0\301\350\203\25\274\344\1\336\367\374" \ - "\244\376\377\374\1I\320\354\203\25\274\344\1\231\342\362\213\376\377" \ - "\374\1M\323\357\203\25\274\344\1\206\340\363\233\376\377\374\1\206\340" \ - "\363\203\25\274\344\1k\327\357\226\376\377\374\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\223\377\377\377\374\376\377\374\1\0\301\350" \ - "\203\25\274\344\1\336\367\374\244\376\377\374\1I\320\354\203\25\274\344" \ - "\1\231\342\362\213\376\377\374\1M\323\357\203\25\274\344\1\206\340\363" \ - "\233\376\377\374\1\206\340\363\203\25\274\344\1k\327\357\226\376\377" \ - "\374\377\377\377\377\377\377\377\377\377\377\377\377\223\377\377\377" \ - "\374\376\377\374\1\0\301\350\203\25\274\344\1\336\367\374\244\376\377" \ - "\374\1I\320\354\203\25\274\344\1\231\342\362\213\376\377\374\1M\323\357" \ - "\203\25\274\344\1\206\340\363\233\376\377\374\1\206\340\363\203\25\274" \ - "\344\1k\327\357\226\376\377\374\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\223\377\377\377\374\376\377\374\1\0\301\350\203\25\274\344\1" \ - "\336\367\374\244\376\377\374\1I\320\354\203\25\274\344\1\231\342\362" \ - "\213\376\377\374\1M\323\357\203\25\274\344\1\206\340\363\233\376\377" \ - "\374\1\206\340\363\203\25\274\344\1k\327\357\226\376\377\374\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\223\377\377\377\374\376\377" \ - "\374\1\0\301\350\203\25\274\344\1\336\367\374\244\376\377\374\1I\320" \ - "\354\203\25\274\344\1\231\342\362\213\376\377\374\1M\323\357\203\25\274" \ - "\344\1\206\340\363\233\376\377\374\1\206\340\363\203\25\274\344\1k\327" \ - "\357\226\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\223\377\377\377\232\376\377\374\7\311\316\321\211\230\236j}\210cu\200" \ - "n\201\214\233\243\253\333\340\343\206\376\377\374\2\236\246\256dv\201" \ - "\205]oz\4_q|k~\211\222\241\247\337\344\346\210\376\377\374\7\322\330" \ - "\332\222\241\247l\177\212cu\200k~\211\222\241\247\322\330\332\206\376" \ - "\377\374\2\257\267\277gy\204\205]oz\4^p{i{\206\211\230\236\325\332\334" \ - "\210\376\377\374\10\313\360\371\\\326\355%\305\347\0\276\345\0\302\351" \ - "G\317\353\237\350\367\370\376\377\205\376\377\374\2\235\346\365\0\304" \ - "\352\212\25\274\344\4\0\276\345\0\304\352M\323\357\315\362\373\205\376" \ - "\377\374\1\0\301\350\207\25\274\344\4\0\301\350B\314\347\233\345\364" \ - "\370\376\377\207\376\377\374\7\302\357\367M\323\357#\304\346\0\276\345" \ - "\0\304\352J\321\355\260\353\366\210\376\377\374\4\315\362\373M\323\357" \ - "#\304\346\31\275\345\207\25\274\344\1\231\342\362\204\376\377\374\4\323" \ - "\364\367\\\326\355%\305\347\0\276\345\207\25\274\344\1\206\340\363\205" \ - "\376\377\374\10\334\365\372m\332\361(\307\350\0\276\345\0\302\351B\314" \ - "\347\233\345\364\370\376\377\207\376\377\374\4\336\367\374m\332\361(" \ - "\307\350\0\276\345\207\25\274\344\1k\327\357\226\376\377\374\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\223\377\377\377\230\376\377" \ - "\374\2\356\363\366\202\221\227\206]oz\3^p{\247\257\267\373\375\372\203" \ - "\376\377\374\1\327\334\337\212]oz\2_q|\303\310\313\205\376\377\374\2" \ - "\364\371\374\222\241\247\207]oz\2\222\241\247\370\372\367\203\376\377" \ - "\374\2\353\360\363^p{\212]oz\1\254\264\274\205\376\377\374\2\370\376" \ - "\377m\332\361\207\25\274\344\2B\314\347\350\371\377\203\376\377\374\2" \ - "\370\376\377\0\276\345\216\25\274\344\2\31\275\345\235\346\365\204\376" \ - "\377\374\1\0\301\350\212\25\274\344\2B\314\347\357\374\375\204\376\377" \ - "\374\2\367\375\377Z\325\354\207\25\274\344\2G\317\353\357\374\375\205" \ - "\376\377\374\2\235\346\365\31\275\345\212\25\274\344\1\231\342\362\203" \ - "\376\377\374\2\256\350\364\0\276\345\212\25\274\344\1\206\340\363\204" \ - "\376\377\374\2\206\340\363\31\275\345\206\25\274\344\2*\310\351\335\366" \ - "\373\205\376\377\374\2\302\357\367\0\301\350\212\25\274\344\1k\327\357" \ - "\226\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377\223" \ - "\377\377\377\227\376\377\374\2\364\371\374u\210\224\211]oz\1\242\252" \ - "\262\203\376\377\374\1\306\314\316\213]oz\2_q|\325\332\334\203\376\377" \ - "\374\2\373\375\372\210\227\235\211]oz\2\211\230\236\373\375\372\202\376" \ - "\377\374\1\330\335\340\214]oz\1\304\311\314\204\376\377\374\1i\326\356" \ - "\211\25\274\344\2*\310\351\366\373\376\202\376\377\374\1\357\374\375" \ - "\220\25\274\344\2\0\276\345\274\355\373\203\376\377\374\1\0\301\350\213" \ - "\25\274\344\1M\323\357\204\376\377\374\1L\322\356\211\25\274\344\2""3" \ - "\314\355\370\376\377\203\376\377\374\2\313\360\371\0\276\345\213\25\274" \ - "\344\1\231\342\362\202\376\377\374\2\333\364\371\0\276\345\213\25\274" \ - "\344\1\206\340\363\203\376\377\374\1\206\340\363\211\25\274\344\2\0\304" \ - "\352\347\370\376\203\376\377\374\2\356\373\374\0\304\352\213\25\274\344" \ - "\1k\327\357\226\376\377\374\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\223\377\377\377\227\376\377\374\1\251\261\271\213]oz\1\322\330\332" \ - "\202\376\377\374\1\306\314\316\214]oz\1\200\217\225\203\376\377\374\1" \ - "\277\304\306\213]oz\1\277\304\306\202\376\377\374\1\330\335\340\214]" \ - "oz\2j}\210\373\375\372\202\376\377\374\1\273\354\371\213\25\274\344\1" \ - "n\333\362\202\376\377\374\1\357\374\375\221\25\274\344\1""1\313\354\203" \ - "\376\377\374\1\0\301\350\214\25\274\344\1\332\363\370\202\376\377\374" \ - "\1\237\350\367\213\25\274\344\1\206\340\363\203\376\377\374\1I\320\354" \ - "\214\25\274\344\1\231\342\362\202\376\377\374\1M\323\357\214\25\274\344" \ - "\1\206\340\363\202\376\377\374\2\320\365\376\31\275\345\212\25\274\344" \ - "\1L\322\356\203\376\377\374\1\203\334\360\214\25\274\344\1k\327\357\226" \ - "\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377\223\377" \ - "\377\377\226\376\377\374\2\370\372\367cu\200\203]oz\5s\206\221\317\324" \ - "\327\343\350\353\276\303\305ew\202\203]oz\1\210\227\235\202\376\377\374" \ - "\1\306\314\316\203]oz\1y\214\230\203\347\355\357\2\346\354\356\264\274" \ - "\305\203]oz\2^p{\357\365\367\202\376\377\374\1p\203\216\203]oz\5k~\211" \ - "\307\315\317\343\350\353\306\314\316k~\211\203]oz\1p\203\216\202\376" \ - "\377\374\1\330\335\340\203]oz\1k~\211\204\347\355\357\2\304\311\314_" \ - "q|\203]oz\1\334\342\344\202\376\377\374\1B\314\347\203\25\274\344\5\0" \ - "\301\350\233\345\364\333\364\371\260\353\366(\307\350\203\25\274\344" \ - "\4\0\276\345\367\375\377\376\377\374\357\374\375\204\25\274\344\203\335" \ - "\366\373\204\25\274\344\3\302\357\367\335\366\373\206\340\363\204\25" \ - "\274\344\1\356\373\374\202\376\377\374\1\0\301\350\203\25\274\344\1\302" \ - "\357\367\203\335\366\373\2\302\357\367\0\304\352\203\25\274\344\1\207" \ - "\341\364\202\376\377\374\1,\311\352\203\25\274\344\5\0\302\351\236\347" \ - "\366\332\363\370\256\350\364#\304\346\203\25\274\344\5\0\302\351\370" \ - "\376\377\376\377\374\370\376\377\0\276\345\203\25\274\344\1w\333\356" \ - "\204\335\366\373\1B\314\347\203\25\274\344\1\231\342\362\202\376\377" \ - "\374\1\0\276\345\203\25\274\344\2m\332\361\334\365\372\203\335\366\373" \ - "\1I\320\354\203\25\274\344\1\206\340\363\202\376\377\374\1i\326\356\203" \ - "\25\274\344\5\0\276\345\206\340\363\323\364\367\273\354\3711\313\354" \ - "\204\25\274\344\1\335\366\373\202\376\377\374\1,\311\352\203\25\274\344" \ - "\2L\322\356\332\363\370\203\335\366\373\1n\333\362\203\25\274\344\1k" \ - "\327\357\226\376\377\374\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\223\377\377\377\226\376\377\374\1\324\331\333\203]oz\2cu\200\353" \ - "\360\363\203\376\377\374\1\307\315\317\203]oz\4as~\372\374\371\376\377" \ - "\374\306\314\316\203]oz\1\202\221\227\205\376\377\374\1hz\205\203]oz" \ - "\3\341\346\351\376\377\374\347\355\357\203]oz\2^p{\335\343\345\203\376" \ - "\377\374\1\333\340\343\204]oz\3\347\355\357\376\377\374\330\335\340\203" \ - "]oz\1m\200\213\205\376\377\374\1~\215\223\203]oz\4\313\320\322\376\377" \ - "\374\370\376\377\31\275\345\203\25\274\344\1\256\350\364\203\376\377" \ - "\374\2\336\367\374\0\276\345\203\25\274\344\3\274\355\373\376\377\374" \ - "\357\374\375\204\25\274\344\203\376\377\374\204\25\274\344\1\336\367" \ - "\374\202\376\377\374\1\0\301\350\203\25\274\344\1\323\364\367\202\376" \ - "\377\374\1\0\301\350\203\25\274\344\1\336\367\374\204\376\377\374\1n" \ - "\333\362\203\25\274\344\3m\332\361\376\377\374\356\373\374\204\25\274" \ - "\344\1\274\355\373\203\376\377\374\2\323\364\367\0\276\345\203\25\274" \ - "\344\3\315\362\373\376\377\374\335\366\373\203\25\274\344\2\0\276\345" \ - "\370\376\377\204\376\377\374\1I\320\354\203\25\274\344\3\231\342\362" \ - "\376\377\374\366\373\376\204\25\274\344\1\366\373\376\204\376\377\374" \ - "\1M\323\357\203\25\274\344\1\206\340\363\202\376\377\374\1%\305\347\203" \ - "\25\274\344\1\207\341\364\203\376\377\374\2\360\375\376\0\304\352\203" \ - "\25\274\344\1\233\345\364\202\376\377\374\1\0\301\350\203\25\274\344" \ - "\1\323\364\367\204\376\377\374\1\206\340\363\203\25\274\344\1k\327\357" \ - "\226\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377\223" \ - "\377\377\377\226\376\377\374\1\303\310\313\203]oz\1\204\223\231\204\376" \ - "\377\374\2\370\372\367_q|\203]oz\3\354\361\364\376\377\374\306\314\316" \ - "\203]oz\1\202\221\227\205\376\377\374\1m\200\213\203]oz\3\341\346\351" \ - "\376\377\374\326\333\335\203]oz\1n\201\214\205\376\377\374\1l\177\212" \ - "\203]oz\3\327\334\337\376\377\374\330\335\340\203]oz\1m\200\213\205\376" \ - "\377\374\1\202\221\227\203]oz\3\306\314\316\376\377\374\337\370\375\203" \ - "\25\274\344\2\31\275\345\370\376\377\204\376\377\374\1""3\314\355\203" \ - "\25\274\344\3\236\347\366\376\377\374\357\374\375\204\25\274\344\203" \ - "\376\377\374\204\25\274\344\1\336\367\374\202\376\377\374\1#\304\346" \ - "\203\25\274\344\1\316\363\374\202\376\377\374\1\0\301\350\203\25\274" \ - "\344\1\336\367\374\204\376\377\374\1w\333\356\203\25\274\344\3k\327\357" \ - "\376\377\374\315\362\373\203\25\274\344\1\0\301\350\205\376\377\374\1" \ - "*\310\351\203\25\274\344\3\261\354\367\376\377\374\316\363\374\203\25" \ - "\274\344\1\0\301\350\205\376\377\374\1I\320\354\203\25\274\344\3\231" \ - "\342\362\376\377\374\357\374\375\204\25\274\344\205\376\377\374\1M\323" \ - "\357\203\25\274\344\1\206\340\363\202\376\377\374\1\31\275\345\203\25" \ - "\274\344\1\335\366\373\204\376\377\374\1M\323\357\203\25\274\344\1\203" \ - "\334\360\202\376\377\374\1\0\301\350\203\25\274\344\1\336\367\374\204" \ - "\376\377\374\1\206\340\363\203\25\274\344\1k\327\357\226\376\377\374" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\223\377\377\377\226" \ - "\376\377\374\1\277\304\306\203]oz\1\211\230\236\205\376\377\374\1ew\202" \ - "\203]oz\3\352\357\362\376\377\374\306\314\316\203]oz\1\202\221\227\205" \ - "\376\377\374\1m\200\213\203]oz\3\341\346\351\376\377\374\317\324\327" \ - "\203]oz\1as~\205o\202\215\1as~\203]oz\3\317\324\327\376\377\374\330\335" \ - "\340\203]oz\1m\200\213\205\376\377\374\1\202\221\227\203]oz\3\306\314" \ - "\316\376\377\374\336\367\374\203\25\274\344\1\0\276\345\205%\305\347" \ - "\1\0\276\345\203\25\274\344\3\231\342\362\376\377\374\357\374\375\204" \ - "\25\274\344\203\376\377\374\204\25\274\344\1\336\367\374\202\376\377" \ - "\374\1#\304\346\203\25\274\344\1\316\363\374\202\376\377\374\1\0\301" \ - "\350\203\25\274\344\1\336\367\374\204\376\377\374\1w\333\356\203\25\274" \ - "\344\3k\327\357\376\377\374\302\357\367\203\25\274\344\1\31\275\345\205" \ - "%\305\347\1\0\276\345\203\25\274\344\3\237\350\367\376\377\374\316\363" \ - "\374\203\25\274\344\1\0\301\350\205\376\377\374\1I\320\354\203\25\274" \ - "\344\3\231\342\362\376\377\374\357\374\375\204\25\274\344\205\376\377" \ - "\374\1M\323\357\203\25\274\344\1\206\340\363\202\376\377\374\204\25\274" \ - "\344\1#\304\346\204%\305\347\1\0\301\350\203\25\274\344\1w\333\356\202" \ - "\376\377\374\1\0\301\350\203\25\274\344\1\336\367\374\204\376\377\374" \ - "\1\206\340\363\203\25\274\344\1k\327\357\226\376\377\374\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\223\377\377\377\226\376\377\374" \ - "\1\277\304\306\203]oz\1\211\230\236\205\376\377\374\1ew\202\203]oz\3" \ - "\352\357\362\376\377\374\306\314\316\203]oz\1\202\221\227\205\376\377" \ - "\374\1m\200\213\203]oz\3\341\346\351\376\377\374\317\324\327\215]oz\3" \ - "\317\324\327\376\377\374\330\335\340\203]oz\1m\200\213\205\376\377\374" \ - "\1\202\221\227\203]oz\3\306\314\316\376\377\374\336\367\374\215\25\274" \ - "\344\3\231\342\362\376\377\374\357\374\375\204\25\274\344\203\376\377" \ - "\374\204\25\274\344\1\336\367\374\202\376\377\374\1#\304\346\203\25\274" \ - "\344\1\316\363\374\202\376\377\374\1\0\301\350\203\25\274\344\1\336\367" \ - "\374\204\376\377\374\1w\333\356\203\25\274\344\3k\327\357\376\377\374" \ - "\302\357\367\215\25\274\344\3\237\350\367\376\377\374\316\363\374\203" \ - "\25\274\344\1\0\301\350\205\376\377\374\1I\320\354\203\25\274\344\3\231" \ - "\342\362\376\377\374\357\374\375\204\25\274\344\205\376\377\374\1M\323" \ - "\357\203\25\274\344\1\206\340\363\202\376\377\374\215\25\274\344\1w\333" \ - "\356\202\376\377\374\1\0\301\350\203\25\274\344\1\336\367\374\204\376" \ - "\377\374\1\206\340\363\203\25\274\344\1k\327\357\226\376\377\374\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\223\377\377\377\226\376" \ - "\377\374\1\277\304\306\203]oz\1\211\230\236\205\376\377\374\1ew\202\203" \ - "]oz\3\352\357\362\376\377\374\306\314\316\203]oz\1\202\221\227\205\376" \ - "\377\374\1m\200\213\203]oz\3\341\346\351\376\377\374\317\324\327\215" \ - "]oz\3\317\324\327\376\377\374\330\335\340\203]oz\1m\200\213\205\376\377" \ - "\374\1\202\221\227\203]oz\3\306\314\316\376\377\374\336\367\374\215\25" \ - "\274\344\3\231\342\362\376\377\374\357\374\375\204\25\274\344\203\376" \ - "\377\374\204\25\274\344\1\336\367\374\202\376\377\374\1#\304\346\203" \ - "\25\274\344\1\316\363\374\202\376\377\374\1\0\301\350\203\25\274\344" \ - "\1\336\367\374\204\376\377\374\1w\333\356\203\25\274\344\3k\327\357\376" \ - "\377\374\302\357\367\215\25\274\344\3\237\350\367\376\377\374\316\363" \ - "\374\203\25\274\344\1\0\301\350\205\376\377\374\1I\320\354\203\25\274" \ - "\344\3\231\342\362\376\377\374\357\374\375\204\25\274\344\205\376\377" \ - "\374\1M\323\357\203\25\274\344\1\206\340\363\202\376\377\374\215\25\274" \ - "\344\1w\333\356\202\376\377\374\1\0\301\350\203\25\274\344\1\336\367" \ - "\374\204\376\377\374\1\206\340\363\203\25\274\344\1k\327\357\226\376" \ - "\377\374\377\377\377\377\377\377\377\377\377\377\377\377\223\377\377" \ - "\377\226\376\377\374\1\277\304\306\203]oz\1\211\230\236\205\376\377\374" \ - "\1ew\202\203]oz\3\352\357\362\376\377\374\306\314\316\203]oz\1\202\221" \ - "\227\205\376\377\374\1m\200\213\203]oz\3\341\346\351\376\377\374\317" \ - "\324\327\215]oz\3\317\324\327\376\377\374\330\335\340\203]oz\1m\200\213" \ - "\205\376\377\374\1\202\221\227\203]oz\3\306\314\316\376\377\374\336\367" \ - "\374\215\25\274\344\3\231\342\362\376\377\374\357\374\375\204\25\274" \ - "\344\203\376\377\374\204\25\274\344\1\336\367\374\202\376\377\374\1#" \ - "\304\346\203\25\274\344\1\316\363\374\202\376\377\374\1\0\301\350\203" \ - "\25\274\344\1\336\367\374\204\376\377\374\1w\333\356\203\25\274\344\3" \ - "k\327\357\376\377\374\302\357\367\215\25\274\344\3\237\350\367\376\377" \ - "\374\316\363\374\203\25\274\344\1\0\301\350\205\376\377\374\1I\320\354" \ - "\203\25\274\344\3\231\342\362\376\377\374\357\374\375\204\25\274\344" \ - "\205\376\377\374\1M\323\357\203\25\274\344\1\206\340\363\202\376\377" \ - "\374\215\25\274\344\1w\333\356\202\376\377\374\1\0\301\350\203\25\274" \ - "\344\1\336\367\374\204\376\377\374\1\206\340\363\203\25\274\344\1k\327" \ - "\357\226\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\223\377\377\377\226\376\377\374\1\300\305\310\203]oz\1\211\230\236\205" \ - "\376\377\374\1bt\177\203]oz\3\352\357\362\376\377\374\306\314\316\203" \ - "]oz\1\202\221\227\205\376\377\374\1m\200\213\203]oz\3\341\346\351\376" \ - "\377\374\317\324\327\203]oz\1p\203\216\211\335\343\345\3\366\370\364" \ - "\376\377\374\330\335\340\203]oz\1m\200\213\205\376\377\374\1\202\221" \ - "\227\203]oz\3\306\314\316\376\377\374\336\367\374\203\25\274\344\1\0" \ - "\276\345\211\314\361\372\3\350\371\377\376\377\374\357\374\375\204\25" \ - "\274\344\203\376\377\374\204\25\274\344\1\336\367\374\202\376\377\374" \ - "\1#\304\346\203\25\274\344\1\316\363\374\202\376\377\374\1\0\301\350" \ - "\203\25\274\344\1\336\367\374\204\376\377\374\1w\333\356\203\25\274\344" \ - "\3k\327\357\376\377\374\302\357\367\203\25\274\344\1\0\302\351\211\314" \ - "\361\372\3\356\373\374\376\377\374\316\363\374\203\25\274\344\1\0\301" \ - "\350\205\376\377\374\1I\320\354\203\25\274\344\3\231\342\362\376\377" \ - "\374\357\374\375\204\25\274\344\205\376\377\374\1M\323\357\203\25\274" \ - "\344\1\206\340\363\202\376\377\374\204\25\274\344\1\301\356\366\210\314" \ - "\361\372\1\337\370\375\202\376\377\374\1\0\301\350\203\25\274\344\1\336" \ - "\367\374\204\376\377\374\1\206\340\363\203\25\274\344\1k\327\357\226" \ - "\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377\223\377" \ - "\377\377\226\376\377\374\1\314\321\324\203]oz\2l\177\212\372\374\371" \ - "\203\376\377\374\1\333\340\343\203]oz\4^p{\366\373\376\376\377\374\306" \ - "\314\316\203]oz\1\202\221\227\205\376\377\374\1k~\211\203]oz\3\341\346" \ - "\351\376\377\374\320\326\330\203]oz\1t\207\222\213\376\377\374\1\330" \ - "\335\340\203]oz\1m\200\213\205\376\377\374\1\202\221\227\203]oz\3\306" \ - "\314\316\376\377\374\336\367\374\203\25\274\344\1\0\276\345\213\376\377" \ - "\374\1\357\374\375\204\25\274\344\203\376\377\374\204\25\274\344\1\336" \ - "\367\374\202\376\377\374\1#\304\346\203\25\274\344\1\316\363\374\202" \ - "\376\377\374\1\0\301\350\203\25\274\344\1\336\367\374\204\376\377\374" \ - "\1n\333\362\203\25\274\344\3k\327\357\376\377\374\303\361\370\203\25" \ - "\274\344\1\0\304\352\213\376\377\374\1\332\363\370\203\25\274\344\1\0" \ - "\276\345\205\376\377\374\1I\320\354\203\25\274\344\3\231\342\362\376" \ - "\377\374\357\374\375\204\25\274\344\1\370\376\377\204\376\377\374\1M" \ - "\323\357\203\25\274\344\1\206\340\363\202\376\377\374\204\25\274\344" \ - "\1\356\373\374\213\376\377\374\1\0\301\350\203\25\274\344\1\335\366\373" \ - "\204\376\377\374\1\206\340\363\203\25\274\344\1k\327\357\226\376\377" \ - "\374\377\377\377\377\377\377\377\377\377\377\377\377\223\377\377\377" \ - "\226\376\377\374\2\353\360\363^p{\203]oz\5\236\246\256\366\373\376\376" \ - "\377\374\347\355\357w\212\226\203]oz\1~\215\223\202\376\377\374\1\306" \ - "\314\316\203]oz\1\202\221\227\204\376\377\374\2\335\343\345^p{\203]o" \ - "z\3\351\356\360\376\377\374\335\343\345\203]oz\2bt\177\343\350\353\212" \ - "\376\377\374\1\330\335\340\203]oz\1m\200\213\205\376\377\374\1\202\221" \ - "\227\203]oz\3\306\314\316\376\377\374\356\373\374\204\25\274\344\1\274" \ - "\355\373\212\376\377\374\1\357\374\375\204\25\274\344\203\376\377\374" \ - "\204\25\274\344\1\336\367\374\202\376\377\374\1#\304\346\203\25\274\344" \ - "\1\316\363\374\202\376\377\374\1\0\301\350\203\25\274\344\1\336\367\374" \ - "\203\376\377\374\2\367\375\377/\312\353\203\25\274\344\3\204\335\361" \ - "\376\377\374\334\365\372\203\25\274\344\2\0\276\345\314\361\372\212\376" \ - "\377\374\1\356\373\374\204\25\274\344\1\274\355\373\204\376\377\374\1" \ - "I\320\354\203\25\274\344\4\231\342\362\376\377\374\370\376\377\0\276" \ - "\345\203\25\274\344\1\257\351\365\204\376\377\374\1M\323\357\203\25\274" \ - "\344\1\206\340\363\202\376\377\374\1\0\301\350\203\25\274\344\1\233\345" \ - "\364\213\376\377\374\1#\304\346\203\25\274\344\1\207\341\364\204\376" \ - "\377\374\1\206\340\363\203\25\274\344\1k\327\357\226\376\377\374\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\223\377\377\377\227\376" \ - "\377\374\1\211\230\236\204]oz\3cu\200p\203\216^p{\204]oz\1\277\304\306" \ - "\202\376\377\374\1\306\314\316\203]oz\1dv\201\203~\215\223\2v\211\225" \ - "as~\203]oz\1n\201\214\202\376\377\374\2\371\373\370dv\201\203]oz\2bt" \ - "\177w\212\226\205~\215\223\2\203\222\230\304\311\314\202\376\377\374" \ - "\1\330\335\340\203]oz\1m\200\213\205\376\377\374\1\202\221\227\203]o" \ - "z\1\306\314\316\202\376\377\374\1(\307\350\203\25\274\344\2\0\276\345" \ - "*\310\351\205,\311\352\2""1\313\354\207\341\364\202\376\377\374\1\357" \ - "\374\375\204\25\274\344\203\376\377\374\204\25\274\344\1\336\367\374" \ - "\202\376\377\374\1#\304\346\203\25\274\344\1\316\363\374\202\376\377" \ - "\374\1\0\301\350\203\25\274\344\1*\310\351\203,\311\352\1\0\302\351\204" \ - "\25\274\344\4\274\355\373\376\377\374\370\376\377\0\302\351\203\25\274" \ - "\344\2\31\275\345*\310\351\205,\311\352\2B\314\347\231\342\362\203\376" \ - "\377\374\1%\305\347\203\25\274\344\2\0\276\345*\310\351\203,\311\352" \ - "\1\0\301\350\203\25\274\344\1\231\342\362\202\376\377\374\1/\312\353" \ - "\203\25\274\344\2\0\276\345*\310\351\203,\311\352\1\0\301\350\203\25" \ - "\274\344\1\206\340\363\202\376\377\374\1G\317\353\204\25\274\344\1(\307" \ - "\350\205,\311\352\3""1\313\354w\333\356\370\376\377\202\376\377\374\1" \ - "M\323\357\204\25\274\344\1(\307\350\203,\311\352\1\0\304\352\203\25\274" \ - "\344\1k\327\357\226\376\377\374\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\223\377\377\377\227\376\377\374\2\343\350\353ew\202\211]oz\2" \ - "\177\216\224\373\375\372\202\376\377\374\1\306\314\316\214]oz\1\270\300" \ - "\311\203\376\377\374\1\253\263\273\213]oz\4_q|\352\357\362\376\377\374" \ - "\330\335\340\203]oz\1m\200\213\205\376\377\374\1\202\221\227\203]oz\1" \ - "\306\314\316\202\376\377\374\1\233\345\364\214\25\274\344\3\301\356\366" \ - "\376\377\374\357\374\375\204\25\274\344\203\376\377\374\204\25\274\344" \ - "\1\336\367\374\202\376\377\374\1#\304\346\203\25\274\344\1\316\363\374" \ - "\202\376\377\374\1\0\301\350\213\25\274\344\2,\311\352\370\376\377\202" \ - "\376\377\374\1\206\340\363\214\25\274\344\1\316\363\374\202\376\377\374" \ - "\1\233\345\364\214\25\274\344\1\231\342\362\202\376\377\374\1\250\347" \ - "\371\214\25\274\344\1\206\340\363\202\376\377\374\1\273\354\371\214\25" \ - "\274\344\1\236\347\366\202\376\377\374\2\313\360\371\0\276\345\213\25" \ - "\274\344\1k\327\357\226\376\377\374\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\223\377\377\377\230\376\377\374\2\325\332\334gy\204\207" \ - "]oz\2x\213\227\354\361\364\203\376\377\374\1\306\314\316\213]oz\1\225" \ - "\235\245\204\376\377\374\2\372\374\371~\221\235\213]oz\3\333\340\343" \ - "\376\377\374\342\347\352\203]oz\1t\207\222\205\376\377\374\1\211\230" \ - "\236\203]oz\1\317\324\327\203\376\377\374\1M\323\357\213\25\274\344\4" \ - "\237\350\367\376\377\374\367\375\377\0\276\345\202\25\274\344\1\0\276" \ - "\345\203\376\377\374\1\0\301\350\203\25\274\344\1\357\374\375\202\376" \ - "\377\374\1(\307\350\203\25\274\344\1\335\366\373\202\376\377\374\1\0" \ - "\302\351\212\25\274\344\2\0\301\350\333\364\371\203\376\377\374\2\370" \ - "\376\377G\317\353\213\25\274\344\1\273\354\371\203\376\377\374\1M\323" \ - "\357\213\25\274\344\1\237\350\367\203\376\377\374\1k\327\357\213\25\274" \ - "\344\1\231\342\362\203\376\377\374\1w\333\356\213\25\274\344\1\206\340" \ - "\363\203\376\377\374\1\207\341\364\213\25\274\344\1n\333\362\226\376" \ - "\377\374\377\377\377\377\377\377\377\377\377\377\377\377\223\377\377" \ - "\377\231\376\377\374\3\351\356\360\231\241\251bt\177\203]oz\3k~\211\257" \ - "\267\277\370\372\367\204\376\377\374\1\306\314\316\211]oz\3gy\204\261" \ - "\271\302\373\375\372\205\376\377\374\3\371\373\370\252\262\272dv\201" \ - "\210]oz\2x\213\227\372\374\371\202\376\377\374\4}\220\233]oz^p{\266\277" \ - "\307\205\376\377\374\5\311\316\321_q|]ozq\204\217\370\372\367\203\376" \ - "\377\374\3\370\376\377\211\342\365\0\301\350\210\25\274\344\2\0\304\352" \ - "\356\373\374\202\376\377\374\1M\323\357\202\25\274\344\1m\332\361\203" \ - "\376\377\374\1n\333\362\202\25\274\344\1L\322\356\203\376\377\374\1\206" \ - "\340\363\202\25\274\344\2B\314\347\370\376\377\202\376\377\374\1w\333" \ - "\356\210\25\274\344\3\0\276\345L\322\356\336\367\374\205\376\377\374" \ - "\3\370\376\377\204\335\361\0\301\350\210\25\274\344\2(\307\350\366\373" \ - "\376\203\376\377\374\3\370\376\377\211\342\365\0\301\350\210\25\274\344" \ - "\2#\304\346\356\373\374\204\376\377\374\2\233\345\364\0\302\351\210\25" \ - "\274\344\2\0\302\351\337\370\375\204\376\377\374\2\237\350\367#\304\346" \ - "\210\25\274\344\2\0\301\350\333\364\371\204\376\377\374\2\257\351\365" \ - "%\305\347\210\25\274\344\2\0\276\345\314\361\372\226\376\377\374\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\223\377\377\377\233\376" \ - "\377\374\4\365\372\375\335\343\345\325\332\334\343\350\353\207\376\377" \ - "\374\1\306\314\316\203]oz\1u\210\224\204\324\331\333\2\335\343\345\373" \ - "\375\372\211\376\377\374\2\372\374\371\334\342\344\206\324\331\333\2" \ - "\331\336\341\372\374\371\203\376\377\374\3\373\375\372\332\337\342\343" \ - "\350\353\207\376\377\374\3\351\356\360\330\335\340\366\373\376\206\376" \ - "\377\374\2\370\376\377\316\363\374\206\273\354\371\2\302\357\367\366" \ - "\373\376\204\376\377\374\2\314\361\372\315\362\373\205\376\377\374\2" \ - "\316\363\374\313\360\371\205\376\377\374\3\332\363\370\312\357\370\370" \ - "\376\377\204\376\377\374\1\316\363\374\206\273\354\371\2\302\357\367" \ - "\356\373\374\211\376\377\374\2\370\376\377\314\361\372\206\273\354\371" \ - "\2\302\357\367\367\375\377\206\376\377\374\2\370\376\377\316\363\374" \ - "\206\273\354\371\2\302\357\367\366\373\376\206\376\377\374\2\370\376" \ - "\377\316\363\374\206\273\354\371\2\301\356\366\357\374\375\207\376\377" \ - "\374\1\332\363\370\206\273\354\371\2\301\356\366\356\373\374\207\376" \ - "\377\374\2\333\364\371\274\355\373\205\273\354\371\2\274\355\373\350" \ - "\371\377\227\376\377\374\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\223\377\377\377\246\376\377\374\1\306\314\316\203]oz\1\202\221\227" \ - "\377\376\377\374\306\376\377\374\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\223\377\377\377\246\376\377\374\1\306\314\316\203]oz\1\202" \ - "\221\227\377\376\377\374\306\376\377\374\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\223\377\377\377\246\376\377\374\1\306\314\316\203" \ - "]oz\1\202\221\227\377\376\377\374\306\376\377\374\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\223\377\377\377\246\376\377\374\1\306\314" \ - "\316\203]oz\1\202\221\227\377\376\377\374\306\376\377\374\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\223\377\377\377\246\376\377\374" \ - "\1\315\322\325\203]oz\1\211\230\236\377\376\377\374\306\376\377\374\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\223\377\377\377\246\376" \ - "\377\374\2\360\366\370i{\206\202]oz\1\302\307\312\377\376\377\374\306" \ - "\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377\223\377" \ - "\377\377\247\376\377\374\3\357\365\367\313\320\322\335\343\345\377\376" \ - "\377\374\307\376\377\374\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\223\377\377\377\377\376\377\374\361\376\377\374\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\223\377\377\377\377\376\377\374\361" \ - "\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377\223\377" \ - "\377\377\377\376\377\374\361\376\377\374\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\223\377\377\377\377\376\377\374\361\376\377\374" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\223\377\377\377\377" \ - "\376\377\374\361\376\377\374\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\223\377\377\377\377\376\377\374\361\376\377\374\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\223\377\377\377\377\376\377\374" \ - "\361\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377\223" \ - "\377\377\377\377\376\377\374\361\376\377\374\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\223\377\377\377\377\376\377\374\361\376\377" \ - "\374\377\377\377\377\377\377\377\377\377\377\377\377\223\377\377\377" \ - "\377\376\377\374\361\376\377\374\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\223\377\377\377\377\376\377\374\361\376\377\374\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\223\377\377\377\377\376\377" \ - "\374\361\376\377\374\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\223\377\377\377\377\376\377\374\361\376\377\374\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\223\377\377\377\377\376\377\374\361\376" \ - "\377\374\377\377\377\377\377\377\377\377\377\377\377\377\223\377\377" \ - "\377\377\376\377\374\361\376\377\374\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\223\377\377\377\377\376\377\374\361\376\377\374\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\223\377\377\377\377\376" \ - "\377\374\361\376\377\374\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" \ - "\377\377\377\377\232\377\377\377") - - diff --git a/poky/meta/recipes-core/psplash/files/psplash-poky-img.png b/poky/meta/recipes-core/psplash/files/psplash-poky-img.png Binary files differnew file mode 100644 index 0000000000..239db1186e --- /dev/null +++ b/poky/meta/recipes-core/psplash/files/psplash-poky-img.png diff --git a/poky/meta/recipes-core/psplash/files/psplash-poky-img.svg b/poky/meta/recipes-core/psplash/files/psplash-poky-img.svg new file mode 100644 index 0000000000..8d953983a9 --- /dev/null +++ b/poky/meta/recipes-core/psplash/files/psplash-poky-img.svg @@ -0,0 +1,116 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + width="1280mm" + height="800mm" + viewBox="0 0 1280 800" + version="1.1" + id="svg5" + inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)" + sodipodi:docname="psplash-poky-img.svg" + inkscape:export-filename="/home/mike/work/yocto/poky/meta/recipes-core/psplash/files/psplash-poky-img.png" + inkscape:export-xdpi="25.4" + inkscape:export-ydpi="25.4" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + <sodipodi:namedview + id="namedview7" + pagecolor="#ecece1" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageshadow="2" + inkscape:pageopacity="0" + inkscape:pagecheckerboard="0" + inkscape:document-units="mm" + showgrid="false" + units="mm" + inkscape:zoom="0.093984989" + inkscape:cx="2489.7593" + inkscape:cy="1005.4797" + inkscape:window-width="1654" + inkscape:window-height="1016" + inkscape:window-x="74" + inkscape:window-y="27" + inkscape:window-maximized="1" + inkscape:current-layer="layer1" /> + <defs + id="defs2" /> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1"> + <g + id="g10" + transform="matrix(0.90740741,0,0,-0.90740791,444,460.88448)" + style="stroke-width:0.0971934"> + <g + id="g12" + transform="scale(0.1)" + style="stroke-width:0.0971934"> + <path + inkscape:connector-curvature="0" + d="m 4320,994.227 c 0,-45.723 -36.96,-82.813 -82.81,-82.813 -45.72,0 -82.68,37.09 -82.68,82.813 0,45.713 36.96,82.793 82.68,82.793 45.85,0 82.81,-37.08 82.81,-82.793 v 0" + style="fill:#4597d9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0971934" + id="path14" /> + <path + inkscape:connector-curvature="0" + d="M 796.738,1353.54 676.184,1421.84 433.375,929.832 174.371,1421.84 52.2461,1353.54 360.098,775.184 c -2.223,-5.477 -9.274,-20.625 -21.157,-45.704 -12.011,-23.906 -24.429,-47.792 -37.488,-71.718 -22.859,-41.274 -46.105,-74.84 -70.004,-100.961 -23.906,-27.16 -48.336,-48.84 -73.406,-65.172 C 133.098,475.301 107.105,462.898 79.9375,454.148 53.8125,445.52 27.168,438.461 0,432.98 L 55.5117,317.25 c 17.375,2.23 40.6211,7.719 70.0113,16.332 30.43,7.578 63.477,22.328 99.395,44.02 35.785,21.679 72.227,52.636 109.059,92.859 38.14,40.23 73.406,93.391 105.925,159.609 l 356.836,723.47" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0971934" + id="path16" /> + <path + inkscape:connector-curvature="0" + d="m 1455.8,993.445 c 0,-38.007 -6.52,-73.281 -19.59,-105.929 -13.07,-32.52 -30.96,-60.868 -53.68,-84.637 -21.81,-22.852 -47.8,-41.27 -78.23,-55.508 -29.4,-12.93 -61.39,-19.453 -96.14,-19.453 -34.74,0 -67.39,6.523 -97.69,19.453 -30.43,14.238 -57.08,32.656 -79.94,55.508 -21.68,23.769 -39.046,52.117 -52.112,84.637 -13.059,32.648 -19.59,67.922 -19.59,105.929 0,38.005 6.531,73.265 19.59,105.895 13.066,32.55 30.432,60.77 52.112,84.68 22.86,23.9 49.51,42.43 79.94,55.36 30.3,14.26 62.95,21.31 97.69,21.31 34.75,0 66.74,-7.05 96.14,-21.31 30.43,-12.93 56.42,-31.46 78.23,-55.36 22.72,-23.91 40.61,-52.13 53.68,-84.68 13.07,-32.63 19.59,-67.89 19.59,-105.895 m 151.51,0 c 0,56.425 -10.32,109.185 -30.95,158.035 -19.59,48.85 -47.28,91.18 -83.07,127.08 -35.92,35.8 -78.23,63.48 -127.08,83.08 -48.85,20.61 -101.62,30.95 -158.05,30.95 -56.42,0 -109.2,-10.34 -158.04,-30.95 -48.84,-19.6 -91.292,-47.28 -127.085,-83.08 -35.789,-35.9 -64.129,-78.23 -84.765,-127.08 -20.633,-48.85 -30.946,-101.61 -30.946,-158.035 0,-56.425 10.313,-109.199 30.946,-158.047 20.636,-47.804 48.976,-89.589 84.765,-125.39 35.793,-35.918 78.245,-64.121 127.085,-84.77 48.84,-19.59 101.62,-29.386 158.04,-29.386 56.43,0 109.2,9.796 158.05,29.386 48.85,20.649 91.16,48.852 127.08,84.77 35.79,35.801 63.48,77.586 83.07,125.39 20.63,48.848 30.95,101.622 30.95,158.047" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0971934" + id="path18" /> + <path + inkscape:connector-curvature="0" + d="m 3599.29,993.445 c 0,-38.007 -6.54,-73.281 -19.6,-105.929 -13.07,-32.52 -30.95,-60.868 -53.82,-84.637 -21.68,-22.852 -47.67,-41.27 -78.1,-55.508 -29.39,-12.93 -61.39,-19.453 -96.13,-19.453 -34.75,0 -67.4,6.523 -97.83,19.453 -30.3,14.238 -56.94,32.656 -79.8,55.508 -21.69,23.769 -39.06,52.117 -52.12,84.637 -13.06,32.648 -19.6,67.922 -19.6,105.929 0,38.005 6.54,73.265 19.6,105.895 13.06,32.55 30.43,60.77 52.12,84.68 22.86,23.9 49.5,42.43 79.8,55.36 30.43,14.26 63.08,21.31 97.83,21.31 34.74,0 66.74,-7.05 96.13,-21.31 30.43,-12.93 56.42,-31.46 78.1,-55.36 22.87,-23.91 40.75,-52.13 53.82,-84.68 13.06,-32.63 19.6,-67.89 19.6,-105.895 m 151.5,0 c 0,56.425 -10.32,109.185 -30.96,158.035 -19.59,48.85 -47.28,91.18 -83.06,127.08 -35.92,35.8 -78.23,63.48 -127.09,83.08 -48.85,20.61 -101.61,30.95 -158.04,30.95 -56.56,0 -109.19,-10.34 -158.05,-30.95 -48.84,-19.6 -91.3,-47.28 -127.08,-83.08 -35.79,-35.9 -64.13,-78.23 -84.77,-127.08 -20.63,-48.85 -30.95,-101.61 -30.95,-158.035 0,-56.425 10.32,-109.199 30.95,-158.047 20.64,-47.804 48.98,-89.589 84.77,-125.39 35.78,-35.918 78.24,-64.121 127.08,-84.77 48.86,-19.59 101.49,-29.386 158.05,-29.386 56.43,0 109.19,9.796 158.04,29.386 48.86,20.649 91.17,48.852 127.09,84.77 35.78,35.801 63.47,77.586 83.06,125.39 20.64,48.848 30.96,101.622 30.96,158.047" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0971934" + id="path20" /> + <path + inkscape:connector-curvature="0" + d="m 2676.51,1639.06 -145.11,-81.49 v -178.19 h -392.37 c -283.29,0 -454,-138.02 -454,-389.47 0,-390.531 406.85,-464.199 696.16,-324.57 l -60.99,118.34 c -228.97,-100.039 -482.49,-57.461 -482.49,208.847 0,171.893 89.48,265.933 297.8,265.933 H 2531.4 V 783.68 c 0,-209.899 240.45,-214.59 389.48,-128.535 l -57.34,113.261 c -95.87,-48.593 -187.03,-54.863 -187.03,38.262 v 451.792 h 198.53 v 120.92 h -198.53 v 259.68 0" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0971934" + id="path22" /> + <path + inkscape:connector-curvature="0" + d="m 1037.58,233.66 h 36.32 c 18.29,0.141 36.18,-12.93 36.18,-31.469 0,-31.089 -35.01,-35.8 -35.01,-35.8 l -37.49,-0.25 z m -52.365,44.41 V 3.91016 h 52.365 l 0.66,115.60984 c 93.38,-5.879 128.26,26.64 128.26,83.96 0,51.469 -46.11,74.59 -90.39,74.59 h -90.895 v 0" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0971934" + id="path24" /> + <path + inkscape:connector-curvature="0" + d="m 1986.62,140.809 c 0,-13.34 -2.49,-25.879 -7.45,-37.5 -4.58,-11.227 -11.1,-21.1488 -19.6,-29.6488 -8.49,-8.4805 -18.41,-15.1407 -29.78,-20.1211 -11.23,-4.5703 -23.5,-6.9102 -36.57,-6.9102 -13.19,0 -25.47,2.3399 -36.7,6.9102 -11.36,4.9804 -21.29,11.6406 -29.78,20.1211 -8.22,8.5 -14.76,18.4218 -19.59,29.6488 -4.96,11.621 -7.44,24.16 -7.44,37.5 0,13.32 2.48,25.722 7.44,37.089 4.83,11.481 11.37,21.543 19.59,30.043 8.49,8.469 18.42,15.02 29.78,19.719 11.23,4.828 23.51,7.309 36.7,7.309 13.07,0 25.34,-2.481 36.57,-7.309 11.37,-4.699 21.29,-11.25 29.78,-19.719 8.5,-8.5 15.02,-18.562 19.6,-30.043 4.96,-11.367 7.45,-23.769 7.45,-37.089 m 53.16,0 c 0,19.589 -3.8,37.871 -11.5,54.839 -7.45,17.25 -17.9,32.133 -31.35,44.672 -13.06,12.68 -28.61,22.602 -46.63,29.782 -17.76,7.468 -36.96,11.238 -57.47,11.238 -20.63,0 -39.96,-3.77 -57.99,-11.238 -17.76,-7.18 -33.17,-17.102 -46.24,-29.782 -13.19,-12.539 -23.5,-27.422 -31.34,-44.672 -7.46,-16.968 -11.11,-35.25 -11.11,-54.839 0,-19.868 3.65,-38.278 11.11,-55.2582 7.84,-16.9922 18.15,-31.8711 31.34,-44.6602 13.07,-12.6797 28.48,-22.6015 46.24,-29.789 18.03,-7.19144 37.36,-10.839881 57.99,-10.839881 20.51,0 39.71,3.648441 57.47,10.839881 18.02,7.1875 33.57,17.1093 46.63,29.789 13.45,12.7891 23.9,27.668 31.35,44.6602 7.7,16.9802 11.5,35.3902 11.5,55.2582" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0971934" + id="path26" /> + <path + inkscape:connector-curvature="0" + d="M 2253.58,277.57 V 69.75 c 0,-8.3594 -6.14,-17.6289 -16.32,-17.8906 l -16.32,-0.6602 0.91,-50.937481 15.28,-0.2500002 C 2288.33,-0.769531 2306.08,47.4102 2306.08,69.8906 V 277.16" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0971934" + id="path28" /> + <path + inkscape:connector-curvature="0" + d="M 2699.76,278.211 H 2524.99 V 4.96875 h 175.55 l -0.78,44.00005 H 2577.5 v 71.3322 h 102.28 v 44 H 2577.5 v 69.109 h 121.47 l 0.79,44.801" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0971934" + id="path30" /> + <path + inkscape:connector-curvature="0" + d="m 3102.69,212.641 c -89.46,49.109 -177.63,19.32 -177.63,-70.661 0,-72.4995 69.62,-128.2612 184.16,-68.3198 l 16.59,-44.7891 C 3015.83,-31.5898 2871.12,11.4883 2871.12,141.98 c 0,118.2 128.39,179.731 253.12,114.942 l -21.55,-44.281" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0971934" + id="path32" /> + <path + inkscape:connector-curvature="0" + d="m 3521.83,278.211 0.12,-44.801 h -87.24 V 4.19141 H 3382.2 V 233.41 h -83.71 l 1.17,44.801 h 222.17" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0971934" + id="path34" /> + <path + inkscape:connector-curvature="0" + d="m 1426.42,233.66 h 36.31 c 18.29,0.141 36.18,-12.93 36.18,-31.469 0,-31.089 -35,-35.8 -35,-35.8 l -37.49,-0.25 z m -52.25,44.41 V 3.91016 h 52.25 V 121.859 h 34.62 L 1521.63,3.91016 h 59.56 L 1508.96,136.102 c 28.61,12.789 43.5,35.269 43.5,67.378 0,53.559 -46.89,74.59 -98.49,74.59 h -79.8 v 0" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0971934" + id="path36" /> + </g> + </g> + </g> +</svg> diff --git a/poky/meta/recipes-core/psplash/psplash_git.bb b/poky/meta/recipes-core/psplash/psplash_git.bb index e590eb978f..78960e1e4c 100644 --- a/poky/meta/recipes-core/psplash/psplash_git.bb +++ b/poky/meta/recipes-core/psplash/psplash_git.bb @@ -16,7 +16,7 @@ SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master;protocol=https \ ${SPLASH_IMAGES}" UPSTREAM_CHECK_COMMITS = "1" -SPLASH_IMAGES = "file://psplash-poky-img.h;outsuffix=default" +SPLASH_IMAGES = "file://psplash-poky-img.png;outsuffix=default" python __anonymous() { oldpkgs = d.getVar("PACKAGES").split() diff --git a/poky/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/obsolete_automake_macros.patch b/poky/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/obsolete_automake_macros.patch deleted file mode 100644 index 9d828d7026..0000000000 --- a/poky/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/obsolete_automake_macros.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Submitted [http://sourceforge.net/tracker/?func=detail&aid=3600345&group_id=44427&atid=439544] - -Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> -diff -Nurd sysfsutils-2.1.0/configure.ac sysfsutils-2.1.0/configure.ac ---- sysfsutils-2.1.0/configure.ac 2006-08-07 08:08:00.000000000 +0300 -+++ sysfsutils-2.1.0/configure.ac 2013-01-11 08:13:08.651550634 +0200 -@@ -2,7 +2,7 @@ - AC_INIT(sysfsutils, 2.1.0, linux-diag-devel@lists.sourceforge.net) - AM_INIT_AUTOMAKE - AC_CONFIG_SRCDIR([config.h.in]) --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - - # Checks for KLIBC support (should be before AC_PROG_LIBTOOL and AC_PROG_CC) - AC_CHECK_KLIBC diff --git a/poky/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/separatebuild.patch b/poky/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/separatebuild.patch deleted file mode 100644 index 82e725e2ac..0000000000 --- a/poky/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/separatebuild.patch +++ /dev/null @@ -1,65 +0,0 @@ -Upstream-Status: Pending - -Fix out of tree build issues so ${B} != ${S} works. - -RP 2013/03/18 - -Index: sysfsutils-2.1.0/cmd/Makefile.am -=================================================================== ---- sysfsutils-2.1.0.orig/cmd/Makefile.am 2013-03-08 08:57:27.224556508 +0000 -+++ sysfsutils-2.1.0/cmd/Makefile.am 2013-03-08 08:57:27.480556502 +0000 -@@ -1,6 +1,6 @@ - bin_PROGRAMS = systool - systool_SOURCES = systool.c names.c names.h --INCLUDES = -I../include -+INCLUDES = -I$(srcdir)/../include - LDADD = ../lib/libsysfs.la - EXTRA_CFLAGS = @EXTRA_CFLAGS@ - AM_CFLAGS = -Wall -W -Wstrict-prototypes $(EXTRA_CFLAGS) -Index: sysfsutils-2.1.0/lib/Makefile.am -=================================================================== ---- sysfsutils-2.1.0.orig/lib/Makefile.am 2013-03-08 08:57:27.224556508 +0000 -+++ sysfsutils-2.1.0/lib/Makefile.am 2013-03-08 08:57:27.480556502 +0000 -@@ -1,7 +1,7 @@ - lib_LTLIBRARIES = libsysfs.la - libsysfs_la_SOURCES = sysfs_utils.c sysfs_attr.c sysfs_class.c dlist.c \ - sysfs_device.c sysfs_driver.c sysfs_bus.c sysfs_module.c sysfs.h --INCLUDES = -I../include -+INCLUDES = -I$(srcdir)/../include - libsysfs_la_LDFLAGS = -version-info 2:1:0 - EXTRA_CFLAGS = @EXTRA_CLFAGS@ - libsysfs_la_CFLAGS = -Wall -W -Wstrict-prototypes $(EXTRA_CLFAGS) -Index: sysfsutils-2.1.0/test/Makefile.am -=================================================================== ---- sysfsutils-2.1.0.orig/test/Makefile.am 2013-03-08 08:57:27.224556508 +0000 -+++ sysfsutils-2.1.0/test/Makefile.am 2013-03-08 09:06:48.196543326 +0000 -@@ -2,14 +2,14 @@ - BUILT_SOURCES = test.h - CLEANFILES = test.h - test.h: -- ./create-test -+ $(srcdir)/create-test $(srcdir)/libsysfs.conf - get_device_SOURCES = get_device.c - get_driver_SOURCES = get_driver.c - get_module_SOURCES = get_module.c - testlibsysfs_SOURCES = test.c test_attr.c test_bus.c test_class.c \ - test_device.c test_driver.c test_module.c test_utils.c \ - testout.c test-defs.h libsysfs.conf create-test --INCLUDES = -I../include -+INCLUDES = -I$(srcdir)/../include - LDADD = ../lib/libsysfs.la - EXTRA_CFLAGS = @EXTRA_CLFAGS@ - AM_CFLAGS = -Wall -W -Wstrict-prototypes $(EXTRA_CLFAGS) -Index: sysfsutils-2.1.0/test/create-test -=================================================================== ---- sysfsutils-2.1.0.orig/test/create-test 2005-11-28 10:22:10.000000000 +0000 -+++ sysfsutils-2.1.0/test/create-test 2013-03-08 09:07:03.372542838 +0000 -@@ -2,7 +2,7 @@ - - rm -f test.h - --conf_file=./libsysfs.conf -+conf_file=$1 - - . $conf_file - diff --git a/poky/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/sysfsutils-2.0.0-class-dup.patch b/poky/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/sysfsutils-2.0.0-class-dup.patch deleted file mode 100644 index 1a35b7897a..0000000000 --- a/poky/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/sysfsutils-2.0.0-class-dup.patch +++ /dev/null @@ -1,23 +0,0 @@ -Upstream-Status: Backport [from fedora core 9] - -This patch is from the Fedora Core 9 sysfsutils-2.1.0-3.fc9 package. - -It fixes a problem in the upstream package where not all devices -will be returned by the function. - -The package License indicates this is GPLv2 licensed. - -Signed-off-by: Mark Hatle <mark.hatle@windriver.com> - -diff -puN lib/sysfs_class.c~sysfsutils_class_dup lib/sysfs_class.c ---- sysfsutils-2.1.0/lib/sysfs_class.c~sysfsutils_class_dup 2006-09-07 17:01:26.000000000 -0500 -+++ sysfsutils-2.1.0-bjking1/lib/sysfs_class.c 2006-09-07 17:01:26.000000000 -0500 -@@ -66,7 +66,7 @@ static int cdev_name_equal(void *a, void - return 0; - - if (strncmp((char *)a, ((struct sysfs_class_device *)b)->name, -- strlen((char *)a)) == 0) -+ SYSFS_NAME_LEN) == 0) - return 1; - - return 0; diff --git a/poky/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb b/poky/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb deleted file mode 100644 index c90a02f131..0000000000 --- a/poky/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Tools for working with sysfs" -DESCRIPTION = "Tools for working with the sysfs virtual filesystem. The tool 'systool' can query devices by bus, class and topology." -HOMEPAGE = "http://linux-diag.sourceforge.net/Sysfsutils.html" - -LICENSE = "GPL-2.0-only & LGPL-2.1-only" -LICENSE:${PN} = "GPL-2.0-only" -LICENSE:libsysfs = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=3d06403ea54c7574a9e581c6478cc393 \ - file://cmd/GPL;md5=d41d4e2e1e108554e0388ea4aecd8d27 \ - file://lib/LGPL;md5=b75d069791103ffe1c0d6435deeff72e" -PR = "r5" - -SRC_URI = "${SOURCEFORGE_MIRROR}/linux-diag/sysfsutils-${PV}.tar.gz \ - file://sysfsutils-2.0.0-class-dup.patch \ - file://obsolete_automake_macros.patch \ - file://separatebuild.patch" - -SRC_URI[md5sum] = "14e7dcd0436d2f49aa403f67e1ef7ddc" -SRC_URI[sha256sum] = "e865de2c1f559fff0d3fc936e660c0efaf7afe662064f2fb97ccad1ec28d208a" - -UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/linux-diag/files/sysfsutils/" -UPSTREAM_CHECK_REGEX = "/sysfsutils/(?P<pver>(\d+[\.\-_]*)+)/" - -S = "${WORKDIR}/sysfsutils-${PV}" - -inherit autotools - -PACKAGES =+ "libsysfs" -FILES:libsysfs = "${libdir}/lib*${SOLIBS}" - -export libdir = "${base_libdir}" diff --git a/poky/meta/recipes-core/sysfsutils/sysfsutils_2.1.1.bb b/poky/meta/recipes-core/sysfsutils/sysfsutils_2.1.1.bb new file mode 100644 index 0000000000..86cc06a2cd --- /dev/null +++ b/poky/meta/recipes-core/sysfsutils/sysfsutils_2.1.1.bb @@ -0,0 +1,21 @@ +SUMMARY = "Tools for working with sysfs" +DESCRIPTION = "Tools for working with the sysfs virtual filesystem. The tool 'systool' can query devices by bus, class and topology." +HOMEPAGE = "http://linux-diag.sourceforge.net/Sysfsutils.html" + +LICENSE = "GPL-2.0-only & LGPL-2.1-only" +LICENSE:${PN} = "GPL-2.0-only" +LICENSE:libsysfs = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=dcc19fa9307a50017fca61423a7d9754 \ + file://cmd/GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://lib/LGPL;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI = "git://github.com/linux-ras/sysfsutils.git;protocol=https;branch=master" + +SRCREV = "da2f1f8500c0af6663a56ce2bff07f67e60a92e0" + +S = "${WORKDIR}/git" + +inherit autotools + +PACKAGES =+ "libsysfs" +FILES:libsysfs = "${libdir}/lib*${SOLIBS}" diff --git a/poky/meta/recipes-core/systemd/systemd-systemctl/systemctl b/poky/meta/recipes-core/systemd/systemd-systemctl/systemctl index b45a2dc2f7..514f747fe6 100755 --- a/poky/meta/recipes-core/systemd/systemd-systemctl/systemctl +++ b/poky/meta/recipes-core/systemd/systemd-systemctl/systemctl @@ -201,13 +201,8 @@ class SystemdUnit(): target = ROOT / location.relative_to(self.root) try: for dependent in config.get('Install', prop): - # determine whether or not dependent is a template with an actual - # instance (i.e. a '@%i') - dependent_is_template = re.match(r"[^@]+@(?P<instance>[^\.]*)\.", dependent) - if dependent_is_template: - # if so, replace with the actual instance to achieve - # svc-wants@a.service.wants/svc-wanted-by@a.service - dependent = re.sub(dependent_is_template.group('instance'), instance, dependent, 1) + # expand any %i to instance (ignoring escape sequence %%) + dependent = re.sub("([^%](%%)*)%i", "\\1{}".format(instance), dependent) wants = systemdir / "{}.{}".format(dependent, dirstem) / service add_link(wants, target) diff --git a/poky/meta/recipes-core/systemd/systemd/basic.conf.in b/poky/meta/recipes-core/systemd/systemd/basic.conf.in new file mode 100644 index 0000000000..fac288f7fa --- /dev/null +++ b/poky/meta/recipes-core/systemd/systemd/basic.conf.in @@ -0,0 +1,40 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +# The superuser +u root 0 "root" :ROOT_HOME: + +# The nobody user/group for NFS file systems +g {{NOBODY_GROUP_NAME}} 65534 - - +u {{NOBODY_USER_NAME }} 65534:65534 "Nobody" - + +# Administrator group: can *see* more than normal users +g adm {{ADM_GID }} - - + +# Administrator group: can *do* more than normal users +g wheel {{WHEEL_GID }} - - + +# Access to shared database of users on the system +g utmp {{UTMP_GID }} - - + +# Physical and virtual hardware access groups +g audio {{AUDIO_GID }} - - +g cdrom {{CDROM_GID }} - - +g dialout {{DIALOUT_GID}} - - +g disk {{DISK_GID }} - - +g input {{INPUT_GID }} - - +g kmem {{KMEM_GID }} - - +g kvm {{KVM_GID }} - - +g lp {{LP_GID }} - - +g render {{RENDER_GID }} - - +g sgx {{SGX_GID }} - - +g tape {{TAPE_GID }} - - +g tty {{TTY_GID }} - - +g video {{VIDEO_GID }} - - + +# Default group for normal users +g users {{USERS_GID }} - - diff --git a/poky/meta/recipes-core/systemd/systemd_253.3.bb b/poky/meta/recipes-core/systemd/systemd_253.3.bb index 45dc6ab5bb..87fbf6f785 100644 --- a/poky/meta/recipes-core/systemd/systemd_253.3.bb +++ b/poky/meta/recipes-core/systemd/systemd_253.3.bb @@ -17,6 +17,7 @@ REQUIRED_DISTRO_FEATURES = "systemd" SRC_URI += " \ file://touchscreen.rules \ file://00-create-volatile.conf \ + file://basic.conf.in \ ${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', 'file://org.freedesktop.hostname1_no_polkit.conf', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', 'file://00-hostnamed-network-user.conf', '', d)} \ file://init \ @@ -252,6 +253,10 @@ EXTRA_OEMESON += "-Dkexec-path=${sbindir}/kexec \ # The 60 seconds is watchdog's default vaule. WATCHDOG_TIMEOUT ??= "60" +do_configure:prepend() { + sed s@:ROOT_HOME:@${ROOT_HOME}@g ${WORKDIR}/basic.conf.in > ${S}/sysusers.d/basic.conf.in +} + do_install() { meson_do_install install -d ${D}/${base_sbindir} diff --git a/poky/meta/recipes-core/udev/eudev/0001-build-Remove-dead-g-i-r-configuration.patch b/poky/meta/recipes-core/udev/eudev/0001-build-Remove-dead-g-i-r-configuration.patch deleted file mode 100644 index 2836f30c3a..0000000000 --- a/poky/meta/recipes-core/udev/eudev/0001-build-Remove-dead-g-i-r-configuration.patch +++ /dev/null @@ -1,155 +0,0 @@ -From 520c4d451efc488573746f169d8e47d5a131afc2 Mon Sep 17 00:00:00 2001 -From: Alex Kiernan <alex.kiernan@gmail.com> -Date: Fri, 20 May 2022 09:35:08 +0100 -Subject: [PATCH] build: Remove dead g-i-r configuration - -g-i-r support was removed in 2015 as part of removal of Gobject libudev -support, but the autoconf support wasn't removed but is dead. - -Fixes: 252150e181c5 ("src/gudev: remove Gobject libudev support.") -Upstream-Status: Submitted [https://github.com/eudev-project/eudev/pull/231] -Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> -Signed-off-by: Alex Kiernan <alex.kiernan@zuma.ai> ---- - configure.ac | 12 ------ - m4/introspection.m4 | 96 --------------------------------------------- - 2 files changed, 108 deletions(-) - delete mode 100644 m4/introspection.m4 - -diff --git a/configure.ac b/configure.ac -index 85a524a618ae..987d5037ae77 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -183,17 +183,8 @@ AC_SUBST([udevrulesdir],[${udevlibexecdir}/rules.d]) - AC_SUBST([pkgconfiglibdir], [${libdir}/pkgconfig]) - AC_SUBST([sharepkgconfigdir],[${datadir}/pkgconfig]) - --# introspection paths --AC_SUBST([girdir], [${datadir}/gir-1.0]) --AC_SUBST([typelibsdir], [${libdir}/girepository-1.0]) -- - AC_SUBST([rootrundir],[${with_rootrundir}]) - --# ------------------------------------------------------------------------------ -- --GOBJECT_INTROSPECTION_CHECK([1.31.1]) --AM_CONDITIONAL([HAVE_INTROSPECTION], [test "$enable_introspection" = "yes"]) -- - # ------------------------------------------------------------------------------ - AC_ARG_ENABLE([programs], - AS_HELP_STRING([--disable-programs], [disable programs (udevd, udevadm and helpers)]), -@@ -349,9 +340,6 @@ AC_MSG_RESULT([ - - pkgconfiglibdir: ${libdir}/pkgconfig - sharepkgconfigdir ${datadir}/pkgconfig -- -- girdir ${datadir}/gir-1.0 -- typelibsdir ${libdir}/girepository-1.0 - ]) - - # ------------------------------------------------------------------------------ -diff --git a/m4/introspection.m4 b/m4/introspection.m4 -deleted file mode 100644 -index d89c3d907d9c..000000000000 ---- a/m4/introspection.m4 -+++ /dev/null -@@ -1,96 +0,0 @@ --dnl -*- mode: autoconf -*- --dnl Copyright 2009 Johan Dahlin --dnl --dnl This file is free software; the author(s) gives unlimited --dnl permission to copy and/or distribute it, with or without --dnl modifications, as long as this notice is preserved. --dnl -- --# serial 1 -- --m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], --[ -- AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first -- AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first -- AC_BEFORE([LT_INIT],[$0])dnl setup libtool first -- -- dnl enable/disable introspection -- m4_if([$2], [require], -- [dnl -- enable_introspection=yes -- ],[dnl -- AC_ARG_ENABLE(introspection, -- AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], -- [Enable introspection for this build]),, -- [enable_introspection=auto]) -- ])dnl -- -- AC_MSG_CHECKING([for gobject-introspection]) -- -- dnl presence/version checking -- AS_CASE([$enable_introspection], -- [no], [dnl -- found_introspection="no (disabled, use --enable-introspection to enable)" -- ],dnl -- [yes],[dnl -- PKG_CHECK_EXISTS([gobject-introspection-1.0],, -- AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) -- PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], -- found_introspection=yes, -- AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) -- ],dnl -- [auto],[dnl -- PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) -- dnl Canonicalize enable_introspection -- enable_introspection=$found_introspection -- ],dnl -- [dnl -- AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) -- ])dnl -- -- AC_MSG_RESULT([$found_introspection]) -- -- INTROSPECTION_SCANNER= -- INTROSPECTION_COMPILER= -- INTROSPECTION_GENERATE= -- INTROSPECTION_GIRDIR= -- INTROSPECTION_TYPELIBDIR= -- if test "x$found_introspection" = "xyes"; then -- INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` -- INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` -- INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` -- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` -- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" -- INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` -- INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` -- INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection -- fi -- AC_SUBST(INTROSPECTION_SCANNER) -- AC_SUBST(INTROSPECTION_COMPILER) -- AC_SUBST(INTROSPECTION_GENERATE) -- AC_SUBST(INTROSPECTION_GIRDIR) -- AC_SUBST(INTROSPECTION_TYPELIBDIR) -- AC_SUBST(INTROSPECTION_CFLAGS) -- AC_SUBST(INTROSPECTION_LIBS) -- AC_SUBST(INTROSPECTION_MAKEFILE) -- -- AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") --]) -- -- --dnl Usage: --dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) -- --AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], --[ -- _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) --]) -- --dnl Usage: --dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) -- -- --AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], --[ -- _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) --]) --- -2.35.1 - diff --git a/poky/meta/recipes-core/udev/eudev_3.2.11.bb b/poky/meta/recipes-core/udev/eudev_3.2.12.bb index eba36c2f91..572ccecafd 100644 --- a/poky/meta/recipes-core/udev/eudev_3.2.11.bb +++ b/poky/meta/recipes-core/udev/eudev_3.2.12.bb @@ -12,10 +12,9 @@ PROVIDES = "udev" SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \ file://init \ file://local.rules \ - file://0001-build-Remove-dead-g-i-r-configuration.patch \ " -SRC_URI[sha256sum] = "19847cafec67897da855fde56f9dc7d92e21c50e450aa79068a7e704ed44558b" +SRC_URI[sha256sum] = "ccdd64ec3c381d3c3ed0e99d2e70d1f62988c7763de89ca7bdffafa5eacb9ad8" GITHUB_BASE_URI = "https://github.com/eudev-project/eudev/releases" diff --git a/poky/meta/recipes-devtools/binutils/binutils.inc b/poky/meta/recipes-devtools/binutils/binutils.inc index c69d29448f..e176b5cff1 100644 --- a/poky/meta/recipes-devtools/binutils/binutils.inc +++ b/poky/meta/recipes-devtools/binutils/binutils.inc @@ -33,6 +33,8 @@ FILES:${PN}-dev = " \ ${libdir}/libctf-nobfd.so \ ${libdir}/libopcodes.so" +FILES:${PN}-staticdev += "${libdir}/gprofng/*.a" + # Rather than duplicating multiple entries for these, make one # list and reuse it. diff --git a/poky/meta/recipes-devtools/binutils/binutils_2.40.bb b/poky/meta/recipes-devtools/binutils/binutils_2.40.bb index 9fe4bf5ae3..4ce1b4bec2 100644 --- a/poky/meta/recipes-devtools/binutils/binutils_2.40.bb +++ b/poky/meta/recipes-devtools/binutils/binutils_2.40.bb @@ -67,7 +67,6 @@ FILES:libbfd = "${libdir}/libbfd-*.so.* ${libdir}/libbfd-*.so" FILES:libopcodes = "${libdir}/libopcodes-*.so.* ${libdir}/libopcodes-*.so" FILES:gprofng = "${sysconfdir}/gprofng.rc ${libdir}/gprofng/libgp-*.so ${libdir}/gprofng/libgprofng.so.* ${bindir}/gp-* ${bindir}/gprofng" FILES:${PN}-dev += "${libdir}/libgprofng.so ${libdir}/libsframe.so" -FILES:${PN}-staticdev += "${libdir}/gprofng/*.a" SRC_URI:append:class-nativesdk = " file://0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch " USE_ALTERNATIVES_FOR:class-nativesdk = "" diff --git a/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.3.bb b/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.3.1.bb index 5c43d951c4..0bdf48ded2 100644 --- a/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.3.bb +++ b/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.3.1.bb @@ -18,7 +18,7 @@ DEPENDS = "util-linux zlib" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git;branch=master;protocol=https \ file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \ " -SRCREV = "fba31d634e3bc658e7d42a6c00f31ebb60adf901" +SRCREV = "9d2c8c364a6b8df4b1a47ad384cd75fd4ba53e12" S = "${WORKDIR}/git" PACKAGECONFIG ??= " \ diff --git a/poky/meta/recipes-devtools/cmake/cmake-native_3.26.3.bb b/poky/meta/recipes-devtools/cmake/cmake-native_3.26.4.bb index 2177aa81a4..2177aa81a4 100644 --- a/poky/meta/recipes-devtools/cmake/cmake-native_3.26.3.bb +++ b/poky/meta/recipes-devtools/cmake/cmake-native_3.26.4.bb diff --git a/poky/meta/recipes-devtools/cmake/cmake.inc b/poky/meta/recipes-devtools/cmake/cmake.inc index 2b6554690b..7788a5c45a 100644 --- a/poky/meta/recipes-devtools/cmake/cmake.inc +++ b/poky/meta/recipes-devtools/cmake/cmake.inc @@ -19,7 +19,7 @@ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ " -SRC_URI[sha256sum] = "bbd8d39217509d163cb544a40d6428ac666ddc83e22905d3e52c925781f0f659" +SRC_URI[sha256sum] = "313b6880c291bd4fe31c0aa51d6e62659282a521e695f30d5cc0d25abbd5c208" UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/poky/meta/recipes-devtools/cmake/cmake_3.26.3.bb b/poky/meta/recipes-devtools/cmake/cmake_3.26.4.bb index bb7ed83e30..bb7ed83e30 100644 --- a/poky/meta/recipes-devtools/cmake/cmake_3.26.3.bb +++ b/poky/meta/recipes-devtools/cmake/cmake_3.26.4.bb diff --git a/poky/meta/recipes-devtools/dnf/dnf_4.14.0.bb b/poky/meta/recipes-devtools/dnf/dnf_4.16.1.bb index 62df8c4ace..ff79701dc7 100644 --- a/poky/meta/recipes-devtools/dnf/dnf_4.14.0.bb +++ b/poky/meta/recipes-devtools/dnf/dnf_4.16.1.bb @@ -18,7 +18,7 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git;branch=master;protoc file://0001-dnf-write-the-log-lock-to-root.patch \ " -SRCREV = "e50875b3f5790f70720bdb670e1dd2bf4d828744" +SRCREV = "94b7cc7956580405b219329541d6b40db6499cf1" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-devtools/dpkg/dpkg_1.21.21.bb b/poky/meta/recipes-devtools/dpkg/dpkg_1.21.22.bb index a19a96ef06..04bcc93321 100644 --- a/poky/meta/recipes-devtools/dpkg/dpkg_1.21.21.bb +++ b/poky/meta/recipes-devtools/dpkg/dpkg_1.21.22.bb @@ -18,6 +18,6 @@ SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=1.21. SRC_URI:append:class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch" -SRCREV = "9ef736b7b3a5fa0d6e991e8475eb2e3151fec345" +SRCREV = "48482e4f16467e05a08aa3b3b8048e08f0024609" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-devtools/erofs-utils/erofs-utils_1.6.bb b/poky/meta/recipes-devtools/erofs-utils/erofs-utils_1.6.bb index 43643e07bb..5a89e4b8ee 100644 --- a/poky/meta/recipes-devtools/erofs-utils/erofs-utils_1.6.bb +++ b/poky/meta/recipes-devtools/erofs-utils/erofs-utils_1.6.bb @@ -6,7 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=73001d804ea1e3d84365f652242cca20" HOMEPAGE = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/tree/README" SRCREV = "21710612d35cd952490959bfa6ea9fe87aaa52dd" -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git;branch=master;protocol=https" +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git;branch=master;protocol=https \ + file://0001-erofs-utils-fsck-don-t-allocate-read-too-large-exten.patch \ + file://0002-erofs-utils-fsck-block-insane-long-paths-when-extrac.patch \ +" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>(\d+(\.\d+)+))" diff --git a/poky/meta/recipes-devtools/erofs-utils/files/0001-erofs-utils-fsck-don-t-allocate-read-too-large-exten.patch b/poky/meta/recipes-devtools/erofs-utils/files/0001-erofs-utils-fsck-don-t-allocate-read-too-large-exten.patch new file mode 100644 index 0000000000..52f475dc42 --- /dev/null +++ b/poky/meta/recipes-devtools/erofs-utils/files/0001-erofs-utils-fsck-don-t-allocate-read-too-large-exten.patch @@ -0,0 +1,126 @@ +From c769805c79d5acede65d96e5786aa5ebb46c01e0 Mon Sep 17 00:00:00 2001 +From: Gao Xiang <hsiangkao@linux.alibaba.com> +Date: Fri, 2 Jun 2023 11:05:19 +0800 +Subject: [PATCH 1/2] erofs-utils: fsck: don't allocate/read too large extents + +Since some crafted EROFS filesystem images could have insane large +extents, which causes unexpected bahaviors when extracting data. + +Fix it by extracting large extents with a buffer of a reasonable +maximum size limit and reading multiple times instead. + +Note that only `--extract` option is impacted. + +CVE: CVE-2023-33552 +Closes: https://nvd.nist.gov/vuln/detail/CVE-2023-33552 +Reported-by: Chaoming Yang <lometsj@live.com> +Fixes: 412c8f908132 ("erofs-utils: fsck: add --extract=X support to extract to path X") +Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com> +Link: https://lore.kernel.org/r/20230602030519.117071-1-hsiangkao@linux.alibaba.com + +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@arm.com> +--- + fsck/main.c | 63 +++++++++++++++++++++++++++++++++++++++++------------ + 1 file changed, 49 insertions(+), 14 deletions(-) + +diff --git a/fsck/main.c b/fsck/main.c +index 6b42252..6689ad8 100644 +--- a/fsck/main.c ++++ b/fsck/main.c +@@ -392,6 +392,8 @@ static int erofs_verify_inode_data(struct erofs_inode *inode, int outfd) + } + + while (pos < inode->i_size) { ++ unsigned int alloc_rawsize; ++ + map.m_la = pos; + if (compressed) + ret = z_erofs_map_blocks_iter(inode, &map, +@@ -420,10 +422,28 @@ static int erofs_verify_inode_data(struct erofs_inode *inode, int outfd) + if (!(map.m_flags & EROFS_MAP_MAPPED) || !fsckcfg.check_decomp) + continue; + +- if (map.m_plen > raw_size) { +- raw_size = map.m_plen; +- raw = realloc(raw, raw_size); +- BUG_ON(!raw); ++ if (map.m_plen > Z_EROFS_PCLUSTER_MAX_SIZE) { ++ if (compressed) { ++ erofs_err("invalid pcluster size %" PRIu64 " @ offset %" PRIu64 " of nid %" PRIu64, ++ map.m_plen, map.m_la, ++ inode->nid | 0ULL); ++ ret = -EFSCORRUPTED; ++ goto out; ++ } ++ alloc_rawsize = Z_EROFS_PCLUSTER_MAX_SIZE; ++ } else { ++ alloc_rawsize = map.m_plen; ++ } ++ ++ if (alloc_rawsize > raw_size) { ++ char *newraw = realloc(raw, alloc_rawsize); ++ ++ if (!newraw) { ++ ret = -ENOMEM; ++ goto out; ++ } ++ raw = newraw; ++ raw_size = alloc_rawsize; + } + + if (compressed) { +@@ -434,18 +454,27 @@ static int erofs_verify_inode_data(struct erofs_inode *inode, int outfd) + } + ret = z_erofs_read_one_data(inode, &map, raw, buffer, + 0, map.m_llen, false); ++ if (ret) ++ goto out; ++ ++ if (outfd >= 0 && write(outfd, buffer, map.m_llen) < 0) ++ goto fail_eio; + } else { +- ret = erofs_read_one_data(&map, raw, 0, map.m_plen); +- } +- if (ret) +- goto out; ++ u64 p = 0; + +- if (outfd >= 0 && write(outfd, compressed ? buffer : raw, +- map.m_llen) < 0) { +- erofs_err("I/O error occurred when verifying data chunk @ nid %llu", +- inode->nid | 0ULL); +- ret = -EIO; +- goto out; ++ do { ++ u64 count = min_t(u64, alloc_rawsize, ++ map.m_llen); ++ ++ ret = erofs_read_one_data(&map, raw, p, count); ++ if (ret) ++ goto out; ++ ++ if (outfd >= 0 && write(outfd, raw, count) < 0) ++ goto fail_eio; ++ map.m_llen -= count; ++ p += count; ++ } while (map.m_llen); + } + } + +@@ -460,6 +489,12 @@ out: + if (buffer) + free(buffer); + return ret < 0 ? ret : 0; ++ ++fail_eio: ++ erofs_err("I/O error occurred when verifying data chunk @ nid %llu", ++ inode->nid | 0ULL); ++ ret = -EIO; ++ goto out; + } + + static inline int erofs_extract_dir(struct erofs_inode *inode) +-- +2.34.1 + diff --git a/poky/meta/recipes-devtools/erofs-utils/files/0002-erofs-utils-fsck-block-insane-long-paths-when-extrac.patch b/poky/meta/recipes-devtools/erofs-utils/files/0002-erofs-utils-fsck-block-insane-long-paths-when-extrac.patch new file mode 100644 index 0000000000..f2f1e34368 --- /dev/null +++ b/poky/meta/recipes-devtools/erofs-utils/files/0002-erofs-utils-fsck-block-insane-long-paths-when-extrac.patch @@ -0,0 +1,80 @@ +From 6cebfbb79b1d5d8feb48801e1008eea5bfa8b599 Mon Sep 17 00:00:00 2001 +From: Gao Xiang <hsiangkao@linux.alibaba.com> +Date: Fri, 2 Jun 2023 13:52:56 +0800 +Subject: [PATCH 2/2] erofs-utils: fsck: block insane long paths when + extracting images + +Since some crafted EROFS filesystem images could have insane deep +hierarchy (or may form directory loops) which triggers the +PATH_MAX-sized path buffer OR stack overflow. + +Actually some crafted images cannot be deemed as real corrupted +images but over-PATH_MAX paths are not something that we'd like to +support for now. + +CVE: CVE-2023-33551 +Closes: https://nvd.nist.gov/vuln/detail/CVE-2023-33551 +Reported-by: Chaoming Yang <lometsj@live.com> +Fixes: f44043561491 ("erofs-utils: introduce fsck.erofs") +Fixes: b11f84f593f9 ("erofs-utils: fsck: convert to use erofs_iterate_dir()") +Fixes: 412c8f908132 ("erofs-utils: fsck: add --extract=X support to extract to path X") +Signeo-off-by: Gao Xiang <hsiangkao@linux.alibaba.com> +Link: https://lore.kernel.org/r/20230602055256.18061-1-hsiangkao@linux.alibaba.com + +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@arm.com> +--- + fsck/main.c | 23 +++++++++++++++-------- + 1 file changed, 15 insertions(+), 8 deletions(-) + +diff --git a/fsck/main.c b/fsck/main.c +index 6689ad8..28d95ec 100644 +--- a/fsck/main.c ++++ b/fsck/main.c +@@ -680,28 +680,35 @@ again: + static int erofsfsck_dirent_iter(struct erofs_dir_context *ctx) + { + int ret; +- size_t prev_pos = fsckcfg.extract_pos; ++ size_t prev_pos, curr_pos; + + if (ctx->dot_dotdot) + return 0; + +- if (fsckcfg.extract_path) { +- size_t curr_pos = prev_pos; ++ prev_pos = fsckcfg.extract_pos; ++ curr_pos = prev_pos; ++ ++ if (prev_pos + ctx->de_namelen >= PATH_MAX) { ++ erofs_err("unable to fsck since the path is too long (%u)", ++ curr_pos + ctx->de_namelen); ++ return -EOPNOTSUPP; ++ } + ++ if (fsckcfg.extract_path) { + fsckcfg.extract_path[curr_pos++] = '/'; + strncpy(fsckcfg.extract_path + curr_pos, ctx->dname, + ctx->de_namelen); + curr_pos += ctx->de_namelen; + fsckcfg.extract_path[curr_pos] = '\0'; +- fsckcfg.extract_pos = curr_pos; ++ } else { ++ curr_pos += ctx->de_namelen; + } +- ++ fsckcfg.extract_pos = curr_pos; + ret = erofsfsck_check_inode(ctx->dir->nid, ctx->de_nid); + +- if (fsckcfg.extract_path) { ++ if (fsckcfg.extract_path) + fsckcfg.extract_path[prev_pos] = '\0'; +- fsckcfg.extract_pos = prev_pos; +- } ++ fsckcfg.extract_pos = prev_pos; + return ret; + } + +-- +2.34.1 + diff --git a/poky/meta/recipes-devtools/gcc/libgcc_13.1.bb b/poky/meta/recipes-devtools/gcc/libgcc_13.1.bb index f88963b0a4..fdcd6cc0da 100644 --- a/poky/meta/recipes-devtools/gcc/libgcc_13.1.bb +++ b/poky/meta/recipes-devtools/gcc/libgcc_13.1.bb @@ -1,5 +1,7 @@ require recipes-devtools/gcc/gcc-${PV}.inc require libgcc.inc +LDFLAGS += "-fuse-ld=bfd" + # Building with thumb enabled on armv6t fails ARM_INSTRUCTION_SET:armv6 = "arm" diff --git a/poky/meta/recipes-devtools/gdb/gdb-cross-canadian_13.1.bb b/poky/meta/recipes-devtools/gdb/gdb-cross-canadian_13.2.bb index 4ab2b7156d..4ab2b7156d 100644 --- a/poky/meta/recipes-devtools/gdb/gdb-cross-canadian_13.1.bb +++ b/poky/meta/recipes-devtools/gdb/gdb-cross-canadian_13.2.bb diff --git a/poky/meta/recipes-devtools/gdb/gdb-cross_13.1.bb b/poky/meta/recipes-devtools/gdb/gdb-cross_13.2.bb index 3b654a2f0d..3b654a2f0d 100644 --- a/poky/meta/recipes-devtools/gdb/gdb-cross_13.1.bb +++ b/poky/meta/recipes-devtools/gdb/gdb-cross_13.2.bb diff --git a/poky/meta/recipes-devtools/gdb/gdb.inc b/poky/meta/recipes-devtools/gdb/gdb.inc index 8589de62ff..e986b1a1f9 100644 --- a/poky/meta/recipes-devtools/gdb/gdb.inc +++ b/poky/meta/recipes-devtools/gdb/gdb.inc @@ -13,10 +13,8 @@ SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ file://0006-resolve-restrict-keyword-conflict.patch \ file://0007-Fix-invalid-sigprocmask-call.patch \ file://0008-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch \ - file://0009-gdbserver-linux-low.cc-Fix-a-typo-in-ternary-operato.patch \ file://add-missing-ldflags.patch \ - file://0001-aarch64-Check-for-valid-inferior-thread-regcache-bef.patch \ " -SRC_URI[sha256sum] = "115ad5c18d69a6be2ab15882d365dda2a2211c14f480b3502c6eba576e2e95a0" +SRC_URI[sha256sum] = "fd5bebb7be1833abdb6e023c2f498a354498281df9d05523d8915babeb893f0a" TOOLCHAIN = "gcc" diff --git a/poky/meta/recipes-devtools/gdb/gdb/0001-aarch64-Check-for-valid-inferior-thread-regcache-bef.patch b/poky/meta/recipes-devtools/gdb/gdb/0001-aarch64-Check-for-valid-inferior-thread-regcache-bef.patch deleted file mode 100644 index 9adf4a4db5..0000000000 --- a/poky/meta/recipes-devtools/gdb/gdb/0001-aarch64-Check-for-valid-inferior-thread-regcache-bef.patch +++ /dev/null @@ -1,286 +0,0 @@ -From b3eff3e15576229af9bae026c5c23ee694b90389 Mon Sep 17 00:00:00 2001 -From: Luis Machado <luis.machado@arm.com> -Date: Fri, 24 Mar 2023 07:58:38 +0000 -Subject: [PATCH] aarch64: Check for valid inferior thread/regcache before - reading pauth registers - -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@arm.com> - -There were reports of gdb throwing internal errors when calling -inferior_thread ()/get_current_regcache () on a system with -Pointer Authentication enabled. - -In such cases, gdb produces the following backtrace, or a variation -of it (for gdb's with the non-address removal implemented only in -the aarch64-linux-tdep.c file). - -../../../repos/binutils-gdb/gdb/thread.c:86: internal-error: inferior_thread: Assertion `current_thread_ != nullptr' failed. -A problem internal to GDB has been detected, -further debugging may prove unreliable. ------ Backtrace ----- -0xaaaae04a571f gdb_internal_backtrace_1 - ../../../repos/binutils-gdb/gdb/bt-utils.c:122 -0xaaaae04a57f3 _Z22gdb_internal_backtracev - ../../../repos/binutils-gdb/gdb/bt-utils.c:168 -0xaaaae0b52ccf internal_vproblem - ../../../repos/binutils-gdb/gdb/utils.c:401 -0xaaaae0b5310b _Z15internal_verrorPKciS0_St9__va_list - ../../../repos/binutils-gdb/gdb/utils.c:481 -0xaaaae0e24b8f _Z18internal_error_locPKciS0_z - ../../../repos/binutils-gdb/gdbsupport/errors.cc:58 -0xaaaae0a88983 _Z15inferior_threadv - ../../../repos/binutils-gdb/gdb/thread.c:86 -0xaaaae0956c87 _Z20get_current_regcachev - ../../../repos/binutils-gdb/gdb/regcache.c:428 -0xaaaae035223f aarch64_remove_non_address_bits - ../../../repos/binutils-gdb/gdb/aarch64-tdep.c:3572 -0xaaaae03e8abb _Z31gdbarch_remove_non_address_bitsP7gdbarchm - ../../../repos/binutils-gdb/gdb/gdbarch.c:3109 -0xaaaae0a692d7 memory_xfer_partial - ../../../repos/binutils-gdb/gdb/target.c:1620 -0xaaaae0a695e3 _Z19target_xfer_partialP10target_ops13target_objectPKcPhPKhmmPm - ../../../repos/binutils-gdb/gdb/target.c:1684 -0xaaaae0a69e9f target_read_partial - ../../../repos/binutils-gdb/gdb/target.c:1937 -0xaaaae0a69fdf _Z11target_readP10target_ops13target_objectPKcPhml - ../../../repos/binutils-gdb/gdb/target.c:1977 -0xaaaae0a69937 _Z18target_read_memorymPhl - ../../../repos/binutils-gdb/gdb/target.c:1773 -0xaaaae08be523 ps_xfer_memory - ../../../repos/binutils-gdb/gdb/proc-service.c:90 -0xaaaae08be6db ps_pdread - ../../../repos/binutils-gdb/gdb/proc-service.c:124 -0x40001ed7c3b3 _td_fetch_value - /build/glibc-RIFKjK/glibc-2.31/nptl_db/fetch-value.c:115 -0x40001ed791ef td_ta_map_lwp2thr - /build/glibc-RIFKjK/glibc-2.31/nptl_db/td_ta_map_lwp2thr.c:194 -0xaaaae07f4473 thread_from_lwp - ../../../repos/binutils-gdb/gdb/linux-thread-db.c:413 -0xaaaae07f6d6f _ZN16thread_db_target4waitE6ptid_tP17target_waitstatus10enum_flagsI16target_wait_flagE - ../../../repos/binutils-gdb/gdb/linux-thread-db.c:1420 -0xaaaae0a6b33b _Z11target_wait6ptid_tP17target_waitstatus10enum_flagsI16target_wait_flagE - ../../../repos/binutils-gdb/gdb/target.c:2586 -0xaaaae0789cf7 do_target_wait_1 - ../../../repos/binutils-gdb/gdb/infrun.c:3825 -0xaaaae0789e6f operator() - ../../../repos/binutils-gdb/gdb/infrun.c:3884 -0xaaaae078a167 do_target_wait - ../../../repos/binutils-gdb/gdb/infrun.c:3903 -0xaaaae078b0af _Z20fetch_inferior_eventv - ../../../repos/binutils-gdb/gdb/infrun.c:4314 -0xaaaae076652f _Z22inferior_event_handler19inferior_event_type - ../../../repos/binutils-gdb/gdb/inf-loop.c:41 -0xaaaae07dc68b handle_target_event - ../../../repos/binutils-gdb/gdb/linux-nat.c:4206 -0xaaaae0e25fbb handle_file_event - ../../../repos/binutils-gdb/gdbsupport/event-loop.cc:573 -0xaaaae0e264f3 gdb_wait_for_event - ../../../repos/binutils-gdb/gdbsupport/event-loop.cc:694 -0xaaaae0e24f9b _Z16gdb_do_one_eventi - ../../../repos/binutils-gdb/gdbsupport/event-loop.cc:217 -0xaaaae080f033 start_event_loop - ../../../repos/binutils-gdb/gdb/main.c:411 -0xaaaae080f1b7 captured_command_loop - ../../../repos/binutils-gdb/gdb/main.c:475 -0xaaaae0810b97 captured_main - ../../../repos/binutils-gdb/gdb/main.c:1318 -0xaaaae0810c1b _Z8gdb_mainP18captured_main_args - ../../../repos/binutils-gdb/gdb/main.c:1337 -0xaaaae0338453 main - ../../../repos/binutils-gdb/gdb/gdb.c:32 ---------------------- -../../../repos/binutils-gdb/gdb/thread.c:86: internal-error: inferior_thread: Assertion `current_thread_ != nullptr' failed. -A problem internal to GDB has been detected, -further debugging may prove unreliable. -Quit this debugging session? (y or n) - -We also see failures across the testsuite if the tests get executed on a target -that has native support for the pointer authentication feature. But -gdb.base/break.exp and gdb.base/access-mem-running.exp are two examples of -tests that run into errors and internal errors. - -This issue started after commit d88cb738e6a7a7179dfaff8af78d69250c852af1, which -enabled more broad use of pointer authentication masks to remove non-address -bits of pointers, but wasn't immediately detected because systems with native -support for pointer authentication are not that common yet. - -The above crash happens because gdb is in the middle of handling an event, -and do_target_wait_1 calls switch_to_inferior_no_thread, nullifying the -current thread. This means a call to inferior_thread () will assert, and -attempting to call get_current_regcache () will also call inferior_thread (), -resulting in an assertion as well. - -target_has_registers was one function that seemed useful for detecting these -types of situation where we don't have a register cache. The problem with that -is the inconsistent state of inferior_ptid, which is used by -target_has_registers. - -Despite the call to switch_to_no_thread in switch_to_inferior_no_thread from -do_target_wait_1 in the backtrace above clearing inferior_ptid, the call to -ps_xfer_memory sets inferior_ptid momentarily before reading memory: - -static ps_err_e -ps_xfer_memory (const struct ps_prochandle *ph, psaddr_t addr, - gdb_byte *buf, size_t len, int write) -{ - scoped_restore_current_inferior restore_inferior; - set_current_inferior (ph->thread->inf); - - scoped_restore_current_program_space restore_current_progspace; - set_current_program_space (ph->thread->inf->pspace); - - scoped_restore save_inferior_ptid = make_scoped_restore (&inferior_ptid); - inferior_ptid = ph->thread->ptid; - - CORE_ADDR core_addr = ps_addr_to_core_addr (addr); - - int ret; - if (write) - ret = target_write_memory (core_addr, buf, len); - else - ret = target_read_memory (core_addr, buf, len); - return (ret == 0 ? PS_OK : PS_ERR); -} - -Maybe this shouldn't happen, or maybe it is just an unfortunate state to be -in. But this prevents the use of target_has_registers to guard against the -lack of registers, since, although current_thread_ is still nullptr, -inferior_ptid is valid and is not null_ptid. - -There is another crash scenario after we kill a previously active inferior, in -which case the gdbarch will still say we support pointer authentication but we -will also have no current thread (inferior_thread () will assert etc). - -If the target has support for pointer authentication, gdb needs to use -a couple (or 4, for bare-metal) mask registers to mask off some bits of -pointers, and for that it needs to access the registers. - -At some points, like the one from the backtrace above, there is no active -thread/current regcache because gdb is in the middle of doing event handling -and switching between threads. - -Simon suggested the use of inferior_ptid to fetch the register cache, as -opposed to relying on the current register cache. Though we need to make sure -inferior_ptid is valid (not null_ptid), I think this works nicely. - -With inferior_ptid, we can do safety checks along the way, making sure we have -a thread to fetch a register cache from and checking if the thread is actually -stopped or running. - -The following patch implements this idea with safety checks to make sure we -don't run into assertions or errors. If any of the checks fail, we fallback to -using a default mask to remove non-address bits of a pointer. - -I discussed with Pedro the possibility of caching the mask register values -(which are per-process and can change mid-execution), but there isn't a good -spot to cache those values. Besides, the mask registers can change constantly -for bare-metal debugging when switching between exception levels. - -In some cases, it is just not possible to get access to these mask registers, -like the case where threads are running. In those cases, using a default mask -to remove the non-address bits should be enough. - -This can happen when we let threads run in the background and then we attempt -to access a memory address (now that gdb is capable of reading memory even -with threads running). Thus gdb will attempt to remove non-address bits -of that memory access, will attempt to access registers, running into errors. - -Regression-tested on aarch64-linux Ubuntu 20.04. ---- - gdb/aarch64-linux-tdep.c | 64 ++++++++++++++++++++++++++++++---------- - 1 file changed, 49 insertions(+), 15 deletions(-) - -diff --git a/gdb/aarch64-linux-tdep.c b/gdb/aarch64-linux-tdep.c -index 20a041c599e..4b2915b8e99 100644 ---- a/gdb/aarch64-linux-tdep.c -+++ b/gdb/aarch64-linux-tdep.c -@@ -57,6 +57,9 @@ - #include "elf/common.h" - #include "elf/aarch64.h" - -+/* For inferior_ptid and current_inferior (). */ -+#include "inferior.h" -+ - /* Signal frame handling. - - +------------+ ^ -@@ -1986,29 +1989,60 @@ aarch64_linux_decode_memtag_section (struct gdbarch *gdbarch, - static CORE_ADDR - aarch64_remove_non_address_bits (struct gdbarch *gdbarch, CORE_ADDR pointer) - { -- aarch64_gdbarch_tdep *tdep = gdbarch_tdep<aarch64_gdbarch_tdep> (gdbarch); -- - /* By default, we assume TBI and discard the top 8 bits plus the VA range -- select bit (55). */ -+ select bit (55). Below we try to fetch information about pointer -+ authentication masks in order to make non-address removal more -+ precise. */ - CORE_ADDR mask = AARCH64_TOP_BITS_MASK; - -- if (tdep->has_pauth ()) -+ /* Check if we have an inferior first. If not, just use the default -+ mask. -+ -+ We use the inferior_ptid here because the pointer authentication masks -+ should be the same across threads of a process. Since we may not have -+ access to the current thread (gdb may have switched to no inferiors -+ momentarily), we use the inferior ptid. */ -+ if (inferior_ptid != null_ptid) - { -- /* Fetch the PAC masks. These masks are per-process, so we can just -- fetch data from whatever thread we have at the moment. -+ /* If we do have an inferior, attempt to fetch its thread's thread_info -+ struct. */ -+ thread_info *thread -+ = find_thread_ptid (current_inferior ()->process_target (), -+ inferior_ptid); - -- Also, we have both a code mask and a data mask. For now they are the -- same, but this may change in the future. */ -- struct regcache *regs = get_current_regcache (); -- CORE_ADDR cmask, dmask; -+ /* If the thread is running, we will not be able to fetch the mask -+ registers. */ -+ if (thread != nullptr && thread->state != THREAD_RUNNING) -+ { -+ /* Otherwise, fetch the register cache and the masks. */ -+ struct regcache *regs -+ = get_thread_regcache (current_inferior ()->process_target (), -+ inferior_ptid); -+ -+ /* Use the gdbarch from the register cache to check for pointer -+ authentication support, as it matches the features found in -+ that particular thread. */ -+ aarch64_gdbarch_tdep *tdep -+ = gdbarch_tdep<aarch64_gdbarch_tdep> (regs->arch ()); -+ -+ /* Is there pointer authentication support? */ -+ if (tdep->has_pauth ()) -+ { -+ /* We have both a code mask and a data mask. For now they are -+ the same, but this may change in the future. */ -+ CORE_ADDR cmask, dmask; - -- if (regs->cooked_read (tdep->pauth_reg_base, &dmask) != REG_VALID) -- dmask = mask; -+ if (regs->cooked_read (tdep->pauth_reg_base, &dmask) -+ != REG_VALID) -+ dmask = mask; - -- if (regs->cooked_read (tdep->pauth_reg_base + 1, &cmask) != REG_VALID) -- cmask = mask; -+ if (regs->cooked_read (tdep->pauth_reg_base + 1, &cmask) -+ != REG_VALID) -+ cmask = mask; - -- mask |= aarch64_mask_from_pac_registers (cmask, dmask); -+ mask |= aarch64_mask_from_pac_registers (cmask, dmask); -+ } -+ } - } - - return aarch64_remove_top_bits (pointer, mask); --- -2.34.1 - diff --git a/poky/meta/recipes-devtools/gdb/gdb/0009-gdbserver-linux-low.cc-Fix-a-typo-in-ternary-operato.patch b/poky/meta/recipes-devtools/gdb/gdb/0009-gdbserver-linux-low.cc-Fix-a-typo-in-ternary-operato.patch deleted file mode 100644 index 32eba089bc..0000000000 --- a/poky/meta/recipes-devtools/gdb/gdb/0009-gdbserver-linux-low.cc-Fix-a-typo-in-ternary-operato.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 9a85132c4ba7d37a5df146239b3ab1a5854ce478 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 22 Feb 2023 16:24:07 -0800 -Subject: [PATCH] gdbserver/linux-low.cc: Fix a typo in ternary operator - -Upstream-Status: Submitted [https://sourceware.org/pipermail/gdb-patches/2023-February/197298.html] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - gdbserver/linux-low.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc -index 7e1de397893..95ec871d436 100644 ---- a/gdbserver/linux-low.cc -+++ b/gdbserver/linux-low.cc -@@ -5390,7 +5390,7 @@ proc_xfer_memory (CORE_ADDR memaddr, unsigned char *readbuf, - if (lseek (fd, memaddr, SEEK_SET) != -1) - bytes = (readbuf != nullptr - ? read (fd, readbuf, len) -- ? write (fd, writebuf, len)); -+ : write (fd, writebuf, len)); - #endif - - if (bytes < 0) diff --git a/poky/meta/recipes-devtools/gdb/gdb_13.1.bb b/poky/meta/recipes-devtools/gdb/gdb_13.2.bb index 9c6db4ca2c..9c6db4ca2c 100644 --- a/poky/meta/recipes-devtools/gdb/gdb_13.1.bb +++ b/poky/meta/recipes-devtools/gdb/gdb_13.2.bb diff --git a/poky/meta/recipes-devtools/go/go-1.20.4.inc b/poky/meta/recipes-devtools/go/go-1.20.5.inc index 05bc168e0c..4e4e57d5cb 100644 --- a/poky/meta/recipes-devtools/go/go-1.20.4.inc +++ b/poky/meta/recipes-devtools/go/go-1.20.5.inc @@ -15,4 +15,4 @@ SRC_URI += "\ file://0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \ file://0009-go-Filter-build-paths-on-staticly-linked-arches.patch \ " -SRC_URI[main.sha256sum] = "9f34ace128764b7a3a4b238b805856cc1b2184304df9e5690825b0710f4202d6" +SRC_URI[main.sha256sum] = "9a15c133ba2cfafe79652f4815b62e7cfc267f68df1b9454c6ab2a3ca8b96a88" diff --git a/poky/meta/recipes-devtools/go/go-binary-native_1.20.4.bb b/poky/meta/recipes-devtools/go/go-binary-native_1.20.5.bb index 87ce8a558f..a98be4af1b 100644 --- a/poky/meta/recipes-devtools/go/go-binary-native_1.20.4.bb +++ b/poky/meta/recipes-devtools/go/go-binary-native_1.20.5.bb @@ -9,9 +9,9 @@ PROVIDES = "go-native" # Checksums available at https://go.dev/dl/ SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}" -SRC_URI[go_linux_amd64.sha256sum] = "698ef3243972a51ddb4028e4a1ac63dc6d60821bf18e59a807e051fee0a385bd" -SRC_URI[go_linux_arm64.sha256sum] = "105889992ee4b1d40c7c108555222ca70ae43fccb42e20fbf1eebb822f5e72c6" -SRC_URI[go_linux_ppc64le.sha256sum] = "8c6f44b96c2719c90eebabe2dd866f9c39538648f7897a212cac448587e9a408" +SRC_URI[go_linux_amd64.sha256sum] = "d7ec48cde0d3d2be2c69203bc3e0a44de8660b9c09a6e85c4732a3f7dc442612" +SRC_URI[go_linux_arm64.sha256sum] = "aa2fab0a7da20213ff975fa7876a66d47b48351558d98851b87d1cfef4360d09" +SRC_URI[go_linux_ppc64le.sha256sum] = "049b8ab07d34077b90c0642138e10207f6db14bdd1743ea994a21e228f8ca53d" UPSTREAM_CHECK_URI = "https://golang.org/dl/" UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux" diff --git a/poky/meta/recipes-devtools/go/go-cross-canadian_1.20.4.bb b/poky/meta/recipes-devtools/go/go-cross-canadian_1.20.5.bb index 7ac9449e47..7ac9449e47 100644 --- a/poky/meta/recipes-devtools/go/go-cross-canadian_1.20.4.bb +++ b/poky/meta/recipes-devtools/go/go-cross-canadian_1.20.5.bb diff --git a/poky/meta/recipes-devtools/go/go-cross_1.20.4.bb b/poky/meta/recipes-devtools/go/go-cross_1.20.5.bb index 80b5a03f6c..80b5a03f6c 100644 --- a/poky/meta/recipes-devtools/go/go-cross_1.20.4.bb +++ b/poky/meta/recipes-devtools/go/go-cross_1.20.5.bb diff --git a/poky/meta/recipes-devtools/go/go-crosssdk_1.20.4.bb b/poky/meta/recipes-devtools/go/go-crosssdk_1.20.5.bb index 1857c8a577..1857c8a577 100644 --- a/poky/meta/recipes-devtools/go/go-crosssdk_1.20.4.bb +++ b/poky/meta/recipes-devtools/go/go-crosssdk_1.20.5.bb diff --git a/poky/meta/recipes-devtools/go/go-native_1.20.4.bb b/poky/meta/recipes-devtools/go/go-native_1.20.5.bb index ddf25b2c9b..ddf25b2c9b 100644 --- a/poky/meta/recipes-devtools/go/go-native_1.20.4.bb +++ b/poky/meta/recipes-devtools/go/go-native_1.20.5.bb diff --git a/poky/meta/recipes-devtools/go/go-runtime_1.20.4.bb b/poky/meta/recipes-devtools/go/go-runtime_1.20.5.bb index 63464a1501..63464a1501 100644 --- a/poky/meta/recipes-devtools/go/go-runtime_1.20.4.bb +++ b/poky/meta/recipes-devtools/go/go-runtime_1.20.5.bb diff --git a/poky/meta/recipes-devtools/go/go_1.20.4.bb b/poky/meta/recipes-devtools/go/go_1.20.5.bb index 46f5fbc6be..46f5fbc6be 100644 --- a/poky/meta/recipes-devtools/go/go_1.20.4.bb +++ b/poky/meta/recipes-devtools/go/go_1.20.5.bb diff --git a/poky/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb b/poky/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb index 9e32134628..d3bef83306 100644 --- a/poky/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb +++ b/poky/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=25a3927bff3ee4f5b21bcb0ed3fcd6bb" SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https;branch=main" -PV = "2.14.0" -SRCREV = "ee80309bc766d781a144e6879419b29f444d94eb" +PV = "2.15.0" +SRCREV = "bfde7f2d04fbb22e26c9eb843e4ccc478762dd8d" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-devtools/llvm/llvm_git.bb b/poky/meta/recipes-devtools/llvm/llvm_git.bb index a49965668f..f3d6f24bd2 100644 --- a/poky/meta/recipes-devtools/llvm/llvm_git.bb +++ b/poky/meta/recipes-devtools/llvm/llvm_git.bb @@ -14,14 +14,14 @@ RDEPENDS:${PN}:append:class-target = " ncurses-terminfo" inherit cmake pkgconfig -PV = "16.0.3" +PV = "16.0.6" MAJOR_VERSION = "${@oe.utils.trim_version("${PV}", 1)}" LLVM_RELEASE = "${PV}" BRANCH = "release/${MAJOR_VERSION}.x" -SRCREV = "da3cd333bea572fb10470f610a27f22bcb84b08c" +SRCREV = "7cbf1a2591520c2491aa35339f227775f4d3adf6" SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH};protocol=https \ file://0007-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \ file://0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch;striplevel=2 \ diff --git a/poky/meta/recipes-devtools/meson/meson_1.1.0.bb b/poky/meta/recipes-devtools/meson/meson_1.1.1.bb index 1190d5c34d..500e13775f 100644 --- a/poky/meta/recipes-devtools/meson/meson_1.1.0.bb +++ b/poky/meta/recipes-devtools/meson/meson_1.1.1.bb @@ -15,7 +15,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/meson-${PV}.tar.gz \ file://0001-Make-CPU-family-warnings-fatal.patch \ file://0002-Support-building-allarch-recipes-again.patch \ " -SRC_URI[sha256sum] = "d9616c44cd6c53689ff8f05fc6958a693f2e17c3472a8daf83cee55dabff829f" +SRC_URI[sha256sum] = "d04b541f97ca439fb82fab7d0d480988be4bd4e62563a5ca35fadb5400727b1c" inherit python_setuptools_build_meta github-releases diff --git a/poky/meta/recipes-devtools/mmc/mmc-utils_git.bb b/poky/meta/recipes-devtools/mmc/mmc-utils_git.bb index 1e2e17bfd3..373ada2026 100644 --- a/poky/meta/recipes-devtools/mmc/mmc-utils_git.bb +++ b/poky/meta/recipes-devtools/mmc/mmc-utils_git.bb @@ -5,7 +5,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://mmc.c;beginline=1;endline=20;md5=fae32792e20f4d27ade1c5a762d16b7d" SRCBRANCH ?= "master" -SRCREV = "d4c2910981ff99b983734426dfa99632fb81ac6b" +SRCREV = "958227890690290ee766aaad1b92f3413f67048c" PV = "0.1+git${SRCPV}" diff --git a/poky/meta/recipes-devtools/mtd/mtd-utils_git.bb b/poky/meta/recipes-devtools/mtd/mtd-utils_git.bb index 2d76991d2f..cdcc766748 100644 --- a/poky/meta/recipes-devtools/mtd/mtd-utils_git.bb +++ b/poky/meta/recipes-devtools/mtd/mtd-utils_git.bb @@ -55,6 +55,14 @@ ALTERNATIVE_LINK_NAME[flashcp] = "${sbindir}/flashcp" do_install () { oe_runmake install DESTDIR=${D} SBINDIR=${sbindir} MANDIR=${mandir} INCLUDEDIR=${includedir} + install -d ${D}${includedir}/mtd + install -d ${D}${libdir} + install -m 0644 ${S}/include/libubi.h ${D}${includedir} + install -m 0644 ${S}/include/libmtd.h ${D}${includedir} + install -m 0644 ${S}/include/libscan.h ${D}${includedir} + install -m 0644 ${S}/include/libubigen.h ${D}${includedir} + oe_libinstall -a libubi ${D}${libdir}/ + oe_libinstall -a libmtd ${D}${libdir}/ } PACKAGES =+ "mtd-utils-misc mtd-utils-tests" diff --git a/poky/meta/recipes-devtools/perl/files/CVE-2023-31484.patch b/poky/meta/recipes-devtools/perl/files/CVE-2023-31484.patch new file mode 100644 index 0000000000..9a9117c53a --- /dev/null +++ b/poky/meta/recipes-devtools/perl/files/CVE-2023-31484.patch @@ -0,0 +1,29 @@ +From a625ec2cc3a0b6116c1f8b831d3480deb621c245 Mon Sep 17 00:00:00 2001 +From: Stig Palmquist <git@stig.io> +Date: Tue, 28 Feb 2023 11:54:06 +0100 +Subject: [PATCH] Add verify_SSL=>1 to HTTP::Tiny to verify https server + identity + +CVE: CVE-2023-31484 + +Upstream-Status: Backport [https://github.com/andk/cpanpm/commit/9c98370287f4e709924aee7c58ef21c85289a7f0] + +Signed-off-by: Soumya <soumya.sambu@windriver.com> +--- + cpan/CPAN/lib/CPAN/HTTP/Client.pm | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/cpan/CPAN/lib/CPAN/HTTP/Client.pm b/cpan/CPAN/lib/CPAN/HTTP/Client.pm +index 4fc792c..a616fee 100644 +--- a/cpan/CPAN/lib/CPAN/HTTP/Client.pm ++++ b/cpan/CPAN/lib/CPAN/HTTP/Client.pm +@@ -32,6 +32,7 @@ sub mirror { + + my $want_proxy = $self->_want_proxy($uri); + my $http = HTTP::Tiny->new( ++ verify_SSL => 1, + $want_proxy ? (proxy => $self->{proxy}) : () + ); + +-- +2.40.0 diff --git a/poky/meta/recipes-devtools/perl/perl_5.36.1.bb b/poky/meta/recipes-devtools/perl/perl_5.36.1.bb index f7d66e6ed9..3db1d9c6ae 100644 --- a/poky/meta/recipes-devtools/perl/perl_5.36.1.bb +++ b/poky/meta/recipes-devtools/perl/perl_5.36.1.bb @@ -17,6 +17,7 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://0002-Constant-Fix-up-shebang.patch \ file://determinism.patch \ file://0001-cpan-Sys-Syslog-Makefile.PL-Fix-_PATH_LOG-for-determ.patch \ + file://CVE-2023-31484.patch \ " SRC_URI:append:class-native = " \ file://perl-configpm-switch.patch \ diff --git a/poky/meta/recipes-devtools/python/python-pyasn1.inc b/poky/meta/recipes-devtools/python/python-pyasn1.inc index 126d0388ef..9eb87354cf 100644 --- a/poky/meta/recipes-devtools/python/python-pyasn1.inc +++ b/poky/meta/recipes-devtools/python/python-pyasn1.inc @@ -1,10 +1,9 @@ SUMMARY = "Python library implementing ASN.1 types." HOMEPAGE = "http://pyasn1.sourceforge.net/" LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=a14482d15c2249de3b6f0e8a47e021fd" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=190f79253908c986e6cacf380c3a5f6d" -SRC_URI[md5sum] = "dffae4ff9f997a83324b3f33fe62be54" -SRC_URI[sha256sum] = "aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba" +SRC_URI[sha256sum] = "97b7290ca68e62a832558ec3976f15cbf911bf5d7c7039d8b861c2a0ece69fde" RDEPENDS:${PN}:class-target += " \ ${PYTHON_PN}-codecs \ @@ -18,9 +17,8 @@ BBCLASSEXTEND = "native nativesdk" inherit ptest SRC_URI += " \ - file://run-ptest \ - file://0001-Fix-DeprecationWarning-__int__-returned-non-int-on-P.patch \ -" + file://run-ptest \ + " RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-pytest \ diff --git a/poky/meta/recipes-devtools/python/python3-bcrypt_4.0.1.bb b/poky/meta/recipes-devtools/python/python3-bcrypt_4.0.1.bb index b4f245530d..d8377de96c 100644 --- a/poky/meta/recipes-devtools/python/python3-bcrypt_4.0.1.bb +++ b/poky/meta/recipes-devtools/python/python3-bcrypt_4.0.1.bb @@ -4,6 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8f7bb094c7232b058c7e9f2e431f389c" HOMEPAGE = "https://pypi.org/project/bcrypt/" DEPENDS += "${PYTHON_PN}-cffi-native" +LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', ' -fuse-ld=bfd', '', d)}" SRC_URI[sha256sum] = "27d375903ac8261cfe4047f6709d16f7d18d39b1ec92aaf72af989552a650ebd" diff --git a/poky/meta/recipes-devtools/python/python3-certifi_2022.12.7.bb b/poky/meta/recipes-devtools/python/python3-certifi_2023.5.7.bb index b2e3ec125a..924b05c12c 100644 --- a/poky/meta/recipes-devtools/python/python3-certifi_2022.12.7.bb +++ b/poky/meta/recipes-devtools/python/python3-certifi_2023.5.7.bb @@ -7,7 +7,7 @@ HOMEPAGE = " http://certifi.io/" LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=3c2b7404369c587c3559afb604fce2f2" -SRC_URI[sha256sum] = "35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3" +SRC_URI[sha256sum] = "0f0d56dc5a6ad56fd4ba36484d6cc34451e1c6548c61daad8c320169f91eddc7" inherit pypi setuptools3 diff --git a/poky/meta/recipes-devtools/python/python3-dbusmock_0.29.0.bb b/poky/meta/recipes-devtools/python/python3-dbusmock_0.29.0.bb index 32a43e00b9..64e0ae8811 100644 --- a/poky/meta/recipes-devtools/python/python3-dbusmock_0.29.0.bb +++ b/poky/meta/recipes-devtools/python/python3-dbusmock_0.29.0.bb @@ -13,9 +13,10 @@ DEPENDS += "python3-setuptools-scm-native" RDEPENDS:${PN} += "\ ${PYTHON_PN}-dbus \ - ${PYTHON_PN}-pygobject \ ${PYTHON_PN}-unittest \ ${PYTHON_PN}-xml \ " +RRECOMMENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'gobject-introspection-data', '${MLPREFIX}${PYTHON_PN}-pygobject', '', d)}" + BBCLASSEXTEND = "native" diff --git a/poky/meta/recipes-devtools/python/python3-docutils_0.19.bb b/poky/meta/recipes-devtools/python/python3-docutils_0.20.1.bb index 7ae93ab557..65ca55e07b 100644 --- a/poky/meta/recipes-devtools/python/python3-docutils_0.19.bb +++ b/poky/meta/recipes-devtools/python/python3-docutils_0.20.1.bb @@ -2,9 +2,9 @@ SUMMARY = "Docutils is a modular system for processing documentation into useful HOMEPAGE = "http://docutils.sourceforge.net" SECTION = "devel/python" LICENSE = "PSF-2.0 & BSD-2-Clause & GPL-3.0-only" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=41001b296a89bb2780bbe306e947ecee" +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=08f5f8aa6a1db2500c08a2bb558e45af" -SRC_URI[sha256sum] = "33995a6753c30b7f577febfc2c50411fec6aac7f7ffeb7c4cfe5991072dcf9e6" +SRC_URI[sha256sum] = "f08a4e276c3a1583a86dce3e34aba3fe04d02bba2dd51ed16106244e8a923e3b" inherit pypi setuptools3 diff --git a/poky/meta/recipes-devtools/python/python3-flit-core_3.8.0.bb b/poky/meta/recipes-devtools/python/python3-flit-core_3.9.0.bb index 2e5b1e8069..b0bef4b6b6 100644 --- a/poky/meta/recipes-devtools/python/python3-flit-core_3.8.0.bb +++ b/poky/meta/recipes-devtools/python/python3-flit-core_3.9.0.bb @@ -8,7 +8,7 @@ BUGTRACKER = "https://github.com/pypa/flit/issues" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=41eb78fa8a872983a882c694a8305f08" -SRC_URI[sha256sum] = "d0f2a8f4bd45dc794befbf5839ecc0fd3830d65a57bd52b5997542fac5d5e937" +SRC_URI[sha256sum] = "d75edf5eb324da20d53570a6a6f87f51e606eee8384925cd66a90611140844c7" inherit pypi python_flit_core diff --git a/poky/meta/recipes-devtools/python/python3-importlib-metadata_6.2.0.bb b/poky/meta/recipes-devtools/python/python3-importlib-metadata_6.6.0.bb index 3e9b40ee9d..34bc55b0e1 100644 --- a/poky/meta/recipes-devtools/python/python3-importlib-metadata_6.2.0.bb +++ b/poky/meta/recipes-devtools/python/python3-importlib-metadata_6.6.0.bb @@ -8,7 +8,7 @@ inherit pypi python_setuptools_build_meta PYPI_PACKAGE = "importlib_metadata" UPSTREAM_CHECK_REGEX = "/importlib-metadata/(?P<pver>(\d+[\.\-_]*)+)/" -SRC_URI[sha256sum] = "9127aad2f49d7203e7112098c12b92e4fd1061ccd18548cdfdc49171a8c073cc" +SRC_URI[sha256sum] = "92501cdf9cc66ebd3e612f1b4f0c0765dfa42f0fa38ffb319b6bd84dd675d705" S = "${WORKDIR}/importlib_metadata-${PV}" diff --git a/poky/meta/recipes-devtools/python/python3-pyasn1/0001-Fix-DeprecationWarning-__int__-returned-non-int-on-P.patch b/poky/meta/recipes-devtools/python/python3-pyasn1/0001-Fix-DeprecationWarning-__int__-returned-non-int-on-P.patch deleted file mode 100644 index 30ac9a6684..0000000000 --- a/poky/meta/recipes-devtools/python/python3-pyasn1/0001-Fix-DeprecationWarning-__int__-returned-non-int-on-P.patch +++ /dev/null @@ -1,28 +0,0 @@ -From db8f1a7930c6b5826357646746337dafc983f953 Mon Sep 17 00:00:00 2001 -From: Ilya Etingof <etingof@gmail.com> -Date: Sat, 21 Mar 2020 19:05:03 +0100 -Subject: [PATCH] Fix `DeprecationWarning: __int__ returned non-int` on Py3 - -In `BitString.__int__()` -Upstream-Status: Backport -Signed-off-by: Yulong Liu <yulong.liu@windriver.com> ---- - pyasn1/type/univ.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pyasn1/type/univ.py b/pyasn1/type/univ.py -index 10924c3..488241f 100644 ---- a/pyasn1/type/univ.py -+++ b/pyasn1/type/univ.py -@@ -551,7 +551,7 @@ class BitString(base.SimpleAsn1Type): - return self.clone(SizedInteger(self._value >> count).setBitLength(max(0, len(self._value) - count))) - - def __int__(self): -- return self._value -+ return int(self._value) - - def __float__(self): - return float(self._value) --- -2.25.1 - diff --git a/poky/meta/recipes-devtools/python/python3-pyasn1_0.4.8.bb b/poky/meta/recipes-devtools/python/python3-pyasn1_0.5.0.bb index a5e2a71362..0519ba5edb 100644 --- a/poky/meta/recipes-devtools/python/python3-pyasn1_0.4.8.bb +++ b/poky/meta/recipes-devtools/python/python3-pyasn1_0.5.0.bb @@ -1,2 +1,3 @@ inherit pypi setuptools3 require python-pyasn1.inc + diff --git a/poky/meta/recipes-devtools/python/python3-pyopenssl_23.1.1.bb b/poky/meta/recipes-devtools/python/python3-pyopenssl_23.2.0.bb index 90a6252f7c..86ae406ffb 100644 --- a/poky/meta/recipes-devtools/python/python3-pyopenssl_23.1.1.bb +++ b/poky/meta/recipes-devtools/python/python3-pyopenssl_23.2.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" DEPENDS += "openssl ${PYTHON_PN}-cryptography" -SRC_URI[sha256sum] = "841498b9bec61623b1b6c47ebbc02367c07d60e0e195f19790817f10cc8db0b7" +SRC_URI[sha256sum] = "276f931f55a452e7dea69c7173e984eb2a4407ce413c918aa34b55f82f9b8bac" PYPI_PACKAGE = "pyOpenSSL" inherit pypi setuptools3 diff --git a/poky/meta/recipes-devtools/python/python3-sphinx_7.0.1.bb b/poky/meta/recipes-devtools/python/python3-sphinx_7.0.1.bb index 7af4582861..10e01a2d7a 100644 --- a/poky/meta/recipes-devtools/python/python3-sphinx_7.0.1.bb +++ b/poky/meta/recipes-devtools/python/python3-sphinx_7.0.1.bb @@ -1,7 +1,7 @@ SUMMARY = "Python documentation generator" HOMEPAGE = "http://sphinx-doc.org/" SECTION = "devel/python" -LICENSE = "BSD-2-Clause & MIT & BSD-3-Clause" +LICENSE = "BSD-2-Clause & MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=5eb6ac1b115a1ed24a12d9f15b633993" PYPI_PACKAGE = "Sphinx" diff --git a/poky/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch b/poky/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch index 96e5e81342..c9253832cf 100644 --- a/poky/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch +++ b/poky/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch @@ -1,4 +1,4 @@ -From 7d296dc635ad3ac2792955ce37e140a4104b098f Mon Sep 17 00:00:00 2001 +From 6cb667f37beacd832cb409e5244b3c90dfad32f7 Mon Sep 17 00:00:00 2001 From: Jeremy Puhlman <jpuhlman@mvista.com> Date: Wed, 4 Mar 2020 00:06:42 +0000 Subject: [PATCH] Don't search system for headers/libraries diff --git a/poky/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch b/poky/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch index 86971f4048..d5b7ce2b95 100644 --- a/poky/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch +++ b/poky/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch @@ -1,4 +1,4 @@ -From cab8b8b1390165a93dfb27c48c1cc4c3e4280dfd Mon Sep 17 00:00:00 2001 +From 4ed481f4928c361970e78f27c4d9be8700af176b Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex@linutronix.de> Date: Fri, 10 Sep 2021 12:28:31 +0200 Subject: [PATCH] Lib/sysconfig.py: use prefix value from build configuration diff --git a/poky/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch b/poky/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch index e080b5c562..5ee4e4f126 100644 --- a/poky/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch +++ b/poky/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch @@ -1,4 +1,4 @@ -From 79e7ed59750612e57647847957ab85709307ea38 Mon Sep 17 00:00:00 2001 +From 4c39252c71d8bca81fdc43753c83a59f8668c619 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 14 May 2013 15:00:26 -0700 Subject: [PATCH] python3: Add target and native recipes diff --git a/poky/meta/recipes-devtools/python/python3_3.11.2.bb b/poky/meta/recipes-devtools/python/python3_3.11.3.bb index 421a305e22..c7974849b6 100644 --- a/poky/meta/recipes-devtools/python/python3_3.11.2.bb +++ b/poky/meta/recipes-devtools/python/python3_3.11.3.bb @@ -39,7 +39,7 @@ SRC_URI:append:class-native = " \ file://12-distutils-prefix-is-inside-staging-area.patch \ file://0001-Don-t-search-system-for-headers-libraries.patch \ " -SRC_URI[sha256sum] = "29e4b8f5f1658542a8c13e2dd277358c9c48f2b2f7318652ef1675e402b9d2af" +SRC_URI[sha256sum] = "8a5db99c961a7ecf27c75956189c9602c968751f11dbeae2b900dbff1c085b5e" # exclude pre-releases for both python 2.x and 3.x UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar" diff --git a/poky/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb b/poky/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb index 2a5bcfb909..b100659a8c 100644 --- a/poky/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb +++ b/poky/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb @@ -6,8 +6,7 @@ RDEPENDS:${PN} = "nativesdk-qemu nativesdk-unfs3 nativesdk-pseudo \ PR = "r9" -LIC_FILES_CHKSUM = "file://${WORKDIR}/tunctl.c;endline=4;md5=ff3a09996bc5fff6bc5d4e0b4c28f999 \ - file://${COREBASE}/scripts/runqemu;beginline=5;endline=10;md5=ac2b489a58739c7628a2604698db5e7f" +LIC_FILES_CHKSUM = "file://${COREBASE}/scripts/runqemu;beginline=5;endline=10;md5=ac2b489a58739c7628a2604698db5e7f" SRC_URI = "file://${COREBASE}/scripts/runqemu \ @@ -18,7 +17,6 @@ SRC_URI = "file://${COREBASE}/scripts/runqemu \ file://${COREBASE}/scripts/oe-find-native-sysroot \ file://${COREBASE}/scripts/runqemu-extract-sdk \ file://${COREBASE}/scripts/runqemu-export-rootfs \ - file://tunctl.c \ " S = "${WORKDIR}" @@ -26,12 +24,11 @@ S = "${WORKDIR}" inherit nativesdk do_compile() { - ${CC} tunctl.c -o tunctl + : } do_install() { install -d ${D}${bindir} install -m 0755 ${WORKDIR}${COREBASE}/scripts/oe-* ${D}${bindir}/ install -m 0755 ${WORKDIR}${COREBASE}/scripts/runqemu* ${D}${bindir}/ - install tunctl ${D}${bindir}/ } diff --git a/poky/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb b/poky/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb index 6053b71717..4d64ea4b93 100644 --- a/poky/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb +++ b/poky/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb @@ -3,25 +3,20 @@ LICENSE = "GPL-2.0-only" RDEPENDS:${PN} = "qemu-system-native" PR = "r1" -LIC_FILES_CHKSUM = "file://${WORKDIR}/tunctl.c;endline=4;md5=ff3a09996bc5fff6bc5d4e0b4c28f999" +LIC_FILES_CHKSUM = "file://${WORKDIR}/qemu-oe-bridge-helper.c;endline=4;md5=ae00a3bab86f2caaa8462eacda77f4d7" -SRC_URI = "\ - file://tunctl.c \ - file://qemu-oe-bridge-helper.c \ - " +SRC_URI = "file://qemu-oe-bridge-helper.c" S = "${WORKDIR}" inherit native do_compile() { - ${CC} ${CFLAGS} ${LDFLAGS} -Wall tunctl.c -o tunctl ${CC} ${CFLAGS} ${LDFLAGS} -Wall qemu-oe-bridge-helper.c -o qemu-oe-bridge-helper } do_install() { install -d ${D}${bindir} - install tunctl ${D}${bindir}/ install qemu-oe-bridge-helper ${D}${bindir}/ } diff --git a/poky/meta/recipes-devtools/qemu/qemu-helper/qemu-oe-bridge-helper.c b/poky/meta/recipes-devtools/qemu/qemu-helper/qemu-oe-bridge-helper.c index 9434e1d269..c34aa00567 100644 --- a/poky/meta/recipes-devtools/qemu/qemu-helper/qemu-oe-bridge-helper.c +++ b/poky/meta/recipes-devtools/qemu/qemu-helper/qemu-oe-bridge-helper.c @@ -7,6 +7,7 @@ */ #include <stdio.h> +#include <string.h> #include <unistd.h> #include <stdlib.h> @@ -25,6 +26,11 @@ int main(int argc, char** argv) { return 1; } + if (argc == 2 && strcmp(argv[1], "--help") == 0) { + fprintf(stderr, "Helper function to find and exec qemu-bridge-helper. Set QEMU_BRIDGE_HELPER to override default search path\n"); + return 0; + } + try_program("/usr/libexec/qemu-bridge-helper", argv); try_program("/usr/lib/qemu/qemu-bridge-helper", argv); diff --git a/poky/meta/recipes-devtools/qemu/qemu-helper/tunctl.c b/poky/meta/recipes-devtools/qemu/qemu-helper/tunctl.c deleted file mode 100644 index d745dd06cb..0000000000 --- a/poky/meta/recipes-devtools/qemu/qemu-helper/tunctl.c +++ /dev/null @@ -1,158 +0,0 @@ -/* Copyright 2002 Jeff Dike - * Licensed under the GPL - */ - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <errno.h> -#include <fcntl.h> -#include <unistd.h> -#include <pwd.h> -#include <grp.h> -#include <net/if.h> -#include <sys/ioctl.h> -#include <linux/if_tun.h> - -/* TUNSETGROUP appeared in 2.6.23 */ -#ifndef TUNSETGROUP -#define TUNSETGROUP _IOW('T', 206, int) -#endif - -static void Usage(char *name, int status) -{ - fprintf(stderr, "Create: %s [-b] [-u owner] [-g group] [-t device-name] " - "[-f tun-clone-device]\n", name); - fprintf(stderr, "Delete: %s -d device-name [-f tun-clone-device]\n\n", - name); - fprintf(stderr, "The default tun clone device is /dev/net/tun - some systems" - " use\n/dev/misc/net/tun instead\n\n"); - fprintf(stderr, "-b will result in brief output (just the device name)\n"); - exit(status); -} - -int main(int argc, char **argv) -{ - struct ifreq ifr; - struct passwd *pw; - struct group *gr; - uid_t owner = -1; - gid_t group = -1; - int tap_fd, opt, delete = 0, brief = 0; - char *tun = "", *file = "/dev/net/tun", *name = argv[0], *end; - - while((opt = getopt(argc, argv, "bd:f:t:u:g:h")) > 0){ - switch(opt) { - case 'b': - brief = 1; - break; - case 'd': - delete = 1; - tun = optarg; - break; - case 'f': - file = optarg; - break; - case 'u': - pw = getpwnam(optarg); - if(pw != NULL){ - owner = pw->pw_uid; - break; - } - owner = strtol(optarg, &end, 0); - if(*end != '\0'){ - fprintf(stderr, "'%s' is neither a username nor a numeric uid.\n", - optarg); - Usage(name, 1); - } - break; - case 'g': - gr = getgrnam(optarg); - if(gr != NULL){ - group = gr->gr_gid; - break; - } - group = strtol(optarg, &end, 0); - if(*end != '\0'){ - fprintf(stderr, "'%s' is neither a groupname nor a numeric group.\n", - optarg); - Usage(name, 1); - } - break; - - case 't': - tun = optarg; - break; - case 'h': - Usage(name, 0); - break; - default: - Usage(name, 1); - } - } - - argv += optind; - argc -= optind; - - if(argc > 0) - Usage(name, 1); - - if((tap_fd = open(file, O_RDWR)) < 0){ - fprintf(stderr, "Failed to open '%s' : ", file); - perror(""); - exit(1); - } - - memset(&ifr, 0, sizeof(ifr)); - - ifr.ifr_flags = IFF_TAP | IFF_NO_PI; - strncpy(ifr.ifr_name, tun, sizeof(ifr.ifr_name) - 1); - if(ioctl(tap_fd, TUNSETIFF, (void *) &ifr) < 0){ - perror("TUNSETIFF"); - exit(1); - } - - if(delete){ - if(ioctl(tap_fd, TUNSETPERSIST, 0) < 0){ - perror("disabling TUNSETPERSIST"); - exit(1); - } - printf("Set '%s' nonpersistent\n", ifr.ifr_name); - } - else { - /* emulate behaviour prior to TUNSETGROUP */ - if(owner == -1 && group == -1) { - owner = geteuid(); - } - - if(owner != -1) { - if(ioctl(tap_fd, TUNSETOWNER, owner) < 0){ - perror("TUNSETOWNER"); - exit(1); - } - } - if(group != -1) { - if(ioctl(tap_fd, TUNSETGROUP, group) < 0){ - perror("TUNSETGROUP"); - exit(1); - } - } - - if(ioctl(tap_fd, TUNSETPERSIST, 1) < 0){ - perror("enabling TUNSETPERSIST"); - exit(1); - } - - if(brief) - printf("%s\n", ifr.ifr_name); - else { - printf("Set '%s' persistent and owned by", ifr.ifr_name); - if(owner != -1) - printf(" uid %d", owner); - if(group != -1) - printf(" gid %d", group); - printf("\n"); - } - } - return(0); -} diff --git a/poky/meta/recipes-devtools/qemu/qemu.inc b/poky/meta/recipes-devtools/qemu/qemu.inc index a87dee5c99..6acda61425 100644 --- a/poky/meta/recipes-devtools/qemu/qemu.inc +++ b/poky/meta/recipes-devtools/qemu/qemu.inc @@ -230,6 +230,28 @@ INSANE_SKIP:${PN} = "arch" FILES:${PN} += "${datadir}/icons" +# For user who want to install all arch packages +PACKAGES =+ "${PN}-system-all ${PN}-user-all" + +ALLOW_EMPTY:${PN}-system-all = "1" +ALLOW_EMPTY:${PN}-user-all = "1" + +PACKAGESPLITFUNCS =+ "split_qemu_packages" + +python split_qemu_packages () { + archdir = d.expand('${bindir}/') + syspackages = do_split_packages(d, archdir, r'^qemu-system-(.*)$', '${PN}-system-%s', 'QEMU full system emulation binaries(%s)' , prepend=True) + if syspackages: + d.setVar('RDEPENDS:' + d.getVar('PN') + '-system-all', ' '.join(syspackages)) + + userpackages = do_split_packages(d, archdir, r'^qemu-((?!system|edid|ga|img|io|nbd|pr-helper|storage-daemon).*)$', '${PN}-user-%s', 'QEMU full user emulation binaries(%s)' , prepend=True) + if userpackages: + d.setVar('RDEPENDS:' + d.getVar('PN') + '-user-all', ' '.join(userpackages)) + mipspackage = d.getVar('PN') + "-user-mips" + if mipspackage in ' '.join(userpackages): + d.appendVar('RDEPENDS:' + mipspackage, ' ' + d.getVar("MLPREFIX") + 'bash') +} + # Put the guest agent in a separate package PACKAGES =+ "${PN}-guest-agent" SUMMARY:${PN}-guest-agent = "QEMU guest agent" diff --git a/poky/meta/recipes-devtools/qemu/qemu/0001-tracetool-use-relative-paths-for-line-preprocessor-d.patch b/poky/meta/recipes-devtools/qemu/qemu/0001-tracetool-use-relative-paths-for-line-preprocessor-d.patch index a32ee57f8a..049b9a5105 100644 --- a/poky/meta/recipes-devtools/qemu/qemu/0001-tracetool-use-relative-paths-for-line-preprocessor-d.patch +++ b/poky/meta/recipes-devtools/qemu/qemu/0001-tracetool-use-relative-paths-for-line-preprocessor-d.patch @@ -8,7 +8,7 @@ The event filename is an absolute path. Convert it to a relative path when writing '#line' directives, to preserve reproducibility of the generated output when different base paths are used. -Upstream-Status: Pending +Upstream-Status: Accepted [https://gitlab.com/qemu-project/qemu/-/commit/9d672e290475001fcecdcc9dc79ad088ff89d17f] --- scripts/tracetool/backend/ftrace.py | 4 +++- diff --git a/poky/meta/recipes-devtools/rpm/rpm_4.18.1.bb b/poky/meta/recipes-devtools/rpm/rpm_4.18.1.bb index 6da2edddf3..83537d4761 100644 --- a/poky/meta/recipes-devtools/rpm/rpm_4.18.1.bb +++ b/poky/meta/recipes-devtools/rpm/rpm_4.18.1.bb @@ -134,8 +134,8 @@ do_install:append:class-target() { do_install:append:class-nativesdk() { rm -rf ${D}${SDKPATHNATIVE}/var # Ensure find-debuginfo is located correctly inside SDK - mkdir -p ${D}${SDKPATHNATIVE}/etc/rpm - echo "%__find_debuginfo ${SDKPATHNATIVE}/usr/bin/find-debuginfo" >> ${D}${SDKPATHNATIVE}/etc/rpm/macros + mkdir -p ${D}${libdir}/rpm + echo "%__find_debuginfo ${SDKPATHNATIVE}/usr/bin/find-debuginfo" >> ${D}${libdir}/rpm/macros } do_install:append () { @@ -173,7 +173,6 @@ FILES:${PN}-build = "\ ${libdir}/rpm/macros.p* \ ${libdir}/rpm/fileattrs/* \ " -FILES:${PN}-build:append:class-nativesdk = " ${SDKPATHNATIVE}/etc/rpm/macros" FILES:${PN}-sign = "\ ${bindir}/rpmsign \ diff --git a/poky/meta/recipes-devtools/rust/libstd-rs_1.70.0.bb b/poky/meta/recipes-devtools/rust/libstd-rs_1.70.0.bb index f4e5abc0cc..f23db79733 100644 --- a/poky/meta/recipes-devtools/rust/libstd-rs_1.70.0.bb +++ b/poky/meta/recipes-devtools/rust/libstd-rs_1.70.0.bb @@ -45,3 +45,8 @@ do_install () { } BBCLASSEXTEND = "nativesdk" + +# Since 1.70.0 upgrade this fails to build with gold: +# http://errors.yoctoproject.org/Errors/Details/708194/ +# ld: error: version script assignment of to symbol __rust_alloc_error_handler_should_panic failed: symbol not defined +LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd', '', d)}" diff --git a/poky/meta/recipes-devtools/rust/rust_1.70.0.bb b/poky/meta/recipes-devtools/rust/rust_1.70.0.bb index 83f9bec68a..8669291d08 100644 --- a/poky/meta/recipes-devtools/rust/rust_1.70.0.bb +++ b/poky/meta/recipes-devtools/rust/rust_1.70.0.bb @@ -350,3 +350,8 @@ RUSTLIB_DEP:class-nativesdk = "" INSANE_SKIP:${PN} = "staticdev" BBCLASSEXTEND = "native nativesdk" + +# Since 1.70.0 upgrade this fails to build with gold: +# http://errors.yoctoproject.org/Errors/Details/708196/ +# ld: error: version script assignment of to symbol __rust_alloc_error_handler_should_panic failed: symbol not defined +LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd', '', d)}" diff --git a/poky/meta/recipes-devtools/squashfs-tools/files/0001-install-manpages.sh-do-not-write-original-timestamps.patch b/poky/meta/recipes-devtools/squashfs-tools/files/0001-install-manpages.sh-do-not-write-original-timestamps.patch deleted file mode 100644 index ed1d2f5b3b..0000000000 --- a/poky/meta/recipes-devtools/squashfs-tools/files/0001-install-manpages.sh-do-not-write-original-timestamps.patch +++ /dev/null @@ -1,30 +0,0 @@ -From b44b00dae195d8587857c7e8054e9be4eaa1f8b3 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex@linutronix.de> -Date: Thu, 7 Apr 2022 09:26:09 +0200 -Subject: [PATCH] install-manpages.sh: do not write original timestamps into - .gz metadata - -This helps binary reproducibility. - -Upstream-Status: Submitted [https://github.com/plougher/squashfs-tools/pull/177] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - generate-manpages/install-manpages.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/generate-manpages/install-manpages.sh b/generate-manpages/install-manpages.sh -index d4c9e91..6a43b89 100755 ---- a/generate-manpages/install-manpages.sh -+++ b/generate-manpages/install-manpages.sh -@@ -56,7 +56,7 @@ for i in mksquashfs unsquashfs sqfstar sqfscat; do - exit 1 - fi - -- if ! gzip -f9 $2/$i.1; then -+ if ! gzip -n -f9 $2/$i.1; then - echo "$0: Compressing installed manpage failed. Aborting" >&2 - exit 1 - fi --- -2.30.2 - diff --git a/poky/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb b/poky/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb index 4e009d2625..982a43f889 100644 --- a/poky/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb +++ b/poky/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb @@ -7,11 +7,9 @@ SECTION = "base" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -PV = "4.5.1" -SRCREV = "afdd63fc386919b4aa40d573b0a6069414d14317" -SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https;branch=master \ - file://0001-install-manpages.sh-do-not-write-original-timestamps.patch \ - " +PV = "4.6.1" +SRCREV = "d8cb82d9840330f9344ec37b992595b5d7b44184" +SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https;branch=v6.1.1" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch b/poky/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch deleted file mode 100644 index 235e803641..0000000000 --- a/poky/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 597cc206d982e7237eb93fdc33e8c4bb6bb2d796 Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Thu, 9 Feb 2017 01:27:49 -0800 -Subject: [PATCH] caps-abbrev.awk: fix gawk's path - -It should be /usr/bin/gawk as other scripts use in this package. - -Upstream-Status: Pending - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> - ---- - tests-m32/caps-abbrev.awk | 2 +- - tests-mx32/caps-abbrev.awk | 2 +- - tests/caps-abbrev.awk | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/tests-m32/caps-abbrev.awk b/tests-m32/caps-abbrev.awk -index c00023b..a56cd56 100644 ---- a/tests-m32/caps-abbrev.awk -+++ b/tests-m32/caps-abbrev.awk -@@ -1,4 +1,4 @@ --#!/bin/gawk -+#!/usr/bin/gawk - # - # This file is part of caps strace test. - # -diff --git a/tests-mx32/caps-abbrev.awk b/tests-mx32/caps-abbrev.awk -index c00023b..a56cd56 100644 ---- a/tests-mx32/caps-abbrev.awk -+++ b/tests-mx32/caps-abbrev.awk -@@ -1,4 +1,4 @@ --#!/bin/gawk -+#!/usr/bin/gawk - # - # This file is part of caps strace test. - # -diff --git a/tests/caps-abbrev.awk b/tests/caps-abbrev.awk -index c00023b..a56cd56 100644 ---- a/tests/caps-abbrev.awk -+++ b/tests/caps-abbrev.awk -@@ -1,4 +1,4 @@ --#!/bin/gawk -+#!/usr/bin/gawk - # - # This file is part of caps strace test. - # diff --git a/poky/meta/recipes-devtools/strace/strace/skip-sockopt-test.patch b/poky/meta/recipes-devtools/strace/strace/skip-sockopt-test.patch new file mode 100644 index 0000000000..5741bf8672 --- /dev/null +++ b/poky/meta/recipes-devtools/strace/strace/skip-sockopt-test.patch @@ -0,0 +1,37 @@ +Upstream-Status: Inappropriate [avoid this test until fixed by upstream] + +Reported at https://github.com/strace/strace/issues/257 + +root@qemux86-64:/usr/lib/strace/ptest/tests# make sockopt-sol_netlink.gen.log +FAIL: sockopt-sol_netlink.gen.test + +#root@qemux86-64:/usr/lib/strace/ptest/tests# diff sockopt-sol_netlink.dir/exp sockopt-sol_netlink.dir/out +#--- sockopt-sol_netlink.dir/exp +#+++ sockopt-sol_netlink.dir/out +#@@ -86,11 +86,11 @@ + setsockopt(3, SOL_NETLINK, NETLINK_LISTEN_ALL_NSID, 0x7fa18a802ffc, -1) = -1 EINVAL (Invalid argument) + setsockopt(3, SOL_NETLINK, NETLINK_LISTEN_ALL_NSID, 0x7fa18a802ffc, 3) = 0 + setsockopt(3, SOL_NETLINK, NETLINK_LISTEN_ALL_NSID, 0x7fa18a803000, 4) = -1 EFAULT (Bad address) +-getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, [0], [8]) = 0 ++getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, [0], [4 => 8]) = 0 + getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, [0], [5 => 8]) = 0 + getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, NULL, [0 => 8]) = 0 + getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, [], [3 => 8]) = 0 +-getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, 0x7fa18a803000, [8]) = -1 EFAULT (Bad address) ++getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, 0x7fa18a803000, [4]) = -1 EFAULT (Bad address) + getsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, 0x7fa18a802ffc, 0x7fa18a7fd000) = -1 EFAULT (Bad address) + setsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, [233811181], 4) = -1 ENOPROTOOPT (Protocol not available) + setsockopt(3, SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS, [233811181], 5) = -1 ENOPROTOOPT (Protocol not available) + + + +Index: strace-6.3/tests/sockopt-sol_netlink.gen.test +=================================================================== +--- strace-6.3.orig/tests/sockopt-sol_netlink.gen.test ++++ strace-6.3/tests/sockopt-sol_netlink.gen.test +@@ -1,4 +1,5 @@ + #!/bin/sh -efu + # Generated by ./tests/gen_tests.sh from ./tests/gen_tests.in (sockopt-sol_netlink -e trace=getsockopt,setsockopt); do not edit. + . "${srcdir=.}/init.sh" ++skip_ "Test failing after system upgrades, wait for upstream fixes" + run_strace_match_diff -e trace=getsockopt,setsockopt diff --git a/poky/meta/recipes-devtools/strace/strace/update-gawk-paths.patch b/poky/meta/recipes-devtools/strace/strace/update-gawk-paths.patch index 0c683496ae..a16ede95c2 100644 --- a/poky/meta/recipes-devtools/strace/strace/update-gawk-paths.patch +++ b/poky/meta/recipes-devtools/strace/strace/update-gawk-paths.patch @@ -125,3 +125,33 @@ index dce78f5..573d9ea 100644 # # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@strace.io> # Copyright (c) 2016 Elvira Khabirova <lineprinter0@gmail.com> +diff --git a/tests-m32/caps-abbrev.awk b/tests-m32/caps-abbrev.awk +index c00023b..a56cd56 100644 +--- a/tests-m32/caps-abbrev.awk ++++ b/tests-m32/caps-abbrev.awk +@@ -1,4 +1,4 @@ +-#!/bin/gawk ++#!/usr/bin/gawk + # + # This file is part of caps strace test. + # +diff --git a/tests-mx32/caps-abbrev.awk b/tests-mx32/caps-abbrev.awk +index c00023b..a56cd56 100644 +--- a/tests-mx32/caps-abbrev.awk ++++ b/tests-mx32/caps-abbrev.awk +@@ -1,4 +1,4 @@ +-#!/bin/gawk ++#!/usr/bin/gawk + # + # This file is part of caps strace test. + # +diff --git a/tests/caps-abbrev.awk b/tests/caps-abbrev.awk +index c00023b..a56cd56 100644 +--- a/tests/caps-abbrev.awk ++++ b/tests/caps-abbrev.awk +@@ -1,4 +1,4 @@ +-#!/bin/gawk ++#!/usr/bin/gawk + # + # This file is part of caps strace test. + # diff --git a/poky/meta/recipes-devtools/strace/strace_6.2.bb b/poky/meta/recipes-devtools/strace/strace_6.3.bb index dc01b57d80..7ba9fcc468 100644 --- a/poky/meta/recipes-devtools/strace/strace_6.2.bb +++ b/poky/meta/recipes-devtools/strace/strace_6.3.bb @@ -9,14 +9,14 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ file://update-gawk-paths.patch \ file://Makefile-ptest.patch \ file://run-ptest \ - file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ file://ptest-spacesave.patch \ file://0001-strace-fix-reproducibilty-issues.patch \ file://skip-load.patch \ file://0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch \ file://0002-tests-Replace-off64_t-with-off_t.patch \ + file://skip-sockopt-test.patch \ " -SRC_URI[sha256sum] = "0c7d38a449416268d3004029a220a15a77c2206a03cc88120f37f46e949177e8" +SRC_URI[sha256sum] = "e17878e301506c1cc301611118ad14efee7f8bcef63b27ace5d290acce7bb731" inherit autotools ptest diff --git a/poky/meta/recipes-devtools/vala/vala_0.56.6.bb b/poky/meta/recipes-devtools/vala/vala_0.56.6.bb deleted file mode 100644 index bc5f5477d7..0000000000 --- a/poky/meta/recipes-devtools/vala/vala_0.56.6.bb +++ /dev/null @@ -1,3 +0,0 @@ -require ${BPN}.inc - -SRC_URI[sha256sum] = "050e841cbfe2b8e7d0fb350c9506bd7557be1cd86a90c896765f1a09a1870013" diff --git a/poky/meta/recipes-devtools/vala/vala_0.56.8.bb b/poky/meta/recipes-devtools/vala/vala_0.56.8.bb new file mode 100644 index 0000000000..f55fb41ad3 --- /dev/null +++ b/poky/meta/recipes-devtools/vala/vala_0.56.8.bb @@ -0,0 +1,3 @@ +require ${BPN}.inc + +SRC_URI[sha256sum] = "93f81dcfc6a93b77baa271d65e6be981ee3238ad451ef380af118e295d904bde" diff --git a/poky/meta/recipes-extended/baremetal-example/baremetal-helloworld_git.bb b/poky/meta/recipes-extended/baremetal-example/baremetal-helloworld_git.bb index 82b2901d51..4182372057 100644 --- a/poky/meta/recipes-extended/baremetal-example/baremetal-helloworld_git.bb +++ b/poky/meta/recipes-extended/baremetal-example/baremetal-helloworld_git.bb @@ -4,10 +4,10 @@ DESCRIPTION = "These are introductory examples to showcase the use of QEMU to ru LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=39346640a23c701e4f459e05f56f4449" -SRCREV = "22016ecbb9fb6c5f3a7a06698aea7ff8a701c166" +SRCREV = "ea7f59b02467ed1fb36c3b4c6d5cabe702df26ec" PV = "0.1+git${SRCPV}" -SRC_URI = "git://github.com/aehs29/baremetal-helloqemu.git;protocol=https;branch=master" +SRC_URI = "git://github.com/ahcbb6/baremetal-helloqemu.git;protocol=https;branch=master" UPSTREAM_VERSION_UNKNOWN="1" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-extended/cups/cups.inc b/poky/meta/recipes-extended/cups/cups.inc index da320b1085..d77758fd3f 100644 --- a/poky/meta/recipes-extended/cups/cups.inc +++ b/poky/meta/recipes-extended/cups/cups.inc @@ -15,6 +15,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/cups-${PV}-source.tar.gz \ file://0004-cups-fix-multilib-install-file-conflicts.patch \ file://volatiles.99_cups \ file://cups-volatiles.conf \ + file://CVE-2023-32324.patch \ " GITHUB_BASE_URI = "https://github.com/OpenPrinting/cups/releases" diff --git a/poky/meta/recipes-extended/cups/cups/CVE-2023-32324.patch b/poky/meta/recipes-extended/cups/cups/CVE-2023-32324.patch new file mode 100644 index 0000000000..40b89c9899 --- /dev/null +++ b/poky/meta/recipes-extended/cups/cups/CVE-2023-32324.patch @@ -0,0 +1,36 @@ +From 07cbffd11107eed3aaf1c64e35552aec20f792da Mon Sep 17 00:00:00 2001 +From: Zdenek Dohnal <zdohnal@redhat.com> +Date: Thu, 1 Jun 2023 12:04:00 +0200 +Subject: [PATCH] cups/string.c: Return if `size` is 0 (fixes CVE-2023-32324) + +CVE: CVE-2023-32324 +Upstream-Status: Backport [https://github.com/OpenPrinting/cups/commit/fd8bc2d32589] + +(cherry picked from commit fd8bc2d32589d1fd91fe1c0521be2a7c0462109e) +Signed-off-by: Sanjay Chitroda <schitrod@cisco.com> +--- + cups/string.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/cups/string.c b/cups/string.c +index 93cdad19..6ef58515 100644 +--- a/cups/string.c ++++ b/cups/string.c +@@ -1,6 +1,7 @@ + /* + * String functions for CUPS. + * ++ * Copyright © 2023 by OpenPrinting. + * Copyright © 2007-2019 by Apple Inc. + * Copyright © 1997-2007 by Easy Software Products. + * +@@ -730,6 +731,9 @@ _cups_strlcpy(char *dst, /* O - Destination string */ + size_t srclen; /* Length of source string */ + + ++ if (size == 0) ++ return (0); ++ + /* + * Figure out how much room is needed... + */ diff --git a/poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch index d5cb8705c2..5e9024834c 100644 --- a/poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch +++ b/poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch @@ -1,4 +1,4 @@ -From b4ec6635af4d4a47e9ab7bbd5347e78710d19362 Mon Sep 17 00:00:00 2001 +From 08f887f4bc65684397bf8ec30cc61d91d894deac Mon Sep 17 00:00:00 2001 From: Tudor Florea <tudor.florea@enea.com> Date: Wed, 28 May 2014 18:59:54 +0200 Subject: [PATCH] ethtool: use serial-tests config needed by ptest. @@ -15,11 +15,11 @@ Upstream-Status: Inappropriate 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index ebdfd39..c93b79a 100644 +index c1e0012..c460398 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. - AC_INIT(ethtool, 6.2, netdev@vger.kernel.org) + AC_INIT(ethtool, 6.3, netdev@vger.kernel.org) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([ethtool.c]) -AM_INIT_AUTOMAKE([gnu subdir-objects]) diff --git a/poky/meta/recipes-extended/ethtool/ethtool_6.2.bb b/poky/meta/recipes-extended/ethtool/ethtool_6.3.bb index aea03b729d..504e645966 100644 --- a/poky/meta/recipes-extended/ethtool/ethtool_6.2.bb +++ b/poky/meta/recipes-extended/ethtool/ethtool_6.3.bb @@ -11,7 +11,7 @@ SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ file://avoid_parallel_tests.patch \ " -SRC_URI[sha256sum] = "1a9f95c3d8c1795a942220912d72c06a208f1c122a78f7690259402856ff06a0" +SRC_URI[sha256sum] = "342d37d3fe19da79d0276c4c69c34c61f1ad8f87b06514d664bf1eeb29bfd525" UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/" diff --git a/poky/meta/recipes-extended/gawk/gawk_5.2.1.bb b/poky/meta/recipes-extended/gawk/gawk_5.2.2.bb index 768c8eb364..3c18b6911a 100644 --- a/poky/meta/recipes-extended/gawk/gawk_5.2.1.bb +++ b/poky/meta/recipes-extended/gawk/gawk_5.2.2.bb @@ -19,7 +19,7 @@ SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \ file://run-ptest \ " -SRC_URI[sha256sum] = "529e7c8c6acf21ff3a6183f4d763c632810908989c24675c77995d51ac37b79c" +SRC_URI[sha256sum] = "945aef7ccff101f20b22a10802bc005e994ab2b8ea3e724cc1a197c62f41f650" inherit autotools gettext texinfo update-alternatives diff --git a/poky/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch b/poky/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch index e8cb16c36b..15c7eb5a77 100644 --- a/poky/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch +++ b/poky/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch @@ -5,8 +5,7 @@ Subject: [PATCH 04/10] avoid host contamination Remove hardcode path refer to host to avoid host contamination. -Upstream-Status: Inappropriate [embedded specific] - +Upstream-Status: Pending Signed-off-by: Kai Kang <kai.kang@windriver.com> Rebase to 9.23 diff --git a/poky/meta/recipes-extended/ghostscript/ghostscript/base-genht.c-add-a-preprocessor-define-to-allow-fope.patch b/poky/meta/recipes-extended/ghostscript/ghostscript/base-genht.c-add-a-preprocessor-define-to-allow-fope.patch deleted file mode 100644 index 7d80066a80..0000000000 --- a/poky/meta/recipes-extended/ghostscript/ghostscript/base-genht.c-add-a-preprocessor-define-to-allow-fope.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 9ca6f795409b988d38dd98bc2a6ecb68a9392312 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Thu, 29 Mar 2018 16:37:40 +0800 -Subject: [PATCH 10/10] base/genht.c: add a preprocessor define to allow fopen - calling - -The commit in upstream: -http://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=773c69e46e70bdd5482676437dafd2ca83397643 - -Replace all fopen calls with gp_fopen and add a preprocessor define so -that any unintential calls directly to fopen will cause an error. - -Only exceptions are those in the platform specific code, and mkromfs.c. -This patch add a preprocessor define to allow fopen calling in -base/genht.c. - -Upstream-Status: Pending - -Rebase to 9.23 -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - base/genht.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/base/genht.c b/base/genht.c -index e597e72..e96bfb5 100644 ---- a/base/genht.c -+++ b/base/genht.c -@@ -16,6 +16,10 @@ - - /* Generate C code for compiling halftones into ROM. */ - #include "malloc_.h" -+ -+/* prevent gp.h from defining fopen */ -+#define fopen fopen -+ - #include "stdio_.h" - #include "string_.h" - #include "gscdefs.h" --- -1.8.3.1 - diff --git a/poky/meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch b/poky/meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch deleted file mode 100644 index 4c9bb22fa2..0000000000 --- a/poky/meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 9129eb7fa9dc160d64a7d9df9279a3b1dae4d793 Mon Sep 17 00:00:00 2001 -From: Jackie Huang <jackie.huang@windriver.com> -Date: Thu, 29 Mar 2018 16:16:18 +0800 -Subject: [PATCH 08/10] cups no gcrypt - -Don't build-depend on libgcrypt, as nothing is used from it - -Backported from -http://www.cups.org/strfiles.php/3308/cups-no-gcrypt.patch - -This addresses the cryto dependency seen during build. - -Upstream-Status: Backport - -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> - -Rebase to 9.23 -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - cups/libs/cups/http-private.h | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/cups/libs/cups/http-private.h b/cups/libs/cups/http-private.h -index 99a85c3..a674852 100644 ---- a/cups/libs/cups/http-private.h -+++ b/cups/libs/cups/http-private.h -@@ -80,7 +80,6 @@ typedef int socklen_t; - # elif defined HAVE_GNUTLS - # include <gnutls/gnutls.h> - # include <gnutls/x509.h> --# include <gcrypt.h> - # elif defined(HAVE_CDSASSL) - # include <CoreFoundation/CoreFoundation.h> - # include <Security/Security.h> --- -1.8.3.1 - diff --git a/poky/meta/recipes-extended/ghostscript/ghostscript/do-not-check-local-libpng-source.patch b/poky/meta/recipes-extended/ghostscript/ghostscript/do-not-check-local-libpng-source.patch deleted file mode 100644 index 13e71c824f..0000000000 --- a/poky/meta/recipes-extended/ghostscript/ghostscript/do-not-check-local-libpng-source.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 108a7d3f79af8c669af129bd87401402e76edfa9 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Mon, 18 Jan 2016 01:00:30 -0500 -Subject: [PATCH] configure.ac: do not check local png source - -In oe-core, it did not need to compile local libpng -source in ghostscript, so do not check local png -source, and directly check the existance of shared -libpng library. - -Upstream-Status: Inappropriate [OE-Core specific] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index bb57825..389c473 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1441,7 +1441,7 @@ else - PNGDEVS='' - PNGDEVS_ALL='png48 png16m pnggray pngmono pngmonod png256 png16 pngalpha png16malpha' - AC_MSG_CHECKING([for local png library source]) -- if test -f $srcdir/libpng/pngread.c; then -+ if false; then - AC_MSG_RESULT([yes]) - SHARE_LIBPNG=0 - LIBPNGDIR=$srcdir/libpng diff --git a/poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch b/poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch deleted file mode 100644 index 5b57da2a97..0000000000 --- a/poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 04a86a613e0f9bfbbad99874f72217f75e8c53a3 Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Thu, 29 Mar 2018 15:59:05 +0800 -Subject: [PATCH] contrib.mak: fix for parallel build - -Upstream-Status: Pending - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> - -Rebase to 9.23 -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - ---- - contrib/contrib.mak | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/contrib/contrib.mak b/contrib/contrib.mak -index 2edee7a..c9100e8 100644 ---- a/contrib/contrib.mak -+++ b/contrib/contrib.mak -@@ -1241,6 +1241,7 @@ $(DEVOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH) \ - ### ----------------- Additional .upp files ---------------- ### - - extra-upp-install: install-libdata -+ mkdir -p $(DESTDIR)$(gsdatadir)$(D)lib - for f in $(CONTRIBSRC)uniprint$(D)*.upp; do \ - $(INSTALL_DATA) $$f $(DESTDIR)$(gsdatadir)$(D)lib || exit 1; \ - done diff --git a/poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.21-native-fix-disable-system-libtiff.patch b/poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.21-native-fix-disable-system-libtiff.patch deleted file mode 100644 index a382c7f891..0000000000 --- a/poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.21-native-fix-disable-system-libtiff.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 0124b1c29b9cfe46d73ae82ce023dd7c5b055744 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Thu, 29 Mar 2018 16:36:12 +0800 -Subject: [PATCH 09/10] ghostscript-native:fix disable-system-libtiff - -Modify configure to add the check to make sure -ghostscrip could work while system-libtiff is -disabled. - -Upstream-Status: Pending - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - -Rebase to ghostscript 9.25. - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> -Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com> ---- - configure.ac | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 80a60b1..f3e9efb 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1319,6 +1319,7 @@ AC_TRY_COMPILE([], [return 0;], - CFLAGS=$CGLAGS_STORE - - if test x"$SHARE_LIBTIFF" = x"0" ; then -+ if test -e $LIBTIFFDIR/configure; then - echo "Running libtiff configure script..." - olddir=`pwd` - if ! test -d "$LIBTIFFCONFDIR" ; then -@@ -1337,6 +1338,10 @@ if test x"$SHARE_LIBTIFF" = x"0" ; then - - echo - echo "Continuing with Ghostscript configuration..." -+ else -+ AC_MSG_NOTICE([Could not find local copy of libtiff. -+Disabling tiff output devices.]) -+ fi - fi - - AC_SUBST(SHARE_LIBTIFF) --- -1.8.3.1 - diff --git a/poky/meta/recipes-extended/ghostscript/ghostscript/mkdir-p.patch b/poky/meta/recipes-extended/ghostscript/ghostscript/mkdir-p.patch deleted file mode 100644 index 3e6d3e3c48..0000000000 --- a/poky/meta/recipes-extended/ghostscript/ghostscript/mkdir-p.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 2b23026f8e2a352417fb1c4da94bf69b19bef267 Mon Sep 17 00:00:00 2001 -From: Joe Slater <joe.slater@windriver.com> -Date: Thu, 29 Mar 2018 16:04:32 +0800 -Subject: [PATCH 05/10] ghostscript: allow directories to be created more than - once - -When doing parallel builds, we might try to create directories -more than once. This should not cause an error. - -Upstream-Status: Pending - -Signed-off-by: Joe Slater <joe.slater@windriver.com> - -Rebase to 9.23 -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - base/unix-end.mak | 17 ++++++++--------- - 1 file changed, 8 insertions(+), 9 deletions(-) - -diff --git a/base/unix-end.mak b/base/unix-end.mak -index 9ce599a..feff5a6 100644 ---- a/base/unix-end.mak -+++ b/base/unix-end.mak -@@ -17,15 +17,14 @@ - UNIX_END_MAK=$(GLSRC)unix-end.mak $(TOP_MAKEFILES) - # Define the rule for building standard configurations. - directories: $(UNIX_END_MAK) -- @if test "$(BINDIR)" != "" -a ! -d $(BINDIR); then mkdir $(BINDIR); fi -- @if test "$(GLGENDIR)" != "" -a ! -d $(GLGENDIR); then mkdir $(GLGENDIR); fi -- @if test "$(GLOBJDIR)" != "" -a ! -d $(GLOBJDIR); then mkdir $(GLOBJDIR); fi -- @if test "$(DEVGENDIR)" != "" -a ! -d $(DEVGENDIR); then mkdir $(DEVGENDIR); fi -- @if test "$(DEVOBJDIR)" != "" -a ! -d $(DEVOBJDIR); then mkdir $(DEVOBJDIR); fi -- @if test "$(AUXDIR)" != "" -a ! -d $(AUXDIR); then mkdir $(AUXDIR); fi -- @if test "$(PSGENDIR)" != "" -a ! -d $(PSGENDIR); then mkdir $(PSGENDIR); fi -- @if test "$(PSGENDIR)" != "" -a ! -d $(PSGENDIR)/cups; then mkdir $(PSGENDIR)/cups; fi -- @if test "$(PSOBJDIR)" != "" -a ! -d $(PSOBJDIR); then mkdir $(PSOBJDIR); fi -+ @if test "$(BINDIR)" != "" -a ! -d $(BINDIR); then mkdir -p $(BINDIR); fi -+ @if test "$(GLGENDIR)" != "" -a ! -d $(GLGENDIR); then mkdir -p $(GLGENDIR); fi -+ @if test "$(GLOBJDIR)" != "" -a ! -d $(GLOBJDIR); then mkdir -p $(GLOBJDIR); fi -+ @if test "$(DEVGENDIR)" != "" -a ! -d $(DEVGENDIR); then mkdir -p $(DEVGENDIR); fi -+ @if test "$(DEVOBJDIR)" != "" -a ! -d $(DEVOBJDIR); then mkdir -p $(DEVOBJDIR); fi -+ @if test "$(AUXDIR)" != "" -a ! -d $(AUXDIR); then mkdir -p $(AUXDIR); fi -+ @if test "$(PSGENDIR)" != "" -a ! -d $(PSGENDIR)/cups; then mkdir -p $(PSGENDIR)/cups; fi -+ @if test "$(PSOBJDIR)" != "" -a ! -d $(PSOBJDIR); then mkdir -p $(PSOBJDIR); fi - - - gs: .gssubtarget $(UNIX_END_MAK) --- -1.8.3.1 - diff --git a/poky/meta/recipes-extended/ghostscript/ghostscript_10.01.1.bb b/poky/meta/recipes-extended/ghostscript/ghostscript_10.01.1.bb index 5d4b8cdc91..f03ebf4478 100644 --- a/poky/meta/recipes-extended/ghostscript/ghostscript_10.01.1.bb +++ b/poky/meta/recipes-extended/ghostscript/ghostscript_10.01.1.bb @@ -13,91 +13,50 @@ SECTION = "console/utils" LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=f98ffa763e50cded76f49bce73aade16" -DEPENDS = "ghostscript-native tiff jpeg fontconfig cups libpng" -DEPENDS:class-native = "libpng-native" +DEPENDS = "tiff jpeg fontconfig cups libpng freetype zlib" UPSTREAM_CHECK_URI = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar" -# As of ghostscript 9.54.0 the jpeg issue in the CVE is present in the gs jpeg sources -# however we use an external jpeg which doesn't have the issue. +# We use a system libjpeg-turbo which has this fix CVE_CHECK_IGNORE += "CVE-2013-6629" def gs_verdir(v): return "".join(v.split(".")) -SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${@gs_verdir("${PV}")}/${BPN}-${PV}.tar.gz \ - file://ghostscript-9.15-parallel-make.patch \ - file://ghostscript-9.16-Werror-return-type.patch \ - file://do-not-check-local-libpng-source.patch \ - file://avoid-host-contamination.patch \ - file://mkdir-p.patch \ +SRC_URI = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${@gs_verdir("${PV}")}/${BPN}-${PV}.tar.gz \ + file://ghostscript-9.16-Werror-return-type.patch \ + file://avoid-host-contamination.patch \ " -SRC_URI = "${SRC_URI_BASE} \ - file://cups-no-gcrypt.patch \ - " - -SRC_URI:class-native = "${SRC_URI_BASE} \ - file://ghostscript-9.21-native-fix-disable-system-libtiff.patch \ - file://base-genht.c-add-a-preprocessor-define-to-allow-fope.patch \ - " - SRC_URI[sha256sum] = "4df18a808cd4369f25e02dbcec2f133cb6d674627b2c6b1502020e58d43e32ce" -# Put something like -# -# PACKAGECONFIG:append:pn-ghostscript = " x11" -# -# in local.conf to enable building with X11. Be careful. The order -# of the overrides matters! -# -#PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" -PACKAGECONFIG:class-native = "" - +PACKAGECONFIG ??= "" +PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+3" +PACKAGECONFIG[libidn] = "--with-libidn,--without-libidn,libidn" +PACKAGECONFIG[libpaper] = "--with-libpaper,--without-libpaper,libpaper" PACKAGECONFIG[x11] = "--with-x --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR}, \ - --without-x, virtual/libx11 libxext libxt gtk+3\ - " + --without-x, virtual/libx11 libxext libxt" -EXTRA_OECONF = "--without-libpaper --with-system-libtiff --with-jbig2dec \ +EXTRA_OECONF = "--with-jbig2dec \ --with-fontpath=${datadir}/fonts \ - --without-libidn --with-cups-serverbin=${exec_prefix}/lib/cups \ - --with-cups-datadir=${datadir}/cups \ CUPSCONFIG="${STAGING_BINDIR_CROSS}/cups-config" \ + PKGCONFIG=pkg-config \ " EXTRA_OECONF:append:mipsarcho32 = " --with-large_color_index=0" -# Explicity disable libtiff, fontconfig, -# freetype, cups for ghostscript-native -EXTRA_OECONF:class-native = "--without-x --with-system-libtiff=no \ - --without-libpaper \ - --with-fontpath=${datadir}/fonts \ - --without-libidn --disable-fontconfig \ - --enable-freetype --disable-cups " - -# This has been fixed upstream but for now we need to subvert the check for time.h -# http://bugs.ghostscript.com/show_bug.cgi?id=692443 -# http://bugs.ghostscript.com/show_bug.cgi?id=692426 -CFLAGS += "-DHAVE_SYS_TIME_H=1" -BUILD_CFLAGS += "-DHAVE_SYS_TIME_H=1" - -inherit autotools-brokensep - -do_configure:prepend:class-target () { - rm -rf ${S}/jpeg/ -} +# Uses autoconf but not automake, can't do out-of-tree +inherit autotools-brokensep pkgconfig -do_configure:append () { - # copy tools from the native ghostscript build - if [ "${PN}" != "ghostscript-native" ]; then - mkdir -p obj/aux soobj - for i in genarch genconf mkromfs echogs gendev genht packps; do - cp ${STAGING_BINDIR_NATIVE}/ghostscript-${PV}/$i obj/aux/$i - done - fi +# Prune the source tree of libraries that we're using our packaging of, so that +# ghostscript can't link to them. Can't prune zlib as that's needed for the +# native tools. +prune_sources() { + rm -rf ${S}/jpeg/ ${S}/libpng/ ${S}/tiff/ ${S}/expat/ ${S}/freetype/ ${S}/cups/lib } +do_unpack[postfuncs] += "prune_sources" do_install:append () { mkdir -p ${D}${datadir}/ghostscript/${PV}/ @@ -105,22 +64,6 @@ do_install:append () { cp -r ${S}/iccprofiles ${D}${datadir}/ghostscript/${PV}/ } -do_compile:class-native () { - mkdir -p obj - for i in genarch genconf mkromfs echogs gendev genht packps; do - oe_runmake obj/aux/$i - done -} - -do_install:class-native () { - install -d ${D}${bindir}/ghostscript-${PV} - for i in genarch genconf mkromfs echogs gendev genht packps; do - install -m 755 obj/aux/$i ${D}${bindir}/ghostscript-${PV}/$i - done -} - -BBCLASSEXTEND = "native" - # ghostscript does not supports "arc" COMPATIBLE_HOST = "^(?!arc).*" diff --git a/poky/meta/recipes-extended/go-examples/go-helloworld_0.1.bb b/poky/meta/recipes-extended/go-examples/go-helloworld_0.1.bb index 5483ecc307..ce6ec08c59 100644 --- a/poky/meta/recipes-extended/go-examples/go-helloworld_0.1.bb +++ b/poky/meta/recipes-extended/go-examples/go-helloworld_0.1.bb @@ -6,7 +6,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" SRC_URI = "git://go.googlesource.com/example;branch=master;protocol=https" -SRCREV = "2e68773dfca072cb81f219fc3b97ad34fe9d9f94" +SRCREV = "5bec756976671f30903223ec46ff8a70dced4954" UPSTREAM_CHECK_COMMITS = "1" GO_IMPORT = "golang.org/x/example" diff --git a/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.69.bb b/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.71.bb index 8570d85f5e..3959f88b98 100644 --- a/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.69.bb +++ b/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.71.bb @@ -7,11 +7,8 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=e4dac5c6ab169aa212feb5028853a579" SECTION = "net" -RDEPENDS:${PN} = "lighttpd-module-dirlisting \ - lighttpd-module-indexfile \ - lighttpd-module-staticfile" -RRECOMMENDS:${PN} = "lighttpd-module-access \ - lighttpd-module-accesslog" +RDEPENDS:${PN} = "lighttpd-module-dirlisting" +RRECOMMENDS:${PN} = "lighttpd-module-accesslog" SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.tar.xz \ file://index.html.lighttpd \ @@ -19,7 +16,7 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t file://lighttpd \ " -SRC_URI[sha256sum] = "16ac8db95e719629ba61949b99f8a26feba946a81d185215b28379bb4116b0b4" +SRC_URI[sha256sum] = "b8b6915da20396fdc354df3324d5e440169b2e5ea7859e3a775213841325afac" DEPENDS = "virtual/crypt" diff --git a/poky/meta/recipes-extended/logrotate/logrotate_3.21.0.bb b/poky/meta/recipes-extended/logrotate/logrotate_3.21.0.bb index 87c0d9ae60..f0755e3ae5 100644 --- a/poky/meta/recipes-extended/logrotate/logrotate_3.21.0.bb +++ b/poky/meta/recipes-extended/logrotate/logrotate_3.21.0.bb @@ -66,7 +66,6 @@ do_install(){ install -p -m 644 ${S}/examples/logrotate.conf ${D}${sysconfdir}/logrotate.conf install -p -m 644 ${S}/examples/btmp ${D}${sysconfdir}/logrotate.d/btmp install -p -m 644 ${S}/examples/wtmp ${D}${sysconfdir}/logrotate.d/wtmp - touch ${D}${localstatedir}/lib/logrotate.status if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${systemd_system_unitdir} diff --git a/poky/meta/recipes-extended/ltp/ltp/0001-testcases-kernel-syscalls-fcntl-define-_LARGEFILE64_.patch b/poky/meta/recipes-extended/ltp/ltp/0001-testcases-kernel-syscalls-fcntl-define-_LARGEFILE64_.patch new file mode 100644 index 0000000000..dbe63f2170 --- /dev/null +++ b/poky/meta/recipes-extended/ltp/ltp/0001-testcases-kernel-syscalls-fcntl-define-_LARGEFILE64_.patch @@ -0,0 +1,28 @@ +From f4f75ce9218b469d91b536218de3323977edc529 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Tue, 13 Jun 2023 15:10:33 +0200 +Subject: [PATCH] testcases/kernel/syscalls/fcntl: define _LARGEFILE64_SOURCE + +This is required for off64_t to be available on musl systems. + +Upstream-Status: Submitted [https://github.com/linux-test-project/ltp/pull/1047] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + testcases/kernel/syscalls/fcntl/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/testcases/kernel/syscalls/fcntl/Makefile b/testcases/kernel/syscalls/fcntl/Makefile +index df663a50a..aac774111 100644 +--- a/testcases/kernel/syscalls/fcntl/Makefile ++++ b/testcases/kernel/syscalls/fcntl/Makefile +@@ -17,6 +17,6 @@ include $(abs_srcdir)/../utils/newer_64.mk + + %_64: CPPFLAGS += -D_FILE_OFFSET_BITS=64 + +-CPPFLAGS += -D_GNU_SOURCE ++CPPFLAGS += -D_GNU_SOURCE -D_LARGEFILE64_SOURCE + + include $(top_srcdir)/include/mk/generic_leaf_target.mk +-- +2.30.2 + diff --git a/poky/meta/recipes-extended/ltp/ltp_20230127.bb b/poky/meta/recipes-extended/ltp/ltp_20230516.bb index 4325aa6672..ddc6523e30 100644 --- a/poky/meta/recipes-extended/ltp/ltp_20230127.bb +++ b/poky/meta/recipes-extended/ltp/ltp_20230516.bb @@ -24,11 +24,12 @@ TUNE_CCARGS:remove:x86-64 = "-mfpmath=sse" CFLAGS:append:powerpc64 = " -D__SANE_USERSPACE_TYPES__" CFLAGS:append:mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" -SRCREV = "dd2d61ac1a1e09797a6165f478abd4a9f4f43035" +SRCREV = "3ebc2dfa85c2445bb68d8c0d66e33c4da1e1b3a7" SRC_URI = "git://github.com/linux-test-project/ltp.git;branch=master;protocol=https \ file://0001-Remove-OOM-tests-from-runtest-mm.patch \ file://disable_hanging_tests.patch \ + file://0001-testcases-kernel-syscalls-fcntl-define-_LARGEFILE64_.patch \ " S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-extended/parted/files/0001-fs-Add-libuuid-to-linker-flags-for-libparted-fs-resi.patch b/poky/meta/recipes-extended/parted/files/0001-fs-Add-libuuid-to-linker-flags-for-libparted-fs-resi.patch new file mode 100644 index 0000000000..10354f1ed9 --- /dev/null +++ b/poky/meta/recipes-extended/parted/files/0001-fs-Add-libuuid-to-linker-flags-for-libparted-fs-resi.patch @@ -0,0 +1,34 @@ +From 1fc88332f7e906294fd889287b9e84cefc7f1586 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 12 Jun 2023 10:40:07 -0700 +Subject: [PATCH] fs: Add libuuid to linker flags for libparted-fs-resize + library + +This library uses uuid_generate function which comes from libuuid and +hence it should be mentioned on linker cmdline + +fixes +| aarch64-yoe-linux-ld.lld: error: undefined reference due to --no-allow-shlib-undefined: uuid_generate +| >>> referenced by /mnt/b/yoe/master/build/tmp/work/cortexa72-cortexa53-crypto-yoe-linux/fatresize/1.1.0-r0/recipe-sysroot/usr/lib/libparted-fs-resize.so + +Upstream-Status: Submitted [https://alioth-lists.debian.net/pipermail/parted-devel/2023-June/005873.html] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libparted/fs/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libparted/fs/Makefile.am b/libparted/fs/Makefile.am +index 2f345f3..a8970eb 100644 +--- a/libparted/fs/Makefile.am ++++ b/libparted/fs/Makefile.am +@@ -75,6 +75,7 @@ libparted_fs_resize_la_LDFLAGS = \ + EXTRA_DIST += fsresize.sym + libparted_fs_resize_la_DEPENDENCIES = $(sym_file) + ++libparted_fs_resize_la_LIBADD = $(UUID_LIBS) + libparted_fs_resize_la_SOURCES = \ + r/filesys.c \ + r/fat/bootsector.c \ +-- +2.41.0 + diff --git a/poky/meta/recipes-extended/parted/parted_3.5.bb b/poky/meta/recipes-extended/parted/parted_3.6.bb index ea2b68bbd8..a755e1c148 100644 --- a/poky/meta/recipes-extended/parted/parted_3.5.bb +++ b/poky/meta/recipes-extended/parted/parted_3.6.bb @@ -8,10 +8,11 @@ DEPENDS = "ncurses util-linux virtual/libiconv" SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \ file://fix-doc-mandir.patch \ + file://0001-fs-Add-libuuid-to-linker-flags-for-libparted-fs-resi.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "4938dd5c1c125f6c78b1f4b3e297526f18ee74aa43d45c248578b1d2470c05a2" +SRC_URI[sha256sum] = "3b43dbe33cca0f9a18601ebab56b7852b128ec1a3df3a9b30ccde5e73359e612" inherit autotools pkgconfig gettext texinfo ptest diff --git a/poky/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto.bb b/poky/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto.bb index 00919a3d70..20933153a3 100644 --- a/poky/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto.bb +++ b/poky/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto.bb @@ -15,13 +15,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0daaf958d5531ab86169ec6e275e1517" SECTION = "libs" DEPENDS += "rpcsvc-proto-native" -PV = "1.4.3" +PV = "1.4.4" -SRCREV = "71e0a12c04d130a78674ac6309eefffa6ecee612" +SRCREV = "c65926005e50da02a4da3e26abc42eded36cd19d" SRC_URI = "git://github.com/thkukuk/${BPN};branch=master;protocol=https \ file://0001-Use-cross-compiled-rpcgen.patch \ - file://0001-Use-AC_SYS_LARGEFILE-macro-to-control-largefile-supp.patch \ " S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto/0001-Use-AC_SYS_LARGEFILE-macro-to-control-largefile-supp.patch b/poky/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto/0001-Use-AC_SYS_LARGEFILE-macro-to-control-largefile-supp.patch deleted file mode 100644 index f07866d55a..0000000000 --- a/poky/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto/0001-Use-AC_SYS_LARGEFILE-macro-to-control-largefile-supp.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 6820c53c3952f78185beb59f767c372fc745dcf3 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 11 Dec 2022 21:42:59 -0800 -Subject: [PATCH] Use AC_SYS_LARGEFILE macro to control largefile support - -The autoconf macro AC_SYS_LARGEFILE defines _FILE_OFFSET_BITS=64 -where necessary to ensure that off_t and all interfaces using off_t -are 64bit, even on 32bit systems. - -replace stat64 by equivalent stat struct/func - -Upstream-Status: Accepted [https://github.com/thkukuk/rpcsvc-proto/pull/15] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure.ac | 1 + - rpcgen/rpc_main.c | 16 +++++----------- - 2 files changed, 6 insertions(+), 11 deletions(-) - -diff --git a/configure.ac b/configure.ac -index bacc2fb..a9fc730 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -8,6 +8,7 @@ AC_PREFIX_DEFAULT(/usr) - AC_SUBST(PACKAGE) - AC_SUBST(VERSION) - -+AC_SYS_LARGEFILE - AC_PROG_CC - AC_GNU_SOURCE - AM_PROG_CC_C_O -diff --git a/rpcgen/rpc_main.c b/rpcgen/rpc_main.c -index 277adc6..fd7dea9 100644 ---- a/rpcgen/rpc_main.c -+++ b/rpcgen/rpc_main.c -@@ -62,12 +62,6 @@ - #define EXTEND 1 /* alias for TRUE */ - #define DONT_EXTEND 0 /* alias for FALSE */ - --#ifdef __APPLE__ --# if __DARWIN_ONLY_64_BIT_INO_T --# define stat64 stat --# endif --#endif -- - struct commandline - { - int cflag; /* xdr C routines */ -@@ -337,9 +331,9 @@ clear_args (void) - static void - find_cpp (void) - { -- struct stat64 buf; -+ struct stat buf; - -- if (stat64 (CPP, &buf) == 0) -+ if (stat (CPP, &buf) == 0) - return; - - if (cppDefined) /* user specified cpp but it does not exist */ -@@ -1125,17 +1119,17 @@ putarg (int whereto, const char *cp) - static void - checkfiles (const char *infile, const char *outfile) - { -- struct stat64 buf; -+ struct stat buf; - - if (infile) /* infile ! = NULL */ -- if (stat64 (infile, &buf) < 0) -+ if (stat (infile, &buf) < 0) - { - perror (infile); - crash (); - } - if (outfile) - { -- if (stat64 (outfile, &buf) < 0) -+ if (stat (outfile, &buf) < 0) - return; /* file does not exist */ - else - { diff --git a/poky/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto/0001-Use-cross-compiled-rpcgen.patch b/poky/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto/0001-Use-cross-compiled-rpcgen.patch index 208974004b..8e459b5634 100644 --- a/poky/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto/0001-Use-cross-compiled-rpcgen.patch +++ b/poky/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto/0001-Use-cross-compiled-rpcgen.patch @@ -10,14 +10,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> rpcsvc/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: git/rpcsvc/Makefile.am -=================================================================== ---- git.orig/rpcsvc/Makefile.am -+++ git/rpcsvc/Makefile.am -@@ -12,5 +12,5 @@ nodist_rpcsvc_HEADERS = klm_prot.h nlm_p +--- a/rpcsvc/Makefile.am ++++ b/rpcsvc/Makefile.am +@@ -12,4 +12,4 @@ nodist_rpcsvc_HEADERS = klm_prot.h nlm_p nfs_prot.h rquota.h sm_inter.h - %.h: %.x + .x.h: - $(top_builddir)/rpcgen/rpcgen -h -o $@ $< + rpcgen -h -o $@ $< - diff --git a/poky/meta/recipes-extended/unzip/unzip/0001-unix-configure-fix-detection-for-cross-compilation.patch b/poky/meta/recipes-extended/unzip/unzip/0001-unix-configure-fix-detection-for-cross-compilation.patch new file mode 100644 index 0000000000..2fa7f481b7 --- /dev/null +++ b/poky/meta/recipes-extended/unzip/unzip/0001-unix-configure-fix-detection-for-cross-compilation.patch @@ -0,0 +1,103 @@ +From 5cbf901b5c3b6a7d1d0ed91b6df4194bb6d25a40 Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Thu, 15 Jun 2023 07:14:17 -0700 +Subject: [PATCH] unix/configure: fix detection for cross compilation + +We're doing cross compilation, running a cross-compiled problem +on host to detemine feature is not correct. So we change runtime +check into compile-time check to detect the features. + +Upstream-Status: Inactive-Upstream + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + unix/configure | 44 +++++++++++++++----------------------------- + 1 file changed, 15 insertions(+), 29 deletions(-) + +diff --git a/unix/configure b/unix/configure +index 8fd82dd..68dee98 100755 +--- a/unix/configure ++++ b/unix/configure +@@ -259,6 +259,10 @@ cat > conftest.c << _EOF_ + #include <sys/stat.h> + #include <unistd.h> + #include <stdio.h> ++ ++_Static_assert(sizeof(off_t) < 8, "sizeof off_t < 8 failed"); ++_Static_assert(sizeof((struct stat){0}.st_size) < 8, "sizeof st_size < 8 failed"); ++ + int main() + { + off_t offset; +@@ -278,21 +282,10 @@ _EOF_ + # compile it + $CC $CFLAGS $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null + if [ $? -ne 0 ]; then +- echo -- no Large File Support ++ echo -- yes we have Large File Support! ++ CFLAGSR="${CFLAGSR} -DLARGE_FILE_SUPPORT" + else +-# run it +- ./conftest +- r=$? +- if [ $r -eq 1 ]; then +- echo -- no Large File Support - no 64-bit off_t +- elif [ $r -eq 2 ]; then +- echo -- no Large File Support - no 64-bit stat +- elif [ $r -eq 3 ]; then +- echo -- yes we have Large File Support! +- CFLAGSR="${CFLAGSR} -DLARGE_FILE_SUPPORT" +- else +- echo -- no Large File Support - conftest returned $r +- fi ++ echo -- no Large File Support + fi + + # Added 11/24/2005 EG +@@ -302,6 +295,11 @@ cat > conftest.c << _EOF_ + #include <stdlib.h> + #include <stdio.h> + #include <wchar.h> ++ ++#ifndef __STDC_ISO_10646__ ++#error "__STDC_ISO_10646__ not defined ++#endif ++ + int main() + { + size_t wsize; +@@ -327,19 +325,8 @@ if [ $? -ne 0 ]; then + echo "-- no Unicode (wchar_t) support" + else + # have wide char support +-# run it +- ./conftest +- r=$? +- if [ $r -eq 0 ]; then +- echo -- no Unicode wchar_t support - wchar_t allocation error +- elif [ $r -eq 1 ]; then +- echo -- no Unicode support - wchar_t encoding unspecified +- elif [ $r -eq 2 ]; then +- echo -- have wchar_t with known UCS encoding - enabling Unicode support! +- CFLAGSR="${CFLAGSR} -DUNICODE_SUPPORT -DUNICODE_WCHAR" +- else +- echo "-- no Unicode (wchar_t) support - conftest returned $r" +- fi ++ echo -- have wchar_t with known UCS encoding - enabling Unicode support! ++ CFLAGSR="${CFLAGSR} -DUNICODE_SUPPORT -DUNICODE_WCHAR" + fi + + echo "Check for setlocale support (needed for UNICODE Native check)" +@@ -418,8 +405,7 @@ temp_link="link_$$" + echo "int main() { lchmod(\"${temp_file}\", 0666); }" \ + ) > conftest.c + ln -s "${temp_link}" "${temp_file}" && \ +- $CC $BFLAG $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null && \ +- ./conftest ++ $CC -Werror=implicit-function-declaration $BFLAG $LDFLAGS -o conftest conftest.c >/dev/null + [ $? -ne 0 ] && CFLAGSR="${CFLAGSR} -DNO_LCHMOD" + rm -f "${temp_file}" + +-- +2.34.1 + diff --git a/poky/meta/recipes-extended/unzip/unzip_6.0.bb b/poky/meta/recipes-extended/unzip/unzip_6.0.bb index a4d10c30aa..3051e9b5bc 100644 --- a/poky/meta/recipes-extended/unzip/unzip_6.0.bb +++ b/poky/meta/recipes-extended/unzip/unzip_6.0.bb @@ -32,6 +32,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/infozip/UnZip%206.x%20%28latest%29/UnZip%206.0/ file://CVE-2022-0529.patch \ file://CVE-2022-0530.patch \ file://0001-configure-Add-correct-system-headers-and-prototypes-.patch \ + file://0001-unix-configure-fix-detection-for-cross-compilation.patch \ " UPSTREAM_VERSION_UNKNOWN = "1" @@ -46,9 +47,6 @@ UPSTREAM_CHECK_REGEX = "unzip(?P<pver>(?!552).+)\.tgz" S = "${WORKDIR}/unzip60" -# Enable largefile support -CFLAGS += "-DLARGE_FILE_SUPPORT" - # Makefile uses CF_NOOPT instead of CFLAGS. We lifted the values from # Makefile and add CFLAGS. Optimization will be overriden by unzip # configure to be -O3. diff --git a/poky/meta/recipes-extended/wget/wget.inc b/poky/meta/recipes-extended/wget/wget.inc index d31756dbc8..51926e7296 100644 --- a/poky/meta/recipes-extended/wget/wget.inc +++ b/poky/meta/recipes-extended/wget/wget.inc @@ -7,7 +7,7 @@ FTP sites" HOMEPAGE = "https://www.gnu.org/software/wget/" SECTION = "console/network" LICENSE = "GPL-3.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e" +LIC_FILES_CHKSUM = "file://COPYING;md5=6f65012d1daf98cb09b386cfb68df26b" inherit autotools gettext texinfo update-alternatives pkgconfig diff --git a/poky/meta/recipes-extended/wget/wget_1.21.3.bb b/poky/meta/recipes-extended/wget/wget_1.21.4.bb index f176a1546c..1d31b0116d 100644 --- a/poky/meta/recipes-extended/wget/wget_1.21.3.bb +++ b/poky/meta/recipes-extended/wget/wget_1.21.4.bb @@ -2,6 +2,6 @@ SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \ file://0002-improve-reproducibility.patch \ " -SRC_URI[sha256sum] = "5726bb8bc5ca0f6dc7110f6416e4bb7019e2d2ff5bf93d1ca2ffcc6656f220e5" +SRC_URI[sha256sum] = "81542f5cefb8faacc39bbbc6c82ded80e3e4a88505ae72ea51df27525bcde04c" require wget.inc diff --git a/poky/meta/recipes-extended/zip/zip-3.0/0001-unix-configure-use-_Static_assert-to-do-correct-dete.patch b/poky/meta/recipes-extended/zip/zip-3.0/0001-unix-configure-use-_Static_assert-to-do-correct-dete.patch new file mode 100644 index 0000000000..106f246a7c --- /dev/null +++ b/poky/meta/recipes-extended/zip/zip-3.0/0001-unix-configure-use-_Static_assert-to-do-correct-dete.patch @@ -0,0 +1,96 @@ +From 9916fc6f1f93f3e092e3c6937c30dc8137c26d34 Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Thu, 15 Jun 2023 18:31:26 +0800 +Subject: [PATCH] unix/configure: use _Static_assert to do correct detection + +We're doing cross compilation, running a cross-compiled problem +on host to detemine feature is not correct. Use _Static_assert +to do the detection correctly. + +Upstream-Status: Inactive-Upstream + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + unix/configure | 42 ++++++++++++------------------------------ + 1 file changed, 12 insertions(+), 30 deletions(-) + +diff --git a/unix/configure b/unix/configure +index f2b3d02..f917086 100644 +--- a/unix/configure ++++ b/unix/configure +@@ -361,6 +361,10 @@ cat > conftest.c << _EOF_ + #include <sys/stat.h> + #include <unistd.h> + #include <stdio.h> ++ ++_Static_assert(sizeof((struct stat){0}.st_uid) == 2, "sizeof st_uid is not 16 bit"); ++_Static_assert(sizeof((struct stat){0}.st_gid) == 2, "sizeof st_gid is not 16 bit"); ++ + int main() + { + struct stat s; +@@ -385,21 +389,7 @@ if [ $? -ne 0 ]; then + echo -- UID/GID test failed on compile - disabling old 16-bit UID/GID support + CFLAGS="${CFLAGS} -DUIDGID_NOT_16BIT" + else +-# run it +- ./conftest +- r=$? +- if [ $r -eq 1 ]; then +- echo -- UID not 2 bytes - disabling old 16-bit UID/GID support +- CFLAGS="${CFLAGS} -DUIDGID_NOT_16BIT" +- elif [ $r -eq 2 ]; then +- echo -- GID not 2 bytes - disabling old 16-bit UID/GID support +- CFLAGS="${CFLAGS} -DUIDGID_NOT_16BIT" +- elif [ $r -eq 3 ]; then +- echo -- 16-bit UIDs and GIDs - keeping old 16-bit UID/GID support +- else +- echo -- test failed - conftest returned $r - disabling old 16-bit UID/GID support +- CFLAGS="${CFLAGS} -DUIDGID_NOT_16BIT" +- fi ++ echo -- 16-bit UIDs and GIDs - keeping old 16-bit UID/GID support + fi + + +@@ -417,6 +407,10 @@ cat > conftest.c << _EOF_ + #include <sys/stat.h> + #include <unistd.h> + #include <stdio.h> ++ ++_Static_assert(sizeof(off_t) < 8, "sizeof off_t < 8 failed"); ++_Static_assert(sizeof((struct stat){0}.st_size) < 8, "sizeof st_size < 8 failed"); ++ + int main() + { + off_t offset; +@@ -436,24 +430,12 @@ _EOF_ + # compile it + $CC -o conftest conftest.c >/dev/null 2>/dev/null + if [ $? -ne 0 ]; then +- echo -- no Large File Support ++ echo -- yes we have Large File Support! ++ CFLAGS="${CFLAGS} -DLARGE_FILE_SUPPORT" + else +-# run it +- ./conftest +- r=$? +- if [ $r -eq 1 ]; then +- echo -- no Large File Support - no 64-bit off_t +- elif [ $r -eq 2 ]; then +- echo -- no Large File Support - no 64-bit stat +- elif [ $r -eq 3 ]; then +- echo -- yes we have Large File Support! +- CFLAGS="${CFLAGS} -DLARGE_FILE_SUPPORT" +- else +- echo -- no Large File Support - conftest returned $r +- fi ++ echo -- no Large File Support + fi + +- + # Check for wide char for Unicode support + # Added 11/24/2005 EG + +-- +2.34.1 + diff --git a/poky/meta/recipes-extended/zip/zip_3.0.bb b/poky/meta/recipes-extended/zip/zip_3.0.bb index 1930a40140..82153131b4 100644 --- a/poky/meta/recipes-extended/zip/zip_3.0.bb +++ b/poky/meta/recipes-extended/zip/zip_3.0.bb @@ -19,6 +19,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/infozip/Zip%203.x%20%28latest%29/3.0/zip30.tar. file://0001-configure-Use-CFLAGS-and-LDFLAGS-when-doing-link-tes.patch \ file://0001-configure-Specify-correct-function-signatures-and-de.patch \ file://0002-unix.c-Do-not-redefine-DIR-as-FILE.patch \ + file://0001-unix-configure-use-_Static_assert-to-do-correct-dete.patch \ " UPSTREAM_VERSION_UNKNOWN = "1" @@ -31,9 +32,6 @@ CVE_CHECK_IGNORE += "CVE-2018-13410" # Not for zip but for smart contract implementation for it CVE_CHECK_IGNORE += "CVE-2018-13684" -# Enable largefile support -CFLAGS += "-DLARGE_FILE_SUPPORT" - # zip.inc sets CFLAGS, but what Makefile actually uses is # CFLAGS_NOOPT. It will also force -O3 optimization, overriding # whatever we set. diff --git a/poky/meta/recipes-extended/zstd/zstd/0001-pzstd-use-directly-for-the-test-c-snippet.patch b/poky/meta/recipes-extended/zstd/zstd/0001-pzstd-use-directly-for-the-test-c-snippet.patch new file mode 100644 index 0000000000..847a641691 --- /dev/null +++ b/poky/meta/recipes-extended/zstd/zstd/0001-pzstd-use-directly-for-the-test-c-snippet.patch @@ -0,0 +1,39 @@ +From 121ef5253a49065dea6a89536ca7bd3dabd40e25 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Mon, 19 Jun 2023 17:10:09 +0200 +Subject: [PATCH] pzstd: use c++14 without conditions + +Doing this check with a direct c++ snippet is prone to portability problems: + +- \043 is not portable between shells: dash expands it to #, +bash does not; + +- using # directly works with make 4.3 but does not with make 4.2. + +Let's just use the c++ version that covers both the code and the gtest. + +Upstream-Status: Submitted [https://github.com/facebook/zstd/pull/3682] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> + +--- + contrib/pzstd/Makefile | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +diff --git a/contrib/pzstd/Makefile b/contrib/pzstd/Makefile +index e62f8e87..58fb82a1 100644 +--- a/contrib/pzstd/Makefile ++++ b/contrib/pzstd/Makefile +@@ -37,11 +37,8 @@ CFLAGS += -Wno-deprecated-declarations + PZSTD_INC = -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(PROGDIR) -I. + GTEST_INC = -isystem googletest/googletest/include + +-# If default C++ version is older than C++11, explicitly set C++11, which is the +-# minimum required by the code. +-ifeq ($(shell echo "\043if __cplusplus < 201103L\n\043error\n\043endif" | $(CXX) -x c++ -Werror -c - -o /dev/null 2>/dev/null && echo 1 || echo 0),0) +-PZSTD_CXX_STD := -std=c++11 +-endif ++# Set the minimum required by gtest ++PZSTD_CXX_STD := -std=c++14 + + PZSTD_CPPFLAGS = $(PZSTD_INC) + PZSTD_CCXXFLAGS = diff --git a/poky/meta/recipes-extended/zstd/zstd_1.5.4.bb b/poky/meta/recipes-extended/zstd/zstd_1.5.5.bb index c2e96225e4..5c5fb5e734 100644 --- a/poky/meta/recipes-extended/zstd/zstd_1.5.4.bb +++ b/poky/meta/recipes-extended/zstd/zstd_1.5.5.bb @@ -10,9 +10,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0822a32f7acdbe013606746641746ee8 \ file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0 \ " -SRC_URI = "git://github.com/facebook/zstd.git;branch=release;protocol=https" +SRC_URI = "git://github.com/facebook/zstd.git;branch=release;protocol=https \ + file://0001-pzstd-use-directly-for-the-test-c-snippet.patch" -SRCREV = "945f27758c0fd67b636103a38dbf050266c6b90a" +SRCREV = "63779c798237346c2b245c546c40b72a5a5913fe" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" CVE_PRODUCT = "zstandard" diff --git a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch index 030ff17601..9ba8bcfd71 100644 --- a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch +++ b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch @@ -1,4 +1,4 @@ -From d396e5126461631e2c73ce98ba034f1e44598f6a Mon Sep 17 00:00:00 2001 +From 2c31944eabbb42a86a4ddaa2998a3b100a13138d Mon Sep 17 00:00:00 2001 From: Sascha Silbe <x-yo17@se-silbe.de> Date: Fri, 8 Jun 2018 13:55:10 +0200 Subject: [PATCH] Relocate the repository directory for native builds diff --git a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.74.0.bb b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.76.1.bb index d3a7ce2fd9..6d00633825 100644 --- a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.74.0.bb +++ b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.76.1.bb @@ -17,7 +17,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-$ file://0001-g-ir-tool-template.in-fix-girdir-path.patch \ " -SRC_URI[sha256sum] = "347b3a719e68ba4c69ff2d57ee2689233ea8c07fc492205e573386779e42d653" +SRC_URI[sha256sum] = "196178bf64345501dcdc4d8469b36aa6fe80489354efe71cb7cb8ab82a3738bf" SRC_URI:append:class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch" @@ -27,7 +27,7 @@ GTKDOC_MESON_OPTION = "gtk_doc" MULTILIB_SCRIPTS = "${PN}:${bindir}/g-ir-annotation-tool ${PN}:${bindir}/g-ir-scanner" -DEPENDS += " libffi zlib glib-2.0 python3 flex-native bison-native autoconf-archive-native" +DEPENDS += " libffi zlib glib-2.0 python3 flex-native bison-native" # target build needs qemu to run temporary introspection binaries created # on the fly by g-ir-scanner and a native version of itself to run diff --git a/poky/meta/recipes-gnome/gtk+/gtk4_4.10.3.bb b/poky/meta/recipes-gnome/gtk+/gtk4_4.10.4.bb index 9aa33e6851..2d1e0e74a9 100644 --- a/poky/meta/recipes-gnome/gtk+/gtk4_4.10.3.bb +++ b/poky/meta/recipes-gnome/gtk+/gtk4_4.10.4.bb @@ -37,7 +37,7 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" UPSTREAM_CHECK_REGEX = "gtk-(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)\.tar.xz" SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk/${MAJ_VER}/gtk-${PV}.tar.xz" -SRC_URI[sha256sum] = "4545441ad79e377eb6e0a705026dc7a46886e46a1b034db40912909da801cea9" +SRC_URI[sha256sum] = "7725400482e0685e28265e226c62847f4e73cfca9e9b416ac5838207f5377a24" S = "${WORKDIR}/gtk-${PV}" diff --git a/poky/meta/recipes-graphics/glslang/glslang_1.3.243.0.bb b/poky/meta/recipes-graphics/glslang/glslang_1.3.250.0.bb index c50d67a652..6e9c666d46 100644 --- a/poky/meta/recipes-graphics/glslang/glslang_1.3.243.0.bb +++ b/poky/meta/recipes-graphics/glslang/glslang_1.3.250.0.bb @@ -8,7 +8,7 @@ HOMEPAGE = "https://www.khronos.org/opengles/sdk/tools/Reference-Compiler" LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3" -SRCREV = "14e5a04e70057972eef8a40df422e30a3b70e4b5" +SRCREV = "d1517d64cfca91f573af1bf7341dc3a5113349c0" SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=main \ file://0001-generate-glslang-pkg-config.patch \ " diff --git a/poky/meta/recipes-graphics/kmscube/kmscube_git.bb b/poky/meta/recipes-graphics/kmscube/kmscube_git.bb index 67ac97b963..ca76251d7a 100644 --- a/poky/meta/recipes-graphics/kmscube/kmscube_git.bb +++ b/poky/meta/recipes-graphics/kmscube/kmscube_git.bb @@ -10,7 +10,7 @@ DEPENDS = "virtual/libgles3 virtual/libgles2 virtual/egl libdrm virtual/libgbm" LIC_FILES_CHKSUM = "file://kmscube.c;beginline=1;endline=23;md5=8b309d4ee67b7315ff7381270dd631fb" -SRCREV = "345111481d654b38a72b5c3629151dc74f7a82bc" +SRCREV = "cf4ec7f35521eb54d72ce0c92ce65b2249171cbd" SRC_URI = "git://gitlab.freedesktop.org/mesa/kmscube;branch=master;protocol=https" UPSTREAM_CHECK_COMMITS = "1" diff --git a/poky/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch b/poky/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch index 36c33f889b..a555c5f865 100644 --- a/poky/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch +++ b/poky/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch @@ -1,4 +1,4 @@ -From 3b4d6b89f644b43e507c08181fef06db4326f9da Mon Sep 17 00:00:00 2001 +From b251af67df5a6840d2e9cc06edae2c387f8778f1 Mon Sep 17 00:00:00 2001 From: Alistair Francis <alistair@alistair23.me> Date: Thu, 14 Nov 2019 13:04:49 -0800 Subject: [PATCH] meson.build: check for all linux host_os combinations @@ -20,19 +20,19 @@ Signed-off-by: Alistair Francis <alistair@alistair23.me> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build -index 172c64a..9b5294c 100644 +index 22385d8..15f48a6 100644 --- a/meson.build +++ b/meson.build -@@ -173,7 +173,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2 +@@ -121,7 +121,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2 # Only build shared_glapi if at least one OpenGL API is enabled with_shared_glapi = with_shared_glapi and with_any_opengl -system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android'].contains(host_machine.system()) +system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android'].contains(host_machine.system()) or host_machine.system().startswith('linux') - with_freedreno_kgsl = get_option('freedreno-kgsl') - if with_freedreno_kgsl -@@ -1076,7 +1076,7 @@ if cc.has_function('reallocarray') + gallium_drivers = get_option('gallium-drivers') + if gallium_drivers.contains('auto') +@@ -909,7 +909,7 @@ if cc.has_function('fmemopen') endif # TODO: this is very incomplete diff --git a/poky/meta/recipes-graphics/mesa/mesa-gl_23.0.3.bb b/poky/meta/recipes-graphics/mesa/mesa-gl_23.1.1.bb index ca160f1bfc..ca160f1bfc 100644 --- a/poky/meta/recipes-graphics/mesa/mesa-gl_23.0.3.bb +++ b/poky/meta/recipes-graphics/mesa/mesa-gl_23.1.1.bb diff --git a/poky/meta/recipes-graphics/mesa/mesa.inc b/poky/meta/recipes-graphics/mesa/mesa.inc index 439389fb8a..ac42a8dd4f 100644 --- a/poky/meta/recipes-graphics/mesa/mesa.inc +++ b/poky/meta/recipes-graphics/mesa/mesa.inc @@ -19,7 +19,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ " -SRC_URI[sha256sum] = "386362a5d80df3b096636b67f340e1ce67b705b44767d5bdd11d2ed1037192d5" +SRC_URI[sha256sum] = "a2679031ed5b73b29c4f042ac64d96f83b0cfe4858617de32e2efc196c653a40" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" diff --git a/poky/meta/recipes-graphics/mesa/mesa_23.0.3.bb b/poky/meta/recipes-graphics/mesa/mesa_23.1.1.bb index 96e8aa38d6..96e8aa38d6 100644 --- a/poky/meta/recipes-graphics/mesa/mesa_23.0.3.bb +++ b/poky/meta/recipes-graphics/mesa/mesa_23.1.1.bb diff --git a/poky/meta/recipes-graphics/shaderc/files/0001-cmake-disable-building-external-dependencies.patch b/poky/meta/recipes-graphics/shaderc/files/0001-cmake-disable-building-external-dependencies.patch index cc9a400028..35855bd832 100644 --- a/poky/meta/recipes-graphics/shaderc/files/0001-cmake-disable-building-external-dependencies.patch +++ b/poky/meta/recipes-graphics/shaderc/files/0001-cmake-disable-building-external-dependencies.patch @@ -1,7 +1,7 @@ -From 071a9d71bea91bbefcf15e061fc87e53568f3188 Mon Sep 17 00:00:00 2001 +From d3fbd6b9427f29606540528d17fe02930cd78d0c Mon Sep 17 00:00:00 2001 From: Jose Quaresma <quaresma.jose@gmail.com> Date: Sat, 13 Feb 2021 00:45:56 +0000 -Subject: [PATCH 1/3] cmake: disable building external dependencies +Subject: [PATCH] cmake: disable building external dependencies - add cmake option to disable the build of the third_party dependencies - change the update_build_version.py to use pkg-config when third_party dependencies not found @@ -9,24 +9,25 @@ Subject: [PATCH 1/3] cmake: disable building external dependencies Upstream-Status: Inappropriate [OE-core specific] Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> + --- CMakeLists.txt | 13 ++++++++++--- utils/update_build_version.py | 22 +++++++++++++++------- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5c74cd8..b358f6b 100644 +index 633c244..75b01da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -41,6 +41,7 @@ else() +@@ -67,6 +67,7 @@ else() endif() option(SHADERC_ENABLE_WERROR_COMPILE "Enable passing -Werror to compiler, if available" ON) +option(BUILD_EXTERNAL "Build external dependencies in /third_party" ON) - set (CMAKE_CXX_STANDARD 11) + set (CMAKE_CXX_STANDARD 17) -@@ -101,8 +102,14 @@ endif(MSVC) +@@ -129,8 +130,14 @@ endif(MSVC) # Configure subdirectories. @@ -43,7 +44,7 @@ index 5c74cd8..b358f6b 100644 add_subdirectory(libshaderc_util) add_subdirectory(libshaderc) -@@ -112,7 +119,7 @@ add_subdirectory(examples) +@@ -142,7 +149,7 @@ endif() add_custom_target(build-version ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py @@ -104,6 +105,3 @@ index 5785390..f72b762 100755 mkdir_p(os.path.dirname(output_file)) if os.path.isfile(output_file): --- -2.30.1 - diff --git a/poky/meta/recipes-graphics/shaderc/shaderc_2023.2.bb b/poky/meta/recipes-graphics/shaderc/shaderc_2023.4.bb index 07fae0bb7e..739e7ae81c 100644 --- a/poky/meta/recipes-graphics/shaderc/shaderc_2023.2.bb +++ b/poky/meta/recipes-graphics/shaderc/shaderc_2023.4.bb @@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/google/shaderc" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRCREV = "55f4bbd993de3a3cad34cb41cd07b82fa1c77dd6" +SRCREV = "7a8b3da0583425cf511336cf3afbdcf2ebc8b36b" SRC_URI = "git://github.com/google/shaderc.git;protocol=https;branch=main \ file://0001-cmake-disable-building-external-dependencies.patch \ file://0002-libshaderc_util-fix-glslang-header-file-location.patch \ diff --git a/poky/meta/recipes-graphics/spir/spirv-headers_1.3.243.0.bb b/poky/meta/recipes-graphics/spir/spirv-headers_1.3.250.0.bb index e27c0a67dc..d0a2e2e991 100644 --- a/poky/meta/recipes-graphics/spir/spirv-headers_1.3.243.0.bb +++ b/poky/meta/recipes-graphics/spir/spirv-headers_1.3.250.0.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://www.khronos.org/registry/spir-v" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d" -SRCREV = "1feaf4414eb2b353764d01d88f8aa4bcc67b60db" +SRCREV = "268a061764ee69f09a477a695bf6a11ffe311b8d" SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main" PE = "1" # These recipes need to be updated in lockstep with each other: diff --git a/poky/meta/recipes-graphics/spir/spirv-tools_1.3.243.0.bb b/poky/meta/recipes-graphics/spir/spirv-tools_1.3.250.0.bb index c57acc5a11..bde6ddd04b 100644 --- a/poky/meta/recipes-graphics/spir/spirv-tools_1.3.243.0.bb +++ b/poky/meta/recipes-graphics/spir/spirv-tools_1.3.250.0.bb @@ -7,7 +7,7 @@ SECTION = "graphics" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRCREV = "44d72a9b36702f093dd20815561a56778b2d181e" +SRCREV = "e7c6084fd1d6d6f5ac393e842728d8be309688ca" SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https" PE = "1" # These recipes need to be updated in lockstep with each other: @@ -32,7 +32,7 @@ do_install:append:class-target() { # Properly set _IMPORT_PREFIX in INTERFACE_LINK_LIBRARIES so that dependent # tools can find the right library sed -i ${D}${libdir}/cmake/SPIRV-Tools/SPIRV-ToolsTarget.cmake \ - -e 's:INTERFACE_LINK_LIBRARIES.*$:INTERFACE_LINK_LIBRARIES "\$\{_IMPORT_PREFIX\}/lib":' + -e 's:INTERFACE_LINK_LIBRARIES.*$:INTERFACE_LINK_LIBRARIES "\$\{_IMPORT_PREFIX\}/${baselib}":' } # all the libraries are unversioned, so don't pack it on PN-dev diff --git a/poky/meta/recipes-graphics/vulkan/vulkan-headers_1.3.243.0.bb b/poky/meta/recipes-graphics/vulkan/vulkan-headers_1.3.250.0.bb index 6ddc35e5d8..2970767ff3 100644 --- a/poky/meta/recipes-graphics/vulkan/vulkan-headers_1.3.243.0.bb +++ b/poky/meta/recipes-graphics/vulkan/vulkan-headers_1.3.250.0.bb @@ -11,7 +11,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=main;protocol=https" -SRCREV = "65ad768d8603671fc1085fe115019e72a595ced8" +SRCREV = "9e61870ecbd32514113b467e0a0c46f60ed222c7" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-graphics/vulkan/vulkan-loader_1.3.243.0.bb b/poky/meta/recipes-graphics/vulkan/vulkan-loader_1.3.250.0.bb index 20128667f1..456c973406 100644 --- a/poky/meta/recipes-graphics/vulkan/vulkan-loader_1.3.243.0.bb +++ b/poky/meta/recipes-graphics/vulkan/vulkan-loader_1.3.250.0.bb @@ -9,8 +9,8 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac" -SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=sdk-1.3.243;protocol=https" -SRCREV = "22407d7804f111fbc0e31fa0db592d658e19ae8b" +SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=sdk-1.3.250;protocol=https" +SRCREV = "f372068d09fc13bcf54b8c81274f37aa5f46aea3" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-graphics/vulkan/vulkan-tools/0001-scripts-CMakeLists.txt-do-not-make-special-arrangeme.patch b/poky/meta/recipes-graphics/vulkan/vulkan-tools/0001-scripts-CMakeLists.txt-do-not-make-special-arrangeme.patch new file mode 100644 index 0000000000..6b70a1e62d --- /dev/null +++ b/poky/meta/recipes-graphics/vulkan/vulkan-tools/0001-scripts-CMakeLists.txt-do-not-make-special-arrangeme.patch @@ -0,0 +1,29 @@ +From 9060e916ca05d34b56c62f2be0b4a77dd104e2aa Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Fri, 2 Jun 2023 14:13:00 +0200 +Subject: [PATCH] scripts/CMakeLists.txt: append to CMAKE_FIND_ROOT_PATH + instead of replacing it + +Resetting CMAKE_FIND_ROOT_PATH in particular breaks builds in Yocto +(which is a major cross compiling framework). + +Upstream-Status: Submitted [https://github.com/KhronosGroup/Vulkan-Tools/pull/808] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> + +--- + scripts/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt +index 5b979d43..19a58bf9 100644 +--- a/scripts/CMakeLists.txt ++++ b/scripts/CMakeLists.txt +@@ -114,7 +114,7 @@ if (MOLTENVK_REPO_ROOT) + endif() + + if (CMAKE_CROSSCOMPILING) +- set(CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE) ++ set(CMAKE_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH} ${CMAKE_PREFIX_PATH} PARENT_SCOPE) + else() + set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE) + endif() diff --git a/poky/meta/recipes-graphics/vulkan/vulkan-tools_1.3.243.0.bb b/poky/meta/recipes-graphics/vulkan/vulkan-tools_1.3.250.0.bb index dfdd716abd..0346b380ee 100644 --- a/poky/meta/recipes-graphics/vulkan/vulkan-tools_1.3.243.0.bb +++ b/poky/meta/recipes-graphics/vulkan/vulkan-tools_1.3.250.0.bb @@ -6,8 +6,10 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=sdk-1.3.243;protocol=https" -SRCREV = "18bdf5565f5d02831869785cbf758fa7b295b7d5" +SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=main;protocol=https \ + file://0001-scripts-CMakeLists.txt-do-not-make-special-arrangeme.patch \ + " +SRCREV = "695887a994ef9cc00a7aa3f9c00b31a56ea79534" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.243.0.bb b/poky/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.243.0.bb new file mode 100644 index 0000000000..bfb4b370b8 --- /dev/null +++ b/poky/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.243.0.bb @@ -0,0 +1,48 @@ +SUMMARY = "Vulkan Validation layers" +DESCRIPTION = "Khronos official Vulkan validation layers to assist developers \ +in verifying that their applications correctly use the Vulkan API" +HOMEPAGE = "https://www.khronos.org/vulkan/" +BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-ValidationLayers" +SECTION = "libs" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8df9e8826734226d08cb412babfa599c" + +SRC_URI = "git://git@github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=sdk-1.3.243;protocol=https" +SRCREV = "4ac0fd8e6cb3d49105d707d9ec07f0f3aa0943d6" + +S = "${WORKDIR}/git" + +REQUIRED_DISTRO_FEATURES = "vulkan" + +DEPENDS = "vulkan-headers vulkan-loader spirv-headers spirv-tools glslang" + +# BUILD_TESTS - Not required for OE builds +# USE_ROBIN_HOOD_HASHING - Provides substantial performance improvements on all platforms. +# Yocto project doesn't contain a recipe for package so disabled it. +EXTRA_OECMAKE = "\ + -DBUILD_TESTS=OFF \ + -DUSE_ROBIN_HOOD_HASHING=OFF \ + -DGLSLANG_INSTALL_DIR=${STAGING_LIBDIR} \ + -DVULKAN_HEADERS_INSTALL_DIR=${STAGING_EXECPREFIXDIR} \ + -DSPIRV_HEADERS_INSTALL_DIR=${STAGING_EXECPREFIXDIR} \ + " + +PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF, libxcb libx11 libxrandr" +PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland" + +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)}" + +inherit cmake features_check pkgconfig + +FILES:${PN} += "${datadir}/vulkan" + +SOLIBS = ".so" +FILES_SOLIBSDEV = "" + +# These recipes need to be updated in lockstep with each other: +# glslang, vulkan-headers, vulkan-loader, vulkan-tools, +# vulkan-validation-layers, spirv-headers, spirv-tools +# The tags versions should always be sdk-x.y.z, as this is what +# upstream considers a release. +UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" diff --git a/poky/meta/recipes-graphics/wayland/weston-init.bb b/poky/meta/recipes-graphics/wayland/weston-init.bb index 77dda03cf5..1884b5d440 100644 --- a/poky/meta/recipes-graphics/wayland/weston-init.bb +++ b/poky/meta/recipes-graphics/wayland/weston-init.bb @@ -9,15 +9,17 @@ SRC_URI = "file://init \ file://weston.ini \ file://weston.service \ file://weston.socket \ + file://weston-socket.sh \ file://weston-autologin \ file://weston-start" S = "${WORKDIR}" -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xwayland', '', d)}" PACKAGECONFIG:append:qemuriscv64 = " use-pixman" PACKAGECONFIG:append:qemuppc64 = " use-pixman" +PACKAGECONFIG[xwayland] = ",," PACKAGECONFIG[no-idle-timeout] = ",," PACKAGECONFIG[use-pixman] = ",," @@ -25,32 +27,38 @@ DEFAULTBACKEND ??= "" DEFAULTBACKEND:qemuall ?= "drm" do_install() { - if [ "${VIRTUAL-RUNTIME_init_manager}" != "systemd" ]; then + # Install weston-start script + if [ "${VIRTUAL-RUNTIME_init_manager}" != "systemd" ]; then + install -Dm755 ${WORKDIR}/weston-start ${D}${bindir}/weston-start + sed -i 's,@DATADIR@,${datadir},g' ${D}${bindir}/weston-start + sed -i 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${bindir}/weston-start install -Dm755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston sed -i 's#ROOTHOME#${ROOT_HOME}#' ${D}/${sysconfdir}/init.d/weston - fi - install -D -p -m0644 ${WORKDIR}/weston.ini ${D}${sysconfdir}/xdg/weston/weston.ini - install -Dm644 ${WORKDIR}/weston.env ${D}${sysconfdir}/default/weston + fi # Install Weston systemd service and accompanying udev rule - install -D -p -m0644 ${WORKDIR}/weston.service ${D}${systemd_system_unitdir}/weston.service - install -D -p -m0644 ${WORKDIR}/weston.socket ${D}${systemd_system_unitdir}/weston.socket - if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -D -p -m0644 ${WORKDIR}/weston.service ${D}${systemd_system_unitdir}/weston.service + install -D -p -m0644 ${WORKDIR}/weston.socket ${D}${systemd_system_unitdir}/weston.socket + install -D -p -m0644 ${WORKDIR}/weston-socket.sh ${D}${sysconfdir}/profile.d/weston-socket.sh + sed -i -e s:/etc:${sysconfdir}:g \ + -e s:/usr/bin:${bindir}:g \ + -e s:/var:${localstatedir}:g \ + ${D}${systemd_system_unitdir}/weston.service + fi + + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then install -D -p -m0644 ${WORKDIR}/weston-autologin ${D}${sysconfdir}/pam.d/weston-autologin - fi - sed -i -e s:/etc:${sysconfdir}:g \ - -e s:/usr/bin:${bindir}:g \ - -e s:/var:${localstatedir}:g \ - ${D}${systemd_system_unitdir}/weston.service - # Install weston-start script - install -Dm755 ${WORKDIR}/weston-start ${D}${bindir}/weston-start - sed -i 's,@DATADIR@,${datadir},g' ${D}${bindir}/weston-start - sed -i 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${bindir}/weston-start - if [ -n "${DEFAULTBACKEND}" ]; then + fi + + install -D -p -m0644 ${WORKDIR}/weston.ini ${D}${sysconfdir}/xdg/weston/weston.ini + install -Dm644 ${WORKDIR}/weston.env ${D}${sysconfdir}/default/weston + + if [ -n "${DEFAULTBACKEND}" ]; then sed -i -e "/^\[core\]/a backend=${DEFAULTBACKEND}-backend.so" ${D}${sysconfdir}/xdg/weston/weston.ini fi - if [ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'yes', 'no', d)}" = "yes" ]; then + if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then sed -i -e "/^\[core\]/a xwayland=true" ${D}${sysconfdir}/xdg/weston/weston.ini fi @@ -82,6 +90,7 @@ INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ." FILES:${PN} += "\ ${sysconfdir}/xdg/weston/weston.ini \ + ${sysconfdir}/profile.d/weston-socket.sh \ ${systemd_system_unitdir}/weston.service \ ${systemd_system_unitdir}/weston.socket \ ${sysconfdir}/default/weston \ @@ -92,6 +101,6 @@ FILES:${PN} += "\ CONFFILES:${PN} += "${sysconfdir}/xdg/weston/weston.ini ${sysconfdir}/default/weston" SYSTEMD_SERVICE:${PN} = "weston.service weston.socket" -USERADD_PARAM:${PN} = "--home /home/weston --shell /bin/sh --user-group -G video,input weston" -GROUPADD_PARAM:${PN} = "-r wayland" +USERADD_PARAM:${PN} = "--home /home/weston --shell /bin/sh --user-group -G video,input,render,wayland weston" +GROUPADD_PARAM:${PN} = "-r wayland; -r render" diff --git a/poky/meta/recipes-graphics/wayland/weston-init/weston-socket.sh b/poky/meta/recipes-graphics/wayland/weston-init/weston-socket.sh new file mode 100755 index 0000000000..86389d63a3 --- /dev/null +++ b/poky/meta/recipes-graphics/wayland/weston-init/weston-socket.sh @@ -0,0 +1,20 @@ +#!/bin/sh + +# set weston variables for use with global weston socket +global_socket="/run/wayland-0" +if [ -e "$global_socket" ]; then + weston_group=$(stat -c "%G" "$global_socket") + if [ "$(id -u)" = "0" ]; then + export WAYLAND_DISPLAY="$global_socket" + else + case "$(groups "$USER")" in + *"$weston_group"*) + export WAYLAND_DISPLAY="$global_socket" + ;; + *) + ;; + esac + fi + unset weston_group +fi +unset global_socket diff --git a/poky/meta/recipes-graphics/wayland/weston_11.0.1.bb b/poky/meta/recipes-graphics/wayland/weston_11.0.1.bb index 4f6ce19915..0838791a6b 100644 --- a/poky/meta/recipes-graphics/wayland/weston_11.0.1.bb +++ b/poky/meta/recipes-graphics/wayland/weston_11.0.1.bb @@ -57,7 +57,7 @@ PACKAGECONFIG[kms] = "-Dbackend-drm=true,-Dbackend-drm=false,drm udev virtual/eg # Weston on Wayland (nested Weston) PACKAGECONFIG[wayland] = "-Dbackend-wayland=true,-Dbackend-wayland=false,virtual/egl virtual/libgles2" # Weston on X11 -PACKAGECONFIG[x11] = "-Dbackend-x11=true,-Dbackend-x11=false,virtual/libx11 libxcb libxcb libxcursor cairo" +PACKAGECONFIG[x11] = "-Dbackend-x11=true,-Dbackend-x11=false,virtual/libx11 libxcb libxcursor" # Headless Weston PACKAGECONFIG[headless] = "-Dbackend-headless=true,-Dbackend-headless=false" # Weston on RDP @@ -73,7 +73,7 @@ PACKAGECONFIG[webp] = "-Dimage-webp=true,-Dimage-webp=false,libwebp" # Weston with systemd-login support PACKAGECONFIG[systemd] = "-Dsystemd=true -Dlauncher-logind=true,-Dsystemd=false -Dlauncher-logind=false,systemd dbus" # Weston with Xwayland support (requires X11 and Wayland) -PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,xwayland" +PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,libxcb libxcursor xwayland" # colord CMS support PACKAGECONFIG[colord] = "-Ddeprecated-color-management-colord=true,-Ddeprecated-color-management-colord=false,colord" # Clients support diff --git a/poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.2.1.bb b/poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.3.0.bb index e1c47aa5e7..892046e959 100644 --- a/poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.2.1.bb +++ b/poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.3.0.bb @@ -7,6 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a22925127bd3c827c384cedd23ed2309" DEPENDS += "libinput" XORG_DRIVER_COMPRESSOR = ".tar.xz" -SRC_URI[sha256sum] = "8151db5b9ddb317c0ce92dcb62da9a8db5079e5b8a95b60abc854da21e7e971b" +SRC_URI[sha256sum] = "1446ba20a22bc968b5a4a0b4dbc3b8e037c50d9c59ac75fa3f7fc506c58c1abb" FILES:${PN} += "${datadir}/X11/xorg.conf.d" diff --git a/poky/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.4.bb b/poky/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.5.bb index 191987494e..92e54d9701 100644 --- a/poky/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.4.bb +++ b/poky/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.5.bb @@ -8,7 +8,7 @@ functions as a pointer input device, and may be used as the X server's \ core pointer. Multiple mice are supported by multiple instances of this \ driver." -LIC_FILES_CHKSUM = "file://COPYING;md5=90ea9f90d72b6d9327dede5ffdb2a510" +LIC_FILES_CHKSUM = "file://COPYING;md5=d213a69053dffe9bcab94abf60013d33" -SRC_URI[sha256sum] = "7f6f8551fc238abdddcf9f38906564c1f8c7dacb0ad947cfc110487aefbd8d4c" +SRC_URI[sha256sum] = "4fde8ae9b44352e2a208584c36528ee3ed13cf5fe4417208a9785daccefd9968" XORG_DRIVER_COMPRESSOR = ".tar.xz" diff --git a/poky/meta/recipes-graphics/xorg-lib/libx11_1.8.4.bb b/poky/meta/recipes-graphics/xorg-lib/libx11_1.8.5.bb index 9058c1844e..cf2e29471a 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libx11_1.8.4.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libx11_1.8.5.bb @@ -24,7 +24,7 @@ XORG_PN = "libX11" SRC_URI += "file://disable_tests.patch" -SRC_URI[sha256sum] = "c9a287a5aefa9804ce3cfafcf516fe96ed3f7e8e45c0e2ee59e84c86757df518" +SRC_URI[sha256sum] = "e362c6f03c793171becd1ce2078c64789504c7d7ff48ee40a76ff76b59f6b561" inherit gettext diff --git a/poky/meta/recipes-kernel/linux-firmware/linux-firmware_20230404.bb b/poky/meta/recipes-kernel/linux-firmware/linux-firmware_20230515.bb index 7412c022ba..3470131294 100644 --- a/poky/meta/recipes-kernel/linux-firmware/linux-firmware_20230404.bb +++ b/poky/meta/recipes-kernel/linux-firmware/linux-firmware_20230515.bb @@ -134,7 +134,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ " # WHENCE checksum is defined separately to ease overriding it if # class-devupstream is selected. -WHENCE_CHKSUM = "0782deea054d4b1b7f10c92c3a245da4" +WHENCE_CHKSUM = "a0997fc7a9af4e46d96529d6ef13b58a" # These are not common licenses, set NO_GENERIC_LICENSE for them # so that the license files will be copied from fetched source @@ -212,7 +212,7 @@ SRC_URI:class-devupstream = "git://git.kernel.org/pub/scm/linux/kernel/git/firmw # Pin this to the 20220509 release, override this in local.conf SRCREV:class-devupstream ?= "b19cbdca78ab2adfd210c91be15a22568e8b8cae" -SRC_URI[sha256sum] = "c3f9ad2bb5311cce2490f37a8052f836703d6936aabd840246b6576f1f71f607" +SRC_URI[sha256sum] = "8b1acfa16f1ee94732a6acb50d9d6c835cf53af11068bd89ed207bbe04a1e951" inherit allarch diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb b/poky/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb index 794cbf2de9..54ead24ded 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb @@ -14,13 +14,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "1dbf96de89b0e1dc082bfa90b45a5d581b1470a3" -SRCREV_meta ?= "fe6f2a4341877552eb279adc47e0ed32e3e2befa" +SRCREV_machine ?= "6f370bf9127713eccdfb3cf009c46ef4852aec28" +SRCREV_meta ?= "b358c237cf493dcf5af1760fc4632ede32e1ff2e" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https" -LINUX_VERSION ?= "6.1.32" +LINUX_VERSION ?= "6.1.35" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb index 65a8148749..fd2e2511d5 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb @@ -8,7 +8,7 @@ require recipes-kernel/linux/linux-yocto.inc # CVE exclusions include recipes-kernel/linux/cve-exclusion_6.1.inc -LINUX_VERSION ?= "6.1.32" +LINUX_VERSION ?= "6.1.35" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "24ec2fa877406f6e8ccce3841a1575e6d0e94679" -SRCREV_meta ?= "fe6f2a4341877552eb279adc47e0ed32e3e2befa" +SRCREV_machine ?= "682b17e1d76bc4364fcc9864f39c31c855b5f5df" +SRCREV_meta ?= "b358c237cf493dcf5af1760fc4632ede32e1ff2e" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto_6.1.bb b/poky/meta/recipes-kernel/linux/linux-yocto_6.1.bb index f577de5aed..1838a1e031 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto_6.1.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto_6.1.bb @@ -17,25 +17,25 @@ KBRANCH:qemux86-64 ?= "v6.1/standard/base" KBRANCH:qemuloongarch64 ?= "v6.1/standard/base" KBRANCH:qemumips64 ?= "v6.1/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "a362b0a2279ab82e61c03d492b7efd528fee4422" -SRCREV_machine:qemuarm64 ?= "24ec2fa877406f6e8ccce3841a1575e6d0e94679" -SRCREV_machine:qemuloongarch64 ?= "24ec2fa877406f6e8ccce3841a1575e6d0e94679" -SRCREV_machine:qemumips ?= "3adbad6b7ccd09550606f44271cdf67dd9583379" -SRCREV_machine:qemuppc ?= "24ec2fa877406f6e8ccce3841a1575e6d0e94679" -SRCREV_machine:qemuriscv64 ?= "24ec2fa877406f6e8ccce3841a1575e6d0e94679" -SRCREV_machine:qemuriscv32 ?= "24ec2fa877406f6e8ccce3841a1575e6d0e94679" -SRCREV_machine:qemux86 ?= "24ec2fa877406f6e8ccce3841a1575e6d0e94679" -SRCREV_machine:qemux86-64 ?= "24ec2fa877406f6e8ccce3841a1575e6d0e94679" -SRCREV_machine:qemumips64 ?= "bbdfb1b8c9b38bcb63aeaa785b60cc24af88b4b1" -SRCREV_machine ?= "24ec2fa877406f6e8ccce3841a1575e6d0e94679" -SRCREV_meta ?= "fe6f2a4341877552eb279adc47e0ed32e3e2befa" +SRCREV_machine:qemuarm ?= "915f4d2237d1c8e23eb67eda0b8e9b24373a80b4" +SRCREV_machine:qemuarm64 ?= "682b17e1d76bc4364fcc9864f39c31c855b5f5df" +SRCREV_machine:qemuloongarch64 ?= "682b17e1d76bc4364fcc9864f39c31c855b5f5df" +SRCREV_machine:qemumips ?= "1aad3fa2eba5594fb4e779fc53fef6046d833c91" +SRCREV_machine:qemuppc ?= "682b17e1d76bc4364fcc9864f39c31c855b5f5df" +SRCREV_machine:qemuriscv64 ?= "682b17e1d76bc4364fcc9864f39c31c855b5f5df" +SRCREV_machine:qemuriscv32 ?= "682b17e1d76bc4364fcc9864f39c31c855b5f5df" +SRCREV_machine:qemux86 ?= "682b17e1d76bc4364fcc9864f39c31c855b5f5df" +SRCREV_machine:qemux86-64 ?= "682b17e1d76bc4364fcc9864f39c31c855b5f5df" +SRCREV_machine:qemumips64 ?= "53e7685d6da27e112397e71c27a0bce0fc9313a9" +SRCREV_machine ?= "682b17e1d76bc4364fcc9864f39c31c855b5f5df" +SRCREV_meta ?= "b358c237cf493dcf5af1760fc4632ede32e1ff2e" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the <version>/base branch, which is pure upstream -stable, and the same # meta SRCREV as the linux-yocto-standard builds. Select your version using the # normal PREFERRED_VERSION settings. BBCLASSEXTEND = "devupstream:target" -SRCREV_machine:class-devupstream ?= "76ba310227d2490018c271f1ecabb6c0a3212eb0" +SRCREV_machine:class-devupstream ?= "e84a4e368abe42cf359fe237f0238820859d5044" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v6.1/base" @@ -44,7 +44,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA SRC_URI += "file://0001-perf-cpumap-Make-counter-as-unsigned-ints.patch" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "6.1.32" +LINUX_VERSION ?= "6.1.35" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/poky/meta/recipes-kernel/lttng/babeltrace2_2.0.5.bb b/poky/meta/recipes-kernel/lttng/babeltrace2_2.0.5.bb index 6123456c30..9a4007fb25 100644 --- a/poky/meta/recipes-kernel/lttng/babeltrace2_2.0.5.bb +++ b/poky/meta/recipes-kernel/lttng/babeltrace2_2.0.5.bb @@ -28,6 +28,7 @@ FILES:${PN}-staticdev += "${libdir}/babeltrace2/plugins/*.a" FILES:${PN} += "${libdir}/babeltrace2/plugins/*.so" ASNEEDED = "" +LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld ptest', ' -fuse-ld=bfd ', '', d)}" # coreutils since we need full mktemp RDEPENDS:${PN}-ptest += "bash gawk python3 make grep coreutils findutils" diff --git a/poky/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb b/poky/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb index 28e0807d1d..e3b258753f 100644 --- a/poky/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb +++ b/poky/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb @@ -29,6 +29,7 @@ do_configure() { for t in prepare scripts_basic scripts; do oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ AR="${KERNEL_AR}" OBJCOPY="${KERNEL_OBJCOPY}" \ + STRIP="${KERNEL_STRIP}" \ -C ${STAGING_KERNEL_DIR} O=${STAGING_KERNEL_BUILDDIR} $t done } diff --git a/poky/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb b/poky/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb index efe359ec32..3d35481bdc 100644 --- a/poky/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb +++ b/poky/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb @@ -22,11 +22,13 @@ do_compile() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ AR="${KERNEL_AR}" OBJCOPY="${KERNEL_OBJCOPY}" \ + STRIP="${KERNEL_STRIP}" \ -C ${STAGING_KERNEL_DIR} scripts oe_runmake KDIR=${STAGING_KERNEL_DIR} \ M="${S}/runtime/uprobes/" \ CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ AR="${KERNEL_AR}" OBJCOPY="${KERNEL_OBJCOPY}" \ + STRIP="${KERNEL_STRIP}" \ -C "${S}/runtime/uprobes/" fi } diff --git a/poky/meta/recipes-kernel/wireless-regdb/wireless-regdb_2023.02.13.bb b/poky/meta/recipes-kernel/wireless-regdb/wireless-regdb_2023.05.03.bb index ce60154f1e..cd3f52fc76 100644 --- a/poky/meta/recipes-kernel/wireless-regdb/wireless-regdb_2023.02.13.bb +++ b/poky/meta/recipes-kernel/wireless-regdb/wireless-regdb_2023.05.03.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] = "fe81e8a8694dc4753a45087a1c4c7e1b48dee5a59f5f796ce374ea550f0b2e73" +SRC_URI[sha256sum] = "f254d08ab3765aeae2b856222e11a95d44aef519a6663877c71ef68fae4c8c12" inherit bin_package allarch diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.3.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.3.bb index bbcbded1ac..3aa53193af 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.3.bb +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.3.bb @@ -60,7 +60,7 @@ PACKAGECONFIG[libde265] = "-Dlibde265=enabled,-Dlibde265=disabled,libde26 PACKAGECONFIG[libssh2] = "-Dcurl-ssh2=enabled,-Dcurl-ssh2=disabled,libssh2" PACKAGECONFIG[lcms2] = "-Dcolormanagement=enabled,-Dcolormanagement=disabled,lcms" PACKAGECONFIG[modplug] = "-Dmodplug=enabled,-Dmodplug=disabled,libmodplug" -PACKAGECONFIG[msdk] = "-Dmsdk=enabled,-Dmsdk=disabled,intel-mediasdk" +PACKAGECONFIG[msdk] = "-Dmsdk=enabled -Dmfx_api=oneVPL,-Dmsdk=disabled,onevpl-intel-gpu" PACKAGECONFIG[neon] = "-Dneon=enabled,-Dneon=disabled,neon" PACKAGECONFIG[openal] = "-Dopenal=enabled,-Dopenal=disabled,openal-soft" PACKAGECONFIG[opencv] = "-Dopencv=enabled,-Dopencv=disabled,opencv" diff --git a/poky/meta/recipes-multimedia/webp/files/CVE-2023-1999.patch b/poky/meta/recipes-multimedia/webp/files/CVE-2023-1999.patch new file mode 100644 index 0000000000..d293ab93ab --- /dev/null +++ b/poky/meta/recipes-multimedia/webp/files/CVE-2023-1999.patch @@ -0,0 +1,55 @@ +From a486d800b60d0af4cc0836bf7ed8f21e12974129 Mon Sep 17 00:00:00 2001 +From: James Zern <jzern@google.com> +Date: Wed, 22 Feb 2023 22:15:47 -0800 +Subject: [PATCH] EncodeAlphaInternal: clear result->bw on error + +This avoids a double free should the function fail prior to +VP8BitWriterInit() and a previous trial result's buffer carried over. +Previously in ApplyFiltersAndEncode() trial.bw (with a previous +iteration's buffer) would be freed, followed by best.bw pointing to the +same buffer. + +Since: +187d379d add a fallback to ALPHA_NO_COMPRESSION + +In addition, check the return value of VP8BitWriterInit() in this +function. + +Bug: webp:603 +Change-Id: Ic258381ee26c8c16bc211d157c8153831c8c6910 + +CVE: CVE-2023-1999 +Upstream-Status: Backport [https://github.com/webmproject/libwebp/commit/a486d800b60d0af4cc0836bf7ed8f21e12974129] +Signed-off-by: Nikhil R <nikhil.r@kpit.com> +--- + src/enc/alpha_enc.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/enc/alpha_enc.c b/src/enc/alpha_enc.c +index f7c02690e3..7d205586fe 100644 +--- a/src/enc/alpha_enc.c ++++ b/src/enc/alpha_enc.c +@@ -13,6 +13,7 @@ + + #include <assert.h> + #include <stdlib.h> ++#include <string.h> + + #include "src/enc/vp8i_enc.h" + #include "src/dsp/dsp.h" +@@ -148,6 +149,7 @@ static int EncodeAlphaInternal(const uint8_t* const data, int width, int height, + } + } else { + VP8LBitWriterWipeOut(&tmp_bw); ++ memset(&result->bw, 0, sizeof(result->bw)); + return 0; + } + } +@@ -162,7 +164,7 @@ static int EncodeAlphaInternal(const uint8_t* const data, int width, int height, + header = method | (filter << 2); + if (reduce_levels) header |= ALPHA_PREPROCESSED_LEVELS << 4; + +- VP8BitWriterInit(&result->bw, ALPHA_HEADER_LEN + output_size); ++ if (!VP8BitWriterInit(&result->bw, ALPHA_HEADER_LEN + output_size)) ok = 0; + ok = ok && VP8BitWriterAppend(&result->bw, &header, ALPHA_HEADER_LEN); + ok = ok && VP8BitWriterAppend(&result->bw, output, output_size); diff --git a/poky/meta/recipes-multimedia/webp/libwebp_1.3.0.bb b/poky/meta/recipes-multimedia/webp/libwebp_1.3.0.bb index 6939cd33a5..7ca67e44fb 100644 --- a/poky/meta/recipes-multimedia/webp/libwebp_1.3.0.bb +++ b/poky/meta/recipes-multimedia/webp/libwebp_1.3.0.bb @@ -18,6 +18,10 @@ SRC_URI[sha256sum] = "64ac4614db292ae8c5aa26de0295bf1623dbb3985054cb656c55e67431 UPSTREAM_CHECK_URI = "http://downloads.webmproject.org/releases/webp/index.html" +SRC_URI += " \ + file://CVE-2023-1999.patch \ +" + EXTRA_OECONF = " \ --disable-wic \ --enable-libwebpmux \ diff --git a/poky/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.12.bb b/poky/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.12.bb index b71d1e5cd9..83425f60fe 100644 --- a/poky/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.12.bb +++ b/poky/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.12.bb @@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ DEPENDS = "gtk+3 startup-notification dbus dbus-glib dbus-glib-native" DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}" -DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "apm", "apmd", "",d)}" # The startup-notification requires x11 in DISTRO_FEATURES REQUIRED_DISTRO_FEATURES = "x11" @@ -28,7 +27,6 @@ SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=https;branch=master \ EXTRA_OECONF = "--enable-startup-notification --enable-dbus" EXTRA_OECONF += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}" -EXTRA_OECONF += " ${@bb.utils.contains("MACHINE_FEATURES", "apm", "--with-battery=apm", "",d)}" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session b/poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session index 3a70574af9..61fea51054 100644 --- a/poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session +++ b/poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session @@ -22,7 +22,6 @@ matchbox-desktop & START_APPLETS=showdesktop,windowselector END_APPLETS=$KEYBOARD_APPLET,systray,startup-notify,notify END_APPLETS=battery,$END_APPLETS # feature-acpi -END_APPLETS=battery,$END_APPLETS # feature-apm END_APPLETS=clock,$END_APPLETS END_APPLETS=openmoko-panel-gsm,$END_APPLETS # feature-phone diff --git a/poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb b/poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb index 020e211ea5..49bf30ee5e 100644 --- a/poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb +++ b/poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb @@ -26,7 +26,7 @@ FILES:${PN} += "${datadir}/themes/Sato/index.theme" do_install() { # This is the set of machine features that the script has markers for - FEATURES="acpi apm phone" + FEATURES="acpi phone" SCRIPT="${S}/sedder" rm -f $SCRIPT touch $SCRIPT diff --git a/poky/meta/recipes-sato/puzzles/puzzles_git.bb b/poky/meta/recipes-sato/puzzles/puzzles_git.bb index 4b04588682..960b5d3b11 100644 --- a/poky/meta/recipes-sato/puzzles/puzzles_git.bb +++ b/poky/meta/recipes-sato/puzzles/puzzles_git.bb @@ -10,7 +10,7 @@ REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "git://git.tartarus.org/simon/puzzles.git;branch=main;protocol=https" UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "5a491c5ad333ef34c1e7713f920f51cbb205af60" +SRCREV = "b6c842a28cf6597df063fcff35079c3e3982381e" PE = "2" PV = "0.0+git${SRCPV}" diff --git a/poky/meta/recipes-support/apr/apr_1.7.3.bb b/poky/meta/recipes-support/apr/apr_1.7.4.bb index 9a93fe0967..e571469341 100644 --- a/poky/meta/recipes-support/apr/apr_1.7.3.bb +++ b/poky/meta/recipes-support/apr/apr_1.7.4.bb @@ -24,7 +24,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ file://0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch \ " -SRC_URI[sha256sum] = "455e218c060c474f2c834816873f6ed69c0cf0e4cfee54282cc93e8e989ee59e" +SRC_URI[sha256sum] = "fc648de983f3a2a6c9e78dea1f180639bd2fad6c06d556d4367a701fe5c35577" inherit autotools-brokensep lib_package binconfig multilib_header ptest multilib_script diff --git a/poky/meta/recipes-support/atk/at-spi2-core_2.48.0.bb b/poky/meta/recipes-support/atk/at-spi2-core_2.48.3.bb index e9648ffe07..17b0e39a5e 100644 --- a/poky/meta/recipes-support/atk/at-spi2-core_2.48.0.bb +++ b/poky/meta/recipes-support/atk/at-spi2-core_2.48.3.bb @@ -11,7 +11,7 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "905a5b6f1790b68ee803bffa9f5fab4ceb591fb4fae0b2f8c612c54f1d4e8a30" +SRC_URI[sha256sum] = "37316df43ca9989ce539d54cf429a768c28bb38a0b34950beadd0421827edf55" DEPENDS = " \ dbus \ diff --git a/poky/meta/recipes-support/attr/attr.inc b/poky/meta/recipes-support/attr/attr.inc index 8ba865a74a..e8835398af 100644 --- a/poky/meta/recipes-support/attr/attr.inc +++ b/poky/meta/recipes-support/attr/attr.inc @@ -22,7 +22,7 @@ inherit ptest update-alternatives autotools gettext PACKAGES =+ "lib${BPN}" -FILES:lib${BPN} = "${libdir}/lib*${SOLIBS}" +FILES:lib${BPN} = "${libdir}/lib*${SOLIBS} ${sysconfdir}" ALTERNATIVE_PRIORITY = "100" ALTERNATIVE:${PN} = "setfattr" diff --git a/poky/meta/recipes-support/diffoscope/diffoscope_236.bb b/poky/meta/recipes-support/diffoscope/diffoscope_242.bb index 9f89f35c11..4b0d518edc 100644 --- a/poky/meta/recipes-support/diffoscope/diffoscope_236.bb +++ b/poky/meta/recipes-support/diffoscope/diffoscope_242.bb @@ -12,7 +12,7 @@ PYPI_PACKAGE = "diffoscope" inherit pypi setuptools3 -SRC_URI[sha256sum] = "84c46840dafffe0223056718e4250ceb52484452a992b85e345e3cf8a2cf7d4b" +SRC_URI[sha256sum] = "d858c591d2c8d42b2b29eb6d229408607b1cd8a4e7ade72d0cd002db6d1c2a6e" RDEPENDS:${PN} += "binutils vim squashfs-tools python3-libarchive-c python3-magic python3-rpm" diff --git a/poky/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch b/poky/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch index 0cd4c45907..81aeaf5d3a 100644 --- a/poky/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch +++ b/poky/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch @@ -1,4 +1,4 @@ -From 346a6b17a07b658954db65f814461b59824d9fcd Mon Sep 17 00:00:00 2001 +From 8b9e3d286e87bc978ec6bb9cfd790d8d253b79c3 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Mon, 22 Jan 2018 18:00:21 +0200 Subject: [PATCH] configure.ac: use a custom value for the location of @@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 099c6a8..e8cf408 100644 +index a547401..60bc2c5 100644 --- a/configure.ac +++ b/configure.ac -@@ -1935,7 +1935,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", +@@ -1922,7 +1922,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", AC_DEFINE_UNQUOTED(GPGTAR_NAME, "gpgtar", [The name of the gpgtar tool]) diff --git a/poky/meta/recipes-support/gnupg/gnupg/relocate.patch b/poky/meta/recipes-support/gnupg/gnupg/relocate.patch index 071dd93ff5..f7dd12fbcc 100644 --- a/poky/meta/recipes-support/gnupg/gnupg/relocate.patch +++ b/poky/meta/recipes-support/gnupg/gnupg/relocate.patch @@ -1,4 +1,4 @@ -From b1117adeb476304ce2792814516a5b7cd44d0d38 Mon Sep 17 00:00:00 2001 +From c4ddea8e6070d1df51058aac08088e27c37e7e73 Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> Date: Wed, 19 Sep 2018 14:44:40 +0100 Subject: [PATCH] Allow the environment to override where gnupg looks for its @@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de> 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/common/homedir.c b/common/homedir.c -index 67bbde8..7f360ba 100644 +index 286685f..212a945 100644 --- a/common/homedir.c +++ b/common/homedir.c -@@ -1171,7 +1171,7 @@ gnupg_socketdir (void) +@@ -1213,7 +1213,7 @@ gnupg_socketdir (void) if (!name) { unsigned int dummy; @@ -26,7 +26,7 @@ index 67bbde8..7f360ba 100644 gpgrt_annotate_leaked_object (name); } -@@ -1203,7 +1203,7 @@ gnupg_sysconfdir (void) +@@ -1245,7 +1245,7 @@ gnupg_sysconfdir (void) if (dir) return dir; else @@ -35,7 +35,7 @@ index 67bbde8..7f360ba 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1239,7 +1239,7 @@ gnupg_bindir (void) +@@ -1281,7 +1281,7 @@ gnupg_bindir (void) return name; } else @@ -44,7 +44,7 @@ index 67bbde8..7f360ba 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1266,7 +1266,7 @@ gnupg_libexecdir (void) +@@ -1308,7 +1308,7 @@ gnupg_libexecdir (void) return name; } else @@ -53,7 +53,7 @@ index 67bbde8..7f360ba 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1296,7 +1296,7 @@ gnupg_libdir (void) +@@ -1338,7 +1338,7 @@ gnupg_libdir (void) return name; } else @@ -62,7 +62,7 @@ index 67bbde8..7f360ba 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1327,7 +1327,7 @@ gnupg_datadir (void) +@@ -1369,7 +1369,7 @@ gnupg_datadir (void) return name; } else @@ -71,7 +71,7 @@ index 67bbde8..7f360ba 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1359,7 +1359,7 @@ gnupg_localedir (void) +@@ -1401,7 +1401,7 @@ gnupg_localedir (void) return name; } else diff --git a/poky/meta/recipes-support/gnupg/gnupg_2.4.0.bb b/poky/meta/recipes-support/gnupg/gnupg_2.4.2.bb index 900aa8ad73..580782037e 100644 --- a/poky/meta/recipes-support/gnupg/gnupg_2.4.0.bb +++ b/poky/meta/recipes-support/gnupg/gnupg_2.4.2.bb @@ -23,7 +23,7 @@ SRC_URI:append:class-native = " file://0001-configure.ac-use-a-custom-value-for- file://relocate.patch" SRC_URI:append:class-nativesdk = " file://relocate.patch" -SRC_URI[sha256sum] = "1d79158dd01d992431dd2e3facb89fdac97127f89784ea2cb610c600fb0c1483" +SRC_URI[sha256sum] = "97eb47df8ae5a3ff744f868005a090da5ab45cb48ee9836dbf5ee739a4e5cf49" EXTRA_OECONF = "--disable-ldap \ --disable-ccid-driver \ diff --git a/poky/meta/recipes-support/libxslt/libxslt_1.1.37.bb b/poky/meta/recipes-support/libxslt/libxslt_1.1.38.bb index 361bb0f8dc..bf35a94b7f 100644 --- a/poky/meta/recipes-support/libxslt/libxslt_1.1.37.bb +++ b/poky/meta/recipes-support/libxslt/libxslt_1.1.38.bb @@ -15,7 +15,7 @@ DEPENDS = "libxml2" SRC_URI = "https://download.gnome.org/sources/libxslt/1.1/libxslt-${PV}.tar.xz" -SRC_URI[sha256sum] = "3a4b27dc8027ccd6146725950336f1ec520928f320f144eb5fa7990ae6123ab4" +SRC_URI[sha256sum] = "1f32450425819a09acaff2ab7a5a7f8a2ec7956e505d7beeb45e843d0e1ecab1" UPSTREAM_CHECK_REGEX = "libxslt-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/poky/meta/recipes-support/nettle/nettle/dlopen-test.patch b/poky/meta/recipes-support/nettle/nettle/dlopen-test.patch deleted file mode 100644 index ab9b91f88b..0000000000 --- a/poky/meta/recipes-support/nettle/nettle/dlopen-test.patch +++ /dev/null @@ -1,29 +0,0 @@ -Remove the relative path for libnettle.so so the test -program can find it. -Relative paths are not suitable, as the folder strucure for ptest -is different from the one expected by the nettle testsuite. - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> ---- - testsuite/dlopen-test.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testsuite/dlopen-test.c b/testsuite/dlopen-test.c -index 4265bf7..1a25d17 100644 ---- a/testsuite/dlopen-test.c -+++ b/testsuite/dlopen-test.c -@@ -15,7 +15,7 @@ int - main (int argc UNUSED, char **argv UNUSED) - { - #if HAVE_LIBDL -- void *handle = dlopen ("../libnettle." SO_EXT, RTLD_NOW); -+ void *handle = dlopen ("libnettle.so", RTLD_NOW); - int (*get_version)(void); - if (!handle) - { --- -2.17.1 - diff --git a/poky/meta/recipes-support/nettle/nettle/run-ptest b/poky/meta/recipes-support/nettle/nettle/run-ptest index b90bed66d2..61a43c78f1 100644 --- a/poky/meta/recipes-support/nettle/nettle/run-ptest +++ b/poky/meta/recipes-support/nettle/nettle/run-ptest @@ -6,31 +6,35 @@ failed=0 all=0 for f in *-test; do - if [ "$f" = "sha1-huge-test" ] ; then - echo "SKIP: $f (skipped for ludicrous run time)" - continue - fi - - "./$f" - case "$?" in - 0) - echo "PASS: $f" - all=$((all + 1)) + case "$f" in + "sha1-huge-test") + echo "SKIP: $f (long run time)" ;; - 77) - echo "SKIP: $f" + "symbols-test") + echo "SKIP: $f (needs static libraries)" ;; *) - echo "FAIL: $f" - failed=$((failed + 1)) - all=$((all + 1)) + "./$f" + case "$?" in + 0) + echo "PASS: $f" + all=$((all + 1)) + ;; + 77) + echo "SKIP: $f" + ;; + *) + echo "FAIL: $f" + failed=$((failed + 1)) + all=$((all + 1)) + ;; + esac ;; esac done if [ "$failed" -eq 0 ] ; then - echo "All $all tests passed" + echo "All $all tests passed" else - echo "$failed of $all tests failed" + echo "$failed of $all tests failed" fi - diff --git a/poky/meta/recipes-support/nettle/nettle_3.8.1.bb b/poky/meta/recipes-support/nettle/nettle_3.9.bb index bf49132235..7a5bdb2a03 100644 --- a/poky/meta/recipes-support/nettle/nettle_3.8.1.bb +++ b/poky/meta/recipes-support/nettle/nettle_3.9.bb @@ -20,15 +20,11 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \ file://check-header-files-of-openssl-only-if-enable_.patch \ " -SRC_URI:append:class-target = "\ - file://dlopen-test.patch \ - " - -SRC_URI[sha256sum] = "364f3e2b77cd7dcde83fd7c45219c834e54b0c75e428b6f894a23d12dd41cbfe" +SRC_URI[sha256sum] = "0ee7adf5a7201610bb7fe0acbb7c9b3be83be44904dd35ebbcd965cd896bfeaa" UPSTREAM_CHECK_REGEX = "nettle-(?P<pver>\d+(\.\d+)+)\.tar" -inherit autotools ptest multilib_header +inherit autotools ptest multilib_header lib_package EXTRA_AUTORECONF += "--exclude=aclocal" @@ -44,14 +40,19 @@ do_install:append() { do_install_ptest() { install -d ${D}${PTEST_PATH}/testsuite/ - install ${S}/testsuite/gold-bug.txt ${D}${PTEST_PATH}/testsuite/ - install ${S}/testsuite/*-test ${D}${PTEST_PATH}/testsuite/ - # tools can be found in PATH, not in ../tools/ - sed -i -e 's|../tools/||' ${D}${PTEST_PATH}/testsuite/*-test install ${B}/testsuite/*-test ${D}${PTEST_PATH}/testsuite/ + install ${S}/testsuite/*-test ${D}${PTEST_PATH}/testsuite/ + install ${S}/testsuite/gold-bug.txt ${D}${PTEST_PATH}/testsuite/ + + # Install a symlink for dlopen-test + ln -sr ${D}${libdir}/libnettle.so.*.* ${D}${PTEST_PATH}/libnettle.so + # These examples are needed for pkcs1-conv-test + install ${B}/examples/rsa-sign ${B}/examples/rsa-verify ${D}${PTEST_PATH}/testsuite/ + # Fix build-time relative paths + sed -i -e 's|../tools/|${bindir}/|g' ${D}${PTEST_PATH}/testsuite/*-test + sed -i -e 's|../examples/|./|g' ${D}${PTEST_PATH}/testsuite/*-test } -RDEPENDS:${PN}-ptest += "${PN}-dev" -INSANE_SKIP:${PN}-ptest += "dev-deps" +RDEPENDS:${PN}-ptest += "${PN}-bin" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-support/nghttp2/nghttp2_1.52.0.bb b/poky/meta/recipes-support/nghttp2/nghttp2_1.53.0.bb index f57a15954d..88d5f31083 100644 --- a/poky/meta/recipes-support/nghttp2/nghttp2_1.52.0.bb +++ b/poky/meta/recipes-support/nghttp2/nghttp2_1.53.0.bb @@ -8,7 +8,7 @@ SRC_URI = "\ ${GITHUB_BASE_URI}/download/v${PV}/nghttp2-${PV}.tar.xz \ file://0001-fetch-ocsp-response-use-python3.patch \ " -SRC_URI[sha256sum] = "3ea9f0439e60469ad4d39cb349938684ffb929dd7e8e06a7bffe9f9d21f8ba7d" +SRC_URI[sha256sum] = "b867184254e5a29b0ba68413aa14f8b0ce1142a371761374598dec092dabb809" inherit cmake manpages python3native github-releases PACKAGECONFIG[manpages] = "" diff --git a/poky/meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb b/poky/meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb index ff5629c6f9..9a9b8ec260 100644 --- a/poky/meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb +++ b/poky/meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/ptest-runner2/about/" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" -SRCREV = "bcb82804daa8f725b6add259dcef2067e61a75aa" +SRCREV = "a6c7dcda520402adb62a31b8b1c7686c5b8a4875" PV .= "+git${SRCPV}" SRC_URI = "git://git.yoctoproject.org/ptest-runner2;branch=master;protocol=https \ diff --git a/poky/meta/recipes-support/serf/serf/0001-Fix-syntax-of-a-print-in-the-scons-file-to-unbreak-b.patch b/poky/meta/recipes-support/serf/serf/0001-Fix-syntax-of-a-print-in-the-scons-file-to-unbreak-b.patch deleted file mode 100644 index 4a5832ac1a..0000000000 --- a/poky/meta/recipes-support/serf/serf/0001-Fix-syntax-of-a-print-in-the-scons-file-to-unbreak-b.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 99f6e1b0d68281b63218d6adfe68cd9e331ac5be Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 3 Sep 2018 10:50:08 -0700 -Subject: [PATCH] Fix syntax of a print() in the scons file to unbreak building - with most recent scons version. - -* SConstruct Use Python 3.0 valid syntax to make Scons 3.0.0 happy on both python - 3.0 and 2.7. - -Upstream-Status: Backport -[https://svn.apache.org/viewvc/serf/trunk/SConstruct?r1=1809132&r2=1811083&diff_format=h] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - SConstruct | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/SConstruct b/SConstruct -index 1670459..18a45fa 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -184,7 +184,7 @@ CALLOUT_OKAY = not (env.GetOption('clean') or env.GetOption('help')) - - unknown = opts.UnknownVariables() - if unknown: -- print 'Warning: Used unknown variables:', ', '.join(unknown.keys()) -+ print('Warning: Used unknown variables:', ', '.join(unknown.keys())) - - apr = str(env['APR']) - apu = str(env['APU']) diff --git a/poky/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch b/poky/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch deleted file mode 100644 index 91ccc8a474..0000000000 --- a/poky/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 2f45711a66ff99886b6e4a5708e2db01a63e5af4 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex@linutronix.de> -Date: Fri, 10 Sep 2021 11:05:10 +0200 -Subject: [PATCH] buckets/ssl_buckets.c: do not use ERR_GET_FUNC - -Upstream removed it in -https://github.com/openssl/openssl/pull/16004 - -Upstream-Status: Inactive-Upstream [lastrelease: 2015, lastcommit: 2019] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - buckets/ssl_buckets.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/buckets/ssl_buckets.c b/buckets/ssl_buckets.c -index b01e535..9801f87 100644 ---- a/buckets/ssl_buckets.c -+++ b/buckets/ssl_buckets.c -@@ -1325,8 +1325,7 @@ static int ssl_need_client_cert(SSL *ssl, X509 **cert, EVP_PKEY **pkey) - return 0; - } - else { -- printf("OpenSSL cert error: %d %d %d\n", ERR_GET_LIB(err), -- ERR_GET_FUNC(err), -+ printf("OpenSSL cert error: %d %d\n", ERR_GET_LIB(err), - ERR_GET_REASON(err)); - PKCS12_free(p12); - bio_meth_free(biom); diff --git a/poky/meta/recipes-support/serf/serf/0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch b/poky/meta/recipes-support/serf/serf/0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch deleted file mode 100644 index 02fa9e3a06..0000000000 --- a/poky/meta/recipes-support/serf/serf/0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 565211fd082ef653ca9c44a345350fc1451f5a0f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 3 Sep 2018 11:12:38 -0700 -Subject: [PATCH] Follow-up to r1811083 fix building with scons 3.0.0 and - Python3 - -* SConstruct: Append decode('utf-8) to FILE.get_contents() to avoid - TypeError: cannot use a string pattern on a bytes-like object - -Upstream-Status: Backport -[https://svn.apache.org/viewvc/serf/trunk/SConstruct?r1=1811088&r2=1814604] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - SConstruct | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/SConstruct b/SConstruct -index 877731e..7678bb1 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -169,7 +169,7 @@ env.Append(BUILDERS = { - match = re.search('SERF_MAJOR_VERSION ([0-9]+).*' - 'SERF_MINOR_VERSION ([0-9]+).*' - 'SERF_PATCH_VERSION ([0-9]+)', -- env.File('serf.h').get_contents(), -+ env.File('serf.h').get_contents().decode('utf-8'), - re.DOTALL) - MAJOR, MINOR, PATCH = [int(x) for x in match.groups()] - env.Append(MAJOR=str(MAJOR)) diff --git a/poky/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch b/poky/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch index 4105868a7e..91640d6044 100644 --- a/poky/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch +++ b/poky/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch @@ -31,7 +31,7 @@ ERROR: scons install execution failed. and the installed paths (including the paths inside libserf*.pc) look correct -Upstream-Status: Inactive-Upstream [lastrelease: 2015, lastcommit: 2019] +Upstream-Status: Pending Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> diff --git a/poky/meta/recipes-support/serf/serf_1.3.9.bb b/poky/meta/recipes-support/serf/serf_1.3.10.bb index 669f42b8e7..c6b51452aa 100644 --- a/poky/meta/recipes-support/serf/serf_1.3.9.bb +++ b/poky/meta/recipes-support/serf/serf_1.3.10.bb @@ -7,16 +7,12 @@ HOMEPAGE = "http://serf.apache.org/" SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://norpath.patch \ file://env.patch \ - file://0001-Fix-syntax-of-a-print-in-the-scons-file-to-unbreak-b.patch \ file://0002-SConstruct-Fix-path-quoting-for-.def-generator.patch \ file://0003-gen_def.patch \ - file://0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch \ file://SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch \ - file://0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch \ " -SRC_URI[md5sum] = "370a6340ff20366ab088012cd13f2b57" -SRC_URI[sha256sum] = "549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc" +SRC_URI[sha256sum] = "be81ef08baa2516ecda76a77adf7def7bc3227eeb578b9a33b45f7b41dc064e6" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" |
