summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-oe/recipes-core
diff options
context:
space:
mode:
authorPatrick Williams <patrick@stwcx.xyz>2022-04-13 17:07:35 +0300
committerPatrick Williams <patrick@stwcx.xyz>2022-04-14 02:10:00 +0300
commit58776373dfbbda0388940c41752c07c18b4f15cd (patch)
treec8a3e0ccd43548d6df30f960de94404009a2baf5 /meta-openembedded/meta-oe/recipes-core
parentdc43764abca8281445f5d50c2c44cd85b56cc4af (diff)
downloadopenbmc-58776373dfbbda0388940c41752c07c18b4f15cd.tar.xz
subtree updates
meta-raspberrypi: cfbb192e5c..83f5577d8d: AJ Bagwell (1): linux-raspberrypi: add UBOOT_ENTRYPOINT to match LOADADDR poky: ed98f1a1ae..30b38d9cb9: Alexander Kanavin (1): connman-conf: ignore eth0 in qemu in a way that is not sysvinit-specific Chen Qi (1): spirv-tools: fix to use sdk-1.3.204 branch Kevin Hao (1): kernel.bbclass: Fix the do_strip() malfunction Khem Raj (2): libarchive: Upgrade to 3.6.1 musl: Move to 1.2.3 release tag Martin Jansa (1): license_image.bbclass: close package.manifest file Ralph Siemsen (2): xz: fix CVE-2022-1271 gzip: upgrade 1.11 -> 1.12 Richard Purdie (2): uninative: Upgrade to 3.6 with gcc 12 support package_ipk/deb: Fix specific version handling Ross Burton (1): python3-cryptography: backport fix for leaky test meta-openembedded: b9e440ead8..1888971b1f: Andreas Müller (5): octave: add PACKAGECONFIG for (Qt-)gui - disabled by default xfce4-eyes-plugin: upgrade 4.5.1 -> 4.6.0 gnome-online-accounts: upgrade 3.43.1 -> 3.44.0 mutter: upgrade 41.2 -> 42.0 gnome-shell: upgrade 41.2 -> 42.0 Clément Péron (1): grpc: remove unused patches Kai Kang (2): wxwidgets: fix wx-config multilib issue python3-wxgtk4: pass '--baselib' to WX_CONFIG Khem Raj (6): Revert "python3-cppy: upgrade 1.2.0 -> 1.2.1" libotr: Include missing sys/socket.h header libcereal: Link in libatomic on rv32 for ptests gnuplot: Disable libcerf and fix typo libcereal: Disable on ppc/ppc64 evolution-data-server: Disable g-i on musl Markus Volk (1): gparted: update to v1.4.0 Naveen Saini (1): ndctl: fix build failure with EXEWRAPPER_ENABLED False Oleksandr Kravchuk (27): python3-beautifulsoup: update to 4.11.1 python3-bidict: update to 0.22.0 python3-can: update t 4.0.0 python3-elementpath: update to 2.5.0 python3-flask-login: update to 0.6.0 python3-flask: update to 2.1.1 python3-gcovr: update to 5.1 python3-google-api-core: update to 2.7.1 python3-google-auth: update to 2.6.3 python3-grpcio-tools: update to 1.45.0 python3-ipython: update to 8.2.0 python3-jmespath: update to 1.0.0 python3-mypy: update to 0.942 python3-pint: update to 0.19.1 python3-portalocker: update to 2.4.0 python3-pulsectl: update to 22.3.2 python3-pycurl: update to 7.45.1 python3-pymogo: update to 4.1.0 python3-pyscaffold: update to 4.2.1 python3-pytest-helpers-namespace: update to 2021.12.29 python3-pywbem: update to 1.4.1 python3-regex: update to 2022.3.15 python3-sympy: update to 1.10.1 python3-tqdm: update to 4.64.1 python3-twitter: update to 4.8.0 python3-xmlschema: update to 1.10.0 python3-zeroconf: update to 0.38.4 Robert Yang (1): python3-wxgtk4: Require DISTRO_FEATURES as gtk3 Sakib Sajal (1): drbd-utils: update 9.13.1 -> 9.20.2 Scott Murray (1): wxwidgets: Fix building without x11 Stefan Herbrechtsmeier (2): grpc: add cmake support for target grpc: remove useless link with libatomic append Stefan Schmidt (4): ot-br-posix: add recipe for an OpenThread Border Router ot-daemon: add recipe for OpenThread daemon wpantund: add new recipe MAINTAINERS: add entry for OpenThread Willy Tu (1): googletests: Update SRC_URI to 9e71237 to move closer to lastest version Yi Zhao (1): libyang: do not inherit binconfig-disabled wangmy (9): haveged: upgrade 1.9.17 -> 1.9.18 hidapi: upgrade 0.10.1 -> 0.11.2 hwdata: upgrade 0.357 -> 0.358 broadcom-bt-firmware: upgrade 12.0.1.1105_p2 -> 12.0.1.1105_p3 byacc: upgrade 20211224 -> 20220128 ctags: upgrade 5.9.20211114.0 -> 5.9.20220410.0 feh: upgrade 3.6.1 -> 3.8 fio: upgrade 3.29 -> 3.30 grpc: upgrade 1.45.1 -> 1.45.2 Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: Ia6d6cf07c9398a7885df6b31b27019da4d8f01d8
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-core')
-rw-r--r--meta-openembedded/meta-oe/recipes-core/ndctl/ndctl/0001-build-set-HAVE_STATEMENT_EXPR-var.patch60
-rw-r--r--meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v73.bb3
-rw-r--r--meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb4
3 files changed, 64 insertions, 3 deletions
diff --git a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl/0001-build-set-HAVE_STATEMENT_EXPR-var.patch b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl/0001-build-set-HAVE_STATEMENT_EXPR-var.patch
new file mode 100644
index 0000000000..486d6c07be
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl/0001-build-set-HAVE_STATEMENT_EXPR-var.patch
@@ -0,0 +1,60 @@
+From b06d16ec2d4aefc4cf1675e9dd6314956bc32d69 Mon Sep 17 00:00:00 2001
+From: Naveen Saini <naveen.kumar.saini@intel.com>
+Date: Thu, 7 Apr 2022 14:36:58 +0800
+Subject: [PATCH] build: set HAVE_STATEMENT_EXPR var
+
+The v73 version tries to build and run a test program at compile
+time to check whether compiler supports sizeof and expression statements
+and sets HAVE_STATEMENT_EXPR accordingly. This requires EXEWRAPPER_ENABLED
+in meson.bbclass to be True and qemu-usermode to be working.
+
+In cases when EXEWRAPPER_ENABLED is False, build fails with error:
+
+| ../git/meson.build:213:0: ERROR: Can not run test applications in
+this cross environment.
+
+We don't really need to do this as these have been supported since gcc3 and can set the configs to 1.
+
+The autotools implementation also used to set it to 1 so this doesn't change anything:
+
+https://github.com/pmem/ndctl/blob/v72.1/configure.ac#L70
+
+Upstream-Status: Inappropriate
+
+Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
+---
+ meson.build | 18 ++----------------
+ 1 file changed, 2 insertions(+), 16 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 42e11aa..e8d218b 100644
+--- a/meson.build
++++ b/meson.build
+@@ -210,22 +210,8 @@ conf.set('ENABLE_DESTRUCTIVE', get_option('destructive').enabled())
+ conf.set('ENABLE_LOGGING', get_option('logging').enabled())
+ conf.set('ENABLE_DEBUG', get_option('dbg').enabled())
+
+-typeof = cc.run('''
+- int main() {
+- struct {
+- char a[16];
+- } x;
+- typeof(x) y;
+-
+- return sizeof(x) == sizeof(y);
+- }
+- '''
+-)
+-
+-if typeof.compiled() and typeof.returncode() == 1
+- conf.set('HAVE_TYPEOF', 1)
+- conf.set('HAVE_STATEMENT_EXPR', 1)
+-endif
++conf.set('HAVE_TYPEOF', 1)
++conf.set('HAVE_STATEMENT_EXPR', 1)
+
+ if target_machine.endian() == 'big'
+ conf.set('HAVE_BIG_ENDIAN', 1)
+--
+2.17.1
+
diff --git a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v73.bb b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v73.bb
index c88d392970..da649d578b 100644
--- a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v73.bb
+++ b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v73.bb
@@ -13,7 +13,8 @@ inherit meson pkgconfig bash-completion systemd
SRCREV = "dd58d43458943d20ff063850670bf54a5242c9c5"
SRC_URI = "git://github.com/pmem/ndctl.git;branch=main;protocol=https \
file://0001-util-Correct-path-to-iniparser.h.patch \
- file://0001-meson-Use-pkg-config-to-detect-iniparser.patch"
+ file://0001-meson-Use-pkg-config-to-detect-iniparser.patch \
+ file://0001-build-set-HAVE_STATEMENT_EXPR-var.patch"
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>v\d+(\.\d+)*)"
diff --git a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
index 08d9e91704..bc3d4fefeb 100644
--- a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
+++ b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
@@ -948,8 +948,8 @@ RDEPENDS:packagegroup-meta-oe-support:remove:arm ="numactl"
RDEPENDS:packagegroup-meta-oe-support:remove:mipsarch = "gperftools"
RDEPENDS:packagegroup-meta-oe-support:remove:riscv64 = "gperftools uim"
RDEPENDS:packagegroup-meta-oe-support:remove:riscv32 = "gperftools uim"
-RDEPENDS:packagegroup-meta-oe-support:remove:powerpc = "ssiapi tbb"
-RDEPENDS:packagegroup-meta-oe-support:remove:powerpc64le = "ssiapi"
+RDEPENDS:packagegroup-meta-oe-support:remove:powerpc = "libcereal ssiapi tbb"
+RDEPENDS:packagegroup-meta-oe-support:remove:powerpc64le = "libcereal ssiapi"
RDEPENDS:packagegroup-meta-oe-support:remove:libc-musl = "pcp"
RDEPENDS:packagegroup-meta-oe-support:remove:libc-musl:powerpc = "gsl"