diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2023-02-09 23:54:44 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2023-02-10 15:06:00 +0300 |
| commit | 864cc43bcd478cb31e4ab607e596ba9baf46cd3e (patch) | |
| tree | 4d8ce12d09514decbdc038e74866105788a2c2b8 /poky | |
| parent | 2a843a808e5998f725ff11d57d7c966459e4af2b (diff) | |
| download | openbmc-864cc43bcd478cb31e4ab607e596ba9baf46cd3e.tar.xz | |
subtree updates
poky: 29afbb5e14..aa6cd06a9f:
Alejandro Hernandez Samaniego (1):
testimage: Fix error message to reflect new syntax
Alex Kiernan (2):
rust: Upgrade 1.66.1 -> 1.67.0
rust: Add `update_snapshot` task to generate `rust-snapshot.inc`
Alexander Kanavin (49):
oeqa/qemurunner: do not use Popen.poll() when terminating runqemu with a signal
ifupdown: update 0.8.39 -> 0.8.41
python3-pip: update 22.3.1 -> 23.0
diffutils: update 3.8 -> 3.9
mc: update 4.8.28 -> 4.8.29
xf86-video-vmware: update 13.3.0 -> 13.4.0
lttng-tools: update 2.13.8 -> 2.13.9
rt-tests: update 2.4 -> 2.5
apr: update 1.7.0 -> 1.7.2
apr-util: update 1.6.1 -> 1.6.3
glib-2.0: upgrade 2.74.4 -> 2.74.5
systemd: update 252.4 -> 252.5
cmake: upgrade 3.25.1 -> 3.25.2
python3-setuptools: update 65.7.0 -> 67.2.0
lighttpd: upgrade 1.4.67 -> 1.4.68
lsof: upgrade 4.96.5 -> 4.98.0
igt-gpu-tools: upgrade 1.26 -> 1.27.1
vulkan-headers: upgrade 1.3.236.0 -> 1.3.239.0
vulkan-loader: upgrade 1.3.236.0 -> 1.3.239.0
vulkan-tools: upgrade 1.3.236.0 -> 1.3.239.0
spirv-tools: upgrade 1.3.236.0 -> 1.3.239.0
glslang: upgrade 1.3.236.0 -> 1.3.239.0
spirv-headers: upgrade 1.3.236.0 -> 1.3.239.0
libxpm: upgrade 3.5.14 -> 3.5.15
rng-tools: upgrade 6.15 -> 6.16
fontconfig: upgrade 2.14.1 -> 2.14.2
ncurses: upgrade 6.3+20220423 -> 6.4
mpg123: upgrade 1.31.1 -> 1.31.2
python3-pycryptodomex: upgrade 3.16.0 -> 3.17
bind: upgrade 9.18.10 -> 9.18.11
libjpeg-turbo: upgrade 2.1.4 -> 2.1.5
pkgconf: upgrade 1.9.3 -> 1.9.4
python3-pycryptodome: upgrade 3.16.0 -> 3.17
python3-dtschema: upgrade 2022.12 -> 2023.1
llvm: upgrade 15.0.6 -> 15.0.7
puzzles: upgrade to latest revision
dpkg: upgrade 1.21.18 -> 1.21.19
shaderc: upgrade 2022.4 -> 2023.2
sysstat: upgrade 12.6.1 -> 12.6.2
piglit: upgrade to latest revision
ltp: upgrade 20220930 -> 20230127
linux-firmware: upgrade 20221214 -> 20230117
libinput: upgrade 1.22.0 -> 1.22.1
sudo: upgrade 1.9.12p1 -> 1.9.12p2
diffoscope: upgrade 230 -> 234
texinfo: upgrade 7.0.1 -> 7.0.2
stress-ng: upgrade 0.15.02 -> 0.15.03
libgit2: upgrade 1.5.0 -> 1.5.1
python3-pathspec: upgrade 0.10.3 -> 0.11.0
Andrej Valek (1):
busybox: 1.35.0 -> 1.36.0
Arnout Vandecappelle (1):
python3-pytest: Remove dependency on python3-toml
Bruce Ashfield (5):
linux-yocto/6.1: update to v6.1.7
linux-yocto/5.15: update to v5.15.89
linux-yocto/6.1: cfg: remove depreciated configs
linux-yocto/6.1: update to v6.1.9
linux-yocto/5.15: update to v5.15.91
Changqing Li (1):
apt: fix do_package_qa failure
Chen Qi (1):
ffmpeg: fix configure failure on noexec /tmp host
Etienne Cordonnier (1):
bitbake: siggen: Fix inefficient string concatenation
George Kelly (1):
bitbake: fetch2: Add NODE_EXTRA_CA_CERTS to export list
Harald Seiler (1):
bootchart2: Fix usrmerge support
Jan Luebbe (1):
systemd: add PACKAGECONFIG for pstore
Khem Raj (6):
busybox: Make provisions to disable sha256/sha1 accelaration on x86
nghttp2: Disable python bindings
scons: Pass MAXLINELENGTH to scons invocation
scons.bbclass: Make MAXLINELENGTH overridable
glibc: Upgrade to 2.37 release
lttng-tools: Update LFS64 patch with upstream feedback
Louis Rannou (1):
oeqa/selftest/locales: Add selftest for locale generation/presence
Markus Volk (3):
libtiff: add PACKAGECONFIG for libdeflate and zstd
mesa: add PACKAGECONFIG for video-codecs
ell: update 0.55 -> 0.56
Martin Jansa (2):
meta: remove True option to getVar and getVarFlag calls (again)
xinetd: move xconv.pl script to separate package
Mauro Queiros (1):
image.bbclass: print all QA functions exceptions
Michael Halstead (1):
uninative: Upgrade to 3.9 to include glibc 2.37
Michael Opdenacker (1):
bitbake: bitbake-user-manual: show how use BB_LOGCONFIG to log warnings
Mikko Rapeli (1):
oeqa context.py: fix --target-ip comment to include ssh port number
Mingli Yu (1):
glslang: branch rename master -> main
Pavel Zhukov (1):
bitbake.conf: Add mercurial to HOSTTOOLS_NONFATAL
Pedro Baptista (2):
bitbake: bblayers/query: Replace layer directory name with layer name for show-layers
bitbake: bblayers/query: Adjust show-layers output layout
Peter Kjellerstedt (1):
poky.conf: Switch to post release name/version
Ravineet Singh (1):
gnutls: add ptest support
Richard Purdie (6):
python3-markupsafe: upgrade 2.1.1 -> 2.1.2
perf: Fix 6.1 kernel reproducibility issue
perf: Enable debug/source packaging
libc-locale: Fix on target locale generation
oeqa/selftest/locales: Add test for disabled binary locale generation
valgrind: Workaround glibc upgrade
Ross Burton (5):
git: upgrade to 2.39.1
git: ignore CVE-2022-41953
sdkext/cases/devtool: pass a logger to HTTPService
oeqa/utils/httpserver: connect up the request logging
httpserver: add error handler that write to the logger
Tim Orling (14):
libtest-needs-perl: upgrade 0.002009 -> 0.002010
python3-pytest: upgrade 7.2.0 -> 7.2.1
python3-hypothesis: upgrade 6.62.0 -> 6.66.0
python3-poetry-core: upgrade 1.4.0 -> 1.5.0
python3-iniconfig: upgrade 1.1.1 -> 2.0.0
python3-pytz: upgrade 2022.7 -> 2022.7.1
python3-zipp: upgrade 3.11.0 -> 3.12.0
python3-requests: upgrade 2.28.1 -> 2.28.2
python3-sphinxcontrib-applehelp: 1.0.3 -> 1.0.4
python3-sphinxcontrib-htmlhelp: 2.0.0 -> 2.0.1
python3-pyopenssl: upgrade 22.1.0 -> 23.0.0
python3-wcwidth: upgrade 0.2.5 -> 0.2.6
python3-urllib3: upgrade 1.26.13 -> 1.26.14
python3-sphinx: upgrade 6.0.0 -> 6.1.3
Tobias Hagelborn (1):
sstate.bbclass: Fetch non-existing local .sig files if needed
Ulrich Ölmann (3):
recipe_sanity: fix old override syntax
lsof: fix old override syntax
update-alternatives: fix typos
Vivek Kumbhar (1):
openssl: fix CVE-2022-3996 double locking leads to denial of service
Wang Mingyu (2):
btrfs-tools: upgrade 6.1.2 -> 6.1.3
msmtp: upgrade 1.8.22 -> 1.8.23
Xiaotian Wu (5):
base: add support for loongarch64
linux: add loongarch64 support
binutils: disable gold on loongarch64
loongarch: disable seccomp from default feature
uboot: add a loongarch64 entry
meta-security: 7eed4a60f5..3529cfb43e:
Mikko Rapeli (1):
linux-yocto: drop version from bbappends
meta-raspberrypi: 6c57b92708..e43af1e3a6:
Allan Xavier (2):
linux-raspberrypi: Build eeprom access into kernel
rpi-eeprom: Add recipe for eeprom update/configuration
Khem Raj (3):
linux-raspberrypi: Update to 5.15.90
linux-raspberrypi: Fix build with gcc13
linux-raspberrypi: Remove unused patches
Martin Jansa (1):
raspidmx, userland, omxplayer: Fix Upstream-Status formatting
meta-arm: aecbb77f72..dc10b73cc5:
Jon Mason (1):
arm/linux-yocto: avoid kernel defconfig warning
Khem Raj (2):
gator-daemon: Fix build with gcc13
sbsa: Fix build with gcc13
Ross Burton (2):
arm-bsp/corstone*00: disable openssl in kmod
CI: pin to kas 3.2 as 3.2.1 fails
Rui Miguel Silva (6):
meta-arm: add build to gitignore
kas/corstone1000: move from langdale to master
arm-bsp/corstone500: bump u-boot version to 2023.01
arm-bsp/corstone1000: bump u-boot version to 2023.01
arm-bsp: corstone500: bump kernel version to 6.1
arm-bsp/corstone1000: bump kernel version to v6.1
meta-openembedded: ea63f13846..cba6df61c7:
Alex Kiernan (2):
mdns: Upgrade 1790.60.25 -> 1790.80.10
dnsmasq: Upgrade 2.88 -> 2.89
Chen Qi (1):
syslog-ng: workaround segfault for ppc64le
Christian Hohnstaedt (1):
libb64: reactivate BUFFERSIZE patch
David Bagonyi (1):
concurrencykit: Make patch compatible with Bourne shell
Geoff Parker (1):
python3-pillow: add tk to RDEPENDS ptest pkg only if x11 in DISTRO_FEATURES
Jan Luebbe (4):
softhsm: avoid unnecessary check for native sqlite binary
softhsm: enable objectstore backend
extract-cert: add recipe
opensc: fix private key import
Kai Kang (1):
crda: remove recipe
Khem Raj (39):
rwmem: Update to latest
pipewire: Split dymanic modules to target recipe alone
upm: Fix build with gcc13
openthread: Use __attribute__ ((unused)) instead of removing 't'
wireshark: Add nghttp2 packageconfig
rdma-core: Inherit python3targetconfig
wireshark: Inherit python3targetconfig
hplip: Inherit python3targetconfig
hplip: Inherit python3targetconfig
dante: Add -P to preprocessor flags
breakpad: Fix build with gcc13
mongodb: Fix build with gcc13
mongodb: Upgrade to 4.4.18
mongodb: Pass MAXLINELENGTH to scons invocation
perfetto: Disable ccache
nodejs: Fix build with gcc13
zeromq: Fix build with gcc13
python3-greenlet: Fix build with gcc13
perfetto: Upgrade to 31.0 release
perfetto: Fix build with gcc13
ntopng: Add hiredis to depends
python3-grpcio: Fix build with gcc13
tesseract: Fix build with gcc13
lcdproc: Update to latest tip of trunk
mongodb: Use bfd linker for x86/musl with gcc
gegl: Depend on openmp when using clang
pipewire: Do not split modules using PACKAGES_DYNAMIC for native case
sysdig: Fix build with gcc13
zfs: Update to 2.1.9
python3-isort: Upgrade to isort 5.12.0
minicoredumper: Upgrade to 2.0.2 release
perfetto: Add missing dependencies.
vulkan-cts: Rename patch to avoid problems on case insensitive filesytems
python3-greenlet: Upgrade to 2.0.2
cups-filters: Fix build with clang16/c++17
cups-filters: Upgrade to 1.28.17 release
ltrace: Fix build with clang16
oprofile: Do not use std::bind2nd
perfetto: Fix build on musl again
Markus Volk (7):
python3-pycups: add recipe
blueman: add missing runtime dependency, add polkit rule
system-config-printer: add recipe
rtkit: add recipe
xdg-desktop-portal: add runtime dependency on rtkit
pipewire: update 0.3.64 -> 0.3.65
xfdesktop: update 4.18.0 -> 4.18.1
Martin Jansa (3):
hunspell: move ispellaff2myspell script to separate package
meta: remove True option to getVar calls (again)
mctp: fix overrides syntax in SYSTEMD_AUTO_ENABLE:${PN}
Randy MacLeod (1):
python3-pillow: add ptest support
Simone Weiss (1):
minicoredumper: Add ptest
Ulrich Ölmann (2):
initramfs-{debug,kexecboot}-image: fix override syntax in comment
kexecboot: update homepage
Wang Mingyu (5):
byacc: upgrade 20221229 -> 20230201
ccid: upgrade 1.5.1 -> 1.5.2
cglm: upgrade 0.8.7 -> 0.8.9
cmark: upgrade 0.30.2 -> 0.30.3
apache2: upgrade 2.4.54 -> 2.4.55
Yi Zhao (2):
samba: upgrade 4.17.4 -> 4.17.5
frr: upgrade 8.4.1 -> 8.4.2
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Idbe7ba3bb68f0858849f8abf80cc488f94920dda
Diffstat (limited to 'poky')
233 files changed, 1091 insertions, 2501 deletions
diff --git a/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.rst b/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.rst index f6ebf7ba6a..4fa3ca4b54 100644 --- a/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.rst +++ b/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.rst @@ -656,7 +656,7 @@ builds are when execute, bitbake also supports user defined configuration of the `Python logging <https://docs.python.org/3/library/logging.html>`__ facilities through the :term:`BB_LOGCONFIG` variable. This -variable defines a json or yaml `logging +variable defines a JSON or YAML `logging configuration <https://docs.python.org/3/library/logging.config.html>`__ that will be intelligently merged into the default configuration. The logging configuration is merged using the following rules: @@ -690,9 +690,9 @@ logging configuration is merged using the following rules: adds a filter called ``BitBake.defaultFilter``, both filters will be applied to the logger -As an example, consider the following user logging configuration file -which logs all Hash Equivalence related messages of VERBOSE or higher to -a file called ``hashequiv.log`` :: +As a first example, you can create a ``hashequiv.json`` user logging +configuration file to log all Hash Equivalence related messages of ``VERBOSE`` +or higher priority to a file called ``hashequiv.log``:: { "version": 1, @@ -721,3 +721,40 @@ a file called ``hashequiv.log`` :: } } } + +Then set the :term:`BB_LOGCONFIG` variable in ``conf/local.conf``:: + + BB_LOGCONFIG = "hashequiv.json" + +Another example is this ``warn.json`` file to log all ``WARNING`` and +higher priority messages to a ``warn.log`` file:: + + { + "version": 1, + "formatters": { + "warnlogFormatter": { + "()": "bb.msg.BBLogFormatter", + "format": "%(levelname)s: %(message)s" + } + }, + + "handlers": { + "warnlog": { + "class": "logging.FileHandler", + "formatter": "warnlogFormatter", + "level": "WARNING", + "filename": "warn.log" + } + }, + + "loggers": { + "BitBake": { + "handlers": ["warnlog"] + } + }, + + "@disable_existing_loggers": false + } + +Note that BitBake's helper classes for structured logging are implemented in +``lib/bb/msg.py``. diff --git a/poky/bitbake/lib/bb/fetch2/__init__.py b/poky/bitbake/lib/bb/fetch2/__init__.py index 5a7a6024d1..747356dfa1 100644 --- a/poky/bitbake/lib/bb/fetch2/__init__.py +++ b/poky/bitbake/lib/bb/fetch2/__init__.py @@ -851,6 +851,7 @@ FETCH_EXPORT_VARS = ['HOME', 'PATH', 'DBUS_SESSION_BUS_ADDRESS', 'P4CONFIG', 'SSL_CERT_FILE', + 'NODE_EXTRA_CA_CERTS', 'AWS_PROFILE', 'AWS_ACCESS_KEY_ID', 'AWS_SECRET_ACCESS_KEY', diff --git a/poky/bitbake/lib/bb/siggen.py b/poky/bitbake/lib/bb/siggen.py index 0e79404f76..26e0243b00 100644 --- a/poky/bitbake/lib/bb/siggen.py +++ b/poky/bitbake/lib/bb/siggen.py @@ -349,19 +349,19 @@ class SignatureGeneratorBasic(SignatureGenerator): data = self.basehash[tid] for dep in self.runtaskdeps[tid]: - data = data + self.get_unihash(dep) + data += self.get_unihash(dep) for (f, cs) in self.file_checksum_values[tid]: if cs: if "/./" in f: - data = data + "./" + f.split("/./")[1] - data = data + cs + data += "./" + f.split("/./")[1] + data += cs if tid in self.taints: if self.taints[tid].startswith("nostamp:"): - data = data + self.taints[tid][8:] + data += self.taints[tid][8:] else: - data = data + self.taints[tid] + data += self.taints[tid] h = hashlib.sha256(data.encode("utf-8")).hexdigest() self.taskhash[tid] = h diff --git a/poky/bitbake/lib/bblayers/query.py b/poky/bitbake/lib/bblayers/query.py index afd39518e5..bec76db98a 100644 --- a/poky/bitbake/lib/bblayers/query.py +++ b/poky/bitbake/lib/bblayers/query.py @@ -29,12 +29,12 @@ class QueryPlugin(LayerPlugin): def do_show_layers(self, args): """show current configured layers.""" - logger.plain("%s %s %s" % ("layer".ljust(20), "path".ljust(40), "priority")) - logger.plain('=' * 74) + logger.plain("%s %s %s" % ("layer".ljust(20), "path".ljust(70), "priority")) + logger.plain('=' * 104) for layer, _, regex, pri in self.tinfoil.cooker.bbfile_config_priorities: layerdir = self.bbfile_collections.get(layer, None) - layername = self.get_layer_name(layerdir) - logger.plain("%s %s %d" % (layername.ljust(20), layerdir.ljust(40), pri)) + layername = layer + logger.plain("%s %s %s" % (layername.ljust(20), layerdir.ljust(70), pri)) def version_str(self, pe, pv, pr = None): verstr = "%s" % pv diff --git a/poky/meta-poky/conf/distro/poky.conf b/poky/meta-poky/conf/distro/poky.conf index 3d228780c5..ec2101a31e 100644 --- a/poky/meta-poky/conf/distro/poky.conf +++ b/poky/meta-poky/conf/distro/poky.conf @@ -1,8 +1,7 @@ DISTRO = "poky" DISTRO_NAME = "Poky (Yocto Project Reference Distro)" -#DISTRO_VERSION = "4.1+snapshot-${METADATA_REVISION}" -DISTRO_VERSION = "4.1" -DISTRO_CODENAME = "langdale" +DISTRO_VERSION = "4.1+snapshot-${METADATA_REVISION}" +DISTRO_CODENAME = "mickledore" SDK_VENDOR = "-pokysdk" SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${METADATA_REVISION}', 'snapshot')}" SDK_VERSION[vardepvalue] = "${SDK_VERSION}" diff --git a/poky/meta/classes-global/sstate.bbclass b/poky/meta/classes-global/sstate.bbclass index 77e3ea34e1..567de4aba4 100644 --- a/poky/meta/classes-global/sstate.bbclass +++ b/poky/meta/classes-global/sstate.bbclass @@ -365,8 +365,9 @@ def sstate_installpkg(ss, d): d.setVar("SSTATE_CURRTASK", ss['task']) sstatefetch = d.getVar('SSTATE_PKGNAME') sstatepkg = d.getVar('SSTATE_PKG') + verify_sig = bb.utils.to_boolean(d.getVar("SSTATE_VERIFY_SIG"), False) - if not os.path.exists(sstatepkg): + if not os.path.exists(sstatepkg) or (verify_sig and not os.path.exists(sstatepkg + '.sig')): pstaging_fetch(sstatefetch, d) if not os.path.isfile(sstatepkg): @@ -377,7 +378,7 @@ def sstate_installpkg(ss, d): d.setVar('SSTATE_INSTDIR', sstateinst) - if bb.utils.to_boolean(d.getVar("SSTATE_VERIFY_SIG"), False): + if verify_sig: if not os.path.isfile(sstatepkg + '.sig'): bb.warn("No signature file for sstate package %s, skipping acceleration..." % sstatepkg) return False diff --git a/poky/meta/classes-recipe/image.bbclass b/poky/meta/classes-recipe/image.bbclass index d9472a795a..e0dfba4a42 100644 --- a/poky/meta/classes-recipe/image.bbclass +++ b/poky/meta/classes-recipe/image.bbclass @@ -319,7 +319,7 @@ fakeroot python do_image_qa () { except oe.utils.ImageQAFailed as e: qamsg = qamsg + '\tImage QA function %s failed: %s\n' % (e.name, e.description) except Exception as e: - qamsg = qamsg + '\tImage QA function %s failed\n' % cmd + qamsg = qamsg + '\tImage QA function %s failed: %s\n' % (cmd, e) if qamsg: imgname = d.getVar('IMAGE_NAME') @@ -446,7 +446,7 @@ python () { localdata.delVar('DATE') localdata.delVar('TMPDIR') localdata.delVar('IMAGE_VERSION_SUFFIX') - vardepsexclude = (d.getVarFlag('IMAGE_CMD:' + realt, 'vardepsexclude', True) or '').split() + vardepsexclude = (d.getVarFlag('IMAGE_CMD:' + realt, 'vardepsexclude') or '').split() for dep in vardepsexclude: localdata.delVar(dep) diff --git a/poky/meta/classes-recipe/kernel-arch.bbclass b/poky/meta/classes-recipe/kernel-arch.bbclass index 1531ae6cd5..777f900241 100644 --- a/poky/meta/classes-recipe/kernel-arch.bbclass +++ b/poky/meta/classes-recipe/kernel-arch.bbclass @@ -19,6 +19,7 @@ valid_archs = "alpha cris ia64 \ sh sh64 um h8300 \ parisc s390 v850 \ avr32 blackfin \ + loongarch64 \ microblaze \ nios2 arc riscv xtensa" @@ -34,6 +35,7 @@ def map_kernel_arch(a, d): elif re.match('aarch64_be$', a): return 'arm64' elif re.match('aarch64_ilp32$', a): return 'arm64' elif re.match('aarch64_be_ilp32$', a): return 'arm64' + elif re.match('loongarch(32|64|)$', a): return 'loongarch' elif re.match('mips(isa|)(32|64|)(r6|)(el|)$', a): return 'mips' elif re.match('mcf', a): return 'm68k' elif re.match('riscv(32|64|)(eb|)$', a): return 'riscv' diff --git a/poky/meta/classes-recipe/libc-package.bbclass b/poky/meta/classes-recipe/libc-package.bbclass index de3d4223a8..8a99f73ae7 100644 --- a/poky/meta/classes-recipe/libc-package.bbclass +++ b/poky/meta/classes-recipe/libc-package.bbclass @@ -51,6 +51,7 @@ PACKAGE_NO_GCONV ?= "0" OVERRIDES:append = ":${TARGET_ARCH}-${TARGET_OS}" locale_base_postinst_ontarget() { +mkdir ${libdir}/locale localedef --inputfile=${datadir}/i18n/locales/%s --charmap=%s %s } diff --git a/poky/meta/classes-recipe/license_image.bbclass b/poky/meta/classes-recipe/license_image.bbclass index b60d6e44f4..8560c27e93 100644 --- a/poky/meta/classes-recipe/license_image.bbclass +++ b/poky/meta/classes-recipe/license_image.bbclass @@ -235,7 +235,7 @@ def get_deployed_dependencies(d): deploy = {} # Get all the dependencies for the current task (rootfs). taskdata = d.getVar("BB_TASKDEPDATA", False) - pn = d.getVar("PN", True) + pn = d.getVar("PN") depends = list(set([dep[0] for dep in list(taskdata.values()) if not dep[0].endswith("-native") and not dep[0] == pn])) diff --git a/poky/meta/classes-recipe/rust-target-config.bbclass b/poky/meta/classes-recipe/rust-target-config.bbclass index 939dd13d2f..5e71546fee 100644 --- a/poky/meta/classes-recipe/rust-target-config.bbclass +++ b/poky/meta/classes-recipe/rust-target-config.bbclass @@ -114,7 +114,7 @@ def llvm_features_from_target_fpu(d): # TARGET_FPU can be hard or soft. +soft-float tell llvm to use soft float # ABI. There is no option for hard. - fpu = d.getVar('TARGET_FPU', True) + fpu = d.getVar('TARGET_FPU') return ["+soft-float"] if fpu == "soft" else [] def llvm_features(d): diff --git a/poky/meta/classes-recipe/scons.bbclass b/poky/meta/classes-recipe/scons.bbclass index 5f0d4a910b..d20a78dc6e 100644 --- a/poky/meta/classes-recipe/scons.bbclass +++ b/poky/meta/classes-recipe/scons.bbclass @@ -9,7 +9,9 @@ inherit python3native DEPENDS += "python3-scons-native" EXTRA_OESCONS ?= "" - +# This value below is derived from $(getconf ARG_MAX) +SCONS_MAXLINELENGTH ?= "MAXLINELENGTH=2097152" +EXTRA_OESCONS:append = " ${SCONS_MAXLINELENGTH}" do_configure() { if [ -n "${CONFIGURESTAMPFILE}" -a "${S}" = "${B}" ]; then if [ -e "${CONFIGURESTAMPFILE}" -a "`cat ${CONFIGURESTAMPFILE}`" != "${BB_TASKHASH}" -a "${CLEANBROKEN}" != "1" ]; then @@ -31,4 +33,8 @@ scons_do_install() { die "scons install execution failed." } +do_configure[vardepsexclude] = "SCONS_MAXLINELENGTH" +do_compile[vardepsexclude] = "SCONS_MAXLINELENGTH" +do_install[vardepsexclude] = "SCONS_MAXLINELENGTH" + EXPORT_FUNCTIONS do_compile do_install diff --git a/poky/meta/classes-recipe/siteinfo.bbclass b/poky/meta/classes-recipe/siteinfo.bbclass index d31c9b2571..05253ae90d 100644 --- a/poky/meta/classes-recipe/siteinfo.bbclass +++ b/poky/meta/classes-recipe/siteinfo.bbclass @@ -39,6 +39,8 @@ def siteinfo_data_for_machine(arch, os, d): "i686": "endian-little bit-32 ix86-common", "ia64": "endian-little bit-64", "lm32": "endian-big bit-32", + "loongarch32": "endian-little bit-32 loongarch", + "loongarch64": "endian-little bit-64 loongarch", "m68k": "endian-big bit-32", "microblaze": "endian-big bit-32 microblaze-common", "microblazeel": "endian-little bit-32 microblaze-common", @@ -97,6 +99,8 @@ def siteinfo_data_for_machine(arch, os, d): "arm-linux-musleabi": "arm-linux", "armeb-linux-gnueabi": "armeb-linux", "armeb-linux-musleabi": "armeb-linux", + "loongarch32-linux": "loongarch32-linux", + "loongarch64-linux": "loongarch64-linux", "microblazeel-linux" : "microblaze-linux", "microblazeel-linux-musl" : "microblaze-linux", "mips-linux-musl": "mips-linux", diff --git a/poky/meta/classes-recipe/testimage.bbclass b/poky/meta/classes-recipe/testimage.bbclass index 5cc408b0c4..df22bb2344 100644 --- a/poky/meta/classes-recipe/testimage.bbclass +++ b/poky/meta/classes-recipe/testimage.bbclass @@ -236,7 +236,7 @@ def testimage_main(d): with open(tdname, "r") as f: td = json.load(f) except FileNotFoundError as err: - bb.fatal('File %s not found (%s).\nHave you built the image with INHERIT += "testimage" in the conf/local.conf?' % (tdname, err)) + bb.fatal('File %s not found (%s).\nHave you built the image with IMAGE_CLASSES += "testimage" in the conf/local.conf?' % (tdname, err)) # Some variables need to be updates (mostly paths) with the # ones of the current environment because some tests require them. diff --git a/poky/meta/classes-recipe/update-alternatives.bbclass b/poky/meta/classes-recipe/update-alternatives.bbclass index 55e0b954d6..36a7497fec 100644 --- a/poky/meta/classes-recipe/update-alternatives.bbclass +++ b/poky/meta/classes-recipe/update-alternatives.bbclass @@ -5,7 +5,7 @@ # # This class is used to help the alternatives system which is useful when -# multiple sources provide same command. You can use update-alternatives +# multiple sources provide the same command. You can use update-alternatives # command directly in your recipe, but in most cases this class simplifies # that job. # @@ -35,7 +35,7 @@ # A non-default link to create for a target # ALTERNATIVE_TARGET[name] = "target" # -# This is the name of the binary as it's been install by do_install +# This is the name of the binary as it's been installed by do_install # i.e. ALTERNATIVE_TARGET[sh] = "/bin/bash" # # A package specific link for a target @@ -68,7 +68,7 @@ ALTERNATIVE_PRIORITY = "10" # We need special processing for vardeps because it can not work on # modified flag values. So we aggregate the flags into a new variable -# and include that vairable in the set. +# and include that variable in the set. UPDALTVARS = "ALTERNATIVE ALTERNATIVE_LINK_NAME ALTERNATIVE_TARGET ALTERNATIVE_PRIORITY" PACKAGE_WRITE_DEPS += "virtual/update-alternatives-native" diff --git a/poky/meta/classes/recipe_sanity.bbclass b/poky/meta/classes/recipe_sanity.bbclass index 1c2e24c6a1..a5cc4315fb 100644 --- a/poky/meta/classes/recipe_sanity.bbclass +++ b/poky/meta/classes/recipe_sanity.bbclass @@ -16,7 +16,7 @@ def bad_runtime_vars(cfgdata, d): for var in d.getVar("__recipe_sanity_badruntimevars").split(): val = d.getVar(var, False) if val and val != cfgdata.get(var): - __note("%s should be %s_${PN}" % (var, var), d) + __note("%s should be %s:${PN}" % (var, var), d) __recipe_sanity_reqvars = "DESCRIPTION" __recipe_sanity_reqdiffvars = "" diff --git a/poky/meta/conf/bitbake.conf b/poky/meta/conf/bitbake.conf index 530b068757..dcf6ce99d1 100644 --- a/poky/meta/conf/bitbake.conf +++ b/poky/meta/conf/bitbake.conf @@ -543,6 +543,9 @@ HOSTTOOLS_NONFATAL += "bzr" # Used by ssh fetcher HOSTTOOLS_NONFATAL += "scp" +# Used by Mercurial fetcher +HOSTTOOLS_NONFATAL += "hg" + # Link to git-lfs if present HOSTTOOLS_NONFATAL += "git-lfs" diff --git a/poky/meta/conf/distro/include/default-distrovars.inc b/poky/meta/conf/distro/include/default-distrovars.inc index d05390d3cc..7554081e8b 100644 --- a/poky/meta/conf/distro/include/default-distrovars.inc +++ b/poky/meta/conf/distro/include/default-distrovars.inc @@ -22,6 +22,9 @@ DISTRO_FEATURES_DEFAULT:remove:arc = "seccomp" # seccomp is not yet ported to microblaze DISTRO_FEATURES_DEFAULT:remove:microblaze = "seccomp" +# seccomp is not yet ported to loongarch64 +DISTRO_FEATURES_DEFAULT:remove:loongarch64 = "seccomp" + DISTRO_FEATURES_DEFAULT ?= "acl alsa bluetooth debuginfod ext2 ipv4 ipv6 pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc x11 vfat seccomp" DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT}" IMAGE_FEATURES ?= "" diff --git a/poky/meta/conf/distro/include/ptest-packagelists.inc b/poky/meta/conf/distro/include/ptest-packagelists.inc index 72162f10ee..5422ecd378 100644 --- a/poky/meta/conf/distro/include/ptest-packagelists.inc +++ b/poky/meta/conf/distro/include/ptest-packagelists.inc @@ -88,6 +88,7 @@ PTESTS_SLOW = "\ elfutils-ptest \ gettext-ptest \ glib-2.0-ptest \ + gnutls-ptest \ gstreamer1.0-ptest \ libevent-ptest \ libgcrypt-ptest \ diff --git a/poky/meta/conf/distro/include/tcmode-default.inc b/poky/meta/conf/distro/include/tcmode-default.inc index f628e00d33..9236f8bf37 100644 --- a/poky/meta/conf/distro/include/tcmode-default.inc +++ b/poky/meta/conf/distro/include/tcmode-default.inc @@ -20,12 +20,12 @@ GCCVERSION ?= "12.%" SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.40%" GDBVERSION ?= "12.%" -GLIBCVERSION ?= "2.36" +GLIBCVERSION ?= "2.37" LINUXLIBCVERSION ?= "6.1%" QEMUVERSION ?= "7.2%" GOVERSION ?= "1.19%" LLVMVERSION ?= "15.%" -RUSTVERSION ?= "1.66%" +RUSTVERSION ?= "1.67%" PREFERRED_VERSION_gcc ?= "${GCCVERSION}" PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}" diff --git a/poky/meta/conf/distro/include/yocto-uninative.inc b/poky/meta/conf/distro/include/yocto-uninative.inc index 51c0cdee43..8a5cab5360 100644 --- a/poky/meta/conf/distro/include/yocto-uninative.inc +++ b/poky/meta/conf/distro/include/yocto-uninative.inc @@ -6,10 +6,10 @@ # to the distro running on the build machine. # -UNINATIVE_MAXGLIBCVERSION = "2.36" -UNINATIVE_VERSION = "3.8.1" +UNINATIVE_MAXGLIBCVERSION = "2.37" +UNINATIVE_VERSION = "3.9" UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/${UNINATIVE_VERSION}/" -UNINATIVE_CHECKSUM[aarch64] ?= "3f15d420049b21854bd7a8843da0f42f17064559492c8b752d7a6f998ff5ea65" -UNINATIVE_CHECKSUM[i686] ?= "a6dcf316d738ade2e5e463bd3b33a270b4bfc25bba41770ad5cbdc3b0e24044c" -UNINATIVE_CHECKSUM[x86_64] ?= "5fab9a5c97fc73a21134e5a81f74498cbaecda75d56aab971c934e0b803bcc00" +UNINATIVE_CHECKSUM[aarch64] ?= "de35708c95c34573af140da910132c3291ba4fd26ebf7b74b755ada432cdf07b" +UNINATIVE_CHECKSUM[i686] ?= "adac07b08adb88eb26fc7fd87fee0cec9d5be167bf7c5ffd3a549a2a6699c29c" +UNINATIVE_CHECKSUM[x86_64] ?= "3dd82c3fbdb59e87bf091c3eef555a05fae528eeda3083828f76cd4deaceca8b" diff --git a/poky/meta/conf/machine-sdk/loongarch64.conf b/poky/meta/conf/machine-sdk/loongarch64.conf new file mode 100644 index 0000000000..40bf0039ea --- /dev/null +++ b/poky/meta/conf/machine-sdk/loongarch64.conf @@ -0,0 +1,2 @@ +SDK_ARCH = "loongarch64" +ABIEXTENSION:class-nativesdk = "" diff --git a/poky/meta/conf/machine/include/loongarch/arch-loongarch.inc b/poky/meta/conf/machine/include/loongarch/arch-loongarch.inc new file mode 100644 index 0000000000..4b44614035 --- /dev/null +++ b/poky/meta/conf/machine/include/loongarch/arch-loongarch.inc @@ -0,0 +1,7 @@ +# LoongArch Architecture definition + +DEFAULTTUNE ?= "loongarch64" + +TUNE_ARCH = "${TUNE_ARCH:tune-${DEFAULTTUNE}}" +TUNE_PKGARCH = "${TUNE_PKGARCH:tune-${DEFAULTTUNE}}" +TUNE_CCARGS:append = "${@bb.utils.contains('TUNE_FEATURES', 'loongarch64', ' -march=la464 -mabi=lp64d', ' ', d)}" diff --git a/poky/meta/conf/machine/include/loongarch/qemuloongarch.inc b/poky/meta/conf/machine/include/loongarch/qemuloongarch.inc new file mode 100644 index 0000000000..77245ff85d --- /dev/null +++ b/poky/meta/conf/machine/include/loongarch/qemuloongarch.inc @@ -0,0 +1,35 @@ +PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" + +require conf/machine/include/qemu.inc +require conf/machine/include/loongarch/tune-loongarch.inc + +MACHINE_FEATURES = "screen keyboard ext2 ext3 serial" + +KERNEL_IMAGETYPE = "vmlinuz" +KERNEL_IMAGETYPES += "vmlinuz" +KEEPUIMAGE = "no" + +SERIAL_CONSOLES ?= "115200;ttyS0 115200;hvc0" + +IMAGE_FSTYPES += "ext4 wic.qcow2" + +WKS_FILE ?= "qemuloongarch.wks" + +MACHINE_EXTRA_RRECOMMENDS += " kernel-modules" + +#EXTRA_IMAGEDEPENDS += "opensbi" + +UBOOT_ENTRYPOINT_loongarch32 = "0x80400000" +UBOOT_ENTRYPOINT_loongarch64 = "0x80200000" + +# qemuboot options +QB_KERNEL_CMDLINE_APPEND = "earlycon=sbi" +QB_MACHINE = "-machine virt" +QB_DEFAULT_BIOS = "fw_jump.elf" +QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" +QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@" +QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=none,format=raw -device virtio-blk-device,drive=disk0" +QB_SERIAL_OPT = "-device virtio-serial-device -chardev null,id=virtcon -device virtconsole,chardev=virtcon" +QB_TCPSERIAL_OPT = " -device virtio-serial-device -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1 -device virtconsole,chardev=virtcon" +# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy +QB_OPT_APPEND = " -object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-device,rng=rng0" diff --git a/poky/meta/conf/machine/include/loongarch/tune-loongarch.inc b/poky/meta/conf/machine/include/loongarch/tune-loongarch.inc new file mode 100644 index 0000000000..f02ddda474 --- /dev/null +++ b/poky/meta/conf/machine/include/loongarch/tune-loongarch.inc @@ -0,0 +1,13 @@ +require conf/machine/include/loongarch/arch-loongarch.inc + +TUNEVALID[loongarch64] = "Enable 64-bit LoongArch optimizations" + +TUNEVALID[littleendian] = "Little endian mode" + +AVAILTUNES += "loongarch64" + +# Default +TUNE_FEATURES:tune-loongarch64 = "loongarch64" +TUNE_ARCH:tune-loongarch64 = "loongarch64" +TUNE_PKGARCH:tune-loongarch64 = "loongarch64" +PACKAGE_EXTRA_ARCHS:tune-loongarch64 = "loongarch64" diff --git a/poky/meta/conf/machine/qemuloongarch64.conf b/poky/meta/conf/machine/qemuloongarch64.conf new file mode 100644 index 0000000000..675d525afd --- /dev/null +++ b/poky/meta/conf/machine/qemuloongarch64.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: generic loongarch64 machine +#@DESCRIPTION: Machine configuration for running a generic loongarch64 + +require conf/machine/include/loongarch/qemuloongarch.inc + +XVISOR_PLAT = "loongarch/virt64" + +EXTRA_IMAGEDEPENDS += "u-boot" +UBOOT_MACHINE = "qemu-loongarch64_smode_defconfig" +UBOOT_ELF = "u-boot" diff --git a/poky/meta/lib/oe/elf.py b/poky/meta/lib/oe/elf.py index fb07995b3e..eab2349a4f 100644 --- a/poky/meta/lib/oe/elf.py +++ b/poky/meta/lib/oe/elf.py @@ -21,6 +21,7 @@ def machine_dict(d): "x86_64": (62, 0, 0, True, 64), "epiphany": (4643, 0, 0, True, 32), "lm32": (138, 0, 0, False, 32), + "loongarch64":(258, 0, 0, True, 64), "mips": ( 8, 0, 0, False, 32), "mipsel": ( 8, 0, 0, True, 32), "microblaze": (189, 0, 0, False, 32), @@ -45,6 +46,7 @@ def machine_dict(d): "ia64": (50, 0, 0, True, 64), "alpha": (36902, 0, 0, True, 64), "hppa": (15, 3, 0, False, 32), + "loongarch64":(258, 0, 0, True, 64), "m68k": ( 4, 0, 0, False, 32), "mips": ( 8, 0, 0, False, 32), "mipsel": ( 8, 0, 0, True, 32), diff --git a/poky/meta/lib/oe/package_manager/deb/__init__.py b/poky/meta/lib/oe/package_manager/deb/__init__.py index c672454072..0c23c884c1 100644 --- a/poky/meta/lib/oe/package_manager/deb/__init__.py +++ b/poky/meta/lib/oe/package_manager/deb/__init__.py @@ -82,15 +82,15 @@ class DpkgIndexer(Indexer): return oe.utils.multiprocess_launch(create_index, index_cmds, self.d) - if self.d.getVar('PACKAGE_FEED_SIGN', True) == '1': - signer = get_signer(self.d, self.d.getVar('PACKAGE_FEED_GPG_BACKEND', True)) + if self.d.getVar('PACKAGE_FEED_SIGN') == '1': + signer = get_signer(self.d, self.d.getVar('PACKAGE_FEED_GPG_BACKEND')) else: signer = None if signer: for f in index_sign_files: signer.detach_sign(f, - self.d.getVar('PACKAGE_FEED_GPG_NAME', True), - self.d.getVar('PACKAGE_FEED_GPG_PASSPHRASE_FILE', True), + self.d.getVar('PACKAGE_FEED_GPG_NAME'), + self.d.getVar('PACKAGE_FEED_GPG_PASSPHRASE_FILE'), output_suffix="gpg", use_sha256=True) diff --git a/poky/meta/lib/oeqa/runtime/context.py b/poky/meta/lib/oeqa/runtime/context.py index 8092dd0bae..0c5d1869ab 100644 --- a/poky/meta/lib/oeqa/runtime/context.py +++ b/poky/meta/lib/oeqa/runtime/context.py @@ -67,11 +67,11 @@ class OERuntimeTestContextExecutor(OETestContextExecutor): % self.default_target_type) runtime_group.add_argument('--target-ip', action='store', default=self.default_target_ip, - help="IP address of device under test, default: %s" \ + help="IP address and optionally ssh port (default 22) of device under test, for example '192.168.0.7:22'. Default: %s" \ % self.default_target_ip) runtime_group.add_argument('--server-ip', action='store', default=self.default_target_ip, - help="IP address of device under test, default: %s" \ + help="IP address of the test host from test target machine, default: %s" \ % self.default_server_ip) runtime_group.add_argument('--host-dumper-dir', action='store', diff --git a/poky/meta/lib/oeqa/sdkext/cases/devtool.py b/poky/meta/lib/oeqa/sdkext/cases/devtool.py index a5c6a76e02..5ffb732556 100644 --- a/poky/meta/lib/oeqa/sdkext/cases/devtool.py +++ b/poky/meta/lib/oeqa/sdkext/cases/devtool.py @@ -112,7 +112,7 @@ class SdkUpdateTest(OESDKExtTestCase): cmd = 'oe-publish-sdk %s %s' % (tcname_new, self.publish_dir) subprocess.check_output(cmd, shell=True) - self.http_service = HTTPService(self.publish_dir) + self.http_service = HTTPService(self.publish_dir, logger=self.logger) self.http_service.start() self.http_url = "http://127.0.0.1:%d" % self.http_service.port diff --git a/poky/meta/lib/oeqa/selftest/cases/locales.py b/poky/meta/lib/oeqa/selftest/cases/locales.py new file mode 100644 index 0000000000..4ca8ffb7aa --- /dev/null +++ b/poky/meta/lib/oeqa/selftest/cases/locales.py @@ -0,0 +1,54 @@ +# +# SPDX-License-Identifier: MIT +# + +from oeqa.selftest.case import OESelftestTestCase +from oeqa.core.decorator import OETestTag +from oeqa.utils.commands import bitbake, runqemu + +class LocalesTest(OESelftestTestCase): + + @OETestTag("runqemu") + + def run_locales_test(self, binary_enabled): + features = [] + features.append('EXTRA_IMAGE_FEATURES = "empty-root-password allow-empty-password allow-root-login"') + features.append('IMAGE_INSTALL:append = " glibc-utils localedef"') + features.append('GLIBC_GENERATE_LOCALES = "en_US.UTF-8 fr_FR.UTF-8"') + features.append('IMAGE_LINGUAS:append = " en-us fr-fr"') + if binary_enabled: + features.append('ENABLE_BINARY_LOCALE_GENERATION = "1"') + else: + features.append('ENABLE_BINARY_LOCALE_GENERATION = "0"') + self.write_config("\n".join(features)) + + # Build a core-image-minimal + bitbake('core-image-minimal') + + with runqemu("core-image-minimal", ssh=False, runqemuparams='nographic') as qemu: + cmd = "locale -a" + status, output = qemu.run_serial(cmd) + # output must includes fr_FR or fr_FR.UTF-8 + self.assertEqual(status, 1, msg='locale test command failed: output: %s' % output) + self.assertIn("fr_FR", output, msg='locale -a test failed: output: %s' % output) + + cmd = "localedef --list-archive -v" + status, output = qemu.run_serial(cmd) + # output must includes fr_FR.utf8 + self.assertEqual(status, 1, msg='localedef test command failed: output: %s' % output) + self.assertIn("fr_FR.utf8", output, msg='localedef test failed: output: %s' % output) + + def test_locales_on(self): + """ + Summary: Test the locales are generated + Expected: 1. Check the locale exist in the locale-archive + 2. Check the locale exist for the glibc + 3. Check the locale can be generated + Product: oe-core + Author: Louis Rannou <lrannou@baylibre.com> + AutomatedBy: Louis Rannou <lrannou@baylibre.com> + """ + self.run_locales_test(True) + + def test_locales_off(self): + self.run_locales_test(False) diff --git a/poky/meta/lib/oeqa/utils/httpserver.py b/poky/meta/lib/oeqa/utils/httpserver.py index 8ce1dd42f4..80752c1377 100644 --- a/poky/meta/lib/oeqa/utils/httpserver.py +++ b/poky/meta/lib/oeqa/utils/httpserver.py @@ -5,9 +5,9 @@ # import http.server +import logging import multiprocessing import os -import traceback import signal from socketserver import ThreadingMixIn @@ -15,20 +15,24 @@ class HTTPServer(ThreadingMixIn, http.server.HTTPServer): def server_start(self, root_dir, logger): os.chdir(root_dir) + self.logger = logger self.serve_forever() class HTTPRequestHandler(http.server.SimpleHTTPRequestHandler): def log_message(self, format_str, *args): - pass + self.server.logger.info(format_str, *args) -class HTTPService(object): +class HTTPService: def __init__(self, root_dir, host='', port=0, logger=None): self.root_dir = root_dir self.host = host self.port = port - self.logger = logger + if logger: + self.logger = logger.getChild("HTTPService") + else: + self.logger = logging.getLogger("HTTPService") def start(self): if not os.path.exists(self.root_dir): @@ -40,6 +44,12 @@ class HTTPService(object): self.port = self.server.server_port self.process = multiprocessing.Process(target=self.server.server_start, args=[self.root_dir, self.logger]) + def handle_error(self, request, client_address): + import traceback + exception = traceback.format_exc() + self.logger.warn("Exception when handling %s: %s" % (request, exception)) + self.server.handle_error = handle_error + # The signal handler from testimage.bbclass can cause deadlocks here # if the HTTPServer is terminated before it can restore the standard #signal behaviour @@ -49,7 +59,7 @@ class HTTPService(object): signal.signal(signal.SIGTERM, orig) if self.logger: - self.logger.info("Started HTTPService on %s:%s" % (self.host, self.port)) + self.logger.info("Started HTTPService for %s on %s:%s" % (self.root_dir, self.host, self.port)) def stop(self): @@ -61,3 +71,10 @@ class HTTPService(object): if self.logger: self.logger.info("Stopped HTTPService on %s:%s" % (self.host, self.port)) +if __name__ == "__main__": + import sys, logging + + logger = logging.getLogger(__name__) + logging.basicConfig(level=logging.DEBUG) + httpd = HTTPService(sys.argv[1], port=8888, logger=logger) + httpd.start() diff --git a/poky/meta/lib/oeqa/utils/qemurunner.py b/poky/meta/lib/oeqa/utils/qemurunner.py index b5fed6c9fe..8b893601d4 100644 --- a/poky/meta/lib/oeqa/utils/qemurunner.py +++ b/poky/meta/lib/oeqa/utils/qemurunner.py @@ -543,10 +543,13 @@ class QemuRunner: except OSError as e: if e.errno != errno.ESRCH: raise - endtime = time.time() + self.runqemutime - while self.runqemu.poll() is None and time.time() < endtime: - time.sleep(1) - if self.runqemu.poll() is None: + try: + outs, errs = self.runqemu.communicate(timeout = self.runqemutime) + if outs: + self.logger.info("Output from runqemu:\n%s", outs.decode("utf-8")) + if errs: + self.logger.info("Stderr from runqemu:\n%s", errs.decode("utf-8")) + except TimeoutExpired: self.logger.debug("Sending SIGKILL to runqemu") os.killpg(os.getpgid(self.runqemu.pid), signal.SIGKILL) if not self.runqemu.stdout.closed: diff --git a/poky/meta/recipes-bsp/u-boot/u-boot-tools.inc b/poky/meta/recipes-bsp/u-boot/u-boot-tools.inc index 0bdbce725a..09b3c3f68c 100644 --- a/poky/meta/recipes-bsp/u-boot/u-boot-tools.inc +++ b/poky/meta/recipes-bsp/u-boot/u-boot-tools.inc @@ -24,6 +24,7 @@ SED_CONFIG_EFI:x86-64 = '' SED_CONFIG_EFI:arm = '' SED_CONFIG_EFI:armeb = '' SED_CONFIG_EFI:aarch64 = '' +SED_CONFIG_EFI:loongarch64 = '' do_compile () { # Yes, this is crazy. If you build on a system with git < 2.14 from scratch, the tree will diff --git a/poky/meta/recipes-connectivity/bind/bind-9.18.10/0001-avoid-start-failure-with-bind-user.patch b/poky/meta/recipes-connectivity/bind/bind-9.18.11/0001-avoid-start-failure-with-bind-user.patch index ec1bc7b567..ec1bc7b567 100644 --- a/poky/meta/recipes-connectivity/bind/bind-9.18.10/0001-avoid-start-failure-with-bind-user.patch +++ b/poky/meta/recipes-connectivity/bind/bind-9.18.11/0001-avoid-start-failure-with-bind-user.patch diff --git a/poky/meta/recipes-connectivity/bind/bind-9.18.10/0001-named-lwresd-V-and-start-log-hide-build-options.patch b/poky/meta/recipes-connectivity/bind/bind-9.18.11/0001-named-lwresd-V-and-start-log-hide-build-options.patch index 4c10f33f04..4c10f33f04 100644 --- a/poky/meta/recipes-connectivity/bind/bind-9.18.10/0001-named-lwresd-V-and-start-log-hide-build-options.patch +++ b/poky/meta/recipes-connectivity/bind/bind-9.18.11/0001-named-lwresd-V-and-start-log-hide-build-options.patch diff --git a/poky/meta/recipes-connectivity/bind/bind-9.18.10/bind-ensure-searching-for-json-headers-searches-sysr.patch b/poky/meta/recipes-connectivity/bind/bind-9.18.11/bind-ensure-searching-for-json-headers-searches-sysr.patch index f1abd179e8..f1abd179e8 100644 --- a/poky/meta/recipes-connectivity/bind/bind-9.18.10/bind-ensure-searching-for-json-headers-searches-sysr.patch +++ b/poky/meta/recipes-connectivity/bind/bind-9.18.11/bind-ensure-searching-for-json-headers-searches-sysr.patch diff --git a/poky/meta/recipes-connectivity/bind/bind-9.18.10/bind9 b/poky/meta/recipes-connectivity/bind/bind-9.18.11/bind9 index 968679ff7f..968679ff7f 100644 --- a/poky/meta/recipes-connectivity/bind/bind-9.18.10/bind9 +++ b/poky/meta/recipes-connectivity/bind/bind-9.18.11/bind9 diff --git a/poky/meta/recipes-connectivity/bind/bind-9.18.10/conf.patch b/poky/meta/recipes-connectivity/bind/bind-9.18.11/conf.patch index aa3642acec..aa3642acec 100644 --- a/poky/meta/recipes-connectivity/bind/bind-9.18.10/conf.patch +++ b/poky/meta/recipes-connectivity/bind/bind-9.18.11/conf.patch diff --git a/poky/meta/recipes-connectivity/bind/bind-9.18.10/generate-rndc-key.sh b/poky/meta/recipes-connectivity/bind/bind-9.18.11/generate-rndc-key.sh index 633e29c0e6..633e29c0e6 100644 --- a/poky/meta/recipes-connectivity/bind/bind-9.18.10/generate-rndc-key.sh +++ b/poky/meta/recipes-connectivity/bind/bind-9.18.11/generate-rndc-key.sh diff --git a/poky/meta/recipes-connectivity/bind/bind-9.18.10/init.d-add-support-for-read-only-rootfs.patch b/poky/meta/recipes-connectivity/bind/bind-9.18.11/init.d-add-support-for-read-only-rootfs.patch index 11db95ede1..11db95ede1 100644 --- a/poky/meta/recipes-connectivity/bind/bind-9.18.10/init.d-add-support-for-read-only-rootfs.patch +++ b/poky/meta/recipes-connectivity/bind/bind-9.18.11/init.d-add-support-for-read-only-rootfs.patch diff --git a/poky/meta/recipes-connectivity/bind/bind-9.18.10/make-etc-initd-bind-stop-work.patch b/poky/meta/recipes-connectivity/bind/bind-9.18.11/make-etc-initd-bind-stop-work.patch index 146f3e35db..146f3e35db 100644 --- a/poky/meta/recipes-connectivity/bind/bind-9.18.10/make-etc-initd-bind-stop-work.patch +++ b/poky/meta/recipes-connectivity/bind/bind-9.18.11/make-etc-initd-bind-stop-work.patch diff --git a/poky/meta/recipes-connectivity/bind/bind-9.18.10/named.service b/poky/meta/recipes-connectivity/bind/bind-9.18.11/named.service index cda56ef015..cda56ef015 100644 --- a/poky/meta/recipes-connectivity/bind/bind-9.18.10/named.service +++ b/poky/meta/recipes-connectivity/bind/bind-9.18.11/named.service diff --git a/poky/meta/recipes-connectivity/bind/bind_9.18.10.bb b/poky/meta/recipes-connectivity/bind/bind_9.18.11.bb index cb0e251d51..55a06eae5f 100644 --- a/poky/meta/recipes-connectivity/bind/bind_9.18.10.bb +++ b/poky/meta/recipes-connectivity/bind/bind_9.18.11.bb @@ -4,7 +4,7 @@ DESCRIPTION = "BIND 9 provides a full-featured Domain Name Server system" SECTION = "console/network" LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=9a4a897f202c0710e07f2f2836bc2b62" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d8cf7bd9c4fd5471a588e7e66e672408" DEPENDS = "openssl libcap zlib libuv" @@ -20,7 +20,7 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \ file://0001-avoid-start-failure-with-bind-user.patch \ " -SRC_URI[sha256sum] = "f415a92feb62568b50854a063cb231e257351f8672186d0ab031a49b3de2cac6" +SRC_URI[sha256sum] = "8ff3352812230cbcbda42df87cad961f94163d3da457c5e4bef8057fd5df2158" UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" # follow the ESV versions divisible by 2 diff --git a/poky/meta/recipes-connectivity/openssl/openssl/CVE-2022-3996.patch b/poky/meta/recipes-connectivity/openssl/openssl/CVE-2022-3996.patch new file mode 100644 index 0000000000..6d70b323d1 --- /dev/null +++ b/poky/meta/recipes-connectivity/openssl/openssl/CVE-2022-3996.patch @@ -0,0 +1,43 @@ +From 7725e7bfe6f2ce8146b6552b44e0d226be7638e7 Mon Sep 17 00:00:00 2001 +From: Pauli <pauli@openssl.org> +Date: Fri, 11 Nov 2022 09:40:19 +1100 +Subject: [PATCH] x509: fix double locking problem + +This reverts commit 9aa4be691f5c73eb3c68606d824c104550c053f7 and removed the +redundant flag setting. + +Fixes #19643 + +Fixes LOW CVE-2022-3996 + +Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> +Reviewed-by: Tomas Mraz <tomas@openssl.org> +(Merged from https://github.com/openssl/openssl/pull/19652) + +(cherry picked from commit 4d0340a6d2f327700a059f0b8f954d6160f8eef5) + +Upstream-Status: Backport [https://github.com/openssl/openssl/commit/7725e7bfe6f2ce8146b6552b44e0d226be7638e7] +CVE: CVE-2022-3996 +Signed-off-by: Vivek Kumbhar <vkumbhar@mvista.com> +--- + crypto/x509/pcy_map.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/crypto/x509/pcy_map.c b/crypto/x509/pcy_map.c +index 05406c6493..60dfd1e320 100644 +--- a/crypto/x509/pcy_map.c ++++ b/crypto/x509/pcy_map.c +@@ -73,10 +73,6 @@ int ossl_policy_cache_set_mapping(X509 *x, POLICY_MAPPINGS *maps) + + ret = 1; + bad_mapping: +- if (ret == -1 && CRYPTO_THREAD_write_lock(x->lock)) { +- x->ex_flags |= EXFLAG_INVALID_POLICY; +- CRYPTO_THREAD_unlock(x->lock); +- } + sk_POLICY_MAPPING_pop_free(maps, POLICY_MAPPING_free); + return ret; + +-- +2.30.2 + diff --git a/poky/meta/recipes-connectivity/openssl/openssl_3.0.7.bb b/poky/meta/recipes-connectivity/openssl/openssl_3.0.7.bb index 45fd1de2fd..1842148592 100644 --- a/poky/meta/recipes-connectivity/openssl/openssl_3.0.7.bb +++ b/poky/meta/recipes-connectivity/openssl/openssl_3.0.7.bb @@ -12,6 +12,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ file://afalg.patch \ file://0001-Configure-do-not-tweak-mips-cflags.patch \ + file://CVE-2022-3996.patch \ " SRC_URI:append:class-nativesdk = " \ diff --git a/poky/meta/recipes-core/busybox/busybox-inittab_1.35.0.bb b/poky/meta/recipes-core/busybox/busybox-inittab_1.36.0.bb index 868d7a230f..868d7a230f 100644 --- a/poky/meta/recipes-core/busybox/busybox-inittab_1.35.0.bb +++ b/poky/meta/recipes-core/busybox/busybox-inittab_1.36.0.bb diff --git a/poky/meta/recipes-core/busybox/busybox/0001-devmem-add-128-bit-width.patch b/poky/meta/recipes-core/busybox/busybox/0001-devmem-add-128-bit-width.patch deleted file mode 100644 index 985e2bf1d9..0000000000 --- a/poky/meta/recipes-core/busybox/busybox/0001-devmem-add-128-bit-width.patch +++ /dev/null @@ -1,128 +0,0 @@ -From d432049f288c9acdc4a7caa729c68ceba3c5dca1 Mon Sep 17 00:00:00 2001 -From: Aaro Koskinen <aaro.koskinen@nokia.com> -Date: Thu, 25 Aug 2022 18:47:02 +0300 -Subject: [PATCH] devmem: add 128-bit width - -Add 128-bit width if the compiler provides the needed type. - -function old new delta -devmem_main 405 464 +59 -.rodata 109025 109043 +18 ------------------------------------------------------------------------------- -(add/remove: 0/0 grow/shrink: 2/0 up/down: 77/0) Total: 77 bytes - -Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=d432049f288c9acdc4a7caa729c68ceba3c5dca1] - -Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com> -Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> -Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> ---- - miscutils/devmem.c | 68 ++++++++++++++++++++++++++++++---------------- - 1 file changed, 44 insertions(+), 24 deletions(-) - -diff --git a/miscutils/devmem.c b/miscutils/devmem.c -index f9f0276bc..f21621bd6 100644 ---- a/miscutils/devmem.c -+++ b/miscutils/devmem.c -@@ -29,7 +29,6 @@ int devmem_main(int argc UNUSED_PARAM, char **argv) - { - void *map_base, *virt_addr; - uint64_t read_result; -- uint64_t writeval = writeval; /* for compiler */ - off_t target; - unsigned page_size, mapped_size, offset_in_page; - int fd; -@@ -64,9 +63,6 @@ int devmem_main(int argc UNUSED_PARAM, char **argv) - width = strchrnul(bhwl, (argv[2][0] | 0x20)) - bhwl; - width = sizes[width]; - } -- /* VALUE */ -- if (argv[3]) -- writeval = bb_strtoull(argv[3], NULL, 0); - } else { /* argv[2] == NULL */ - /* make argv[3] to be a valid thing to fetch */ - argv--; -@@ -96,28 +92,46 @@ int devmem_main(int argc UNUSED_PARAM, char **argv) - virt_addr = (char*)map_base + offset_in_page; - - if (!argv[3]) { -- switch (width) { -- case 8: -- read_result = *(volatile uint8_t*)virt_addr; -- break; -- case 16: -- read_result = *(volatile uint16_t*)virt_addr; -- break; -- case 32: -- read_result = *(volatile uint32_t*)virt_addr; -- break; -- case 64: -- read_result = *(volatile uint64_t*)virt_addr; -- break; -- default: -- bb_simple_error_msg_and_die("bad width"); -+#ifdef __SIZEOF_INT128__ -+ if (width == 128) { -+ unsigned __int128 rd = -+ *(volatile unsigned __int128 *)virt_addr; -+ printf("0x%016llX%016llX\n", -+ (unsigned long long)(uint64_t)(rd >> 64), -+ (unsigned long long)(uint64_t)rd -+ ); -+ } else -+#endif -+ { -+ switch (width) { -+ case 8: -+ read_result = *(volatile uint8_t*)virt_addr; -+ break; -+ case 16: -+ read_result = *(volatile uint16_t*)virt_addr; -+ break; -+ case 32: -+ read_result = *(volatile uint32_t*)virt_addr; -+ break; -+ case 64: -+ read_result = *(volatile uint64_t*)virt_addr; -+ break; -+ default: -+ bb_simple_error_msg_and_die("bad width"); -+ } -+// printf("Value at address 0x%"OFF_FMT"X (%p): 0x%llX\n", -+// target, virt_addr, -+// (unsigned long long)read_result); -+ /* Zero-padded output shows the width of access just done */ -+ printf("0x%0*llX\n", (width >> 2), (unsigned long long)read_result); - } --// printf("Value at address 0x%"OFF_FMT"X (%p): 0x%llX\n", --// target, virt_addr, --// (unsigned long long)read_result); -- /* Zero-padded output shows the width of access just done */ -- printf("0x%0*llX\n", (width >> 2), (unsigned long long)read_result); - } else { -+ /* parse VALUE */ -+#ifdef __SIZEOF_INT128__ -+ unsigned __int128 writeval = strtoumax(argv[3], NULL, 0); -+#else -+ uint64_t writeval = bb_strtoull(argv[3], NULL, 0); -+#endif - switch (width) { - case 8: - *(volatile uint8_t*)virt_addr = writeval; -@@ -135,6 +149,12 @@ int devmem_main(int argc UNUSED_PARAM, char **argv) - *(volatile uint64_t*)virt_addr = writeval; - // read_result = *(volatile uint64_t*)virt_addr; - break; -+#ifdef __SIZEOF_INT128__ -+ case 128: -+ *(volatile unsigned __int128 *)virt_addr = writeval; -+// read_result = *(volatile uint64_t*)virt_addr; -+ break; -+#endif - default: - bb_simple_error_msg_and_die("bad width"); - } --- -2.25.1 - diff --git a/poky/meta/recipes-core/busybox/busybox/CVE-2022-30065.patch b/poky/meta/recipes-core/busybox/busybox/CVE-2022-30065.patch deleted file mode 100644 index 25ad653b25..0000000000 --- a/poky/meta/recipes-core/busybox/busybox/CVE-2022-30065.patch +++ /dev/null @@ -1,29 +0,0 @@ -Fix use-after-free in awk. - -CVE: CVE-2022-30065 -Upstream-Status: Submitted [http://lists.busybox.net/pipermail/busybox/2022-June/089768.html] -Signed-off-by: Ross Burton <ross.burton@arm.com> - -fixes https://bugs.busybox.net/show_bug.cgi?id=14781 - -Signed-off-by: Natanael Copa <ncopa at alpinelinux.org> ---- - editors/awk.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/editors/awk.c b/editors/awk.c -index 079d0bde5..728ee8685 100644 ---- a/editors/awk.c -+++ b/editors/awk.c -@@ -3128,6 +3128,9 @@ static var *evaluate(node *op, var *res) - - case XC( OC_MOVE ): - debug_printf_eval("MOVE\n"); -+ /* make sure that we never return a temp var */ -+ if (L.v == TMPVAR0) -+ L.v = res; - /* if source is a temporary string, jusk relink it to dest */ - if (R.v == TMPVAR1 - && !(R.v->type & VF_NUMBER) --- -2.36.1 diff --git a/poky/meta/recipes-core/busybox/busybox/defconfig b/poky/meta/recipes-core/busybox/busybox/defconfig index 5e1e1f5638..3d36447c63 100644 --- a/poky/meta/recipes-core/busybox/busybox/defconfig +++ b/poky/meta/recipes-core/busybox/busybox/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.35.0 -# Sun Dec 26 16:55:55 2021 +# Busybox version: 1.36.0 +# Tue Jan 3 14:17:01 2023 # CONFIG_HAVE_DOT_CONFIG=y @@ -123,6 +123,9 @@ CONFIG_UNICODE_WIDE_WCHARS=y # CONFIG_UNICODE_BIDI_SUPPORT is not set # CONFIG_UNICODE_NEUTRAL_TABLE is not set # CONFIG_UNICODE_PRESERVE_BROKEN is not set +# CONFIG_LOOP_CONFIGURE is not set +# CONFIG_NO_LOOP_CONFIGURE is not set +CONFIG_TRY_LOOP_CONFIGURE=y # # Applets @@ -338,6 +341,7 @@ CONFIG_FEATURE_TR_CLASSES=y # CONFIG_FEATURE_TR_EQUIV is not set CONFIG_TRUE=y # CONFIG_TRUNCATE is not set +# CONFIG_TSORT is not set CONFIG_TTY=y CONFIG_UNAME=y CONFIG_UNAME_OSNAME="GNU/Linux" @@ -831,10 +835,12 @@ CONFIG_MICROCOM=y CONFIG_RFKILL=y # CONFIG_RUNLEVEL is not set # CONFIG_RX is not set +# CONFIG_SEEDRNG is not set # CONFIG_SETFATTR is not set # CONFIG_SETSERIAL is not set CONFIG_STRINGS=y CONFIG_TIME=y +# CONFIG_TREE is not set CONFIG_TS=y # CONFIG_TTYSIZE is not set # CONFIG_UBIATTACH is not set diff --git a/poky/meta/recipes-core/busybox/busybox/recognize_connmand.patch b/poky/meta/recipes-core/busybox/busybox/recognize_connmand.patch index f42c74caad..4f28beb556 100644 --- a/poky/meta/recipes-core/busybox/busybox/recognize_connmand.patch +++ b/poky/meta/recipes-core/busybox/busybox/recognize_connmand.patch @@ -4,14 +4,14 @@ Upstream-Status: Inappropriate [OE-Core] Signed-off-by: Saul Wold <sgw@linux.intel.com> -Index: busybox-1.22.1/networking/ifupdown.c +Index: busybox-1.36.0/networking/ifupdown.c =================================================================== ---- busybox-1.22.1.orig/networking/ifupdown.c -+++ busybox-1.22.1/networking/ifupdown.c -@@ -521,6 +521,10 @@ struct dhcp_client_t { +--- busybox-1.36.0.orig/networking/ifupdown.c ++++ busybox-1.36.0/networking/ifupdown.c +@@ -628,6 +628,10 @@ struct dhcp_client_t { }; - static const struct dhcp_client_t ext_dhcp_clients[] = { + static const struct dhcp_client_t ext_dhcp_clients[] ALIGN_PTR = { + { "connmand", + "true", + "true", diff --git a/poky/meta/recipes-core/busybox/busybox/sha1sum.cfg b/poky/meta/recipes-core/busybox/busybox/sha1sum.cfg index 20e72d9263..afd4da4ea1 100644 --- a/poky/meta/recipes-core/busybox/busybox/sha1sum.cfg +++ b/poky/meta/recipes-core/busybox/busybox/sha1sum.cfg @@ -1 +1,2 @@ CONFIG_SHA1SUM=y +CONFIG_SHA1_SMALL=3 diff --git a/poky/meta/recipes-core/busybox/busybox/sha_accel.cfg b/poky/meta/recipes-core/busybox/busybox/sha_accel.cfg new file mode 100644 index 0000000000..8900305a11 --- /dev/null +++ b/poky/meta/recipes-core/busybox/busybox/sha_accel.cfg @@ -0,0 +1,2 @@ +# CONFIG_SHA256_HWACCEL is not set +# CONFIG_SHA1_HWACCEL is not set diff --git a/poky/meta/recipes-core/busybox/busybox_1.35.0.bb b/poky/meta/recipes-core/busybox/busybox_1.36.0.bb index e9ca6fdb1a..8014a5c7bf 100644 --- a/poky/meta/recipes-core/busybox/busybox_1.35.0.bb +++ b/poky/meta/recipes-core/busybox/busybox_1.36.0.bb @@ -49,9 +49,8 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0001-sysctl-ignore-EIO-of-stable_secret-below-proc-sys-ne.patch \ file://0001-libbb-sockaddr2str-ensure-only-printable-characters-.patch \ file://0002-nslookup-sanitize-all-printed-strings-with-printable.patch \ - file://CVE-2022-30065.patch \ - file://0001-devmem-add-128-bit-width.patch \ " SRC_URI:append:libc-musl = " file://musl.cfg " - -SRC_URI[tarball.sha256sum] = "faeeb244c35a348a334f4a59e44626ee870fb07b6884d68c10ae8bc19f83a694" +# TODO http://lists.busybox.net/pipermail/busybox/2023-January/090078.html +SRC_URI:append:x86 = " file://sha_accel.cfg" +SRC_URI[tarball.sha256sum] = "542750c8af7cb2630e201780b4f99f3dcceeb06f505b479ec68241c1e6af61a5" diff --git a/poky/meta/recipes-core/ell/ell_0.55.bb b/poky/meta/recipes-core/ell/ell_0.56.bb index 7184701e4e..0ace622835 100644 --- a/poky/meta/recipes-core/ell/ell_0.55.bb +++ b/poky/meta/recipes-core/ell/ell_0.56.bb @@ -15,7 +15,7 @@ DEPENDS = "dbus" inherit autotools pkgconfig SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "a7e1fd3e13d9083f80eb9787546add49fba5c3d9e9f166b06e2ff9fd8030dc6d" +SRC_URI[sha256sum] = "58eb8b2b64087f7479d5db6a830a0656c536d93e5f11d4c9a4443ce8760a1b63" do_configure:prepend () { mkdir -p ${S}/build-aux diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/fix-errno.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/fix-errno.patch deleted file mode 100644 index 144fe8bbd8..0000000000 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/fix-errno.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 6626765a79f125cf0ec9cdaefa51ceef718d41e7 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro <mcatanzaro@redhat.com> -Date: Tue, 20 Dec 2022 17:10:41 -0600 -Subject: [PATCH] gthread-posix: need to #include <errno.h> - -a79c6af23eff5ee978db62e048828c9a992a1261 uses errno without the required -header. - - -(cherry picked from commit 03cb4261e00cf505790f4fd4e69f97b2ef4fcccd) - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/6626765a79f125cf0ec9cdaefa51ceef718d41e7] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - glib/gthreadprivate.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/glib/gthreadprivate.h b/glib/gthreadprivate.h -index 6eaf422753..f34368a7c2 100644 ---- a/glib/gthreadprivate.h -+++ b/glib/gthreadprivate.h -@@ -41,6 +41,7 @@ struct _GRealThread - /* system thread implementation (gthread-posix.c, gthread-win32.c) */ - - #if defined(HAVE_FUTEX) || defined(HAVE_FUTEX_TIME64) -+#include <errno.h> - #include <linux/futex.h> - #include <sys/syscall.h> - #include <unistd.h> --- -GitLab diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch index 168dc73290..ae6881b61e 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch @@ -1,4 +1,4 @@ -From 2adfd458507c8c832955d6ffb9408d6c574b94f6 Mon Sep 17 00:00:00 2001 +From a3cdf17643bf33d532ec269913974195e136b7fc Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> Date: Fri, 11 Mar 2016 15:35:55 +0000 Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0_2.74.4.bb b/poky/meta/recipes-core/glib-2.0/glib-2.0_2.74.5.bb index e5279e946c..d54f077cb0 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0_2.74.4.bb +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0_2.74.5.bb @@ -18,11 +18,10 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://0001-gio-tests-meson.build-do-not-use-can_run_host_binari.patch \ file://cpp-null.patch \ file://cpp-null2.patch \ - file://fix-errno.patch \ " SRC_URI:append:class-native = " file://relocate-modules.patch" -SRC_URI[sha256sum] = "0e82da5ea129b4444227c7e4a9e598f7288d1994bf63f129c44b90cfd2432172" +SRC_URI[sha256sum] = "ceba83a5999ceb31a4c4fc9921207cb9ffffd2ab1d6ec03c162d3f608a5c14c8" # 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/glibc/cross-localedef-native_2.36.bb b/poky/meta/recipes-core/glibc/cross-localedef-native_2.37.bb index f4ea76380e..e7261a644b 100644 --- a/poky/meta/recipes-core/glibc/cross-localedef-native_2.36.bb +++ b/poky/meta/recipes-core/glibc/cross-localedef-native_2.37.bb @@ -30,8 +30,8 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ file://0012-eglibc-Resolve-__fpscr_values-on-SH4.patch \ file://0013-eglibc-Forward-port-cross-locale-generation-support.patch \ file://0014-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch \ - file://0019-Replace-echo-with-printf-builtin-in-nscd-init-script.patch \ - file://0021-timezone-Make-shell-interpreter-overridable-in-tzsel.patch \ + file://0017-Replace-echo-with-printf-builtin-in-nscd-init-script.patch \ + file://0019-timezone-Make-shell-interpreter-overridable-in-tzsel.patch \ " # Makes for a rather long rev (22 characters), but... # diff --git a/poky/meta/recipes-core/glibc/glibc-common.inc b/poky/meta/recipes-core/glibc/glibc-common.inc index fba172d968..a1a0a5feb1 100644 --- a/poky/meta/recipes-core/glibc/glibc-common.inc +++ b/poky/meta/recipes-core/glibc/glibc-common.inc @@ -22,4 +22,4 @@ ARM_INSTRUCTION_SET:armv6 = "arm" # COMPATIBLE_HOST:libc-musl:class-target = "null" -PV = "2.36" +PV = "2.37" diff --git a/poky/meta/recipes-core/glibc/glibc-locale_2.36.bb b/poky/meta/recipes-core/glibc/glibc-locale_2.37.bb index f7702e0358..f7702e0358 100644 --- a/poky/meta/recipes-core/glibc/glibc-locale_2.36.bb +++ b/poky/meta/recipes-core/glibc/glibc-locale_2.37.bb diff --git a/poky/meta/recipes-core/glibc/glibc-mtrace_2.36.bb b/poky/meta/recipes-core/glibc/glibc-mtrace_2.37.bb index 0b69bad46a..0b69bad46a 100644 --- a/poky/meta/recipes-core/glibc/glibc-mtrace_2.36.bb +++ b/poky/meta/recipes-core/glibc/glibc-mtrace_2.37.bb diff --git a/poky/meta/recipes-core/glibc/glibc-scripts_2.36.bb b/poky/meta/recipes-core/glibc/glibc-scripts_2.37.bb index 5a89bd8022..5a89bd8022 100644 --- a/poky/meta/recipes-core/glibc/glibc-scripts_2.36.bb +++ b/poky/meta/recipes-core/glibc/glibc-scripts_2.37.bb diff --git a/poky/meta/recipes-core/glibc/glibc-tests_2.36.bb b/poky/meta/recipes-core/glibc/glibc-tests_2.37.bb index bb6ef06162..bb6ef06162 100644 --- a/poky/meta/recipes-core/glibc/glibc-tests_2.36.bb +++ b/poky/meta/recipes-core/glibc/glibc-tests_2.37.bb diff --git a/poky/meta/recipes-core/glibc/glibc-testsuite_2.36.bb b/poky/meta/recipes-core/glibc/glibc-testsuite_2.37.bb index e8ad2a938b..e8ad2a938b 100644 --- a/poky/meta/recipes-core/glibc/glibc-testsuite_2.36.bb +++ b/poky/meta/recipes-core/glibc/glibc-testsuite_2.37.bb diff --git a/poky/meta/recipes-core/glibc/glibc-version.inc b/poky/meta/recipes-core/glibc/glibc-version.inc index bd125ec401..bf6a8c9bd4 100644 --- a/poky/meta/recipes-core/glibc/glibc-version.inc +++ b/poky/meta/recipes-core/glibc/glibc-version.inc @@ -1,6 +1,6 @@ -SRCBRANCH ?= "release/2.36/master" -PV = "2.36" -SRCREV_glibc ?= "c399271c10bd00714504e8d4dfbec8aebf996dd4" +SRCBRANCH ?= "release/2.37/master" +PV = "2.37" +SRCREV_glibc ?= "a704fd9a133bfb10510e18702f48a6a9c88dbbd5" SRCREV_localedef ?= "794da69788cbf9bf57b59a852f9f11307663fa87" GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" diff --git a/poky/meta/recipes-core/glibc/glibc/0001-Linux-Add-ppoll-fortify-symbol-for-64-bit-time_t-BZ-.patch b/poky/meta/recipes-core/glibc/glibc/0001-Linux-Add-ppoll-fortify-symbol-for-64-bit-time_t-BZ-.patch deleted file mode 100644 index 678dc2af2c..0000000000 --- a/poky/meta/recipes-core/glibc/glibc/0001-Linux-Add-ppoll-fortify-symbol-for-64-bit-time_t-BZ-.patch +++ /dev/null @@ -1,528 +0,0 @@ -From 69318192d16adc7d57adcd69fbbb1e3e107b2783 Mon Sep 17 00:00:00 2001 -From: Adhemerval Zanella <adhemerval.zanella@linaro.org> -Date: Fri, 4 Nov 2022 16:02:52 -0300 -Subject: [PATCH] Linux: Add ppoll fortify symbol for 64 bit time_t (BZ# 29746) - -Similar to ppoll, the poll.h header needs to redirect the poll call -to a proper fortified ppoll with 64 bit time_t support. - -The implementation is straightforward, just need to add a similar -check as __poll_chk and call the 64 bit time_t ppoll version. The -debug fortify tests are also extended to cover 64 bit time_t for -affected ABIs. - -Unfortunately it requires an aditional symbol, which makes backport -tricky. One possibility is to add a static inline version if compiler -supports is and call abort instead of __chk_fail, so fortified version -will call __poll64 in the end. - -Another possibility is to just remove the fortify support for -_TIME_BITS=64. - -Checked on i686-linux-gnu. - -Upstream-Status: Backport - -Signed-off-by: Ola Nilsson <olani@axis.com> ---- - debug/Makefile | 41 ++++++++++++------ - include/sys/poll.h | 5 ++- - io/bits/poll2.h | 25 +++++++++++ - sysdeps/unix/sysv/linux/Versions | 5 +++ - sysdeps/unix/sysv/linux/arm/be/libc.abilist | 1 + - sysdeps/unix/sysv/linux/arm/le/libc.abilist | 1 + - sysdeps/unix/sysv/linux/csky/libc.abilist | 1 + - sysdeps/unix/sysv/linux/hppa/libc.abilist | 1 + - sysdeps/unix/sysv/linux/i386/libc.abilist | 1 + - .../sysv/linux/m68k/coldfire/libc.abilist | 1 + - .../unix/sysv/linux/m68k/m680x0/libc.abilist | 1 + - .../sysv/linux/microblaze/be/libc.abilist | 1 + - .../sysv/linux/microblaze/le/libc.abilist | 1 + - .../sysv/linux/mips/mips32/fpu/libc.abilist | 1 + - .../sysv/linux/mips/mips32/nofpu/libc.abilist | 1 + - .../sysv/linux/mips/mips64/n32/libc.abilist | 1 + - sysdeps/unix/sysv/linux/nios2/libc.abilist | 1 + - .../linux/powerpc/powerpc32/fpu/libc.abilist | 1 + - .../powerpc/powerpc32/nofpu/libc.abilist | 1 + - sysdeps/unix/sysv/linux/ppoll.c | 3 +- - sysdeps/unix/sysv/linux/ppoll_chk.c | 42 +++++++++++++++++++ - .../unix/sysv/linux/s390/s390-32/libc.abilist | 1 + - sysdeps/unix/sysv/linux/sh/be/libc.abilist | 1 + - sysdeps/unix/sysv/linux/sh/le/libc.abilist | 1 + - .../sysv/linux/sparc/sparc32/libc.abilist | 1 + - 25 files changed, 125 insertions(+), 15 deletions(-) - create mode 100644 sysdeps/unix/sysv/linux/ppoll_chk.c - -diff --git a/debug/Makefile b/debug/Makefile -index 456b349c4d..075a135a2b 100644 ---- a/debug/Makefile -+++ b/debug/Makefile -@@ -120,8 +120,10 @@ CPPFLAGS-tst-read-chk-cancel.c += -D_FORTIFY_SOURCE=2 - # CFLAGS for the file. - - tests-all-chk = tst-fortify --tests-c-chk = --tests-cc-chk = -+tests-c-def-chk = -+tests-cc-def-chk = -+tests-c-time64-chk = -+tests-cc-time64-chk = - - CFLAGS-tst-fortify.c += -Wno-format -Wno-deprecated-declarations -Wno-error - -@@ -130,11 +132,11 @@ define cflags-default - endef - - define cflags-lfs --CFLAGS-tst-fortify-$(1)-lfs-$(2).$(1) += -D_FILE_OFFSET_BITS=64 -+CFLAGS-tst-fortify-$(1)-lfs-$(2)-$(3).$(1) += -D_FILE_OFFSET_BITS=64 - endef - - define cflags-nongnu --CFLAGS-tst-fortify-$(1)-nongnu-$(2).$(1) += -D_LARGEFILE64_SOURCE=1 -+CFLAGS-tst-fortify-$(1)-nongnu-$(2)-$(3).$(1) += -D_LARGEFILE64_SOURCE=1 - endef - - src-chk-nongnu = \#undef _GNU_SOURCE -@@ -145,12 +147,12 @@ src-chk-nongnu = \#undef _GNU_SOURCE - # And they also generate warnings from warning attributes, which - # cannot be disabled via pragmas, so require -Wno-error to be used. - define gen-chk-test --tests-$(1)-chk += tst-fortify-$(1)-$(2)-$(3) --CFLAGS-tst-fortify-$(1)-$(2)-$(3).$(1) += -D_FORTIFY_SOURCE=$(3) -Wno-format \ -+tests-$(1)-$(4)-chk += tst-fortify-$(1)-$(2)-$(3)-$(4) -+CFLAGS-tst-fortify-$(1)-$(2)-$(3)-$(4).$(1) += -D_FORTIFY_SOURCE=$(3) -Wno-format \ - -Wno-deprecated-declarations \ - -Wno-error --$(eval $(call cflags-$(2),$(1),$(3))) --$(objpfx)tst-fortify-$(1)-$(2)-$(3).$(1): tst-fortify.c Makefile -+$(eval $(call cflags-$(2),$(1),$(3),$(4))) -+$(objpfx)tst-fortify-$(1)-$(2)-$(3)-$(4).$(1): tst-fortify.c Makefile - ( echo "/* Autogenerated from Makefile. */"; \ - echo "$(src-chk-$(2))"; \ - echo "#include \"tst-fortify.c\"" ) > $$@.tmp -@@ -159,19 +161,29 @@ endef - - chk-extensions = c cc - chk-types = default lfs nongnu -+# 64 bit time_t implies LFS. -+chk-types-time64 = default nongnu - chk-levels = 1 2 3 - - $(foreach e,$(chk-extensions), \ - $(foreach t,$(chk-types), \ - $(foreach l,$(chk-levels), \ -- $(eval $(call gen-chk-test,$(e),$(t),$(l)))))) -+ $(eval $(call gen-chk-test,$(e),$(t),$(l),def))))) - --tests-all-chk += $(tests-c-chk) $(tests-cc-chk) -+tests-all-chk += $(tests-c-def-chk) $(tests-cc-def-chk) -+ -+$(foreach e,$(chk-extensions), \ -+ $(foreach t,$(chk-types-time64), \ -+ $(foreach l,$(chk-levels), \ -+ $(eval $(call gen-chk-test,$(e),$(t),$(l),time64))))) -+ -+tests-all-time64-chk += $(tests-c-time64-chk) $(tests-cc-time64-chk) - - define link-cc - LDLIBS-$(1) = -lstdc++ - endef --$(foreach t,$(tests-cc-chk), $(eval $(call link-cc,$(t)))) -+$(foreach t,$(tests-cc-def-chk), $(eval $(call link-cc,$(t)))) -+$(foreach t,$(tests-cc-time64-chk), $(eval $(call link-cc,$(t)))) - - # backtrace_symbols only works if we link with -rdynamic. backtrace - # requires unwind tables on most architectures. -@@ -201,6 +213,10 @@ tests = backtrace-tst \ - tst-realpath-chk \ - $(tests-all-chk) - -+tests-time64 += \ -+ $(tests-all-time64-chk) \ -+ # tests-time64 -+ - ifeq ($(have-ssp),yes) - tests += tst-ssp-1 - endif -@@ -210,7 +226,7 @@ tests += tst-read-chk-cancel - endif - - ifeq (,$(CXX)) --tests-unsupported = $(tests-cc-chk) -+tests-unsupported = $(tests-cc-def-chk) $(test-cc-time64-chk) - endif - - extra-libs = libpcprofile -@@ -235,6 +251,7 @@ define chk-gen-locales - $(objpfx)$(1).out: $(gen-locales) - endef - $(foreach t, $(tests-all-chk), $(eval $(call chk-gen-locales,$(t)))) -+$(foreach t, $(tests-all-time64-chk), $(eval $(call chk-gen-locales,$(t)))) - endif - - sLIBdir := $(shell echo $(slibdir) | sed 's,lib\(\|64\)$$,\\\\$$LIB,') -diff --git a/include/sys/poll.h b/include/sys/poll.h -index f904e21f89..228704fe79 100644 ---- a/include/sys/poll.h -+++ b/include/sys/poll.h -@@ -2,13 +2,16 @@ - # include <io/sys/poll.h> - - #ifndef _ISOMAC -+#include <include/struct___timespec64.h> -+ - extern int __poll (struct pollfd *__fds, unsigned long int __nfds, - int __timeout); - libc_hidden_proto (__poll) - libc_hidden_proto (ppoll) - - # if __TIMESIZE == 64 --# define __ppoll64 __ppoll -+# define __ppoll64 ppoll -+# define __ppoll64_chk __ppoll_chk - # else - # include <time.h> - # include <signal.h> -diff --git a/io/bits/poll2.h b/io/bits/poll2.h -index 3679d8451a..90f5574969 100644 ---- a/io/bits/poll2.h -+++ b/io/bits/poll2.h -@@ -43,6 +43,30 @@ poll (struct pollfd *__fds, nfds_t __nfds, int __timeout) - - - #ifdef __USE_GNU -+# ifdef __USE_TIME_BITS64 -+extern int __REDIRECT (__ppoll64_alias, (struct pollfd *__fds, nfds_t __nfds, -+ const struct timespec *__timeout, -+ const __sigset_t *__ss), __ppoll64); -+extern int __ppoll64_chk (struct pollfd *__fds, nfds_t __nfds, -+ const struct timespec *__timeout, -+ const __sigset_t *__ss, __SIZE_TYPE__ __fdslen) -+ __attr_access ((__write_only__, 1, 2)); -+extern int __REDIRECT (__ppoll64_chk_warn, (struct pollfd *__fds, nfds_t __n, -+ const struct timespec *__timeout, -+ const __sigset_t *__ss, -+ __SIZE_TYPE__ __fdslen), -+ __ppoll64_chk) -+ __warnattr ("ppoll called with fds buffer too small file nfds entries"); -+ -+__fortify_function __fortified_attr_access (__write_only__, 1, 2) int -+ppoll (struct pollfd *__fds, nfds_t __nfds, const struct timespec *__timeout, -+ const __sigset_t *__ss) -+{ -+ return __glibc_fortify (ppoll64, __nfds, sizeof (*__fds), -+ __glibc_objsize (__fds), -+ __fds, __nfds, __timeout, __ss); -+} -+# else - extern int __REDIRECT (__ppoll_alias, (struct pollfd *__fds, nfds_t __nfds, - const struct timespec *__timeout, - const __sigset_t *__ss), ppoll); -@@ -65,6 +89,7 @@ ppoll (struct pollfd *__fds, nfds_t __nfds, const struct timespec *__timeout, - __glibc_objsize (__fds), - __fds, __nfds, __timeout, __ss); - } -+# endif - #endif - - __END_DECLS -diff --git a/sysdeps/unix/sysv/linux/Versions b/sysdeps/unix/sysv/linux/Versions -index 65d2ceda2c..ca6eb1a49e 100644 ---- a/sysdeps/unix/sysv/linux/Versions -+++ b/sysdeps/unix/sysv/linux/Versions -@@ -313,6 +313,11 @@ libc { - process_madvise; - process_mrelease; - } -+ GLIBC_2.37 { -+%ifdef TIME64_NON_DEFAULT -+ __ppoll64_chk; -+%endif -+ } - GLIBC_PRIVATE { - # functions used in other libraries - __syscall_rt_sigqueueinfo; -diff --git a/sysdeps/unix/sysv/linux/arm/be/libc.abilist b/sysdeps/unix/sysv/linux/arm/be/libc.abilist -index e0668a80cf..f28402fe03 100644 ---- a/sysdeps/unix/sysv/linux/arm/be/libc.abilist -+++ b/sysdeps/unix/sysv/linux/arm/be/libc.abilist -@@ -513,6 +513,7 @@ GLIBC_2.36 pidfd_open F - GLIBC_2.36 pidfd_send_signal F - GLIBC_2.36 process_madvise F - GLIBC_2.36 process_mrelease F -+GLIBC_2.37 __ppoll64_chk F - GLIBC_2.4 _Exit F - GLIBC_2.4 _IO_2_1_stderr_ D 0xa0 - GLIBC_2.4 _IO_2_1_stdin_ D 0xa0 -diff --git a/sysdeps/unix/sysv/linux/arm/le/libc.abilist b/sysdeps/unix/sysv/linux/arm/le/libc.abilist -index d28e7c60b7..e2f56880ed 100644 ---- a/sysdeps/unix/sysv/linux/arm/le/libc.abilist -+++ b/sysdeps/unix/sysv/linux/arm/le/libc.abilist -@@ -510,6 +510,7 @@ GLIBC_2.36 pidfd_open F - GLIBC_2.36 pidfd_send_signal F - GLIBC_2.36 process_madvise F - GLIBC_2.36 process_mrelease F -+GLIBC_2.37 __ppoll64_chk F - GLIBC_2.4 _Exit F - GLIBC_2.4 _IO_2_1_stderr_ D 0xa0 - GLIBC_2.4 _IO_2_1_stdin_ D 0xa0 -diff --git a/sysdeps/unix/sysv/linux/csky/libc.abilist b/sysdeps/unix/sysv/linux/csky/libc.abilist -index 922b05062f..319d92356e 100644 ---- a/sysdeps/unix/sysv/linux/csky/libc.abilist -+++ b/sysdeps/unix/sysv/linux/csky/libc.abilist -@@ -2669,3 +2669,4 @@ GLIBC_2.36 pidfd_open F - GLIBC_2.36 pidfd_send_signal F - GLIBC_2.36 process_madvise F - GLIBC_2.36 process_mrelease F -+GLIBC_2.37 __ppoll64_chk F -diff --git a/sysdeps/unix/sysv/linux/hppa/libc.abilist b/sysdeps/unix/sysv/linux/hppa/libc.abilist -index 412144f94c..6450e17ebe 100644 ---- a/sysdeps/unix/sysv/linux/hppa/libc.abilist -+++ b/sysdeps/unix/sysv/linux/hppa/libc.abilist -@@ -2618,6 +2618,7 @@ GLIBC_2.36 pidfd_open F - GLIBC_2.36 pidfd_send_signal F - GLIBC_2.36 process_madvise F - GLIBC_2.36 process_mrelease F -+GLIBC_2.37 __ppoll64_chk F - GLIBC_2.4 __confstr_chk F - GLIBC_2.4 __fgets_chk F - GLIBC_2.4 __fgets_unlocked_chk F -diff --git a/sysdeps/unix/sysv/linux/i386/libc.abilist b/sysdeps/unix/sysv/linux/i386/libc.abilist -index 134393900a..0a24ec9afd 100644 ---- a/sysdeps/unix/sysv/linux/i386/libc.abilist -+++ b/sysdeps/unix/sysv/linux/i386/libc.abilist -@@ -2802,6 +2802,7 @@ GLIBC_2.36 pidfd_open F - GLIBC_2.36 pidfd_send_signal F - GLIBC_2.36 process_madvise F - GLIBC_2.36 process_mrelease F -+GLIBC_2.37 __ppoll64_chk F - GLIBC_2.4 __confstr_chk F - GLIBC_2.4 __fgets_chk F - GLIBC_2.4 __fgets_unlocked_chk F -diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist -index 0604029c68..16243a7a92 100644 ---- a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist -+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist -@@ -514,6 +514,7 @@ GLIBC_2.36 pidfd_open F - GLIBC_2.36 pidfd_send_signal F - GLIBC_2.36 process_madvise F - GLIBC_2.36 process_mrelease F -+GLIBC_2.37 __ppoll64_chk F - GLIBC_2.4 _Exit F - GLIBC_2.4 _IO_2_1_stderr_ D 0x98 - GLIBC_2.4 _IO_2_1_stdin_ D 0x98 -diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist -index af2be5c80d..564a553b27 100644 ---- a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist -+++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist -@@ -2745,6 +2745,7 @@ GLIBC_2.36 pidfd_open F - GLIBC_2.36 pidfd_send_signal F - GLIBC_2.36 process_madvise F - GLIBC_2.36 process_mrelease F -+GLIBC_2.37 __ppoll64_chk F - GLIBC_2.4 __confstr_chk F - GLIBC_2.4 __fgets_chk F - GLIBC_2.4 __fgets_unlocked_chk F -diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist -index e090b8d48f..e850f47b21 100644 ---- a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist -+++ b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist -@@ -2718,3 +2718,4 @@ GLIBC_2.36 pidfd_open F - GLIBC_2.36 pidfd_send_signal F - GLIBC_2.36 process_madvise F - GLIBC_2.36 process_mrelease F -+GLIBC_2.37 __ppoll64_chk F -diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist -index 8c5b2db243..37178c503f 100644 ---- a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist -+++ b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist -@@ -2715,3 +2715,4 @@ GLIBC_2.36 pidfd_open F - GLIBC_2.36 pidfd_send_signal F - GLIBC_2.36 process_madvise F - GLIBC_2.36 process_mrelease F -+GLIBC_2.37 __ppoll64_chk F -diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist -index 68847134a2..3b30b31466 100644 ---- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist -+++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist -@@ -2710,6 +2710,7 @@ GLIBC_2.36 pidfd_open F - GLIBC_2.36 pidfd_send_signal F - GLIBC_2.36 process_madvise F - GLIBC_2.36 process_mrelease F -+GLIBC_2.37 __ppoll64_chk F - GLIBC_2.4 __confstr_chk F - GLIBC_2.4 __fgets_chk F - GLIBC_2.4 __fgets_unlocked_chk F -diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist -index daa44e64fa..0e358570a2 100644 ---- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist -+++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist -@@ -2708,6 +2708,7 @@ GLIBC_2.36 pidfd_open F - GLIBC_2.36 pidfd_send_signal F - GLIBC_2.36 process_madvise F - GLIBC_2.36 process_mrelease F -+GLIBC_2.37 __ppoll64_chk F - GLIBC_2.4 __confstr_chk F - GLIBC_2.4 __fgets_chk F - GLIBC_2.4 __fgets_unlocked_chk F -diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist -index 6169188c96..59c598b98f 100644 ---- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist -+++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist -@@ -2716,6 +2716,7 @@ GLIBC_2.36 pidfd_open F - GLIBC_2.36 pidfd_send_signal F - GLIBC_2.36 process_madvise F - GLIBC_2.36 process_mrelease F -+GLIBC_2.37 __ppoll64_chk F - GLIBC_2.4 __confstr_chk F - GLIBC_2.4 __fgets_chk F - GLIBC_2.4 __fgets_unlocked_chk F -diff --git a/sysdeps/unix/sysv/linux/nios2/libc.abilist b/sysdeps/unix/sysv/linux/nios2/libc.abilist -index 58e9b486b0..463e01ab84 100644 ---- a/sysdeps/unix/sysv/linux/nios2/libc.abilist -+++ b/sysdeps/unix/sysv/linux/nios2/libc.abilist -@@ -2757,3 +2757,4 @@ GLIBC_2.36 pidfd_open F - GLIBC_2.36 pidfd_send_signal F - GLIBC_2.36 process_madvise F - GLIBC_2.36 process_mrelease F -+GLIBC_2.37 __ppoll64_chk F -diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist -index 8c9ca32cbe..405d40d11c 100644 ---- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist -+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist -@@ -2772,6 +2772,7 @@ GLIBC_2.36 pidfd_open F - GLIBC_2.36 pidfd_send_signal F - GLIBC_2.36 process_madvise F - GLIBC_2.36 process_mrelease F -+GLIBC_2.37 __ppoll64_chk F - GLIBC_2.4 _IO_fprintf F - GLIBC_2.4 _IO_printf F - GLIBC_2.4 _IO_sprintf F -diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist -index 08a6604aab..ce89602b93 100644 ---- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist -+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist -@@ -2805,6 +2805,7 @@ GLIBC_2.36 pidfd_open F - GLIBC_2.36 pidfd_send_signal F - GLIBC_2.36 process_madvise F - GLIBC_2.36 process_mrelease F -+GLIBC_2.37 __ppoll64_chk F - GLIBC_2.4 _IO_fprintf F - GLIBC_2.4 _IO_printf F - GLIBC_2.4 _IO_sprintf F -diff --git a/sysdeps/unix/sysv/linux/ppoll.c b/sysdeps/unix/sysv/linux/ppoll.c -index 1105e29b00..2e173b931d 100644 ---- a/sysdeps/unix/sysv/linux/ppoll.c -+++ b/sysdeps/unix/sysv/linux/ppoll.c -@@ -67,7 +67,7 @@ __ppoll64 (struct pollfd *fds, nfds_t nfds, const struct __timespec64 *timeout, - libc_hidden_def (__ppoll64) - - int --__ppoll (struct pollfd *fds, nfds_t nfds, const struct timespec *timeout, -+ppoll (struct pollfd *fds, nfds_t nfds, const struct timespec *timeout, - const sigset_t *sigmask) - { - struct __timespec64 ts64; -@@ -77,5 +77,4 @@ __ppoll (struct pollfd *fds, nfds_t nfds, const struct timespec *timeout, - return __ppoll64 (fds, nfds, timeout ? &ts64 : NULL, sigmask); - } - #endif --strong_alias (__ppoll, ppoll) - libc_hidden_def (ppoll) -diff --git a/sysdeps/unix/sysv/linux/ppoll_chk.c b/sysdeps/unix/sysv/linux/ppoll_chk.c -new file mode 100644 -index 0000000000..65c4b56671 ---- /dev/null -+++ b/sysdeps/unix/sysv/linux/ppoll_chk.c -@@ -0,0 +1,42 @@ -+/* Fortify ppoll implementation. Linux version. -+ Copyright (C) 2022 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library 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 GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <https://www.gnu.org/licenses/>. */ -+ -+#include <poll.h> -+ -+int -+__ppoll64_chk (struct pollfd *fds, nfds_t nfds, -+ const struct __timespec64 *tmo, const __sigset_t *ss, -+ __SIZE_TYPE__ fdslen) -+{ -+ if (fdslen / sizeof (*fds) < nfds) -+ __chk_fail (); -+ -+ return __ppoll64 (fds, nfds, tmo, ss); -+} -+ -+#if __TIMESIZE != 64 -+int -+__ppoll_chk (struct pollfd *fds, nfds_t nfds, const struct timespec *tmo, -+ const __sigset_t *ss, __SIZE_TYPE__ fdslen) -+{ -+ if (fdslen / sizeof (*fds) < nfds) -+ __chk_fail (); -+ -+ return ppoll (fds, nfds, tmo, ss); -+} -+#endif -diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist -index 009f22931e..5ca051a9eb 100644 ---- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist -+++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist -@@ -2770,6 +2770,7 @@ GLIBC_2.36 pidfd_open F - GLIBC_2.36 pidfd_send_signal F - GLIBC_2.36 process_madvise F - GLIBC_2.36 process_mrelease F -+GLIBC_2.37 __ppoll64_chk F - GLIBC_2.4 _IO_fprintf F - GLIBC_2.4 _IO_printf F - GLIBC_2.4 _IO_sprintf F -diff --git a/sysdeps/unix/sysv/linux/sh/be/libc.abilist b/sysdeps/unix/sysv/linux/sh/be/libc.abilist -index afb5bc37b1..5b48168ec6 100644 ---- a/sysdeps/unix/sysv/linux/sh/be/libc.abilist -+++ b/sysdeps/unix/sysv/linux/sh/be/libc.abilist -@@ -2625,6 +2625,7 @@ GLIBC_2.36 pidfd_open F - GLIBC_2.36 pidfd_send_signal F - GLIBC_2.36 process_madvise F - GLIBC_2.36 process_mrelease F -+GLIBC_2.37 __ppoll64_chk F - GLIBC_2.4 __confstr_chk F - GLIBC_2.4 __fgets_chk F - GLIBC_2.4 __fgets_unlocked_chk F -diff --git a/sysdeps/unix/sysv/linux/sh/le/libc.abilist b/sysdeps/unix/sysv/linux/sh/le/libc.abilist -index 2b53a3cf92..c42b39cea8 100644 ---- a/sysdeps/unix/sysv/linux/sh/le/libc.abilist -+++ b/sysdeps/unix/sysv/linux/sh/le/libc.abilist -@@ -2622,6 +2622,7 @@ GLIBC_2.36 pidfd_open F - GLIBC_2.36 pidfd_send_signal F - GLIBC_2.36 process_madvise F - GLIBC_2.36 process_mrelease F -+GLIBC_2.37 __ppoll64_chk F - GLIBC_2.4 __confstr_chk F - GLIBC_2.4 __fgets_chk F - GLIBC_2.4 __fgets_unlocked_chk F -diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist -index 43b9844a99..5a0a662dee 100644 ---- a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist -+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist -@@ -2765,6 +2765,7 @@ GLIBC_2.36 pidfd_open F - GLIBC_2.36 pidfd_send_signal F - GLIBC_2.36 process_madvise F - GLIBC_2.36 process_mrelease F -+GLIBC_2.37 __ppoll64_chk F - GLIBC_2.4 _IO_fprintf F - GLIBC_2.4 _IO_printf F - GLIBC_2.4 _IO_sprintf F diff --git a/poky/meta/recipes-core/glibc/glibc/0001-localedef-Add-hardlink-resolver-from-util-linux.patch b/poky/meta/recipes-core/glibc/glibc/0001-localedef-Add-hardlink-resolver-from-util-linux.patch index dfbd700c5f..0e2bbbc6a2 100644 --- a/poky/meta/recipes-core/glibc/glibc/0001-localedef-Add-hardlink-resolver-from-util-linux.patch +++ b/poky/meta/recipes-core/glibc/glibc/0001-localedef-Add-hardlink-resolver-from-util-linux.patch @@ -1,4 +1,4 @@ -From c6dca721df6dd8c39ffe16e61623516bd8742d39 Mon Sep 17 00:00:00 2001 +From 604a78e86ca374278fc5f3ce11b0abe1ff096b7e Mon Sep 17 00:00:00 2001 From: Jason Wessel <jason.wessel@windriver.com> Date: Sat, 7 Dec 2019 09:59:22 -0800 Subject: [PATCH] localedef: Add hardlink resolver from util-linux diff --git a/poky/meta/recipes-core/glibc/glibc/0002-localedef-fix-ups-hardlink-to-make-it-compile.patch b/poky/meta/recipes-core/glibc/glibc/0002-localedef-fix-ups-hardlink-to-make-it-compile.patch index 57f1a36455..0fd8a0d57d 100644 --- a/poky/meta/recipes-core/glibc/glibc/0002-localedef-fix-ups-hardlink-to-make-it-compile.patch +++ b/poky/meta/recipes-core/glibc/glibc/0002-localedef-fix-ups-hardlink-to-make-it-compile.patch @@ -1,4 +1,4 @@ -From 3e391efa9b179ae886dd0942202bd2a6698e2679 Mon Sep 17 00:00:00 2001 +From 85d14ae38fb9e7b46bb4b8f5f041e39a605ed81e Mon Sep 17 00:00:00 2001 From: Jason Wessel <jason.wessel@windriver.com> Date: Sat, 7 Dec 2019 10:01:37 -0800 Subject: [PATCH] localedef: fix-ups hardlink to make it compile diff --git a/poky/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch b/poky/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch index 4eb23bd0e5..c6f1455ee1 100644 --- a/poky/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch +++ b/poky/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch @@ -1,4 +1,4 @@ -From a74ac72e6a25121c99f3875cf0245a435729e897 Mon Sep 17 00:00:00 2001 +From d1b745b6e4c6a755cceb92329227efce1547d5fc Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 01:48:24 +0000 Subject: [PATCH] nativesdk-glibc: Look for host system ld.so.cache as well @@ -30,7 +30,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/elf/dl-load.c b/elf/dl-load.c -index 1ad0868dad..c5e235d918 100644 +index fcb39a78d4..cde9fc2358 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -2109,6 +2109,14 @@ _dl_map_object (struct link_map *loader, const char *name, diff --git a/poky/meta/recipes-core/glibc/glibc/0004-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch b/poky/meta/recipes-core/glibc/glibc/0004-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch index 7eaf70b780..8256a56245 100644 --- a/poky/meta/recipes-core/glibc/glibc/0004-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch +++ b/poky/meta/recipes-core/glibc/glibc/0004-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch @@ -1,4 +1,4 @@ -From d2f16ab250dbb93ae21e9e9286ddf696141db735 Mon Sep 17 00:00:00 2001 +From 3789e9ae4c208b2d97169a95cf3b1767e73b3856 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 01:50:00 +0000 Subject: [PATCH] nativesdk-glibc: Fix buffer overrun with a relocated SDK @@ -21,7 +21,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 12 insertions(+) diff --git a/elf/dl-load.c b/elf/dl-load.c -index c5e235d918..ce3cbfa3c4 100644 +index cde9fc2358..e514bdcc21 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -1809,7 +1809,19 @@ open_path (const char *name, size_t namelen, int mode, diff --git a/poky/meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch b/poky/meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch index 1fb76202c5..2899c0b845 100644 --- a/poky/meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch +++ b/poky/meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch @@ -1,4 +1,4 @@ -From 2d41508ed1059df2df9994d35d870be2005f575f Mon Sep 17 00:00:00 2001 +From 66e971a785aae80ba838a2604c679db70cbb8b3b Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 01:51:38 +0000 Subject: [PATCH] nativesdk-glibc: Raise the size of arrays containing dl paths @@ -19,14 +19,14 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> elf/dl-load.c | 4 ++-- elf/dl-usage.c | 6 ++++-- elf/interp.c | 2 +- - elf/ldconfig.c | 3 +++ + elf/ldconfig.c | 2 ++ elf/rtld.c | 1 + iconv/gconv_conf.c | 2 +- sysdeps/generic/dl-cache.h | 4 ---- - 8 files changed, 16 insertions(+), 10 deletions(-) + 8 files changed, 15 insertions(+), 10 deletions(-) diff --git a/elf/dl-cache.c b/elf/dl-cache.c -index 8bbf110d02..c02a95d9b5 100644 +index 07c054b11a..0fa36548b0 100644 --- a/elf/dl-cache.c +++ b/elf/dl-cache.c @@ -352,6 +352,10 @@ search_cache (const char *string_table, uint32_t string_table_size, @@ -41,7 +41,7 @@ index 8bbf110d02..c02a95d9b5 100644 _dl_cache_libcmp (const char *p1, const char *p2) { diff --git a/elf/dl-load.c b/elf/dl-load.c -index ce3cbfa3c4..e116db24a1 100644 +index e514bdcc21..c43747a3a8 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -117,8 +117,8 @@ enum { ncapstr = 1, max_capstrlen = 0 }; @@ -56,7 +56,7 @@ index ce3cbfa3c4..e116db24a1 100644 SYSTEM_DIRS_LEN }; diff --git a/elf/dl-usage.c b/elf/dl-usage.c -index 98d8c98948..77ca98cbf9 100644 +index 53535c1583..3ba7d9d200 100644 --- a/elf/dl-usage.c +++ b/elf/dl-usage.c @@ -25,6 +25,8 @@ @@ -68,7 +68,7 @@ index 98d8c98948..77ca98cbf9 100644 void _dl_usage (const char *argv0, const char *wrong_option) { -@@ -244,7 +246,7 @@ setting environment variables (which would be inherited by subprocesses).\n\ +@@ -184,7 +186,7 @@ setting environment variables (which would be inherited by subprocesses).\n\ --list list all dependencies and how they are resolved\n\ --verify verify that given object really is a dynamically linked\n\ object we can handle\n\ @@ -77,7 +77,7 @@ index 98d8c98948..77ca98cbf9 100644 --library-path PATH use given PATH instead of content of the environment\n\ variable LD_LIBRARY_PATH\n\ --glibc-hwcaps-prepend LIST\n\ -@@ -267,7 +269,7 @@ setting environment variables (which would be inherited by subprocesses).\n\ +@@ -207,7 +209,7 @@ setting environment variables (which would be inherited by subprocesses).\n\ \n\ This program interpreter self-identifies as: " RTLD "\n\ ", @@ -85,9 +85,9 @@ index 98d8c98948..77ca98cbf9 100644 + argv0, LD_SO_CACHE); print_search_path_for_help (state); print_hwcaps_subdirectories (state); - print_legacy_hwcap_directories (); + _exit (EXIT_SUCCESS); diff --git a/elf/interp.c b/elf/interp.c -index d82af036d1..9d282b2769 100644 +index ae21ae0cb3..b168e6da66 100644 --- a/elf/interp.c +++ b/elf/interp.c @@ -18,5 +18,5 @@ @@ -98,24 +98,23 @@ index d82af036d1..9d282b2769 100644 +const char __invoke_dynamic_linker__[4096] __attribute__ ((section (".interp"))) = RUNTIME_LINKER; diff --git a/elf/ldconfig.c b/elf/ldconfig.c -index 9394ac6438..7f66b1a460 100644 +index 166dccb528..8dda23c92c 100644 --- a/elf/ldconfig.c +++ b/elf/ldconfig.c -@@ -176,6 +176,9 @@ static struct argp argp = +@@ -150,6 +150,8 @@ static struct argp argp = options, parse_opt, NULL, doc, NULL, more_help, NULL }; -+ +extern const char LD_SO_CACHE[4096] __attribute__ ((section (".ldsocache"))); + - /* Check if string corresponds to an important hardware capability or - a platform. */ - static int + /* Handle program arguments. */ + static error_t + parse_opt (int key, char *arg, struct argp_state *state) diff --git a/elf/rtld.c b/elf/rtld.c -index cbbaf4a331..d2d27a0127 100644 +index b8467f37cf..be7bd08bc3 100644 --- a/elf/rtld.c +++ b/elf/rtld.c -@@ -189,6 +189,7 @@ dso_name_valid_for_suid (const char *p) +@@ -190,6 +190,7 @@ dso_name_valid_for_suid (const char *p) } return *p != '\0'; } @@ -124,7 +123,7 @@ index cbbaf4a331..d2d27a0127 100644 static void audit_list_init (struct audit_list *list) diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c -index f069e28323..6288f715ba 100644 +index 21165a558a..3dd67b0ea2 100644 --- a/iconv/gconv_conf.c +++ b/iconv/gconv_conf.c @@ -35,7 +35,7 @@ @@ -137,7 +136,7 @@ index f069e28323..6288f715ba 100644 /* Type to represent search path. */ struct path_elem diff --git a/sysdeps/generic/dl-cache.h b/sysdeps/generic/dl-cache.h -index 93d4bea930..5249176441 100644 +index bd39ff7fb7..38f9e2ad57 100644 --- a/sysdeps/generic/dl-cache.h +++ b/sysdeps/generic/dl-cache.h @@ -34,10 +34,6 @@ diff --git a/poky/meta/recipes-core/glibc/glibc/0006-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch b/poky/meta/recipes-core/glibc/glibc/0006-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch index c66bcf80c0..b0e3dbfa8a 100644 --- a/poky/meta/recipes-core/glibc/glibc/0006-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch +++ b/poky/meta/recipes-core/glibc/glibc/0006-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch @@ -1,4 +1,4 @@ -From 946d1cadf0bb54216409e8e0eb09be3e96044dbf Mon Sep 17 00:00:00 2001 +From a9795b9aadcbc04ad0404badf722acb83ef0ab7b Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 31 Dec 2015 14:35:35 -0800 Subject: [PATCH] nativesdk-glibc: Allow 64 bit atomics for x86 @@ -17,7 +17,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sysdeps/x86/atomic-machine.h b/sysdeps/x86/atomic-machine.h -index f24f1c71ed..574487ca54 100644 +index 95663099e4..4d81efc51a 100644 --- a/sysdeps/x86/atomic-machine.h +++ b/sysdeps/x86/atomic-machine.h @@ -26,19 +26,14 @@ diff --git a/poky/meta/recipes-core/glibc/glibc/0007-nativesdk-glibc-Make-relocatable-install-for-locales.patch b/poky/meta/recipes-core/glibc/glibc/0007-nativesdk-glibc-Make-relocatable-install-for-locales.patch index dc24c0240e..2dac1f1061 100644 --- a/poky/meta/recipes-core/glibc/glibc/0007-nativesdk-glibc-Make-relocatable-install-for-locales.patch +++ b/poky/meta/recipes-core/glibc/glibc/0007-nativesdk-glibc-Make-relocatable-install-for-locales.patch @@ -1,4 +1,4 @@ -From ce4e796fa8bd2df962cf7a0e4bc69ab6181e4ebf Mon Sep 17 00:00:00 2001 +From 68e5df9a7750d7db2323824b1342483e9ecdddd4 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 3 Aug 2018 09:55:12 -0700 Subject: [PATCH] nativesdk-glibc: Make relocatable install for locales @@ -19,7 +19,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/locale/findlocale.c b/locale/findlocale.c -index fc433b61d8..d6f030f13c 100644 +index 1b7034348b..939d4fd613 100644 --- a/locale/findlocale.c +++ b/locale/findlocale.c @@ -55,7 +55,7 @@ struct __locale_data *const _nl_C[] attribute_hidden = @@ -41,7 +41,7 @@ index fc433b61d8..d6f030f13c 100644 else /* We really have to load some data. First see whether the name is diff --git a/locale/loadarchive.c b/locale/loadarchive.c -index fcc4913319..62cae8c6c0 100644 +index 454bbc7eda..f904158182 100644 --- a/locale/loadarchive.c +++ b/locale/loadarchive.c @@ -42,7 +42,7 @@ @@ -54,7 +54,7 @@ index fcc4913319..62cae8c6c0 100644 /* Size of initial mapping window, optimal if large enough to cover the header plus the initial locale. */ diff --git a/locale/localeinfo.h b/locale/localeinfo.h -index fd43033a19..3dc26272a0 100644 +index 66cad7a83b..b7b856f77f 100644 --- a/locale/localeinfo.h +++ b/locale/localeinfo.h @@ -347,7 +347,7 @@ _nl_lookup_word (locale_t l, int category, int item) @@ -67,7 +67,7 @@ index fd43033a19..3dc26272a0 100644 /* Load the locale data for CATEGORY from the file specified by *NAME. If *NAME is "", use environment variables as specified by POSIX, and diff --git a/locale/programs/locale.c b/locale/programs/locale.c -index 1b51b50d68..87c9049444 100644 +index 1d1a9b2f00..d9ed395b39 100644 --- a/locale/programs/locale.c +++ b/locale/programs/locale.c @@ -631,6 +631,7 @@ nameentcmp (const void *a, const void *b) diff --git a/poky/meta/recipes-core/glibc/glibc/0008-nativesdk-glibc-Fall-back-to-faccessat-on-faccess2-r.patch b/poky/meta/recipes-core/glibc/glibc/0008-nativesdk-glibc-Fall-back-to-faccessat-on-faccess2-r.patch index 4d080726f8..7a8fe34815 100644 --- a/poky/meta/recipes-core/glibc/glibc/0008-nativesdk-glibc-Fall-back-to-faccessat-on-faccess2-r.patch +++ b/poky/meta/recipes-core/glibc/glibc/0008-nativesdk-glibc-Fall-back-to-faccessat-on-faccess2-r.patch @@ -1,4 +1,4 @@ -From 95508f06f13604ed96f28d18eb1670ea1ed02063 Mon Sep 17 00:00:00 2001 +From 18fc01c620311d9744a38d9a4a75dbe07b5d9225 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 6 Mar 2021 14:48:56 -0800 Subject: [PATCH] nativesdk-glibc: Fall back to faccessat on faccess2 returns @@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sysdeps/unix/sysv/linux/faccessat.c b/sysdeps/unix/sysv/linux/faccessat.c -index 1378bb2db8..19f2044172 100644 +index 0ccbd778b5..9df1a0fe12 100644 --- a/sysdeps/unix/sysv/linux/faccessat.c +++ b/sysdeps/unix/sysv/linux/faccessat.c @@ -30,7 +30,11 @@ __faccessat (int fd, const char *file, int mode, int flag) diff --git a/poky/meta/recipes-core/glibc/glibc/0009-yes-within-the-path-sets-wrong-config-variables.patch b/poky/meta/recipes-core/glibc/glibc/0009-yes-within-the-path-sets-wrong-config-variables.patch index 6b80ad3e64..cf3b35f8d0 100644 --- a/poky/meta/recipes-core/glibc/glibc/0009-yes-within-the-path-sets-wrong-config-variables.patch +++ b/poky/meta/recipes-core/glibc/glibc/0009-yes-within-the-path-sets-wrong-config-variables.patch @@ -1,4 +1,4 @@ -From 07655aaa14f9d1f3a521caadde2936067ce84b07 Mon Sep 17 00:00:00 2001 +From c7419991ebca369d727cc2f4489fed91fd5bb83f Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:31:06 +0000 Subject: [PATCH] 'yes' within the path sets wrong config variables @@ -29,7 +29,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 12 files changed, 28 insertions(+), 28 deletions(-) diff --git a/sysdeps/aarch64/configure b/sysdeps/aarch64/configure -index bf972122b1..f9397b8d6e 100644 +index 2130f6b8f8..7b7e3bbcf1 100644 --- a/sysdeps/aarch64/configure +++ b/sysdeps/aarch64/configure @@ -152,12 +152,12 @@ else @@ -48,7 +48,7 @@ index bf972122b1..f9397b8d6e 100644 else libc_cv_aarch64_be=no diff --git a/sysdeps/aarch64/configure.ac b/sysdeps/aarch64/configure.ac -index 51253d9802..ba36a0e8b4 100644 +index 85c6f76508..8ecd15d273 100644 --- a/sysdeps/aarch64/configure.ac +++ b/sysdeps/aarch64/configure.ac @@ -13,8 +13,8 @@ AC_DEFINE(SUPPORT_STATIC_PIE) diff --git a/poky/meta/recipes-core/glibc/glibc/0010-eglibc-Cross-building-and-testing-instructions.patch b/poky/meta/recipes-core/glibc/glibc/0010-eglibc-Cross-building-and-testing-instructions.patch index ba8696d654..df6a659e5e 100644 --- a/poky/meta/recipes-core/glibc/glibc/0010-eglibc-Cross-building-and-testing-instructions.patch +++ b/poky/meta/recipes-core/glibc/glibc/0010-eglibc-Cross-building-and-testing-instructions.patch @@ -1,4 +1,4 @@ -From 9373891f13f3550f9b3f896c34ac152efd369ca9 Mon Sep 17 00:00:00 2001 +From b5535340fb24bdae121286a79d759ecb3a464afd Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:42:58 +0000 Subject: [PATCH] eglibc: Cross building and testing instructions diff --git a/poky/meta/recipes-core/glibc/glibc/0011-eglibc-Help-bootstrap-cross-toolchain.patch b/poky/meta/recipes-core/glibc/glibc/0011-eglibc-Help-bootstrap-cross-toolchain.patch index 1f6ff1f1fa..57828dd488 100644 --- a/poky/meta/recipes-core/glibc/glibc/0011-eglibc-Help-bootstrap-cross-toolchain.patch +++ b/poky/meta/recipes-core/glibc/glibc/0011-eglibc-Help-bootstrap-cross-toolchain.patch @@ -1,4 +1,4 @@ -From 7f2fd574646cb5ecbbc09372a2d8580ab72ec158 Mon Sep 17 00:00:00 2001 +From 1aa07d35422f4628437a515a256fdf230192891f Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:49:28 +0000 Subject: [PATCH] eglibc: Help bootstrap cross toolchain @@ -29,7 +29,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> create mode 100644 include/stubs-bootstrap.h diff --git a/Makefile b/Makefile -index 179dd478ff..55cfb740bf 100644 +index 224c792185..6da151f5db 100644 --- a/Makefile +++ b/Makefile @@ -79,9 +79,18 @@ subdir-dirs = include diff --git a/poky/meta/recipes-core/glibc/glibc/0012-eglibc-Resolve-__fpscr_values-on-SH4.patch b/poky/meta/recipes-core/glibc/glibc/0012-eglibc-Resolve-__fpscr_values-on-SH4.patch index 399e14faf4..b2e30a60c8 100644 --- a/poky/meta/recipes-core/glibc/glibc/0012-eglibc-Resolve-__fpscr_values-on-SH4.patch +++ b/poky/meta/recipes-core/glibc/glibc/0012-eglibc-Resolve-__fpscr_values-on-SH4.patch @@ -1,4 +1,4 @@ -From 9f1803a2f91d59a9478ca4d8d93e1de5c62671e5 Mon Sep 17 00:00:00 2001 +From 47db0543da748fa7c355599b90b5016032e9deed Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:55:53 +0000 Subject: [PATCH] eglibc: Resolve __fpscr_values on SH4 @@ -33,7 +33,7 @@ index 9c734ff755..974e33b4b1 100644 # a* alphasort64; diff --git a/sysdeps/unix/sysv/linux/sh/sysdep.S b/sysdeps/unix/sysv/linux/sh/sysdep.S -index c5e3a7a365..35120031c4 100644 +index 9d85ff99a0..6bda921ca3 100644 --- a/sysdeps/unix/sysv/linux/sh/sysdep.S +++ b/sysdeps/unix/sysv/linux/sh/sysdep.S @@ -30,3 +30,14 @@ ENTRY (__syscall_error) diff --git a/poky/meta/recipes-core/glibc/glibc/0013-eglibc-Forward-port-cross-locale-generation-support.patch b/poky/meta/recipes-core/glibc/glibc/0013-eglibc-Forward-port-cross-locale-generation-support.patch index 7d891557bf..46df87430b 100644 --- a/poky/meta/recipes-core/glibc/glibc/0013-eglibc-Forward-port-cross-locale-generation-support.patch +++ b/poky/meta/recipes-core/glibc/glibc/0013-eglibc-Forward-port-cross-locale-generation-support.patch @@ -1,4 +1,4 @@ -From 2c6449014151a4bcd4b253b2acc920f0b3d6b13f Mon Sep 17 00:00:00 2001 +From fc0f96b182cd32037326545625356c88feb5c27a Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 01:33:49 +0000 Subject: [PATCH] eglibc: Forward port cross locale generation support @@ -23,7 +23,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> create mode 100644 locale/catnames.c diff --git a/locale/Makefile b/locale/Makefile -index eb55750496..b0461ac4b9 100644 +index d7036b0855..ed795e2710 100644 --- a/locale/Makefile +++ b/locale/Makefile @@ -26,7 +26,8 @@ headers = langinfo.h locale.h bits/locale.h \ @@ -89,7 +89,7 @@ index 0000000000..538f3f5edb + [LC_ALL] = sizeof ("LC_ALL") - 1 + }; diff --git a/locale/localeinfo.h b/locale/localeinfo.h -index 3dc26272a0..b667d32c23 100644 +index b7b856f77f..5e87ff336d 100644 --- a/locale/localeinfo.h +++ b/locale/localeinfo.h @@ -246,7 +246,7 @@ __libc_tsd_define (extern, locale_t, LOCALE) @@ -102,7 +102,7 @@ index 3dc26272a0..b667d32c23 100644 # define NL_CURRENT_INDIRECT 1 #endif diff --git a/locale/programs/charmap-dir.c b/locale/programs/charmap-dir.c -index 396a0d76c0..91f4a765ee 100644 +index 9582f2d167..8f9f3f582c 100644 --- a/locale/programs/charmap-dir.c +++ b/locale/programs/charmap-dir.c @@ -18,7 +18,9 @@ @@ -148,7 +148,7 @@ index 396a0d76c0..91f4a765ee 100644 return NULL; } diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c -index 992814491d..da4dde4663 100644 +index 2c9f540bf1..c937cfd2ab 100644 --- a/locale/programs/ld-collate.c +++ b/locale/programs/ld-collate.c @@ -352,7 +352,7 @@ new_element (struct locale_collate_t *collate, const char *mbs, size_t mbslen, @@ -197,7 +197,7 @@ index 992814491d..da4dde4663 100644 == runp->wcnext->wcs[runp->nwcs - 1] + 1)); diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c -index c6749dbd82..ac99777925 100644 +index d285b72611..4bf01fa3db 100644 --- a/locale/programs/ld-ctype.c +++ b/locale/programs/ld-ctype.c @@ -914,7 +914,7 @@ ctype_output (struct localedef_t *locale, const struct charmap_t *charmap, @@ -279,7 +279,7 @@ index c6749dbd82..ac99777925 100644 srunp = srunp->next; } diff --git a/locale/programs/ld-time.c b/locale/programs/ld-time.c -index b58fecfcee..a4d70e0780 100644 +index a590b013b3..5ed4fa0f59 100644 --- a/locale/programs/ld-time.c +++ b/locale/programs/ld-time.c @@ -219,8 +219,10 @@ No definition for %s category found"), "LC_TIME"); @@ -348,7 +348,7 @@ index b58fecfcee..a4d70e0780 100644 diff --git a/locale/programs/linereader.c b/locale/programs/linereader.c -index 0460074a0c..31a7151f66 100644 +index f8c49ac06f..ddda006037 100644 --- a/locale/programs/linereader.c +++ b/locale/programs/linereader.c @@ -776,7 +776,7 @@ get_string (struct linereader *lr, const struct charmap_t *charmap, @@ -361,7 +361,7 @@ index 0460074a0c..31a7151f66 100644 lr_buffer_init (&lrb); diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c -index 35a092a111..94712bf114 100644 +index 1b751bb7be..c255e2b436 100644 --- a/locale/programs/localedef.c +++ b/locale/programs/localedef.c @@ -108,6 +108,7 @@ void (*argp_program_version_hook) (FILE *, struct argp_state *) = print_version; @@ -407,7 +407,7 @@ index 35a092a111..94712bf114 100644 force_output = 1; break; diff --git a/locale/programs/locfile.c b/locale/programs/locfile.c -index 8fa74dce60..8d5aca6d9e 100644 +index e3eef59295..711d6fbea0 100644 --- a/locale/programs/locfile.c +++ b/locale/programs/locfile.c @@ -543,6 +543,9 @@ compare_files (const char *filename1, const char *filename2, size_t size, @@ -430,7 +430,7 @@ index 8fa74dce60..8d5aca6d9e 100644 /* Record that FILE's next element is the 32-bit integer VALUE. */ diff --git a/locale/programs/locfile.h b/locale/programs/locfile.h -index 57b2211e2f..e9498c6c7e 100644 +index 5caf5c348f..76856a32c2 100644 --- a/locale/programs/locfile.h +++ b/locale/programs/locfile.h @@ -70,6 +70,8 @@ extern void write_all_categories (struct localedef_t *definitions, @@ -519,7 +519,7 @@ index 57b2211e2f..e9498c6c7e 100644 + #endif /* locfile.h */ diff --git a/locale/setlocale.c b/locale/setlocale.c -index 56c14d8533..6aac00503e 100644 +index dd73fa4248..da3e17774e 100644 --- a/locale/setlocale.c +++ b/locale/setlocale.c @@ -63,35 +63,6 @@ static char *const _nl_current_used[] = diff --git a/poky/meta/recipes-core/glibc/glibc/0014-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch b/poky/meta/recipes-core/glibc/glibc/0014-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch index c47025af3b..3bf4fa45a0 100644 --- a/poky/meta/recipes-core/glibc/glibc/0014-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch +++ b/poky/meta/recipes-core/glibc/glibc/0014-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch @@ -1,4 +1,4 @@ -From 8ebf6708ba54147b44f5638b93f123fd55d4c37e Mon Sep 17 00:00:00 2001 +From 8e38bf52f1b71700a491cd1bd5ac5cf1ec7d097b Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 3 Aug 2018 09:42:06 -0700 Subject: [PATCH] localedef --add-to-archive uses a hard-coded locale path @@ -18,7 +18,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c -index eeb2fa6ffe..15274b0191 100644 +index 87d2d9b1b2..36f5852949 100644 --- a/locale/programs/locarchive.c +++ b/locale/programs/locarchive.c @@ -339,12 +339,24 @@ enlarge_archive (struct locarhandle *ah, const struct locarhead *head) diff --git a/poky/meta/recipes-core/glibc/glibc/0015-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch b/poky/meta/recipes-core/glibc/glibc/0015-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch deleted file mode 100644 index 933fa0eb3f..0000000000 --- a/poky/meta/recipes-core/glibc/glibc/0015-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch +++ /dev/null @@ -1,53 +0,0 @@ -From bd2b87eaa2e99310f5439df95bea12a48dc978bf Mon Sep 17 00:00:00 2001 -From: Martin Jansa <martin.jansa@gmail.com> -Date: Mon, 17 Dec 2018 21:36:18 +0000 -Subject: [PATCH] locale: prevent maybe-uninitialized errors with -Os [BZ - #19444] - -Fixes following error when building for aarch64 with -Os: -| In file included from strcoll_l.c:43: -| strcoll_l.c: In function '__strcoll_l': -| ../locale/weight.h:31:26: error: 'seq2.back_us' may be used uninitialized in this function [-Werror=maybe-uninitialized] -| int_fast32_t i = table[*(*cpp)++]; -| ^~~~~~~~~ -| strcoll_l.c:304:18: note: 'seq2.back_us' was declared here -| coll_seq seq1, seq2; -| ^~~~ -| In file included from strcoll_l.c:43: -| ../locale/weight.h:31:26: error: 'seq1.back_us' may be used uninitialized in this function [-Werror=maybe-uninitialized] -| int_fast32_t i = table[*(*cpp)++]; -| ^~~~~~~~~ -| strcoll_l.c:304:12: note: 'seq1.back_us' was declared here -| coll_seq seq1, seq2; -| ^~~~ - - Partial fix for [BZ #19444] - * locale/weight.h: Fix build with -Os. - -Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1014766] - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - locale/weight.h | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/locale/weight.h b/locale/weight.h -index 8be2d220f8..4a4d5aa6b2 100644 ---- a/locale/weight.h -+++ b/locale/weight.h -@@ -27,7 +27,14 @@ findidx (const int32_t *table, - const unsigned char *extra, - const unsigned char **cpp, size_t len) - { -+ /* With GCC 8 when compiling with -Os the compiler warns that -+ seq1.back_us and seq2.back_us might be used uninitialized. -+ This uninitialized use is impossible for the same reason -+ as described in comments in locale/weightwc.h. */ -+ DIAG_PUSH_NEEDS_COMMENT; -+ DIAG_IGNORE_Os_NEEDS_COMMENT (8, "-Wmaybe-uninitialized"); - int32_t i = table[*(*cpp)++]; -+ DIAG_POP_NEEDS_COMMENT; - const unsigned char *cp; - const unsigned char *usrc; - diff --git a/poky/meta/recipes-core/glibc/glibc/0017-powerpc-Do-not-ask-compiler-for-finding-arch.patch b/poky/meta/recipes-core/glibc/glibc/0015-powerpc-Do-not-ask-compiler-for-finding-arch.patch index cb6f7dc3d0..af7140e4da 100644 --- a/poky/meta/recipes-core/glibc/glibc/0017-powerpc-Do-not-ask-compiler-for-finding-arch.patch +++ b/poky/meta/recipes-core/glibc/glibc/0015-powerpc-Do-not-ask-compiler-for-finding-arch.patch @@ -1,4 +1,4 @@ -From 93c5b86fae5e42e148e5182466eb0ac26298159c Mon Sep 17 00:00:00 2001 +From 666905d40b483b28ffa2a5fa7170a40475ff1003 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Aug 2020 14:31:16 -0700 Subject: [PATCH] powerpc: Do not ask compiler for finding arch diff --git a/poky/meta/recipes-core/glibc/glibc/0016-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch b/poky/meta/recipes-core/glibc/glibc/0016-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch deleted file mode 100644 index f45951ae2c..0000000000 --- a/poky/meta/recipes-core/glibc/glibc/0016-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 58dd1336c1c32716f4f0938bf18f2ddfbe9305ca Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 18 Mar 2015 00:11:22 +0000 -Subject: [PATCH] readlib: Add OECORE_KNOWN_INTERPRETER_NAMES to known names - -This bolts in a hook for OE to pass its own version of interpreter -names into glibc especially for multilib case, where it differs from any -other distros - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Lianhao Lu <lianhao.lu@intel.com> -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - elf/readlib.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/elf/readlib.c b/elf/readlib.c -index ed42fbd48e..777f6c80be 100644 ---- a/elf/readlib.c -+++ b/elf/readlib.c -@@ -49,6 +49,7 @@ static struct known_names interpreters[] = - #ifdef SYSDEP_KNOWN_INTERPRETER_NAMES - SYSDEP_KNOWN_INTERPRETER_NAMES - #endif -+ OECORE_KNOWN_INTERPRETER_NAMES - }; - - static struct known_names known_libs[] = diff --git a/poky/meta/recipes-core/glibc/glibc/0018-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch b/poky/meta/recipes-core/glibc/glibc/0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch index 996471a520..9ed89c93da 100644 --- a/poky/meta/recipes-core/glibc/glibc/0018-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch +++ b/poky/meta/recipes-core/glibc/glibc/0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch @@ -1,4 +1,4 @@ -From e2dba281429384cc22a73a58eaf79459e64be266 Mon Sep 17 00:00:00 2001 +From 80dbf6f21c12b1c60bfab9a64798d4f1ea242efb Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 15 May 2020 17:05:45 -0700 Subject: [PATCH] wordsize.h: Unify the header between arm and aarch64 @@ -11,13 +11,13 @@ Upstream-Status: Inappropriate [ OE-Specific ] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - sysdeps/aarch64/bits/wordsize.h | 8 ++++++-- - sysdeps/{aarch64 => arm}/bits/wordsize.h | 8 ++++++-- - 2 files changed, 12 insertions(+), 4 deletions(-) - copy sysdeps/{aarch64 => arm}/bits/wordsize.h (85%) + sysdeps/aarch64/bits/wordsize.h | 8 ++++++-- + sysdeps/{aarch64 => arm}/bits/wordsize.h | 10 +++++++--- + 2 files changed, 13 insertions(+), 5 deletions(-) + copy sysdeps/{aarch64 => arm}/bits/wordsize.h (80%) diff --git a/sysdeps/aarch64/bits/wordsize.h b/sysdeps/aarch64/bits/wordsize.h -index 4635431f0e..5ef0ed21f3 100644 +index 04d4be9519..63876a7830 100644 --- a/sysdeps/aarch64/bits/wordsize.h +++ b/sysdeps/aarch64/bits/wordsize.h @@ -17,12 +17,16 @@ @@ -40,12 +40,20 @@ index 4635431f0e..5ef0ed21f3 100644 #define __WORDSIZE_TIME64_COMPAT32 0 diff --git a/sysdeps/aarch64/bits/wordsize.h b/sysdeps/arm/bits/wordsize.h -similarity index 85% +similarity index 80% copy from sysdeps/aarch64/bits/wordsize.h copy to sysdeps/arm/bits/wordsize.h -index 4635431f0e..5ef0ed21f3 100644 +index 04d4be9519..5ef0ed21f3 100644 --- a/sysdeps/aarch64/bits/wordsize.h +++ b/sysdeps/arm/bits/wordsize.h +@@ -1,6 +1,6 @@ + /* Determine the wordsize from the preprocessor defines. + +- Copyright (C) 2016-2023 Free Software Foundation, Inc. ++ Copyright (C) 2016-2022 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or @@ -17,12 +17,16 @@ License along with the GNU C Library; if not, see <https://www.gnu.org/licenses/>. */ diff --git a/poky/meta/recipes-core/glibc/glibc/0019-Replace-echo-with-printf-builtin-in-nscd-init-script.patch b/poky/meta/recipes-core/glibc/glibc/0017-Replace-echo-with-printf-builtin-in-nscd-init-script.patch index 5181cfec61..2e5c60a002 100644 --- a/poky/meta/recipes-core/glibc/glibc/0019-Replace-echo-with-printf-builtin-in-nscd-init-script.patch +++ b/poky/meta/recipes-core/glibc/glibc/0017-Replace-echo-with-printf-builtin-in-nscd-init-script.patch @@ -1,4 +1,4 @@ -From 97a71e1dd07ba6721464150b03fd67823b6271e2 Mon Sep 17 00:00:00 2001 +From 561f67dda72ba806120e3ffadd8b85dcf02a90a6 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 31 Dec 2015 14:33:02 -0800 Subject: [PATCH] Replace echo with printf builtin in nscd init script diff --git a/poky/meta/recipes-core/glibc/glibc/0020-sysdeps-gnu-configure.ac-Set-libc_cv_rootsbindir-onl.patch b/poky/meta/recipes-core/glibc/glibc/0018-sysdeps-gnu-configure.ac-Set-libc_cv_rootsbindir-onl.patch index 396f33216d..33585ee337 100644 --- a/poky/meta/recipes-core/glibc/glibc/0020-sysdeps-gnu-configure.ac-Set-libc_cv_rootsbindir-onl.patch +++ b/poky/meta/recipes-core/glibc/glibc/0018-sysdeps-gnu-configure.ac-Set-libc_cv_rootsbindir-onl.patch @@ -1,4 +1,4 @@ -From 3b5b6079512af8af50d0a43d4c1c218f5ba1b302 Mon Sep 17 00:00:00 2001 +From 5b408839318b81cc2713956c87f19eddb009f677 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:27:10 +0000 Subject: [PATCH] sysdeps/gnu/configure.ac: Set libc_cv_rootsbindir only if its diff --git a/poky/meta/recipes-core/glibc/glibc/0021-timezone-Make-shell-interpreter-overridable-in-tzsel.patch b/poky/meta/recipes-core/glibc/glibc/0019-timezone-Make-shell-interpreter-overridable-in-tzsel.patch index 2f4e92dffa..f6e0cec983 100644 --- a/poky/meta/recipes-core/glibc/glibc/0021-timezone-Make-shell-interpreter-overridable-in-tzsel.patch +++ b/poky/meta/recipes-core/glibc/glibc/0019-timezone-Make-shell-interpreter-overridable-in-tzsel.patch @@ -1,4 +1,4 @@ -From 8d5ff7357354394b958321204b75e3855781aefe Mon Sep 17 00:00:00 2001 +From 27d3ec9df3157966819e4369e571769ed9e8604c Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 9 Dec 2021 15:14:42 -0800 Subject: [PATCH] timezone: Make shell interpreter overridable in tzselect.ksh @@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 2 files changed, 10 insertions(+) diff --git a/Makeconfig b/Makeconfig -index ba70321af1..4b643768d9 100644 +index 2fda4af5f7..87777942f3 100644 --- a/Makeconfig +++ b/Makeconfig -@@ -293,6 +293,15 @@ ifndef sysincludedir +@@ -309,6 +309,15 @@ ifndef sysincludedir sysincludedir = /usr/include endif @@ -34,10 +34,10 @@ index ba70321af1..4b643768d9 100644 # Commands to install files. ifndef INSTALL_DATA diff --git a/timezone/Makefile b/timezone/Makefile -index a789c22d26..3e69409a94 100644 +index 0306c0bca9..4dfdcebdb7 100644 --- a/timezone/Makefile +++ b/timezone/Makefile -@@ -134,6 +134,7 @@ $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make +@@ -136,6 +136,7 @@ $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make -e '/TZVERSION=/s|see_Makefile|"$(version)"|' \ -e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \ -e '/REPORT_BUGS_TO=/s|=.*|="$(REPORT_BUGS_TO)"|' \ diff --git a/poky/meta/recipes-core/glibc/glibc/0022-tzselect.ksh-Use-bin-sh-default-shell-interpreter.patch b/poky/meta/recipes-core/glibc/glibc/0020-tzselect.ksh-Use-bin-sh-default-shell-interpreter.patch index c409327f95..ee50a8148c 100644 --- a/poky/meta/recipes-core/glibc/glibc/0022-tzselect.ksh-Use-bin-sh-default-shell-interpreter.patch +++ b/poky/meta/recipes-core/glibc/glibc/0020-tzselect.ksh-Use-bin-sh-default-shell-interpreter.patch @@ -1,4 +1,4 @@ -From ba1365f19ccc8378f2fcff892721187537479884 Mon Sep 17 00:00:00 2001 +From d8c8500b619231c23ef6a151821555786c0d2966 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 15 Dec 2021 21:47:53 -0800 Subject: [PATCH] tzselect.ksh: Use /bin/sh default shell interpreter diff --git a/poky/meta/recipes-core/glibc/glibc/0023-fix-create-thread-failed-in-unprivileged-process-BZ-.patch b/poky/meta/recipes-core/glibc/glibc/0021-fix-create-thread-failed-in-unprivileged-process-BZ-.patch index 7b0965f6bd..4838643911 100644 --- a/poky/meta/recipes-core/glibc/glibc/0023-fix-create-thread-failed-in-unprivileged-process-BZ-.patch +++ b/poky/meta/recipes-core/glibc/glibc/0021-fix-create-thread-failed-in-unprivileged-process-BZ-.patch @@ -1,4 +1,4 @@ -From ffbb37732807e180b14a21d1bf79ad5038252c02 Mon Sep 17 00:00:00 2001 +From 30d209d26918e48e34f34658923c42f269d27ee1 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Sun, 29 Aug 2021 20:49:16 +0800 Subject: [PATCH] fix create thread failed in unprivileged process [BZ #28287] @@ -72,7 +72,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysdeps/unix/sysv/linux/clone-internal.c b/sysdeps/unix/sysv/linux/clone-internal.c -index a71effcbd3..a0569113aa 100644 +index a8611772a2..c75b063370 100644 --- a/sysdeps/unix/sysv/linux/clone-internal.c +++ b/sysdeps/unix/sysv/linux/clone-internal.c @@ -52,7 +52,7 @@ __clone_internal (struct clone_args *cl_args, diff --git a/poky/meta/recipes-core/glibc/glibc/0024-Avoid-hardcoded-build-time-paths-in-the-output-binar.patch b/poky/meta/recipes-core/glibc/glibc/0022-Avoid-hardcoded-build-time-paths-in-the-output-binar.patch index 7983d1f6a7..789d36cacb 100644 --- a/poky/meta/recipes-core/glibc/glibc/0024-Avoid-hardcoded-build-time-paths-in-the-output-binar.patch +++ b/poky/meta/recipes-core/glibc/glibc/0022-Avoid-hardcoded-build-time-paths-in-the-output-binar.patch @@ -1,4 +1,4 @@ -From f873e25e29684cbbf7b141d9c6ee725268505c29 Mon Sep 17 00:00:00 2001 +From b672a35f7d9e25baa83f3fd854a51bc1ad49756a Mon Sep 17 00:00:00 2001 From: Richard Purdie <richard.purdie@linuxfoundation.org> Date: Sun, 24 Jul 2022 07:07:29 -0700 Subject: [PATCH] Avoid hardcoded build time paths in the output binaries @@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/support/Makefile b/support/Makefile -index 9b50eac117..4c24d9f61a 100644 +index b29b7eb505..ae42e6e7e9 100644 --- a/support/Makefile +++ b/support/Makefile -@@ -218,9 +218,9 @@ libsupport-inhibit-o += .o +@@ -219,9 +219,9 @@ libsupport-inhibit-o += .o endif CFLAGS-support_paths.c = \ diff --git a/poky/meta/recipes-core/glibc/glibc/0025-startup-Force-O2.patch b/poky/meta/recipes-core/glibc/glibc/0025-startup-Force-O2.patch deleted file mode 100644 index 1f3426295a..0000000000 --- a/poky/meta/recipes-core/glibc/glibc/0025-startup-Force-O2.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 5e635e5dc7d1b21a78f38109d4f43a03bec865c8 Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" <hjl.tools@gmail.com> -Date: Sun, 7 Aug 2022 12:51:48 +0200 -Subject: [PATCH] startup: Force -O2 - -Upstream-Status: Submitted [https://sourceware.org/bugzilla/show_bug.cgi?id=29249] - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - sysdeps/unix/sysv/linux/startup.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/sysdeps/unix/sysv/linux/startup.h b/sysdeps/unix/sysv/linux/startup.h -index 39859b404a..e1fc1b682d 100644 ---- a/sysdeps/unix/sysv/linux/startup.h -+++ b/sysdeps/unix/sysv/linux/startup.h -@@ -21,6 +21,11 @@ - #else - # include <sysdep.h> - -+# if !defined __OPTIMIZE__ || __OPTIMIZE__ < 2 -+/* Force to fold strlen. */ -+# pragma GCC optimize(2) -+# endif -+ - /* Avoid a run-time invocation of strlen. */ - #define _startup_fatal(message) \ - do \ diff --git a/poky/meta/recipes-core/glibc/glibc_2.36.bb b/poky/meta/recipes-core/glibc/glibc_2.37.bb index 3010f783ac..f299a3004a 100644 --- a/poky/meta/recipes-core/glibc/glibc_2.36.bb +++ b/poky/meta/recipes-core/glibc/glibc_2.37.bb @@ -43,18 +43,14 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ file://0012-eglibc-Resolve-__fpscr_values-on-SH4.patch \ file://0013-eglibc-Forward-port-cross-locale-generation-support.patch \ file://0014-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch \ - file://0015-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch \ - file://0016-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch \ - file://0017-powerpc-Do-not-ask-compiler-for-finding-arch.patch \ - file://0018-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch \ - file://0019-Replace-echo-with-printf-builtin-in-nscd-init-script.patch \ - file://0020-sysdeps-gnu-configure.ac-Set-libc_cv_rootsbindir-onl.patch \ - file://0021-timezone-Make-shell-interpreter-overridable-in-tzsel.patch \ - file://0022-tzselect.ksh-Use-bin-sh-default-shell-interpreter.patch \ - file://0023-fix-create-thread-failed-in-unprivileged-process-BZ-.patch \ - file://0024-Avoid-hardcoded-build-time-paths-in-the-output-binar.patch \ - file://0025-startup-Force-O2.patch \ - file://0001-Linux-Add-ppoll-fortify-symbol-for-64-bit-time_t-BZ-.patch \ + file://0015-powerpc-Do-not-ask-compiler-for-finding-arch.patch \ + file://0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch \ + file://0017-Replace-echo-with-printf-builtin-in-nscd-init-script.patch \ + file://0018-sysdeps-gnu-configure.ac-Set-libc_cv_rootsbindir-onl.patch \ + file://0019-timezone-Make-shell-interpreter-overridable-in-tzsel.patch \ + file://0020-tzselect.ksh-Use-bin-sh-default-shell-interpreter.patch \ + file://0021-fix-create-thread-failed-in-unprivileged-process-BZ-.patch \ + file://0022-Avoid-hardcoded-build-time-paths-in-the-output-binar.patch \ " S = "${WORKDIR}/git" B = "${WORKDIR}/build-${TARGET_SYS}" diff --git a/poky/meta/recipes-core/ifupdown/files/0001-Define-FNM_EXTMATCH-for-musl.patch b/poky/meta/recipes-core/ifupdown/files/0001-Define-FNM_EXTMATCH-for-musl.patch index 7bf02ea536..6c4ed526bf 100644 --- a/poky/meta/recipes-core/ifupdown/files/0001-Define-FNM_EXTMATCH-for-musl.patch +++ b/poky/meta/recipes-core/ifupdown/files/0001-Define-FNM_EXTMATCH-for-musl.patch @@ -1,4 +1,4 @@ -From ff714d6461569d69b253089110ec659e4ebec248 Mon Sep 17 00:00:00 2001 +From 8dfbcf02e424ba1fdef587d81c9e08a37ab8c1b6 Mon Sep 17 00:00:00 2001 From: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> Date: Tue, 2 Jul 2019 20:10:42 +0200 Subject: [PATCH] Define FNM_EXTMATCH for musl @@ -24,12 +24,13 @@ function); did you mean 'FNM_NOMATCH'? Upstream-Status: Submitted [https://salsa.debian.org/debian/ifupdown/merge_requests/5] Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> + --- archcommon.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/archcommon.h b/archcommon.h -index fe99950..f257f9d 100644 +index 818b0b6..ad9cd1a 100644 --- a/archcommon.h +++ b/archcommon.h @@ -1,5 +1,9 @@ @@ -42,6 +43,3 @@ index fe99950..f257f9d 100644 bool execable(const char *); #define iface_is_link() (!_iface_has(ifd->real_iface, ":.")) --- -2.17.1 - diff --git a/poky/meta/recipes-core/ifupdown/files/0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch b/poky/meta/recipes-core/ifupdown/files/0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch index 57c8d04fd7..6e15a25224 100644 --- a/poky/meta/recipes-core/ifupdown/files/0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch +++ b/poky/meta/recipes-core/ifupdown/files/0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch @@ -1,10 +1,11 @@ -From 7ace0656bd325f9e7749f2cde641eddc057bc98a Mon Sep 17 00:00:00 2001 +From 7fe516cbaf9fda09d99dcb54d4645367cffc8a4d Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Thu, 9 Jan 2020 15:38:06 +0100 Subject: [PATCH] Makefile: do not use dpkg for determining OS type Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/poky/meta/recipes-core/ifupdown/files/0001-ifupdown-skip-wrong-test-case.patch b/poky/meta/recipes-core/ifupdown/files/0001-ifupdown-skip-wrong-test-case.patch index c751e4fab0..9ae24da51e 100644 --- a/poky/meta/recipes-core/ifupdown/files/0001-ifupdown-skip-wrong-test-case.patch +++ b/poky/meta/recipes-core/ifupdown/files/0001-ifupdown-skip-wrong-test-case.patch @@ -1,4 +1,4 @@ -From 98243deface88614e3f332c4a85d04a9abce55ff Mon Sep 17 00:00:00 2001 +From 782d8a869c266820d0f34974436f244f67afaea7 Mon Sep 17 00:00:00 2001 From: Zqiang <qiang.zhang@windriver.com> Date: Mon, 19 Apr 2021 14:15:45 +0800 Subject: [PATCH] ifupdown: skip wrong test case @@ -10,23 +10,21 @@ and are skipped directly. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Zqiang <qiang.zhang@windriver.com> + --- tests/testbuild-linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testbuild-linux b/tests/testbuild-linux -index 1181ea0..5f148eb 100755 +index 2fa1b8b..2c69856 100755 --- a/tests/testbuild-linux +++ b/tests/testbuild-linux @@ -3,7 +3,7 @@ dir=tests/linux result=true --for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do -+for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18; do +-for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19; do ++for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18 19; do if [ -e $dir/testcase.$test ]; then args="$(cat $dir/testcase.$test | sed -n 's/^# RUN: //p')" else --- -2.17.1 - diff --git a/poky/meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch b/poky/meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch index d1c3d260ed..7b4b761e6a 100644 --- a/poky/meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch +++ b/poky/meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch @@ -1,7 +1,7 @@ -From 40257d65b338b6e2ed9d89d6fa7c7b8701a4c311 Mon Sep 17 00:00:00 2001 +From fc8e8d4cb19ff30e69aa1855332544f1017f974c Mon Sep 17 00:00:00 2001 From: Paul Gortmaker <paul.gortmaker@windriver.com> Date: Wed, 6 Aug 2014 14:54:12 -0400 -Subject: [PATCH 1/2] defn2[c|man]: don't rely on dpkg-architecture to set arch +Subject: [PATCH] defn2[c|man]: don't rely on dpkg-architecture to set arch In yocto we'll always be cross compiling, and we'll always be building on linux for linux (vs. *BSD, hurd, etc.) @@ -13,13 +13,14 @@ like the loopback device not being configured/enabled. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Upstream-Status: Pending + --- defn2c.pl | 6 +++--- defn2man.pl | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/defn2c.pl b/defn2c.pl -index 8798dc2..f2551c7 100755 +index fa7a02e..bb4987d 100755 --- a/defn2c.pl +++ b/defn2c.pl @@ -2,9 +2,9 @@ @@ -52,6 +53,3 @@ index 6ddcfdd..c9c4dd0 100755 # declarations my $line; --- -2.17.1 - diff --git a/poky/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch b/poky/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch index ea88a9086a..fa6bb84df3 100644 --- a/poky/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch +++ b/poky/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch @@ -1,14 +1,19 @@ -Tweak tests of ifupdown to make it work with oe-core ptest framework. +From a6bb2ac5f521c678abbbdb1960d28f750f4357a6 Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Mon, 3 Feb 2020 17:33:11 +0800 +Subject: [PATCH] Tweak tests of ifupdown to make it work with oe-core ptest + framework. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Kai Kang <kai.kang@windriver.com> + --- tests/testbuild-linux | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/testbuild-linux b/tests/testbuild-linux -index 5f148eb..d9b1698 100755 +index 2c69856..05f0703 100755 --- a/tests/testbuild-linux +++ b/tests/testbuild-linux @@ -1,6 +1,7 @@ @@ -19,8 +24,8 @@ index 5f148eb..d9b1698 100755 +dir=$curdir/linux result=true - for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18; do -@@ -12,7 +13,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18; do + for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18 19; do +@@ -12,7 +13,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18 19; do echo "Testcase $test: $args" exitcode=0 @@ -29,7 +34,7 @@ index 5f148eb..d9b1698 100755 >$dir/up-res-out.$test 2>$dir/up-res-err.$test || exitcode=$? (echo "exit code: $exitcode"; -@@ -20,7 +21,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18; do +@@ -20,7 +21,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18 19; do echo "====stderr===="; cat $dir/up-res-err.$test) > $dir/up-res.$test exitcode=0 @@ -38,7 +43,7 @@ index 5f148eb..d9b1698 100755 >$dir/down-res-out.$test 2>$dir/down-res-err.$test || exitcode=$? (echo "exit code: $exitcode"; -@@ -28,9 +29,9 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18; do +@@ -28,9 +29,9 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18 19; do echo "====stderr===="; cat $dir/down-res-err.$test) > $dir/down-res.$test if diff -ub $dir/up.$test $dir/up-res.$test && diff -ub $dir/down.$test $dir/down-res.$test; then @@ -50,5 +55,3 @@ index 5f148eb..d9b1698 100755 result=false fi echo "==========" --- -2.17.1 diff --git a/poky/meta/recipes-core/ifupdown/ifupdown_0.8.39.bb b/poky/meta/recipes-core/ifupdown/ifupdown_0.8.41.bb index 7096bc94d7..5dbd6193b8 100644 --- a/poky/meta/recipes-core/ifupdown/ifupdown_0.8.39.bb +++ b/poky/meta/recipes-core/ifupdown/ifupdown_0.8.41.bb @@ -8,15 +8,15 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" SRC_URI = "git://salsa.debian.org/debian/ifupdown.git;protocol=https;branch=master \ - file://defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch \ file://99_network \ + file://run-ptest \ file://0001-Define-FNM_EXTMATCH-for-musl.patch \ file://0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch \ - file://run-ptest \ file://0001-ifupdown-skip-wrong-test-case.patch \ - ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'file://tweak-ptest-script.patch', '', d)} \ + file://defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch \ + file://tweak-ptest-script.patch \ " -SRCREV = "be91dd267b4a8db502a6bbf5758563f7048b8078" +SRCREV = "369d9d3c13a0c56ad09fd4f13b4a80eb9a94e270" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-core/ncurses/files/exit_prototype.patch b/poky/meta/recipes-core/ncurses/files/exit_prototype.patch index 791421a338..fd961512e0 100644 --- a/poky/meta/recipes-core/ncurses/files/exit_prototype.patch +++ b/poky/meta/recipes-core/ncurses/files/exit_prototype.patch @@ -1,18 +1,28 @@ -Add needed headers for including mbstate_t and exit() +From 4a769a441d7e57a23017c3037cde3e53fb9f35fe Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 30 Aug 2022 15:58:32 -0700 +Subject: [PATCH] Add needed headers for including mbstate_t and exit() Upstream-Status: Inappropriate [Reconfigure will solve it] Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + configure | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configure b/configure +index f377f551..163f8899 100755 --- a/configure +++ b/configure -@@ -3422,6 +3422,7 @@ rm -f "conftest.$ac_objext" "conftest.$a +@@ -3423,6 +3423,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" cat >"conftest.$ac_ext" <<_ACEOF - #line 3423 "configure" + #line 3424 "configure" #include "confdefs.h" +#include <stdlib.h> $ac_declaration int main (void) -@@ -12997,6 +12998,7 @@ cat >"conftest.$ac_ext" <<_ACEOF +@@ -13111,6 +13112,7 @@ cat >"conftest.$ac_ext" <<_ACEOF #include <stdlib.h> #include <stdarg.h> #include <stdio.h> diff --git a/poky/meta/recipes-core/ncurses/ncurses_6.3+20220423.bb b/poky/meta/recipes-core/ncurses/ncurses_6.4.bb index fb8c11582b..1eb15673d1 100644 --- a/poky/meta/recipes-core/ncurses/ncurses_6.3+20220423.bb +++ b/poky/meta/recipes-core/ncurses/ncurses_6.4.bb @@ -6,10 +6,10 @@ SRC_URI += "file://0001-tic-hang.patch \ file://exit_prototype.patch \ " # commit id corresponds to the revision in package version -SRCREV = "20db1fb41ec91cd8a1f528e770362092c5403378" +SRCREV = "79b9071f2be20a24c7be031655a5638f6032f29f" S = "${WORKDIR}/git" EXTRA_OECONF += "--with-abi-version=5" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)$" # This is needed when using patchlevel versions like 6.1+20181013 -CVE_VERSION = "${@d.getVar("PV").split('+')[0]}.${@d.getVar("PV").split('+')[1]}" +#CVE_VERSION = "${@d.getVar("PV").split('+')[0]}.${@d.getVar("PV").split('+')[1]}" diff --git a/poky/meta/recipes-core/systemd/systemd-boot_252.4.bb b/poky/meta/recipes-core/systemd/systemd-boot_252.5.bb index b67706b731..b67706b731 100644 --- a/poky/meta/recipes-core/systemd/systemd-boot_252.4.bb +++ b/poky/meta/recipes-core/systemd/systemd-boot_252.5.bb diff --git a/poky/meta/recipes-core/systemd/systemd.inc b/poky/meta/recipes-core/systemd/systemd.inc index 9d747ef64d..df27e01b1c 100644 --- a/poky/meta/recipes-core/systemd/systemd.inc +++ b/poky/meta/recipes-core/systemd/systemd.inc @@ -14,7 +14,7 @@ LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "4b48117716f84751dc6c8ee16c94de9858eaef4f" +SRCREV = "61f5710d0bfd8f522af6f8eef399a851509946e2" SRCBRANCH = "v252-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \ " diff --git a/poky/meta/recipes-core/systemd/systemd_252.4.bb b/poky/meta/recipes-core/systemd/systemd_252.5.bb index e6c873f53b..64a3efa1d4 100644 --- a/poky/meta/recipes-core/systemd/systemd_252.4.bb +++ b/poky/meta/recipes-core/systemd/systemd_252.5.bb @@ -185,6 +185,7 @@ PACKAGECONFIG[polkit] = "-Dpolkit=true,-Dpolkit=false" # hostname without acquiring additional privileges PACKAGECONFIG[polkit_hostnamed_fallback] = ",,,,dbus-broker,polkit" PACKAGECONFIG[portabled] = "-Dportabled=true,-Dportabled=false" +PACKAGECONFIG[pstore] = "-Dpstore=true,-Dpstore=false" PACKAGECONFIG[qrencode] = "-Dqrencode=true,-Dqrencode=false,qrencode,,qrencode" PACKAGECONFIG[quotacheck] = "-Dquotacheck=true,-Dquotacheck=false" PACKAGECONFIG[randomseed] = "-Drandomseed=true,-Drandomseed=false" diff --git a/poky/meta/recipes-devtools/apt/apt_2.4.5.bb b/poky/meta/recipes-devtools/apt/apt_2.4.5.bb index 4ecbf98554..7af9792a0d 100644 --- a/poky/meta/recipes-devtools/apt/apt_2.4.5.bb +++ b/poky/meta/recipes-devtools/apt/apt_2.4.5.bb @@ -127,6 +127,7 @@ do_install:append:class-native() { do_install:append:class-nativesdk() { customize_apt_conf_sample + rm -rf ${D}${localstatedir}/log } do_install:append:class-target() { diff --git a/poky/meta/recipes-devtools/binutils/binutils.inc b/poky/meta/recipes-devtools/binutils/binutils.inc index 98acf0a222..b2dbf241df 100644 --- a/poky/meta/recipes-devtools/binutils/binutils.inc +++ b/poky/meta/recipes-devtools/binutils/binutils.inc @@ -57,6 +57,7 @@ GPROFNG_ALTS:aarch64 = "${GPROFNGS}" LDGOLD_ALTS ?= "ld.gold dwp" LDGOLD_ALTS:riscv64 = "" LDGOLD_ALTS:riscv32 = "" +LDGOLD_ALTS:loongarch64 = "" LDGOLD_ALTS:libc-glibc:mipsarch = "" USE_ALTERNATIVES_FOR = " \ @@ -198,6 +199,6 @@ ALTERNATIVE_PRIORITY = "100" ALTERNATIVE:${PN}:class-target = "${USE_ALTERNATIVES_FOR}" python () { - if bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', True, False, d) and bb.utils.contains_any('TARGET_ARCH', 'riscv32 riscv64', True, False, d): - bb.fatal("Gold linker does not _yet_ support RISC-V architecture please remove ld-is-gold from DISTRO_FEATURES") + if bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', True, False, d) and bb.utils.contains_any('TARGET_ARCH', 'riscv32 riscv64 loongarch64', True, False, d): + bb.fatal("Gold linker does not _yet_ support RISC-V and LoongArch architecture please remove ld-is-gold from DISTRO_FEATURES") } diff --git a/poky/meta/recipes-devtools/bootchart2/bootchart2/0001-bootchart2-support-usrmerge.patch b/poky/meta/recipes-devtools/bootchart2/bootchart2/0001-bootchart2-support-usrmerge.patch deleted file mode 100644 index 88597cf3a9..0000000000 --- a/poky/meta/recipes-devtools/bootchart2/bootchart2/0001-bootchart2-support-usrmerge.patch +++ /dev/null @@ -1,37 +0,0 @@ -From b6d1a1ff2de363b1b76c8c70f77ae56a4e4d4b56 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Thu, 5 Sep 2019 18:37:31 +0800 -Subject: [PATCH] bootchart2: support usrmerge - -Upstream-Status: Inappropriate [oe-specific] - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 1cc2974..f988904 100644 ---- a/Makefile -+++ b/Makefile -@@ -36,7 +36,7 @@ endif - PY_SITEDIR ?= $(PY_LIBDIR)/site-packages - LIBC_A_PATH = /usr$(LIBDIR) - # Always lib, even on systems that otherwise use lib64 --SYSTEMD_UNIT_DIR = $(EARLY_PREFIX)/lib/systemd/system -+SYSTEMD_UNIT_DIR ?= $(EARLY_PREFIX)/lib/systemd/system - COLLECTOR = \ - collector/collector.o \ - collector/output.o \ -@@ -99,7 +99,7 @@ install-chroot: - install -d $(DESTDIR)$(PKGLIBDIR)/tmpfs - - install-collector: all install-chroot -- install -m 755 -D bootchartd $(DESTDIR)$(EARLY_PREFIX)/sbin/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX) -+ install -m 755 -D bootchartd $(DESTDIR)${BASE_SBINDIR}/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX) - install -m 644 -D bootchartd.conf $(DESTDIR)/etc/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX).conf - install -m 755 -D bootchart-collector $(DESTDIR)$(PKGLIBDIR)/$(PROGRAM_PREFIX)bootchart$(PROGRAM_SUFFIX)-collector - --- -2.7.4 - diff --git a/poky/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb b/poky/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb index b4d5b7cd9b..297dbfb578 100644 --- a/poky/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb +++ b/poky/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb @@ -93,7 +93,6 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)" SRC_URI = "git://github.com/xrmx/bootchart.git;branch=master;protocol=https \ file://bootchartd_stop.sh \ file://0001-collector-Allocate-space-on-heap-for-chunks.patch \ - file://0001-bootchart2-support-usrmerge.patch \ file://0001-bootchartd.in-make-sure-only-one-bootchartd-process.patch \ file://0001-Do-not-include-linux-fs.h.patch \ " @@ -120,12 +119,11 @@ UPDATERCPN = "bootchartd-stop-initscript" INITSCRIPT_NAME = "bootchartd_stop.sh" INITSCRIPT_PARAMS = "start 99 2 3 4 5 ." -EXTRA_OEMAKE = 'BASE_SBINDIR="${base_sbindir}"' - do_compile:prepend () { export PY_LIBDIR="${libdir}/${PYTHON_DIR}" export BINDIR="${bindir}" - export LIBDIR="${base_libdir}" + export LIBDIR="/${baselib}" + export EARLY_PREFIX="${root_prefix}" } do_install () { @@ -133,9 +131,8 @@ do_install () { export PY_LIBDIR="${libdir}/${PYTHON_DIR}" export BINDIR="${bindir}" export DESTDIR="${D}" - export LIBDIR="${base_libdir}" - export PKGLIBDIR="${base_libdir}/bootchart" - export SYSTEMD_UNIT_DIR="${systemd_system_unitdir}" + export LIBDIR="/${baselib}" + export EARLY_PREFIX="${root_prefix}" oe_runmake install NO_PYTHON_COMPILE=1 install -d ${D}${sysconfdir}/init.d diff --git a/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.1.2.bb b/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.1.3.bb index b10d7efdb5..b4dfc5b3f3 100644 --- a/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.1.2.bb +++ b/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.1.3.bb @@ -19,7 +19,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git;b file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \ file://0001-Use-pread-pwrite-ftruncate-stat-instead-of-64bit-equ.patch \ " -SRCREV = "660d10d3fb2e87909d379b0ea3c52934543455c7" +SRCREV = "908b4b4450320e30fdef693f09b42f4eb93702c3" S = "${WORKDIR}/git" PACKAGECONFIG ??= " \ diff --git a/poky/meta/recipes-devtools/cmake/cmake-native_3.25.1.bb b/poky/meta/recipes-devtools/cmake/cmake-native_3.25.2.bb index c150aef5ef..c150aef5ef 100644 --- a/poky/meta/recipes-devtools/cmake/cmake-native_3.25.1.bb +++ b/poky/meta/recipes-devtools/cmake/cmake-native_3.25.2.bb diff --git a/poky/meta/recipes-devtools/cmake/cmake.inc b/poky/meta/recipes-devtools/cmake/cmake.inc index 7da9a2fb55..b7e674c4c4 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] = "1c511d09516af493694ed9baf13c55947a36389674d657a2d5e0ccedc6b291d8" +SRC_URI[sha256sum] = "c026f22cb931dd532f648f087d587f07a1843c6e66a3dfca4fb0ea21944ed33c" UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/poky/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch b/poky/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch index 451b6ebfad..d13c367e78 100644 --- a/poky/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch +++ b/poky/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch @@ -1,4 +1,4 @@ -From 8e53dd7f6f534ad933e7e9c7fc20cc1a6cded3f4 Mon Sep 17 00:00:00 2001 +From 5acfcb2aba1a5641d390558fdf288373f5e39cb5 Mon Sep 17 00:00:00 2001 From: Cody P Schafer <dev@codyps.com> Date: Thu, 27 Apr 2017 11:35:05 -0400 Subject: [PATCH] CMakeDetermineSystem: use oe environment vars to load default diff --git a/poky/meta/recipes-devtools/cmake/cmake_3.25.1.bb b/poky/meta/recipes-devtools/cmake/cmake_3.25.2.bb index bb7ed83e30..bb7ed83e30 100644 --- a/poky/meta/recipes-devtools/cmake/cmake_3.25.1.bb +++ b/poky/meta/recipes-devtools/cmake/cmake_3.25.2.bb diff --git a/poky/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch b/poky/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch index 1b5b89644f..160adbbe6e 100644 --- a/poky/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch +++ b/poky/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch @@ -1,4 +1,4 @@ -From 54ca20a18253bcf0915b2e2985bbee79bf881ebe Mon Sep 17 00:00:00 2001 +From b68fcf0e23b91dca7fecfeeceb1c4267e29e6f9d Mon Sep 17 00:00:00 2001 From: Paul Eggleton <paul.eggleton@linux.microsoft.com> Date: Tue, 16 Jun 2020 03:57:25 +0000 Subject: [PATCH] build.c: ignore return of 1 from tar -cf diff --git a/poky/meta/recipes-devtools/dpkg/dpkg_1.21.18.bb b/poky/meta/recipes-devtools/dpkg/dpkg_1.21.19.bb index 3bb84a433a..8d0eb40bd6 100644 --- a/poky/meta/recipes-devtools/dpkg/dpkg_1.21.18.bb +++ b/poky/meta/recipes-devtools/dpkg/dpkg_1.21.19.bb @@ -18,6 +18,6 @@ SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=main SRC_URI:append:class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch" -SRCREV = "ebc2c3def335ac391b010323ab65a302648f3ec7" +SRCREV = "2f3105279e0fb2255f39b2e9a11f15837cacd44b" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-devtools/git/git_2.39.0.bb b/poky/meta/recipes-devtools/git/git_2.39.1.bb index 3622b9709d..d8137df561 100644 --- a/poky/meta/recipes-devtools/git/git_2.39.0.bb +++ b/poky/meta/recipes-devtools/git/git_2.39.1.bb @@ -31,6 +31,8 @@ CVE_PRODUCT = "git-scm:git" # in mirrored git repos. Most OE users wouldn't build the docs and # we don't see this as a major issue for our general users/usecases. CVE_CHECK_IGNORE += "CVE-2022-24975" +# This is specific to Git-for-Windows +CVE_CHECK_IGNORE += "CVE-2022-41953" PACKAGECONFIG ??= "expat curl" PACKAGECONFIG[cvsserver] = "" @@ -166,4 +168,4 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ " EXTRA_OEMAKE += "NO_GETTEXT=1" -SRC_URI[tarball.sha256sum] = "d929fe67cef7ac3ca709d2b56a9920f17112d5a524bf8112af37ec045a7a5109" +SRC_URI[tarball.sha256sum] = "ae8d3427e4ccd677abc931f16183c0ec953e3bfcd866493601351e04a2b97398" diff --git a/poky/meta/recipes-devtools/go/go_1.19.4.bb b/poky/meta/recipes-devtools/go/go_1.19.4.bb index 98977673ee..587ee55944 100644 --- a/poky/meta/recipes-devtools/go/go_1.19.4.bb +++ b/poky/meta/recipes-devtools/go/go_1.19.4.bb @@ -12,7 +12,7 @@ export CXX_FOR_TARGET = "g++" # mips/rv64 doesn't support -buildmode=pie, so skip the QA checking for mips/riscv32 and its # variants. python() { - if 'mips' in d.getVar('TARGET_ARCH',True) or 'riscv32' in d.getVar('TARGET_ARCH',True): - d.appendVar('INSANE_SKIP:%s' % d.getVar('PN',True), " textrel") + if 'mips' in d.getVar('TARGET_ARCH') or 'riscv32' in d.getVar('TARGET_ARCH'): + d.appendVar('INSANE_SKIP:%s' % d.getVar('PN'), " textrel") } diff --git a/poky/meta/recipes-devtools/llvm/llvm_git.bb b/poky/meta/recipes-devtools/llvm/llvm_git.bb index 77fccbccc2..b4e983d2d0 100644 --- a/poky/meta/recipes-devtools/llvm/llvm_git.bb +++ b/poky/meta/recipes-devtools/llvm/llvm_git.bb @@ -19,14 +19,14 @@ inherit cmake pkgconfig PROVIDES += "llvm${PV}" -PV = "15.0.6" +PV = "15.0.7" MAJOR_VERSION = "${@oe.utils.trim_version("${PV}", 1)}" LLVM_RELEASE = "${PV}" BRANCH = "release/${MAJOR_VERSION}.x" -SRCREV = "088f33605d8a61ff519c580a71b1dd57d16a03f8" +SRCREV = "8dfdcc7b7bf66834a761bd8de445840ef68e4d1a" 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.0.0.bb b/poky/meta/recipes-devtools/meson/meson_1.0.0.bb index a7740cc6dd..578dfb9d64 100644 --- a/poky/meta/recipes-devtools/meson/meson_1.0.0.bb +++ b/poky/meta/recipes-devtools/meson/meson_1.0.0.bb @@ -66,6 +66,8 @@ def generate_native_link_template(d): loader = 'ld-linux-aarch64.so.1' elif 'ppc64le' in build_arch: loader = 'ld64.so.2' + elif 'loongarch64' in build_arch: + loader = 'ld-linux-loongarch-lp64d.so.1' if loader: val += ['-Wl,--dynamic-linker=@{OECORE_NATIVE_SYSROOT}${base_libdir_native}/' + loader] diff --git a/poky/meta/recipes-devtools/perl/libtest-needs-perl_0.002009.bb b/poky/meta/recipes-devtools/perl/libtest-needs-perl_0.002010.bb index 43a9a6b7d3..79a06170e0 100644 --- a/poky/meta/recipes-devtools/perl/libtest-needs-perl_0.002009.bb +++ b/poky/meta/recipes-devtools/perl/libtest-needs-perl_0.002010.bb @@ -17,8 +17,7 @@ DEPENDS += "perl" SRC_URI = "https://cpan.metacpan.org/authors/id/H/HA/${CPAN_AUTHOR}/${CPAN_NAME}-${PV}.tar.gz" -SRC_URI[md5sum] = "5643cd323afb77d20363acbaf9b12bcc" -SRC_URI[sha256sum] = "571c21193ad16195df58b06b268798796a391b398c443271721d2cc0fb7c4ac3" +SRC_URI[sha256sum] = "923ffdc78fcba96609753e4bae26b0ba0186893de4a63cd5236e012c7c90e208" S = "${WORKDIR}/${CPAN_NAME}-${PV}" diff --git a/poky/meta/recipes-devtools/pkgconf/pkgconf_1.9.3.bb b/poky/meta/recipes-devtools/pkgconf/pkgconf_1.9.4.bb index 453da89c3d..ab0f371093 100644 --- a/poky/meta/recipes-devtools/pkgconf/pkgconf_1.9.3.bb +++ b/poky/meta/recipes-devtools/pkgconf/pkgconf_1.9.4.bb @@ -20,7 +20,7 @@ SRC_URI = "\ file://pkg-config-native.in \ file://pkg-config-esdk.in \ " -SRC_URI[sha256sum] = "5fb355b487d54fb6d341e4f18d4e2f7e813a6622cf03a9e87affa6a40565699d" +SRC_URI[sha256sum] = "daccf1bbe5a30d149b556c7d2ffffeafd76d7b514e249271abdd501533c1d8ae" inherit autotools diff --git a/poky/meta/recipes-devtools/python/python3-dtschema_2022.12.bb b/poky/meta/recipes-devtools/python/python3-dtschema_2023.1.bb index 9d860111c1..9767c95d30 100644 --- a/poky/meta/recipes-devtools/python/python3-dtschema_2022.12.bb +++ b/poky/meta/recipes-devtools/python/python3-dtschema_2023.1.bb @@ -7,7 +7,7 @@ inherit pypi setuptools3 PYPI_PACKAGE = "dtschema" -SRC_URI[sha256sum] = "f532d433a915e507d4b426b7ef57a6730d23c0938b682fb4866f9dfa80a58ec6" +SRC_URI[sha256sum] = "8fc8c269e4c57e9d008af7b32cd33b77afd4ea1ac9552bcfa96b41b9e0c52586" DEPENDS += "python3-setuptools-scm-native" RDEPENDS:${PN} += "python3-ruamel-yaml python3-jsonschema python3-rfc3987" diff --git a/poky/meta/recipes-devtools/python/python3-hypothesis_6.62.0.bb b/poky/meta/recipes-devtools/python/python3-hypothesis_6.66.0.bb index 4369a697bd..3101845e48 100644 --- a/poky/meta/recipes-devtools/python/python3-hypothesis_6.62.0.bb +++ b/poky/meta/recipes-devtools/python/python3-hypothesis_6.66.0.bb @@ -13,7 +13,7 @@ SRC_URI += " \ file://test_rle.py \ " -SRC_URI[sha256sum] = "76f1141e8237f6dd0780a171bec5d6aec873208ccc27b5f9753d4cccd8904272" +SRC_URI[sha256sum] = "2fb334ab068dc6e7c02d49a1c694f66bd1f681197eeed94406650a59eebef870" RDEPENDS:${PN} += " \ python3-attrs \ diff --git a/poky/meta/recipes-devtools/python/python3-iniconfig_1.1.1.bb b/poky/meta/recipes-devtools/python/python3-iniconfig_1.1.1.bb deleted file mode 100644 index 4643437b80..0000000000 --- a/poky/meta/recipes-devtools/python/python3-iniconfig_1.1.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "A small and simple INI-file parser module" -HOMEPAGE = "https://pypi.org/project/iniconfig/" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a6bb0320b04a0a503f12f69fea479de9" - -SRC_URI[md5sum] = "0b7f3be87481211c183eae095bcea6f1" -SRC_URI[sha256sum] = "bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32" - -DEPENDS += "python3-setuptools-scm-native" - -inherit pypi python_setuptools_build_meta diff --git a/poky/meta/recipes-devtools/python/python3-iniconfig_2.0.0.bb b/poky/meta/recipes-devtools/python/python3-iniconfig_2.0.0.bb new file mode 100644 index 0000000000..ca50ebbc35 --- /dev/null +++ b/poky/meta/recipes-devtools/python/python3-iniconfig_2.0.0.bb @@ -0,0 +1,11 @@ +SUMMARY = "A small and simple INI-file parser module" +HOMEPAGE = "https://pypi.org/project/iniconfig/" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a6bb0320b04a0a503f12f69fea479de9" + +SRC_URI[sha256sum] = "2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3" + +DEPENDS += "python3-hatch-vcs-native" + +inherit pypi python_hatchling diff --git a/poky/meta/recipes-devtools/python/python3-markupsafe_2.1.1.bb b/poky/meta/recipes-devtools/python/python3-markupsafe_2.1.2.bb index 0544dd1b83..f4f0ad2df0 100644 --- a/poky/meta/recipes-devtools/python/python3-markupsafe_2.1.1.bb +++ b/poky/meta/recipes-devtools/python/python3-markupsafe_2.1.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://github.com/mitsuhiko/markupsafe" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=ffeffa59c90c9c4a033c7574f8f3fb75" -SRC_URI[sha256sum] = "7f91197cc9e48f989d12e4e6fbc46495c446636dfc81b9ccf50bb0ec74b91d4b" +SRC_URI[sha256sum] = "abcabc8c2b26036d62d4c746381a6f7cf60aafcc653198ad678306986b09450d" PYPI_PACKAGE = "MarkupSafe" inherit pypi setuptools3 diff --git a/poky/meta/recipes-devtools/python/python3-pathspec_0.10.3.bb b/poky/meta/recipes-devtools/python/python3-pathspec_0.11.0.bb index bd1e7e3639..bf0dfbd728 100644 --- a/poky/meta/recipes-devtools/python/python3-pathspec_0.10.3.bb +++ b/poky/meta/recipes-devtools/python/python3-pathspec_0.11.0.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "MPL-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad" -SRC_URI[sha256sum] = "56200de4077d9d0791465aa9095a01d421861e405b5096955051deefd697d6f6" +SRC_URI[sha256sum] = "64d338d4e0914e91c1792321e6907b5a593f1ab1851de7fc269557a21b30ebbc" inherit pypi setuptools3 diff --git a/poky/meta/recipes-devtools/python/python3-pip_22.3.1.bb b/poky/meta/recipes-devtools/python/python3-pip_23.0.bb index cb9f68679f..8b956932c3 100644 --- a/poky/meta/recipes-devtools/python/python3-pip_22.3.1.bb +++ b/poky/meta/recipes-devtools/python/python3-pip_23.0.bb @@ -13,11 +13,11 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=63ec52baf95163b597008bb46db68030 \ file://src/pip/_vendor/msgpack/COPYING;md5=cd9523181d9d4fbf7ffca52eaa2a5751 \ file://src/pip/_vendor/packaging/LICENSE;md5=faadaedca9251a90b205c9167578ce91 \ file://src/pip/_vendor/packaging/LICENSE.APACHE;md5=2ee41112a44fe7014dce33e26468ba93 \ - file://src/pip/_vendor/pep517/LICENSE;md5=aad69c93f605003e3342b174d9b0708c \ file://src/pip/_vendor/pkg_resources/LICENSE;md5=9a33897f1bca1160d7aad3835152e158 \ - file://src/pip/_vendor/platformdirs/LICENSE.txt;md5=282c970bb844954c8535dd6e9733db7f \ + file://src/pip/_vendor/platformdirs/LICENSE;md5=ea4f5a41454746a9ed111e3d8723d17a \ file://src/pip/_vendor/pygments/LICENSE;md5=36a13c90514e2899f1eba7f41c3ee592 \ file://src/pip/_vendor/pyparsing/LICENSE;md5=657a566233888513e1f07ba13e2f47f1 \ + file://src/pip/_vendor/pyproject_hooks/LICENSE;md5=aad69c93f605003e3342b174d9b0708c \ file://src/pip/_vendor/requests/LICENSE;md5=34400b68072d710fecd0a2940a0d1658 \ file://src/pip/_vendor/resolvelib/LICENSE;md5=78e1c0248051c32a38a7f820c30bd7a5 \ file://src/pip/_vendor/rich/LICENSE;md5=b5f0b94fbc94f5ad9ae4efcf8a778303 \ @@ -33,7 +33,7 @@ inherit pypi python_setuptools_build_meta SRC_URI += "file://no_shebang_mangling.patch" -SRC_URI[sha256sum] = "65fd48317359f3af8e593943e6ae1506b66325085ea64b706a998c6e83eeaf38" +SRC_URI[sha256sum] = "aee438284e82c8def684b0bcc50b1f6ed5e941af97fa940e83e2e8ef1a59da9b" do_install:append() { rm -f ${D}/${bindir}/pip diff --git a/poky/meta/recipes-devtools/python/python3-poetry-core/deterministic.patch b/poky/meta/recipes-devtools/python/python3-poetry-core/deterministic.patch deleted file mode 100644 index 402ee53094..0000000000 --- a/poky/meta/recipes-devtools/python/python3-poetry-core/deterministic.patch +++ /dev/null @@ -1,23 +0,0 @@ -builders/wheel: Ensure dist-info is written determinisically - -glob() returns values in "on disk" order. To make the RECORD file -deterministic and consistent between builds we need to sort the -data before adding to the records list. - -Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> - -Upstream-Status: Submitted [https://github.com/python-poetry/poetry-core/pull/545] - -Index: builders/wheel.py -=================================================================== ---- a/src/poetry/core/masonry/builders/wheel.py -+++ b/src/poetry/core/masonry/builders/wheel.py -@@ -294,7 +294,7 @@ class WheelBuilder(Builder): - - def _copy_dist_info(self, wheel: zipfile.ZipFile, source: Path) -> None: - dist_info = Path(self.dist_info) -- for file in source.glob("**/*"): -+ for file in sorted(source.glob("**/*") ): - if not file.is_file(): - continue - diff --git a/poky/meta/recipes-devtools/python/python3-poetry-core_1.4.0.bb b/poky/meta/recipes-devtools/python/python3-poetry-core_1.5.0.bb index 8a95022012..03db426b39 100644 --- a/poky/meta/recipes-devtools/python/python3-poetry-core_1.4.0.bb +++ b/poky/meta/recipes-devtools/python/python3-poetry-core_1.5.0.bb @@ -14,20 +14,17 @@ LIC_FILES_CHKSUM = "\ file://src/poetry/core/_vendor/packaging/LICENSE;md5=faadaedca9251a90b205c9167578ce91 \ file://src/poetry/core/_vendor/packaging/LICENSE.APACHE;md5=2ee41112a44fe7014dce33e26468ba93 \ file://src/poetry/core/_vendor/packaging/LICENSE.BSD;md5=7bef9bf4a8e4263634d0597e7ba100b8 \ - file://src/poetry/core/_vendor/pyparsing/LICENSE;md5=657a566233888513e1f07ba13e2f47f1 \ file://src/poetry/core/_vendor/pyrsistent/LICENSE.mit;md5=b695eb9c6e7a6fb1b1bc2d193c42776e \ file://src/poetry/core/_vendor/tomlkit/LICENSE;md5=31aac0dbc1babd278d5386dadb7f8e82 \ file://src/poetry/core/_vendor/typing_extensions.LICENSE;md5=f16b323917992e0f8a6f0071bc9913e2 \ " -SRC_URI[sha256sum] = "514bd33c30e0bf56b0ed44ee15e120d7e47b61ad908b2b1011da68c48a84ada9" +SRC_URI[sha256sum] = "253521bb7104e1df81f64d7b49ea1825057c91fa156d7d0bd752fefdad6f8c7a" inherit python_poetry_core pypi PYPI_ARCHIVE_NAME = "poetry_core-${PV}.${PYPI_PACKAGE_EXT}" S = "${WORKDIR}/poetry_core-${PV}" -SRC_URI += "file://deterministic.patch" - RDEPENDS:${PN}:append:class-target = "\ python3-compression \ python3-core \ diff --git a/poky/meta/recipes-devtools/python/python3-pycryptodome_3.16.0.bb b/poky/meta/recipes-devtools/python/python3-pycryptodome_3.16.0.bb deleted file mode 100644 index 15ee31c66a..0000000000 --- a/poky/meta/recipes-devtools/python/python3-pycryptodome_3.16.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require python-pycryptodome.inc -inherit setuptools3 - -SRC_URI[sha256sum] = "0e45d2d852a66ecfb904f090c3f87dc0dfb89a499570abad8590f10d9cffb350" - diff --git a/poky/meta/recipes-devtools/python/python3-pycryptodome_3.17.bb b/poky/meta/recipes-devtools/python/python3-pycryptodome_3.17.bb new file mode 100644 index 0000000000..05f654f225 --- /dev/null +++ b/poky/meta/recipes-devtools/python/python3-pycryptodome_3.17.bb @@ -0,0 +1,5 @@ +require python-pycryptodome.inc +inherit setuptools3 + +SRC_URI[sha256sum] = "bce2e2d8e82fcf972005652371a3e8731956a0c1fbb719cc897943b3695ad91b" + diff --git a/poky/meta/recipes-devtools/python/python3-pycryptodomex_3.16.0.bb b/poky/meta/recipes-devtools/python/python3-pycryptodomex_3.17.bb index 36ef772863..720aec2d36 100644 --- a/poky/meta/recipes-devtools/python/python3-pycryptodomex_3.16.0.bb +++ b/poky/meta/recipes-devtools/python/python3-pycryptodomex_3.17.bb @@ -1,7 +1,7 @@ require python-pycryptodome.inc inherit setuptools3 -SRC_URI[sha256sum] = "e9ba9d8ed638733c9e95664470b71d624a6def149e2db6cc52c1aca5a6a2df1d" +SRC_URI[sha256sum] = "0af93aad8d62e810247beedef0261c148790c52f3cd33643791cc6396dd217c1" FILES:${PN}-tests = " \ ${PYTHON_SITEPACKAGES_DIR}/Cryptodome/SelfTest/ \ diff --git a/poky/meta/recipes-devtools/python/python3-pyopenssl_22.1.0.bb b/poky/meta/recipes-devtools/python/python3-pyopenssl_23.0.0.bb index 4d83b8c7d7..822d21a58a 100644 --- a/poky/meta/recipes-devtools/python/python3-pyopenssl_22.1.0.bb +++ b/poky/meta/recipes-devtools/python/python3-pyopenssl_23.0.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" DEPENDS += "openssl ${PYTHON_PN}-cryptography" -SRC_URI[sha256sum] = "7a83b7b272dd595222d672f5ce29aa030f1fb837630ef229f62e72e395ce8968" +SRC_URI[sha256sum] = "c1cc5f86bcacefc84dada7d31175cae1b1518d5f60d3d0bb595a67822a868a6f" PYPI_PACKAGE = "pyOpenSSL" inherit pypi setuptools3 diff --git a/poky/meta/recipes-devtools/python/python3-pytest_7.2.0.bb b/poky/meta/recipes-devtools/python/python3-pytest_7.2.1.bb index 02fc55fdb0..105b76a4a6 100644 --- a/poky/meta/recipes-devtools/python/python3-pytest_7.2.0.bb +++ b/poky/meta/recipes-devtools/python/python3-pytest_7.2.1.bb @@ -5,7 +5,7 @@ DESCRIPTION = "The pytest framework makes it easy to write small tests, yet scal LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=bd27e41b6550fe0fc45356d1d81ee37c" -SRC_URI[sha256sum] = "c4014eb40e10f11f355ad4e3c2fb2c6c6d1919c73f3b5a433de4708202cade59" +SRC_URI[sha256sum] = "d45e0952f3727241918b8fd0f376f5ff6b301cc0777c6f9a556935c92d8a7d42" DEPENDS += "python3-setuptools-scm-native" @@ -26,7 +26,6 @@ RDEPENDS:${PN}:class-target += " \ ${PYTHON_PN}-py \ ${PYTHON_PN}-setuptools \ ${PYTHON_PN}-six \ - ${PYTHON_PN}-toml \ ${PYTHON_PN}-wcwidth \ " diff --git a/poky/meta/recipes-devtools/python/python3-pytz_2022.7.bb b/poky/meta/recipes-devtools/python/python3-pytz_2022.7.1.bb index a6a69c8b59..553b9cfa18 100644 --- a/poky/meta/recipes-devtools/python/python3-pytz_2022.7.bb +++ b/poky/meta/recipes-devtools/python/python3-pytz_2022.7.1.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1a67fc46c1b596cce5d21209bbe75999" inherit pypi setuptools3 ptest -SRC_URI[sha256sum] = "7ccfae7b4b2c067464a6733c6261673fdb8fd1be905460396b97a073e9fa683a" +SRC_URI[sha256sum] = "01a0681c4b9684a28304615eba55d1ab31ae00bf68ec157ec3708a8182dbbcd0" RDEPENDS:${PN}:class-target += "\ ${PYTHON_PN}-datetime \ diff --git a/poky/meta/recipes-devtools/python/python3-requests_2.28.1.bb b/poky/meta/recipes-devtools/python/python3-requests_2.28.2.bb index 8de08d2620..2f397ddaad 100644 --- a/poky/meta/recipes-devtools/python/python3-requests_2.28.1.bb +++ b/poky/meta/recipes-devtools/python/python3-requests_2.28.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://python-requests.org" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" -SRC_URI[sha256sum] = "7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983" +SRC_URI[sha256sum] = "98b1b2782e3c6c4904938b84c0eb932721069dfdb9134313beff7c83c2df24bf" inherit pypi setuptools3 diff --git a/poky/meta/recipes-devtools/python/python3-setuptools/0001-change-shebang-to-python3.patch b/poky/meta/recipes-devtools/python/python3-setuptools/0001-change-shebang-to-python3.patch deleted file mode 100644 index 6dcf52771b..0000000000 --- a/poky/meta/recipes-devtools/python/python3-setuptools/0001-change-shebang-to-python3.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c39d0896930e25c224cc897660fc8511ccae30c8 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Thu, 23 Apr 2020 10:01:12 +0000 -Subject: [PATCH] change shebang to python3 - -Upstream-Status: Pending - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - pkg_resources/_vendor/appdirs.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/pkg_resources/_vendor/appdirs.py b/pkg_resources/_vendor/appdirs.py -index ae67001..933e398 100644 ---- a/pkg_resources/_vendor/appdirs.py -+++ b/pkg_resources/_vendor/appdirs.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - # Copyright (c) 2005-2010 ActiveState Software Inc. - # Copyright (c) 2013 Eddy Petrișor --- -2.24.1 - diff --git a/poky/meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch b/poky/meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch index 2110c4a877..e22e757fcd 100644 --- a/poky/meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch +++ b/poky/meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch @@ -1,4 +1,4 @@ -From 2e57369593ede5336f947e7b9903ebc673f98fef Mon Sep 17 00:00:00 2001 +From 1a7fbd6b7ccf9d3f69bd591fa35fa48c0b8916ba Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Tue, 17 Jul 2018 10:13:38 +0800 Subject: [PATCH] conditionally do not fetch code by easy_install diff --git a/poky/meta/recipes-devtools/python/python3-setuptools_65.7.0.bb b/poky/meta/recipes-devtools/python/python3-setuptools_67.2.0.bb index 789d212281..a412043a8b 100644 --- a/poky/meta/recipes-devtools/python/python3-setuptools_65.7.0.bb +++ b/poky/meta/recipes-devtools/python/python3-setuptools_67.2.0.bb @@ -8,10 +8,10 @@ inherit pypi python_setuptools_build_meta SRC_URI:append:class-native = " file://0001-conditionally-do-not-fetch-code-by-easy_install.patch" -SRC_URI += "file://0001-change-shebang-to-python3.patch \ +SRC_URI += " \ file://0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch" -SRC_URI[sha256sum] = "4d3c92fac8f1118bb77a22181355e29c239cabfe2b9effdaa665c66b711136d7" +SRC_URI[sha256sum] = "b440ee5f7e607bb8c9de15259dba2583dd41a38879a7abc1d43a71c59524da48" DEPENDS += "${PYTHON_PN}" diff --git a/poky/meta/recipes-devtools/python/python3-sphinx_6.0.0.bb b/poky/meta/recipes-devtools/python/python3-sphinx_6.1.3.bb index 5e565e745d..f75988a6a0 100644 --- a/poky/meta/recipes-devtools/python/python3-sphinx_6.0.0.bb +++ b/poky/meta/recipes-devtools/python/python3-sphinx_6.1.3.bb @@ -2,11 +2,11 @@ DESCRIPTION = "Python documentation generator" HOMEPAGE = "http://sphinx-doc.org/" SECTION = "devel/python" LICENSE = "BSD-2-Clause & MIT & BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2214a89317448c7f792f5b75dd6726e4" +LIC_FILES_CHKSUM = "file://LICENSE;md5=066da51ab732319a06beae4f10788577" PYPI_PACKAGE = "Sphinx" -SRC_URI[sha256sum] = "58c140ecd9aa0abbc8ff6da48a266648eac9e5bfc8e49576efd2979bf46f5961" +SRC_URI[sha256sum] = "0dac3b698538ffef41716cf97ba26c1c7788dba73ce6f150c1ff5b4720786dd2" inherit python_flit_core pypi diff --git a/poky/meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.3.bb b/poky/meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.4.bb index c97d204c06..4d14216c52 100644 --- a/poky/meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.3.bb +++ b/poky/meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.4.bb @@ -3,10 +3,8 @@ HOMEPAGE = "https://www.sphinx-doc.org" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=c7715857042d4c8c0105999ca0c072c5" -SRC_URI[sha256sum] = "83749f09f6ac843b8cb685277dbc818a8bf2d76cc19602699094fe9a74db529e" +SRC_URI[sha256sum] = "828f867945bbe39817c210a1abfd1bc4895c8b73fcaade56d45357a348a07d7e" -PYPI_PACKAGE = "sphinxcontrib.applehelp" - -inherit pypi python_flit_core +inherit pypi python_setuptools_build_meta BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/python/python3-sphinxcontrib-htmlhelp_2.0.0.bb b/poky/meta/recipes-devtools/python/python3-sphinxcontrib-htmlhelp_2.0.1.bb index cd8b987e0c..39589881da 100644 --- a/poky/meta/recipes-devtools/python/python3-sphinxcontrib-htmlhelp_2.0.0.bb +++ b/poky/meta/recipes-devtools/python/python3-sphinxcontrib-htmlhelp_2.0.1.bb @@ -3,10 +3,10 @@ HOMEPAGE = "https://www.sphinx-doc.org" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=24dce5ef6a13563241c24bc366f48886" -SRC_URI[sha256sum] = "f5f8bb2d0d629f398bf47d0d69c07bc13b65f75a81ad9e2f71a63d4b7a2f6db2" +SRC_URI[sha256sum] = "0cbdd302815330058422b98a113195c9249825d681e18f11e8b1f78a2f11efff" PYPI_PACKAGE = "sphinxcontrib-htmlhelp" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/python/python3-urllib3_1.26.13.bb b/poky/meta/recipes-devtools/python/python3-urllib3_1.26.14.bb index 7af95117cf..f35a141df2 100644 --- a/poky/meta/recipes-devtools/python/python3-urllib3_1.26.13.bb +++ b/poky/meta/recipes-devtools/python/python3-urllib3_1.26.14.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/shazow/urllib3" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c2823cb995439c984fd62a973d79815c" -SRC_URI[sha256sum] = "c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8" +SRC_URI[sha256sum] = "076907bf8fd355cde77728471316625a4d2f7e713c125f51953bb5b3eecf4f72" inherit pypi setuptools3 diff --git a/poky/meta/recipes-devtools/python/python3-wcwidth_0.2.5.bb b/poky/meta/recipes-devtools/python/python3-wcwidth_0.2.6.bb index a532d3c5cb..368146dba4 100644 --- a/poky/meta/recipes-devtools/python/python3-wcwidth_0.2.5.bb +++ b/poky/meta/recipes-devtools/python/python3-wcwidth_0.2.6.bb @@ -4,8 +4,7 @@ HOMEPAGE = "https://github.com/jquast/wcwidth" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=b15979c39a2543892fca8cd86b4b52cb" -SRC_URI[md5sum] = "a07a75f99d316e14838ac760c831ea37" -SRC_URI[sha256sum] = "c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83" +SRC_URI[sha256sum] = "a5220780a404dbe3353789870978e472cfe477761f06ee55077256e509b156d0" inherit pypi setuptools3 ptest diff --git a/poky/meta/recipes-devtools/python/python3-zipp_3.11.0.bb b/poky/meta/recipes-devtools/python/python3-zipp_3.12.0.bb index 70ebafc168..1b36e42543 100644 --- a/poky/meta/recipes-devtools/python/python3-zipp_3.11.0.bb +++ b/poky/meta/recipes-devtools/python/python3-zipp_3.12.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/jaraco/zipp" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=7a7126e068206290f3fe9f8d6c713ea6" -SRC_URI[sha256sum] = "a7a22e05929290a67401440b39690ae6563279bced5f314609d9d03798f56766" +SRC_URI[sha256sum] = "73efd63936398aac78fd92b6f4865190119d6c91b531532e798977ea8dd402eb" DEPENDS += "${PYTHON_PN}-setuptools-scm-native" diff --git a/poky/meta/recipes-devtools/qemu/qemu.inc b/poky/meta/recipes-devtools/qemu/qemu.inc index 80f6edd2b9..92828e8f2d 100644 --- a/poky/meta/recipes-devtools/qemu/qemu.inc +++ b/poky/meta/recipes-devtools/qemu/qemu.inc @@ -86,7 +86,7 @@ do_install_ptest() { } # QEMU_TARGETS is overridable variable -QEMU_TARGETS ?= "arm aarch64 i386 mips mipsel mips64 mips64el ppc ppc64 ppc64le riscv32 riscv64 sh4 x86_64" +QEMU_TARGETS ?= "arm aarch64 i386 loongarch64 mips mipsel mips64 mips64el ppc ppc64 ppc64le riscv32 riscv64 sh4 x86_64" EXTRA_OECONF = " \ --prefix=${prefix} \ diff --git a/poky/meta/recipes-devtools/rust/cargo_1.66.1.bb b/poky/meta/recipes-devtools/rust/cargo_1.67.0.bb index 2b2394e898..2b2394e898 100644 --- a/poky/meta/recipes-devtools/rust/cargo_1.66.1.bb +++ b/poky/meta/recipes-devtools/rust/cargo_1.67.0.bb diff --git a/poky/meta/recipes-devtools/rust/files/crossbeam_atomic.patch b/poky/meta/recipes-devtools/rust/files/crossbeam_atomic.patch index b24ac439c6..51dd3c5f65 100644 --- a/poky/meta/recipes-devtools/rust/files/crossbeam_atomic.patch +++ b/poky/meta/recipes-devtools/rust/files/crossbeam_atomic.patch @@ -17,10 +17,10 @@ to create a patch that upstream might accept. Upstream-Status: Submitted [https://github.com/crossbeam-rs/crossbeam/pull/922] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> -Index: rustc-1.66.0-src/vendor/crossbeam-utils/build.rs +Index: rustc-1.66.0-src/vendor/crossbeam-utils-0.8.12/build.rs =================================================================== ---- rustc-1.66.0-src.orig/vendor/crossbeam-utils/build.rs -+++ rustc-1.66.0-src/vendor/crossbeam-utils/build.rs +--- rustc-1.66.0-src.orig/vendor/crossbeam-utils-0.8.12/build.rs ++++ rustc-1.66.0-src/vendor/crossbeam-utils-0.8.12/build.rs @@ -29,7 +29,7 @@ use std::env; include!("no_atomic.rs"); @@ -39,10 +39,10 @@ Index: rustc-1.66.0-src/vendor/crossbeam-utils/build.rs // Note that this is `no_`*, not `has_*`. This allows treating as the latest // stable rustc is used when the build script doesn't run. This is useful -Index: rustc-1.66.0-src/vendor/crossbeam-utils/.cargo-checksum.json +Index: rustc-1.66.0-src/vendor/crossbeam-utils-0.8.12/.cargo-checksum.json =================================================================== ---- rustc-1.66.0-src.orig/vendor/crossbeam-utils/.cargo-checksum.json -+++ rustc-1.66.0-src/vendor/crossbeam-utils/.cargo-checksum.json +--- rustc-1.66.0-src.orig/vendor/crossbeam-utils-0.8.12/.cargo-checksum.json ++++ rustc-1.66.0-src/vendor/crossbeam-utils-0.8.12/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"CHANGELOG.md":"65d3e11edf9498bdbc930c8c3878b7d3a90c1a0b1698597dc4a396a547fa0948","Cargo.toml":"1e4259a5a47271e8ae040b91e17652b5a4e0e7e45c3f22de5008db276f3a50bf","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"2a19af38a52dd965c2d66bb39f90a85b430b51ee9ccb29e9e1978ee7091e5087","benches/atomic_cell.rs":"c927eb3cd1e5ecc4b91adbc3bde98af15ffab4086190792ba64d5cde0e24df3d","build.rs":"4859f9c926c230023e861bf01c4b225b460035faf8cf6240108530efedbb747f","no_atomic.rs":"f58085b9d0666ccf62e0ae17fb5dae937c0a86fcc55dc0ae04ad8659e696a49c","src/atomic/atomic_cell.rs":"0fc99463e633144c5d59d39c35b5477da1f1b90f5448cadc37454b7f4b97707e","src/atomic/consume.rs":"7a7736fcd64f6473dfea7653559ffc5e1a2a234df43835f8aa8734862145ac15","src/atomic/mod.rs":"94193895fa03cece415e8d7be700b73a9a8a7015774ca821253438607f9b0736","src/atomic/seq_lock.rs":"27182e6b87a9db73c5f6831759f8625f9fcdec3c2828204c444aef04f427735a","src/atomic/seq_lock_wide.rs":"9888dd03116bb89ca36d4ab8d5a0b5032107a2983a7eb8024454263b09080088","src/backoff.rs":"8fd5e3dcccc05860680e49c8498de8096bee9140bcfee8723d97117106a020d0","src/cache_padded.rs":"8bb8925e2df44224ffa29f31a2f9c08d88d8bd3df6c1ce47003598225055fdb5","src/lib.rs":"6f1bcf157abe06ad8458a53e865bf8efab9fad4a9424790147cee8fefb3795d8","src/sync/mod.rs":"eca73c04f821859b8434d2b93db87d160dc6a3f65498ca201cd40d732ca4c134","src/sync/once_lock.rs":"c03dc9c05a817e087dccf8b682f7307501542805533551da3c2bab442bc40743","src/sync/parker.rs":"91f3a7d4ee8d9e06b6558d180e8a0df08ff5c6cef612b4ce4790f9f75cb34f84","src/sync/sharded_lock.rs":"6391b3b99b194b8e0888446c2dec340e4fb095753bcf0c1a80bc654f9c8be0e3","src/sync/wait_group.rs":"3e339aab014f50e214fea535c841755113ea058153378ed54e50a4acb403c937","src/thread.rs":"21cf9b3e965529e5c0a6ff8fc1ec846bfe0006c41deb238a149be8d07384e955","tests/atomic_cell.rs":"bf8bc869c922a1cbf929c3b741bae0cae98f2157f572b5a4eb2873d20a407c22","tests/cache_padded.rs":"1bfaff8354c8184e1ee1f902881ca9400b60effb273b0d3f752801a483d2b66d","tests/parker.rs":"6def4721287d9d70b1cfd63ebb34e1c83fbb3376edbad2bc8aac6ef69dd99d20","tests/sharded_lock.rs":"314adeb8a651a28935f7a49c9a261b8fa1fd82bf6a16c865a5aced6216d7e40b","tests/thread.rs":"9a7d7d3028c552fd834c68598b04a1cc252a816bc20ab62cec060d6cd09cab10","tests/wait_group.rs":"02661c2a820a5abe8b0c8fe15a6650aead707b57cdda0610d1b09a2680ed6969"},"package":"edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac"} \ No newline at end of file diff --git a/poky/meta/recipes-devtools/rust/files/hardcodepaths.patch b/poky/meta/recipes-devtools/rust/files/hardcodepaths.patch index 178f354cf8..cb99e8b011 100644 --- a/poky/meta/recipes-devtools/rust/files/hardcodepaths.patch +++ b/poky/meta/recipes-devtools/rust/files/hardcodepaths.patch @@ -5,18 +5,6 @@ to resolve these issues properly upstream. Upstream-Status: Inappropriate [patches need rework] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> -Index: rustc-1.66.0-src/src/tools/clippy/src/driver.rs -=================================================================== ---- rustc-1.66.0-src.orig/src/tools/clippy/src/driver.rs -+++ rustc-1.66.0-src/src/tools/clippy/src/driver.rs -@@ -259,7 +259,6 @@ pub fn main() { - .and_then(|out| String::from_utf8(out.stdout).ok()) - .map(|s| PathBuf::from(s.trim())) - }) -- .or_else(|| option_env!("SYSROOT").map(PathBuf::from)) - .or_else(|| { - let home = option_env!("RUSTUP_HOME") - .or(option_env!("MULTIRUST_HOME")) Index: rustc-1.66.0-src/compiler/rustc_codegen_llvm/src/context.rs =================================================================== --- rustc-1.66.0-src.orig/compiler/rustc_codegen_llvm/src/context.rs diff --git a/poky/meta/recipes-devtools/rust/libstd-rs_1.66.1.bb b/poky/meta/recipes-devtools/rust/libstd-rs_1.67.0.bb index 8802e9790c..f4e5abc0cc 100644 --- a/poky/meta/recipes-devtools/rust/libstd-rs_1.66.1.bb +++ b/poky/meta/recipes-devtools/rust/libstd-rs_1.67.0.bb @@ -2,7 +2,7 @@ SUMMARY = "Rust standard libaries" HOMEPAGE = "http://www.rust-lang.org" SECTION = "devel" LICENSE = "(MIT | Apache-2.0) & Unicode-TOU" -LIC_FILES_CHKSUM = "file://../../COPYRIGHT;md5=92289ed52a60b63ab715612ad2915603" +LIC_FILES_CHKSUM = "file://../../COPYRIGHT;md5=c2cccf560306876da3913d79062a54b9" require rust-source.inc diff --git a/poky/meta/recipes-devtools/rust/rust-cross-canadian_1.66.1.bb b/poky/meta/recipes-devtools/rust/rust-cross-canadian_1.67.0.bb index 55865238ab..55865238ab 100644 --- a/poky/meta/recipes-devtools/rust/rust-cross-canadian_1.66.1.bb +++ b/poky/meta/recipes-devtools/rust/rust-cross-canadian_1.67.0.bb diff --git a/poky/meta/recipes-devtools/rust/rust-llvm_1.66.1.bb b/poky/meta/recipes-devtools/rust/rust-llvm_1.67.0.bb index 4cc57d12ae..4da11da8ef 100644 --- a/poky/meta/recipes-devtools/rust/rust-llvm_1.66.1.bb +++ b/poky/meta/recipes-devtools/rust/rust-llvm_1.67.0.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.rust-lang.org" # check src/llvm-project/llvm/CMakeLists.txt for llvm version in use # -LLVM_RELEASE = "15.0.2" +LLVM_RELEASE = "15.0.6" require rust-source.inc @@ -37,6 +37,7 @@ EXTRA_OECMAKE = " \ -DLLVM_BUILD_DOCS=OFF \ -DLLVM_ENABLE_TERMINFO=OFF \ -DLLVM_ENABLE_ZLIB=OFF \ + -DLLVM_ENABLE_ZSTD=OFF \ -DLLVM_ENABLE_LIBXML2=OFF \ -DLLVM_ENABLE_FFI=OFF \ -DLLVM_INSTALL_UTILS=ON \ diff --git a/poky/meta/recipes-devtools/rust/rust-snapshot.inc b/poky/meta/recipes-devtools/rust/rust-snapshot.inc index 25192c9f76..d5317279db 100644 --- a/poky/meta/recipes-devtools/rust/rust-snapshot.inc +++ b/poky/meta/recipes-devtools/rust/rust-snapshot.inc @@ -3,30 +3,61 @@ ## Rust is self-hosting and bootstraps itself with a pre-built previous version of itself. ## The exact (previous) version that has been used is specified in the source tarball. ## The version is replicated here. -## TODO: find a way to add additional SRC_URIs based on the contents of an -## earlier SRC_URI. -SNAPSHOT_VERSION = "1.65.0" +SNAPSHOT_VERSION = "1.66.1" -# TODO: Add hashes for other architecture toolchains as well. Make a script? -SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "2b588cd2d49688c0c33b7466614123e8fe4c910f4d802fc0ff0662b1772816a9" -SRC_URI[rustc-snapshot-x86_64.sha256sum] = "62b89786e195fc5a8a262f83118d6689832b24228c9d303cba8ac14dc1e9adc8" -SRC_URI[cargo-snapshot-x86_64.sha256sum] = "82547aacaf42fc3c2970ec31b96751dfbeba3dffe1a042a3780bd670c29a89bf" +SRC_URI[cargo-snapshot-aarch64.sha256sum] = "61736a6ec61a4eaa9a7b3f219d9f8166ae97c1acd54b5e904c15fb8caff06250" +SRC_URI[rust-std-snapshot-aarch64.sha256sum] = "9d96ba6a5a255339cd04af079d906753d56c85503c727279c227d24bd4987e24" +SRC_URI[rustc-snapshot-aarch64.sha256sum] = "b4d842594ba11a84712c2d1bbf7f7945cfcc2485c72861a23b488fefba5c6a45" -SRC_URI[rust-std-snapshot-aarch64.sha256sum] = "735b681c8a6e60925c76d6cc899e78b4cb4562ada24a1f265b2021c1faad78ad" -SRC_URI[rustc-snapshot-aarch64.sha256sum] = "67c3d3545fd898c1383071c0f6296453565e0da10903c50652d7bf679b53e8a2" -SRC_URI[cargo-snapshot-aarch64.sha256sum] = "3fd483c0d58673ab69862824408c8a48612827ddcdeaaca0f8fbe5ca02214a4c" +SRC_URI[cargo-snapshot-i686.sha256sum] = "fb0c1aa922c4e41fead9d35090769309cb45648d6f77ccbe8d2ba125a75cc2af" +SRC_URI[rust-std-snapshot-i686.sha256sum] = "b32cbbb9002f8a20b302823a2ff122a91f077b5e1a7bc1340de690ded86bf10b" +SRC_URI[rustc-snapshot-i686.sha256sum] = "e2ab464f43d6319ddb9796cbfacd444dc40f3d0e7503d672c23ecbe0daf11e1c" -SRC_URI[rust-std-snapshot-powerpc64le.sha256sum] = "ce18b44300f7d5d94856cef5b270ba010061fafa411beb9782207e26cbab88a6" -SRC_URI[rustc-snapshot-powerpc64le.sha256sum] = "a6ce7aadd10a3fd84fe4717a59378421a65b101b61f27eed8b09336b8daf62cf" -SRC_URI[cargo-snapshot-powerpc64le.sha256sum] = "9393de910df7cd6947e380460a1144ac2373a36c776c7367a81212a51a92d9a7" +SRC_URI[cargo-snapshot-mips.sha256sum] = "0f03d6d35b6044dc81a4d5eb9bd42c9d1e8c0e85363f960ff921ebe46294ae45" +SRC_URI[rust-std-snapshot-mips.sha256sum] = "e6029b4cec5d6c06c34a0dbec614fa252fdc8cf31013d6e561112cf90f742568" +SRC_URI[rustc-snapshot-mips.sha256sum] = "64ad92525ae1f018e08c055d7892e0fc613437bde8cf614b1c2a8986488290e7" + +SRC_URI[cargo-snapshot-mipsel.sha256sum] = "74d757a456d2fbb418c253db203c0bb3f71d797e4ab3e2804b6c594a18e0f199" +SRC_URI[rust-std-snapshot-mipsel.sha256sum] = "8bfa3d6079c6df049978fe61b1ccaf992aecd006e23df2439ecfc883bd8bc31b" +SRC_URI[rustc-snapshot-mipsel.sha256sum] = "f2674d60ce52c49048e9823af57aae24bb6722e8998783819ec884222caeccf3" + +SRC_URI[cargo-snapshot-powerpc.sha256sum] = "f771fa4294c8e0d5d0e58129fe9d4e0913566dd43523b6f0af19a08004004df8" +SRC_URI[rust-std-snapshot-powerpc.sha256sum] = "417b12a9bf090d694514937cd8c321ed625f155248f63c0de8207b17fa4b35b1" +SRC_URI[rustc-snapshot-powerpc.sha256sum] = "ff16d02c100086175b9fbcfff4d3705fb4f5b58a6506ec7667dc86c56b8bb3c7" + +SRC_URI[cargo-snapshot-powerpc64.sha256sum] = "9a933d39e6b028e73db9cc0959af84128824e0b11554e3a0171cad7635a343c7" +SRC_URI[rust-std-snapshot-powerpc64.sha256sum] = "7074c4ea9fcc683ceb0adcca6ba07544a1d91f0e5d2a4cf14c81eb14316ebf35" +SRC_URI[rustc-snapshot-powerpc64.sha256sum] = "f5bff79d517e2f721839462881331bdc1b8323a434f4ebe0529f93213adb2a24" + +SRC_URI[cargo-snapshot-powerpc64le.sha256sum] = "29fa2e003f4bf3e37a3fb506d5b7ab19eb6412b5966d865e082b354637d5d84a" +SRC_URI[rust-std-snapshot-powerpc64le.sha256sum] = "4c64a09be872b5832b50d681fbe29691b6a5d3e23ee5535020fa22b8b453c770" +SRC_URI[rustc-snapshot-powerpc64le.sha256sum] = "3b4322b519b0f7fbcf88511b2061be1499921517d810d7696be58a16467d4589" + +SRC_URI[cargo-snapshot-riscv64gc.sha256sum] = "f362cf575fde92f988d5b1fe19fd463a1905d8d2a3844168034df49b1dffb10b" +SRC_URI[rust-std-snapshot-riscv64gc.sha256sum] = "776eff6f451845e88224714ee6da7819e34f01b7625bf927394c2b91e5c8243c" +SRC_URI[rustc-snapshot-riscv64gc.sha256sum] = "84bea70d3acb6af04ae4c0f49f904bba4e2644b92c5996aacbafd7610dd0e147" + +SRC_URI[cargo-snapshot-s390x.sha256sum] = "f69ea091fa1ee4871a46cb9fa1da5b81fa2980687f3bedbc4677a4a82f8da0c0" +SRC_URI[rust-std-snapshot-s390x.sha256sum] = "51d1567e1d28e43c2165886f5a4955dcdaa41aa5ddcec5fb08200491fd1f6062" +SRC_URI[rustc-snapshot-s390x.sha256sum] = "25a047db8ec0627bb7054eafe6edca6ce4c473b30d6766b30cbff1c536d0673b" + +SRC_URI[cargo-snapshot-x86_64.sha256sum] = "a636f83eb2327a66f484b9592ab305c6642df16fc80d0d1cb727e766a60da904" +SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "c5e2c9b160bd8d99514f13cfbc0e42a722fd9ca14e6aaca4b9b77731a7a48377" +SRC_URI[rustc-snapshot-x86_64.sha256sum] = "242855e2626860aede6957dc56481cc02acf8cad12fa5bbbcbd93f9c51f0b3ad" + +SRC_URI[rust-std-snapshot-i586.sha256sum] = "90eb8e2490283930e682b79842d664d4867414563353d53dafc47eccf44aea17" + +SRC_URI[rust-std-snapshot-sparc64.sha256sum] = "3aee03fa61c28bb242023efb09a22e38a76b075cc72bcad9894560be8b28a927" SRC_URI += " \ - https://static.rust-lang.org/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${RUST_BUILD_ARCH};subdir=rust-snapshot-components \ - https://static.rust-lang.org/dist/${RUSTC_SNAPSHOT}.tar.xz;name=rustc-snapshot-${RUST_BUILD_ARCH};subdir=rust-snapshot-components \ - https://static.rust-lang.org/dist/${CARGO_SNAPSHOT}.tar.xz;name=cargo-snapshot-${RUST_BUILD_ARCH};subdir=rust-snapshot-components \ + ${RUST_DIST_SERVER}/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${RUST_BUILD_ARCH};subdir=rust-snapshot-components \ + ${RUST_DIST_SERVER}/dist/${RUSTC_SNAPSHOT}.tar.xz;name=rustc-snapshot-${RUST_BUILD_ARCH};subdir=rust-snapshot-components \ + ${RUST_DIST_SERVER}/dist/${CARGO_SNAPSHOT}.tar.xz;name=cargo-snapshot-${RUST_BUILD_ARCH};subdir=rust-snapshot-components \ " +RUST_DIST_SERVER = "https://static.rust-lang.org" + RUST_STD_SNAPSHOT = "rust-std-${SNAPSHOT_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu" RUSTC_SNAPSHOT = "rustc-${SNAPSHOT_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu" CARGO_SNAPSHOT = "cargo-${SNAPSHOT_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu" diff --git a/poky/meta/recipes-devtools/rust/rust-source.inc b/poky/meta/recipes-devtools/rust/rust-source.inc index 22e97174a9..268e17bcf8 100644 --- a/poky/meta/recipes-devtools/rust/rust-source.inc +++ b/poky/meta/recipes-devtools/rust/rust-source.inc @@ -7,7 +7,7 @@ SRC_URI += "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n file://0001-Do-not-use-LFS64-on-linux-with-musl.patch;patchdir=${RUSTSRC} \ file://zlib-off64_t.patch;patchdir=${RUSTSRC} \ " -SRC_URI[rust.sha256sum] = "07ac4e6c93e0d8ecfaf3b86c4c78bbbde3f5be675f0334e7fb343cb4a0b81ebe" +SRC_URI[rust.sha256sum] = "9ef8cf88a1d35d319808daf2f193aadca9ed9bcae1d4d5db8946a448c9432c6d" RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src" diff --git a/poky/meta/recipes-devtools/rust/rust_1.66.1.bb b/poky/meta/recipes-devtools/rust/rust_1.67.0.bb index eba933dded..2118faec8f 100644 --- a/poky/meta/recipes-devtools/rust/rust_1.66.1.bb +++ b/poky/meta/recipes-devtools/rust/rust_1.67.0.bb @@ -2,7 +2,7 @@ SUMMARY = "Rust compiler and runtime libaries" HOMEPAGE = "http://www.rust-lang.org" SECTION = "devel" LICENSE = "(MIT | Apache-2.0) & Unicode-TOU" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=92289ed52a60b63ab715612ad2915603" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=c2cccf560306876da3913d79062a54b9" inherit rust inherit cargo_common @@ -83,7 +83,7 @@ python do_configure() { config = configparser.RawConfigParser() # [target.ARCH-poky-linux] - host_section = "target.{}".format(d.getVar('RUST_HOST_SYS', True)) + host_section = "target.{}".format(d.getVar('RUST_HOST_SYS')) config.add_section(host_section) llvm_config_target = d.expand("${RUST_ALTERNATE_EXE_PATH}") @@ -98,7 +98,7 @@ python do_configure() { # If we don't do this rust-native will compile it's own llvm for BUILD. # [target.${BUILD_ARCH}-unknown-linux-gnu] - build_section = "target.{}".format(d.getVar('RUST_BUILD_SYS', True)) + build_section = "target.{}".format(d.getVar('RUST_BUILD_SYS')) if build_section != host_section: config.add_section(build_section) @@ -108,7 +108,7 @@ python do_configure() { config.set(build_section, "cc", e(d.expand("${RUST_BUILD_CC}"))) config.set(build_section, "linker", e(d.expand("${RUST_BUILD_CCLD}"))) - target_section = "target.{}".format(d.getVar('RUST_TARGET_SYS', True)) + target_section = "target.{}".format(d.getVar('RUST_TARGET_SYS')) if target_section != host_section and target_section != build_section: config.add_section(target_section) @@ -154,26 +154,26 @@ python do_configure() { config.set("build", "vendor", e(True)) if not "targets" in locals(): - targets = [d.getVar("RUST_TARGET_SYS", True)] + targets = [d.getVar("RUST_TARGET_SYS")] config.set("build", "target", e(targets)) if not "hosts" in locals(): - hosts = [d.getVar("RUST_HOST_SYS", True)] + hosts = [d.getVar("RUST_HOST_SYS")] config.set("build", "host", e(hosts)) # We can't use BUILD_SYS since that is something the rust snapshot knows # nothing about when trying to build some stage0 tools (like fabricate) - config.set("build", "build", e(d.getVar("RUST_BUILD_SYS", True))) + config.set("build", "build", e(d.getVar("RUST_BUILD_SYS"))) # [install] config.add_section("install") # ./x.py install doesn't have any notion of "destdir" # but we can prepend ${D} to all the directories instead - config.set("install", "prefix", e(d.getVar("D", True) + d.getVar("prefix", True))) - config.set("install", "bindir", e(d.getVar("D", True) + d.getVar("bindir", True))) - config.set("install", "libdir", e(d.getVar("D", True) + d.getVar("libdir", True))) - config.set("install", "datadir", e(d.getVar("D", True) + d.getVar("datadir", True))) - config.set("install", "mandir", e(d.getVar("D", True) + d.getVar("mandir", True))) + config.set("install", "prefix", e(d.getVar("D") + d.getVar("prefix"))) + config.set("install", "bindir", e(d.getVar("D") + d.getVar("bindir"))) + config.set("install", "libdir", e(d.getVar("D") + d.getVar("libdir"))) + config.set("install", "datadir", e(d.getVar("D") + d.getVar("datadir"))) + config.set("install", "mandir", e(d.getVar("D") + d.getVar("mandir"))) with open("config.toml", "w") as f: f.write('changelog-seen = 2\n\n') @@ -289,6 +289,66 @@ rust_do_install:class-target() { rm ${D}${libdir}/rustlib/manifest* } +addtask do_update_snapshot after do_patch +do_update_snapshot[nostamp] = "1" + +# Run with `bitbake -c update_snapshot rust` to update `rust-snapshot.inc` +# with the checksums for the rust snapshot associated with this rustc-src +# tarball. +python do_update_snapshot() { + import json + import re + import sys + + from collections import defaultdict + + with open(os.path.join(d.getVar("S"), "src", "stage0.json")) as f: + j = json.load(f) + + config_dist_server = j['config']['dist_server'] + compiler_date = j['compiler']['date'] + compiler_version = j['compiler']['version'] + + src_uri = defaultdict(list) + for k, v in j['checksums_sha256'].items(): + m = re.search(f"dist/{compiler_date}/(?P<component>.*)-{compiler_version}-(?P<arch>.*)-unknown-linux-gnu\\.tar\\.xz", k) + if m: + component = m.group('component') + arch = m.group('arch') + src_uri[arch].append(f"SRC_URI[{component}-snapshot-{arch}.sha256sum] = \"{v}\"") + + snapshot = """\ +## This is information on the rust-snapshot (binary) used to build our current release. +## snapshot info is taken from rust/src/stage0.json +## Rust is self-hosting and bootstraps itself with a pre-built previous version of itself. +## The exact (previous) version that has been used is specified in the source tarball. +## The version is replicated here. + +SNAPSHOT_VERSION = "%s" + +""" % compiler_version + + for arch, components in src_uri.items(): + snapshot += "\n".join(components) + "\n\n" + + snapshot += """\ +SRC_URI += " \\ + ${RUST_DIST_SERVER}/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${RUST_BUILD_ARCH};subdir=rust-snapshot-components \\ + ${RUST_DIST_SERVER}/dist/${RUSTC_SNAPSHOT}.tar.xz;name=rustc-snapshot-${RUST_BUILD_ARCH};subdir=rust-snapshot-components \\ + ${RUST_DIST_SERVER}/dist/${CARGO_SNAPSHOT}.tar.xz;name=cargo-snapshot-${RUST_BUILD_ARCH};subdir=rust-snapshot-components \\ +" + +RUST_DIST_SERVER = "%s" + +RUST_STD_SNAPSHOT = "rust-std-${SNAPSHOT_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu" +RUSTC_SNAPSHOT = "rustc-${SNAPSHOT_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu" +CARGO_SNAPSHOT = "cargo-${SNAPSHOT_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu" +""" % config_dist_server + + with open(os.path.join(d.getVar("THISDIR"), "rust-snapshot.inc"), "w") as f: + f.write(snapshot) +} + RUSTLIB_DEP:class-nativesdk = "" # musl builds include libunwind.a diff --git a/poky/meta/recipes-devtools/valgrind/valgrind/remove-for-all b/poky/meta/recipes-devtools/valgrind/valgrind/remove-for-all index a26837d297..5d1e7ed102 100644 --- a/poky/meta/recipes-devtools/valgrind/valgrind/remove-for-all +++ b/poky/meta/recipes-devtools/valgrind/valgrind/remove-for-all @@ -2,6 +2,7 @@ none/tests/amd64/fb_test_amd64 gdbserver_tests/hginfo memcheck/tests/supp_unknown helgrind/tests/tls_threads +helgrind/tests/pth_mempcpy_false_races drd/tests/bar_bad_xml drd/tests/pth_barrier_thr_cr drd/tests/std_thread2 diff --git a/poky/meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch b/poky/meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch index aac1c43465..8b88c308f2 100644 --- a/poky/meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch +++ b/poky/meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch @@ -1,4 +1,4 @@ -From bd7fb8be2ae2d75347cf7733302d5093046ffa85 Mon Sep 17 00:00:00 2001 +From 027229d25392b22d7280c0abbc3efde4f467d167 Mon Sep 17 00:00:00 2001 From: Peiran Hong <peiran.hong@windriver.com> Date: Thu, 5 Sep 2019 15:42:22 -0400 Subject: [PATCH] Skip strip-trailing-cr test case @@ -10,19 +10,21 @@ package. Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Peiran Hong <peiran.hong@windriver.com> + --- tests/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am -index 83a7c9d..04d51b5 100644 +index d98df82..757ea52 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -21,8 +21,10 @@ TESTS = \ +@@ -21,9 +21,11 @@ TESTS = \ stdin \ strcoll-0-names \ filename-quoting \ - strip-trailing-cr \ + timezone \ colors +# Skipping this test since it requires valgrind +# and thus is too heavy for diffutils package @@ -30,6 +32,3 @@ index 83a7c9d..04d51b5 100644 XFAIL_TESTS = large-subopt --- -2.21.0 - diff --git a/poky/meta/recipes-extended/diffutils/diffutils/0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch b/poky/meta/recipes-extended/diffutils/diffutils/0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch deleted file mode 100644 index 4928e1eaff..0000000000 --- a/poky/meta/recipes-extended/diffutils/diffutils/0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f385ad6639380eb6dfa8b8eb4a5ba65dd12db744 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 25 Mar 2022 13:43:19 -0700 -Subject: [PATCH] mcontext is not a standard layout so glibc and musl differ - -This is already applied to libsigsegv upstream, hopefully next version -of grep will update its internal copy and we can drop this patch - -Upstream-Status: Backport [https://git.savannah.gnu.org/gitweb/?p=libsigsegv.git;a=commitdiff;h=a6ff69873110c0a8ba6f7fd90532dbc11224828c] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - lib/sigsegv.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/sigsegv.c b/lib/sigsegv.c -index 998c827..b6f4841 100644 ---- a/lib/sigsegv.c -+++ b/lib/sigsegv.c -@@ -219,8 +219,8 @@ int libsigsegv_version = LIBSIGSEGV_VERSION; - # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gp_regs[1] - # else /* 32-bit */ - /* both should be equivalent */ --# if 0 --# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1] -+# if ! defined __GLIBC__ -+# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_regs->gregs[1] - # else - # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1] - # endif --- -2.35.1 - diff --git a/poky/meta/recipes-extended/diffutils/diffutils_3.8.bb b/poky/meta/recipes-extended/diffutils/diffutils_3.9.bb index 8889c83ee2..2bb9e6f32d 100644 --- a/poky/meta/recipes-extended/diffutils/diffutils_3.8.bb +++ b/poky/meta/recipes-extended/diffutils/diffutils_3.9.bb @@ -6,10 +6,9 @@ require diffutils.inc SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz \ file://run-ptest \ file://0001-Skip-strip-trailing-cr-test-case.patch \ - file://0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch \ " -SRC_URI[sha256sum] = "a6bdd7d1b31266d11c4f4de6c1b748d4607ab0231af5188fc2533d0ae2438fec" +SRC_URI[sha256sum] = "d80d3be90a201868de83d78dad3413ad88160cc53bcc36eb9eaf7c20dbf023f1" EXTRA_OECONF += "ac_cv_path_PR_PROGRAM=${bindir}/pr --without-libsigsegv-prefix" diff --git a/poky/meta/recipes-extended/lighttpd/lighttpd/fix-missing-test.patch b/poky/meta/recipes-extended/lighttpd/lighttpd/fix-missing-test.patch new file mode 100644 index 0000000000..6aa843b75d --- /dev/null +++ b/poky/meta/recipes-extended/lighttpd/lighttpd/fix-missing-test.patch @@ -0,0 +1,23 @@ +From d809433d6d900e899f796606b11bdc6a73413ac5 Mon Sep 17 00:00:00 2001 +From: Glenn Strauss <gstrauss@gluelogic.com> +Date: Tue, 3 Jan 2023 17:50:16 -0500 +Subject: [PATCH] [meson] remove t/test_mod_evasive.c + +Upstream-Status: Backport [https://github.com/lighttpd/lighttpd1.4/commit/d809433d6d900e899f796606b11bdc6a73413ac5] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + src/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/meson.build b/src/meson.build +index ff472c320..77089fc3c 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -721,7 +721,6 @@ test('test_mod', executable('test_mod', + 't/test_mod.c', + 't/test_mod_access.c', + 't/test_mod_alias.c', +- 't/test_mod_evasive.c', + 't/test_mod_evhost.c', + 't/test_mod_indexfile.c', + 't/test_mod_simple_vhost.c', diff --git a/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.67.bb b/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.68.bb index 838881f238..a9163f8492 100644 --- a/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.67.bb +++ b/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.68.bb @@ -17,9 +17,10 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t file://index.html.lighttpd \ file://lighttpd.conf \ file://lighttpd \ + file://fix-missing-test.patch \ " -SRC_URI[sha256sum] = "7e04d767f51a8d824b32e2483ef2950982920d427d1272ef4667f49d6f89f358" +SRC_URI[sha256sum] = "e56f37ae52b63e1ada4d76ce78005affb6e56eea2f6bdb0ce17d6d36e9583384" DEPENDS = "virtual/crypt" @@ -27,19 +28,19 @@ PACKAGECONFIG ??= "openssl pcre zlib \ ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ " -PACKAGECONFIG[libev] = "-Dwith_libev=true,-Dwith_libev=false,libev" -PACKAGECONFIG[mysql] = "-Dwith_mysql=true,-Dwith_mysql=false,mariadb" -PACKAGECONFIG[ldap] = "-Dwith_ldap=true,-Dwith_ldap=false,openldap" +PACKAGECONFIG[libev] = "-Dwith_libev=enabled,-Dwith_libev=disabled,libev" +PACKAGECONFIG[mysql] = "-Dwith_mysql=enabled,-Dwith_mysql=disabled,mariadb" +PACKAGECONFIG[ldap] = "-Dwith_ldap=enabled,-Dwith_ldap=disabled,openldap" PACKAGECONFIG[attr] = "-Dwith_xattr=true,-Dwith_xattr=false,attr" PACKAGECONFIG[openssl] = "-Dwith_openssl=true,-Dwith_openssl=false,openssl" -PACKAGECONFIG[krb5] = "-Dwith_krb5=true,-Dwith_krb5=false,krb5" -PACKAGECONFIG[pcre] = "-Dwith_pcre=true,-Dwith_pcre=false,libpcre" -PACKAGECONFIG[zlib] = "-Dwith_zlib=true,-Dwith_zlib=false,zlib" -PACKAGECONFIG[bzip2] = "-Dwith_bzip=true,-Dwith_bzip=false,bzip2" -PACKAGECONFIG[webdav-props] = "-Dwith_webdav_props=true,-Dwith_webdav_props=false,libxml2 sqlite3" -PACKAGECONFIG[webdav-locks] = "-Dwith_webdav_locks=true,-Dwith_webdav_locks=false,util-linux" +PACKAGECONFIG[krb5] = "-Dwith_krb5=enabled,-Dwith_krb5=disabled,krb5" +PACKAGECONFIG[pcre] = "-Dwith_pcre=pcre2,-Dwith_pcre=disabled,libpcre2" +PACKAGECONFIG[zlib] = "-Dwith_zlib=enabled,-Dwith_zlib=disabled,zlib" +PACKAGECONFIG[bzip2] = "-Dwith_bzip=enabled,-Dwith_bzip=disabled,bzip2" +PACKAGECONFIG[webdav-props] = "-Dwith_webdav_props=enabled,-Dwith_webdav_props=disabled,libxml2 sqlite3" +PACKAGECONFIG[webdav-locks] = "-Dwith_webdav_locks=enabled,-Dwith_webdav_locks=disabled,util-linux" PACKAGECONFIG[lua] = "-Dwith_lua=true,-Dwith_lua=false,lua" -PACKAGECONFIG[zstd] = "-Dwith_zstd=true,-Dwith_zstd=false,zstd" +PACKAGECONFIG[zstd] = "-Dwith_zstd=enabled,-Dwith_zstd=disabled,zstd" inherit meson pkgconfig update-rc.d gettext systemd diff --git a/poky/meta/recipes-extended/lsof/lsof_4.96.5.bb b/poky/meta/recipes-extended/lsof/lsof_4.98.0.bb index 9f80176ee1..835ce3b8df 100644 --- a/poky/meta/recipes-extended/lsof/lsof_4.96.5.bb +++ b/poky/meta/recipes-extended/lsof/lsof_4.98.0.bb @@ -4,18 +4,18 @@ Its name stands for LiSt Open Files, and it does just that." HOMEPAGE = "http://people.freebsd.org/~abe/" SECTION = "devel" LICENSE = "Spencer-94" -LIC_FILES_CHKSUM = "file://00README;beginline=645;endline=679;md5=964df275d26429ba3b39dbb9f205172a" +LIC_FILES_CHKSUM = "file://COPYING;md5=a48ac97a8550eff12395a2c0d6151510" SRC_URI = "git://github.com/lsof-org/lsof;branch=master;protocol=https \ file://remove-host-information.patch" -SRCREV = "898916d4c7c390ea4610aebaf1d32b8a3c49f26b" +SRCREV = "546eb1c9910e7c137fdff551683c35a736021e05" S = "${WORKDIR}/git" inherit update-alternatives -ALTERNATIVE_${PN} = "lsof" +ALTERNATIVE:${PN} = "lsof" ALTERNATIVE_LINK_NAME[lsof] = "${sbindir}/lsof" # Make our priority higher than busybox ALTERNATIVE_PRIORITY = "100" @@ -38,7 +38,7 @@ export I = "${STAGING_INCDIR}" export L = "${STAGING_INCDIR}" do_compile () { - oe_runmake 'CC=${CC}' 'CFGL=${LDFLAGS} -L./lib -llsof' 'DEBUG=' 'INCL=${CFLAGS}' + oe_runmake 'CC=${CC}' 'CFGL=${LDFLAGS} -L./lib -llsof' 'DEBUG=' 'INCL=${CFLAGS} -I..' } do_install () { diff --git a/poky/meta/recipes-extended/ltp/ltp/0001-testcases-Fix-largefile-support.patch b/poky/meta/recipes-extended/ltp/ltp/0001-testcases-Fix-largefile-support.patch deleted file mode 100644 index e9b48c392f..0000000000 --- a/poky/meta/recipes-extended/ltp/ltp/0001-testcases-Fix-largefile-support.patch +++ /dev/null @@ -1,426 +0,0 @@ -From 3cca69b85c88c6eb4f02313b3c6a9e0f6cc0b5d7 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 14 Dec 2022 18:14:22 -0800 -Subject: [PATCH] testcases: Fix largefile support - -Use standard functions ( not 64-bit equivalents ) which operate on off_t -and pass -D_FILE_OFFSET_BITS=64 to enable LFS always so off_t is 64bit -for these tests. - -This helps making it portable across musl which has removed the 64bit -transition functions from _GNU_SOURCE namespace. - -Upstream-Status: Submitted [https://lists.linux.it/pipermail/ltp/2022-December/032310.html] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - testcases/kernel/io/direct_io/Makefile | 2 +- - testcases/kernel/io/direct_io/diotest2.c | 4 ++-- - testcases/kernel/io/direct_io/diotest5.c | 10 +++++----- - testcases/kernel/io/direct_io/diotest6.c | 4 ++-- - testcases/kernel/syscalls/fcntl/fcntl18.c | 6 +++--- - testcases/kernel/syscalls/fcntl/fcntl34.c | 2 +- - testcases/kernel/syscalls/fcntl/fcntl36.c | 4 ++-- - testcases/kernel/syscalls/llseek/Makefile | 2 ++ - testcases/kernel/syscalls/llseek/llseek01.c | 14 +++++++------- - testcases/kernel/syscalls/llseek/llseek02.c | 12 ++++++------ - testcases/kernel/syscalls/llseek/llseek03.c | 6 +++--- - testcases/kernel/syscalls/open/Makefile | 2 ++ - testcases/kernel/syscalls/open/open12.c | 6 +++--- - testcases/kernel/syscalls/openat/Makefile | 2 ++ - testcases/kernel/syscalls/openat/openat02.c | 6 +++--- - testcases/kernel/syscalls/sync_file_range/Makefile | 2 ++ - .../syscalls/sync_file_range/sync_file_range01.c | 4 ++-- - .../syscalls/sync_file_range/sync_file_range02.c | 6 +++--- - 18 files changed, 51 insertions(+), 43 deletions(-) - -diff --git a/testcases/kernel/io/direct_io/Makefile b/testcases/kernel/io/direct_io/Makefile -index 777f7b166..7480d7b0d 100644 ---- a/testcases/kernel/io/direct_io/Makefile -+++ b/testcases/kernel/io/direct_io/Makefile -@@ -5,7 +5,7 @@ top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/testcases.mk - --CFLAGS += -DSHARED_OFILE -D_GNU_SOURCE -+CFLAGS += -DSHARED_OFILE -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE - - LDLIBS += -lpthread - -diff --git a/testcases/kernel/io/direct_io/diotest2.c b/testcases/kernel/io/direct_io/diotest2.c -index c407c46ae..db47ee8ef 100644 ---- a/testcases/kernel/io/direct_io/diotest2.c -+++ b/testcases/kernel/io/direct_io/diotest2.c -@@ -78,7 +78,7 @@ int bufsize = BUFSIZE; - * For each iteration, write data starting at offse+iter*bufsize - * location in the file and read from there. - */ --int runtest(int fd_r, int fd_w, int iter, off64_t offset, int action) -+int runtest(int fd_r, int fd_w, int iter, off_t offset, int action) - { - char *buf1; - char *buf2; -@@ -136,7 +136,7 @@ static void cleanup(void); - int main(int argc, char *argv[]) - { - int iter = 100; /* Iterations. Default 100 */ -- off64_t offset = 0; /* Offset. Default 0 */ -+ off_t offset = 0; /* Offset. Default 0 */ - int i, action, fd_r, fd_w; - int fail_count = 0, total = 0, failed = 0; - -diff --git a/testcases/kernel/io/direct_io/diotest5.c b/testcases/kernel/io/direct_io/diotest5.c -index 9bf917c64..ac66f2a04 100644 ---- a/testcases/kernel/io/direct_io/diotest5.c -+++ b/testcases/kernel/io/direct_io/diotest5.c -@@ -75,14 +75,14 @@ int TST_TOTAL = 3; /* Total number of test conditions */ - static int bufsize = BUFSIZE; /* Buffer size. Default 4k */ - static int iter = 20; /* Iterations. Default 20 */ - static int nvector = 20; /* Vector array. Default 20 */ --static off64_t offset = 0; /* Start offset. Default 0 */ -+static off_t offset = 0; /* Start offset. Default 0 */ - static char filename[LEN]; /* Test data file */ - static int fd1 = -1; - /* - * runtest: Write the data in vector array to the file. Read the data - * from the file into another vectory array and verify. Repeat the test. - */ --int runtest(int fd_r, int fd_w, int iter, off64_t offset, int action) -+int runtest(int fd_r, int fd_w, int iter, off_t offset, int action) - { - int i; - struct iovec *iov1, *iov2, *iovp; -@@ -218,7 +218,7 @@ int main(int argc, char *argv[]) - tst_brkm(TBROK, cleanup, "fd_w open failed for %s: %s", - filename, strerror(errno)); - } -- if ((fd_r = open64(filename, O_DIRECT | O_RDONLY | O_CREAT, 0666)) < 0) { -+ if ((fd_r = open(filename, O_DIRECT | O_RDONLY | O_CREAT, 0666)) < 0) { - tst_brkm(TBROK, cleanup, "fd_r open failed for %s: %s", - filename, strerror(errno)); - } -@@ -240,7 +240,7 @@ int main(int argc, char *argv[]) - tst_brkm(TBROK, cleanup, "fd_w open failed for %s: %s", - filename, strerror(errno)); - } -- if ((fd_r = open64(filename, O_RDONLY | O_CREAT, 0666)) < 0) { -+ if ((fd_r = open(filename, O_RDONLY | O_CREAT, 0666)) < 0) { - tst_brkm(TBROK, cleanup, "fd_r open failed for %s: %s", - filename, strerror(errno)); - } -@@ -261,7 +261,7 @@ int main(int argc, char *argv[]) - tst_brkm(TBROK, cleanup, "fd_w open failed for %s: %s", - filename, strerror(errno)); - } -- if ((fd_r = open64(filename, O_DIRECT | O_RDONLY | O_CREAT, 0666)) < 0) { -+ if ((fd_r = open(filename, O_DIRECT | O_RDONLY | O_CREAT, 0666)) < 0) { - tst_brkm(TBROK, cleanup, "fd_r open failed for %s: %s", - filename, strerror(errno)); - } -diff --git a/testcases/kernel/io/direct_io/diotest6.c b/testcases/kernel/io/direct_io/diotest6.c -index a06e6b82b..1905380f0 100644 ---- a/testcases/kernel/io/direct_io/diotest6.c -+++ b/testcases/kernel/io/direct_io/diotest6.c -@@ -62,7 +62,7 @@ int TST_TOTAL = 3; - - static int iter = 100; - static int bufsize = BUFSIZE; --static off64_t offset = 0; -+static off_t offset = 0; - static int nvector = 20; - static char filename[LEN]; - static int fd1 = -1; -@@ -84,7 +84,7 @@ static void prg_usage(void) - */ - int runtest(int fd_r, int fd_w, int childnum, int action) - { -- off64_t seekoff; -+ off_t seekoff; - int i, ret = -1; - ssize_t n = 0; - struct iovec *iov_r, *iov_w; -diff --git a/testcases/kernel/syscalls/fcntl/fcntl18.c b/testcases/kernel/syscalls/fcntl/fcntl18.c -index 5eefbd128..1105dd393 100644 ---- a/testcases/kernel/syscalls/fcntl/fcntl18.c -+++ b/testcases/kernel/syscalls/fcntl/fcntl18.c -@@ -103,11 +103,11 @@ int main(int ac, char **av) - tst_resm(TINFO, "Enter block 2"); - fail = 0; - /* Error condition if address is bad */ -- retval = fcntl(fd, F_GETLK64, (struct flock *)INVAL_FLAG); -+ retval = fcntl(fd, F_GETLK, (struct flock *)INVAL_FLAG); - if (errno == EFAULT) { -- tst_resm(TPASS, "Test F_GETLK64: for errno EFAULT PASSED"); -+ tst_resm(TPASS, "Test F_GETLK: for errno EFAULT PASSED"); - } else { -- tst_resm(TFAIL, "Test F_GETLK64: for errno EFAULT FAILED"); -+ tst_resm(TFAIL, "Test F_GETLK: for errno EFAULT FAILED"); - fail = 1; - } - if (fail) { -diff --git a/testcases/kernel/syscalls/fcntl/fcntl34.c b/testcases/kernel/syscalls/fcntl/fcntl34.c -index 3442114ff..536dead29 100644 ---- a/testcases/kernel/syscalls/fcntl/fcntl34.c -+++ b/testcases/kernel/syscalls/fcntl/fcntl34.c -@@ -54,7 +54,7 @@ void *thread_fn_01(void *arg) - - memset(buf, (intptr_t)arg, write_size); - -- struct flock64 lck = { -+ struct flock lck = { - .l_whence = SEEK_SET, - .l_start = 0, - .l_len = 1, -diff --git a/testcases/kernel/syscalls/fcntl/fcntl36.c b/testcases/kernel/syscalls/fcntl/fcntl36.c -index d6b07fc41..4e4d48afc 100644 ---- a/testcases/kernel/syscalls/fcntl/fcntl36.c -+++ b/testcases/kernel/syscalls/fcntl/fcntl36.c -@@ -72,7 +72,7 @@ static void *fn_ofd_w(void *arg) - int fd = SAFE_OPEN(fname, O_RDWR); - long wt = pa->cnt; - -- struct flock64 lck = { -+ struct flock lck = { - .l_whence = SEEK_SET, - .l_start = pa->offset, - .l_len = pa->length, -@@ -151,7 +151,7 @@ static void *fn_ofd_r(void *arg) - int i; - int fd = SAFE_OPEN(fname, O_RDWR); - -- struct flock64 lck = { -+ struct flock lck = { - .l_whence = SEEK_SET, - .l_start = pa->offset, - .l_len = pa->length, -diff --git a/testcases/kernel/syscalls/llseek/Makefile b/testcases/kernel/syscalls/llseek/Makefile -index 044619fb8..8a916d0fa 100644 ---- a/testcases/kernel/syscalls/llseek/Makefile -+++ b/testcases/kernel/syscalls/llseek/Makefile -@@ -6,3 +6,5 @@ top_srcdir ?= ../../../.. - include $(top_srcdir)/include/mk/testcases.mk - - include $(top_srcdir)/include/mk/generic_leaf_target.mk -+ -+CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -diff --git a/testcases/kernel/syscalls/llseek/llseek01.c b/testcases/kernel/syscalls/llseek/llseek01.c -index 50f35493d..efb444dc8 100644 ---- a/testcases/kernel/syscalls/llseek/llseek01.c -+++ b/testcases/kernel/syscalls/llseek/llseek01.c -@@ -4,7 +4,7 @@ - * 07/2001 Ported by Wayne Boyer - */ - /* -- * Verify that lseek64() call succeeds to set the file pointer position to an -+ * Verify that lseek() call succeeds to set the file pointer position to an - * offset larger than file size limit (RLIMIT_FSIZE). Also, verify that any - * attempt to write to this location fails. - */ -@@ -27,22 +27,22 @@ static int fildes; - - static void verify_llseek(void) - { -- TEST(lseek64(fildes, (loff_t) (80 * BUFSIZ), SEEK_SET)); -+ TEST(lseek(fildes, (loff_t) (80 * BUFSIZ), SEEK_SET)); - if (TST_RET == (80 * BUFSIZ)) -- tst_res(TPASS, "lseek64() can set file pointer position larger than file size limit"); -+ tst_res(TPASS, "lseek() can set file pointer position larger than file size limit"); - else -- tst_res(TFAIL, "lseek64() returned wrong value %ld when write past file size", TST_RET); -+ tst_res(TFAIL, "lseek() returned wrong value %ld when write past file size", TST_RET); - - if (write(fildes, write_buff, BUFSIZ) == -1) - tst_res(TPASS,"write failed after file size limit"); - else - tst_brk(TFAIL, "write successful after file size limit"); - -- TEST(lseek64(fildes, (loff_t) BUFSIZ, SEEK_SET)); -+ TEST(lseek(fildes, (loff_t) BUFSIZ, SEEK_SET)); - if (TST_RET == BUFSIZ) -- tst_res(TPASS,"lseek64() can set file pointer position under filer size limit"); -+ tst_res(TPASS,"lseek() can set file pointer position under filer size limit"); - else -- tst_brk(TFAIL,"lseek64() returns wrong value %ld when write under file size", TST_RET); -+ tst_brk(TFAIL,"lseek() returns wrong value %ld when write under file size", TST_RET); - - if (write(fildes, write_buff, BUFSIZ) != -1) - tst_res(TPASS, "write succcessfully under file size limit"); -diff --git a/testcases/kernel/syscalls/llseek/llseek02.c b/testcases/kernel/syscalls/llseek/llseek02.c -index 3d9c21fc9..5431969f9 100644 ---- a/testcases/kernel/syscalls/llseek/llseek02.c -+++ b/testcases/kernel/syscalls/llseek/llseek02.c -@@ -5,8 +5,8 @@ - */ - /* - * Description: -- * 1) lseek64(2) fails and sets errno to EINVAL when whence is invalid. -- * 2) lseek64(2) fails ans sets errno to EBADF when fd is not an open -+ * 1) lseek(2) fails and sets errno to EINVAL when whence is invalid. -+ * 2) lseek(2) fails ans sets errno to EBADF when fd is not an open - * file descriptor. - */ - -@@ -39,17 +39,17 @@ static void verify_llseek(unsigned int n) - { - struct tcase *tc = &tcases[n]; - -- TEST(lseek64(*tc->fd, (loff_t) 1, tc->whence)); -+ TEST(lseek(*tc->fd, (loff_t) 1, tc->whence)); - if (TST_RET != (off_t) -1) { -- tst_res(TFAIL, "lseek64(%d, 1, %d) succeeded unexpectedly (%ld)", -+ tst_res(TFAIL, "lseek(%d, 1, %d) succeeded unexpectedly (%ld)", - *tc->fd, tc->whence, TST_RET); - return; - } - if (TST_ERR == tc->exp_err) { -- tst_res(TPASS | TTERRNO, "lseek64(%d, 1, %d) failed as expected", -+ tst_res(TPASS | TTERRNO, "lseek(%d, 1, %d) failed as expected", - *tc->fd, tc->whence); - } else { -- tst_res(TFAIL | TTERRNO, "lseek64(%d, 1, %d) failed " -+ tst_res(TFAIL | TTERRNO, "lseek(%d, 1, %d) failed " - "unexpectedly, expected %s", *tc->fd, tc->whence, - tst_strerrno(tc->exp_err)); - } -diff --git a/testcases/kernel/syscalls/llseek/llseek03.c b/testcases/kernel/syscalls/llseek/llseek03.c -index d780f2af6..6c34119e5 100644 ---- a/testcases/kernel/syscalls/llseek/llseek03.c -+++ b/testcases/kernel/syscalls/llseek/llseek03.c -@@ -72,7 +72,7 @@ static const char *str_whence(int whence) - } - } - --static void verify_lseek64(unsigned int n) -+static void verify_lseek(unsigned int n) - { - struct tcase *tc = &tcases[n]; - char read_buf[128]; -@@ -82,7 +82,7 @@ static void verify_lseek64(unsigned int n) - - SAFE_READ(1, fd, read_buf, 4); - -- TEST(lseek64(fd, tc->off, tc->whence)); -+ TEST(lseek(fd, tc->off, tc->whence)); - - if (TST_RET == -1) { - tst_res(TFAIL | TTERRNO, "llseek failed on %s ", TEST_FILE); -@@ -121,6 +121,6 @@ exit: - static struct tst_test test = { - .needs_tmpdir = 1, - .setup = setup, -- .test = verify_lseek64, -+ .test = verify_lseek, - .tcnt = ARRAY_SIZE(tcases), - }; -diff --git a/testcases/kernel/syscalls/open/Makefile b/testcases/kernel/syscalls/open/Makefile -index 044619fb8..8a916d0fa 100644 ---- a/testcases/kernel/syscalls/open/Makefile -+++ b/testcases/kernel/syscalls/open/Makefile -@@ -6,3 +6,5 @@ top_srcdir ?= ../../../.. - include $(top_srcdir)/include/mk/testcases.mk - - include $(top_srcdir)/include/mk/generic_leaf_target.mk -+ -+CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -diff --git a/testcases/kernel/syscalls/open/open12.c b/testcases/kernel/syscalls/open/open12.c -index bdf29a9a8..c840de53d 100644 ---- a/testcases/kernel/syscalls/open/open12.c -+++ b/testcases/kernel/syscalls/open/open12.c -@@ -233,14 +233,14 @@ static void test_cloexec(void) - static void test_largefile(void) - { - int fd; -- off64_t offset; -+ off_t offset; - - fd = SAFE_OPEN(cleanup, LARGE_FILE, - O_LARGEFILE | O_RDWR | O_CREAT, 0777); - -- offset = lseek64(fd, 4.1*1024*1024*1024, SEEK_SET); -+ offset = lseek(fd, 4.1*1024*1024*1024, SEEK_SET); - if (offset == -1) -- tst_brkm(TBROK | TERRNO, cleanup, "lseek64 failed"); -+ tst_brkm(TBROK | TERRNO, cleanup, "lseek failed"); - - SAFE_WRITE(cleanup, 1, fd, LARGE_FILE, sizeof(LARGE_FILE)); - -diff --git a/testcases/kernel/syscalls/openat/Makefile b/testcases/kernel/syscalls/openat/Makefile -index 044619fb8..8a916d0fa 100644 ---- a/testcases/kernel/syscalls/openat/Makefile -+++ b/testcases/kernel/syscalls/openat/Makefile -@@ -6,3 +6,5 @@ top_srcdir ?= ../../../.. - include $(top_srcdir)/include/mk/testcases.mk - - include $(top_srcdir)/include/mk/generic_leaf_target.mk -+ -+CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -diff --git a/testcases/kernel/syscalls/openat/openat02.c b/testcases/kernel/syscalls/openat/openat02.c -index 2ce119033..f6113852a 100644 ---- a/testcases/kernel/syscalls/openat/openat02.c -+++ b/testcases/kernel/syscalls/openat/openat02.c -@@ -22,7 +22,7 @@ - * 2)openat() succeeds to enable the close-on-exec flag for a - * file descriptor, when 'flags' is set to O_CLOEXEC. - * 3)openat() succeeds to allow files whose sizes cannot be -- * represented in an off_t but can be represented in an off64_t -+ * represented in an off_t but can be represented in an off_t - * to be opened, when 'flags' is set to O_LARGEFILE. - * 4)openat() succeeds to not update the file last access time - * (st_atime in the inode) when the file is read, when 'flags' -@@ -193,12 +193,12 @@ void testfunc_cloexec(void) - void testfunc_largefile(void) - { - int fd; -- off64_t offset; -+ off_t offset; - - fd = SAFE_OPEN(cleanup, LARGE_FILE, - O_LARGEFILE | O_RDWR | O_CREAT, 0777); - -- offset = lseek64(fd, 4.1*1024*1024*1024, SEEK_SET); -+ offset = lseek(fd, 4.1*1024*1024*1024, SEEK_SET); - if (offset == -1) - tst_brkm(TBROK | TERRNO, cleanup, "lseek64 failed"); - -diff --git a/testcases/kernel/syscalls/sync_file_range/Makefile b/testcases/kernel/syscalls/sync_file_range/Makefile -index 044619fb8..8a916d0fa 100644 ---- a/testcases/kernel/syscalls/sync_file_range/Makefile -+++ b/testcases/kernel/syscalls/sync_file_range/Makefile -@@ -6,3 +6,5 @@ top_srcdir ?= ../../../.. - include $(top_srcdir)/include/mk/testcases.mk - - include $(top_srcdir)/include/mk/generic_leaf_target.mk -+ -+CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -diff --git a/testcases/kernel/syscalls/sync_file_range/sync_file_range01.c b/testcases/kernel/syscalls/sync_file_range/sync_file_range01.c -index 187ef6071..47188aa48 100644 ---- a/testcases/kernel/syscalls/sync_file_range/sync_file_range01.c -+++ b/testcases/kernel/syscalls/sync_file_range/sync_file_range01.c -@@ -44,8 +44,8 @@ static int bfd = -1; - - struct test_case { - int *fd; -- off64_t offset; -- off64_t nbytes; -+ off_t offset; -+ off_t nbytes; - unsigned int flags; - int error; - } tcases[] = { -diff --git a/testcases/kernel/syscalls/sync_file_range/sync_file_range02.c b/testcases/kernel/syscalls/sync_file_range/sync_file_range02.c -index 5da751c70..28a8156c8 100644 ---- a/testcases/kernel/syscalls/sync_file_range/sync_file_range02.c -+++ b/testcases/kernel/syscalls/sync_file_range/sync_file_range02.c -@@ -31,10 +31,10 @@ - - struct testcase { - char *fname; -- off64_t sync_off; -- off64_t sync_size; -+ off_t sync_off; -+ off_t sync_size; - size_t exp_sync_size; -- off64_t write_off; -+ off_t write_off; - size_t write_size_mb; - const char *desc; - }; diff --git a/poky/meta/recipes-extended/ltp/ltp_20220930.bb b/poky/meta/recipes-extended/ltp/ltp_20230127.bb index 568a6320c1..4325aa6672 100644 --- a/poky/meta/recipes-extended/ltp/ltp_20220930.bb +++ b/poky/meta/recipes-extended/ltp/ltp_20230127.bb @@ -24,12 +24,11 @@ TUNE_CCARGS:remove:x86-64 = "-mfpmath=sse" CFLAGS:append:powerpc64 = " -D__SANE_USERSPACE_TYPES__" CFLAGS:append:mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" -SRCREV = "b763f81998f19f783982d3937d1fd05bcf649c16" +SRCREV = "dd2d61ac1a1e09797a6165f478abd4a9f4f43035" 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-Fix-largefile-support.patch \ " S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-extended/mc/files/0001-mc-replace-perl-w-with-use-warnings.patch b/poky/meta/recipes-extended/mc/files/0001-mc-replace-perl-w-with-use-warnings.patch index 012a499684..5ede82d342 100644 --- a/poky/meta/recipes-extended/mc/files/0001-mc-replace-perl-w-with-use-warnings.patch +++ b/poky/meta/recipes-extended/mc/files/0001-mc-replace-perl-w-with-use-warnings.patch @@ -1,4 +1,4 @@ -From cdc7c278212ae836eecb4cc9d42c29443cc128a0 Mon Sep 17 00:00:00 2001 +From 62c86b69106d0d702167ba1b963ea1c201cce5af Mon Sep 17 00:00:00 2001 From: Robert Yang <liezhi.yang@windriver.com> Date: Thu, 6 Apr 2017 02:24:28 -0700 Subject: [PATCH] mc: replace "perl -w" with "use warnings" @@ -20,6 +20,7 @@ The man2hlp.in already has "use warnings;", so just remove '-w' is OK. Upstream-Status: Submitted [https://github.com/MidnightCommander/mc/pull/174] Signed-off-by: Robert Yang <liezhi.yang@windriver.com> + --- src/man2hlp/man2hlp.in | 2 +- src/vfs/extfs/helpers/a+.in | 4 +++- @@ -30,12 +31,12 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com> 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/man2hlp/man2hlp.in b/src/man2hlp/man2hlp.in -index f095830..558a674 100644 +index 08765d8..8aa7131 100644 --- a/src/man2hlp/man2hlp.in +++ b/src/man2hlp/man2hlp.in @@ -1,4 +1,4 @@ --#! @PERL@ -w -+#! @PERL@ +-#! @PERL_FOR_BUILD@ -w ++#! @PERL_FOR_BUILD@ # # Man page to help file converter # Copyright (C) 1994, 1995, 1998, 2000, 2001, 2002, 2003, 2004, 2005, @@ -59,7 +60,7 @@ index 579441c..fe446f4 100644 $_ = shift(@_); s/([^\w\/.+-])/\\$1/g; diff --git a/src/vfs/extfs/helpers/mailfs.in b/src/vfs/extfs/helpers/mailfs.in -index e9455be..059f41f 100644 +index 4bdd68b..5bb373b 100644 --- a/src/vfs/extfs/helpers/mailfs.in +++ b/src/vfs/extfs/helpers/mailfs.in @@ -1,6 +1,7 @@ @@ -72,7 +73,7 @@ index e9455be..059f41f 100644 # MC extfs for (possibly compressed) Berkeley style mailbox files # Peter Daum <gator@cs.tu-berlin.de> (Jan 1998, mc-4.1.24) diff --git a/src/vfs/extfs/helpers/patchfs.in b/src/vfs/extfs/helpers/patchfs.in -index ef407de..3ad4b53 100644 +index c20cd54..1f1e75b 100644 --- a/src/vfs/extfs/helpers/patchfs.in +++ b/src/vfs/extfs/helpers/patchfs.in @@ -1,4 +1,4 @@ @@ -107,7 +108,7 @@ index 418611f..82c7ccf 100644 'apr' => '04', 'may' => '05', 'jun' => '06', 'jul' => '07', 'aug' => '08', 'sep' => '09', diff --git a/src/vfs/extfs/helpers/uzip.in b/src/vfs/extfs/helpers/uzip.in -index b1c4f90..c8eb335 100644 +index c468f3a..ceffb53 100644 --- a/src/vfs/extfs/helpers/uzip.in +++ b/src/vfs/extfs/helpers/uzip.in @@ -1,4 +1,4 @@ @@ -124,6 +125,3 @@ index b1c4f90..c8eb335 100644 # # Configuration options --- -2.10.2 - diff --git a/poky/meta/recipes-extended/mc/files/nomandate.patch b/poky/meta/recipes-extended/mc/files/nomandate.patch index c01d065b0e..4ebaaa2fa7 100644 --- a/poky/meta/recipes-extended/mc/files/nomandate.patch +++ b/poky/meta/recipes-extended/mc/files/nomandate.patch @@ -1,4 +1,4 @@ -From f02010965af21db018c4e108b2193c872406a314 Mon Sep 17 00:00:00 2001 +From 4482ed0b8bd506cc2590ceacfdada6cc34450796 Mon Sep 17 00:00:00 2001 From: Richard Purdie <richard.purdie@linuxfoundation.org> Date: Tue, 4 Feb 2020 18:12:15 +0000 Subject: [PATCH] mc: Fix manpage date indeterminism @@ -21,7 +21,7 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/man/date-of-man-include.am b/doc/man/date-of-man-include.am -index 3a4e599..f11e9b3 100644 +index c6b1e69..165a796 100644 --- a/doc/man/date-of-man-include.am +++ b/doc/man/date-of-man-include.am @@ -1,5 +1,5 @@ @@ -29,5 +29,5 @@ index 3a4e599..f11e9b3 100644 - -e "s/%DATE_OF_MAN_PAGE%/$${MAN_DATE}/g" \ + -e "s/%DATE_OF_MAN_PAGE%//g" \ -e "s/%MAN_VERSION%/@MAN_VERSION@/g" \ - -e "s{%prefix%{@prefix@{g" \ -e "s{%sysconfdir%{@sysconfdir@{g" \ + -e "s{%libexecdir%{@libexecdir@{g" \ diff --git a/poky/meta/recipes-extended/mc/mc_4.8.28.bb b/poky/meta/recipes-extended/mc/mc_4.8.29.bb index 9a950a8cd0..c9db172183 100644 --- a/poky/meta/recipes-extended/mc/mc_4.8.28.bb +++ b/poky/meta/recipes-extended/mc/mc_4.8.29.bb @@ -12,7 +12,7 @@ SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ file://0001-mc-replace-perl-w-with-use-warnings.patch \ file://nomandate.patch \ " -SRC_URI[sha256sum] = "6bb47533d7a55bb21e46292d2f94786c9037bd7a70bf02b6a3c48adb0c9ce20c" +SRC_URI[sha256sum] = "ba6b2d8752806ac23fe045c1b081eb66dcefa6159205c79f86c005dcaf9941c1" # remove at next version upgrade or when output changes HASHEQUIV_HASH_VERSION .= ".2" diff --git a/poky/meta/recipes-extended/msmtp/msmtp_1.8.22.bb b/poky/meta/recipes-extended/msmtp/msmtp_1.8.23.bb index d56af7346b..5e68a7ea92 100644 --- a/poky/meta/recipes-extended/msmtp/msmtp_1.8.22.bb +++ b/poky/meta/recipes-extended/msmtp/msmtp_1.8.23.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" UPSTREAM_CHECK_URI = "https://marlam.de/msmtp/download/" SRC_URI = "https://marlam.de/${BPN}/releases/${BP}.tar.xz" -SRC_URI[sha256sum] = "1b04206286a5b82622335e4eb09e17074368b7288e53d134543cbbc6b79ea3e7" +SRC_URI[sha256sum] = "cf04c16b099b3d414db4b5b93fc5ed9d46aad564c81a352aa107a33964c356b8" inherit gettext autotools update-alternatives pkgconfig diff --git a/poky/meta/recipes-extended/stress-ng/stress-ng_0.15.02.bb b/poky/meta/recipes-extended/stress-ng/stress-ng_0.15.03.bb index 75400f589e..13a8b49f70 100644 --- a/poky/meta/recipes-extended/stress-ng/stress-ng_0.15.02.bb +++ b/poky/meta/recipes-extended/stress-ng/stress-ng_0.15.03.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master \ file://0001-test-float-Make-variables-global.patch \ file://0001-Pass-LD_GOLD-1-via-makefile-to-enable-gold-linker.patch" -SRCREV = "4164f6842c712c2d9a13619c3c70fd35d8d02cdb" +SRCREV = "f3be0447c10fd5652b4c3753d56bcaac13fd8917" S = "${WORKDIR}/git" DEPENDS = "coreutils-native libbsd" diff --git a/poky/meta/recipes-extended/sudo/sudo_1.9.12p1.bb b/poky/meta/recipes-extended/sudo/sudo_1.9.12p2.bb index 1495b67b8b..ae7207c081 100644 --- a/poky/meta/recipes-extended/sudo/sudo_1.9.12p1.bb +++ b/poky/meta/recipes-extended/sudo/sudo_1.9.12p2.bb @@ -8,7 +8,7 @@ SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \ PAM_SRC_URI = "file://sudo.pam" -SRC_URI[sha256sum] = "475a18a8eb3da8b2917ceab063a6baf51ea09128c3c47e3e0e33ab7497bab7d8" +SRC_URI[sha256sum] = "b9a0b1ae0f1ddd9be7f3eafe70be05ee81f572f6f536632c44cd4101bb2a8539" DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS:${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" diff --git a/poky/meta/recipes-extended/sysstat/sysstat_12.6.1.bb b/poky/meta/recipes-extended/sysstat/sysstat_12.6.2.bb index 6df7bdbb83..f9e5778e76 100644 --- a/poky/meta/recipes-extended/sysstat/sysstat_12.6.1.bb +++ b/poky/meta/recipes-extended/sysstat/sysstat_12.6.2.bb @@ -4,4 +4,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb" SRC_URI += "file://0001-configure.in-remove-check-for-chkconfig.patch" -SRC_URI[sha256sum] = "18ff5a4e149e2568e43385637f72437fe6bafcc1322a93d13d1981e9464a0342" +SRC_URI[sha256sum] = "3e77134aedaa6fc57d9745da67edfd8990e19adee71ac47196229261c563fb48" diff --git a/poky/meta/recipes-extended/texinfo/texinfo_7.0.1.bb b/poky/meta/recipes-extended/texinfo/texinfo_7.0.2.bb index f0f9211594..da455df4bb 100644 --- a/poky/meta/recipes-extended/texinfo/texinfo_7.0.1.bb +++ b/poky/meta/recipes-extended/texinfo/texinfo_7.0.2.bb @@ -35,7 +35,7 @@ SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \ ${TARGET_PATCH} \ " -SRC_URI[sha256sum] = "53c01dd34c9bf116866d03aabd38c5cd9ee95ac10043d61aa33dec0d27825d8d" +SRC_URI[sha256sum] = "a9c646bc4f6bb31843f129f8408a3a627334575faf7b22ebc416be5cb1570553" tex_texinfo = "texmf/tex/texinfo" diff --git a/poky/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb b/poky/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb index 897417314d..c390fcf33c 100644 --- a/poky/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb +++ b/poky/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb @@ -48,4 +48,7 @@ do_install:append() { ${D}${systemd_system_unitdir}/xinetd.service } -RDEPENDS:${PN} += "perl" +# Script for converting inetd.conf files into xinetd.conf files +PACKAGES =+ "${PN}-xconv" +FILES:${PN}-xconv = "${bindir}/xconv.pl" +RDEPENDS:${PN}-xconv += "perl" diff --git a/poky/meta/recipes-graphics/fontconfig/fontconfig_2.14.1.bb b/poky/meta/recipes-graphics/fontconfig/fontconfig_2.14.2.bb index ae5a45be54..a3d29ddbae 100644 --- a/poky/meta/recipes-graphics/fontconfig/fontconfig_2.14.1.bb +++ b/poky/meta/recipes-graphics/fontconfig/fontconfig_2.14.2.bb @@ -14,7 +14,6 @@ BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig" LICENSE = "MIT & MIT & PD" LIC_FILES_CHKSUM = "file://COPYING;md5=00252fd272bf2e722925613ad74cb6c7 \ file://src/fcfreetype.c;endline=45;md5=ce976b310a013a6ace6b60afa71851c1 \ - file://src/fccache.c;beginline=1671;endline=1686;md5=906c2f04b0c79a1bcc84ecfca4de5619 \ " SECTION = "libs" @@ -25,7 +24,7 @@ SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ file://revert-static-pkgconfig.patch \ " -SRC_URI[sha256sum] = "ae480e9ca34382790312ff062c625ec70df94d6d9a9366e2b2b3d525f7f90387" +SRC_URI[sha256sum] = "3ba2dd92158718acec5caaf1a716043b5aa055c27b081d914af3ccb40dce8a55" UPSTREAM_CHECK_REGEX = "fontconfig-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" diff --git a/poky/meta/recipes-graphics/glslang/glslang_1.3.236.0.bb b/poky/meta/recipes-graphics/glslang/glslang_1.3.239.0.bb index 99eca6a6c1..6bcde521e2 100644 --- a/poky/meta/recipes-graphics/glslang/glslang_1.3.236.0.bb +++ b/poky/meta/recipes-graphics/glslang/glslang_1.3.239.0.bb @@ -8,9 +8,10 @@ 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 = "77551c429f86c0e077f26552b7c1c0f12a9f235e" -SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=master \ - file://0001-generate-glslang-pkg-config.patch" +SRCREV = "ca8d07d0bc1c6390b83915700439fa7719de6a2a" +SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=main \ + file://0001-generate-glslang-pkg-config.patch \ + " PE = "1" UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-meson.build-fix-meson-0.60-compatibility.patch b/poky/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-meson.build-fix-meson-0.60-compatibility.patch deleted file mode 100644 index e7c782055b..0000000000 --- a/poky/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-meson.build-fix-meson-0.60-compatibility.patch +++ /dev/null @@ -1,24 +0,0 @@ -From b9a19aa4bdb21751c04c0e3ba8a9e2e35a10c953 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex@linutronix.de> -Date: Mon, 25 Oct 2021 18:18:15 +0200 -Subject: [PATCH] lib/meson.build: fix meson 0.60 compatibility - -Upstream-Status: Backport [https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/commit/963917a3565466832a3b2fc22e9285d34a0bf944] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - lib/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/meson.build b/lib/meson.build -index 9929520e..1a525587 100644 ---- a/lib/meson.build -+++ b/lib/meson.build -@@ -152,7 +152,7 @@ lib_version = vcs_tag(input : 'version.h.in', output : 'version.h', - - lib_intermediates = [] - foreach f: lib_sources -- name = f.underscorify(f) -+ name = f.underscorify() - lib = static_library('igt-' + name, - [ f, lib_version ], - include_directories: inc, diff --git a/poky/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb b/poky/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb index bb2f9564d2..fbe5e1a4e7 100644 --- a/poky/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb +++ b/poky/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb @@ -9,17 +9,15 @@ LICENSE = "MIT" inherit meson pkgconfig -SRCREV = "203def046b466fb2da67f9f15552d84e1c0b41f2" -PV = "1.26" +SRCREV = "2b29e8ac07fbcfadc48b9d60e4d736a6e3b289ab" +PV = "1.27.1" -SRC_URI = "git://gitlab.freedesktop.org/drm/igt-gpu-tools.git;protocol=https;branch=master \ - file://0001-lib-meson.build-fix-meson-0.60-compatibility.patch \ - " +SRC_URI = "git://gitlab.freedesktop.org/drm/igt-gpu-tools.git;protocol=https;branch=master" S = "${WORKDIR}/git" DEPENDS += "libdrm libpciaccess cairo udev glib-2.0 procps libunwind kmod openssl elfutils alsa-lib json-c bison-native" -RDEPENDS:${PN} += "bash" +RDEPENDS:${PN} += "bash perl" RDEPENDS:${PN}-tests += "bash" PACKAGE_BEFORE_PN = "${PN}-benchmarks ${PN}-tests" diff --git a/poky/meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.4.bb b/poky/meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.5.bb index 1708fa97f0..4d21ca1e1d 100644 --- a/poky/meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.4.bb +++ b/poky/meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.5.bb @@ -14,7 +14,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ file://0001-libjpeg-turbo-fix-package_qa-error.patch \ " -SRC_URI[sha256sum] = "d3ed26a1131a13686dfca4935e520eb7c90ae76fbc45d98bb50a8dc86230342b" +SRC_URI[sha256sum] = "bc12bc9dce55300c6bf4342bc233bcc26bd38bf289eedf147360d731c668ddaf" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/" UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P<pver>(\d+[\.\-_]*)+)/" diff --git a/poky/meta/recipes-graphics/mesa/mesa.inc b/poky/meta/recipes-graphics/mesa/mesa.inc index 0ec681cf20..cc4aa5eeab 100644 --- a/poky/meta/recipes-graphics/mesa/mesa.inc +++ b/poky/meta/recipes-graphics/mesa/mesa.inc @@ -86,6 +86,7 @@ PACKAGECONFIG = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'dri3', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 vulkan', 'dri3', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', 'zink', '', d)} \ + ${@bb.utils.contains('LICENSE_FLAGS_ACCEPTED', 'commercial', 'video-codecs', '', d)} \ " # "gbm" requires "opengl" @@ -178,6 +179,9 @@ PACKAGECONFIG[unwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind" PACKAGECONFIG[lmsensors] = "-Dlmsensors=enabled,-Dlmsensors=disabled,lmsensors" +VIDEO_CODECS = "vc1dec,h264dec,h264enc,h265dec,h265enc" +PACKAGECONFIG[video-codecs] = "-Dvideo-codecs=${@strip_comma('${VIDEO_CODECS}')}, -Dvideo-codecs=''" + # llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2) FULL_OPTIMIZATION:append = " -fno-omit-frame-pointer" diff --git a/poky/meta/recipes-graphics/piglit/piglit_git.bb b/poky/meta/recipes-graphics/piglit/piglit_git.bb index 7858fa0b08..b12dd46ea0 100644 --- a/poky/meta/recipes-graphics/piglit/piglit_git.bb +++ b/poky/meta/recipes-graphics/piglit/piglit_git.bb @@ -13,7 +13,7 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https;branch=ma " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "e300648a805d62101de341232d99bfec1cce78c5" +SRCREV = "acc0e009d0f7e843148205d03fda53ad5f1b7c8c" # (when PV goes above 1.0 remove the trailing r) PV = "1.0+gitr${SRCPV}" diff --git a/poky/meta/recipes-graphics/shaderc/shaderc_2022.4.bb b/poky/meta/recipes-graphics/shaderc/shaderc_2023.2.bb index 0fe6887cbc..07fae0bb7e 100644 --- a/poky/meta/recipes-graphics/shaderc/shaderc_2022.4.bb +++ b/poky/meta/recipes-graphics/shaderc/shaderc_2023.2.bb @@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/google/shaderc" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRCREV = "067e008c80c323b1cd1ab1e547b38f9a5f52269e" +SRCREV = "55f4bbd993de3a3cad34cb41cd07b82fa1c77dd6" 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.236.0.bb b/poky/meta/recipes-graphics/spir/spirv-headers_1.3.239.0.bb index 5b4e15756e..afd59cbcb1 100644 --- a/poky/meta/recipes-graphics/spir/spirv-headers_1.3.236.0.bb +++ b/poky/meta/recipes-graphics/spir/spirv-headers_1.3.239.0.bb @@ -7,8 +7,8 @@ HOMEPAGE = "https://www.khronos.org/registry/spir-v" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d" -SRCREV = "1d31a100405cf8783ca7a31e31cdd727c9fc54c3" -SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=sdk-1.3.236" +SRCREV = "d13b52222c39a7e9a401b44646f0ca3a640fbd47" +SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main" PE = "1" UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-graphics/spir/spirv-tools_1.3.236.0.bb b/poky/meta/recipes-graphics/spir/spirv-tools_1.3.239.0.bb index 1099925cf0..5109bb5333 100644 --- a/poky/meta/recipes-graphics/spir/spirv-tools_1.3.236.0.bb +++ b/poky/meta/recipes-graphics/spir/spirv-tools_1.3.239.0.bb @@ -7,8 +7,8 @@ SECTION = "graphics" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRCREV = "40f5bf59c6acb4754a0bffd3c53a715732883a12" -SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=sdk-1.3.236;protocol=https" +SRCREV = "63de608daeb7e91fbea6d7477a50debe7cac57ce" +SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https" PE = "1" UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-graphics/vulkan/vulkan-headers_1.3.236.0.bb b/poky/meta/recipes-graphics/vulkan/vulkan-headers_1.3.239.0.bb index 8716376fc0..a6b30fa831 100644 --- a/poky/meta/recipes-graphics/vulkan/vulkan-headers_1.3.236.0.bb +++ b/poky/meta/recipes-graphics/vulkan/vulkan-headers_1.3.239.0.bb @@ -11,12 +11,13 @@ 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 = "b75e5a02b6933caf86c5822d019067b335492c85" +SRCREV = "2bb0a23104ceffd9a28d5b7401f2cee7dae35bb8" S = "${WORKDIR}/git" inherit cmake FILES:${PN} += "${datadir}/vulkan" +RDEPENDS:${PN} += "python3-core" UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" diff --git a/poky/meta/recipes-graphics/vulkan/vulkan-loader_1.3.236.0.bb b/poky/meta/recipes-graphics/vulkan/vulkan-loader_1.3.239.0.bb index 56f9d765f8..e11f936a0a 100644 --- a/poky/meta/recipes-graphics/vulkan/vulkan-loader_1.3.236.0.bb +++ b/poky/meta/recipes-graphics/vulkan/vulkan-loader_1.3.239.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.236;protocol=https" -SRCREV = "1ee83a25c2c20e2efbfc0ac976c7a3ddb5fc291c" +SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=sdk-1.3.239;protocol=https" +SRCREV = "fa421a02686e7f01c8e4af24650fa04374df8338" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-graphics/vulkan/vulkan-tools_1.3.236.0.bb b/poky/meta/recipes-graphics/vulkan/vulkan-tools_1.3.239.0.bb index a3561bbb5c..934bd53ee1 100644 --- a/poky/meta/recipes-graphics/vulkan/vulkan-tools_1.3.236.0.bb +++ b/poky/meta/recipes-graphics/vulkan/vulkan-tools_1.3.239.0.bb @@ -6,12 +6,12 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=master;protocol=https" -SRCREV = "ce45337c51ed53e6f1b337aa746a5a96c5018f86" +SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=sdk-1.3.239;protocol=https" +SRCREV = "84c61c463aecdda385de33b0149c7368119c23f6" S = "${WORKDIR}/git" -inherit cmake features_check +inherit cmake features_check pkgconfig ANY_OF_DISTRO_FEATURES = "x11 wayland" REQUIRED_DISTRO_FEATURES = "vulkan" diff --git a/poky/meta/recipes-graphics/wayland/libinput_1.22.0.bb b/poky/meta/recipes-graphics/wayland/libinput_1.22.1.bb index 5a5fc9f35d..f86885d3e3 100644 --- a/poky/meta/recipes-graphics/wayland/libinput_1.22.0.bb +++ b/poky/meta/recipes-graphics/wayland/libinput_1.22.1.bb @@ -12,11 +12,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bab4ac7dc1c10bc0fb037dc76c46ef8a" DEPENDS = "libevdev udev mtdev libcheck" -SRC_URI = "git://gitlab.freedesktop.org/libinput/libinput.git;protocol=https;branch=main \ +SRC_URI = "git://gitlab.freedesktop.org/libinput/libinput.git;protocol=https;branch=1.22-branch \ file://run-ptest \ file://determinism.patch \ " -SRCREV = "fc59e574e050c502c9a3adefacf97babf3d09c7a" +SRCREV = "d9f45fd1261da85b4eb44f8aa82e1500b99f303b" S = "${WORKDIR}/git" UPSTREAM_CHECK_REGEX = "libinput-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" diff --git a/poky/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch b/poky/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch deleted file mode 100644 index b37f697aa4..0000000000 --- a/poky/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch +++ /dev/null @@ -1,103 +0,0 @@ -From da6612659a279bcb02f70622b53a3894fbc11052 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Fri, 9 Dec 2016 14:35:45 +0200 -Subject: [PATCH] Add option for vmwgfx - -Upstream-Status: Submitted - -Signed-off-by: Ross Burton <ross.burton@intel.com> -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> ---- - configure.ac | 51 +++++++++++++++++++++------------------------------ - 1 file changed, 21 insertions(+), 30 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 9f259ce..f3fec57 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -64,6 +64,13 @@ AC_ARG_ENABLE(vmwarectrl-client, - [VMWARECTRL=$enableval], [VMWARECTRL=no]) - AM_CONDITIONAL(BUILD_VMWARECTRL, [test "x$VMWARECTRL" = xyes]) - -+# Define a configure option to build the vmwgfx driver -+AC_ARG_ENABLE(vmwgfx, -+ AS_HELP_STRING([--disable-vmwgfx], -+ [Disable vmwgfx driver (KMS/3D) (default: enabled)]), -+ [VMWGFX="$enableval"], [VMWGFX="yes"]) -+AM_CONDITIONAL(BUILD_VMWGFX, test "x$VMWGFX" = xyes) -+ - # Store the list of server defined optional extensions in REQUIRED_MODULES - XORG_DRIVER_CHECK_EXT(RANDR, randrproto) - XORG_DRIVER_CHECK_EXT(RENDER, renderproto) -@@ -85,11 +92,6 @@ PKG_CHECK_EXISTS([xorg-server >= 1.4.99], - [AC_DEFINE([HAVE_XORG_SERVER_1_5_0], 1, - [Has version 1.5.0 or greater of the Xserver])]) - --PKG_CHECK_EXISTS([xorg-server >= 1.7.0], -- [AC_DEFINE([HAVE_XORG_SERVER_1_7_0], 1, -- [Has version 1.7.0 or greater of the Xserver]) -- BUILD_VMWGFX=yes],[BUILD_VMWGFX=no]) -- - PKG_CHECK_EXISTS([xorg-server >= 1.12.0], - [AC_DEFINE([HAVE_XORG_SERVER_1_12_0], 1, - [Has version 1.12.0 or greater of the Xserver])]) -@@ -114,34 +116,22 @@ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) - - AC_SUBST([moduledir]) - --if test x$BUILD_VMWGFX = xyes; then -- PKG_CHECK_MODULES([LIBDRM], [libdrm],[],[BUILD_VMWGFX=no]) --fi --if test x$BUILD_VMWGFX = xyes; then --# --# Early versions of mesa 10 forgot to bump the XA major version number in --# the xa_tracker.h header --# -- PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0], -- [PKG_CHECK_EXISTS([xatracker = 2.0.0], -- [AC_DEFINE([HAVE_XA_2], 1, -- [Has version 2 of XA])])], -- [BUILD_VMWGFX=no]) --# --# Check for prime. --# -+AC_MSG_CHECKING([whether to build Kernel Mode Setting and 3D]) -+if test x$VMWGFX = xyes; then -+ AC_MSG_RESULT([yes]) -+ PKG_CHECK_MODULES([LIBDRM], [libdrm]) -+ # Check for prime. - PKG_CHECK_EXISTS([libdrm >= 2.4.38], - [AC_DEFINE([HAVE_LIBDRM_2_4_38], 1, - [Has version 2.4.38 or greater of libdrm])]) --fi - --DRIVER_NAME=vmware --AC_SUBST([DRIVER_NAME]) -- --AC_MSG_CHECKING([whether to build Kernel Mode Setting and 3D]) --if test x$BUILD_VMWGFX = xyes; then -- AC_MSG_RESULT([yes]) -- AC_DEFINE([BUILD_VMWGFX], 1, [Building the vmwgfx driver path]) -+ # Early versions of mesa 10 forgot to bump the XA major version number -+ # in the xa_tracker.h header -+ PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0], -+ [PKG_CHECK_EXISTS([xatracker = 2.0.0], -+ [AC_DEFINE([HAVE_XA_2], 1, -+ [Has version 2 of XA])])]) -+ AC_DEFINE([BUILD_VMWGFX], 1, [Building the vmwgfx driver path]) - libudev_check=yes - AC_ARG_WITH([libudev], - [AS_HELP_STRING([--without-libudev], -@@ -158,7 +148,8 @@ else - AC_MSG_RESULT([no]) - fi - --AM_CONDITIONAL(BUILD_VMWGFX, test "x$BUILD_VMWGFX" = xyes) -+DRIVER_NAME=vmware -+AC_SUBST([DRIVER_NAME]) - - AC_CONFIG_FILES([ - Makefile --- -2.1.4 - diff --git a/poky/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.3.0.bb b/poky/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.4.0.bb index 41612b7f07..d7ba2b9e86 100644 --- a/poky/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.3.0.bb +++ b/poky/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.4.0.bb @@ -7,13 +7,8 @@ DESCRIPTION = "vmware is an Xorg driver for VMware virtual video cards." LIC_FILES_CHKSUM = "file://COPYING;md5=5fcd7d437a959a15fbee8707747c6b53" DEPENDS += "virtual/libx11 xorgproto libpciaccess" +XORG_DRIVER_COMPRESSOR = ".tar.xz" -SRC_URI += "file://0002-add-option-for-vmwgfx.patch" - -SRC_URI[md5sum] = "08d66d062055080ff699ab4869726ea2" -SRC_URI[sha256sum] = "47971924659e51666a757269ad941a059ef5afe7a47b5101c174a6022ac4066c" +SRC_URI[sha256sum] = "aed31ee5ed5ecc6e2226705383e7ad06f7602c1376a295305f376b17af3eb81a" COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' - -PACKAGECONFIG ?= "" -PACKAGECONFIG[vmwgfx] = "--enable-vmwgfx, --disable-vmwgfx, libdrm virtual/mesa" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxpm_3.5.14.bb b/poky/meta/recipes-graphics/xorg-lib/libxpm_3.5.15.bb index 2740341807..32a2b35356 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxpm_3.5.14.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxpm_3.5.15.bb @@ -11,16 +11,17 @@ an extension of the monochrome XBM bitmap specificied in the X \ protocol." LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=51f4270b012ecd4ab1a164f5f4ed6cf7" +LIC_FILES_CHKSUM = "file://COPYING;md5=903942ebc9d807dfb68540f40bae5aff" DEPENDS += "libxext libsm libxt gettext-native" PE = "1" XORG_PN = "libXpm" +EXTRA_OECONF += "--disable-open-zfile" PACKAGES =+ "sxpm cxpm" FILES:cxpm = "${bindir}/cxpm" FILES:sxpm = "${bindir}/sxpm" -SRC_URI[sha256sum] = "f7eb8f69c039281def8258ae6859adb5f050fbe161ab3d6a2d6ef109a603eac2" +SRC_URI[sha256sum] = "60bb906c5c317a6db863e39b69c4a83fdbd2ae2154fcf47640f8fefc9fdfd1c1" BBCLASSEXTEND = "native" diff --git a/poky/meta/recipes-kernel/linux-firmware/linux-firmware_20221214.bb b/poky/meta/recipes-kernel/linux-firmware/linux-firmware_20230117.bb index c2354e627f..1dce06c8f5 100644 --- a/poky/meta/recipes-kernel/linux-firmware/linux-firmware_20221214.bb +++ b/poky/meta/recipes-kernel/linux-firmware/linux-firmware_20230117.bb @@ -70,7 +70,7 @@ LICENSE = "\ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.adsp_sst;md5=615c45b91a5a4a9fe046d6ab9a2df728 \ file://LICENCE.agere;md5=af0133de6b4a9b2522defd5f188afd31 \ - file://LICENSE.amdgpu;md5=44c1166d052226cb2d6c8d7400090203 \ + file://LICENSE.amdgpu;md5=a2589a05ea5b6bd2b7f4f623c7e7a649 \ file://LICENSE.amd-ucode;md5=6ca90c57f7b248de1e25c7f68ffc4698 \ file://LICENSE.amlogic_vdec;md5=dc44f59bf64a81643e500ad3f39a468a \ file://LICENCE.atheros_firmware;md5=30a14c7823beedac9fa39c64fdd01a13 \ @@ -132,7 +132,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 = "bf7c716d16e48fe118c6209f99b13253" +WHENCE_CHKSUM = "05f1d941972cedadbf667c05f6010378" # These are not common licenses, set NO_GENERIC_LICENSE for them # so that the license files will be copied from fetched source @@ -209,7 +209,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] = "e793783e92acbde549965521462d1d1327827360664cf242dbda08f075654331" +SRC_URI[sha256sum] = "df11e25ba2fb4d5343473757e17a3b4cef599250a26b1f7e0f038850f0cb3d64" inherit allarch diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb b/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb index 8671b3d30d..05e405f81c 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb @@ -50,7 +50,7 @@ PACKAGECONFIG[dt-validation] = ",,python3-dtschema-native" # we need the wrappers if validation isn't in the packageconfig DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'dt-validation', '', 'python3-dtschema-wrapper-native', d)}" -COMPATIBLE_MACHINE = "^(qemuarmv5|qemuarm|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64|qemuriscv32|qemuriscv64)$" +COMPATIBLE_MACHINE = "^(qemuarmv5|qemuarm|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64|qemuriscv32|qemuriscv64|qemuloongarch64)$" KERNEL_DEVICETREE:qemuarmv5 = "versatile-pb.dtb" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb index d4f5b1cb20..8d299ca059 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "62705725902924fafa34c7bcb4c18f2e3b7d473c" -SRCREV_meta ?= "ed03f6685c020866c2f32c4b14c4f343792146d5" +SRCREV_machine ?= "0567deb52d2f2c3cd3046f56ca3fb97a151cf6ec" +SRCREV_meta ?= "8df0d345ef202197eef82942933161213d4d1846" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.15.87" +LINUX_VERSION ?= "5.15.91" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 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 cced203781..28b7159359 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 @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "2da2dd7ee0de35291a179566ce8e5b85d6982762" -SRCREV_meta ?= "142fcf0b8fcf1643d80e39e2c2f9c4a3bb528fcc" +SRCREV_machine ?= "94f73e8d6872df48a7c4ee6caa1701ae2a535dfe" +SRCREV_meta ?= "d7393c5752865634e307673043da55e353139333" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA}" -LINUX_VERSION ?= "6.1.5" +LINUX_VERSION ?= "6.1.9" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb index a0af388e73..400ef75cc2 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb @@ -5,7 +5,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.15.87" +LINUX_VERSION ?= "5.15.91" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -14,8 +14,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "6d10c8fe87e2037c751157ca8677588fa6e0f214" -SRCREV_meta ?= "ed03f6685c020866c2f32c4b14c4f343792146d5" +SRCREV_machine ?= "01c387906b52214892aaea0664b3b4ead35fe484" +SRCREV_meta ?= "8df0d345ef202197eef82942933161213d4d1846" PV = "${LINUX_VERSION}+git${SRCPV}" 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 15ee6abdbc..65866dd1db 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 @@ -5,7 +5,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "6.1.5" +LINUX_VERSION ?= "6.1.9" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -14,8 +14,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "404168c1ce77179a34bb9959a18b594a9f7105d3" -SRCREV_meta ?= "142fcf0b8fcf1643d80e39e2c2f9c4a3bb528fcc" +SRCREV_machine ?= "1caf99d56881e1510afca553cd4a057f80479973" +SRCREV_meta ?= "d7393c5752865634e307673043da55e353139333" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/poky/meta/recipes-kernel/linux/linux-yocto_5.15.bb index a3895dde78..60c088b9fe 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto_5.15.bb @@ -13,24 +13,24 @@ KBRANCH:qemux86 ?= "v5.15/standard/base" KBRANCH:qemux86-64 ?= "v5.15/standard/base" KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "7463f1ff9674e97fa6bed05983d4828a219994d9" -SRCREV_machine:qemuarm64 ?= "09ebb2096efb9e23a1e2c47bf1926dbae0e3f051" -SRCREV_machine:qemumips ?= "a7058de4f88d9a7a3b3253a31bba703eaf6f78ea" -SRCREV_machine:qemuppc ?= "e43b0b8b142f689bc2e2297a5ca221fb0f802eb5" -SRCREV_machine:qemuriscv64 ?= "9768cdc48a9d6cdd9ce0aedc0037d45cfb3f1665" -SRCREV_machine:qemuriscv32 ?= "9768cdc48a9d6cdd9ce0aedc0037d45cfb3f1665" -SRCREV_machine:qemux86 ?= "9768cdc48a9d6cdd9ce0aedc0037d45cfb3f1665" -SRCREV_machine:qemux86-64 ?= "9768cdc48a9d6cdd9ce0aedc0037d45cfb3f1665" -SRCREV_machine:qemumips64 ?= "75a87ddede429ee1070118f54d38183ee4c81b59" -SRCREV_machine ?= "9768cdc48a9d6cdd9ce0aedc0037d45cfb3f1665" -SRCREV_meta ?= "ed03f6685c020866c2f32c4b14c4f343792146d5" +SRCREV_machine:qemuarm ?= "9c525056e4d5c3852fff6058bd7f6a648a3b645e" +SRCREV_machine:qemuarm64 ?= "30e3bff02675a3d10bd04c51f52f4a6b17b94d01" +SRCREV_machine:qemumips ?= "0dda96ab67034ee0f1db18c04fed33d2a4e2fec1" +SRCREV_machine:qemuppc ?= "43c8d401cf8092c19e47935c5667dacf754885d4" +SRCREV_machine:qemuriscv64 ?= "531238ba91af58291b5f306c237e6bc1b8b6633a" +SRCREV_machine:qemuriscv32 ?= "531238ba91af58291b5f306c237e6bc1b8b6633a" +SRCREV_machine:qemux86 ?= "531238ba91af58291b5f306c237e6bc1b8b6633a" +SRCREV_machine:qemux86-64 ?= "531238ba91af58291b5f306c237e6bc1b8b6633a" +SRCREV_machine:qemumips64 ?= "26e3543c62c04852896adc70584b1eaa59f15fad" +SRCREV_machine ?= "531238ba91af58291b5f306c237e6bc1b8b6633a" +SRCREV_meta ?= "8df0d345ef202197eef82942933161213d4d1846" # 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 ?= "d57287729e229188e7d07ef0117fe927664e08cb" +SRCREV_machine:class-devupstream ?= "9cf4111cdf9420fa99792ae16c8de23242bb2e0b" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v5.15/base" @@ -38,7 +38,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.15.87" +LINUX_VERSION ?= "5.15.91" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" 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 f543240cd8..66d397837f 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto_6.1.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto_6.1.bb @@ -11,26 +11,28 @@ KBRANCH:qemuriscv64 ?= "v6.1/standard/base" KBRANCH:qemuriscv32 ?= "v6.1/standard/base" KBRANCH:qemux86 ?= "v6.1/standard/base" KBRANCH:qemux86-64 ?= "v6.1/standard/base" +KBRANCH:qemuloongarch64 ?= "v6.1/standard/base" KBRANCH:qemumips64 ?= "v6.1/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "45f7cca5081d3cb4ad4fae8e158cd58ea4db6c1f" -SRCREV_machine:qemuarm64 ?= "404168c1ce77179a34bb9959a18b594a9f7105d3" -SRCREV_machine:qemumips ?= "eb204027dbb98317d002250cc594de30ecc62b90" -SRCREV_machine:qemuppc ?= "404168c1ce77179a34bb9959a18b594a9f7105d3" -SRCREV_machine:qemuriscv64 ?= "404168c1ce77179a34bb9959a18b594a9f7105d3" -SRCREV_machine:qemuriscv32 ?= "404168c1ce77179a34bb9959a18b594a9f7105d3" -SRCREV_machine:qemux86 ?= "404168c1ce77179a34bb9959a18b594a9f7105d3" -SRCREV_machine:qemux86-64 ?= "404168c1ce77179a34bb9959a18b594a9f7105d3" -SRCREV_machine:qemumips64 ?= "2b51d6b44e4dc0e5a87f820d8ebc5cc49feea14a" -SRCREV_machine ?= "404168c1ce77179a34bb9959a18b594a9f7105d3" -SRCREV_meta ?= "142fcf0b8fcf1643d80e39e2c2f9c4a3bb528fcc" +SRCREV_machine:qemuarm ?= "ccd3b20fb504d35147d35962254b68b0041a4c6f" +SRCREV_machine:qemuarm64 ?= "1caf99d56881e1510afca553cd4a057f80479973" +SRCREV_machine:qemuloongarch64 ?= "1caf99d56881e1510afca553cd4a057f80479973" +SRCREV_machine:qemumips ?= "d60ecbda7d4de915c867f751f5c63555a14219d1" +SRCREV_machine:qemuppc ?= "1caf99d56881e1510afca553cd4a057f80479973" +SRCREV_machine:qemuriscv64 ?= "1caf99d56881e1510afca553cd4a057f80479973" +SRCREV_machine:qemuriscv32 ?= "1caf99d56881e1510afca553cd4a057f80479973" +SRCREV_machine:qemux86 ?= "1caf99d56881e1510afca553cd4a057f80479973" +SRCREV_machine:qemux86-64 ?= "1caf99d56881e1510afca553cd4a057f80479973" +SRCREV_machine:qemumips64 ?= "2949d76c3f79f3c7f700a6366d828f006d7dd5a8" +SRCREV_machine ?= "1caf99d56881e1510afca553cd4a057f80479973" +SRCREV_meta ?= "d7393c5752865634e307673043da55e353139333" # 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 ?= "90ca7a874a9093e500cc6147cecd85ad2e6a2852" +SRCREV_machine:class-devupstream ?= "68a95455c153f8adc513e5b688f4b348daa7c1b1" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v6.1/base" @@ -38,7 +40,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "6.1.5" +LINUX_VERSION ?= "6.1.9" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" @@ -51,7 +53,7 @@ KCONF_BSP_AUDIT_LEVEL = "1" KERNEL_DEVICETREE:qemuarmv5 = "versatile-pb.dtb" -COMPATIBLE_MACHINE = "^(qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemuppc64|qemumips|qemumips64|qemux86-64|qemuriscv64|qemuriscv32)$" +COMPATIBLE_MACHINE = "^(qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemuppc64|qemumips|qemumips64|qemux86-64|qemuriscv64|qemuriscv32|qemuloongarch64)$" # Functionality flags KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" diff --git a/poky/meta/recipes-kernel/lttng/lttng-tools/0001-compat-Define-off64_t-as-off_t-on-linux.patch b/poky/meta/recipes-kernel/lttng/lttng-tools/0001-compat-Define-off64_t-as-off_t-on-linux.patch index ef81703bc3..4e21d1e9f1 100644 --- a/poky/meta/recipes-kernel/lttng/lttng-tools/0001-compat-Define-off64_t-as-off_t-on-linux.patch +++ b/poky/meta/recipes-kernel/lttng/lttng-tools/0001-compat-Define-off64_t-as-off_t-on-linux.patch @@ -22,7 +22,14 @@ Change-Id: If2c6007a8c85bc3f3065002af8a7538b882fb4a8 --- a/src/common/compat/compat-fcntl.c +++ b/src/common/compat/compat-fcntl.c -@@ -13,7 +13,7 @@ +@@ -8,14 +8,17 @@ + #define _LGPL_SOURCE + #include <common/compat/fcntl.h> + #include <common/macros.h> ++#include <common/bug.h> ++#include <stdint.h> + #include <unistd.h> + #ifdef __linux__ LTTNG_HIDDEN @@ -30,25 +37,20 @@ Change-Id: If2c6007a8c85bc3f3065002af8a7538b882fb4a8 +int compat_sync_file_range(int fd, off_t offset, off_t nbytes, unsigned int flags) { ++ LTTNG_BUILD_BUG_ON(sizeof(off_t) != sizeof(int64_t)); #ifdef HAVE_SYNC_FILE_RANGE + return sync_file_range(fd, offset, nbytes, flags); + #else --- a/src/common/compat/fcntl.h +++ b/src/common/compat/fcntl.h -@@ -8,21 +8,21 @@ - #ifndef _COMPAT_FCNTL_H - #define _COMPAT_FCNTL_H - -+#include <assert.h> - #include <fcntl.h> - #include <sys/types.h> +@@ -13,16 +13,12 @@ #include <common/compat/errno.h> -#if (defined(__CYGWIN__)) -typedef long long off64_t; -#endif -+static_assert(sizeof(off_t) == sizeof(int64_t), -+ "Build system is misconfigured, off_t must be 64-bit wide"); - +- #if (defined(__FreeBSD__) || defined(__sun__)) typedef off64_t loff_t; #endif @@ -59,7 +61,7 @@ Change-Id: If2c6007a8c85bc3f3065002af8a7538b882fb4a8 unsigned int flags); #define lttng_sync_file_range(fd, offset, nbytes, flags) \ compat_sync_file_range(fd, offset, nbytes, flags) -@@ -37,8 +37,8 @@ extern int compat_sync_file_range(int fd +@@ -37,8 +33,8 @@ extern int compat_sync_file_range(int fd #define SYNC_FILE_RANGE_WAIT_BEFORE 0 #define SYNC_FILE_RANGE_WRITE 0 diff --git a/poky/meta/recipes-kernel/lttng/lttng-tools/determinism.patch b/poky/meta/recipes-kernel/lttng/lttng-tools/determinism.patch deleted file mode 100644 index 0a897a8e13..0000000000 --- a/poky/meta/recipes-kernel/lttng/lttng-tools/determinism.patch +++ /dev/null @@ -1,64 +0,0 @@ -This is a bit ugly. Specifing abs_builddir as an RPATH is plain wrong when -cross compiling. Sadly, removing the rpath makes libtool/automake do -weird things and breaks the build as shared libs are no longer generated. - -We already try and delete the RPATH at do_install with chrpath however -that does leave the path in the string table so it doesn't help us -with reproducibility. - -Instead, hack in a bogus but harmless path, then delete it later in -our do_install. Ultimately we may want to pass a specific path to use -to configure if we really do need to set an RPATH at all. It is unclear -to me whether the tests need that or not. - -Fixes reproducibility issues for lttng-tools. - -Upstream-Status: Submitted [https://bugs.lttng.org/issues/1361 - needs discussion with upstream about the correct solution] -RP 2021/3/1 - -Index: lttng-tools-2.12.2/tests/regression/ust/ust-dl/Makefile.am -=================================================================== ---- lttng-tools-2.12.2.orig/tests/regression/ust/ust-dl/Makefile.am -+++ lttng-tools-2.12.2/tests/regression/ust/ust-dl/Makefile.am -@@ -27,16 +27,16 @@ noinst_LTLIBRARIES = libzzz.la libbar.la - - libzzz_la_SOURCES = libzzz.c libzzz.h - libzzz_la_LDFLAGS = -module -shared -avoid-version \ -- -rpath $(abs_builddir) -+ -rpath /usr/lib - - libbar_la_SOURCES = libbar.c libbar.h - libbar_la_LDFLAGS = -module -shared -avoid-version \ -- -rpath $(abs_builddir) -+ -rpath /usr/lib - libbar_la_LIBADD = libzzz.la - - libfoo_la_SOURCES = libfoo.c libfoo.h - libfoo_la_LDFLAGS = -module -shared -avoid-version \ -- -rpath $(abs_builddir) -+ -rpath /usr/lib - libfoo_la_LIBADD = libbar.la - - CLEANFILES = libfoo.so libfoo.so.debug libbar.so libbar.so.debug \ -@@ -44,7 +44,7 @@ CLEANFILES = libfoo.so libfoo.so.debug l - - libtp_la_SOURCES = libbar-tp.h libbar-tp.c libfoo-tp.h libfoo-tp.c \ - libzzz-tp.h libzzz-tp.c --libtp_la_LDFLAGS = -module -shared -rpath $(abs_builddir) -+libtp_la_LDFLAGS = -module -shared -rpath /usr/lib - - # Extract debug symbols - libfoo.so.debug: libfoo.la -Index: lttng-tools-2.12.2/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am -=================================================================== ---- lttng-tools-2.12.2.orig/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am -+++ lttng-tools-2.12.2/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am -@@ -5,7 +5,7 @@ AM_CFLAGS += -O0 - noinst_LTLIBRARIES = libfoo.la - - libfoo_la_SOURCES = foo.c foo.h --libfoo_la_LDFLAGS = -shared -module -avoid-version -rpath $(abs_builddir)/.libs/ -+libfoo_la_LDFLAGS = -shared -module -avoid-version -rpath /usr/lib - - noinst_PROGRAMS = userspace-probe-elf-binary - userspace_probe_elf_binary_SOURCES = userspace-probe-elf-binary.c diff --git a/poky/meta/recipes-kernel/lttng/lttng-tools_2.13.8.bb b/poky/meta/recipes-kernel/lttng/lttng-tools_2.13.9.bb index e64eeba635..340b254b46 100644 --- a/poky/meta/recipes-kernel/lttng/lttng-tools_2.13.8.bb +++ b/poky/meta/recipes-kernel/lttng/lttng-tools_2.13.9.bb @@ -35,12 +35,11 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \ file://0001-tests-do-not-strip-a-helper-library.patch \ file://run-ptest \ file://lttng-sessiond.service \ - file://determinism.patch \ file://disable-tests.patch \ file://0001-compat-Define-off64_t-as-off_t-on-linux.patch \ " -SRC_URI[sha256sum] = "b1e959579b260790930b20f3c7aa7cefb8a40e0de80d4a777c2bf78c6b353dc1" +SRC_URI[sha256sum] = "8d94dc95b608cf70216b01203a3f8242b97a232db2e23421a2f43708da08f337" inherit autotools ptest pkgconfig useradd python3-dir manpages systemd diff --git a/poky/meta/recipes-kernel/perf/perf.bb b/poky/meta/recipes-kernel/perf/perf.bb index 5b2f5956a6..cddbfa725b 100644 --- a/poky/meta/recipes-kernel/perf/perf.bb +++ b/poky/meta/recipes-kernel/perf/perf.bb @@ -276,6 +276,10 @@ do_configure:prepend () { sed -i -e "s,$target,$replacement1$replacement2$replacement3,g" \ "${S}/tools/perf/pmu-events/Build" fi + if [ -e "${S}/tools/perf/pmu-events/jevents.py" ]; then + sed -i -e "s#os.scandir(path)#sorted(os.scandir(path), key=lambda e: e.name)#g" \ + "${S}/tools/perf/pmu-events/jevents.py" + fi # end reproducibility substitutions # We need to ensure the --sysroot option in CC is preserved @@ -356,6 +360,16 @@ FILES:${PN}-python = " \ " FILES:${PN}-perl = "${libexecdir}/perf-core/scripts/perl" - -INHIBIT_PACKAGE_DEBUG_SPLIT="1" DEBUG_OPTIMIZATION:append = " -Wno-error=maybe-uninitialized" + +PACKAGESPLITFUNCS =+ "perf_fix_sources" + +perf_fix_sources () { + for f in util/parse-events-flex.h util/parse-events-flex.c util/pmu-flex.c \ + util/expr-flex.h util/expr-flex.c; do + f=${PKGD}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/$f + if [ -e $f ]; then + sed -i -e 's#${S}/##g' $f + fi + done +} diff --git a/poky/meta/recipes-multimedia/ffmpeg/ffmpeg_5.1.2.bb b/poky/meta/recipes-multimedia/ffmpeg/ffmpeg_5.1.2.bb index 0f67c9e949..63abc5d437 100644 --- a/poky/meta/recipes-multimedia/ffmpeg/ffmpeg_5.1.2.bb +++ b/poky/meta/recipes-multimedia/ffmpeg/ffmpeg_5.1.2.bb @@ -141,6 +141,8 @@ LDFLAGS:append:x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -f EXTRA_OEMAKE = "V=1" do_configure() { + export TMPDIR="${B}/tmp" + mkdir -p ${B}/tmp ${S}/configure ${EXTRA_OECONF} sed -i -e "s,^X86ASMFLAGS=.*,& --debug-prefix-map=${S}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} --debug-prefix-map=${B}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR},g" ${B}/ffbuild/config.mak } diff --git a/poky/meta/recipes-multimedia/libtiff/tiff_4.5.0.bb b/poky/meta/recipes-multimedia/libtiff/tiff_4.5.0.bb index 261cb52081..e2cb512892 100644 --- a/poky/meta/recipes-multimedia/libtiff/tiff_4.5.0.bb +++ b/poky/meta/recipes-multimedia/libtiff/tiff_4.5.0.bb @@ -37,6 +37,8 @@ PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg," PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib," PACKAGECONFIG[lzma] = "--enable-lzma,--disable-lzma,xz," PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp," +PACKAGECONFIG[zstd] = "--enable-zstd,--disable-zstd,zstd," +PACKAGECONFIG[libdeflate] = "--enable-libdeflate,--disable-libdeflate,libdeflate," # Convert single-strip uncompressed images to multiple strips of specified # size (default: 8192) to reduce memory usage diff --git a/poky/meta/recipes-multimedia/mpg123/mpg123_1.31.1.bb b/poky/meta/recipes-multimedia/mpg123/mpg123_1.31.2.bb index a8a2377bd4..0a2d870cfa 100644 --- a/poky/meta/recipes-multimedia/mpg123/mpg123_1.31.1.bb +++ b/poky/meta/recipes-multimedia/mpg123/mpg123_1.31.2.bb @@ -10,7 +10,7 @@ LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=e7b9c15fcfb986abb4cc5e8400a24169" SRC_URI = "https://www.mpg123.de/download/${BP}.tar.bz2" -SRC_URI[sha256sum] = "5dcb0936efd44cb583498b6585845206f002a7b19d5066a2683be361954d955a" +SRC_URI[sha256sum] = "b17f22905e31f43b6b401dfdf6a71ed11bb7d056f68db449d70b9f9ae839c7de" UPSTREAM_CHECK_REGEX = "mpg123-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/poky/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch b/poky/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch index 5410ec94e9..e9967767a0 100644 --- a/poky/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch +++ b/poky/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch @@ -1,4 +1,4 @@ -From 5a7caafe04cac805b5057db2632b0defe703eacd Mon Sep 17 00:00:00 2001 +From 174fd202f2c85e43261139d71ad18908cc29b586 Mon Sep 17 00:00:00 2001 From: Randy Witt <randy.e.witt@intel.com> Date: Fri, 16 Oct 2020 16:54:30 -0700 Subject: [PATCH] Makefile: Allow for CC and AR to be overridden @@ -15,11 +15,11 @@ Upstream-Status: Inappropriate [other] 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index 3fbf882..04d3c0f 100644 +index 4df61ec..a229986 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ - VERSION = 2.4 + VERSION = 2.5 -CC = $(CROSS_COMPILE)gcc -AR = $(CROSS_COMPILE)ar +CC ?= $(CROSS_COMPILE)gcc diff --git a/poky/meta/recipes-rt/rt-tests/rt-tests.inc b/poky/meta/recipes-rt/rt-tests/rt-tests.inc index 93fa390bba..0481bf6028 100644 --- a/poky/meta/recipes-rt/rt-tests/rt-tests.inc +++ b/poky/meta/recipes-rt/rt-tests/rt-tests.inc @@ -1,5 +1,5 @@ -SRCREV = "ca4a6293da23ad0fd708ea1fecb2d465a9ea6093" -PV = "2.4" +SRCREV = "4579b9a6d85ae528f76e92421eb5e7b33cd26b17" +PV = "2.5" PE = "1" SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git;branch=main" diff --git a/poky/meta/recipes-sato/puzzles/puzzles_git.bb b/poky/meta/recipes-sato/puzzles/puzzles_git.bb index c94fef4931..1774d0fb20 100644 --- a/poky/meta/recipes-sato/puzzles/puzzles_git.bb +++ b/poky/meta/recipes-sato/puzzles/puzzles_git.bb @@ -2,7 +2,7 @@ SUMMARY = "Simon Tatham's Portable Puzzle Collection" DESCRIPTION = "Collection of small computer programs which implement one-player puzzle games." HOMEPAGE = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENCE;md5=6e7d24cf1c949887ee9447a1e2a4a24c" +LIC_FILES_CHKSUM = "file://LICENCE;md5=92d2b7a2fc96b5f7f17101df7db1fefa" # gtk support includes a bunch of x11 headers REQUIRED_DISTRO_FEATURES = "x11" @@ -10,7 +10,7 @@ REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "git://git.tartarus.org/simon/puzzles.git;branch=main" UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "14c025d192579961d1ade51f2a322bd765aef0e5" +SRCREV = "37df1f2bbc689d224369d963dd8007d68fcd7c6a" PE = "2" PV = "0.0+git${SRCPV}" diff --git a/poky/meta/recipes-support/apr/apr-util/0001-Fix-error-handling-in-gdbm.patch b/poky/meta/recipes-support/apr/apr-util/0001-Fix-error-handling-in-gdbm.patch deleted file mode 100644 index 6f27876a7f..0000000000 --- a/poky/meta/recipes-support/apr/apr-util/0001-Fix-error-handling-in-gdbm.patch +++ /dev/null @@ -1,134 +0,0 @@ -From 6b638fa9afbeb54dfa19378e391465a5284ce1ad Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Wed, 12 Sep 2018 17:16:36 +0800 -Subject: [PATCH] Fix error handling in gdbm - -Only check for gdbm_errno if the return value of the called gdbm_* -function says so. This fixes apr-util with gdbm 1.14, which does not -seem to always reset gdbm_errno. - -Also make the gdbm driver return error codes starting with -APR_OS_START_USEERR instead of always returning APR_EGENERAL. This is -what the berkleydb driver already does. - -Also ensure that dsize is 0 if dptr == NULL. - -Upstream-Status: Backport [https://svn.apache.org/viewvc?view=revision&revision=1825311] - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - dbm/apr_dbm_gdbm.c | 47 +++++++++++++++++++++++++++++------------------ - 1 file changed, 29 insertions(+), 18 deletions(-) - -diff --git a/dbm/apr_dbm_gdbm.c b/dbm/apr_dbm_gdbm.c -index 749447a..1c86327 100644 ---- a/dbm/apr_dbm_gdbm.c -+++ b/dbm/apr_dbm_gdbm.c -@@ -36,13 +36,25 @@ - static apr_status_t g2s(int gerr) - { - if (gerr == -1) { -- /* ### need to fix this */ -- return APR_EGENERAL; -+ if (gdbm_errno == GDBM_NO_ERROR) -+ return APR_SUCCESS; -+ return APR_OS_START_USEERR + gdbm_errno; - } - - return APR_SUCCESS; - } - -+static apr_status_t gdat2s(datum d) -+{ -+ if (d.dptr == NULL) { -+ if (gdbm_errno == GDBM_NO_ERROR || gdbm_errno == GDBM_ITEM_NOT_FOUND) -+ return APR_SUCCESS; -+ return APR_OS_START_USEERR + gdbm_errno; -+ } -+ -+ return APR_SUCCESS; -+} -+ - static apr_status_t datum_cleanup(void *dptr) - { - if (dptr) -@@ -53,22 +65,15 @@ static apr_status_t datum_cleanup(void *dptr) - - static apr_status_t set_error(apr_dbm_t *dbm, apr_status_t dbm_said) - { -- apr_status_t rv = APR_SUCCESS; - -- /* ### ignore whatever the DBM said (dbm_said); ask it explicitly */ -+ dbm->errcode = dbm_said; - -- if ((dbm->errcode = gdbm_errno) == GDBM_NO_ERROR) { -+ if (dbm_said == APR_SUCCESS) - dbm->errmsg = NULL; -- } -- else { -- dbm->errmsg = gdbm_strerror(gdbm_errno); -- rv = APR_EGENERAL; /* ### need something better */ -- } -- -- /* captured it. clear it now. */ -- gdbm_errno = GDBM_NO_ERROR; -+ else -+ dbm->errmsg = gdbm_strerror(dbm_said - APR_OS_START_USEERR); - -- return rv; -+ return dbm_said; - } - - /* -------------------------------------------------------------------------- -@@ -107,7 +112,7 @@ static apr_status_t vt_gdbm_open(apr_dbm_t **pdb, const char *pathname, - NULL); - - if (file == NULL) -- return APR_EGENERAL; /* ### need a better error */ -+ return APR_OS_START_USEERR + gdbm_errno; /* ### need a better error */ - - /* we have an open database... return it */ - *pdb = apr_pcalloc(pool, sizeof(**pdb)); -@@ -141,10 +146,12 @@ static apr_status_t vt_gdbm_fetch(apr_dbm_t *dbm, apr_datum_t key, - if (pvalue->dptr) - apr_pool_cleanup_register(dbm->pool, pvalue->dptr, datum_cleanup, - apr_pool_cleanup_null); -+ else -+ pvalue->dsize = 0; - - /* store the error info into DBM, and return a status code. Also, note - that *pvalue should have been cleared on error. */ -- return set_error(dbm, APR_SUCCESS); -+ return set_error(dbm, gdat2s(rd)); - } - - static apr_status_t vt_gdbm_store(apr_dbm_t *dbm, apr_datum_t key, -@@ -201,9 +208,11 @@ static apr_status_t vt_gdbm_firstkey(apr_dbm_t *dbm, apr_datum_t *pkey) - if (pkey->dptr) - apr_pool_cleanup_register(dbm->pool, pkey->dptr, datum_cleanup, - apr_pool_cleanup_null); -+ else -+ pkey->dsize = 0; - - /* store any error info into DBM, and return a status code. */ -- return set_error(dbm, APR_SUCCESS); -+ return set_error(dbm, gdat2s(rd)); - } - - static apr_status_t vt_gdbm_nextkey(apr_dbm_t *dbm, apr_datum_t *pkey) -@@ -221,9 +230,11 @@ static apr_status_t vt_gdbm_nextkey(apr_dbm_t *dbm, apr_datum_t *pkey) - if (pkey->dptr) - apr_pool_cleanup_register(dbm->pool, pkey->dptr, datum_cleanup, - apr_pool_cleanup_null); -+ else -+ pkey->dsize = 0; - - /* store any error info into DBM, and return a status code. */ -- return set_error(dbm, APR_SUCCESS); -+ return set_error(dbm, gdat2s(rd)); - } - - static void vt_gdbm_freedatum(apr_dbm_t *dbm, apr_datum_t data) --- -2.7.4 - diff --git a/poky/meta/recipes-support/apr/apr-util_1.6.1.bb b/poky/meta/recipes-support/apr/apr-util_1.6.3.bb index b851d46351..7c6fcc699b 100644 --- a/poky/meta/recipes-support/apr/apr-util_1.6.1.bb +++ b/poky/meta/recipes-support/apr/apr-util_1.6.3.bb @@ -13,11 +13,9 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.gz \ file://configfix.patch \ file://configure_fixes.patch \ file://run-ptest \ - file://0001-Fix-error-handling-in-gdbm.patch \ -" + " -SRC_URI[md5sum] = "bd502b9a8670a8012c4d90c31a84955f" -SRC_URI[sha256sum] = "b65e40713da57d004123b6319828be7f1273fbc6490e145874ee1177e112c459" +SRC_URI[sha256sum] = "2b74d8932703826862ca305b094eef2983c27b39d5c9414442e9976a9acf1983" EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ --without-odbc \ diff --git a/poky/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch b/poky/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch index abff4e9331..a274f3a16e 100644 --- a/poky/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch +++ b/poky/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch @@ -1,14 +1,15 @@ -From 2bbe20b4f69e84e7a18bc79d382486953f479328 Mon Sep 17 00:00:00 2001 +From 225abf37cd0b49960664b59f08e515a4c4ea5ad0 Mon Sep 17 00:00:00 2001 From: Jeremy Puhlman <jpuhlman@mvista.com> Date: Thu, 26 Mar 2020 18:30:36 +0000 Subject: [PATCH] Add option to disable timed dependant tests -The disabled tests rely on timing to pass correctly. On a virtualized +The disabled tests rely on timing to pass correctly. On a virtualized system under heavy load, these tests randomly fail because they miss a timer or other timing related issues. Upstream-Status: Pending Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> + --- configure.in | 6 ++++++ include/apr.h.in | 1 + @@ -16,10 +17,10 @@ Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in -index d9f32d6..f0c5661 100644 +index bfd488b..3663220 100644 --- a/configure.in +++ b/configure.in -@@ -2886,6 +2886,12 @@ AC_ARG_ENABLE(timedlocks, +@@ -3023,6 +3023,12 @@ AC_ARG_ENABLE(timedlocks, ) AC_SUBST(apr_has_timedlocks) @@ -45,10 +46,10 @@ index ee99def..c46a5f4 100644 #define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD @apr_procattr_user_set_requires_password@ diff --git a/test/testlock.c b/test/testlock.c -index a43f477..6233d0b 100644 +index e3437c1..04e01b9 100644 --- a/test/testlock.c +++ b/test/testlock.c -@@ -396,13 +396,13 @@ abts_suite *testlock(abts_suite *suite) +@@ -535,7 +535,7 @@ abts_suite *testlock(abts_suite *suite) abts_run_test(suite, threads_not_impl, NULL); #else abts_run_test(suite, test_thread_mutex, NULL); @@ -56,6 +57,8 @@ index a43f477..6233d0b 100644 +#if APR_HAS_TIMEDLOCKS && APR_HAVE_TIME_DEPENDANT_TESTS abts_run_test(suite, test_thread_timedmutex, NULL); #endif + abts_run_test(suite, test_thread_nestedmutex, NULL); +@@ -543,7 +543,7 @@ abts_suite *testlock(abts_suite *suite) abts_run_test(suite, test_thread_rwlock, NULL); abts_run_test(suite, test_cond, NULL); abts_run_test(suite, test_timeoutcond, NULL); @@ -63,7 +66,4 @@ index a43f477..6233d0b 100644 +#if APR_HAS_TIMEDLOCKS && APR_HAVE_TIME_DEPENDANT_TESTS abts_run_test(suite, test_timeoutmutex, NULL); #endif - #endif --- -2.23.0 - + #ifdef WIN32 diff --git a/poky/meta/recipes-support/apr/apr/0001-add-AC_CACHE_CHECK-for-strerror_r-return-type.patch b/poky/meta/recipes-support/apr/apr/0001-add-AC_CACHE_CHECK-for-strerror_r-return-type.patch deleted file mode 100644 index d0a9bd9129..0000000000 --- a/poky/meta/recipes-support/apr/apr/0001-add-AC_CACHE_CHECK-for-strerror_r-return-type.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 8ca3c3306f1a149e51a3be6a4b1e47e9aee88262 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 23 Aug 2022 22:42:03 -0700 -Subject: [PATCH] add AC_CACHE_CHECK for strerror_r return type - -APR's configure script uses AC_TRY_RUN to detect whether the return type -of strerror_r is int. When cross-compiling this defaults to no. - -This commit adds an AC_CACHE_CHECK so users who cross-compile APR may -influence the outcome with a configure variable. - -Upstream-Status: Backport [https://svn.apache.org/viewvc?view=revision&revision=1875065] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - build/apr_common.m4 | 11 ++++------- - 1 file changed, 4 insertions(+), 7 deletions(-) - -diff --git a/build/apr_common.m4 b/build/apr_common.m4 -index cbf2a4c..42e75cf 100644 ---- a/build/apr_common.m4 -+++ b/build/apr_common.m4 -@@ -525,8 +525,9 @@ dnl string. - dnl - dnl - AC_DEFUN([APR_CHECK_STRERROR_R_RC], [ --AC_MSG_CHECKING(for type of return code from strerror_r) --AC_TRY_RUN([ -+AC_CACHE_CHECK([whether return code from strerror_r has type int], -+[ac_cv_strerror_r_rc_int], -+[AC_TRY_RUN([ - #include <errno.h> - #include <string.h> - #include <stdio.h> -@@ -542,14 +543,10 @@ main() - }], [ - ac_cv_strerror_r_rc_int=yes ], [ - ac_cv_strerror_r_rc_int=no ], [ -- ac_cv_strerror_r_rc_int=no ] ) -+ ac_cv_strerror_r_rc_int=no ] ) ] ) - if test "x$ac_cv_strerror_r_rc_int" = xyes; then - AC_DEFINE(STRERROR_R_RC_INT, 1, [Define if strerror returns int]) -- msg="int" --else -- msg="pointer" - fi --AC_MSG_RESULT([$msg]) - ] ) - - dnl --- -2.37.2 - diff --git a/poky/meta/recipes-support/apr/apr/0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch b/poky/meta/recipes-support/apr/apr/0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch index fa6202da79..a78b16284f 100644 --- a/poky/meta/recipes-support/apr/apr/0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch +++ b/poky/meta/recipes-support/apr/apr/0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch @@ -1,4 +1,4 @@ -From ee728971fd9d2da39356f1574d58d5daa3b24520 Mon Sep 17 00:00:00 2001 +From 316b81c462f065927d7fec56aadd5c8cb94d1cf0 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 26 Aug 2022 00:28:08 -0700 Subject: [PATCH] configure: Remove runtime test for mmap that can map @@ -10,24 +10,25 @@ mutexes Upstream-Status: Inappropriate [Cross-compile specific] Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- - configure.in | 32 -------------------------------- - 1 file changed, 32 deletions(-) + configure.in | 30 ------------------------------ + 1 file changed, 30 deletions(-) diff --git a/configure.in b/configure.in -index a99049d..f1f55c7 100644 +index 3663220..dce9789 100644 --- a/configure.in +++ b/configure.in -@@ -1182,38 +1182,6 @@ AC_CHECK_FUNCS([mmap munmap shm_open shm_unlink shmget shmat shmdt shmctl \ +@@ -1303,36 +1303,6 @@ AC_CHECK_FUNCS([mmap munmap shm_open shm_unlink shmget shmat shmdt shmctl \ APR_CHECK_DEFINE(MAP_ANON, sys/mman.h) AC_CHECK_FILE(/dev/zero) -# Not all systems can mmap /dev/zero (such as HP-UX). Check for that. -if test "$ac_cv_func_mmap" = "yes" && -- test "$ac_cv_file__dev_zero" = "yes"; then -- AC_MSG_CHECKING(for mmap that can map /dev/zero) -- AC_TRY_RUN([ --#include <sys/types.h> +- test "$ac_cv_file__dev_zero" = "yes"; then +- AC_CACHE_CHECK([for mmap that can map /dev/zero], +- [ac_cv_mmap__dev_zero], +- [AC_TRY_RUN([#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#ifdef HAVE_SYS_MMAN_H @@ -49,14 +50,9 @@ index a99049d..f1f55c7 100644 - return 3; - } - return 0; -- }], [], [ac_cv_file__dev_zero=no], [ac_cv_file__dev_zero=no]) -- -- AC_MSG_RESULT($ac_cv_file__dev_zero) +- }], [], [ac_cv_file__dev_zero=no], [ac_cv_file__dev_zero=no])]) -fi - # Now we determine which one is our anonymous shmem preference. haveshmgetanon="0" havemmapzero="0" --- -2.37.2 - diff --git a/poky/meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch b/poky/meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch index 72e706f966..d63423f3a1 100644 --- a/poky/meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch +++ b/poky/meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch @@ -1,8 +1,7 @@ -From 5925b20da8bbc34d9bf5a5dca123ef38864d43c6 Mon Sep 17 00:00:00 2001 +From 689a8db96a6d1e1cae9cbfb35d05ac82140a6555 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Tue, 30 Jan 2018 09:39:06 +0800 -Subject: [PATCH 2/7] apr: Remove workdir path references from installed apr - files +Subject: [PATCH] apr: Remove workdir path references from installed apr files Upstream-Status: Inappropriate [configuration] @@ -14,20 +13,23 @@ packages at target run time, the workdir path caused confusion. Rebase to 1.6.3 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + --- - apr-config.in | 26 ++------------------------ - 1 file changed, 2 insertions(+), 24 deletions(-) + apr-config.in | 32 ++------------------------------ + 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/apr-config.in b/apr-config.in -index 84b4073..bbbf651 100644 +index bed47ca..47874e5 100644 --- a/apr-config.in +++ b/apr-config.in -@@ -152,14 +152,7 @@ while test $# -gt 0; do +@@ -164,16 +164,7 @@ while test $# -gt 0; do flags="$flags $LDFLAGS" ;; --includes) - if test "$location" = "installed"; then flags="$flags -I$includedir $EXTRA_INCLUDES" +- elif test "$location" = "crosscompile"; then +- flags="$flags -I$APR_TARGET_DIR/$includedir $EXTRA_INCLUDES" - elif test "$location" = "source"; then - flags="$flags -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES" - else @@ -37,13 +39,15 @@ index 84b4073..bbbf651 100644 ;; --srcdir) echo $APR_SOURCE_DIR -@@ -181,29 +174,14 @@ while test $# -gt 0; do +@@ -197,33 +188,14 @@ while test $# -gt 0; do exit 0 ;; --link-ld) - if test "$location" = "installed"; then - ### avoid using -L if libdir is a "standard" location like /usr/lib - flags="$flags -L$libdir -l${APR_LIBNAME}" +- elif test "$location" = "crosscompile"; then +- flags="$flags -L$APR_TARGET_DIR/$libdir -l${APR_LIBNAME}" - else - ### this surely can't work since the library is in .libs? - flags="$flags -L$APR_BUILD_DIR -l${APR_LIBNAME}" @@ -62,6 +66,8 @@ index 84b4073..bbbf651 100644 - # Since the user is specifying they are linking with libtool, we - # *know* that -R will be recognized by libtool. - flags="$flags -L$libdir -R$libdir -l${APR_LIBNAME}" +- elif test "$location" = "crosscompile"; then +- flags="$flags -L${APR_TARGET_DIR}/$libdir -l${APR_LIBNAME}" - else - flags="$flags $LA_FILE" - fi @@ -69,6 +75,3 @@ index 84b4073..bbbf651 100644 ;; --shlib-path-var) echo "$SHLIBPATH_VAR" --- -1.8.3.1 - diff --git a/poky/meta/recipes-support/apr/apr/0003-Makefile.in-configure.in-support-cross-compiling.patch b/poky/meta/recipes-support/apr/apr/0003-Makefile.in-configure.in-support-cross-compiling.patch deleted file mode 100644 index 4dd53bd8eb..0000000000 --- a/poky/meta/recipes-support/apr/apr/0003-Makefile.in-configure.in-support-cross-compiling.patch +++ /dev/null @@ -1,63 +0,0 @@ -From d5028c10f156c224475b340cfb1ba025d6797243 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Fri, 2 Feb 2018 15:51:42 +0800 -Subject: [PATCH 3/7] Makefile.in/configure.in: support cross compiling - -While cross compiling, the tools/gen_test_char could not -be executed at build time, use AX_PROG_CC_FOR_BUILD to -build native tools/gen_test_char - -Upstream-Status: Submitted [https://github.com/apache/apr/pull/8] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - Makefile.in | 10 +++------- - configure.in | 3 +++ - 2 files changed, 6 insertions(+), 7 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 5fb760e..8675f90 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -46,7 +46,7 @@ LT_VERSION = @LT_VERSION@ - - CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \ - build/apr_rules.out tools/gen_test_char@EXEEXT@ \ -- tools/gen_test_char.o tools/gen_test_char.lo \ -+ tools/gen_test_char.o \ - include/private/apr_escape_test_char.h - DISTCLEAN_TARGETS = config.cache config.log config.status \ - include/apr.h include/arch/unix/apr_private.h \ -@@ -131,13 +131,9 @@ check: $(TARGET_LIB) - etags: - etags `find . -name '*.[ch]'` - --OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS) --tools/gen_test_char.lo: tools/gen_test_char.c -+tools/gen_test_char@EXEEXT@: tools/gen_test_char.c - $(APR_MKDIR) tools -- $(LT_COMPILE) -- --tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char) -- $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS) -+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $< -o $@ - - include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@ - $(APR_MKDIR) include/private -diff --git a/configure.in b/configure.in -index 719f331..361120f 100644 ---- a/configure.in -+++ b/configure.in -@@ -183,6 +183,9 @@ dnl can only be used once within a configure script, so this prevents a - dnl preload section from invoking the macro to get compiler info. - AC_PROG_CC - -+dnl Check build CC for gen_test_char compiling which is executed at build time. -+AX_PROG_CC_FOR_BUILD -+ - dnl AC_PROG_SED is only avaliable in recent autoconf versions. - dnl Use AC_CHECK_PROG instead if AC_PROG_SED is not present. - ifdef([AC_PROG_SED], --- -1.8.3.1 - diff --git a/poky/meta/recipes-support/apr/apr/0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch b/poky/meta/recipes-support/apr/apr/0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch deleted file mode 100644 index d1a2ebe881..0000000000 --- a/poky/meta/recipes-support/apr/apr/0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 49661ea3858cf8494926cccf57d3e8c6dcb47117 Mon Sep 17 00:00:00 2001 -From: Dengke Du <dengke.du@windriver.com> -Date: Wed, 14 Dec 2016 18:13:08 +0800 -Subject: [PATCH] apr: fix off_t size doesn't match in glibc when cross - compiling - -In configure.in, it contains the following: - - APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], off_t, 8) - -the macro "APR_CHECK_SIZEOF_EXTENDED" was defined in build/apr_common.m4, -it use the "AC_TRY_RUN" macro, this macro let the off_t to 8, when cross -compiling enable. - -So it was hardcoded for cross compiling, we should detect it dynamic based on -the sysroot's glibc. We change it to the following: - - AC_CHECK_SIZEOF(off_t) - -The same for the following hardcoded types for cross compiling: - - pid_t 8 - ssize_t 8 - size_t 8 - off_t 8 - -Change the above correspondingly. - -Signed-off-by: Dengke Du <dengke.du@windriver.com> - -Upstream-Status: Pending - ---- - configure.in | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure.in b/configure.in -index 27b8539..fb408d1 100644 ---- a/configure.in -+++ b/configure.in -@@ -1801,7 +1801,7 @@ else - socklen_t_value="int" - fi - --APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], pid_t, 8) -+AC_CHECK_SIZEOF(pid_t) - - if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then - pid_t_fmt='#define APR_PID_T_FMT "hd"' -@@ -1873,7 +1873,7 @@ APR_CHECK_TYPES_FMT_COMPATIBLE(size_t, unsigned long, lu, [size_t_fmt="lu"], [ - APR_CHECK_TYPES_FMT_COMPATIBLE(size_t, unsigned int, u, [size_t_fmt="u"]) - ]) - --APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], ssize_t, 8) -+AC_CHECK_SIZEOF(ssize_t) - - dnl the else cases below should no longer occur; - AC_MSG_CHECKING([which format to use for apr_ssize_t]) -@@ -1891,7 +1891,7 @@ fi - - ssize_t_fmt="#define APR_SSIZE_T_FMT \"$ssize_t_fmt\"" - --APR_CHECK_SIZEOF_EXTENDED([#include <stddef.h>], size_t, 8) -+AC_CHECK_SIZEOF(size_t) - - # else cases below should no longer occur; - AC_MSG_CHECKING([which format to use for apr_size_t]) -@@ -1909,7 +1909,7 @@ fi - - size_t_fmt="#define APR_SIZE_T_FMT \"$size_t_fmt\"" - --APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], off_t, 8) -+AC_CHECK_SIZEOF(off_t) - - if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then - # Enable LFS diff --git a/poky/meta/recipes-support/apr/apr/CVE-2021-35940.patch b/poky/meta/recipes-support/apr/apr/CVE-2021-35940.patch deleted file mode 100644 index 00befdacee..0000000000 --- a/poky/meta/recipes-support/apr/apr/CVE-2021-35940.patch +++ /dev/null @@ -1,58 +0,0 @@ - -SECURITY: CVE-2021-35940 (cve.mitre.org) - -Restore fix for CVE-2017-12613 which was missing in 1.7.x branch, though -was addressed in 1.6.x in 1.6.3 and later via r1807976. - -The fix was merged back to 1.7.x in r1891198. - -Since this was a regression in 1.7.0, a new CVE name has been assigned -to track this, CVE-2021-35940. - -Thanks to Iveta Cesalova <icesalov redhat.com> for reporting this issue. - -https://svn.apache.org/viewvc?view=revision&revision=1891198 - -Upstream-Status: Backport -CVE: CVE-2021-35940 -Signed-off-by: Armin Kuster <akuster@mvista.com> - - -Index: time/unix/time.c -=================================================================== ---- a/time/unix/time.c (revision 1891197) -+++ b/time/unix/time.c (revision 1891198) -@@ -142,6 +142,9 @@ - static const int dayoffset[12] = - {306, 337, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275}; - -+ if (xt->tm_mon < 0 || xt->tm_mon >= 12) -+ return APR_EBADDATE; -+ - /* shift new year to 1st March in order to make leap year calc easy */ - - if (xt->tm_mon < 2) -Index: time/win32/time.c -=================================================================== ---- a/time/win32/time.c (revision 1891197) -+++ b/time/win32/time.c (revision 1891198) -@@ -54,6 +54,9 @@ - static const int dayoffset[12] = - {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; - -+ if (tm->wMonth < 1 || tm->wMonth > 12) -+ return APR_EBADDATE; -+ - /* Note; the caller is responsible for filling in detailed tm_usec, - * tm_gmtoff and tm_isdst data when applicable. - */ -@@ -228,6 +231,9 @@ - static const int dayoffset[12] = - {306, 337, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275}; - -+ if (xt->tm_mon < 0 || xt->tm_mon >= 12) -+ return APR_EBADDATE; -+ - /* shift new year to 1st March in order to make leap year calc easy */ - - if (xt->tm_mon < 2) diff --git a/poky/meta/recipes-support/apr/apr/autoconf270.patch b/poky/meta/recipes-support/apr/apr/autoconf270.patch deleted file mode 100644 index 9f7b5c624c..0000000000 --- a/poky/meta/recipes-support/apr/apr/autoconf270.patch +++ /dev/null @@ -1,22 +0,0 @@ -With autoconf 2.70 confdefs.h is already included. Including it twice generates -compiler warnings and since this macros is to error on warnings, it breaks. - -Fix by not including the file. - -Upstream-Status: Pending -RP - 2021/1/28 - -Index: apr-1.7.0/build/apr_common.m4 -=================================================================== ---- apr-1.7.0.orig/build/apr_common.m4 -+++ apr-1.7.0/build/apr_common.m4 -@@ -505,8 +505,7 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING], - fi - AC_COMPILE_IFELSE( - [AC_LANG_SOURCE( -- [#include "confdefs.h" -- ] -+ [] - [[$1]] - [int main(int argc, const char *const *argv) {] - [[$2]] diff --git a/poky/meta/recipes-support/apr/apr/libtoolize_check.patch b/poky/meta/recipes-support/apr/apr/libtoolize_check.patch index 740792e6b0..80ce43caa4 100644 --- a/poky/meta/recipes-support/apr/apr/libtoolize_check.patch +++ b/poky/meta/recipes-support/apr/apr/libtoolize_check.patch @@ -1,6 +1,7 @@ +From 17835709bc55657b7af1f7c99b3f572b819cf97e Mon Sep 17 00:00:00 2001 From: Helmut Grohne <helmut@subdivi.de> -Subject: check for libtoolize rather than libtool -Last-Update: 2014-09-19 +Date: Tue, 7 Feb 2023 07:04:00 +0000 +Subject: [PATCH] check for libtoolize rather than libtool libtool is now in package libtool-bin, but apr only needs libtoolize. @@ -8,14 +9,22 @@ Upstream-Status: Pending [ from debian: https://sources.debian.org/data/main/a/a Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- apr.orig/build/buildcheck.sh -+++ apr/build/buildcheck.sh -@@ -39,11 +39,11 @@ fi +--- + build/buildcheck.sh | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +diff --git a/build/buildcheck.sh b/build/buildcheck.sh +index 44921b5..08bc8a8 100755 +--- a/build/buildcheck.sh ++++ b/build/buildcheck.sh +@@ -39,13 +39,11 @@ fi # ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a # output is multiline from 1.5 onwards -# Require libtool 1.4 or newer --libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14` +-if test -z "$libtool"; then +- libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14` +-fi -lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` +# Require libtoolize 1.4 or newer +libtoolize=`build/PrintPath glibtoolize1 glibtoolize libtoolize libtoolize15 libtoolize14` diff --git a/poky/meta/recipes-support/apr/apr_1.7.0.bb b/poky/meta/recipes-support/apr/apr_1.7.2.bb index cb4bb936d7..c9059c9921 100644 --- a/poky/meta/recipes-support/apr/apr_1.7.0.bb +++ b/poky/meta/recipes-support/apr/apr_1.7.2.bb @@ -16,21 +16,15 @@ BBCLASSEXTEND = "native nativesdk" SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ file://run-ptest \ file://0002-apr-Remove-workdir-path-references-from-installed-ap.patch \ - file://0003-Makefile.in-configure.in-support-cross-compiling.patch \ file://0004-Fix-packet-discards-HTTP-redirect.patch \ file://0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \ - file://0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch \ file://0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch \ file://libtoolize_check.patch \ file://0001-Add-option-to-disable-timed-dependant-tests.patch \ - file://autoconf270.patch \ - file://0001-add-AC_CACHE_CHECK-for-strerror_r-return-type.patch \ file://0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch \ - file://CVE-2021-35940.patch \ " -SRC_URI[md5sum] = "7a14a83d664e87599ea25ff4432e48a7" -SRC_URI[sha256sum] = "e2e148f0b2e99b8e5c6caa09f6d4fb4dd3e83f744aa72a952f94f5a14436f7ea" +SRC_URI[sha256sum] = "75e77cc86776c030c0a5c408dfbd0bf2a0b75eed5351e52d5439fa1e5509a43e" inherit autotools-brokensep lib_package binconfig multilib_header ptest multilib_script diff --git a/poky/meta/recipes-support/diffoscope/diffoscope_230.bb b/poky/meta/recipes-support/diffoscope/diffoscope_234.bb index 496ed9e602..994d3e9422 100644 --- a/poky/meta/recipes-support/diffoscope/diffoscope_230.bb +++ b/poky/meta/recipes-support/diffoscope/diffoscope_234.bb @@ -12,7 +12,7 @@ PYPI_PACKAGE = "diffoscope" inherit pypi setuptools3 -SRC_URI[sha256sum] = "a35908c15bb006058f74c2d4f2be3b1ac7cf62c872cfbd2950114a8a705d8108" +SRC_URI[sha256sum] = "6091d555bc88ceca285dc40e63df56b57385aa0dc552daa70bde81e8a69f8c7a" RDEPENDS:${PN} += "binutils vim squashfs-tools python3-libarchive-c python3-magic python3-rpm" diff --git a/poky/meta/recipes-support/gnutls/gnutls/Add-ptest-support.patch b/poky/meta/recipes-support/gnutls/gnutls/Add-ptest-support.patch new file mode 100644 index 0000000000..8ad6ba5ad5 --- /dev/null +++ b/poky/meta/recipes-support/gnutls/gnutls/Add-ptest-support.patch @@ -0,0 +1,60 @@ +From 74080376904713a8e6cceefbc25c81512796bf0c Mon Sep 17 00:00:00 2001 +From: Ravineet Singh <ravineet.a.singh@est.tech> +Date: Tue, 10 Jan 2023 16:11:10 +0100 +Subject: [PATCH] gnutls: add ptest support + +Upstream-Status: Inappropriate [embedded specific] +Signed-off-by: Ravineet Singh <ravineet.a.singh@est.tech> +--- + Makefile.am | 3 +++ + configure.ac | 2 ++ + tests/Makefile.am | 6 ++++++ + 3 files changed, 11 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index 843193f9f..816b09fec 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -191,6 +191,9 @@ dist-hook: + mv ChangeLog $(distdir) + touch -c $(distdir)/doc/*.html $(distdir)/doc/*.pdf $(distdir)/doc/*.info + ++install-ptest: ++ $(MAKE) -C tests DESTDIR=$(DESTDIR)/tests $@ ++ + .PHONY: abi-check abi-dump-versioned abi-dump-latest pic-check symbol-check local-code-coverage-output files-update AUTHORS + + include $(top_srcdir)/cligen/cligen.mk +diff --git a/configure.ac b/configure.ac +index baff1c007..f9f596abf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1150,6 +1150,8 @@ AC_SUBST(LIBGNUTLS_CFLAGS) + + AM_CONDITIONAL(NEEDS_LIBRT, test "$gnutls_needs_librt" = "yes") + ++AM_EXTRA_RECURSIVE_TARGETS([buildtest-TESTS]) ++ + AC_DEFINE([GNUTLS_INTERNAL_BUILD], 1, [We allow temporarily usage of deprecated functions - until they are removed.]) + + hw_features= +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 573e911a0..e8a26f8b9 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -644,6 +644,12 @@ SH_LOG_COMPILER = $(SHELL) + AM_VALGRINDFLAGS = --suppressions=$(srcdir)/suppressions.valgrind + LOG_COMPILER = $(LOG_VALGRIND) + ++install-ptest: $(check_PROGRAMS) ++ @$(INSTALL) -d $(DESTDIR) ++ @for file in $^; do \ ++ $(INSTALL_PROGRAM) $$file $(DESTDIR) ; \ ++ done ++ + distclean-local: + rm -rf softhsm-*.db softhsm-*.config *.tmp tmp-* x509-crt-list-import-url.config.db port.lock.d + +-- +2.31.1 + diff --git a/poky/meta/recipes-support/gnutls/gnutls/run-ptest b/poky/meta/recipes-support/gnutls/gnutls/run-ptest new file mode 100644 index 0000000000..84948f487d --- /dev/null +++ b/poky/meta/recipes-support/gnutls/gnutls/run-ptest @@ -0,0 +1,90 @@ +#!/bin/sh + +rjob() { + local job=$1 + local log=$2 + + # TODO: Output will be garbled + ./${job} >> ${log} 2>&1 + + ret=$? + case $ret in + 0) + echo "PASS: $t" >> ${log} + echo "PASS: $t" + ;; + 77) + echo "SKIP: $t" >> ${log} + echo "SKIP: $t" + ;; + *) + echo "FAIL: $t" >> ${log} + echo "FAIL: $t" + ;; + esac +} + +is_disallowed() { + local key=$1 + $(echo ${test_disallowlist} | grep -w -q ${key}) + return $? +} + +# TODO +# This list should probably be in a external file +# Testcases defined here either take very long time (dtls-stress) +# or are dependent on local files (certs, etc) in local file system +# currently not exported to target. + +test_disallowlist="" +test_disallowlist="${test_disallowlist} dtls-stress" +test_disallowlist="${test_disallowlist} handshake-large-cert" +test_disallowlist="${test_disallowlist} id-on-xmppAddr" +test_disallowlist="${test_disallowlist} mini-x509-cas" +test_disallowlist="${test_disallowlist} pkcs12_simple" +test_disallowlist="${test_disallowlist} protocol-set-allowlist" +test_disallowlist="${test_disallowlist} psk-file" +test_disallowlist="${test_disallowlist} rawpk-api" +test_disallowlist="${test_disallowlist} set_pkcs12_cred" +test_disallowlist="${test_disallowlist} system-override-curves-allowlist" +test_disallowlist="${test_disallowlist} system-override-hash" +test_disallowlist="${test_disallowlist} system-override-sig" +test_disallowlist="${test_disallowlist} system-override-sig-tls" +test_disallowlist="${test_disallowlist} system-prio-file" +test_disallowlist="${test_disallowlist} x509cert-tl" + +LOG=${PWD}/tests.log +cd tests +max_njobs=$(grep -c ^processor /proc/cpuinfo) +njobs=0 + +for t in *; do + [ -x $t ] || continue + [ -f $t ] || continue + + is_disallowed ${t} + [ $? -eq 0 ] && continue + + rjob ${t} ${LOG} & + one=1 + njobs=$(expr ${njobs} + ${one}) + if [ ${njobs} -eq ${max_njobs} ]; then + wait + njobs=0 + fi +done +wait + +skipped=$(grep -c SKIP ${LOG}) +passed=$(grep -c PASS ${LOG}) +failed=$(grep -c FAIL ${LOG}) +total=$(expr ${passed} + ${failed} + ${skipped}) + +echo +echo "gnutls test summary:" +echo "--------------------" +echo "total: ${total}" +echo "pass : ${passed}" +echo "fail : ${failed}" +echo "skip : ${skipped}" +echo diff --git a/poky/meta/recipes-support/gnutls/gnutls_3.7.8.bb b/poky/meta/recipes-support/gnutls/gnutls_3.7.8.bb index 8f979a5b99..fee06393bd 100644 --- a/poky/meta/recipes-support/gnutls/gnutls_3.7.8.bb +++ b/poky/meta/recipes-support/gnutls/gnutls_3.7.8.bb @@ -22,11 +22,13 @@ SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz \ file://arm_eabi.patch \ file://0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch \ + file://run-ptest \ + file://Add-ptest-support.patch \ " SRC_URI[sha256sum] = "c58ad39af0670efe6a8aee5e3a8b2331a1200418b64b7c51977fb396d4617114" -inherit autotools texinfo pkgconfig gettext lib_package gtk-doc +inherit autotools texinfo pkgconfig gettext lib_package gtk-doc ptest PACKAGECONFIG ??= "libidn ${@bb.utils.filter('DISTRO_FEATURES', 'seccomp', d)}" @@ -68,6 +70,10 @@ do_install:append:class-target() { fi } +do_compile:append() { + oe_runmake ${PARALLEL_MAKE} -C tests buildtest-TESTS +} + PACKAGES =+ "${PN}-openssl ${PN}-xx ${PN}-fips" FILES:${PN}-dev += "${bindir}/gnutls-cli-debug" diff --git a/poky/meta/recipes-support/libgit2/libgit2_1.5.0.bb b/poky/meta/recipes-support/libgit2/libgit2_1.5.1.bb index ee4d79b11a..59866ce385 100644 --- a/poky/meta/recipes-support/libgit2/libgit2_1.5.0.bb +++ b/poky/meta/recipes-support/libgit2/libgit2_1.5.1.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=112e6bb421dea73cd41de09e777f2d2c" DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2" -SRC_URI = "git://github.com/libgit2/libgit2.git;branch=main;protocol=https" -SRCREV = "fbea439d4b6fc91c6b619d01b85ab3b7746e4c19" +SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.5;protocol=https" +SRCREV = "42e5db98b963ae503229c63e44e06e439df50e56" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-support/nghttp2/nghttp2_1.51.0.bb b/poky/meta/recipes-support/nghttp2/nghttp2_1.51.0.bb index fc1a592200..8ddb851f71 100644 --- a/poky/meta/recipes-support/nghttp2/nghttp2_1.51.0.bb +++ b/poky/meta/recipes-support/nghttp2/nghttp2_1.51.0.bb @@ -15,7 +15,7 @@ PACKAGECONFIG[manpages] = "" # examples are never installed, and don't need to be built in the # first place -EXTRA_OECMAKE = "-DENABLE_EXAMPLES=OFF -DENABLE_APP=OFF -DENABLE_HPACK_TOOLS=OFF" +EXTRA_OECMAKE = "-DENABLE_EXAMPLES=OFF -DENABLE_APP=OFF -DENABLE_HPACK_TOOLS=OFF -DENABLE_PYTHON_BINDINGS=OFF" PACKAGES =+ "lib${BPN} ${PN}-client ${PN}-proxy ${PN}-server" diff --git a/poky/meta/recipes-support/rng-tools/rng-tools_6.15.bb b/poky/meta/recipes-support/rng-tools/rng-tools_6.16.bb index efc08b5e0a..02abe486bb 100644 --- a/poky/meta/recipes-support/rng-tools/rng-tools_6.15.bb +++ b/poky/meta/recipes-support/rng-tools/rng-tools_6.16.bb @@ -6,14 +6,14 @@ HOMEPAGE = "https://github.com/nhorman/rng-tools" BUGTRACKER = "https://github.com/nhorman/rng-tools/issues" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "sysfsutils openssl" +DEPENDS = "sysfsutils openssl libcap" SRC_URI = "git://github.com/nhorman/rng-tools.git;branch=master;protocol=https \ file://init \ file://default \ file://rng-tools.service \ " -SRCREV = "381f69828b782afda574f259c1b7549f48f9bb77" +SRCREV = "e061c313b95890eb5fa0ada0cd6eec619dafdfe2" S = "${WORKDIR}/git" @@ -27,7 +27,8 @@ PACKAGECONFIG:libc-musl = "libargp libjitterentropy" PACKAGECONFIG[libargp] = "--with-libargp,--without-libargp,argp-standalone," PACKAGECONFIG[libjitterentropy] = "--enable-jitterentropy,--disable-jitterentropy,libjitterentropy" PACKAGECONFIG[libp11] = "--with-pkcs11,--without-pkcs11,libp11 openssl" -PACKAGECONFIG[nistbeacon] = "--with-nistbeacon,--without-nistbeacon,curl libxml2 openssl" +PACKAGECONFIG[nistbeacon] = "--with-nistbeacon,--without-nistbeacon,curl libxml2" +PACKAGECONFIG[qrypt] = "--with-qrypt,--without-qrypt,curl" INITSCRIPT_NAME = "rng-tools" INITSCRIPT_PARAMS = "start 03 2 3 4 5 . stop 30 0 6 1 ." diff --git a/poky/meta/site/loongarch64-linux b/poky/meta/site/loongarch64-linux new file mode 100644 index 0000000000..38bc5f044d --- /dev/null +++ b/poky/meta/site/loongarch64-linux @@ -0,0 +1,11 @@ +# general +ac_cv_alignof_guint32=4 +ac_cv_alignof_guint64=8 +ac_cv_alignof_unsigned_long=8 + +# glib-2.0 +glib_cv_stack_grows=${glib_cv_stack_grows=no} +glib_cv_uscore=${glib_cv_uscore=no} + +# startup-notification +lf_cv_sane_realloc=${lf_cv_sane_realloc=yes} diff --git a/poky/scripts/contrib/image-manifest b/poky/scripts/contrib/image-manifest index 3c07a73a4e..4d65a99258 100755 --- a/poky/scripts/contrib/image-manifest +++ b/poky/scripts/contrib/image-manifest @@ -392,7 +392,7 @@ def export_manifest_info(args): for key in rd.getVarFlags('PACKAGECONFIG').keys(): if key == 'doc': continue - rvalues[pn]['packageconfig_opts'][key] = rd.getVarFlag('PACKAGECONFIG', key, True) + rvalues[pn]['packageconfig_opts'][key] = rd.getVarFlag('PACKAGECONFIG', key) if config['patches'] == 'yes': patches = oe.recipeutils.get_recipe_patches(rd) diff --git a/poky/scripts/lib/devtool/menuconfig.py b/poky/scripts/lib/devtool/menuconfig.py index d87a01e7a9..18daef30c3 100644 --- a/poky/scripts/lib/devtool/menuconfig.py +++ b/poky/scripts/lib/devtool/menuconfig.py @@ -45,7 +45,7 @@ def menuconfig(args, config, basepath, workspace): return 1 check_workspace_recipe(workspace, args.component) - pn = rd.getVar('PN', True) + pn = rd.getVar('PN') if not rd.getVarFlag('do_menuconfig','task'): raise DevtoolError("This recipe does not support menuconfig option") diff --git a/poky/scripts/lib/wic/canned-wks/qemuloongarch.wks b/poky/scripts/lib/wic/canned-wks/qemuloongarch.wks new file mode 100644 index 0000000000..8465c7a8c0 --- /dev/null +++ b/poky/scripts/lib/wic/canned-wks/qemuloongarch.wks @@ -0,0 +1,3 @@ +# short-description: Create qcow2 image for LoongArch QEMU machines + +part / --source rootfs --fstype=ext4 --label root --align 4096 --size 5G diff --git a/poky/scripts/runqemu b/poky/scripts/runqemu index 5907390573..def11ea911 100755 --- a/poky/scripts/runqemu +++ b/poky/scripts/runqemu @@ -1313,7 +1313,7 @@ class BaseConfig(object): """attempt to determine the appropriate qemu-system binary""" mach = self.get('MACHINE') if not mach: - search = '.*(qemux86-64|qemux86|qemuarm64|qemuarm|qemumips64|qemumips64el|qemumipsel|qemumips|qemuppc).*' + search = '.*(qemux86-64|qemux86|qemuarm64|qemuarm|qemuloongarch64|qemumips64|qemumips64el|qemumipsel|qemumips|qemuppc).*' if self.rootfs: match = re.match(search, self.rootfs) if match: @@ -1336,6 +1336,8 @@ class BaseConfig(object): qbsys = 'x86_64' elif mach == 'qemuppc': qbsys = 'ppc' + elif mach == 'qemuloongarch64': + qbsys = 'loongarch64' elif mach == 'qemumips': qbsys = 'mips' elif mach == 'qemumips64': |