summaryrefslogtreecommitdiff
path: root/poky/meta/recipes-extended/bash
diff options
context:
space:
mode:
authorPatrick Williams <patrick@stwcx.xyz>2022-11-17 16:29:11 +0300
committerPatrick Williams <patrick@stwcx.xyz>2022-11-19 05:11:25 +0300
commit7784c4292cd9e369da612736deb0691153d1b786 (patch)
tree31368891eb9ce67a004712b5269b7b9b0f0a3c89 /poky/meta/recipes-extended/bash
parent4a4f35a2d76c72c60405581c889e2835ca49b641 (diff)
downloadopenbmc-7784c4292cd9e369da612736deb0691153d1b786.tar.xz
subtree updates
- Remove systemd patches for object-manager due to upstream fix. meta-arm: 3b7347cd67..d5f132b199: Abdellatif El Khlifi (2): kas: corstone1000: set branches to langdale arm-bsp/documentation: corstone1000: 2022.11.10 RC: update the user guide Anton Antonov (1): arm-bsp/fvp-base: Enable virtio-rng support and unset preferred 5.15 kernel Emekcan (2): arm-bsp/trusted-services: add checks for null attributes in smm gateway arm-bsp/trusted-services: Fix GetNextVariable max_name_len in smm gateway Jon Mason (3): arm/sbsa-acs: update to the latest version arm/hafnium: cleanup the patches arm/gn: update to the latest SHA Luca Fancellu (1): arm,arm-bsp/recipes-kernel: don't use PN in arm-ffa-transport.inc Peter Hoyes (5): arm/fvp: Join cli arguments in verbose logging arm/lib: Factor out asyncio in FVPRunner arm/lib: Decouple console parsing from the FVPRunner arm/oeqa: Log the FVP output in OEFVPSSHTarget runfvp: Fix verbose output when using --console Ross Burton (1): arm/linux-arm64-ack: fix buildpaths in the perf Python module Rui Miguel Silva (3): arm/trusted-services: check before applying patches arm-bsp/trusted-services: psa test setup corstone1000 arm-bsp/trusted-firmware-m: adjust ps assets for corstone1000 Vishnu Banavath (2): arm-bsp/documentation: corstone1000: 2022.11.10 RC: update the release notes arm-bsp/documentation: corstone1000: 2022.11.10 RC: update the change log meta-raspberrypi: a305f4804b..93dadf336c: Andrei Gherzan (2): ci: Bump actions/checkout to v3 ci: Fix dco-check job with newer git versions Martin Jansa (1): raspberrypi4-64: drop DEFAULTTUNE assignment poky: 482c493cf6..44bb88cc86: Alex Kiernan (1): rust: update 1.64.0 -> 1.65.0 Alexander Kanavin (74): man-pages: upgrade 5.13 -> 6.01 piglit: upgrade to latest revision lsof: upgrade 4.96.3 -> 4.96.4 ffmpeg: upgrade 5.1.1 -> 5.1.2 ccache: upgrade 4.6.3 -> 4.7.2 python3-pip: upgrade 22.2.2 -> 22.3 ltp: upgrade 20220527 -> 20220930 alsa-utils: upgrade 1.2.7 -> 1.2.8 alsa-ucm-conf: upgrade 1.2.7.2 -> 1.2.8 libbsd: upgrade 0.11.6 -> 0.11.7 libunistring: upgrade 1.0 -> 1.1 puzzles: upgrade to latest revision libsoup: upgrade 3.2.0 -> 3.2.1 linux-firmware: upgrade 20220913 -> 20221012 python3-git: upgrade 3.1.28 -> 3.1.29 xwayland: upgrade 22.1.3 -> 22.1.4 strace: upgrade 5.19 -> 6.0 python3-dtschema: upgrade 2022.8.3 -> 2022.9 fontconfig: upgrade 2.14.0 -> 2.14.1 python3-setuptools: upgrade 65.0.2 -> 65.5.0 taglib: upgrade 1.12 -> 1.13 nghttp2: upgrade 1.49.0 -> 1.50.0 python3-wheel: upgrade 0.37.1 -> 0.38.0 libffi: upgrade 3.4.2 -> 3.4.4 libical: upgrade 3.0.15 -> 3.0.16 mtd-utils: upgrade 2.1.4 -> 2.1.5 repo: upgrade 2.29.3 -> 2.29.5 libidn2: upgrade 2.3.3 -> 2.3.4 makedepend: upgrade 1.0.6 -> 1.0.7 diffoscope: upgrade 221 -> 224 mmc-utils: upgrade to latest revision libsoup-2.4: upgrade 2.74.2 -> 2.74.3 gdk-pixbuf: upgrade 2.42.9 -> 2.42.10 harfbuzz: upgrade 5.3.0 -> 5.3.1 netbase: upgrade 6.3 -> 6.4 mpg123: upgrade 1.30.2 -> 1.31.1 sudo: upgrade 1.9.11p3 -> 1.9.12 alsa-lib: upgrade 1.2.7.2 -> 1.2.8 pango: upgrade 1.50.10 -> 1.50.11 pixman: upgrade 0.40.0 -> 0.42.2 vulkan: upgrade 1.3.224.1 -> 1.3.231.1 gstreamer1.0: upgrade 1.20.3 -> 1.20.4 shaderc: upgrade 2022.2 -> 2022.3 selftest: add a copy of previous mtd-utils version to meta-selftest python3: correctly adjust include paths in sysconfigdata vala: install vapigen-wrapper into /usr/bin/crosscripts and stage only that sanity.bbclass: do not check for presence of distutils pango: replace a recipe fix with an upstream submitted patch libpciaccess: update 0.16 -> 0.17 libxinerama: update 1.1.4 -> 1.1.5 libxkbfile: update 1.1.0 -> 1.1.1 libxmu: update 1.1.3 -> 1.1.4 libxrender: update 0.9.10 -> 0.9.11 libxshmfence: update 1.3 -> 1.3.1 libxtst: update 1.2.3 -> 1.2.4 libxxf86vm: update 1.1.4 -> 1.1.5 xcb-util: update to latest revisions xf86-input-vmmouse: update 13.1.0 -> 13.2.0 gnomebase.bbclass: return the whole version for tarball directory if it is a number adwaita-icon-theme: update 42.0 -> 43 libepoxy: convert to git libepoxy: update 1.5.9 -> 1.5.10 rgb: update 1.0.6 -> 1.1.0 meson: update 0.63.3 -> 0.64.0 systemd: update 251.4 -> 251.8 libxext: update 1.3.4 -> 1.3.5 gettext: update 0.21 -> 0.21.1 glib-2.0: update 2.72.3 -> 2.74.1 glib-networking: update 2.72.2 -> 2.74.0 readline: update 8.1.2 -> 8.2 llvm: update 15.0.1 -> 15.0.4 make: update 4.3 -> 4.4 bash: update 5.1.16 -> 5.2.9 mesa: do not rely on native llvm-config in target sysroot Atanas Bunchev (1): qemu.rst: audio: reference to Command-Line options Benjamin Szőke (1): image_types: Add 7-Zip support in conversion types and commands Changhyeok Bae (1): repo: upgrade 2.29.5 -> 2.29.9 Chase Qi (1): libc-test: add libc testsuite for musl Christoph Lauer (1): populate_sdk_base: add zip options David Bagonyi (1): gpgme: Allow setuptools3-base to be excluded from the inherit list Diego Sueiro (1): kernel.bbclass: Include randstruct seed assets in STAGING_KERNEL_BUILDDIR Etienne Cordonnier (1): mirrors.bbclass: use shallow tarball for nativesdk-binutils Jordan Crouse (2): spirv-tools: Correctly set the prefix in exported cmake packages vulkan-loader: Allow headless targets to build the loader Jose Quaresma (3): sstatesig: skip the rm_work task signature rm_work: exclude the SSTATETASKS from the rm_work tasks sinature sstate: Allow optimisation of do_deploy_archives task dependencies Joshua Watt (2): classes: create-spdx: Move to version specific class scripts: convert-overrides: Allow command-line customizations Kai Kang (1): libuv: fixup SRC_URI Konrad Weihmann (1): create-spdx: default share_src for shared sources Lee Chee Yang (1): migration guides: add release notes for 4.0.5 Leon Anavi (2): get_module_deps3.py: Check attribute '__file__' python3-manifest.json: Fix re in core Mark Asselstine (2): bitbake: data: drop unused __expand_var_regexp__ and __expand_python_regexp__ bitbake: data_smart: allow python snippets to include a dictionary Markus Volk (4): webkitgtk: use libsoup-3.0 by default epiphany: use libsoup-3.0 by default gstreamer1.0-plugins-good: use libsoup-3.0 by default libinput: upgrade 1.19.4 -> 1.21.0 Martin Jansa (1): cargo.bbclass: avoid calling which ${RUSTC} with undefined ${RUSTC} Michael Opdenacker (10): ref-manual: terms.rst: add SBOM and SPDX terms ref-manual: variables.rst: document spdx-create class variables dev-manual: common-tasks.rst: add section about SPDX / SBOM generation ref-manual: classes.rst: expand documentation of create-spdx class ref-manual: terms.rst: add reference to new SBOM/SPDX section in dev manual manuals: document "mime-xdg" class and MIME_XDG_PACKAGES manuals: add shortcut for Wikipedia links ref-manual/variables.rst: expand BB_NUMBER_THREADS description ref-manual/variables.rst: expand PARALLEL_MAKE description release-notes: use oe_git and yocto_git macros Nathan Rossi (4): oeqa/selftest/lic_checksum: Cleanup changes to emptytest include oeqa/selftest/minidebuginfo: Create selftest for minidebuginfo glibc-locale: Do not INHIBIT_DEFAULT_DEPS package: Fix handling of minidebuginfo with newer binutils Niko Mauno (1): systemd: Consider PACKAGECONFIG in RRECOMMENDS Paulo Neves (1): manuals: remove xterm requirements Pavel Zhukov (1): bitbake: gitsm: Fix regression in gitsm submodule path parsing Peter Kjellerstedt (1): pango: Make it build with ptest disabled Peter Marko (2): systemd: add group render to udev package meta-selftest/staticids: add render group for systemd Quentin Schulz (3): docs: ref-manual: classes: fix section name for github-releases docs: ref-manual: classes: add missing closing parenthesis docs: poky.yaml.in: remove pylint3 from Ubuntu/Debian host dependencies Richard Purdie (7): bitbake.conf: Drop export of SOURCE_DATE_EPOCH_FALLBACK gcc-shared-source: Fix source date epoch handling gcc-source: Fix gengtypes race gcc-source: Drop gengtype manipulation gcc-source: Ensure deploy_source_date_epoch sstate hash doesn't change sanity: Drop data finalize call bitbake: data/data_smart/build: Clean up datastore finalize/update_data references Robert Yang (1): bitbake: gitsm.py: process_submodules(): Set nobranch=1 for url Ross Burton (19): insane: add codeload.github.com to src-uri-bad check populate_sdk_ext: use ConfigParser instead of SafeConfigParser stress-ng: improve makefile use linux-firmware: don't put the firmware into the sysroot oeqa/qemurunner: update exception class for QMP API changes oeqa/core/decorator: add decorators to skip based on HOST_ARCH oeqa/selftest/buildoptions: skip test_read_only_image on qemuarm64 oeqa/selftest/efibootpartition: improve test oeqa/selftest/imagefeatures: remove hardcoded MACHINE in test_image_gen_debugfs oeqa/selftest/imagefeatures: don't use wic images in test_hypervisor_fmts oeqa/selftest/imagefeatures: set a .wks in test_fs_types oeqa/selftest/overlayfs: overlayfs: skip x86-specific tests oeqa/selftest/package: generalise test_gdb_hardlink_debug() oeqa/selftest/package: improve test_preserve_ownership oeqa/selftest/runqemu: don't hardcode qemux86-64 oeqa/selftest/runtime_test: only run the virgl tests on qemux86-64 oeqa/selftest/wic: skip more tests on aarch64 oeqa/selftest/wic: use skipIfNotArch instead of custom decorator classes/testexport: move to classes-recipe Sergei Zhmylev (1): wic: make ext2/3/4 images reproducible Tim Orling (4): python3-typing-extensions: upgrade 4.3.0 -> 4.4.0 bitbake: toaster: fixtures/README: django 1.8 -> 3.2 bitbake: toaster: fixtures/gen_fixtures.py: update branches bitbake: toaster: Add refreshed oe-core and poky fixtures Ulrich Ölmann (1): dev-manual: common-tasks.rst: fix typos Wang Mingyu (33): bind: upgrade 9.18.7 -> 9.18.8 libedit: upgrade 20210910-3.1 -> 20221030-3.1 mtools: upgrade 4.0.41 -> 4.0.42 diffstat: upgrade 1.64 -> 1.65 inetutils: upgrade 2.3 -> 2.4 orc: upgrade 0.4.32 -> 0.4.33 socat: upgrade 1.7.4.3 -> 1.7.4.4 libxcrypt: upgrade 4.4.28 -> 4.4.30 python3-babel: upgrade 2.10.3 -> 2.11.0 python3-hatch-fancy-pypi-readme: upgrade 22.7.0 -> 22.8.0 python3-hatchling upgrade: 1.11.0 -> 1.11.1 gi-docgen: upgrade 2022.1 -> 2022.2 libdrm: upgrade 2.4.113 -> 2.4.114 mmc-utils: upgrade to latest revision mobile-broadband-provider-info: upgrade 20220725 -> 20221107 libsdl2: upgrade 2.24.1 -> 2.24.2 mesa: upgrade 22.2.2 -> 22.2.3 python3-dtschema: upgrade 2022.9 -> 2022.11 python3-flit-core: upgrade 3.7.1 -> 3.8.0 python3-pip: update 22.3 -> 22.3.1 python3-psutil: upgrade 5.9.3 -> 5.9.4 python3-setuptools: upgrade 65.5.0 -> 65.5.1 python3-sphinx-rtd-theme: upgrade 1.1.0 -> 1.1.1 python3-subunit: upgrade 1.4.0 -> 1.4.1 python3-wheel: upgrade 0.38.0 -> 0.38.4 sed: update 4.8 -> 4.9 sudo: upgrade 1.9.12 -> 1.9.12p1 sysstat: upgrade 12.6.0 -> 12.6.1 babeltrace: upgrade 1.5.8 -> 1.5.11 iso-codes: upgrade 4.11.0 -> 4.12.0 libsoup: upgrade 3.2.1 -> 3.2.2 wayland-protocols: upgrade 1.27 -> 1.28 xwayland: upgrade 22.1.4 -> 22.1.5 zhengruoqin (5): python3-jsonschema: upgrade 4.16.0 -> 4.17.0 python3-pyrsistent: upgrade 0.18.1 -> 0.19.2 python3-numpy: upgrade 1.23.3 -> 1.23.4 python3-sphinx-rtd-theme: upgrade 1.0.0 -> 1.1.0 python3-pbr: upgrade 5.10.0 -> 5.11.0 meta-openembedded: 6ebff843cc..d04444509a: Armin Kuster (1): meta-oe][PATCH] gst-editing-services: fix typo in LICENSE field. Chen Pei (1): python3-brotli: Add new recipe for 1.0.9 Kory Maincent (1): openocd: fix build error Leon Anavi (6): python3-automat: Upgrade 20.2.0 -> 22.10.0 python3-asttokens: Upgrade 2.0.8 -> 2.1.0 python3-zeroconf: Upgrade 0.39.2 -> 0.39.4 python3-imageio: Upgrade 2.22.2 -> 2.22.3 python3-httplib: Upgrade 0.20.4 -> 0.21.0 python3-twisted: Upgrade 22.8.0 -> 22.10.0 Markus Volk (6): pugixml: upgrade 1.12 -> 1.13 geary: update 40.0 -> 43.0 rest: upgrade 0.8.1 -> 0.9.0 gnome-online-accounts: update 3.44.0 -> 3.46.0 yelp: use libsoup-3.0 by default surf: use libsoup-3.0 by default Martin Jansa (1): monkey: use git fetcher Randy MacLeod (1): nftables: use automake ptest output format Sakib Sajal (1): minio: add recipe for minio client Tim Orling (5): libcompress-raw-bzip2-perl: upgrade 2.096 -> 2.201 libcompress-raw-lzma-perl: upgrade 2.096 -> 2.201 libcompress-raw-zlib-perl: upgrade 2.096 -> 2.202 libio-compress-lzma-perl: upgrade 2.096 -> 2.201 libio-compress-perl: upgrade 2.096 -> 2.201 Wang Mingyu (43): python3-lazy-object-proxy: upgrade 1.7.1 -> 1.8.0 python3-luma-oled: upgrade 3.8.1 -> 3.9.0 python3-nmap: upgrade 1.5.4 -> 1.6.0 python3-pint: upgrade 0.20 -> 0.20.1 python3-protobuf: upgrade 4.21.8 -> 4.21.9 python3-pytest-benchmark: upgrade 3.4.1 -> 4.0.0 python3-pytest-html: upgrade 3.1.1 -> 3.2.0 python3-pytest-xdist: upgrade 2.5.0 -> 3.0.2 python3-requests-toolbelt: upgrade 0.10.0 -> 0.10.1 python3-websockets: upgrade 10.3 -> 10.4 fetchmail: Fix buildpaths warning. libxpresent: upgrade 1.0.0 -> 1.0.1 xkbprint: upgrade 1.0.5 -> 1.0.6 xmlsec1: upgrade 1.2.34 -> 1.2.36 openwsman: Change download branch from master to main. hwdata: upgrade 0.363 -> 0.364 lcms: upgrade 2.13.1 -> 2.14 libdbd-sqlite-perl: upgrade 1.70 -> 1.72 mosh: upgrade 1.3.2 -> 1.4.0 xfstests: upgrade 2022.10.09 -> 2022.10.30 ulogd2: upgrade 2.0.7 -> 2.0.8 cli11: upgrade 2.3.0 -> 2.3.1 ctags: upgrade 5.9.20221023.0 -> 5.9.20221106.0 valijson: upgrade 0.7 -> 1.0 openvpn: upgrade 2.5.7 -> 2.5.8 poco: upgrade 1.12.3 -> 1.12.4 poppler: upgrade 22.10.0 -> 22.11.0 satyr: upgrade 0.39 -> 0.40 ser1net: upgrade 4.3.8 -> 4.3.9 stunnel: upgrade 5.66 -> 5.67 wolfssl: upgrade 5.5.2 -> 5.5.3 tio: upgrade 2.2 -> 2.3 uhubctl: upgrade 2.4.0 -> 2.5.0 zabbix: upgrade 6.2.3 -> 6.2.4 python3-spidev: upgrade 3.5 -> 3.6 python3-gevent: upgrade 22.10.1 -> 22.10.2 python3-google-auth: upgrade 2.13.0 -> 2.14.0 python3-greenlet: upgrade 1.1.3.post0 -> 2.0.0 python3-robotframework: upgrade 6.0 -> 6.0.1 python3-regex: upgrade 2022.9.13 -> 2022.10.31 python3-pillow: upgrade 9.2.0 -> 9.3.0 python3-paramiko: upgrade 2.11.0 -> 2.12.0 python3-jsonref: upgrade 0.3.0 -> 1.0.1 leimaohui (1): samba: Fix install conflict with multilib enabled. zhengrq.fnst@fujitsu.com (5): python3-sqlalchemy: upgrade 1.4.42 -> 1.4.43 python3-websocket-client: upgrade 1.4.1 -> 1.4.2 python3-termcolor: upgrade 2.0.1 -> 2.1.0 python3-zopeinterface: upgrade 5.5.0 -> 5.5.1 python3-tqdm: upgrade 4.64.0 -> 4.64.1 Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: I0a8f95b57a7b9433fe59a9055a4dae58694c1759
Diffstat (limited to 'poky/meta/recipes-extended/bash')
-rw-r--r--poky/meta/recipes-extended/bash/bash/execute_cmd.patch28
-rw-r--r--poky/meta/recipes-extended/bash/bash/makerace.patch52
-rw-r--r--poky/meta/recipes-extended/bash/bash/makerace2.patch98
-rw-r--r--poky/meta/recipes-extended/bash/bash/use_aclocal.patch27
-rw-r--r--poky/meta/recipes-extended/bash/bash_5.2.9.bb (renamed from poky/meta/recipes-extended/bash/bash_5.1.16.bb)5
5 files changed, 20 insertions, 190 deletions
diff --git a/poky/meta/recipes-extended/bash/bash/execute_cmd.patch b/poky/meta/recipes-extended/bash/bash/execute_cmd.patch
deleted file mode 100644
index 7a9e9a902f..0000000000
--- a/poky/meta/recipes-extended/bash/bash/execute_cmd.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-Rebase to 5.0
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- execute_cmd.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/execute_cmd.c b/execute_cmd.c
-index f1d74bf..31674b4 100644
---- a/execute_cmd.c
-+++ b/execute_cmd.c
-@@ -2567,7 +2567,11 @@ execute_pipeline (command, asynchronous, pipe_in, pipe_out, fds_to_close)
- /* If the `lastpipe' option is set with shopt, and job control is not
- enabled, execute the last element of non-async pipelines in the
- current shell environment. */
-- if (lastpipe_opt && job_control == 0 && asynchronous == 0 && pipe_out == NO_PIPE && prev > 0)
-+ if (lastpipe_opt &&
-+#if defined(JOB_CONTROL)
-+ job_control == 0 &&
-+#endif
-+ asynchronous == 0 && pipe_out == NO_PIPE && prev > 0)
- {
- lstdin = move_to_high_fd (0, 1, -1);
- if (lstdin > 0)
---
-2.7.4
-
diff --git a/poky/meta/recipes-extended/bash/bash/makerace.patch b/poky/meta/recipes-extended/bash/bash/makerace.patch
deleted file mode 100644
index 9bd7c280fe..0000000000
--- a/poky/meta/recipes-extended/bash/bash/makerace.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-We're seeing pipesize.h being created in parallel:
-
-/bin/sh ../../bash-5.1/builtins/psize.sh > pipesize.h
-/bin/sh ../../bash-5.1/builtins/psize.sh > pipesize.h
-
-./mkbuiltins -D ../../bash-5.1/builtins ../../bash-5.1/builtins/ulimit.def
-x86_64-pokysdk-linux-gcc --sysroot=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/recipe-sysroot -c -DHAVE_CONFIG_H -DSHELL -I. -I.. -I../../bash-5.1 -I../../bash-5.1/include -I../../bash-5.1/lib -I../../bash-5.1/builtins -O2 -pipe -fmacro-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0=/usr/src/debug/nativesdk-bash/5.1-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0=/usr/src/debug/nativesdk-bash/5.1-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/recipe-sysroot= -fdebug-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/recipe-sysroot-native= ulimit.c || ( rm -f ulimit.c ; exit 1 )
-make[1]: Leaving directory '/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/build/builtins'
-rm -f redir.o
-x86_64-pokysdk-linux-gcc --sysroot=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/recipe-sysroot -DPROGRAM='"bash"' -DCONF_HOSTTYPE='"x86_64"' -DCONF_OSTYPE='"linux-gnu"' -DCONF_MACHTYPE='"x86_64-pokysdk-linux-gnu"' -DCONF_VENDOR='"pokysdk"' -DLOCALEDIR='"/opt/poky/3.2+snapshot/sysroots/x86_64-pokysdk-linux/usr/share/locale"' -DPACKAGE='"bash"' -DSHELL -DHAVE_CONFIG_H -I. -I../bash-5.1 -I../bash-5.1/include -I../bash-5.1/lib -O2 -pipe -fmacro-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0=/usr/src/debug/nativesdk-bash/5.1-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0=/usr/src/debug/nativesdk-bash/5.1-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/recipe-sysroot= -fdebug-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/recipe-sysroot-native= -c ../bash-5.1/redir.c
-In file included from ../../bash-5.1/builtins/../../bash-5.1/builtins/ulimit.def:95:
-pipesize.h:9:5: error: expected '=', ',', ';', 'asm' or '__attribute__' before '-' token
- 9 | bash-5.1/builtins/psize.sh: 37: ../../bash-5.1/builtins/psize.sh: ./psize.aux: Text file busy
- | ^
-make[1]: *** [Makefile:119: ulimit.o] Error 1
-make[1]: Leaving directory '/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/build/builtins'
-make: *** [Makefile:737: builtins/libbuiltins.a] Error 1
-make: *** Waiting for unfinished jobs....
-In file included from ../bash-5.1/redir.c:61:
-./builtins/pipesize.h:9:5: error: expected '=', ',', ';', 'asm' or '__attribute__' before '-' token
- 9 | bash-5.1/builtins/psize.sh: 37: ../../bash-5.1/builtins/psize.sh: ./psize.aux: Text file busy
- | ^
-make: *** [Makefile:101: redir.o] Error 1
-WARNING: exit code 1 from a shell command.
-
-which happens since builtins/ulimit.o depends on pipesize.h as well as a top
-level dependency. This means:
-
- @(cd $(DEFDIR) && $(MAKE) $(MFLAGS) pipesize.h ) || exit 1
-
-races with:
-
- @(cd $(DEFDIR) && $(MAKE) $(MFLAGS) DEBUG=${DEBUG} targets ) || exit 1
-
-Hack around this by forcing BUILTINS_LIBRARY onto pipesize.h as a dependency.
-
-Upstream-Status: Submitted [https://lists.gnu.org/archive/html/bug-bash/2021-01/msg00152.html]
-Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-
-Index: bash-5.1/Makefile.in
-===================================================================
---- bash-5.1.orig/Makefile.in
-+++ bash-5.1/Makefile.in
-@@ -746,7 +746,7 @@ ${DEFDIR}/bashgetopt.o: $(BUILTIN_SRCDIR
- ${DEFDIR}/builtext.h: $(BUILTIN_DEFS)
- @(cd $(DEFDIR) && $(MAKE) $(MFLAGS) builtext.h ) || exit 1
-
--${DEFDIR}/pipesize.h:
-+${DEFDIR}/pipesize.h: $(BUILTINS_LIBRARY)
- @(cd $(DEFDIR) && $(MAKE) $(MFLAGS) pipesize.h ) || exit 1
-
- $(SDIR)/man2html$(EXEEXT): ${SUPPORT_SRC}/man2html.c
diff --git a/poky/meta/recipes-extended/bash/bash/makerace2.patch b/poky/meta/recipes-extended/bash/bash/makerace2.patch
deleted file mode 100644
index abb51a5086..0000000000
--- a/poky/meta/recipes-extended/bash/bash/makerace2.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-The main makefile can call mkbuiltins from multiple different codepaths in parallel.
-When called, it moves the existing files out the way and creates new ones, then
-compares which will break the build if timing is unlucky.
-
-The root of the problem is mkbuiltins.c creating a file but also referencing that
-file under the same name. By modifing it to allow the final name and the temp name
-to be specified, we can avoid the original reason for the moving of files around.
-This allows them to be created under a new name and then replaced if changed,
-removing any race windows around accessing the files whilst they've been
-moved or are being rewritten.
-
-See [YOCTO #14227]
-
-Upstream-Status: Submitted [https://savannah.gnu.org/patch/index.php?10210]
-Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-
-Index: bash-5.1.8/builtins/Makefile.in
-===================================================================
---- bash-5.1.8.orig/builtins/Makefile.in
-+++ bash-5.1.8/builtins/Makefile.in
-@@ -185,19 +185,17 @@ gen-helpfiles: tmpbuiltins.o gen-helpfil
- $(CC_FOR_BUILD) ${CCFLAGS_FOR_BUILD} $(LDFLAGS_FOR_BUILD) -o $@ gen-helpfiles.o tmpbuiltins.o $(LIBS_FOR_BUILD)
-
- builtext.h builtins.c: $(MKBUILTINS) $(DEFSRC)
-- @-if test -f builtins.c; then mv -f builtins.c old-builtins.c; fi
-- @-if test -f builtext.h; then mv -f builtext.h old-builtext.h; fi
-- ./$(MKBUILTINS) -externfile builtext.h -structfile builtins.c \
-+ ./$(MKBUILTINS) -externfile builtext-new.h -externfinalfile builtext.h -structfile builtins-new.c \
- -noproduction $(DIRECTDEFINE) $(HELPDIRDEFINE) $(HELPSTRINGS) $(DEFSRC)
-- @-if cmp -s old-builtext.h builtext.h 2>/dev/null; then \
-- mv old-builtext.h builtext.h; \
-+ @-if ! cmp -s builtext.h builtext-new.h 2>/dev/null; then \
-+ mv builtext-new.h builtext.h; \
- else \
-- $(RM) old-builtext.h; \
-+ $(RM) builtext-new.h; \
- fi
-- @-if cmp -s old-builtins.c builtins.c 2>/dev/null; then \
-- mv old-builtins.c builtins.c; \
-+ @-if ! cmp -s builtins.c builtins-new.c 2>/dev/null; then \
-+ mv builtins-new.c builtins.c; \
- else \
-- $(RM) old-builtins.c; \
-+ $(RM) builtins-new.c; \
- fi
-
- helpdoc: gen-helpfiles
-Index: bash-5.1.8/builtins/mkbuiltins.c
-===================================================================
---- bash-5.1.8.orig/builtins/mkbuiltins.c
-+++ bash-5.1.8/builtins/mkbuiltins.c
-@@ -113,6 +113,9 @@ char *struct_filename = (char *)NULL;
- /* The name of the external declaration file. */
- char *extern_filename = (char *)NULL;
-
-+/* The final name of the external declaration file. */
-+char *extern_final_filename = (char *)NULL;
-+
- /* Here is a structure for manipulating arrays of data. */
- typedef struct {
- int size; /* Number of slots allocated to array. */
-@@ -230,6 +233,8 @@ main (argc, argv)
-
- if (strcmp (arg, "-externfile") == 0)
- extern_filename = argv[arg_index++];
-+ else if (strcmp (arg, "-externfinalfile") == 0)
-+ extern_final_filename = argv[arg_index++];
- else if (strcmp (arg, "-structfile") == 0)
- struct_filename = argv[arg_index++];
- else if (strcmp (arg, "-noproduction") == 0)
-@@ -273,6 +278,9 @@ main (argc, argv)
- }
- }
-
-+ if (!extern_final_filename)
-+ extern_final_filename = extern_filename;
-+
- /* If there are no files to process, just quit now. */
- if (arg_index == argc)
- exit (0);
-@@ -1174,7 +1182,7 @@ write_file_headers (structfile, externfi
- fprintf (structfile, "%s\n", structfile_header[i]);
-
- fprintf (structfile, "#include \"%s\"\n",
-- extern_filename ? extern_filename : "builtext.h");
-+ extern_final_filename ? extern_final_filename : "builtext.h");
-
- fprintf (structfile, "#include \"bashintl.h\"\n");
-
-@@ -1184,7 +1192,7 @@ write_file_headers (structfile, externfi
- if (externfile)
- fprintf (externfile,
- "/* %s - The list of builtins found in libbuiltins.a. */\n",
-- extern_filename ? extern_filename : "builtext.h");
-+ extern_final_filename ? extern_final_filename : "builtext.h");
- }
-
- /* Write out any necessary closing information for
diff --git a/poky/meta/recipes-extended/bash/bash/use_aclocal.patch b/poky/meta/recipes-extended/bash/bash/use_aclocal.patch
index bebaa08bfe..bd6870b386 100644
--- a/poky/meta/recipes-extended/bash/bash/use_aclocal.patch
+++ b/poky/meta/recipes-extended/bash/bash/use_aclocal.patch
@@ -1,3 +1,8 @@
+From d1bf23817afffd5917b74da6946e0c3b7e63e336 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Mon, 28 Dec 2020 21:04:27 +0100
+Subject: [PATCH] bash: update 5.0 -> 5.1
+
Including m4 files directly like this confuses autotools.bbclass, remove
the references and rely upon aclocal to collect the m4 files together
as needed instead making it work like other autotools based projects.
@@ -5,17 +10,23 @@ as needed instead making it work like other autotools based projects.
Upstream-Status: Inappropriate [OE configuration specific]
RP 2021/1/20
-Index: bash-5.1/configure.ac
-===================================================================
---- bash-5.1.orig/configure.ac
-+++ bash-5.1/configure.ac
-@@ -688,47 +688,6 @@ if test x$SIZE = x; then
+---
+ configure.ac | 43 -------------------------------------------
+ 1 file changed, 43 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 50a6e20..a3b5bd7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -710,49 +710,6 @@ if test x$SIZE = x; then
fi
AC_SUBST(SIZE)
-m4_include([m4/stat-time.m4])
-m4_include([m4/timespec.m4])
-
+-m4_include([m4/strtoimax.m4])
+-
-dnl include files for gettext
-
-m4_include([m4/codeset.m4])
@@ -54,6 +65,6 @@ Index: bash-5.1/configure.ac
-m4_include([m4/wint_t.m4])
-m4_include([m4/xsize.m4])
-
- dnl Turn on any extensions available in the GNU C library.
- AC_DEFINE(_GNU_SOURCE, 1)
-
+ dnl C compiler characteristics
+ AC_C_CONST
+ AC_C_INLINE
diff --git a/poky/meta/recipes-extended/bash/bash_5.1.16.bb b/poky/meta/recipes-extended/bash/bash_5.2.9.bb
index d046faa4e5..39a5d3de86 100644
--- a/poky/meta/recipes-extended/bash/bash_5.1.16.bb
+++ b/poky/meta/recipes-extended/bash/bash_5.2.9.bb
@@ -5,7 +5,6 @@ LICENSE = "GPL-3.0-or-later"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \
- file://execute_cmd.patch \
file://mkbuiltins_have_stringize.patch \
file://build-tests.patch \
file://test-output.patch \
@@ -13,11 +12,9 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \
file://run-bash-ptests \
file://fix-run-builtins.patch \
file://use_aclocal.patch \
- file://makerace.patch \
- file://makerace2.patch \
"
-SRC_URI[tarball.sha256sum] = "5bac17218d3911834520dad13cd1f85ab944e1c09ae1aba55906be1f8192f558"
+SRC_URI[tarball.sha256sum] = "68d978264253bc933d692f1de195e2e5b463a3984dfb4e5504b076865f16b6dd"
DEBUG_OPTIMIZATION:append:armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}"
DEBUG_OPTIMIZATION:append:armv5 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}"