diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2023-03-03 21:41:14 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2023-03-17 01:04:34 +0300 |
| commit | 6aa7eec5002756f5398774a35fb9d985e15a4573 (patch) | |
| tree | e183e1e35404e51cc1f889b603e3500594ce09f6 /poky/meta/recipes-devtools | |
| parent | 9347dd4efc156c93b1d9beaeb32e9b719ad6a3d2 (diff) | |
| download | openbmc-6aa7eec5002756f5398774a35fb9d985e15a4573.tar.xz | |
subtree updates: openembedded poky
poky: aa6cd06a9f..fb1853c66c:
Adrian Freihofer (1):
bblayers/setupwriters/oe-setup-layers: create dir if not exists
Alexander Kanavin (48):
bblayers/makesetup: skip git repos that are submodules
scripts/oe-setup-layers: print a note about submodules if present
go: update 1.19.4 -> 1.20
go-cross-canadian: use gcc-crosssdk, not gcc-native
vim: update 9.0.1211 -> 9.0.1293 to resolve open CVEs
gstreamer1.0: update 1.20.5 -> 1.22.0
mesa: update 22.3.3 -> 22.3.5
meta/conf: move default configuration templates into meta/conf/templates/default
scripts/oe-setup-layers: correct variable names - layers should be called repos
scripts/oe-setup-layers: do not clobber json module with a variable named 'json'
gcr: enable vala .vapi generation only when gobject introspection is also enabled
gstreamer1.0-python: do not require introspection during builds
go: update 1.20 -> 1.20.1
rust: update 1.67.0 -> 1.67.1
freetype: update 2.12.1 -> 2.13.0
gnutls: update 3.7.8 -> 3.8.0
vulkan-samples: update to latest revision
gnu-config: update to latest revision
puzzles: upgrade to latest revision
python3: upgrade 3.11.1 -> 3.11.2
nghttp2: upgrade 1.51.0 -> 1.52.0
log4cplus: upgrade 2.0.8 -> 2.1.0
dos2unix: upgrade 7.4.3 -> 7.4.4
webkitgtk: upgrade 2.38.4 -> 2.38.5
man-pages: upgrade 6.02 -> 6.03
util-macros: upgrade 1.19.3 -> 1.20.0
dpkg: upgrade 1.21.19 -> 1.21.20
ruby: upgrade 3.2.0 -> 3.2.1
libwpe: upgrade 1.14.0 -> 1.14.1
vala: upgrade 0.56.3 -> 0.56.4
dbus: upgrade 1.14.4 -> 1.14.6
linux-firmware: upgrade 20230117 -> 20230210
zstd: upgrade 1.5.2 -> 1.5.4
python3-setuptools: upgrade 67.2.0 -> 67.3.1
mmc-utils: upgrade to latest revision
harfbuzz: upgrade 6.0.0 -> 7.0.0
libhandy: upgrade 1.8.0 -> 1.8.1
diffoscope: upgrade 234 -> 235
wireless-regdb: upgrade 2022.08.12 -> 2023.02.13
libcap: upgrade 2.66 -> 2.67
e2fsprogs: upgrade 1.46.5 -> 1.47.0
git: upgrade 2.39.1 -> 2.39.2
piglit: upgrade to latest revision
python3-hatchling: upgrade 1.12.2 -> 1.13.0
devtool: ignore patch-fuzz errors when extracting source
gcr: correctly configure vala against introspection data
selftest: do not check for dri.pc in the headless test
scripts/runqemu: move render nodes check to runqemu from selftest
Alexis Lothoré (8):
oeqa/selftest/resulttooltests: fix minor typo
scripts/oe-selftest: append metadata to tests results
scripts/resulttool/regression: remove unused import
scripts/resulttool/regression: add metadata filtering for oeselftest
scripts: add new helper for regression report generation
oeqa/selftest: add test for yocto_testresults_query.py
scripts/yoct_testresults_query: manage base/target revision not found
oeqa/selftest/resulttool: add test for metadata filtering on regression
Bruce Ashfield (11):
linux-yocto/5.19: drop recipes
yocto-bsps: remove 5.19 bbappend
lttng-modules: fix for kernel 6.2+
linux-yocto-rt/6.1: fix compilation issue with per cpu stats
linux-yocto-dev: bump to v6.2
linux-yocto/6.1: update to v6.1.12
linux-yocto/5.15: update to v5.15.94
linux-yocto/6.1: update to v6.1.14
linux-yocto/5.15: update to v5.15.96
linux-yocto-rt/6.1: update to -rt7
linux-yocto-rt/5.15: update to -rt59
Caner Altinbasak (1):
bitbake: fetch2: Add GIT_CACHE_PATH and SSL_CERT_DIR into FETCH_EXPORT_VARS
Chee Yang Lee (2):
tar: Fix CVE-2022-48303
checklayer: check for patch file upstream status
Chen Qi (1):
gpgme: fix python setuptools invalid version issue
Denys Zagorui (1):
kernel-devsrc: powerpc: add missed dependency for modules_prepare
Dmitry Baryshkov (4):
linux-firmware: properly set license for all Qualcomm firmware
linux-firmware: add yamato fw files to qcom-adreno-a2xx package
mesa: provide support for packing development and testing tools
ffmpeg: fix build failure when vulkan is enabled
Fawzi KHABER (1):
ref-manual: update DEV_PKG_DEPENDENCY in variables
Federico Pellegrin (1):
curl: fix dependencies when building with ldap/ldaps
Geoffrey GIRY (1):
cve-extra-exclusions: ignore inapplicable linux-yocto CVEs
Joe Slater (1):
tar: Update fix for CVE-2022-48303 to upstream version
Joel Stanley (1):
qemu: Fix building with 6.2 kernel headers
Jose Quaresma (2):
bluez5: refresh patches with devtool
icecc: enable the network only when ICECC_DISABLED is not set
Joshua Watt (4):
classes/populate_sdk_base: Append cleandirs
classes/create-sdpx-2.2: Remove image SPDX and index from deploydir
classes/create-spdx-2.2: Report downloads as separate packages
weston: Add kiosk shell
Kai Kang (2):
xserver-xorg: 21.1.6 -> 21.1.7
webkitgtk: 2.38.3 -> 2.38.4
Khem Raj (12):
unfs3: Add missing header files
stress-ng: Add missing header files for clock_adjtime
gstreamer1.0-plugins-good: Fix build with musl
elfutils: Backport fix for DW_TAG_unspecified_type handling
tune-riscv.inc: Add riscv64nc to available tunes list
grub: Handle R_RISCV_CALL_PLT reloc
gdb: Upgrade to 13.1
musl: Update to tip of trunk
kernel: Add kernel specific OBJDUMP
opensbi: Do not add dependencies if RISCV_SBI_FDT is not set
opensbi: Upgrade to 1.2 release
vte: Fix -Wenum-constexpr-conversion warning
Lee Chee Yang (1):
migration-guides: add release-notes for 4.0.7
Luca Boccassi (1):
systemd: add user for systemd-oomd if enabled
Marek Vasut (1):
systemd-systemctl: Create machine-id with "uninitialized" text in it
Mark Asselstine (1):
bitbake: fetch/npmsw: add more short forms for git operations
Markus Volk (3):
graphene: add a PACKAGECONFIG for arm_neon
libportal: allow to build without gtk4 backend
libsdl2: add missing libdecor RDEPEND
Martin Jansa (3):
python3-numpy: upgrade to 1.24.2
insane.bbclass: use 4 spaces for indentation
insane.bbclass: move Upstream-Status logic to oe.qa
Mateusz Marciniec (1):
sstatesig: Improve output hash calculation
Michael Opdenacker (17):
migration-guides/migration-4.2.rst: fix minor issues
ref-manual: variables.rst: fix broken hyperlink
profile-manual: update WireShark hyperlinks
manuals: replace unnecessary uses of 'yocto_docs' by internal references
bsp-guide: fix broken git URLs and missing word
ref-manual: improve "devtool check-upgrade-status" explanations
ref-manual: document Rust classes
manuals: update patchwork instance URL
ref-manual: classes.rst: add python-setuptools3_rust and python_pyo3 classes
dev-manual: new-recipe.rst: restructure examples
ref-manual: classes.rst: improvements to cmake class documentation
ref-manual: document meson class and variables
dev-manual: sbom.rst: add link to FOSDEM 2023 video
manuals: document COMMERCIAL_[AUDIO|VIDEO]_PLUGINS variables
ref-manual: system-requirements.rst: update supported distros
dev-manual: new-recipe.rst: add Meson example recipe
dev-manual: new-recipe.rst: add references to subsections in Examples section
Mike Crowe (1):
bitbake: gitsm: Fix path construction for relative submodule URI
Mikko Rapeli (8):
oeqa ssh.py: move output prints to new line
oeqa ssh.py: add connection keep alive options to ssh client
oeqa dump.py: add error counter and stop after 5 failures
oeqa qemurunner: read more data at a time from serial
oeqa qemurunner.py: add timeout to QMP calls
oeqa qemurunner.py: try to avoid reading one character at a time
oeqa ssh.py: fix hangs in run()
runqemu: kill qemu if it hangs
Mingli Yu (1):
mc: set ac_cv_path_PERL_FOR_BUILD
Narpat Mali (1):
libseccomp: fix for the ptest result format
Niko Mauno (1):
ref-manual: Fix invalid feature name
Paulo Neves (4):
bitbake: tests/fetch: git-lfs restore _find_git_lfs
bitbake: tests/fetch: Add real git lfs tests and decorator
bitbake: fetch/git: Removed unused variables in _contains_lfs
bitbake: fetch/git: Replace mkdtemp with TemporaryDirectory and avoid exception masking
Pavel Zhukov (4):
wic: Fix usage of fstype=none in wic
u-boot: Map arm64 into map for u-boot dts installation
wic: Fix populating of IMAGE_EFI_BOOT_FILES with uefi-kernel
oeqa/selftest/wic: Add test for uefi-kernel loader
Pedro Baptista (3):
bitbake: action.py: add topdir in bblayers_conf path for add-layer
bitbake: action.py: add topdir in bblayers_conf path for remove-layer
create.py: add command arg to add layer to bblayers.conf
Peter Kjellerstedt (1):
devshell: Do not add scripts/git-intercept to PATH
Peter Marko (1):
systemd: add group sgx to udev package
Petr Kubizňák (1):
graphene: remove introspection from PACKAGECONFIG
Richard Elberger (2):
docbook-xml: Switch from debian packages to upstream docbook sources
bitbake: documentation: bitbake: add file-checksums to varflags section
Richard Leitner (1):
ref-manual: variables: FIT_KERNEL_COMP_ALG: add lzo
Richard Purdie (20):
bitbake: cookerdata: Remove incorrect SystemExit usage
libssh2: Clean up ptest patch/coverage
bitbake: data: Evaluate the value of export/unexport/network flags
poky.conf: Update SANITY_TESTED_DISTROS to match autobuilder
bitbake: cookerdata: Improve early exception handling
bitbake: cookerdata: Drop dubious exception handling code
bitbake: runqueue: Drop SystemExit usage
bitbake: cooker: Ensure lock is held with changing notifier
bitbake: server/process: Improve idle thread exception handling
bitbake: event/cooker/runqueue: Add ability to interrupt longer running code
bitbake: bitbake: Bump to version 2.3.1
sstate: Add check_for_interrupts() call functionality added in bitbake
binutils: Fix nativesdk ld.so search
oeqa/selftest/prservice: Improve debug output for failure
bitbake: cooker: Fix memory resident cache invalidation issue
bitbake: fetch2/wget: Drop unused import
bitbake: utils: Use internal fetcher function to avoid duplication
resulttool/regression: Ensure LTP results are only compared against other LTP runs
resulttool/regression: Improve matching of poor ptest test names
build-appliance-image: Update to master head revision
Robert Joslyn (1):
curl: Update 7.87.0 to 7.88.0
Ross Burton (17):
lib/buildstats: handle tasks that never finished
cml1: remove redundant addtask
bitbake: fetch2/wget: clean up netrc usage
libcgroup: clean up musl DEPENDS
pkgconfig: use system glib for nativesdk builds
site: remove glib site values
less: backport the fix for CVE-2022-46663
tiff: backport fix for CVE-2022-48281
python3-atomicwrites: add BBCLASSEXTEND
python3-iniconfig: add BBCLASSEXTEND
python3-pytest: set RDEPENDS globally, not just target
bitbake: lib/bb/siggen: fix debug() call
ptest-runner: add non-root ptest user for tests to run as
meta-selftest/files: add ptest to static-passwd/-group
quilt: run tests as ptest user, and let that user write into the tests
glibc: add ignore for CVE-2023-25139
glibc: remove obsolete CVE ignores
Saul Wold (2):
busybox: Fix depmod patch
create-spdx-2.2: Add support for custom Annotations
Siddharth Doshi (1):
openssl: Upgrade 3.0.7 -> 3.0.8
Tim Orling (7):
python3-hypothesis: upgrade 6.66.0 -> 6.68.1
python3-typing-extensions: upgrade 4.4.0 -> 4.5.0
python3-cryptography{-vectors}: 39.0.0 -> 39.0.1
python3-more-itertools: upgrade 9.0.0 -> 9.1.0
python3-zipp: upgrade 3.14.0 -> 3.15.0
python3-hypothesis: upgrade 6.68.1 -> 6.68.2
python3-babel: upgrade 2.11.0 -> 2.12.1
Trevor Woerner (12):
packagegroup-self-hosted: alphabetize
packagegroup-self-hosted: add zstd
build-appliance-image: set TERM
build-appliance-image kernel: linux-yocto: qemuall: add taskstats
build-appliance-image: add /lib64 symlink
build-appliance-image: QB_MEM: allow user config
QB_SMP: allow user modification
build-appliance-image: check for xattr feature
dtc: update DESCRIPTION
dtc: update license checks
build-appliance-image: fix HOMEPAGE
VOLATILE_TMP_DIR: add
Ulrich Ölmann (5):
dev-manual: fix old override syntax
kernel-yocto: fix kernel-meta data detection
kernel-dev,ref-manual: fix old override syntax
ref-manual: refer to MACHINE variable instead of KMACHINE
kernel-dev: harmonize example with ref-manual
Wang Mingyu (21):
libdrm: upgrade 2.4.114 -> 2.4.115
libjpeg-turbo: upgrade 2.1.5 -> 2.1.5.1
libsdl2: upgrade 2.26.2 -> 2.26.3
lighttpd: upgrade 1.4.68 -> 1.4.69
openssh: upgrade 9.1p1 -> 9.2p1
python3-sphinx-rtd-theme: upgrade 1.1.1 -> 1.2.0
python3-zipp: upgrade 3.12.0 -> 3.13.0
xkeyboard-config: upgrade 2.37 -> 2.38
xwayland: upgrade 22.1.7 -> 22.1.8
libx11: 1.8.3 -> 1.8.4
dtc: upgrade 1.6.1 -> 1.7.0
liburcu: upgrade 0.13.2 -> 0.14.0
curl: upgrade 7.88.0 -> 7.88.1
harfbuzz: upgrade 7.0.0 -> 7.0.1
libx11-compose-data: 1.8.3 -> 1.8.4
python3-pip: update 23.0 -> 23.0.1
python3-poetry-core: upgrade 1.5.0 -> 1.5.1
python3-pytest-subtests: upgrade 0.9.0 -> 0.10.0
python3-zipp: upgrade 3.13.0 -> 3.14.0
python3-setuptools: upgrade 67.3.1 -> 67.3.3
diffoscope: upgrade 235 -> 236
Xiangyu Chen (1):
dhcpcd: fix dhcpcd start failure on qemuppc64
Yash Shinde (1):
glibc: stable 2.37 branch updates.
Yi Zhao (1):
glibc: unify wordsize.h between arm and aarch64
leimaohui (2):
gnutls: Updated ther patch which fixes build error for fips enabled.
nghttp2: Deleted the entries for -client and -server, and removed a dependency on them from the main package.
yanxk (1):
cpio: Add ptest support
meta-openembedded: cba6df61c7..a9b2d1303b:
Alex Kiernan (1):
ostree: Upgrade 2022.7 -> 2023.1
Arash Partow (1):
ExprTk: Update package to release/0.0.2
Archana Polampalli (1):
Nodejs: fix buildpaths warning
Bartosz Golaszewski (5):
libgpiod: update to v1.6.4
libgpiod: add a recipe for libgpiod v2.0-rc2
python3-gpiod: new package
libgpiod: bump version to v2.0-rc3
python3-gpiod: bump version to v2.0-rc3
Catalin Enache (1):
plocate: add recipe
Changqing Li (1):
liblockfile: fix do_install failure when ldconfig is not installed
Chee Yang Lee (2):
tinyproxy: fix CVE-2022-40468
tmux: update to tmux_3.3a
Chen Qi (1):
nodejs: add CVE_PRODUCT
Cook, Samuel (1):
python-systemd: update from v234 to v235
Craig Comstock (1):
cfengine: upgrade to 3.21.0
Denys Dmytriyenko (2):
lmbench: set up /usr/bin/hello as alternative
mbedtls: set up /usr/bin/hello as alternative
Fabio Estevam (2):
spice-gtk: Update to version 0.42
glmark2: Update to 2023.01
Jan Luebbe (5):
add signing.bbclass as infrastructure for build artifact signing
smemstat: add recipe
linux-serial-test: add recipe
atftp: upgrade from 0.7.5 to 0.8.0
atftp: use https for git repository access
Joe Slater (1):
phoronix-test-suite: fix CVE-2022-40704
Joshua Watt (2):
libvpx: Explicitly link with pthread support
libvpx: Enable native support
Khem Raj (7):
python3-cson: Make PEP440 compatible version scheme
python3-grpcio: Add missing include for close/open APIs
graphene: Delete recipe
glog: Link with libatomics on mips.
glog: Fix build with clang on 32bit platforms
networkmanager: Fix build with musl
liburing: Update to latest tip of tree
Lei Maohui (1):
libiodbc: Fix install conflict when enable multilib.
Marek Vasut (1):
v4l-utils: Update 1.23.0+fd544473 -> 1.23.0+9431e4b2
Markus Volk (10):
iwd: update 2.0 -> 2.3
libdeflate: add recipe
pipewire-media-session: update 0.4.1 -> 0.4.2
gnome-software: update 43.2 -> 43.4
fwupd: fix polkit rules.d permissions
pipewire: update 0.3.65 -> 0.3.66
appstream: update 0.15.5 -> 0.16.1
flatpak: update 1.15.1 -> 1.15.3
gparted: update 1.4.0 -> 1.5.0
webp-pixbuf-loader: update 0.0.7 -> 0.2.0
Martin Jansa (4):
nodejs: fix do_install failure with 'shared' PACKAGECONFIG
nodejs: add Upstream-Status
openhpi, uw-imag, python3-m2crypto: replace Unknown Upstream-Status with Pending
.patch: fix Upstream-Status formatting issues reported by patchreview tool from oe-core
Michael Haener (1):
usb-modeswitch: update 2.6.0 -> 2.6.1
Michael Opdenacker (1):
ipcalc: update to 1.0.2
Mingli Yu (2):
opencv: disable intel IPP
mariadb: Upgrade to 10.11.2
Narpat Mali (1):
net-snmp: CVE-2022-44792 & CVE-2022-44793 Fix NULL Pointer Exception
Pablo Saavedra (1):
graphene: disable neon support on arm 32bits
Petr Gotthard (5):
libqmi: upgrade 1.30.8 -> 1.32.2
libmbim: upgrade 1.26.4 -> 1.28.2
modemmanager: upgrade 1.18.12 -> 1.20.4
openvpn: upgrade 2.5.8 -> 2.6.0
python3-scapy: upgrade 2.4.5 -> 2.5.0
Randy MacLeod (1):
python3-pillow: Add distutils, unixadmin for ptest
Ross Burton (10):
python3-simpleeval: update patch status
nodejs: remove redundant expand=True to getVar()
nodejs: run configure.py in verbose mode
nodejs: use a postfunc to prune source tree
nodejs: don't force cross-compilation in native builds
nodejs: remove LD assignment
nodejs: no need to stage binaries for target
nodejs: remove redundant comment
zchunk: upgrade to 1.2.4
liburing: enable native/nativesdk builds
Stefano Babic (1):
zchunk: upgrade 1.2.4 -> 1.3.0
Tom Hochstein (1):
nlohmann-json: Allow empty main package for SDK
Ulrich Ölmann (1):
tnftp: switch to using variable flags for alternatives
Wang Mingyu (104):
python3-apt: upgrade 2.5.0 -> 2.5.2
python3-aspectlib: upgrade 1.5.2 -> 2.0.0
python3-aiohttp-jinja2: upgrade 1.5 -> 1.5.1
python3-astroid: upgrade 2.13.2 -> 2.14.1
python3-bitarray: upgrade 2.6.2 -> 2.7.0
python3-cantools: upgrade 38.0.1 -> 38.0.2
python3-coverage: upgrade 7.0.5 -> 7.1.0
python3-cmd2: upgrade 2.4.2 -> 2.4.3
python3-django: upgrade 4.1.3 -> 4.1.6
python3-dateparser: upgrade 1.1.6 -> 1.1.7
python3-elementpath: upgrade 3.0.2 -> 4.0.1
python3-evdev: upgrade 1.6.0 -> 1.6.1
python3-flask-wtf: upgrade 1.1.0 -> 1.1.1
python3-fastnumbers: upgrade 3.2.1 -> 4.0.1
python3-flask-migrate: upgrade 4.0.1 -> 4.0.4
python3-luma-oled: upgrade 3.9.0 -> 3.11.0
python3-google-api-python-client: upgrade 2.72.0 -> 2.77.0
python3-ipython: upgrade 8.8.0 -> 8.9.0
python3-icu: upgrade 2.8.1 -> 2.10.2
python3-license-expression: upgrade 30.0.0 -> 30.1.0
python3-meh: upgrade 0.50.1 -> 0.51
python3-portalocker: upgrade 2.6.0 -> 2.7.0
python3-pandas: upgrade 1.5.2 -> 1.5.3
python3-openpyxl: upgrade 3.0.10 -> 3.1.0
python3-paramiko: upgrade 2.12.0 -> 3.0.0
python3-portion: Upgrade 2.3.0 -> 2.3.1
python3-pymisp: upgrade 2.4.167 -> 2.4.168
python3-pymodbus: upgrade 3.1.0 -> 3.1.3
python3-pykickstart: upgrade 3.34 -> 3.43
python3-pyscaffold: upgrade 4.3.1 -> 4.4
python3-pywbem: upgrade 1.5.0 -> 1.6.0
python3-sentry-sdk: upgrade 1.13.0 -> 1.15.0
python3-qrcode: upgrade 7.3.1 -> 7.4.2
python3-reedsolo: upgrade 1.6.1 -> 1.7.0
python3-simplejson: upgrade 3.18.1 -> 3.18.3
python3-traitlets: upgrade 5.8.1 -> 5.9.0
python3-sqlalchemy: upgrade 1.4.46 -> 2.0.3
python3-websocket-client: upgrade 1.4.2 -> 1.5.1
python3-xlsxwriter: upgrade 3.0.7 -> 3.0.8
python3-xmlschema: upgrade 2.1.1 -> 2.2.1
ctags: upgrade 6.0.20230115.0 -> 6.0.20230212.0
ddrescue: upgrade 1.26 -> 1.27
editorconfig-core-c: upgrade 0.12.5 -> 0.12.6
htpdate: upgrade 1.3.6 -> 1.3.7
iscsi-initiator-utils: upgrade 2.1.7 -> 2.1.8
geoclue: upgrade 2.6.0 -> 2.7.0
htop: upgrade 3.2.1 -> 3.2.2
hwdata: upgrade 0.366 -> 0.367
glog: upgrade 0.5.0 -> 0.6.0
libtevent: upgrade 0.13.0 -> 0.14.1
libtdb: upgrade 1.4.7 -> 1.4.8
libtalloc: upgrade 2.3.4 -> 2.4.0
jack: upgrade 1.19.21 -> 1.19.22
jsonrpc: upgrade 1.3.0 -> 1.4.1
liburing: upgrade 2.2 -> 2.3
libusb-compat: upgrade 0.1.7 -> 0.1.8
networkmanager: upgrade 1.40.10 -> 1.42.0
minicoredumper: upgrade 2.0.2 -> 2.0.3
neon: upgrade 0.32.4 -> 0.32.5
nano: upgrade 7.1 -> 7.2
netplan: upgrade 0.104 -> 0.106
rdma-core: upgrade 42.0 -> 44.0
pcsc-tools: upgrade 1.6.1 -> 1.6.2
poppler-data: upgrade 0.4.11 -> 0.4.12
sshpass: upgrade 1.09 -> 1.10
poppler: upgrade 23.01.0 -> 23.02.0
postgresql: upgrade 14.5 -> 15.2
sip: upgrade 6.7.5 -> 6.7.7
uchardet: upgrade 0.0.7 -> 0.0.8
zabbix: upgrade 6.2.6 -> 6.2.7
uftrace: upgrade 0.13 -> 0.13.1
krb5: Fix install conflict when enable multilib.
libnet: Fix install conflict when enable multilib.
imlib2: Fix install conflict when enable multilib.
python3-aiofiles: upgrade 22.1.0 -> 23.1.0
python3-aiohttp: upgrade 3.8.3 -> 3.8.4
python3-alembic: upgrade 1.9.2 -> 1.9.4
python3-antlr4-runtime: upgrade 4.11.1 -> 4.12.0
python3-astroid: upgrade 2.14.1 -> 2.14.2
python3-autobahn: upgrade 23.1.1 -> 23.1.2
python3-bitstruct: upgrade 8.15.1 -> 8.17.0
python3-bitarray: upgrade 2.7.0 -> 2.7.3
python3-django: upgrade 4.1.6 -> 4.1.7
python3-google-api-python-client: upgrade 2.77.0 -> 2.79.0
python3-flask: upgrade 2.2.2 -> 2.2.3
python3-huey: upgrade 2.4.4 -> 2.4.5
python3-google-auth: upgrade 2.16.0 -> 2.16.1
python3-ipython: upgrade 8.9.0 -> 8.10.0
python3-imageio: upgrade 2.25.0 -> 2.25.1
python3-openpyxl: upgrade 3.1.0 -> 3.1.1
python3-pykickstart: upgrade 3.43 -> 3.44
python3-pydantic: upgrade 1.10.4 -> 1.10.5
python3-pytest-forked: upgrade 1.4.0 -> 1.6.0
python3-pytest-xdist: upgrade 3.1.0 -> 3.2.0
python3-redis: upgrade 4.4.2 -> 4.5.1
python3-soupsieve: upgrade 2.3.2.post1 -> 2.4
python3-simpleeval: upgrade 0.9.12 -> 0.9.13
python3-stevedore: upgrade 4.1.1 -> 5.0.0
python3-sqlalchemy: upgrade 2.0.3 -> 2.0.4
python3-watchdog: upgrade 2.2.1 -> 2.3.0
python3-werkzeug: upgrade 2.2.2 -> 2.2.3
python3-zeroconf: upgrade 0.47.1 -> 0.47.3
python3-coverage: upgrade 7.1.0 -> 7.2.0
python3-eth-keyfile: upgrade 0.6.0 -> 0.6.1
Yi Zhao (7):
meta-python: fix Upstream-Status format
meta-oe: fix Upstream-Status format
meta-networking: fix Upstream-Status format
fatresize: fix Upstream-Status format
apache2: use /run instead of /var/run for systemd volatile config
phpmyadmin: upgrade 5.2.0 -> 5.2.1
ufs-utils: upgrade 1.9 -> 3.12.3
bhargav_das@mentor.com (1):
python3-daemon_2.3.2.bb: add python-daemon recipe for python3
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I826d53d70744bc80ebe8b60203241dfddce7d5fe
Diffstat (limited to 'poky/meta/recipes-devtools')
94 files changed, 594 insertions, 908 deletions
diff --git a/poky/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch b/poky/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch index 8e5e2be81d..54967b9362 100644 --- a/poky/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch +++ b/poky/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch @@ -65,7 +65,7 @@ index eff6693e052..95787012b89 100644 info.path = NULL; info.len = info.alloc = 0; - tmppath = concat (ld_sysroot, prefix, "/etc/ld.so.conf", -+ tmppath = concat (ld_sysconfdir, "/etc/ld.so.conf", ++ tmppath = concat (ld_sysconfdir, "/ld.so.conf", (const char *) NULL); if (!ldelf_parse_ld_so_conf (&info, tmppath)) { diff --git a/poky/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch b/poky/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch index c1385631d7..1f3364900c 100644 --- a/poky/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch +++ b/poky/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch @@ -1,97 +1,12 @@ +21/3/2023: modified to remove 4.0 + docbook-xml: update catalog.xml Refer Ubuntu 13.04 to update catalog.xml Upstream-Status: Inappropriate [docbook 4.x development has ceased, docbook 5 is entirely different] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - docbook-4.0/catalog.xml | 72 +++++++++++++++++++++++++++++++++++++++++++++++ - docbook-4.1.2/catalog.xml | 66 +++++++++++++++++++++++++++++++++++++++++++ - docbook-4.2/catalog.xml | 69 ++++++--------------------------------------- - docbook-4.3/catalog.xml | 72 ++++++++--------------------------------------- - docbook-4.4/catalog.xml | 63 ++--------------------------------------- - docbook-4.5/catalog.xml | 63 ++--------------------------------------- - 6 files changed, 165 insertions(+), 240 deletions(-) - create mode 100644 docbook-4.0/catalog.xml - create mode 100644 docbook-4.1.2/catalog.xml -diff --git a/docbook-4.0/catalog.xml b/docbook-4.0/catalog.xml -new file mode 100644 ---- /dev/null -+++ b/docbook-4.0/catalog.xml -@@ -0,0 +1,72 @@ -+<?xml version='1.0'?> -+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" -+ "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd"> -+ -+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> -+ -+<!-- ...................................................................... --> -+<!-- XML Catalog data for DocBook XML V4.0............................... --> -+<!-- File catalog.xml ..................................................... --> -+ -+<!-- Please direct all questions, bug reports, or suggestions for -+ changes to the docbook@lists.oasis-open.org mailing list. For more -+ information, see http://www.oasis-open.org/. -+ --> -+ -+<!-- This is the catalog data file for DocBook V4.0. It is provided as -+ a convenience in building your own catalog files. You need not use -+ the filenames listed here, and need not use the filename method of -+ identifying storage objects at all. See the documentation for -+ detailed information on the files associated with the DocBook DTD. -+ See XML Catalogs at http://www.oasis-open.org/committees/entity/ for -+ detailed information on supplying and using catalog data. -+ --> -+ -+<!-- ...................................................................... --> -+<!-- DocBook driver file .................................................. --> -+ -+<public publicId="-//Norman Walsh//DTD DocBk XML V4.0//EN" -+ uri="docbookx.dtd"/> -+ -+<!-- Other ways to refer to DocBook XML v4.0............................... --> -+<public publicId="-//Norman Walsh//DTD DocBook XML V4.0//EN" -+ uri="docbookx.dtd"/> -+ -+<system systemId="http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd" -+ uri="docbookx.dtd"/> -+ -+<!-- ...................................................................... --> -+<!-- DocBook modules ...................................................... --> -+ -+<public publicId="-//Norman Walsh//ENTITIES DocBook XML Notations V4.0//EN" -+ uri="dbnotnx.mod"/> -+ -+<public publicId="-//Norman Walsh//ENTITIES DocBook XML Character Entities V4.0//EN" -+ uri="dbcentx.mod"/> -+ -+<public publicId="-//Norman Walsh//ELEMENTS DocBook XML Information Pool V4.0//EN" -+ uri="dbpoolx.mod"/> -+ -+<public publicId="-//Norman Walsh//ELEMENTS DocBook XML Document Hierarchy V4.0//EN" -+ uri="dbhierx.mod"/> -+ -+<public publicId="-//Norman Walsh//ENTITIES DocBook XML Additional General Entities V4.0//EN" -+ uri="dbgenent.mod"/> -+ -+<public publicId="-//Norman Walsh//DTD CALS Table Model XML V4.0//EN" -+ uri="calstblx.dtd"/> -+ -+<!-- UNOFFICIAL conversion of the exchange table model to XML, based on the OASIS Exchange --> -+<!-- Table Model PUBLIC "-//SGML Open//DTD Exchange Table Model 19960430//EN" --> -+<public publicId="-//Normal Walsh//Exchange Table Model 19960430 XML V4.0//EN" -+ uri="soextblx.dtd"/> -+ -+<!-- the following FPI is declared for the DTD inside the DTD, but we'll --> -+<!-- use the version from the latest DocBook -+<public publicId="-//OASIS//DTD XML Exchange Table Model 19990315//EN" -+ uri="soextblx.dtd"/> --> -+ -+<!-- End of catalog data for DocBook XML V4.0 ............................. --> -+<!-- ...................................................................... --> -+ -+</catalog> diff --git a/docbook-4.1.2/catalog.xml b/docbook-4.1.2/catalog.xml new file mode 100644 --- /dev/null diff --git a/poky/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb b/poky/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb index 2bec1442af..e4b4201b1f 100644 --- a/poky/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb +++ b/poky/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb @@ -1,30 +1,47 @@ SUMMARY = "Document type definitions for verification of XML data files" DESCRIPTION = "Document type definitions for verification of XML data \ -files against the DocBook rule set, it ships with the latest DocBook 4.5 \ -XML DTD, as well as a selected set of legacy DTDs for use with older \ -documents, including 4.0, 4.1.2, 4.2, 4.3 and 4.4" -HOMEPAGE = "http://www.docbook.org/xml/" +files against the DocBook rule set." +HOMEPAGE = "https://docbook.org" + +# The upstream sources are not distributed with a license file. +# LICENSE-OASIS is included as a "patch" to workaround this. When +# upgrading this recipe, please verify whether this is still needed. LICENSE = "OASIS" LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" -# Note: the upstream sources are not distributed with a license file. -# LICENSE-OASIS is included as a "patch" to workaround this. When -# upgrading this recipe, please verify whether this is still needed. -SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/d/docbook-xml/docbook-xml_${PV}.orig.tar.gz \ - file://LICENSE-OASIS \ - file://docbook-xml-update-catalog.xml.patch \ -" +# To support apps with xml schema backward compatibility, we must +# install a set of schemas. Install the latest based on PV and then +# name any specific versions as required. TODO: Figure out a mechanism +# to filter exactly which versions are necessary, if that's even +# possible. +# +# DocBook.org lists available release packages at https://docbook.org/xml/. +# +# The release packages relate docbook source at +# https://github.com/docbook/docbook but building them requires the +# Gradle build system. In future, it might be safer to use the source +# tree which would also enable proper SBOM generation through the +# bitbake build system. +# -SRC_URI[md5sum] = "487b4d44e15cffb1f4048af23f98208e" -SRC_URI[sha256sum] = "b0f8edcf697f5318e63dd98c9a931f3fee167af0805ba441db372e0f17b2a44f" +SRC_URI = "https://docbook.org/xml/4.1.2/docbkx412.zip;name=payload412;subdir=docbook-4.1.2 \ + https://docbook.org/xml/4.2/docbook-xml-4.2.zip;name=payload42;subdir=docbook-4.2 \ + https://docbook.org/xml/4.3/docbook-xml-4.3.zip;name=payload43;subdir=docbook-4.3 \ + https://docbook.org/xml/4.4/docbook-xml-4.4.zip;name=payload44;subdir=docbook-4.4 \ + https://docbook.org/xml/${PV}/docbook-xml-${PV}.zip;name=payloadPV;subdir=docbook-${PV} \ + file://docbook-xml-update-catalog.xml.patch \ + file://LICENSE-OASIS" -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/docbook-xml/" +SRC_URI[payload412.sha256sum] = "30f0644064e0ea71751438251940b1431f46acada814a062870f486c772e7772" +SRC_URI[payload42.sha256sum] = "acc4601e4f97a196076b7e64b368d9248b07c7abf26b34a02cca40eeebe60fa2" +SRC_URI[payload43.sha256sum] = "23068a94ea6fd484b004c5a73ec36a66aa47ea8f0d6b62cc1695931f5c143464" +SRC_URI[payload44.sha256sum] = "02f159eb88c4254d95e831c51c144b1863b216d909b5ff45743a1ce6f5273090" +SRC_URI[payloadPV.sha256sum] = "4e4e037a2b83c98c6c94818390d4bdd3f6e10f6ec62dd79188594e26190dc7b4" -S = "${WORKDIR}/docbook-xml-4.5.c31424" +UPSTREAM_CHECK_REGEX = "docbook-xml-(?P<pver>4(\.\d+)).zip" -inherit allarch -BBCLASSEXTEND = "native" +S = "${WORKDIR}" do_configure (){ : @@ -38,15 +55,20 @@ do_install () { install -d ${D}${sysconfdir}/xml/ xmlcatalog --create --noout ${D}${sysconfdir}/xml/docbook-xml.xml - for DTDVERSION in 4.0 4.1.2 4.2 4.3 4.4 4.5; do + for DTDVERSION in 4.1.2 4.2 4.3 4.4 4.5; do DEST=${datadir}/xml/docbook/schema/dtd/$DTDVERSION install -d -m 755 ${D}$DEST cp -v -R docbook-$DTDVERSION/* ${D}$DEST - xmlcatalog --verbose --noout --add nextCatalog unused file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml + xmlcatalog --verbose --noout --add nextCatalog unused \ + file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml done } +# Magic environment variable is required for downstream recipe processing XMLCATALOGS = "${sysconfdir}/xml/docbook-xml.xml" inherit xmlcatalog FILES:${PN} = "${datadir}/* ${sysconfdir}/xml/docbook-xml.xml" + +inherit allarch +BBCLASSEXTEND = "native" 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 160adbbe6e..f2367c95e9 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 b68fcf0e23b91dca7fecfeeceb1c4267e29e6f9d Mon Sep 17 00:00:00 2001 +From e3ade3464b8a1129a55c2790cf114d9ae01e3cda 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.19.bb b/poky/meta/recipes-devtools/dpkg/dpkg_1.21.20.bb index 8d0eb40bd6..a6ed4fd429 100644 --- a/poky/meta/recipes-devtools/dpkg/dpkg_1.21.19.bb +++ b/poky/meta/recipes-devtools/dpkg/dpkg_1.21.20.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 = "2f3105279e0fb2255f39b2e9a11f15837cacd44b" +SRCREV = "6c5140f124925ad4eb12fb2c8e83a050028bbc1f" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-Add-option-to-enable-disable-largefile-support.patch b/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-Add-option-to-enable-disable-largefile-support.patch deleted file mode 100644 index a770d0cf89..0000000000 --- a/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-Add-option-to-enable-disable-largefile-support.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 6fab3346d448298a24cee1faeb5fc8507a3b9712 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 10 Nov 2022 20:34:54 -0800 -Subject: [PATCH] Add option to enable/disable largefile support - -fallocate can be used to have 64bit off_t provided its compiled with -_FILE_OFFSET_BITS=64 which will be added automatically when ---enable-largefile is used. - -Upstream-Status: Submitted [https://github.com/tytso/e2fsprogs/pull/129] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure.ac | 3 +++ - misc/e4defrag.c | 6 +----- - 2 files changed, 4 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index dff3d1ca..ec1c5b64 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1800,6 +1800,9 @@ OS_IO_FILE="" - ;; - esac] - AC_SUBST(OS_IO_FILE) -+ -+AC_SYS_LARGEFILE -+ - dnl - dnl Make our output files, being sure that we create the some miscellaneous - dnl directories -diff --git a/misc/e4defrag.c b/misc/e4defrag.c -index 86e97ee3..e7175c37 100644 ---- a/misc/e4defrag.c -+++ b/misc/e4defrag.c -@@ -195,10 +195,6 @@ static struct frag_statistic_ino frag_rank[SHOW_FRAG_FILES]; - #error posix_fadvise not available! - #endif - --#ifndef HAVE_FALLOCATE64 --#error fallocate64 not available! --#endif /* ! HAVE_FALLOCATE64 */ -- - /* - * get_mount_point() - Get device's mount point. - * -@@ -1568,7 +1564,7 @@ static int file_defrag(const char *file, const struct stat64 *buf, - /* Allocate space for donor inode */ - orig_group_tmp = orig_group_head; - do { -- ret = fallocate64(donor_fd, 0, -+ ret = fallocate(donor_fd, 0, - (ext2_loff_t)orig_group_tmp->start->data.logical * block_size, - (ext2_loff_t)orig_group_tmp->len * block_size); - if (ret < 0) { --- -2.38.1 - diff --git a/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-ext2fs-Use-64bit-lseek-when-_FILE_OFFSET_BITS-is-64.patch b/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-ext2fs-Use-64bit-lseek-when-_FILE_OFFSET_BITS-is-64.patch deleted file mode 100644 index 20ed6ecb3b..0000000000 --- a/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-ext2fs-Use-64bit-lseek-when-_FILE_OFFSET_BITS-is-64.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 1a8aaa8ff7f4aca68b5ae964458e49ab16b4315f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 14 Dec 2022 20:56:44 -0800 -Subject: [PATCH] ext2fs: Use 64bit lseek when _FILE_OFFSET_BITS is 64 - -Use lseek() with 64bit off_t when _FILE_OFFSET_BITS is 64 -this fixes build with musl where there is no _llseek but lseek -is using off_t which is 64bit on musl - -Upstream-Status: Submitted [https://github.com/tytso/e2fsprogs/pull/129] -Signe-off-by: Khem Raj <raj.khem@gmail.com> ---- - lib/ext2fs/llseek.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/ext2fs/llseek.c b/lib/ext2fs/llseek.c -index 922a0d56..45f21d09 100644 ---- a/lib/ext2fs/llseek.c -+++ b/lib/ext2fs/llseek.c -@@ -51,7 +51,7 @@ extern long long llseek (int fd, long long offset, int origin); - - #else /* ! HAVE_LLSEEK */ - --#if SIZEOF_LONG == SIZEOF_LONG_LONG -+#if SIZEOF_LONG == SIZEOF_LONG_LONG || _FILE_OFFSET_BITS+0 == 64 - - #define my_llseek lseek - -@@ -69,7 +69,7 @@ static int _llseek (unsigned int, unsigned long, - - static _syscall5(int,_llseek,unsigned int,fd,unsigned long,offset_high, - unsigned long, offset_low,ext2_loff_t *,result, -- unsigned int, origin) -+ unsigned int, origin); - #endif - - static ext2_loff_t my_llseek (int fd, ext2_loff_t offset, int origin) diff --git a/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch b/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch index 92bd0d0c1f..b038e61eb7 100644 --- a/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch +++ b/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch @@ -1,4 +1,4 @@ -From cce489c96aa3f4272a19d2137c2a46b439636712 Mon Sep 17 00:00:00 2001 +From 5bc75654690a2d916190168b865770a7c93e65dd Mon Sep 17 00:00:00 2001 From: Jackie Huang <jackie.huang@windriver.com> Date: Wed, 10 Aug 2016 11:19:44 +0800 Subject: [PATCH] Fix missing check for permission denied. @@ -19,7 +19,7 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/support/profile.c b/lib/support/profile.c -index f54739e7..53ea68f1 100644 +index bdb14b17..1bd62406 100644 --- a/lib/support/profile.c +++ b/lib/support/profile.c @@ -335,7 +335,7 @@ profile_init(const char * const *files, profile_t *ret_profile) diff --git a/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/extents.patch b/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/extents.patch deleted file mode 100644 index 2c09bb276d..0000000000 --- a/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/extents.patch +++ /dev/null @@ -1,56 +0,0 @@ -CVE: CVE-2022-1304 -Upstream-Status: Backport [ ab51d587bb9b229b1fade1afd02e1574c1ba5c76 ] -Signed-off-by: Ross Burton <ross.burton@arm.com> - -From 347084c9c1ad20f47dae16f5a3dcd8628d5fc7b0 Mon Sep 17 00:00:00 2001 -From: Lukas Czerner <lczerner@redhat.com> -Date: Thu, 21 Apr 2022 19:31:48 +0200 -Subject: [PATCH] e2fsprogs: add sanity check to extent manipulation - -It is possible to have a corrupted extent tree in such a way that a leaf -node contains zero extents in it. Currently if that happens and we try -to traverse the tree we can end up accessing wrong data, or possibly -even uninitialized memory. Make sure we don't do that. - -Additionally make sure that we have a sane number of bytes passed to -memmove() in ext2fs_extent_delete(). - -Note that e2fsck is currently unable to spot and fix such corruption in -pass1. - -Signed-off-by: Lukas Czerner <lczerner@redhat.com> -Reported-by: Nils Bars <nils_bars@t-online.de> -Addressess: https://bugzilla.redhat.com/show_bug.cgi?id=2068113 ---- - lib/ext2fs/extent.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/lib/ext2fs/extent.c b/lib/ext2fs/extent.c -index b324c7b0..1a206a16 100644 ---- a/lib/ext2fs/extent.c -+++ b/lib/ext2fs/extent.c -@@ -495,6 +495,10 @@ retry: - ext2fs_le16_to_cpu(eh->eh_entries); - newpath->max_entries = ext2fs_le16_to_cpu(eh->eh_max); - -+ /* Make sure there is at least one extent present */ -+ if (newpath->left <= 0) -+ return EXT2_ET_EXTENT_NO_DOWN; -+ - if (path->left > 0) { - ix++; - newpath->end_blk = ext2fs_le32_to_cpu(ix->ei_block); -@@ -1630,6 +1634,10 @@ errcode_t ext2fs_extent_delete(ext2_extent_handle_t handle, int flags) - - cp = path->curr; - -+ /* Sanity check before memmove() */ -+ if (path->left < 0) -+ return EXT2_ET_EXTENT_LEAF_BAD; -+ - if (path->left) { - memmove(cp, cp + sizeof(struct ext3_extent_idx), - path->left * sizeof(struct ext3_extent_idx)); --- -2.25.1 - diff --git a/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch b/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch index d695580c92..0a6904208d 100644 --- a/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch +++ b/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch @@ -1,4 +1,4 @@ -From 20bf59365646af0466c1910e8763b352380b26d6 Mon Sep 17 00:00:00 2001 +From 580ef6cae2d353f3aa5d5c52d6614bdc1df50f08 Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> Date: Mon, 23 Dec 2013 13:38:34 +0000 Subject: [PATCH] e2fsprogs: silence debugfs @@ -14,10 +14,10 @@ Signed-off-by: Ross Burton <ross.burton@intel.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c -index b67a88bc..76dd5556 100644 +index 9b6321dc..8ebf3ddb 100644 --- a/debugfs/debugfs.c +++ b/debugfs/debugfs.c -@@ -2518,7 +2518,7 @@ static int source_file(const char *cmd_file, int ss_idx) +@@ -2516,7 +2516,7 @@ static int source_file(const char *cmd_file, int ss_idx) cp = strchr(buf, '\r'); if (cp) *cp = 0; diff --git a/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.5.bb b/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.0.bb index ceceb7edcc..2620610903 100644 --- a/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.5.bb +++ b/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.0.bb @@ -4,16 +4,13 @@ SRC_URI += "file://remove.ldconfig.call.patch \ file://run-ptest \ file://ptest.patch \ file://mkdir_p.patch \ - file://extents.patch \ - file://0001-Add-option-to-enable-disable-largefile-support.patch \ - file://0001-ext2fs-Use-64bit-lseek-when-_FILE_OFFSET_BITS-is-64.patch \ " SRC_URI:append:class-native = " \ file://e2fsprogs-fix-missing-check-for-permission-denied.patch \ file://quiet-debugfs.patch \ " -SRCREV = "02540dedd3ddc52c6ae8aaa8a95ce75c3f8be1c0" +SRCREV = "f4c9cc4bedacde8408edda3520a32d3842290112" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$" EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \ diff --git a/poky/meta/recipes-devtools/elfutils/elfutils_0.188.bb b/poky/meta/recipes-devtools/elfutils/elfutils_0.188.bb index 182229becf..74271b2411 100644 --- a/poky/meta/recipes-devtools/elfutils/elfutils_0.188.bb +++ b/poky/meta/recipes-devtools/elfutils/elfutils_0.188.bb @@ -23,6 +23,7 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \ file://0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch \ file://0001-PR29926-debuginfod-Fix-usage-of-deprecated-CURLINFO_.patch \ file://0002-debuginfod-client-Use-CURLOPT_PROTOCOLS_STR-for-libc.patch \ + file://handle_DW_TAG_unspecified_type.patch \ " SRC_URI:append:libc-musl = " \ file://0003-musl-utils.patch \ @@ -98,8 +99,6 @@ do_install_ptest() { cp -r ${B}/debuginfod ${D}${PTEST_PATH} sed -i '/^Makefile:/c Makefile:' ${D}${PTEST_PATH}/tests/Makefile find ${D}${PTEST_PATH} -type f -name *.[hoc] | xargs -i rm {} - # TODO: remove below filter after https://sourceware.org/bugzilla/show_bug.cgi?id=30047 is fixed - sed -i -e '/funcretval/d' ${D}${PTEST_PATH}/tests/run-native-test.sh fi } diff --git a/poky/meta/recipes-devtools/elfutils/files/handle_DW_TAG_unspecified_type.patch b/poky/meta/recipes-devtools/elfutils/files/handle_DW_TAG_unspecified_type.patch new file mode 100644 index 0000000000..8cab01c29a --- /dev/null +++ b/poky/meta/recipes-devtools/elfutils/files/handle_DW_TAG_unspecified_type.patch @@ -0,0 +1,88 @@ +From: Mark Wielaard <mark@klomp.org> +Date: Thu, 26 Jan 2023 17:19:15 +0000 (+0100) +Subject: backends: Handle DW_TAG_unspecified_type in dwarf_peeled_die_type +X-Git-Url: https://sourceware.org/git/?p=elfutils.git;a=commitdiff_plain;h=f2c522567ad63ac293535fba9704895e685ab5bc;hp=3fa98a6f29b0f370e32549ead7eb897c839af980 + +backends: Handle DW_TAG_unspecified_type in dwarf_peeled_die_type + +binutils 2.40 introduces DW_TAG_unspecified_type for assembly +functions with an unknown return type. This breaks the +run-funcretval.sh testcase because dwfl_module_return_value_location +returns an error for such functions because it cannot determine the +return value location. Fix that by treating DW_TAG_unspecified_type +as if the DIE doesn't have a DW_AT_type. + +Also update the testcase to explicitly checking for +DW_TAG_unspecified_type and printing "returns unspecified type". + +https://sourceware.org/bugzilla/show_bug.cgi?id=30047 + +Upstream-Status: Backport [https://sourceware.org/git/?p=elfutils.git;a=commitdiff;h=f2c522567ad63ac293535fba9704895e685ab5bc;hp=3fa98a6f29b0f370e32549ead7eb897c839af980] +Signed-off-by: Mark Wielaard <mark@klomp.org> +--- + +--- a/backends/libebl_CPU.h ++++ b/backends/libebl_CPU.h +@@ -1,5 +1,6 @@ + /* Common interface for libebl modules. + Copyright (C) 2000, 2001, 2002, 2003, 2005, 2013, 2014 Red Hat, Inc. ++ Copyright (C) 2023 Mark J. Wielaard <mark@klomp.org> + This file is part of elfutils. + + This file is free software; you can redistribute it and/or modify +@@ -53,7 +54,9 @@ extern bool (*generic_debugscn_p) (const + dwarf_tag (_die); }) + + /* Get a type die corresponding to DIE. Peel CV qualifiers off +- it. */ ++ it. Returns zero if the DIE doesn't have a type, or the type ++ is DW_TAG_unspecified_type. Returns -1 on error. Otherwise ++ returns the result tag DW_AT value. */ + static inline int + dwarf_peeled_die_type (Dwarf_Die *die, Dwarf_Die *result) + { +@@ -69,7 +72,14 @@ dwarf_peeled_die_type (Dwarf_Die *die, D + if (dwarf_peel_type (result, result) != 0) + return -1; + +- return DWARF_TAG_OR_RETURN (result); ++ if (result == NULL) ++ return -1; ++ ++ int tag = dwarf_tag (result); ++ if (tag == DW_TAG_unspecified_type) ++ return 0; /* Treat an unspecified type as if there was no type. */ ++ ++ return tag; + } + + #endif /* libebl_CPU.h */ +--- a/tests/funcretval.c ++++ b/tests/funcretval.c +@@ -1,5 +1,6 @@ + /* Test program for dwfl_module_return_value_location. + Copyright (C) 2005 Red Hat, Inc. ++ Copyright (C) 2023 Mark J. Wielaard <mark@klomp.org> + This file is part of elfutils. + + This file is free software; you can redistribute it and/or modify +@@ -67,7 +68,18 @@ handle_function (Dwarf_Die *funcdie, voi + error (EXIT_FAILURE, 0, "dwfl_module_return_value_location: %s", + dwfl_errmsg (-1)); + else if (nlocops == 0) +- puts ("returns no value"); ++ { ++ // Check if this is the special unspecified type ++ // https://sourceware.org/bugzilla/show_bug.cgi?id=30047 ++ Dwarf_Die die_mem, *typedie = &die_mem; ++ Dwarf_Attribute attr_mem, *attr; ++ attr = dwarf_attr_integrate (funcdie, DW_AT_type, &attr_mem); ++ if (dwarf_formref_die (attr, typedie) != NULL ++ && dwarf_tag (typedie) == DW_TAG_unspecified_type) ++ puts ("returns unspecified type"); ++ else ++ puts ("returns no value"); ++ } + else + { + printf ("return value location:"); diff --git a/poky/meta/recipes-devtools/gdb/gdb-cross-canadian_12.1.bb b/poky/meta/recipes-devtools/gdb/gdb-cross-canadian_13.1.bb index 4ab2b7156d..4ab2b7156d 100644 --- a/poky/meta/recipes-devtools/gdb/gdb-cross-canadian_12.1.bb +++ b/poky/meta/recipes-devtools/gdb/gdb-cross-canadian_13.1.bb diff --git a/poky/meta/recipes-devtools/gdb/gdb-cross_12.1.bb b/poky/meta/recipes-devtools/gdb/gdb-cross_13.1.bb index 3b654a2f0d..3b654a2f0d 100644 --- a/poky/meta/recipes-devtools/gdb/gdb-cross_12.1.bb +++ b/poky/meta/recipes-devtools/gdb/gdb-cross_13.1.bb diff --git a/poky/meta/recipes-devtools/gdb/gdb.inc b/poky/meta/recipes-devtools/gdb/gdb.inc index a5dc554581..18603cc7d4 100644 --- a/poky/meta/recipes-devtools/gdb/gdb.inc +++ b/poky/meta/recipes-devtools/gdb/gdb.inc @@ -5,16 +5,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ - file://0001-make-man-install-relative-to-DESTDIR.patch \ - file://0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \ - file://0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \ - file://0004-Dont-disable-libreadline.a-when-using-disable-static.patch \ - file://0005-use-asm-sgidefs.h.patch \ - file://0006-Change-order-of-CFLAGS.patch \ - file://0007-resolve-restrict-keyword-conflict.patch \ - file://0008-Fix-invalid-sigprocmask-call.patch \ - file://0009-gdbserver-ctrl-c-handling.patch \ - file://readline-8.2.patch \ + file://0001-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \ + file://0002-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \ + file://0003-Dont-disable-libreadline.a-when-using-disable-static.patch \ + file://0004-use-asm-sgidefs.h.patch \ + file://0005-Change-order-of-CFLAGS.patch \ + file://0006-resolve-restrict-keyword-conflict.patch \ + file://0007-Fix-invalid-sigprocmask-call.patch \ file://0008-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch \ + file://0009-gdbserver-linux-low.cc-Fix-a-typo-in-ternary-operato.patch \ " -SRC_URI[sha256sum] = "0e1793bf8f2b54d53f46dea84ccfd446f48f81b297b28c4f7fc017b818d69fed" +SRC_URI[sha256sum] = "115ad5c18d69a6be2ab15882d365dda2a2211c14f480b3502c6eba576e2e95a0" + +TOOLCHAIN = "gcc" diff --git a/poky/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch b/poky/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch deleted file mode 100644 index 16d6cf196f..0000000000 --- a/poky/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 8eca28eddcda4ce8a345ca031f43ff1ed6f37089 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 2 Mar 2015 02:27:55 +0000 -Subject: [PATCH 1/9] make man install relative to DESTDIR - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - sim/common/Make-common.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in -index 74e5dad3049..9e95c224ba4 100644 ---- a/sim/common/Make-common.in -+++ b/sim/common/Make-common.in -@@ -70,7 +70,7 @@ tooldir = $(libdir)/$(target_alias) - datadir = @datadir@ - datarootdir = @datarootdir@ - mandir = @mandir@ --man1dir = $(mandir)/man1 -+man1dir = $(DESTDIR)$(mandir)/man1 - infodir = @infodir@ - includedir = @includedir@ - --- -2.36.1 - diff --git a/poky/meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch b/poky/meta/recipes-devtools/gdb/gdb/0001-mips-linux-nat-Define-_ABIO32-if-not-defined.patch index 8d263de896..55bdbf644c 100644 --- a/poky/meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch +++ b/poky/meta/recipes-devtools/gdb/gdb/0001-mips-linux-nat-Define-_ABIO32-if-not-defined.patch @@ -1,7 +1,7 @@ -From 37d3afd2eaa95c89ad7cb5d0079b017752e4d0ea Mon Sep 17 00:00:00 2001 +From 73b71f0b85dd6c8181f2f11a427400d4870fabcc Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 23 Mar 2016 06:30:09 +0000 -Subject: [PATCH 2/9] mips-linux-nat: Define _ABIO32 if not defined +Subject: [PATCH] mips-linux-nat: Define _ABIO32 if not defined This helps building gdb on mips64 on musl, since musl does not provide sgidefs.h this define is @@ -16,7 +16,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 4 insertions(+) diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index 20e12b6889e..6adc61235aa 100644 +index 972b5db8e76..5e68538a3ba 100644 --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c @@ -41,6 +41,10 @@ @@ -30,6 +30,3 @@ index 20e12b6889e..6adc61235aa 100644 class mips_linux_nat_target final : public linux_nat_trad_target { --- -2.36.1 - diff --git a/poky/meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/poky/meta/recipes-devtools/gdb/gdb/0002-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch index 7e09404bb0..01e466f29b 100644 --- a/poky/meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch +++ b/poky/meta/recipes-devtools/gdb/gdb/0002-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch @@ -1,7 +1,7 @@ -From e689eec672ee8c53b3adb2ade2b5deb9b7cd99d4 Mon Sep 17 00:00:00 2001 +From e258cfb37d7c61b4a97e4ca8f1178485a3f91940 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 30 Apr 2016 18:32:14 -0700 -Subject: [PATCH 3/9] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems +Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems Upstream-Status: Pending @@ -12,7 +12,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 2 files changed, 12 insertions(+) diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h -index 1094f6b0be3..d8588a646c2 100644 +index c84f9146bbd..8c8580c95e1 100644 --- a/gdb/nat/ppc-linux.h +++ b/gdb/nat/ppc-linux.h @@ -18,7 +18,13 @@ @@ -30,7 +30,7 @@ index 1094f6b0be3..d8588a646c2 100644 /* This sometimes isn't defined. */ diff --git a/gdbserver/linux-ppc-low.cc b/gdbserver/linux-ppc-low.cc -index 08824887003..69afbae5359 100644 +index fdf74727e39..f64afd09b7a 100644 --- a/gdbserver/linux-ppc-low.cc +++ b/gdbserver/linux-ppc-low.cc @@ -23,7 +23,13 @@ @@ -47,6 +47,3 @@ index 08824887003..69afbae5359 100644 #include "arch/ppc-linux-common.h" #include "arch/ppc-linux-tdesc.h" --- -2.36.1 - diff --git a/poky/meta/recipes-devtools/gdb/gdb/0004-Dont-disable-libreadline.a-when-using-disable-static.patch b/poky/meta/recipes-devtools/gdb/gdb/0003-Dont-disable-libreadline.a-when-using-disable-static.patch index a1e85e91b3..5562461c75 100644 --- a/poky/meta/recipes-devtools/gdb/gdb/0004-Dont-disable-libreadline.a-when-using-disable-static.patch +++ b/poky/meta/recipes-devtools/gdb/gdb/0003-Dont-disable-libreadline.a-when-using-disable-static.patch @@ -1,7 +1,7 @@ -From 15ee6a626242efb8f367be49c13e00d0b72317f0 Mon Sep 17 00:00:00 2001 +From 431a88f4370a23b297998641e1e10ebfd74478d9 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 30 Apr 2016 15:25:03 -0700 -Subject: [PATCH 4/9] Dont disable libreadline.a when using --disable-static +Subject: [PATCH] Dont disable libreadline.a when using --disable-static If gdb is configured with --disable-static then this is dutifully passed to readline which then disables libreadline.a, which causes a problem when gdb @@ -19,7 +19,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.def b/Makefile.def -index acdcd625ed6..78fc31e1199 100644 +index f974565d8ca..039b5a3c209 100644 --- a/Makefile.def +++ b/Makefile.def @@ -120,7 +120,8 @@ host_modules= { module= libiconv; @@ -33,10 +33,10 @@ index acdcd625ed6..78fc31e1199 100644 host_modules= { module= sim; }; host_modules= { module= texinfo; no_install= true; }; diff --git a/Makefile.in b/Makefile.in -index 3aacd2daac9..aa58adada4a 100644 +index a425b54e094..dfaf585a7c1 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -32791,7 +32791,7 @@ configure-readline: +@@ -32816,7 +32816,7 @@ configure-readline: $$s/$$module_srcdir/configure \ --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ @@ -45,6 +45,3 @@ index 3aacd2daac9..aa58adada4a 100644 || exit 1 @endif readline --- -2.36.1 - diff --git a/poky/meta/recipes-devtools/gdb/gdb/0005-use-asm-sgidefs.h.patch b/poky/meta/recipes-devtools/gdb/gdb/0004-use-asm-sgidefs.h.patch index 242099b9b1..d34c75ca61 100644 --- a/poky/meta/recipes-devtools/gdb/gdb/0005-use-asm-sgidefs.h.patch +++ b/poky/meta/recipes-devtools/gdb/gdb/0004-use-asm-sgidefs.h.patch @@ -1,7 +1,7 @@ -From 25a75aaf29791f4302f0e4452f7ebaf735d4f083 Mon Sep 17 00:00:00 2001 +From 693e01865c28c0a48e60173389ef467f46244c21 Mon Sep 17 00:00:00 2001 From: Andre McCurdy <amccurdy@gmail.com> Date: Sat, 30 Apr 2016 15:29:06 -0700 -Subject: [PATCH 5/9] use <asm/sgidefs.h> +Subject: [PATCH] use <asm/sgidefs.h> Build fix for MIPS with musl libc @@ -19,7 +19,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index 6adc61235aa..afb40066744 100644 +index 5e68538a3ba..5b1c209abd8 100644 --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c @@ -31,7 +31,7 @@ @@ -31,6 +31,3 @@ index 6adc61235aa..afb40066744 100644 #include "nat/gdb_ptrace.h" #include <asm/ptrace.h> #include "inf-ptrace.h" --- -2.36.1 - diff --git a/poky/meta/recipes-devtools/gdb/gdb/0006-Change-order-of-CFLAGS.patch b/poky/meta/recipes-devtools/gdb/gdb/0005-Change-order-of-CFLAGS.patch index 58c9b1d0a7..3aaab8a8f1 100644 --- a/poky/meta/recipes-devtools/gdb/gdb/0006-Change-order-of-CFLAGS.patch +++ b/poky/meta/recipes-devtools/gdb/gdb/0005-Change-order-of-CFLAGS.patch @@ -1,7 +1,7 @@ -From c0e7c34134aa1f9644075c596a2338a50d3d923e Mon Sep 17 00:00:00 2001 +From 9e72a19355375e589032809dd2ec051b75d4db07 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 30 Apr 2016 15:35:39 -0700 -Subject: [PATCH 6/9] Change order of CFLAGS +Subject: [PATCH] Change order of CFLAGS Lets us override Werror if need be @@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in -index 47648b8d962..5599779de57 100644 +index 040f0b6faa0..256ce6a3f6a 100644 --- a/gdbserver/Makefile.in +++ b/gdbserver/Makefile.in @@ -156,7 +156,7 @@ WIN32APILIBS = @WIN32APILIBS@ @@ -25,6 +25,3 @@ index 47648b8d962..5599779de57 100644 # LDFLAGS is specifically reserved for setting from the command line # when running make. --- -2.36.1 - diff --git a/poky/meta/recipes-devtools/gdb/gdb/0007-resolve-restrict-keyword-conflict.patch b/poky/meta/recipes-devtools/gdb/gdb/0006-resolve-restrict-keyword-conflict.patch index bbd1f0b27f..fe39c16877 100644 --- a/poky/meta/recipes-devtools/gdb/gdb/0007-resolve-restrict-keyword-conflict.patch +++ b/poky/meta/recipes-devtools/gdb/gdb/0006-resolve-restrict-keyword-conflict.patch @@ -1,7 +1,7 @@ -From 44fa1ecfbd8a5fe0cfea12a175fa041686842a0c Mon Sep 17 00:00:00 2001 +From 0ce96011d76ffa377349d0193dd0bf8f1bf641e0 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 10 May 2016 08:47:05 -0700 -Subject: [PATCH 7/9] resolve restrict keyword conflict +Subject: [PATCH] resolve restrict keyword conflict GCC detects that we call 'restrict' as param name in function signatures and complains since both params are called 'restrict' @@ -15,7 +15,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnulib/import/sys_time.in.h b/gnulib/import/sys_time.in.h -index 90a67d18426..664641a1fe8 100644 +index 87db1a88745..e6b98c7e467 100644 --- a/gnulib/import/sys_time.in.h +++ b/gnulib/import/sys_time.in.h @@ -93,20 +93,20 @@ struct timeval @@ -43,6 +43,3 @@ index 90a67d18426..664641a1fe8 100644 # endif _GL_CXXALIASWARN (gettimeofday); # if defined __cplusplus && defined GNULIB_NAMESPACE --- -2.36.1 - diff --git a/poky/meta/recipes-devtools/gdb/gdb/0008-Fix-invalid-sigprocmask-call.patch b/poky/meta/recipes-devtools/gdb/gdb/0007-Fix-invalid-sigprocmask-call.patch index ed1310ced2..b095e92434 100644 --- a/poky/meta/recipes-devtools/gdb/gdb/0008-Fix-invalid-sigprocmask-call.patch +++ b/poky/meta/recipes-devtools/gdb/gdb/0007-Fix-invalid-sigprocmask-call.patch @@ -1,7 +1,7 @@ -From 5bdd15553daef7370ca3c1f12d8f14247fdd4907 Mon Sep 17 00:00:00 2001 +From 696891f6c5a1c6acab95dffd8c1d3a986ca71a18 Mon Sep 17 00:00:00 2001 From: Yousong Zhou <yszhou4tech@gmail.com> Date: Fri, 24 Mar 2017 10:36:03 +0800 -Subject: [PATCH 8/9] Fix invalid sigprocmask call +Subject: [PATCH] Fix invalid sigprocmask call MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -32,7 +32,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdbsupport/signals-state-save-restore.cc b/gdbsupport/signals-state-save-restore.cc -index 92e799d3551..a4a0234272a 100644 +index 3ec7a259c9c..0702eca7725 100644 --- a/gdbsupport/signals-state-save-restore.cc +++ b/gdbsupport/signals-state-save-restore.cc @@ -38,7 +38,7 @@ save_original_signals_state (bool quiet) @@ -44,6 +44,3 @@ index 92e799d3551..a4a0234272a 100644 if (res == -1) perror_with_name (("sigprocmask")); --- -2.36.1 - diff --git a/poky/meta/recipes-devtools/gdb/gdb/0008-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch b/poky/meta/recipes-devtools/gdb/gdb/0008-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch index 3e29327613..566b910648 100644 --- a/poky/meta/recipes-devtools/gdb/gdb/0008-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch +++ b/poky/meta/recipes-devtools/gdb/gdb/0008-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch @@ -1,11 +1,11 @@ -From 48906e1038e469b429aa35d0f967730a929c3880 Mon Sep 17 00:00:00 2001 +From e649db1664af981cc87f966aef6c5365ae234547 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 15 Jan 2023 00:16:25 -0800 -Subject: [PATCH 8/8] Define alignof using _Alignof when using C11 or newer +Subject: [PATCH] Define alignof using _Alignof when using C11 or newer WG14 N2350 made very clear that it is an UB having type definitions within "offsetof" [1]. This patch enhances the implementation of macro -alignof_slot to use builtin "_Alignof" to avoid undefined behavior on +alignof to use builtin "_Alignof" to avoid undefined behavior on when using std=c11 or newer clang 16+ has started to flag this [2] @@ -15,14 +15,10 @@ Fixes build when using -std >= gnu11 and using clang16+ Older compilers gcc < 4.9 or clang < 8 has buggy _Alignof even though it may support C11, exclude those compilers too -gnulib needs this fix and then it will be applied to downstream packages -like gdb [3] - [1] https://www.open-std.org/jtc1/sc22/wg14/www/docs/n2350.htm [2] https://reviews.llvm.org/D133574 -[3] https://public-inbox.org/bug-gnulib/20230114232744.215167-1-raj.khem@gmail.com/T/#u -Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=2d404c7dd974cc65f894526f4a1b76bc1dcd8d82] +Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- libiberty/sha1.c | 10 ++++++++++ @@ -50,6 +46,3 @@ index 504f06d3b9b..790ada82443 100644 # define UNALIGNED_P(p) (((size_t) p) % alignof (sha1_uint32) != 0) if (UNALIGNED_P (buffer)) while (len > 64) --- -2.39.0 - diff --git a/poky/meta/recipes-devtools/gdb/gdb/0009-gdbserver-ctrl-c-handling.patch b/poky/meta/recipes-devtools/gdb/gdb/0009-gdbserver-ctrl-c-handling.patch deleted file mode 100644 index f53d3bd1e5..0000000000 --- a/poky/meta/recipes-devtools/gdb/gdb/0009-gdbserver-ctrl-c-handling.patch +++ /dev/null @@ -1,40 +0,0 @@ -From bc3b1f6aacf2d8fe66b022fbfcf28cd82c76e52f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 29 Nov 2018 18:00:23 -0800 -Subject: [PATCH 9/9] gdbserver ctrl-c handling - -This problem was created by the upstream commit 78708b7c8c -After applying the commit, it will send SIGINT to the process -group(-signal_pid). -But if we use gdbserver send SIGINT, and the attached process is not a -process -group leader, then the "kill (-signal_pid, SIGINT)" returns error and -fails to -interrupt the attached process. - -Upstream-Status: Submitted -[https://sourceware.org/bugzilla/show_bug.cgi?id=18945] - -Author: Josh Gao -Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - gdbserver/linux-low.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc -index 7726a4a0c36..f750e074a03 100644 ---- a/gdbserver/linux-low.cc -+++ b/gdbserver/linux-low.cc -@@ -5496,7 +5496,7 @@ linux_process_target::request_interrupt () - { - /* Send a SIGINT to the process group. This acts just like the user - typed a ^C on the controlling terminal. */ -- ::kill (-signal_pid, SIGINT); -+ ::kill (signal_pid, SIGINT); - } - - bool --- -2.36.1 - diff --git a/poky/meta/recipes-devtools/gdb/gdb/0009-gdbserver-linux-low.cc-Fix-a-typo-in-ternary-operato.patch b/poky/meta/recipes-devtools/gdb/gdb/0009-gdbserver-linux-low.cc-Fix-a-typo-in-ternary-operato.patch new file mode 100644 index 0000000000..32eba089bc --- /dev/null +++ b/poky/meta/recipes-devtools/gdb/gdb/0009-gdbserver-linux-low.cc-Fix-a-typo-in-ternary-operato.patch @@ -0,0 +1,24 @@ +From 9a85132c4ba7d37a5df146239b3ab1a5854ce478 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 22 Feb 2023 16:24:07 -0800 +Subject: [PATCH] gdbserver/linux-low.cc: Fix a typo in ternary operator + +Upstream-Status: Submitted [https://sourceware.org/pipermail/gdb-patches/2023-February/197298.html] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + gdbserver/linux-low.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc +index 7e1de397893..95ec871d436 100644 +--- a/gdbserver/linux-low.cc ++++ b/gdbserver/linux-low.cc +@@ -5390,7 +5390,7 @@ proc_xfer_memory (CORE_ADDR memaddr, unsigned char *readbuf, + if (lseek (fd, memaddr, SEEK_SET) != -1) + bytes = (readbuf != nullptr + ? read (fd, readbuf, len) +- ? write (fd, writebuf, len)); ++ : write (fd, writebuf, len)); + #endif + + if (bytes < 0) diff --git a/poky/meta/recipes-devtools/gdb/gdb/readline-8.2.patch b/poky/meta/recipes-devtools/gdb/gdb/readline-8.2.patch deleted file mode 100644 index c2db4c0d79..0000000000 --- a/poky/meta/recipes-devtools/gdb/gdb/readline-8.2.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1add37b567a7dee39d99f37b37802034c3fce9c4 Mon Sep 17 00:00:00 2001 -From: Andreas Schwab <schwab@linux-m68k.org> -Date: Sun, 20 Mar 2022 14:01:54 +0100 -Subject: [PATCH] Add support for readline 8.2 - -In readline 8.2 the type of rl_completer_word_break_characters changed to -include const. - -Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=1add37b567a7dee39d99f37b37802034c3fce9c4] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - gdb/completer.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gdb/completer.c b/gdb/completer.c -index d3900ae2014..a51c16ac7f8 100644 ---- a/gdb/completer.c -+++ b/gdb/completer.c -@@ -36,7 +36,7 @@ - calling a hook instead so we eliminate the CLI dependency. */ - #include "gdbcmd.h" - --/* Needed for rl_completer_word_break_characters() and for -+/* Needed for rl_completer_word_break_characters and for - rl_filename_completion_function. */ - #include "readline/readline.h" - -@@ -2011,7 +2011,7 @@ gdb_completion_word_break_characters_throw () - rl_basic_quote_characters = NULL; - } - -- return rl_completer_word_break_characters; -+ return (char *) rl_completer_word_break_characters; - } - - char * --- -2.31.1 - diff --git a/poky/meta/recipes-devtools/gdb/gdb_12.1.bb b/poky/meta/recipes-devtools/gdb/gdb_13.1.bb index 9c6db4ca2c..9c6db4ca2c 100644 --- a/poky/meta/recipes-devtools/gdb/gdb_12.1.bb +++ b/poky/meta/recipes-devtools/gdb/gdb_13.1.bb diff --git a/poky/meta/recipes-devtools/git/git_2.39.1.bb b/poky/meta/recipes-devtools/git/git_2.39.2.bb index d8137df561..222e545f60 100644 --- a/poky/meta/recipes-devtools/git/git_2.39.1.bb +++ b/poky/meta/recipes-devtools/git/git_2.39.2.bb @@ -168,4 +168,4 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ " EXTRA_OEMAKE += "NO_GETTEXT=1" -SRC_URI[tarball.sha256sum] = "ae8d3427e4ccd677abc931f16183c0ec953e3bfcd866493601351e04a2b97398" +SRC_URI[tarball.sha256sum] = "fb6807d1eb4094bb2349ab97d203fe1e6c3eb28af73ea391decfbd3a03c02e85" diff --git a/poky/meta/recipes-devtools/gnu-config/gnu-config_git.bb b/poky/meta/recipes-devtools/gnu-config/gnu-config_git.bb index e35e9008f9..080704753d 100644 --- a/poky/meta/recipes-devtools/gnu-config/gnu-config_git.bb +++ b/poky/meta/recipes-devtools/gnu-config/gnu-config_git.bb @@ -9,8 +9,8 @@ DEPENDS:class-native = "hostperl-runtime-native" INHIBIT_DEFAULT_DEPS = "1" -SRCREV = "f992bcc08219edb283d2ab31dd3871a4a0e8220e" -PV = "20221007+git${SRCPV}" +SRCREV = "63acb96f92473ceb5e21d873d7c0aee266b3d6d3" +PV = "20230216+git${SRCPV}" SRC_URI = "git://git.savannah.gnu.org/git/config.git;protocol=https;branch=master \ file://gnu-configize.in" diff --git a/poky/meta/recipes-devtools/go/go-1.19.4.inc b/poky/meta/recipes-devtools/go/go-1.19.4.inc deleted file mode 100644 index 49349ba6ec..0000000000 --- a/poky/meta/recipes-devtools/go/go-1.19.4.inc +++ /dev/null @@ -1,18 +0,0 @@ -require go-common.inc - -FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/go:" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707" - -SRC_URI += "\ - file://0001-cmd-go-make-content-based-hash-generation-less-pedan.patch \ - file://0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch \ - file://0004-ld-add-soname-to-shareable-objects.patch \ - file://0005-make.bash-override-CC-when-building-dist-and-go_boot.patch \ - file://0006-cmd-dist-separate-host-and-target-builds.patch \ - file://0007-cmd-go-make-GOROOT-precious-by-default.patch \ - file://0001-exec.go-do-not-write-linker-flags-into-buildids.patch \ - file://0001-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \ - file://filter-build-paths.patch \ -" -SRC_URI[main.sha256sum] = "eda74db4ac494800a3e66ee784e495bfbb9b8e535df924a8b01b1a8028b7f368" diff --git a/poky/meta/recipes-devtools/go/go-1.20.1.inc b/poky/meta/recipes-devtools/go/go-1.20.1.inc new file mode 100644 index 0000000000..aa3e2dadf1 --- /dev/null +++ b/poky/meta/recipes-devtools/go/go-1.20.1.inc @@ -0,0 +1,18 @@ +require go-common.inc + +FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/go:" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707" + +SRC_URI += "\ + file://0001-cmd-go-make-content-based-hash-generation-less-pedan.patch \ + file://0002-cmd-go-Allow-GOTOOLDIR-to-be-overridden-in-the-envir.patch \ + file://0003-ld-add-soname-to-shareable-objects.patch \ + file://0004-make.bash-override-CC-when-building-dist-and-go_boot.patch \ + file://0005-cmd-dist-separate-host-and-target-builds.patch \ + file://0006-cmd-go-make-GOROOT-precious-by-default.patch \ + file://0007-exec.go-do-not-write-linker-flags-into-buildids.patch \ + file://0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \ + file://0009-go-Filter-build-paths-on-staticly-linked-arches.patch \ +" +SRC_URI[main.sha256sum] = "b5c1a3af52c385a6d1c76aed5361cf26459023980d0320de7658bae3915831a2" diff --git a/poky/meta/recipes-devtools/go/go-binary-native_1.19.4.bb b/poky/meta/recipes-devtools/go/go-binary-native_1.20.1.bb index 8dc8bdf8e2..3eb80fdcce 100644 --- a/poky/meta/recipes-devtools/go/go-binary-native_1.19.4.bb +++ b/poky/meta/recipes-devtools/go/go-binary-native_1.20.1.bb @@ -9,9 +9,9 @@ PROVIDES = "go-native" # Checksums available at https://go.dev/dl/ SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}" -SRC_URI[go_linux_amd64.sha256sum] = "c9c08f783325c4cf840a94333159cc937f05f75d36a8b307951d5bd959cf2ab8" -SRC_URI[go_linux_arm64.sha256sum] = "9df122d6baf6f2275270306b92af3b09d7973fb1259257e284dba33c0db14f1b" -SRC_URI[go_linux_ppc64le.sha256sum] = "fbc6c7d1d169bbdc82223d861d2fadc6add01c126533d3efbba3fdca9b362035" +SRC_URI[go_linux_amd64.sha256sum] = "000a5b1fca4f75895f78befeb2eecf10bfff3c428597f3f1e69133b63b911b02" +SRC_URI[go_linux_arm64.sha256sum] = "5e5e2926733595e6f3c5b5ad1089afac11c1490351855e87849d0e7702b1ec2e" +SRC_URI[go_linux_ppc64le.sha256sum] = "85cfd4b89b48c94030783b6e9e619e35557862358b846064636361421d0b0c52" UPSTREAM_CHECK_URI = "https://golang.org/dl/" UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux" diff --git a/poky/meta/recipes-devtools/go/go-cross-canadian.inc b/poky/meta/recipes-devtools/go/go-cross-canadian.inc index c1aa987427..5a80ceffa3 100644 --- a/poky/meta/recipes-devtools/go/go-cross-canadian.inc +++ b/poky/meta/recipes-devtools/go/go-cross-canadian.inc @@ -21,10 +21,10 @@ export GO_LDFLAGS = '-linkmode external -extld ${HOST_PREFIX}gcc -extldflags "-- do_configure[noexec] = "1" do_compile() { - export CC_FOR_${HOST_GOTUPLE}="${HOST_PREFIX}gcc --sysroot=${STAGING_DIR_HOST}${SDKPATHNATIVE} ${SECURITY_NOPIE_CFLAGS}" - export CXX_FOR_${HOST_GOTUPLE}="${HOST_PREFIX}gxx --sysroot=${STAGING_DIR_HOST}${SDKPATHNATIVE} ${SECURITY_NOPIE_CFLAGS}" + export CC_FOR_${HOST_GOTUPLE}="${HOST_PREFIX}gcc --sysroot=${STAGING_DIR_HOST} ${SECURITY_NOPIE_CFLAGS}" + export CXX_FOR_${HOST_GOTUPLE}="${HOST_PREFIX}gxx --sysroot=${STAGING_DIR_HOST} ${SECURITY_NOPIE_CFLAGS}" cd src - ./make.bash --host-only --no-banner + ./make.bash --target-only --no-banner cd ${B} } do_compile[cleandirs] += "${GOTMPDIR} ${B}/bin ${B}/pkg" diff --git a/poky/meta/recipes-devtools/go/go-cross-canadian_1.19.4.bb b/poky/meta/recipes-devtools/go/go-cross-canadian_1.20.1.bb index 7ac9449e47..7ac9449e47 100644 --- a/poky/meta/recipes-devtools/go/go-cross-canadian_1.19.4.bb +++ b/poky/meta/recipes-devtools/go/go-cross-canadian_1.20.1.bb diff --git a/poky/meta/recipes-devtools/go/go-cross_1.19.4.bb b/poky/meta/recipes-devtools/go/go-cross_1.20.1.bb index 80b5a03f6c..80b5a03f6c 100644 --- a/poky/meta/recipes-devtools/go/go-cross_1.19.4.bb +++ b/poky/meta/recipes-devtools/go/go-cross_1.20.1.bb diff --git a/poky/meta/recipes-devtools/go/go-crosssdk_1.19.4.bb b/poky/meta/recipes-devtools/go/go-crosssdk_1.20.1.bb index 1857c8a577..1857c8a577 100644 --- a/poky/meta/recipes-devtools/go/go-crosssdk_1.19.4.bb +++ b/poky/meta/recipes-devtools/go/go-crosssdk_1.20.1.bb diff --git a/poky/meta/recipes-devtools/go/go-native_1.19.4.bb b/poky/meta/recipes-devtools/go/go-native_1.20.1.bb index ddf25b2c9b..ddf25b2c9b 100644 --- a/poky/meta/recipes-devtools/go/go-native_1.19.4.bb +++ b/poky/meta/recipes-devtools/go/go-native_1.20.1.bb diff --git a/poky/meta/recipes-devtools/go/go-runtime_1.19.4.bb b/poky/meta/recipes-devtools/go/go-runtime_1.20.1.bb index 63464a1501..63464a1501 100644 --- a/poky/meta/recipes-devtools/go/go-runtime_1.19.4.bb +++ b/poky/meta/recipes-devtools/go/go-runtime_1.20.1.bb diff --git a/poky/meta/recipes-devtools/go/go/0001-cmd-go-make-content-based-hash-generation-less-pedan.patch b/poky/meta/recipes-devtools/go/go/0001-cmd-go-make-content-based-hash-generation-less-pedan.patch index 43be5cd2e8..56487e34e3 100644 --- a/poky/meta/recipes-devtools/go/go/0001-cmd-go-make-content-based-hash-generation-less-pedan.patch +++ b/poky/meta/recipes-devtools/go/go/0001-cmd-go-make-content-based-hash-generation-less-pedan.patch @@ -1,7 +1,7 @@ -From fb22e586871cc6be0b7041e86d2daceee06ea568 Mon Sep 17 00:00:00 2001 +From 10766ca6f4007b96e3f6bf4fb496e5df74397eb9 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 28 Mar 2022 10:59:03 -0700 -Subject: [PATCH] cmd/go: make content-based hash generation less pedantic +Subject: [PATCH 1/9] cmd/go: make content-based hash generation less pedantic Go 1.10's build tool now uses content-based hashes to determine when something should be built or re-built. @@ -25,19 +25,18 @@ Upstream-Status: Inappropriate [OE specific] Signed-off-by: Alex Kube <alexander.j.kube@gmail.com> Signed-off-by: Matt Madison <matt@madison.systems> Signed-off-by: Khem Raj <raj.khem@gmail.com> - --- src/cmd/go/internal/envcmd/env.go | 2 +- - src/cmd/go/internal/work/exec.go | 42 ++++++++++++++++++++++++------- - 2 files changed, 34 insertions(+), 10 deletions(-) + src/cmd/go/internal/work/exec.go | 44 ++++++++++++++++++++++++------- + 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go -index 81ee859..2db3898 100644 +index 66ef5ce..fb7448a 100644 --- a/src/cmd/go/internal/envcmd/env.go +++ b/src/cmd/go/internal/envcmd/env.go -@@ -176,7 +176,7 @@ func ExtraEnvVars() []cfg.EnvVar { - func ExtraEnvVarsCostly() []cfg.EnvVar { - b := work.NewBuilder("") +@@ -183,7 +183,7 @@ func ExtraEnvVarsCostly() []cfg.EnvVar { + } + }() - cppflags, cflags, cxxflags, fflags, ldflags, err := b.CFlags(&load.Package{}) + cppflags, cflags, cxxflags, fflags, ldflags, err := b.CFlags(&load.Package{}, false) @@ -45,10 +44,10 @@ index 81ee859..2db3898 100644 // Should not happen - b.CFlags was given an empty package. fmt.Fprintf(os.Stderr, "go: invalid cflags: %v\n", err) diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go -index c88b315..a06455c 100644 +index d6fa847..7e4fcb3 100644 --- a/src/cmd/go/internal/work/exec.go +++ b/src/cmd/go/internal/work/exec.go -@@ -213,6 +213,8 @@ func (b *Builder) Do(ctx context.Context, root *Action) { +@@ -223,6 +223,8 @@ func (b *Builder) Do(ctx context.Context, root *Action) { writeActionGraph() } @@ -57,7 +56,7 @@ index c88b315..a06455c 100644 // buildActionID computes the action ID for a build action. func (b *Builder) buildActionID(a *Action) cache.ActionID { p := a.Package -@@ -234,7 +236,7 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID { +@@ -244,7 +246,7 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID { if p.Module != nil { fmt.Fprintf(h, "module %s@%s\n", p.Module.Path, p.Module.Version) } @@ -66,7 +65,7 @@ index c88b315..a06455c 100644 // The Go compiler always hides the exact value of $GOROOT // when building things in GOROOT. // -@@ -266,9 +268,9 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID { +@@ -276,9 +278,9 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID { } if len(p.CgoFiles)+len(p.SwigFiles)+len(p.SwigCXXFiles) > 0 { fmt.Fprintf(h, "cgo %q\n", b.toolID("cgo")) @@ -78,14 +77,14 @@ index c88b315..a06455c 100644 fmt.Fprintf(h, "CC=%q %q %q %q\n", ccExe, cppflags, cflags, ldflags) // Include the C compiler tool ID so that if the C // compiler changes we rebuild the package. -@@ -281,14 +283,14 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID { - } +@@ -286,14 +288,14 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID { + fmt.Fprintf(h, "CC ID=%q\n", ccID) } if len(p.CXXFiles)+len(p.SwigCXXFiles) > 0 { - cxxExe := b.cxxExe() + cxxExe := filterCompilerFlags(b.cxxExe(), true) fmt.Fprintf(h, "CXX=%q %q\n", cxxExe, cxxflags) - if cxxID, err := b.gccToolID(cxxExe[0], "c++"); err == nil { + if cxxID, _, err := b.gccToolID(cxxExe[0], "c++"); err == nil { fmt.Fprintf(h, "CXX ID=%q\n", cxxID) } } @@ -93,9 +92,9 @@ index c88b315..a06455c 100644 - fcExe := b.fcExe() + fcExe := filterCompilerFlags(b.fcExe(), true) fmt.Fprintf(h, "FC=%q %q\n", fcExe, fflags) - if fcID, err := b.gccToolID(fcExe[0], "f95"); err == nil { + if fcID, _, err := b.gccToolID(fcExe[0], "f95"); err == nil { fmt.Fprintf(h, "FC ID=%q\n", fcID) -@@ -305,7 +307,7 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID { +@@ -310,7 +312,7 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID { } } if p.Internal.BuildInfo != "" { @@ -104,7 +103,7 @@ index c88b315..a06455c 100644 } // Configuration specific to compiler toolchain. -@@ -2705,8 +2707,25 @@ func envList(key, def string) []string { +@@ -2970,8 +2972,25 @@ func envList(key, def string) []string { return args } @@ -128,11 +127,11 @@ index c88b315..a06455c 100644 // CFlags returns the flags to use when invoking the C, C++ or Fortran compilers, or cgo. -func (b *Builder) CFlags(p *load.Package) (cppflags, cflags, cxxflags, fflags, ldflags []string, err error) { +func (b *Builder) CFlags(p *load.Package, filtered bool) (cppflags, cflags, cxxflags, fflags, ldflags []string, err error) { - defaults := "-g -O2" - if cppflags, err = buildFlags("CPPFLAGS", "", p.CgoCPPFLAGS, checkCompilerFlags); err != nil { -@@ -2724,6 +2743,13 @@ func (b *Builder) CFlags(p *load.Package) (cppflags, cflags, cxxflags, fflags, l - if ldflags, err = buildFlags("LDFLAGS", defaults, p.CgoLDFLAGS, checkLinkerFlags); err != nil { + return + } +@@ -2987,6 +3006,13 @@ func (b *Builder) CFlags(p *load.Package) (cppflags, cflags, cxxflags, fflags, l + if ldflags, err = buildFlags("LDFLAGS", defaultCFlags, p.CgoLDFLAGS, checkLinkerFlags); err != nil { return } + if filtered { @@ -145,7 +144,7 @@ index c88b315..a06455c 100644 return } -@@ -2739,7 +2765,7 @@ var cgoRe = lazyregexp.New(`[/\\:]`) +@@ -3002,7 +3028,7 @@ var cgoRe = lazyregexp.New(`[/\\:]`) func (b *Builder) cgo(a *Action, cgoExe, objdir string, pcCFLAGS, pcLDFLAGS, cgofiles, gccfiles, gxxfiles, mfiles, ffiles []string) (outGo, outObj []string, err error) { p := a.Package @@ -154,7 +153,7 @@ index c88b315..a06455c 100644 if err != nil { return nil, nil, err } -@@ -3246,7 +3272,7 @@ func (b *Builder) swigIntSize(objdir string) (intsize string, err error) { +@@ -3510,7 +3536,7 @@ func (b *Builder) swigIntSize(objdir string) (intsize string, err error) { // Run SWIG on one SWIG input file. func (b *Builder) swigOne(a *Action, p *load.Package, file, objdir string, pcCFLAGS []string, cxx bool, intgosize string) (outGo, outC string, err error) { @@ -163,3 +162,6 @@ index c88b315..a06455c 100644 if err != nil { return "", "", err } +-- +2.30.2 + diff --git a/poky/meta/recipes-devtools/go/go/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch b/poky/meta/recipes-devtools/go/go/0002-cmd-go-Allow-GOTOOLDIR-to-be-overridden-in-the-envir.patch index 30068d8e74..6abd424733 100644 --- a/poky/meta/recipes-devtools/go/go/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch +++ b/poky/meta/recipes-devtools/go/go/0002-cmd-go-Allow-GOTOOLDIR-to-be-overridden-in-the-envir.patch @@ -1,7 +1,8 @@ -From 7e0136a882757da0a374ab8592209586eced0e1c Mon Sep 17 00:00:00 2001 +From 5cca2fa5997292a87302bdc7e7ed3231371e98bd Mon Sep 17 00:00:00 2001 From: Alex Kube <alexander.j.kube@gmail.com> Date: Wed, 23 Oct 2019 21:15:37 +0430 -Subject: [PATCH] cmd/go: Allow GOTOOLDIR to be overridden in the environment +Subject: [PATCH 2/9] cmd/go: Allow GOTOOLDIR to be overridden in the + environment to allow for split host/target build roots @@ -12,14 +13,13 @@ Matt Madison <matt@madison.systems>. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com> - --- src/cmd/dist/build.go | 4 +++- src/cmd/go/internal/cfg/cfg.go | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go -index 7c44c4a..3024d0c 100644 +index c36a12e..5d31718 100644 --- a/src/cmd/dist/build.go +++ b/src/cmd/dist/build.go @@ -264,7 +264,9 @@ func xinit() { @@ -34,19 +34,22 @@ index 7c44c4a..3024d0c 100644 // compilerEnv returns a map from "goos/goarch" to the diff --git a/src/cmd/go/internal/cfg/cfg.go b/src/cmd/go/internal/cfg/cfg.go -index c6ddfe5..605adb1 100644 +index 3257140..bb46253 100644 --- a/src/cmd/go/internal/cfg/cfg.go +++ b/src/cmd/go/internal/cfg/cfg.go -@@ -162,7 +162,11 @@ func SetGOROOT(goroot string) { - // variables. This matches the initialization of ToolDir in - // go/build, except for using BuildContext.GOROOT rather than - // runtime.GOROOT. -- build.ToolDir = filepath.Join(goroot, "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH) -+ if s := os.Getenv("GOTOOLDIR"); s != "" { -+ build.ToolDir = filepath.Clean(s) -+ } else { -+ build.ToolDir = filepath.Join(goroot, "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH) -+ } +@@ -229,7 +229,11 @@ func SetGOROOT(goroot string, isTestGo bool) { + // This matches the initialization of ToolDir in go/build, except for + // using ctxt.GOROOT and the installed GOOS and GOARCH rather than the + // GOROOT, GOOS, and GOARCH reported by the runtime package. +- build.ToolDir = filepath.Join(GOROOTpkg, "tool", installedGOOS+"_"+installedGOARCH) ++ if s := os.Getenv("GOTOOLDIR"); s != "" { ++ build.ToolDir = filepath.Clean(s) ++ } else { ++ build.ToolDir = filepath.Join(GOROOTpkg, "tool", installedGOOS+"_"+installedGOARCH) ++ } + } } } - +-- +2.30.2 + diff --git a/poky/meta/recipes-devtools/go/go/0004-ld-add-soname-to-shareable-objects.patch b/poky/meta/recipes-devtools/go/go/0003-ld-add-soname-to-shareable-objects.patch index b700634910..2bc7d194bb 100644 --- a/poky/meta/recipes-devtools/go/go/0004-ld-add-soname-to-shareable-objects.patch +++ b/poky/meta/recipes-devtools/go/go/0003-ld-add-soname-to-shareable-objects.patch @@ -1,7 +1,7 @@ -From 68867eae5d3a51f32b2a2e16374323338408781e Mon Sep 17 00:00:00 2001 +From c7536a820f713013ab1d4acef74a4c8bd970bf8f Mon Sep 17 00:00:00 2001 From: Alex Kube <alexander.j.kube@gmail.com> Date: Wed, 23 Oct 2019 21:16:32 +0430 -Subject: [PATCH] ld: add soname to shareable objects +Subject: [PATCH 3/9] ld: add soname to shareable objects so that OE's shared library dependency handling can find them. @@ -13,16 +13,15 @@ Matt Madison <matt@madison.systems>. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com> - --- src/cmd/link/internal/ld/lib.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go -index 18910dd..b2e1d36 100644 +index c073017..e60d39a 100644 --- a/src/cmd/link/internal/ld/lib.go +++ b/src/cmd/link/internal/ld/lib.go -@@ -1459,6 +1459,7 @@ func (ctxt *Link) hostlink() { +@@ -1491,6 +1491,7 @@ func (ctxt *Link) hostlink() { argv = append(argv, "-Wl,-z,relro") } argv = append(argv, "-shared") @@ -30,7 +29,7 @@ index 18910dd..b2e1d36 100644 if ctxt.HeadType == objabi.Hwindows { argv = addASLRargs(argv, *flagAslr) } else { -@@ -1474,6 +1475,7 @@ func (ctxt *Link) hostlink() { +@@ -1506,6 +1507,7 @@ func (ctxt *Link) hostlink() { argv = append(argv, "-Wl,-z,relro") } argv = append(argv, "-shared") @@ -38,7 +37,7 @@ index 18910dd..b2e1d36 100644 case BuildModePlugin: if ctxt.HeadType == objabi.Hdarwin { argv = append(argv, "-dynamiclib") -@@ -1482,6 +1484,7 @@ func (ctxt *Link) hostlink() { +@@ -1514,6 +1516,7 @@ func (ctxt *Link) hostlink() { argv = append(argv, "-Wl,-z,relro") } argv = append(argv, "-shared") @@ -46,3 +45,6 @@ index 18910dd..b2e1d36 100644 } } +-- +2.30.2 + diff --git a/poky/meta/recipes-devtools/go/go/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch b/poky/meta/recipes-devtools/go/go/0004-make.bash-override-CC-when-building-dist-and-go_boot.patch index 608f1eb5a0..85e42f7660 100644 --- a/poky/meta/recipes-devtools/go/go/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch +++ b/poky/meta/recipes-devtools/go/go/0004-make.bash-override-CC-when-building-dist-and-go_boot.patch @@ -1,7 +1,8 @@ -From 8f020921c464e95ded850950382115154448580a Mon Sep 17 00:00:00 2001 +From 31ff609cc3d3bfcc2f2257fda1dbaafaec31eb0b Mon Sep 17 00:00:00 2001 From: Alex Kube <alexander.j.kube@gmail.com> Date: Wed, 23 Oct 2019 21:17:16 +0430 -Subject: [PATCH] make.bash: override CC when building dist and go_bootstrap +Subject: [PATCH 4/9] make.bash: override CC when building dist and + go_bootstrap for handling OE cross-canadian builds. @@ -12,16 +13,15 @@ Matt Madison <matt@madison.systems>. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com> - --- src/make.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/make.bash b/src/make.bash -index ab2ce19..37ec1fb 100755 +index c07f39b..6ca7242 100755 --- a/src/make.bash +++ b/src/make.bash -@@ -198,7 +198,7 @@ if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ]; then +@@ -194,7 +194,7 @@ if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ]; then exit 1 fi rm -f cmd/dist/dist @@ -30,12 +30,15 @@ index ab2ce19..37ec1fb 100755 # -e doesn't propagate out of eval, so check success by hand. eval $(./cmd/dist/dist env -p || echo FAIL=true) -@@ -223,7 +223,7 @@ fi +@@ -219,7 +219,7 @@ fi # Run dist bootstrap to complete make.bash. # Bootstrap installs a proper cmd/dist, built with the new toolchain. - # Throw ours, built with Go 1.4, away after bootstrap. + # Throw ours, built with the bootstrap toolchain, away after bootstrap. -./cmd/dist/dist bootstrap -a $vflag $GO_DISTFLAGS "$@" +CC="${BUILD_CC:-${CC}}" ./cmd/dist/dist bootstrap -a $vflag $GO_DISTFLAGS "$@" rm -f ./cmd/dist/dist # DO NOT ADD ANY NEW CODE HERE. +-- +2.30.2 + diff --git a/poky/meta/recipes-devtools/go/go/0006-cmd-dist-separate-host-and-target-builds.patch b/poky/meta/recipes-devtools/go/go/0005-cmd-dist-separate-host-and-target-builds.patch index 2c864baa0e..29598449da 100644 --- a/poky/meta/recipes-devtools/go/go/0006-cmd-dist-separate-host-and-target-builds.patch +++ b/poky/meta/recipes-devtools/go/go/0005-cmd-dist-separate-host-and-target-builds.patch @@ -1,7 +1,7 @@ -From ef5fddafdec78cab9963d21736e64d71ca520bcc Mon Sep 17 00:00:00 2001 +From 7a191e5191c8b813e929caedb3f3918bb08692a1 Mon Sep 17 00:00:00 2001 From: Alex Kube <alexander.j.kube@gmail.com> Date: Wed, 23 Oct 2019 21:18:12 +0430 -Subject: [PATCH] cmd/dist: separate host and target builds +Subject: [PATCH 5/9] cmd/dist: separate host and target builds Upstream-Status: Inappropriate [OE specific] @@ -34,16 +34,15 @@ the meta/recipes-devtools/go tree by Matt Madison <matt@madison.systems>. Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com> - --- - src/cmd/dist/build.go | 154 ++++++++++++++++++++++++++++++------------ - 1 file changed, 112 insertions(+), 42 deletions(-) + src/cmd/dist/build.go | 152 +++++++++++++++++++++++++++++++----------- + 1 file changed, 113 insertions(+), 39 deletions(-) diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go -index 3024d0c..45ebee0 100644 +index 5d31718..1c7f308 100644 --- a/src/cmd/dist/build.go +++ b/src/cmd/dist/build.go -@@ -45,6 +45,7 @@ var ( +@@ -44,6 +44,7 @@ var ( goexperiment string workdir string tooldir string @@ -52,9 +51,9 @@ index 3024d0c..45ebee0 100644 oldgoarch string exe string @@ -55,6 +56,7 @@ var ( - rebuildall bool defaultclang bool + noOpt bool + crossBuild bool vflag int // verbosity @@ -69,17 +68,17 @@ index 3024d0c..45ebee0 100644 // compilerEnv returns a map from "goos/goarch" to the @@ -468,8 +472,10 @@ func setup() { - p := pathf("%s/pkg/%s_%s", goroot, gohostos, gohostarch) + goosGoarch := pathf("%s/pkg/%s_%s", goroot, gohostos, gohostarch) if rebuildall { - xremoveall(p) + xremoveall(goosGoarch) + xremoveall(build_tooldir) } - xmkdirall(p) + xmkdirall(goosGoarch) + xmkdirall(build_tooldir) - - if goos != gohostos || goarch != gohostarch { - p := pathf("%s/pkg/%s_%s", goroot, goos, goarch) -@@ -1248,17 +1254,35 @@ func cmdbootstrap() { + xatexit(func() { + if files := xreaddir(goosGoarch); len(files) == 0 { + xremove(goosGoarch) +@@ -1276,17 +1282,35 @@ func cmdbootstrap() { var noBanner, noClean bool var debug bool @@ -116,23 +115,25 @@ index 3024d0c..45ebee0 100644 // Set GOPATH to an internal directory. We shouldn't actually // need to store files here, since the toolchain won't // depend on modules outside of vendor directories, but if -@@ -1326,8 +1350,13 @@ func cmdbootstrap() { +@@ -1354,9 +1378,14 @@ func cmdbootstrap() { xprintf("\n") } - gogcflags = os.Getenv("GO_GCFLAGS") // we were using $BOOT_GO_GCFLAGS until now +- setNoOpt() - goldflags = os.Getenv("GO_LDFLAGS") // we were using $BOOT_GO_LDFLAGS until now + // For split host/target cross/cross-canadian builds, we don't + // want to be setting these flags until after we have compiled + // the toolchain that runs on the build host. + if !crossBuild { + gogcflags = os.Getenv("GO_GCFLAGS") // we were using $BOOT_GO_GCFLAGS until now ++ setNoOpt() + goldflags = os.Getenv("GO_LDFLAGS") // we were using $BOOT_GO_LDFLAGS until now + } goBootstrap := pathf("%s/go_bootstrap", tooldir) cmdGo := pathf("%s/go", gorootBin) if debug { -@@ -1356,7 +1385,11 @@ func cmdbootstrap() { +@@ -1385,7 +1414,11 @@ func cmdbootstrap() { xprintf("\n") } xprintf("Building Go toolchain2 using go_bootstrap and Go toolchain1.\n") @@ -144,10 +145,10 @@ index 3024d0c..45ebee0 100644 + } // Now that cmd/go is in charge of the build process, enable GOEXPERIMENT. os.Setenv("GOEXPERIMENT", goexperiment) - goInstall(goBootstrap, append([]string{"-i"}, toolchain...)...) -@@ -1395,50 +1428,84 @@ func cmdbootstrap() { + goInstall(goBootstrap, toolchain...) +@@ -1421,46 +1454,84 @@ func cmdbootstrap() { + copyfile(pathf("%s/compile3", tooldir), pathf("%s/compile", tooldir), writeExec) } - checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...) - if goos == oldgoos && goarch == oldgoarch { - // Common case - not setting up for cross-compilation. @@ -251,22 +252,18 @@ index 3024d0c..45ebee0 100644 - xprintf("Building packages and commands for target, %s/%s.\n", goos, goarch) - } - targets := []string{"std", "cmd"} -- if goos == "js" && goarch == "wasm" { -- // Skip the cmd tools for js/wasm. They're not usable. -- targets = targets[:1] -- } - goInstall(goBootstrap, targets...) +- checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...) - checkNotStale(goBootstrap, targets...) - checkNotStale(cmdGo, targets...) - if debug { - run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full") -- run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch)) - checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...) - copyfile(pathf("%s/compile4", tooldir), pathf("%s/compile", tooldir), writeExec) } // Check that there are no new files in $GOROOT/bin other than -@@ -1455,8 +1522,11 @@ func cmdbootstrap() { +@@ -1477,8 +1548,11 @@ func cmdbootstrap() { } } @@ -280,3 +277,6 @@ index 3024d0c..45ebee0 100644 if goos == "android" { // Make sure the exec wrapper will sync a fresh $GOROOT to the device. +-- +2.30.2 + diff --git a/poky/meta/recipes-devtools/go/go/0007-cmd-go-make-GOROOT-precious-by-default.patch b/poky/meta/recipes-devtools/go/go/0006-cmd-go-make-GOROOT-precious-by-default.patch index 534d431045..38b28b9877 100644 --- a/poky/meta/recipes-devtools/go/go/0007-cmd-go-make-GOROOT-precious-by-default.patch +++ b/poky/meta/recipes-devtools/go/go/0006-cmd-go-make-GOROOT-precious-by-default.patch @@ -1,7 +1,7 @@ -From 9ba507e076c744f4d394418e4a849e68cd426a4a Mon Sep 17 00:00:00 2001 +From efab470498bb0a30ee2d00455a0c8c10459f6347 Mon Sep 17 00:00:00 2001 From: Alex Kube <alexander.j.kube@gmail.com> Date: Wed, 23 Oct 2019 21:18:56 +0430 -Subject: [PATCH 7/9] cmd/go: make GOROOT precious by default +Subject: [PATCH 6/9] cmd/go: make GOROOT precious by default Upstream-Status: Inappropriate [OE specific] @@ -27,9 +27,11 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com> src/cmd/go/internal/work/exec.go | 25 +++++++++++++++++++++++++ 3 files changed, 34 insertions(+) +diff --git a/src/cmd/go/internal/work/action.go b/src/cmd/go/internal/work/action.go +index 8beb134..68a8cfe 100644 --- a/src/cmd/go/internal/work/action.go +++ b/src/cmd/go/internal/work/action.go -@@ -673,6 +673,9 @@ func (b *Builder) addTransitiveLinkDeps( +@@ -718,6 +718,9 @@ func (b *Builder) addTransitiveLinkDeps(a, a1 *Action, shlib string) { if p1 == nil || p1.Shlib == "" || haveShlib[filepath.Base(p1.Shlib)] { continue } @@ -39,9 +41,11 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com> haveShlib[filepath.Base(p1.Shlib)] = true // TODO(rsc): The use of ModeInstall here is suspect, but if we only do ModeBuild, // we'll end up building an overall library or executable that depends at runtime +diff --git a/src/cmd/go/internal/work/build.go b/src/cmd/go/internal/work/build.go +index 2f2860a..8cc6166 100644 --- a/src/cmd/go/internal/work/build.go +++ b/src/cmd/go/internal/work/build.go -@@ -197,6 +197,8 @@ See also: go install, go get, go clean. +@@ -217,6 +217,8 @@ See also: go install, go get, go clean. const concurrentGCBackendCompilationEnabledByDefault = true @@ -50,10 +54,10 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com> func init() { // break init cycle CmdBuild.Run = runBuild -@@ -209,6 +211,10 @@ func init() { - - AddBuildFlags(CmdBuild, DefaultBuildFlags) - AddBuildFlags(CmdInstall, DefaultBuildFlags) +@@ -230,6 +232,10 @@ func init() { + AddCoverFlags(CmdBuild, nil) + AddCoverFlags(CmdInstall, nil) + } + + if x := os.Getenv("GOROOT_OVERRIDE"); x != "" { + goRootPrecious = false @@ -61,9 +65,11 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com> } // Note that flags consulted by other parts of the code +diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go +index 7e4fcb3..d83b31b 100644 --- a/src/cmd/go/internal/work/exec.go +++ b/src/cmd/go/internal/work/exec.go -@@ -535,6 +535,23 @@ func (b *Builder) build(ctx context.Cont +@@ -527,6 +527,23 @@ func (b *Builder) build(ctx context.Context, a *Action) (err error) { return errors.New("binary-only packages are no longer supported") } @@ -87,7 +93,7 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com> if err := b.Mkdir(a.Objdir); err != nil { return err } -@@ -1585,6 +1602,14 @@ func (b *Builder) linkShared(ctx context +@@ -1624,6 +1641,14 @@ func (b *Builder) linkShared(ctx context.Context, a *Action) (err error) { return err } @@ -102,3 +108,6 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com> if err := b.Mkdir(a.Objdir); err != nil { return err } +-- +2.30.2 + diff --git a/poky/meta/recipes-devtools/go/go/0001-exec.go-do-not-write-linker-flags-into-buildids.patch b/poky/meta/recipes-devtools/go/go/0007-exec.go-do-not-write-linker-flags-into-buildids.patch index f117152f2a..a821cf02fc 100644 --- a/poky/meta/recipes-devtools/go/go/0001-exec.go-do-not-write-linker-flags-into-buildids.patch +++ b/poky/meta/recipes-devtools/go/go/0007-exec.go-do-not-write-linker-flags-into-buildids.patch @@ -1,7 +1,7 @@ -From bdd69b55387f80c8df18d0af5008bf5e1a66be6a Mon Sep 17 00:00:00 2001 +From 0ba747e6a4b251a0d9eed0cfd8f8c491bb508040 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Mon, 23 Nov 2020 19:22:04 +0000 -Subject: [PATCH] exec.go: do not write linker flags into buildids +Subject: [PATCH 7/9] exec.go: do not write linker flags into buildids The flags can contain build-specific paths, breaking reproducibility. @@ -14,9 +14,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> src/cmd/go/internal/work/exec.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) +diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go +index d83b31b..a646fbb 100644 --- a/src/cmd/go/internal/work/exec.go +++ b/src/cmd/go/internal/work/exec.go -@@ -1274,7 +1274,7 @@ func (b *Builder) linkActionID(a *Action +@@ -1312,7 +1312,7 @@ func (b *Builder) linkActionID(a *Action) cache.ActionID { } // Toolchain-dependent configuration, shared with b.linkSharedActionID. @@ -25,7 +27,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> // Input files. for _, a1 := range a.Deps { -@@ -1568,7 +1568,7 @@ func (b *Builder) linkSharedActionID(a * +@@ -1607,7 +1607,7 @@ func (b *Builder) linkSharedActionID(a *Action) cache.ActionID { fmt.Fprintf(h, "goos %s goarch %s\n", cfg.Goos, cfg.Goarch) // Toolchain-dependent configuration, shared with b.linkActionID. @@ -34,3 +36,6 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> // Input files. for _, a1 := range a.Deps { +-- +2.30.2 + diff --git a/poky/meta/recipes-devtools/go/go/0001-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch b/poky/meta/recipes-devtools/go/go/0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch index ef1cc6716a..fe830ce35c 100644 --- a/poky/meta/recipes-devtools/go/go/0001-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch +++ b/poky/meta/recipes-devtools/go/go/0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch @@ -1,8 +1,8 @@ -From 2055a46b396e272616c0b2273903e02c3b49a2ff Mon Sep 17 00:00:00 2001 +From 1cbb416538a9c7c3fbedcb23f4d90d5c48becca8 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Tue, 10 Nov 2020 16:33:27 +0000 -Subject: [PATCH] src/cmd/dist/buildgo.go: do not hardcode host compilers into - target binaries +Subject: [PATCH 8/9] src/cmd/dist/buildgo.go: do not hardcode host compilers + into target binaries These come from $CC/$CXX on the build host and are not useful on targets; additionally as they contain host specific paths, this helps reproducibility. @@ -13,9 +13,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> src/cmd/dist/buildgo.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) +diff --git a/src/cmd/dist/buildgo.go b/src/cmd/dist/buildgo.go +index 29b0167..63a49f0 100644 --- a/src/cmd/dist/buildgo.go +++ b/src/cmd/dist/buildgo.go -@@ -34,8 +34,8 @@ func mkzdefaultcc(dir, file string) { +@@ -33,8 +33,8 @@ func mkzdefaultcc(dir, file string) { fmt.Fprintf(&buf, "package cfg\n") fmt.Fprintln(&buf) fmt.Fprintf(&buf, "const DefaultPkgConfig = `%s`\n", defaultpkgconfig) @@ -26,7 +28,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> writefile(buf.String(), file, writeSkipSame) return } -@@ -46,8 +46,8 @@ func mkzdefaultcc(dir, file string) { +@@ -45,8 +45,8 @@ func mkzdefaultcc(dir, file string) { fmt.Fprintf(&buf, "package main\n") fmt.Fprintln(&buf) fmt.Fprintf(&buf, "const defaultPkgConfig = `%s`\n", defaultpkgconfig) @@ -37,3 +39,6 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> writefile(buf.String(), file, writeSkipSame) } +-- +2.30.2 + diff --git a/poky/meta/recipes-devtools/go/go/filter-build-paths.patch b/poky/meta/recipes-devtools/go/go/0009-go-Filter-build-paths-on-staticly-linked-arches.patch index 280f911a21..705c922141 100644 --- a/poky/meta/recipes-devtools/go/go/filter-build-paths.patch +++ b/poky/meta/recipes-devtools/go/go/0009-go-Filter-build-paths-on-staticly-linked-arches.patch @@ -1,7 +1,7 @@ -From 3bdbce685c688a27eece36ccc8be9b50b4849498 Mon Sep 17 00:00:00 2001 +From 18011f72125bbea273d07ee5d792ac0ce6059572 Mon Sep 17 00:00:00 2001 From: Richard Purdie <richard.purdie@linuxfoundation.org> Date: Sat, 2 Jul 2022 23:08:13 +0100 -Subject: [PATCH] go: Filter build paths on staticly linked arches +Subject: [PATCH 9/9] go: Filter build paths on staticly linked arches Filter out build time paths from ldflags and other flags variables when they're embedded in the go binary so that builds are reproducible regardless of build @@ -11,16 +11,15 @@ on mips/ppc. Upstream-Status: Submitted [https://github.com/golang/go/pull/56410] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> - --- src/cmd/go/internal/load/pkg.go | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/cmd/go/internal/load/pkg.go b/src/cmd/go/internal/load/pkg.go -index 046f508..353cbc4 100644 +index 56a4e5e..22edbdb 100644 --- a/src/cmd/go/internal/load/pkg.go +++ b/src/cmd/go/internal/load/pkg.go -@@ -2256,6 +2256,17 @@ func (p *Package) collectDeps() { +@@ -2266,6 +2266,17 @@ func (p *Package) collectDeps() { // to their VCS information (vcsStatusError). var vcsStatusCache par.Cache @@ -38,7 +37,7 @@ index 046f508..353cbc4 100644 // setBuildInfo gathers build information, formats it as a string to be // embedded in the binary, then sets p.Internal.BuildInfo to that string. // setBuildInfo should only be called on a main package with no errors. -@@ -2353,7 +2364,7 @@ func (p *Package) setBuildInfo(includeVCS bool) { +@@ -2372,7 +2383,7 @@ func (p *Package) setBuildInfo(autoVCS bool) { if gcflags := BuildGcflags.String(); gcflags != "" && cfg.BuildContext.Compiler == "gc" { appendSetting("-gcflags", gcflags) } @@ -47,7 +46,7 @@ index 046f508..353cbc4 100644 // https://go.dev/issue/52372: only include ldflags if -trimpath is not set, // since it can include system paths through various linker flags (notably // -extar, -extld, and -extldflags). -@@ -2392,7 +2403,7 @@ func (p *Package) setBuildInfo(includeVCS bool) { +@@ -2418,7 +2429,7 @@ func (p *Package) setBuildInfo(autoVCS bool) { // subset of flags that are known not to be paths? if cfg.BuildContext.CgoEnabled && !cfg.BuildTrimpath { for _, name := range []string{"CGO_CFLAGS", "CGO_CPPFLAGS", "CGO_CXXFLAGS", "CGO_LDFLAGS"} { @@ -56,3 +55,6 @@ index 046f508..353cbc4 100644 } } appendSetting("GOARCH", cfg.BuildContext.GOARCH) +-- +2.30.2 + diff --git a/poky/meta/recipes-devtools/go/go_1.19.4.bb b/poky/meta/recipes-devtools/go/go_1.20.1.bb index 587ee55944..587ee55944 100644 --- a/poky/meta/recipes-devtools/go/go_1.19.4.bb +++ b/poky/meta/recipes-devtools/go/go_1.20.1.bb diff --git a/poky/meta/recipes-devtools/log4cplus/log4cplus_2.0.8.bb b/poky/meta/recipes-devtools/log4cplus/log4cplus_2.1.0.bb index bbf4ce6218..e0c16d2e73 100644 --- a/poky/meta/recipes-devtools/log4cplus/log4cplus_2.0.8.bb +++ b/poky/meta/recipes-devtools/log4cplus/log4cplus_2.1.0.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=41e8e060c26822886b592ab4765c756b" SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}-stable/${PV}/${BP}.tar.gz \ " -SRC_URI[sha256sum] = "cdc3c738e00be84d8d03b580816b9f12628ecc1d71e1395080c802615d2d9ced" +SRC_URI[sha256sum] = "2a8eb99d71b0680c0520c7c16248cdb4195da82f396b79fea30b0d9e289c8c72" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/log4cplus/files/log4cplus-stable/" UPSTREAM_CHECK_REGEX = "log4cplus-stable/(?P<pver>\d+(\.\d+)+)/" diff --git a/poky/meta/recipes-devtools/mmc/mmc-utils_git.bb b/poky/meta/recipes-devtools/mmc/mmc-utils_git.bb index d9625473f5..8c41b77fe1 100644 --- a/poky/meta/recipes-devtools/mmc/mmc-utils_git.bb +++ b/poky/meta/recipes-devtools/mmc/mmc-utils_git.bb @@ -5,7 +5,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://mmc.c;beginline=1;endline=20;md5=fae32792e20f4d27ade1c5a762d16b7d" SRCBRANCH ?= "master" -SRCREV = "c62dd8e415b12cc7f9a362db23cd384caf77ff03" +SRCREV = "d4c2910981ff99b983734426dfa99632fb81ac6b" PV = "0.1+git${SRCPV}" diff --git a/poky/meta/recipes-devtools/pkgconfig/pkgconfig/0001-autotools-remove-support-for-the-__int64-type.-See-1.patch b/poky/meta/recipes-devtools/pkgconfig/pkgconfig/0001-autotools-remove-support-for-the-__int64-type.-See-1.patch deleted file mode 100644 index bee4585724..0000000000 --- a/poky/meta/recipes-devtools/pkgconfig/pkgconfig/0001-autotools-remove-support-for-the-__int64-type.-See-1.patch +++ /dev/null @@ -1,144 +0,0 @@ -From 7e821441c482917e54435a07893272d87d3ad9e5 Mon Sep 17 00:00:00 2001 -From: Christoph Reiter <reiter.christoph@gmail.com> -Date: Fri, 24 Aug 2018 19:43:04 +0200 -Subject: [PATCH] autotools: remove support for the __int64 type. See #1313 - -__int64 was the 64bit type for Visual Studio before it added support for -"long long" with VS2013. I think this was used to build glib with mingw and -make the result usable for VS 6.0 which didn't support "long long" (??) - -Given that newer MSVC links against a different crt and mixing is not supported -and everything supports "long long" nowadays just remove it. - -This is also a cleanup for printf format changes needed for #1497 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Backport [https://github.com/GNOME/glib/commit/7e821441c4] ---- - configure.ac | 43 ++++--------------------------------------- - 1 file changed, 4 insertions(+), 39 deletions(-) - ---- a/glib/configure.ac -+++ b/glib/configure.ac -@@ -550,7 +550,6 @@ AC_CHECK_SIZEOF(long) - AC_CHECK_SIZEOF(int) - AC_CHECK_SIZEOF(void *) - AC_CHECK_SIZEOF(long long) --AC_CHECK_SIZEOF(__int64) - - AC_CACHE_CHECK([for sig_atomic_t], ac_cv_type_sig_atomic_t, - [AC_TRY_LINK([#include <signal.h> -@@ -564,7 +563,7 @@ if test x$ac_cv_type_sig_atomic_t = xyes - [Define if you have the 'sig_atomic_t' type.]) - fi - --if test x$ac_cv_sizeof_long = x8 || test x$ac_cv_sizeof_long_long = x8 || test x$ac_cv_sizeof___int64 = x8 ; then -+if test x$ac_cv_sizeof_long = x8 || test x$ac_cv_sizeof_long_long = x8 ; then - : - else - AC_MSG_ERROR([ -@@ -573,7 +572,7 @@ else - ]) - fi - --AS_IF([test x$glib_native_win32 != xyes && test x$ac_cv_sizeof_long_long = x8], [ -+AS_IF([test x$ac_cv_sizeof_long_long = x8], [ - # long long is a 64 bit integer. - AC_MSG_CHECKING(for format to printf and scanf a guint64) - AC_CACHE_VAL(glib_cv_long_long_format,[ -@@ -599,14 +598,6 @@ AS_IF([test x$glib_native_win32 != xyes - AC_DEFINE(HAVE_INT64_AND_I64,1,[define to support printing 64-bit integers with format I64]) - fi - ], [AC_MSG_RESULT(none)]) --],[ test x$ac_cv_sizeof___int64 = x8], [ -- # __int64 is a 64 bit integer. -- AC_MSG_CHECKING(for format to printf and scanf a guint64) -- # We know this is MSVCRT.DLL, and what the formats are -- glib_cv_long_long_format=I64 -- AC_MSG_RESULT(%${glib_cv_long_long_format}u) -- AC_DEFINE(HAVE_LONG_LONG_FORMAT,1,[define if system printf can print long long]) -- AC_DEFINE(HAVE_INT64_AND_I64,1,[define to support printing 64-bit integers with format I64]) - ]) - - AC_C_CONST -@@ -872,9 +863,6 @@ case $ac_cv_sizeof_size_t in - $ac_cv_sizeof_long_long) - glib_size_type='long long' - ;; -- $ac_cv_sizeof__int64) -- glib_size_type='__int64' -- ;; - *) AC_MSG_ERROR([No type matching size_t in size]) - ;; - esac -@@ -931,9 +919,6 @@ case $ac_cv_sizeof_ssize_t in - $ac_cv_sizeof_long_long) - glib_ssize_type='long long' - ;; -- $ac_cv_sizeof__int64) -- glib_ssize_type='__int64' -- ;; - *) AC_MSG_ERROR([No type matching ssize_t in size]) - ;; - esac -@@ -2985,17 +2970,6 @@ $ac_cv_sizeof_long_long) - gint64_constant='(G_GNUC_EXTENSION (val##LL))' - guint64_constant='(G_GNUC_EXTENSION (val##ULL))' - ;; --$ac_cv_sizeof___int64) -- gint64='__int64' -- if test -n "$glib_cv_long_long_format"; then -- gint64_modifier='"'$glib_cv_long_long_format'"' -- gint64_format='"'$glib_cv_long_long_format'i"' -- guint64_format='"'$glib_cv_long_long_format'u"' -- fi -- glib_extension= -- gint64_constant='(val##i64)' -- guint64_constant='(val##ui64)' -- ;; - esac - glib_size_t=$ac_cv_sizeof_size_t - glib_ssize_t=$ac_cv_sizeof_ssize_t -@@ -3020,7 +2994,7 @@ long) - gsize_format='"lu"' - glib_msize_type='LONG' - ;; --"long long"|__int64) -+"long long") - gsize_modifier='"I64"' - gsize_format='"I64u"' - glib_msize_type='INT64' -@@ -3043,7 +3017,7 @@ long) - gssize_format='"li"' - glib_mssize_type='LONG' - ;; --"long long"|__int64) -+"long long") - gssize_modifier='"I64"' - gssize_format='"I64i"' - glib_mssize_type='INT64' -@@ -3080,14 +3054,6 @@ $ac_cv_sizeof_long_long) - glib_gpi_cast='(gint64)' - glib_gpui_cast='(guint64)' - ;; --$ac_cv_sizeof___int64) -- glib_intptr_type_define=__int64 -- gintptr_modifier='"I64"' -- gintptr_format='"I64i"' -- guintptr_format='"I64u"' -- glib_gpi_cast='(gint64)' -- glib_gpui_cast='(guint64)' -- ;; - *) - glib_unknown_void_p=yes - ;; -@@ -3258,9 +3224,6 @@ $ac_cv_sizeof_long) - $ac_cv_sizeof_long_long) - gint64='long long' - ;; --$ac_cv_sizeof___int64) -- gint64='__int64' -- ;; - esac - - AC_CHECK_TYPE([guint32],,,[typedef unsigned $gint32 guint32;]) diff --git a/poky/meta/recipes-devtools/pkgconfig/pkgconfig/0001-autotools-use-C99-printf-format-specifiers-on-Window.patch b/poky/meta/recipes-devtools/pkgconfig/pkgconfig/0001-autotools-use-C99-printf-format-specifiers-on-Window.patch deleted file mode 100644 index a4e92da34b..0000000000 --- a/poky/meta/recipes-devtools/pkgconfig/pkgconfig/0001-autotools-use-C99-printf-format-specifiers-on-Window.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 3d7cde654c4c6f3bdad32f5521f28f5802a7c377 Mon Sep 17 00:00:00 2001 -From: Christoph Reiter <reiter.christoph@gmail.com> -Date: Fri, 24 Aug 2018 21:46:47 +0200 -Subject: [PATCH] autotools: use C99 printf format specifiers on Windows. Fixes - #1497 - -Since we now require a C99 compatible printf and use gnulib on Windows, -we also mark our printf functions as gnu_printf. GCC complains about the -Windows specific I64 specifiers we still write to glibconfig.h with the -autotools build. - -To fix this switch all I64(x) to ll(x). - -This also makes the glibconfig.h output for those macros match the ones -we get when using meson. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Backport [https://github.com/GNOME/glib/commit/3d7cde654c] ---- - configure.ac | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - ---- a/glib/configure.ac -+++ b/glib/configure.ac -@@ -576,7 +576,7 @@ AS_IF([test x$ac_cv_sizeof_long_long = x - # long long is a 64 bit integer. - AC_MSG_CHECKING(for format to printf and scanf a guint64) - AC_CACHE_VAL(glib_cv_long_long_format,[ -- for format in ll q I64; do -+ for format in ll q; do - AC_TRY_RUN([#include <stdio.h> - int main() - { -@@ -2995,8 +2995,8 @@ long) - glib_msize_type='LONG' - ;; - "long long") -- gsize_modifier='"I64"' -- gsize_format='"I64u"' -+ gsize_modifier='"ll"' -+ gsize_format='"llu"' - glib_msize_type='INT64' - ;; - esac -@@ -3018,8 +3018,8 @@ long) - glib_mssize_type='LONG' - ;; - "long long") -- gssize_modifier='"I64"' -- gssize_format='"I64i"' -+ gssize_modifier='"ll"' -+ gssize_format='"lli"' - glib_mssize_type='INT64' - ;; - esac -@@ -3048,9 +3048,9 @@ $ac_cv_sizeof_long) - ;; - $ac_cv_sizeof_long_long) - glib_intptr_type_define='long long' -- gintptr_modifier='"I64"' -- gintptr_format='"I64i"' -- guintptr_format='"I64u"' -+ gintptr_modifier='"ll"' -+ gintptr_format='"lli"' -+ guintptr_format='"llu"' - glib_gpi_cast='(gint64)' - glib_gpui_cast='(guint64)' - ;; diff --git a/poky/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb b/poky/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb index 7e5860c18c..68f624c80a 100644 --- a/poky/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb +++ b/poky/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb @@ -15,8 +15,6 @@ SRC_URI = "git://gitlab.freedesktop.org/pkg-config/pkg-config.git;branch=master; file://pkg-config-esdk.in \ file://pkg-config-native.in \ file://0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch \ - file://0001-autotools-remove-support-for-the-__int64-type.-See-1.patch \ - file://0001-autotools-use-C99-printf-format-specifiers-on-Window.patch \ " S = "${WORKDIR}/git" @@ -30,7 +28,6 @@ EXTRA_OECONF += "--disable-indirect-deps" PACKAGECONFIG ??= "glib" PACKAGECONFIG:class-native = "" -PACKAGECONFIG:class-nativesdk = "" PACKAGECONFIG[glib] = "--without-internal-glib,--with-internal-glib,glib-2.0 pkgconfig-native" diff --git a/poky/meta/recipes-devtools/python/python3-atomicwrites_1.4.1.bb b/poky/meta/recipes-devtools/python/python3-atomicwrites_1.4.1.bb index d4d15cea50..9f58a4bf1f 100644 --- a/poky/meta/recipes-devtools/python/python3-atomicwrites_1.4.1.bb +++ b/poky/meta/recipes-devtools/python/python3-atomicwrites_1.4.1.bb @@ -22,3 +22,5 @@ do_install_ptest() { } RDEPENDS:${PN} = "${PYTHON_PN}-misc" + +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/python/python3-babel_2.11.0.bb b/poky/meta/recipes-devtools/python/python3-babel_2.12.1.bb index f6eae88b80..dfa45fbdf6 100644 --- a/poky/meta/recipes-devtools/python/python3-babel_2.11.0.bb +++ b/poky/meta/recipes-devtools/python/python3-babel_2.12.1.bb @@ -1,9 +1,9 @@ DESCRIPTION = "A collection of tools for internationalizing Python applications" HOMEPAGE = "http://babel.edgewall.org/" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=fb98e9f202b978d6569807b9525cc691" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0f97d9a63e91407b4c0d01efde91cfc0" -SRC_URI[sha256sum] = "5ef4b3226b0180dedded4229651c8b0e1a3a6a2837d45a073272f313e4cf97f6" +SRC_URI[sha256sum] = "cc2d99999cd01d44420ae725a21c9e3711b3aadc7976d6147f622d8581963455" PYPI_PACKAGE = "Babel" diff --git a/poky/meta/recipes-devtools/python/python3-cryptography-vectors_39.0.0.bb b/poky/meta/recipes-devtools/python/python3-cryptography-vectors_39.0.1.bb index 6aaf6501b4..458ca2adbd 100644 --- a/poky/meta/recipes-devtools/python/python3-cryptography-vectors_39.0.0.bb +++ b/poky/meta/recipes-devtools/python/python3-cryptography-vectors_39.0.1.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4 \ # NOTE: Make sure to keep this recipe at the same version as python3-cryptography # Upgrade both recipes at the same time -SRC_URI[sha256sum] = "52e59670a0820b5bbfa85f724b8aebd61385787eb8b6607f64d533969124b2a0" +SRC_URI[sha256sum] = "0cbaeb50bdb7f3c9d7a93b26a0462ef6e97c768ca78d902854fe045c30b680c6" PYPI_PACKAGE = "cryptography_vectors" diff --git a/poky/meta/recipes-devtools/python/python3-cryptography_39.0.0.bb b/poky/meta/recipes-devtools/python/python3-cryptography_39.0.1.bb index cca192bc84..abc8d8e0ef 100644 --- a/poky/meta/recipes-devtools/python/python3-cryptography_39.0.0.bb +++ b/poky/meta/recipes-devtools/python/python3-cryptography_39.0.1.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=bf405a8056a6647e7d077b0e7bc36aba \ " LDSHARED += "-pthread" -SRC_URI[sha256sum] = "f964c7dcf7802d133e8dbd1565914fa0194f9d683d82411989889ecd701e8adf" +SRC_URI[sha256sum] = "d1f6198ee6d9148405e49887803907fe8962a23e6c6f83ea7d98f1c0de375695" SRC_URI += "\ file://0002-Cargo.toml-edition-2018-2021.patch \ diff --git a/poky/meta/recipes-devtools/python/python3-hatchling_1.12.2.bb b/poky/meta/recipes-devtools/python/python3-hatchling_1.13.0.bb index 7f5a29879b..17e7f86ba6 100644 --- a/poky/meta/recipes-devtools/python/python3-hatchling_1.12.2.bb +++ b/poky/meta/recipes-devtools/python/python3-hatchling_1.13.0.bb @@ -8,7 +8,7 @@ inherit pypi python_hatchling DEPENDS += "python3-pluggy-native python3-pathspec-native python3-packaging-native python3-editables-native" DEPENDS:remove:class-native = "python3-hatchling-native" -SRC_URI[sha256sum] = "8a6d719d96653a0f3901072b12710c9c3cc934f9061b443775c6789b45333495" +SRC_URI[sha256sum] = "f8d275a2cc720735286b7c2e2bc35da05761e6d3695c2fa416550395f10c53c7" do_compile:prepend() { export PYTHONPATH=src diff --git a/poky/meta/recipes-devtools/python/python3-hypothesis_6.66.0.bb b/poky/meta/recipes-devtools/python/python3-hypothesis_6.68.2.bb index 3101845e48..23e842f2e2 100644 --- a/poky/meta/recipes-devtools/python/python3-hypothesis_6.66.0.bb +++ b/poky/meta/recipes-devtools/python/python3-hypothesis_6.68.2.bb @@ -13,7 +13,7 @@ SRC_URI += " \ file://test_rle.py \ " -SRC_URI[sha256sum] = "2fb334ab068dc6e7c02d49a1c694f66bd1f681197eeed94406650a59eebef870" +SRC_URI[sha256sum] = "a7eb2b0c9a18560d8197fe35047ceb58e7e8ab7623a3e5a82613f6a2cd71cffa" RDEPENDS:${PN} += " \ python3-attrs \ 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 index ca50ebbc35..2abeec62f4 100644 --- a/poky/meta/recipes-devtools/python/python3-iniconfig_2.0.0.bb +++ b/poky/meta/recipes-devtools/python/python3-iniconfig_2.0.0.bb @@ -9,3 +9,5 @@ SRC_URI[sha256sum] = "2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a4 DEPENDS += "python3-hatch-vcs-native" inherit pypi python_hatchling + +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/python/python3-more-itertools_9.0.0.bb b/poky/meta/recipes-devtools/python/python3-more-itertools_9.1.0.bb index fce3aea897..7602350795 100644 --- a/poky/meta/recipes-devtools/python/python3-more-itertools_9.0.0.bb +++ b/poky/meta/recipes-devtools/python/python3-more-itertools_9.1.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/erikrose/more-itertools" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=3396ea30f9d21389d7857719816f83b5" -SRC_URI[sha256sum] = "5a6257e40878ef0520b1803990e3e22303a41b5714006c32a3fd8304b26ea1ab" +SRC_URI[sha256sum] = "cabaa341ad0389ea83c17a94566a53ae4c9d07349861ecb14dc6d0345cf9ac5d" inherit pypi python_flit_core ptest diff --git a/poky/meta/recipes-devtools/python/python3-numpy/0001-Define-_ALIGN-using-_Alignof-when-using-C11-or-newer.patch b/poky/meta/recipes-devtools/python/python3-numpy/0001-Define-_ALIGN-using-_Alignof-when-using-C11-or-newer.patch deleted file mode 100644 index 97391e2c12..0000000000 --- a/poky/meta/recipes-devtools/python/python3-numpy/0001-Define-_ALIGN-using-_Alignof-when-using-C11-or-newer.patch +++ /dev/null @@ -1,77 +0,0 @@ -From f9ac08a0fea543d68b2dba540093bd079e50be47 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 15 Jan 2023 15:49:09 -0800 -Subject: [PATCH] Define _ALIGN using _Alignof when using C11 or newer - -WG14 N2350 made very clear that it is an UB having type definitions -within "offsetof" [1]. This patch enhances the implementation of macro -_ALIGN to use builtin "_Alignof" to avoid undefined behavior on -when using std=c11 or newer - -clang 16+ has started to flag this [2] - -Fixes build when using -std >= gnu11 and using clang16+ - -Older compilers gcc < 4.9 or clang < 8 has buggy _Alignof even though it -may support C11, exclude those compilers too - -[1] https://www.open-std.org/jtc1/sc22/wg14/www/docs/n2350.htm -[2] https://reviews.llvm.org/D133574 - -Upstream-Status: Submitted [https://github.com/numpy/numpy/pull/23016] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - numpy/core/src/multiarray/arraytypes.c.src | 13 +++++++++++-- - numpy/core/src/multiarray/common.h | 12 +++++++++++- - 2 files changed, 22 insertions(+), 3 deletions(-) - -diff --git a/numpy/core/src/multiarray/arraytypes.c.src b/numpy/core/src/multiarray/arraytypes.c.src -index c03d09784..683917220 100644 ---- a/numpy/core/src/multiarray/arraytypes.c.src -+++ b/numpy/core/src/multiarray/arraytypes.c.src -@@ -224,8 +224,17 @@ MyPyLong_AsUnsigned@Type@(PyObject *obj) - ** GETITEM AND SETITEM ** - ***************************************************************************** - */ -- --#define _ALIGN(type) offsetof(struct {char c; type v;}, v) -+/* GCC releases before GCC 4.9 had a bug in _Alignof. See GCC bug 52023 -+ <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>. -+ clang versions < 8.0.0 have the same bug. */ -+#if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \ -+ || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \ -+ && !defined __clang__) \ -+ || (defined __clang__ && __clang_major__ < 8)) -+# define _ALIGN(type) offsetof(struct {char c; type v;}, v) -+#else -+# define _ALIGN(type) _Alignof(type) -+#endif - /* - * Disable harmless compiler warning "4116: unnamed type definition in - * parentheses" which is caused by the _ALIGN macro. -diff --git a/numpy/core/src/multiarray/common.h b/numpy/core/src/multiarray/common.h -index 3de8c842d..d01074c45 100644 ---- a/numpy/core/src/multiarray/common.h -+++ b/numpy/core/src/multiarray/common.h -@@ -178,7 +178,17 @@ check_and_adjust_axis(int *axis, int ndim) - } - - /* used for some alignment checks */ --#define _ALIGN(type) offsetof(struct {char c; type v;}, v) -+/* GCC releases before GCC 4.9 had a bug in _Alignof. See GCC bug 52023 -+ <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>. -+ clang versions < 8.0.0 have the same bug. */ -+#if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \ -+ || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \ -+ && !defined __clang__) \ -+ || (defined __clang__ && __clang_major__ < 8)) -+# define _ALIGN(type) offsetof(struct {char c; type v;}, v) -+#else -+# define _ALIGN(type) _Alignof(type) -+#endif - #define _UINT_ALIGN(type) npy_uint_alignment(sizeof(type)) - /* - * Disable harmless compiler warning "4116: unnamed type definition in --- -2.39.0 - diff --git a/poky/meta/recipes-devtools/python/python3-numpy_1.24.1.bb b/poky/meta/recipes-devtools/python/python3-numpy_1.24.2.bb index adac08b3e1..78a857bf16 100644 --- a/poky/meta/recipes-devtools/python/python3-numpy_1.24.1.bb +++ b/poky/meta/recipes-devtools/python/python3-numpy_1.24.2.bb @@ -10,10 +10,9 @@ SRCNAME = "numpy" SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${SRCNAME}-${PV}.tar.gz \ file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \ file://0001-numpy-core-Define-RISCV-32-support.patch \ - file://0001-Define-_ALIGN-using-_Alignof-when-using-C11-or-newer.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "2386da9a471cc00a1f47845e27d916d5ec5346ae9696e01a8a34760858fe9dd2" +SRC_URI[sha256sum] = "003a9f530e880cb2cd177cba1af7220b9aa42def9c4afc2a2fc3ee6be7eb2b22" GITHUB_BASE_URI = "https://github.com/numpy/numpy/releases" UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P<pver>\d+(\.\d+)+)$" diff --git a/poky/meta/recipes-devtools/python/python3-pip_23.0.bb b/poky/meta/recipes-devtools/python/python3-pip_23.0.1.bb index 8b956932c3..d9b9906ff9 100644 --- a/poky/meta/recipes-devtools/python/python3-pip_23.0.bb +++ b/poky/meta/recipes-devtools/python/python3-pip_23.0.1.bb @@ -33,7 +33,7 @@ inherit pypi python_setuptools_build_meta SRC_URI += "file://no_shebang_mangling.patch" -SRC_URI[sha256sum] = "aee438284e82c8def684b0bcc50b1f6ed5e941af97fa940e83e2e8ef1a59da9b" +SRC_URI[sha256sum] = "cd015ea1bfb0fcef59d8a286c1f8bebcb983f6317719d415dc5351efb7cd7024" do_install:append() { rm -f ${D}/${bindir}/pip diff --git a/poky/meta/recipes-devtools/python/python3-poetry-core_1.5.0.bb b/poky/meta/recipes-devtools/python/python3-poetry-core_1.5.1.bb index 03db426b39..952ffef99d 100644 --- a/poky/meta/recipes-devtools/python/python3-poetry-core_1.5.0.bb +++ b/poky/meta/recipes-devtools/python/python3-poetry-core_1.5.1.bb @@ -19,7 +19,7 @@ LIC_FILES_CHKSUM = "\ file://src/poetry/core/_vendor/typing_extensions.LICENSE;md5=f16b323917992e0f8a6f0071bc9913e2 \ " -SRC_URI[sha256sum] = "253521bb7104e1df81f64d7b49ea1825057c91fa156d7d0bd752fefdad6f8c7a" +SRC_URI[sha256sum] = "41887261358863f25831fa0ad1fe7e451fc32d1c81fcf7710ba5174cc0047c6d" inherit python_poetry_core pypi PYPI_ARCHIVE_NAME = "poetry_core-${PV}.${PYPI_PACKAGE_EXT}" diff --git a/poky/meta/recipes-devtools/python/python3-pytest-subtests_0.9.0.bb b/poky/meta/recipes-devtools/python/python3-pytest-subtests_0.10.0.bb index bfaff39077..e1f2a49d31 100644 --- a/poky/meta/recipes-devtools/python/python3-pytest-subtests_0.9.0.bb +++ b/poky/meta/recipes-devtools/python/python3-pytest-subtests_0.10.0.bb @@ -7,7 +7,7 @@ BUGTRACKER = "https://github.com/pytest-dev/pytest-subtests/issues" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=242b4e17fa287dcf7aef372f6bc3dcb1" -SRC_URI[sha256sum] = "c0317cd5f6a5eb3e957e89dbe4fc3322a9afddba2db8414355ed2a2cb91a844e" +SRC_URI[sha256sum] = "d9961a67c1791e8c1e32dce7a70ed1e54f3b1e641087f2094f2d37087ab7fb17" inherit pypi setuptools3 diff --git a/poky/meta/recipes-devtools/python/python3-pytest_7.2.1.bb b/poky/meta/recipes-devtools/python/python3-pytest_7.2.1.bb index 105b76a4a6..c7610d440c 100644 --- a/poky/meta/recipes-devtools/python/python3-pytest_7.2.1.bb +++ b/poky/meta/recipes-devtools/python/python3-pytest_7.2.1.bb @@ -11,7 +11,7 @@ DEPENDS += "python3-setuptools-scm-native" inherit update-alternatives pypi python_setuptools_build_meta -RDEPENDS:${PN}:class-target += " \ +RDEPENDS:${PN} += " \ ${PYTHON_PN}-atomicwrites \ ${PYTHON_PN}-attrs \ ${PYTHON_PN}-debugger \ 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 e22e757fcd..b12e4f5d05 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 1a7fbd6b7ccf9d3f69bd591fa35fa48c0b8916ba Mon Sep 17 00:00:00 2001 +From 8a67710131fc1b8246edc4dbcd8077eed96e13f7 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_67.2.0.bb b/poky/meta/recipes-devtools/python/python3-setuptools_67.3.3.bb index a412043a8b..053b671e2a 100644 --- a/poky/meta/recipes-devtools/python/python3-setuptools_67.2.0.bb +++ b/poky/meta/recipes-devtools/python/python3-setuptools_67.3.3.bb @@ -11,7 +11,7 @@ SRC_URI:append:class-native = " file://0001-conditionally-do-not-fetch-code-by-e SRC_URI += " \ file://0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch" -SRC_URI[sha256sum] = "b440ee5f7e607bb8c9de15259dba2583dd41a38879a7abc1d43a71c59524da48" +SRC_URI[sha256sum] = "ed4e75fafe103c79b692f217158ba87edf38d31004b9dbc1913debb48793c828" DEPENDS += "${PYTHON_PN}" diff --git a/poky/meta/recipes-devtools/python/python3-sphinx-rtd-theme_1.1.1.bb b/poky/meta/recipes-devtools/python/python3-sphinx-rtd-theme_1.2.0.bb index a8b2653ccd..0845646978 100644 --- a/poky/meta/recipes-devtools/python/python3-sphinx-rtd-theme_1.1.1.bb +++ b/poky/meta/recipes-devtools/python/python3-sphinx-rtd-theme_1.2.0.bb @@ -10,7 +10,7 @@ DEPENDS = "python3-sphinx" PYPI_PACKAGE = "sphinx_rtd_theme" -SRC_URI[sha256sum] = "6146c845f1e1947b3c3dd4432c28998a1693ccc742b4f9ad7c63129f0757c103" +SRC_URI[sha256sum] = "a0d8bd1a2ed52e0b338cbe19c4b2eef3c5e7a048769753dac6a9f059c7b641b8" UPSTREAM_CHECK_REGEX ?= "/sphinx-rtd-theme/(?P<pver>(\d+[\.\-_]*)+)/" inherit setuptools3 pypi diff --git a/poky/meta/recipes-devtools/python/python3-typing-extensions_4.4.0.bb b/poky/meta/recipes-devtools/python/python3-typing-extensions_4.5.0.bb index 27ec7560ea..80f87cae84 100644 --- a/poky/meta/recipes-devtools/python/python3-typing-extensions_4.4.0.bb +++ b/poky/meta/recipes-devtools/python/python3-typing-extensions_4.5.0.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f16b323917992e0f8a6f0071bc9913e2" # The name on PyPi is slightly different. PYPI_PACKAGE = "typing_extensions" -SRC_URI[sha256sum] = "1511434bb92bf8dd198c12b1cc812e800d4181cfcb867674e0f8279cc93087aa" +SRC_URI[sha256sum] = "5cb5f4a79139d699607b3ef622a1dedafa84e115ab0024e0d9c044a9479ca7cb" inherit pypi python_flit_core diff --git a/poky/meta/recipes-devtools/python/python3-zipp_3.12.0.bb b/poky/meta/recipes-devtools/python/python3-zipp_3.15.0.bb index 1b36e42543..5b42dd8139 100644 --- a/poky/meta/recipes-devtools/python/python3-zipp_3.12.0.bb +++ b/poky/meta/recipes-devtools/python/python3-zipp_3.15.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/jaraco/zipp" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=7a7126e068206290f3fe9f8d6c713ea6" -SRC_URI[sha256sum] = "73efd63936398aac78fd92b6f4865190119d6c91b531532e798977ea8dd402eb" +SRC_URI[sha256sum] = "112929ad649da941c23de50f356a2b5570c954b65150642bccdd66bf194d224b" DEPENDS += "${PYTHON_PN}-setuptools-scm-native" diff --git a/poky/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch b/poky/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch index bd696ade92..96e5e81342 100644 --- a/poky/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch +++ b/poky/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch @@ -1,4 +1,4 @@ -From 32aba1dfba1e27103e7367bbb9e4bef0e31aeac5 Mon Sep 17 00:00:00 2001 +From 7d296dc635ad3ac2792955ce37e140a4104b098f Mon Sep 17 00:00:00 2001 From: Jeremy Puhlman <jpuhlman@mvista.com> Date: Wed, 4 Mar 2020 00:06:42 +0000 Subject: [PATCH] Don't search system for headers/libraries @@ -11,7 +11,7 @@ Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py -index f29ac86..930cb20 100644 +index 6811951..65ae476 100644 --- a/setup.py +++ b/setup.py @@ -877,8 +877,8 @@ class PyBuildExt(build_ext): diff --git a/poky/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch b/poky/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch index dc06baf504..86971f4048 100644 --- a/poky/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch +++ b/poky/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch @@ -1,4 +1,4 @@ -From a73020a9c388b4882c384087882a77ab2c7b3729 Mon Sep 17 00:00:00 2001 +From cab8b8b1390165a93dfb27c48c1cc4c3e4280dfd Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex@linutronix.de> Date: Fri, 10 Sep 2021 12:28:31 +0200 Subject: [PATCH] Lib/sysconfig.py: use prefix value from build configuration diff --git a/poky/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch b/poky/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch index 1879024e16..e080b5c562 100644 --- a/poky/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch +++ b/poky/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch @@ -1,4 +1,4 @@ -From 3bdf292be303e239e78ed39dd8106fbd5f7ee645 Mon Sep 17 00:00:00 2001 +From 79e7ed59750612e57647847957ab85709307ea38 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 14 May 2013 15:00:26 -0700 Subject: [PATCH] python3: Add target and native recipes diff --git a/poky/meta/recipes-devtools/python/python3_3.11.1.bb b/poky/meta/recipes-devtools/python/python3_3.11.2.bb index 37092d30d2..43c147ca6d 100644 --- a/poky/meta/recipes-devtools/python/python3_3.11.1.bb +++ b/poky/meta/recipes-devtools/python/python3_3.11.2.bb @@ -4,7 +4,7 @@ DESCRIPTION = "Python is a programming language that lets you work more quickly LICENSE = "PSF-2.0" SECTION = "devel/python" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a1822df8d0f068628ca6090aedc5bfc8" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fcf6b249c2641540219a727f35d8d2c2" SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://run-ptest \ @@ -38,7 +38,7 @@ SRC_URI:append:class-native = " \ file://12-distutils-prefix-is-inside-staging-area.patch \ file://0001-Don-t-search-system-for-headers-libraries.patch \ " -SRC_URI[sha256sum] = "85879192f2cffd56cb16c092905949ebf3e5e394b7f764723529637901dfb58f" +SRC_URI[sha256sum] = "29e4b8f5f1658542a8c13e2dd277358c9c48f2b2f7318652ef1675e402b9d2af" # exclude pre-releases for both python 2.x and 3.x UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar" diff --git a/poky/meta/recipes-devtools/qemu/qemu.inc b/poky/meta/recipes-devtools/qemu/qemu.inc index 92828e8f2d..1e768b560d 100644 --- a/poky/meta/recipes-devtools/qemu/qemu.inc +++ b/poky/meta/recipes-devtools/qemu/qemu.inc @@ -30,6 +30,8 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0001-contrib-vhost-user-blk-Replace-lseek64-with-lseek.patch \ file://0002-linux-user-Replace-use-of-lfs64-related-functions-an.patch \ file://0001-configure-Fix-check-tcg-not-executing-any-tests.patch \ + file://0001-Revert-linux-user-add-more-compat-ioctl-definitions.patch \ + file://0002-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/poky/meta/recipes-devtools/qemu/qemu/0001-Revert-linux-user-add-more-compat-ioctl-definitions.patch b/poky/meta/recipes-devtools/qemu/qemu/0001-Revert-linux-user-add-more-compat-ioctl-definitions.patch new file mode 100644 index 0000000000..cd8121fed1 --- /dev/null +++ b/poky/meta/recipes-devtools/qemu/qemu/0001-Revert-linux-user-add-more-compat-ioctl-definitions.patch @@ -0,0 +1,69 @@ +From afa96c55f2c270405de8984e2466067bbb44c0e4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com> +Date: Tue, 10 Jan 2023 12:49:00 -0500 +Subject: [PATCH] Revert "linux-user: add more compat ioctl definitions" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This reverts commit c5495f4ecb0cdaaf2e9dddeb48f1689cdb520ca0. + +glibc has fixed (in 2.36.9000-40-g774058d729) the problem +that caused a clash when both sys/mount.h annd linux/mount.h +are included, and backported this to the 2.36 stable release +too: + + https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E + +It is saner for QEMU to remove the workaround it applied for +glibc 2.36 and expect distros to ship the 2.36 maint release +with the fix. This avoids needing to add a further workaround +to QEMU to deal with the fact that linux/brtfs.h now also pulls +in linux/mount.h via linux/fs.h since Linux 6.1 + +Upstream-Status: Backport from v8.0 (master) + +Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> +Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> +Link: https://lore.kernel.org/r/20230110174901.2580297-2-berrange@redhat.com +Signed-off-by: Joel Stanley <joel@jms.id.au> +--- + linux-user/syscall.c | 25 ------------------------- + 1 file changed, 25 deletions(-) + +diff --git a/linux-user/syscall.c b/linux-user/syscall.c +index f95a6161e..510de8edc 100644 +--- a/linux-user/syscall.c ++++ b/linux-user/syscall.c +@@ -111,31 +111,6 @@ + #define FS_IOC32_SETFLAGS _IOW('f', 2, int) + #define FS_IOC32_GETVERSION _IOR('v', 1, int) + #define FS_IOC32_SETVERSION _IOW('v', 2, int) +- +-#define BLKGETSIZE64 _IOR(0x12,114,size_t) +-#define BLKDISCARD _IO(0x12,119) +-#define BLKIOMIN _IO(0x12,120) +-#define BLKIOOPT _IO(0x12,121) +-#define BLKALIGNOFF _IO(0x12,122) +-#define BLKPBSZGET _IO(0x12,123) +-#define BLKDISCARDZEROES _IO(0x12,124) +-#define BLKSECDISCARD _IO(0x12,125) +-#define BLKROTATIONAL _IO(0x12,126) +-#define BLKZEROOUT _IO(0x12,127) +- +-#define FIBMAP _IO(0x00,1) +-#define FIGETBSZ _IO(0x00,2) +- +-struct file_clone_range { +- __s64 src_fd; +- __u64 src_offset; +- __u64 src_length; +- __u64 dest_offset; +-}; +- +-#define FICLONE _IOW(0x94, 9, int) +-#define FICLONERANGE _IOW(0x94, 13, struct file_clone_range) +- + #else + #include <linux/fs.h> + #endif diff --git a/poky/meta/recipes-devtools/qemu/qemu/0002-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch b/poky/meta/recipes-devtools/qemu/qemu/0002-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch new file mode 100644 index 0000000000..d754f21ad4 --- /dev/null +++ b/poky/meta/recipes-devtools/qemu/qemu/0002-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch @@ -0,0 +1,78 @@ +From e95c0a42940ca1cf763ca3374b36a9be030039d7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com> +Date: Tue, 10 Jan 2023 12:49:01 -0500 +Subject: [PATCH] Revert "linux-user: fix compat with glibc >= 2.36 + sys/mount.h" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This reverts commit 3cd3df2a9584e6f753bb62a0028bd67124ab5532. + +glibc has fixed (in 2.36.9000-40-g774058d729) the problem +that caused a clash when both sys/mount.h annd linux/mount.h +are included, and backported this to the 2.36 stable release +too: + + https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E + +It is saner for QEMU to remove the workaround it applied for +glibc 2.36 and expect distros to ship the 2.36 maint release +with the fix. This avoids needing to add a further workaround +to QEMU to deal with the fact that linux/brtfs.h now also pulls +in linux/mount.h via linux/fs.h since Linux 6.1 + +Upstream-Status: Backport from v8.0 (master) + +Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> +Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> +Link: https://lore.kernel.org/r/20230110174901.2580297-3-berrange@redhat.com +Signed-off-by: Joel Stanley <joel@jms.id.au> +--- + linux-user/syscall.c | 18 ------------------ + meson.build | 2 -- + 2 files changed, 20 deletions(-) + +diff --git a/linux-user/syscall.c b/linux-user/syscall.c +index 510de8edc..13a67b84b 100644 +--- a/linux-user/syscall.c ++++ b/linux-user/syscall.c +@@ -95,25 +95,7 @@ + #include <linux/soundcard.h> + #include <linux/kd.h> + #include <linux/mtio.h> +- +-#ifdef HAVE_SYS_MOUNT_FSCONFIG +-/* +- * glibc >= 2.36 linux/mount.h conflicts with sys/mount.h, +- * which in turn prevents use of linux/fs.h. So we have to +- * define the constants ourselves for now. +- */ +-#define FS_IOC_GETFLAGS _IOR('f', 1, long) +-#define FS_IOC_SETFLAGS _IOW('f', 2, long) +-#define FS_IOC_GETVERSION _IOR('v', 1, long) +-#define FS_IOC_SETVERSION _IOW('v', 2, long) +-#define FS_IOC_FIEMAP _IOWR('f', 11, struct fiemap) +-#define FS_IOC32_GETFLAGS _IOR('f', 1, int) +-#define FS_IOC32_SETFLAGS _IOW('f', 2, int) +-#define FS_IOC32_GETVERSION _IOR('v', 1, int) +-#define FS_IOC32_SETVERSION _IOW('v', 2, int) +-#else + #include <linux/fs.h> +-#endif + #include <linux/fd.h> + #if defined(CONFIG_FIEMAP) + #include <linux/fiemap.h> +diff --git a/meson.build b/meson.build +index e44432370..f37ba4114 100644 +--- a/meson.build ++++ b/meson.build +@@ -2032,8 +2032,6 @@ config_host_data.set('HAVE_OPTRESET', + cc.has_header_symbol('getopt.h', 'optreset')) + config_host_data.set('HAVE_IPPROTO_MPTCP', + cc.has_header_symbol('netinet/in.h', 'IPPROTO_MPTCP')) +-config_host_data.set('HAVE_SYS_MOUNT_FSCONFIG', +- cc.has_header_symbol('sys/mount.h', 'FSCONFIG_SET_FLAG')) + + # has_member + config_host_data.set('HAVE_SIGEV_NOTIFY_THREAD_ID', diff --git a/poky/meta/recipes-devtools/quilt/quilt.inc b/poky/meta/recipes-devtools/quilt/quilt.inc index f7ff958103..01fc22e996 100644 --- a/poky/meta/recipes-devtools/quilt/quilt.inc +++ b/poky/meta/recipes-devtools/quilt/quilt.inc @@ -61,6 +61,9 @@ do_install:append:class-native () { touch ${D}${sysconfdir}/quiltrc } +# The tests need to run as a non-root user, so pull in the ptest user +DEPENDS:append:class-target = "${@bb.utils.contains('PTEST_ENABLED', '1', ' ptest-runner', '', d)}" + do_install_ptest() { install ${WORKDIR}/test.sh ${D}${PTEST_PATH} mkdir ${D}${PTEST_PATH}/test @@ -69,6 +72,14 @@ do_install_ptest() { rm -f ${D}${PTEST_PATH}/test/mail.test ${D}${PTEST_PATH}/test/patch-wrapper.test } +# ptest.bbclass currently chowns the ptest directory explicitly, so we need to +# change permission after that has happened so the ptest user can write a +# temporary directory. +do_install_ptest_base:append() { + chgrp ptest ${D}${PTEST_PATH}/test + chmod g+w ${D}${PTEST_PATH}/test +} + PACKAGES += "guards guards-doc" FILES:${PN} = "${sysconfdir} ${datadir}/quilt \ @@ -84,5 +95,5 @@ RDEPENDS:${PN}-ptest += "file sed gawk diffutils findutils ed perl \ perl-module-filehandle perl-module-getopt-std \ perl-module-posix perl-module-file-temp \ perl-module-text-parsewords perl-module-overloading \ - bash util-linux-getopt \ + bash util-linux-getopt ptest-runner \ " diff --git a/poky/meta/recipes-devtools/quilt/quilt/run-ptest b/poky/meta/recipes-devtools/quilt/quilt/run-ptest index 322508cbe2..f35a756d6b 100755 --- a/poky/meta/recipes-devtools/quilt/quilt/run-ptest +++ b/poky/meta/recipes-devtools/quilt/quilt/run-ptest @@ -1,7 +1,3 @@ #!/bin/sh -/usr/sbin/adduser --disabled-password --gecos "" quilttest - -su -c ./test.sh quilttest - -/usr/sbin/deluser quilttest +su -c ./test.sh ptest diff --git a/poky/meta/recipes-devtools/ruby/ruby_3.2.0.bb b/poky/meta/recipes-devtools/ruby/ruby_3.2.1.bb index 0e1336f5b0..3f1bbc262b 100644 --- a/poky/meta/recipes-devtools/ruby/ruby_3.2.0.bb +++ b/poky/meta/recipes-devtools/ruby/ruby_3.2.1.bb @@ -10,7 +10,7 @@ LICENSE = "Ruby | BSD-2-Clause | BSD-3-Clause | GPL-2.0-only | ISC | MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=5b8c87559868796979806100db3f3805 \ file://BSDL;md5=8b50bc6de8f586dc66790ba11d064d75 \ file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://LEGAL;md5=f260190bc1e92e363f0ee3c0463d4c7c \ + file://LEGAL;md5=bcd74b47bbaf2051c5e49811a5faa97a \ " DEPENDS = "zlib openssl libyaml gdbm readline libffi" @@ -51,7 +51,7 @@ do_configure:prepend() { DEPENDS:append:libc-musl = " libucontext" -SRC_URI[sha256sum] = "daaa78e1360b2783f98deeceb677ad900f3a36c0ffa6e2b6b19090be77abc272" +SRC_URI[sha256sum] = "13d67901660ee3217dbd9dd56059346bd4212ce64a69c306ef52df64935f8dbd" PACKAGECONFIG ??= "" PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" diff --git a/poky/meta/recipes-devtools/rust/cargo_1.67.0.bb b/poky/meta/recipes-devtools/rust/cargo_1.67.1.bb index 2b2394e898..2b2394e898 100644 --- a/poky/meta/recipes-devtools/rust/cargo_1.67.0.bb +++ b/poky/meta/recipes-devtools/rust/cargo_1.67.1.bb diff --git a/poky/meta/recipes-devtools/rust/libstd-rs_1.67.0.bb b/poky/meta/recipes-devtools/rust/libstd-rs_1.67.1.bb index f4e5abc0cc..f4e5abc0cc 100644 --- a/poky/meta/recipes-devtools/rust/libstd-rs_1.67.0.bb +++ b/poky/meta/recipes-devtools/rust/libstd-rs_1.67.1.bb diff --git a/poky/meta/recipes-devtools/rust/rust-cross-canadian_1.67.0.bb b/poky/meta/recipes-devtools/rust/rust-cross-canadian_1.67.1.bb index 55865238ab..55865238ab 100644 --- a/poky/meta/recipes-devtools/rust/rust-cross-canadian_1.67.0.bb +++ b/poky/meta/recipes-devtools/rust/rust-cross-canadian_1.67.1.bb diff --git a/poky/meta/recipes-devtools/rust/rust-llvm_1.67.0.bb b/poky/meta/recipes-devtools/rust/rust-llvm_1.67.1.bb index 4da11da8ef..4da11da8ef 100644 --- a/poky/meta/recipes-devtools/rust/rust-llvm_1.67.0.bb +++ b/poky/meta/recipes-devtools/rust/rust-llvm_1.67.1.bb diff --git a/poky/meta/recipes-devtools/rust/rust-source.inc b/poky/meta/recipes-devtools/rust/rust-source.inc index 268e17bcf8..942978e6bf 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] = "9ef8cf88a1d35d319808daf2f193aadca9ed9bcae1d4d5db8946a448c9432c6d" +SRC_URI[rust.sha256sum] = "77e0615011f887d9533d5374bf9c15c590c3caf32bbb035b392d1c2ae502a682" RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src" diff --git a/poky/meta/recipes-devtools/rust/rust_1.67.0.bb b/poky/meta/recipes-devtools/rust/rust_1.67.1.bb index 2118faec8f..2118faec8f 100644 --- a/poky/meta/recipes-devtools/rust/rust_1.67.0.bb +++ b/poky/meta/recipes-devtools/rust/rust_1.67.1.bb diff --git a/poky/meta/recipes-devtools/unfs3/unfs3/0001-fix-building-on-macOS.patch b/poky/meta/recipes-devtools/unfs3/unfs3/0001-fix-building-on-macOS.patch new file mode 100644 index 0000000000..f18ffd3711 --- /dev/null +++ b/poky/meta/recipes-devtools/unfs3/unfs3/0001-fix-building-on-macOS.patch @@ -0,0 +1,27 @@ +From 989b87ae46b3183a742031373fbb3e912ab9b666 Mon Sep 17 00:00:00 2001 +From: Andrey Filipenkov <decapitator@ukr.net> +Date: Wed, 2 Nov 2022 13:38:40 +0300 +Subject: [PATCH] fix building on macOS + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Backport [https://github.com/unfs3/unfs3/commit/989b87ae46b3183a742031373fbb3e912ab9b666] +--- + attr.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/attr.c b/attr.c +index 6253e84..0ce9375 100644 +--- a/attr.c ++++ b/attr.c +@@ -18,6 +18,8 @@ + #include <utime.h> + #include <errno.h> + #include <dirent.h> ++#include <stdlib.h> ++#include <string.h> + + #include "backend.h" + #include "nfs.h" +-- +2.39.1 + diff --git a/poky/meta/recipes-devtools/unfs3/unfs3_git.bb b/poky/meta/recipes-devtools/unfs3/unfs3_git.bb index be3870b8a4..9913a503e8 100644 --- a/poky/meta/recipes-devtools/unfs3/unfs3_git.bb +++ b/poky/meta/recipes-devtools/unfs3/unfs3_git.bb @@ -16,6 +16,7 @@ SRC_URI = "git://github.com/unfs3/unfs3.git;protocol=https;branch=master \ file://0001-daemon.c-Fix-race-window-for-writing-of-the-pid-file.patch \ file://0001-Alias-off64_t-to-off_t-on-linux-if-not-defined.patch \ file://0001-locate.c-Include-attr.h.patch \ + file://0001-fix-building-on-macOS.patch \ " SRCREV = "c8f2d2cd4529955419bad0e163f88d47ff176b8d" UPSTREAM_CHECK_GITTAGREGEX = "unfs3\-(?P<pver>\d+(\.\d+)+)" diff --git a/poky/meta/recipes-devtools/vala/vala_0.56.3.bb b/poky/meta/recipes-devtools/vala/vala_0.56.3.bb deleted file mode 100644 index 83f61e5b2f..0000000000 --- a/poky/meta/recipes-devtools/vala/vala_0.56.3.bb +++ /dev/null @@ -1,3 +0,0 @@ -require ${BPN}.inc - -SRC_URI[sha256sum] = "e1066221bf7b89cb1fa7327a3888645cb33b604de3bf45aa81132fd040b699bf" diff --git a/poky/meta/recipes-devtools/vala/vala_0.56.4.bb b/poky/meta/recipes-devtools/vala/vala_0.56.4.bb new file mode 100644 index 0000000000..32fa81a08b --- /dev/null +++ b/poky/meta/recipes-devtools/vala/vala_0.56.4.bb @@ -0,0 +1,3 @@ +require ${BPN}.inc + +SRC_URI[sha256sum] = "862c41d938543ed3d8d86c8219a61087797193defee8da0c50caf49993c66b6a" |