diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2024-01-19 17:49:29 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2024-01-23 20:52:36 +0300 |
| commit | 56b44a9896b5068220cbd7d58795773b750149c8 (patch) | |
| tree | 26baf5d8f0d7031707b62deab067516b733c915a /meta-openembedded | |
| parent | 1ada3c2d58691868267415a1ea08dab4a7f54aef (diff) | |
| download | openbmc-56b44a9896b5068220cbd7d58795773b750149c8.tar.xz | |
subtree updates
meta-arm: 5712422011..1cad3c3813:
Jon Mason (3):
arm/pyhsslms: update to 2.0.0
arm/trusted-firmware-m: update to 2.0.0
arm/opencsd: update to 1.4.2
Ross Burton (2):
arm-bsp/documentation: upgrade Sphinx slightly
arm/fvp-base-a-aem: upgrade to 11.24.11
Vikas Katariya (2):
arm-bsp/n1sdp: Downgrade to 6.1 linux yocto kernel
arm-bsp/linux-yocto: Remove EOL Linux yocto kernel 6.5
meta-openembedded: 098dc606f9..4dbbef7a39:
Alex Kiernan (1):
thin-provisioning-tools: Drop musl fixes (fixed upstream)
Derek Straka (9):
python3-web3: update to version 6.14.0
python3-engineio: update to version 4.8.2
python3-marshmallow: update to version 3.20.2
python3-apispec: update to version 6.4.0
python3-protobuf: update to version 4.25.1
python3-eth-hash: update to version 0.6.0
python3-google-auth: update to version 2.26.2
python3-socketio: update to version 5.11.0
python3-google-api-python-client: update to version 2.113.0
Fabio Estevam (1):
v4l-utils: Update to 1.26.1
Jörg Sommer (1):
i2cdev: Fix MUSL build
Khem Raj (7):
thunar: inherit gtk-doc
libxklavier: inherit gtk-doc
libwnck: inherit gtk-doc
schroedinger: inherit gtk-doc
gst-shark: inherit gtk-doc
evolution-data-server: Use inherit_defer for native class
opencl-icd: Rename rdepends to virtual-opencl-icd
Markus Volk (2):
flatpak: fix gtk-doc build
gvfs: drop gnome-keyring rdepend
Peter Marko (1):
grpc: correct dependencies
Randy MacLeod (1):
rng-tools: move from oe-core to meta-oe
Ross Burton (9):
libuser: fix gtk-doc configure call
libuser: remove obsolete GTKDOC_DOCDIR assignment
gtksourceview4: remove check for target gtk-doc
gtksourceview4: remove obsolete workaround for build failures
telepathy-glib: inherit gtk-doc
glade: inherit gtk-doc, fix FILES
libgxim: inherit gtk-doc
gmime: inherit gtk-doc
raptor2: inherit gtk-doc
Wang Mingyu (3):
frr: use update-alternatives for ietf-interfaces.yang
libsmi: use update-alternatives for ietf-interfaces.yang
frr: Fix install conflict when enable multilib.
alperak (1):
adcli: use https protocol for fetching
poky: 61182659c2..7af374c90c:
Alexander Kanavin (3):
glib-2.0: ensure GI_DATA_ENABLED is set
gobject-introspection-data.bbclass: move do_compile() tweak to g-i class
python: update 3.11.5 -> 3.12.1
Alexander Sverdlin (2):
linux-firmware: upgrade 20231030 -> 20231211
linux-firmware: package PowerVR firmware
André Draszik (1):
linux-firmware: split out rockchip/dptx firmware
Changhyeok Bae (1):
iw: upgrade 5.19 -> 6.7
Etienne Cordonnier (3):
package.py: fix Darwin support
chrpath.bbclass: fix Darwin support
siteinfo.bbclass: add support for darwin19 and darwin21
Fabio Estevam (2):
mesa: Upgrade 23.3.2 -> 23.3.3
libdrm: Upgrade to 2.4.120
Joe Slater (1):
init-ifupdown: add predictable interface names
Kai Kang (1):
xserver-xorg: 21.1.9 -> 21.1.11
Khem Raj (3):
webkitgtk: Workaround for clang compiler segfault
mdadm: Disable 10ddf-fail-spare and 10ddf-fail-stop-readd testcases
openssl: Fix build on riscv
Ola x Nilsson (2):
insane.bbclass: Check for adjtime in check_32_bit_symbols
insane.bbclass: Python code cleanup in check_32bit_symbols
Petr Vorel (1):
iputils: update to 20240117
Randy MacLeod (2):
rng-tools: move to meta-oe
rng-tools: Revert "rng-tools: move to meta-oe"
Richard Purdie (13):
bitbake: ast/BBHandler: Add inherit_defer support
allarch: Fix allarch corner case
rootfs: Fix MULTILIB_RE_ALLOW to be inherit order independent
rootfs-postcommands: Try and improve ordering constraints
classes/recipes: Switch to use inherit_defer
libtool: Update patches to mark as backports
libtool: Update nios2 patch to match upstream merged version
libtool: Update prefixmap and clang patches to match upstream submission
libtool: Update cleanup sysroot handling patch
libtool: Update patch offsets
libtool: Update further patch status to backport
reproducible: Fix race with externalsrc/devtool over lockfile
build-appliance-image: Update to master head revision
Ross Burton (4):
musl: doesn't support riscv32
libunwind: merge .inc and .bb
libunwind: refresh patches
libunwind: clean up configuration
Simone Weiß (1):
classes-global/insane: Add check for "virtual/" in RPROVIDES and RDEPENDS
Tim Orling (1):
python3-alabaster: upgrade 0.7.13 -> 0.7.16
Trevor Woerner (1):
bmaptool: add 3 fixes
Vyacheslav Yurkov (9):
recipetool: Don't fail on local go modules
classes: go-vendor: Reference local modules
classes: go-vendor: Handle modules from the same repo
classes: go-vendor: Unlink vendor dir later
recipetool: Proceed even with a missing license file
recipetool: Disregard version in URL for replaced modules
oeqa/selftest/recipetool: Move create_go test to a proper class
oeqa/selftest/recipetool: Move helper function to the class scope
oeqa/selftest/recipetool: Add test coverage for local go modules
Wang Mingyu (22):
mpg123: upgrade 1.32.3 -> 1.32.4
bind: upgrade 9.18.20 -> 9.18.21
iproute2: upgrade 6.6.0 -> 6.7.0
kexec-tools: upgrade 2.0.27 -> 2.0.28
libbsd: upgrade 0.11.7 -> 0.11.8
libxmlb: upgrade 0.3.14 -> 0.3.15
nghttp2: upgrade 1.57.0 -> 1.58.0
ofono: upgrade 2.2 -> 2.3
python3-numpy: upgrade 1.26.2 -> 1.26.3
vte: upgrade 0.74.1 -> 0.74.2
python3-cython: upgrade 3.0.7 -> 3.0.8
python3-git: upgrade 3.1.40 -> 3.1.41
python3-hypothesis: upgrade 6.92.2 -> 6.92.9
python3-jinja2: upgrade 3.1.2 -> 3.1.3
python3-markdown: upgrade 3.5 -> 3.5.2
python3-more-itertools: upgrade 10.1.0 -> 10.2.0
python3-pycryptodome: upgrade 3.19.1 -> 3.20.0
python3-pycryptodomex: upgrade 3.19.1 -> 3.20.0
python3-trove-classifiers: upgrade 2023.11.29 -> 2024.1.8
stress-ng: upgrade 0.17.03 -> 0.17.04
virglrenderer: upgrade 1.0.0 -> 1.0.1
xz: upgrade 5.4.4 -> 5.4.5
Change-Id: I9581526d3addb54889dd73268e672c2d84345f3e
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'meta-openembedded')
49 files changed, 468 insertions, 263 deletions
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb index 681a61c33a..28d4c2152b 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb @@ -1,10 +1,12 @@ require ${BPN}.inc -inherit native +inherit_defer native DEPENDS = "glib-2.0-native" # build native helpers +do_configure[noexec] = "1" + do_compile() { cd ${S}/src/camel sed -i 's:#include "evolution-data-server-config.h"::g' camel-gen-tables.c diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb index 11a52b455e..0c3cc53030 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb @@ -6,7 +6,7 @@ DEPENDS = " \ dbus db virtual/libiconv zlib libsoup-3.0 libical nss libsecret \ " -inherit pkgconfig gsettings gobject-introspection features_check cmake gtk-doc gettext perlnative vala +inherit pkgconfig gsettings gobject-introspection features_check gtk-doc gettext perlnative vala ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" REQUIRED_DISTRO_FEATURES = "opengl" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc index 2f3bf61982..33190c461c 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc +++ b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \ file://src/camel/camel.h;endline=24;md5=342fc5e9357254bc30c24e43ae47d9a1 \ file://src/libedataserver/e-data-server-util.h;endline=20;md5=8f21a9c80ea82a4fb80b5f959f672543" -GNOMEBASEBUILDCLASS = "autotools" +GNOMEBASEBUILDCLASS = "cmake" inherit gnomebase upstream-version-is-even SRC_URI[archive.sha256sum] = "91f4ffc38a1b8d2fe8939834449ac541c0bff4a39b444edc2a9529344a28e98a" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/files/0001-remove-pointless-check.patch b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/files/0001-remove-pointless-check.patch new file mode 100644 index 0000000000..8230bbbd16 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/files/0001-remove-pointless-check.patch @@ -0,0 +1,38 @@ +From 397751846130f79d5fbe8d617b788f3bcbb36816 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@arm.com> +Date: Tue, 9 Jan 2024 22:20:03 +0000 +Subject: [PATCH] meson: remove pointless gtk-doc check + +There's no point explicitly checking for gtk-doc, for two reasons: + +1) In cross-compiled environments this looks for a target gtk-doc, not a + native gtk-doc, so it should set native:true. + +2) The gnome.gtkdoc() function checks for gtk-doc itself. + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gtksourceview/-/merge_requests/351] +Signed-off-by: Ross Burton <ross.burton@arm.com> +--- + meson.build | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/meson.build b/meson.build +index ba07da70..1109daea 100644 +--- a/meson.build ++++ b/meson.build +@@ -107,12 +107,6 @@ else + vapigen_dep = [] + endif + +-if build_gtk_doc +- gtk_doc_dep = dependency('gtk-doc', version: gtk_doc_req) +-else +- gtk_doc_dep = [] +-endif +- + # Look for the libxml2 library manually on Visual Studio if + # its pkg-config file could not be found, as the NMake + # Makefiles of libxml2 do not generate the pkg-config files +-- +2.34.1 + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.4.bb index 353f02f1ba..38ca4a39e6 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.4.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.4.bb @@ -10,27 +10,15 @@ PNAME = "gtksourceview" S = "${WORKDIR}/${PNAME}-${PV}" - inherit gnomebase lib_package gettext features_check gtk-doc gobject-introspection vala ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -SRC_URI = "https://download.gnome.org/sources/gtksourceview/4.8/${PNAME}-${PV}.tar.xz" +SRC_URI = "https://download.gnome.org/sources/gtksourceview/4.8/${PNAME}-${PV}.tar.xz \ + file://0001-remove-pointless-check.patch" SRC_URI[sha256sum] = "7ec9d18fb283d1f84a3a3eff3b7a72b09a10c9c006597b3fbabbb5958420a87d" GIR_MESON_OPTION = 'gir' GTKDOC_MESON_OPTION = "gtk_doc" -# Override the definition in meson.bbclass. The dependencies in mason.build are incomplete -# and the recipe will not build with "-j 1". This fix is benign but should be reviewed when -# updating versions. -# -meson_do_compile() { - bbnote "========== generating gtksourceview-gresources.h ========" - bbnote "PARALLEL_MAKE is ${PARALLEL_MAKE}" - ninja ${PARALLEL_MAKE} gtksourceview/gtksourceview-gresources.h - bbnote "========== compiling target all ========" - ninja ${PARALLEL_MAKE} -} - FILES:${PN} += "${datadir}/gtksourceview-4" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.52.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.52.1.bb index 627b499fe8..7ac6c3ef21 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.52.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.52.1.bb @@ -58,7 +58,7 @@ PACKAGECONFIG[admin] = "-Dadmin=true, -Dadmin=false, libcap polkit" PACKAGECONFIG[afc] = "-Dafc=true, -Dafc=false, libimobiledevice libplist" PACKAGECONFIG[archive] = "-Darchive=true, -Darchive=false, libarchive" PACKAGECONFIG[dnssd] = "-Ddnssd=true, -Ddnssd=false, avahi" -PACKAGECONFIG[gcr] = "-Dgcr=true, -Dgcr=false, gcr3, gnome-keyring" +PACKAGECONFIG[gcr] = "-Dgcr=true, -Dgcr=false, gcr3" PACKAGECONFIG[gcrypt] = "-Dgcrypt=true, -Dgcrypt=false, libgcrypt" PACKAGECONFIG[goa] = "-Dgoa=true, -Dgoa=false, gnome-online-accounts" PACKAGECONFIG[google] = "-Dgoogle=true, -Dgoogle=false, libgdata" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb index 8655affdbb..d7f47002f8 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb @@ -9,7 +9,7 @@ PACKAGECONFIG ??= "startup-notification" PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" GNOMEBASEBUILDCLASS = "autotools" -inherit gnomebase gobject-introspection features_check +inherit gnomebase gobject-introspection features_check gtk-doc REQUIRED_DISTRO_FEATURES = "x11" SRC_URI[archive.md5sum] = "f03e1139296e2a3a92e3b65a3080cd32" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb index 7955663f26..f52c210ed4 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6e29c688d912da12b66b73e32b03d812" DEPENDS = "xkbcomp gtk+ iso-codes libxi libxml2" -inherit autotools pkgconfig gettext gobject-introspection features_check +inherit autotools pkgconfig gettext gobject-introspection features_check gtk-doc REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-gnome/recipes-support/libuser/libuser/gtkdoc.patch b/meta-openembedded/meta-gnome/recipes-support/libuser/libuser/gtkdoc.patch new file mode 100644 index 0000000000..4d11b94e02 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/libuser/libuser/gtkdoc.patch @@ -0,0 +1,22 @@ +Update the GTK_DOC_CHECK invocation to specify where the +documentation will be built (as the default is ./docs). + +This is needed so that gtkdocize as run by autopoint knows where the +documentation will be built. + +Upstream-Status: Submitted [https://pagure.io/libuser/pull-request/70] +Signed-off-by: Ross Burton <ross.burton@arm.com> + +diff --git a/configure.ac b/configure.ac +index 0bd4a67..51508b7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -169,7 +169,7 @@ if test "$GCC" = yes ; then + AC_MSG_RESULT([$enable_Werror]) + fi + +-GTK_DOC_CHECK ++GTK_DOC_CHECK([1.14],[--flavour no-tmpl --docdir docs/reference]) + + AC_CONFIG_FILES([Makefile po/Makefile.in docs/Makefile docs/reference/Makefile + libuser.pc]) diff --git a/meta-openembedded/meta-gnome/recipes-support/libuser/libuser_0.64.bb b/meta-openembedded/meta-gnome/recipes-support/libuser/libuser_0.64.bb index d86a577b10..6d3bce8a1c 100644 --- a/meta-openembedded/meta-gnome/recipes-support/libuser/libuser_0.64.bb +++ b/meta-openembedded/meta-gnome/recipes-support/libuser/libuser_0.64.bb @@ -14,6 +14,7 @@ SECTION = "base" SRC_URI = "https://releases.pagure.org/libuser/libuser-${PV}.tar.gz \ file://0001-docs-Disable-building.patch \ file://0002-remove-unused-execinfo.h.patch \ + file://gtkdoc.patch \ " SRC_URI[sha256sum] = "ea6094c72cb9e60a42fb53509dc98d124a340f1c9222783b503208adc16a0a8f" @@ -26,11 +27,6 @@ REQUIRED_DISTRO_FEATURES = "pam" EXTRA_OEMAKE = "PYTHON_CPPFLAGS=-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}" -GTKDOC_DOCDIR = "${S}/docs/reference" - -# run autopoint since it needs ABOUT-NLS and admin/config.rpath from gettext -#EXTRA_AUTORECONF:remove = "--exclude=autopoint" - do_configure:prepend() { install -d ${S}/admin -d ${S}/m4 touch ${S}/ABOUT-NLS ${S}/admin/config.rpath diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_0.8.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_0.8.1.bb index 8a839e0d10..dc43bed63b 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_0.8.1.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_0.8.1.bb @@ -31,4 +31,4 @@ FILES:${PN} += "\ ${libdir}/gstreamer-1.0/libgstsharktracers.la \ " -inherit autotools gettext pkgconfig +inherit autotools gettext pkgconfig gtk-doc diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/schroedinger/schroedinger_1.0.11.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/schroedinger/schroedinger_1.0.11.bb index c78e008007..e8f6df6348 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/schroedinger/schroedinger_1.0.11.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/schroedinger/schroedinger_1.0.11.bb @@ -19,5 +19,5 @@ SRC_URI[sha256sum] = "1e572a0735b92aca5746c4528f9bebd35aa0ccf8619b22fa2756137a8c EXTRA_OECONF += "STAGING_DIR=${STAGING_DIR_NATIVE}" -inherit autotools-brokensep pkgconfig +inherit autotools-brokensep pkgconfig gtk-doc diff --git a/meta-openembedded/meta-networking/recipes-connectivity/adcli/adcli_0.9.2.bb b/meta-openembedded/meta-networking/recipes-connectivity/adcli/adcli_0.9.2.bb index 6092823944..c5dcccbac5 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/adcli/adcli_0.9.2.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/adcli/adcli_0.9.2.bb @@ -6,7 +6,7 @@ SECTION = "net" SRCREV = "8e88e3590a19006362ea8b8dfdc18bb88b3cb3b5" -SRC_URI = "git://gitlab.freedesktop.org/realmd/adcli;branch=master" +SRC_URI = "git://gitlab.freedesktop.org/realmd/adcli;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-protocols/frr/frr_9.1.bb b/meta-openembedded/meta-networking/recipes-protocols/frr/frr_9.1.bb index 9db6710d9c..0926f84214 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/frr/frr_9.1.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/frr/frr_9.1.bb @@ -46,7 +46,7 @@ PACKAGECONFIG[ospfclient] = "--enable-ospfapi --enable-ospfclient,--disable-ospf EXTRA_OECONF:class-native = "--enable-clippy-only" -EXTRA_OECONF:class-target = "--sbindir=${libdir}/frr \ +EXTRA_OECONF:class-target = "--sbindir=${libexecdir}/frr \ --sysconfdir=${sysconfdir}/frr \ --localstatedir=${localstatedir}/run/frr \ --enable-vtysh \ @@ -74,6 +74,11 @@ SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} = "frr.service" SYSTEMD_AUTO_ENABLE = "disable" +inherit update-alternatives multilib_script multilib_header + +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE:${PN} = " ietf-interfaces " +ALTERNATIVE_LINK_NAME[ietf-interfaces] = "${datadir}/yang/ietf-interfaces.yang" do_compile:prepend () { sed -i -e 's#${RECIPE_SYSROOT_NATIVE}##g' \ -e 's#${RECIPE_SYSROOT}##g' ${S}/lib/version.h @@ -90,6 +95,7 @@ do_install:class-native () { do_install:append:class-target () { install -m 0755 -d ${D}${sysconfdir}/frr + install -m 0755 -d ${D}${libexecdir}/frr install -m 0640 ${S}/tools/etc/frr/* ${D}${sysconfdir}/frr/ chown frr:frrvty ${D}${sysconfdir}/frr chown frr:frr ${D}${sysconfdir}/frr/* @@ -118,6 +124,7 @@ do_install:append:class-target () { echo "d /run/frr 0755 frr frr -" \ > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf fi + oe_multilib_header frr/version.h } USERADD_PACKAGES = "${PN}" diff --git a/meta-openembedded/meta-oe/conf/layer.conf b/meta-openembedded/meta-oe/conf/layer.conf index 83a9f7d566..6b64328c81 100644 --- a/meta-openembedded/meta-oe/conf/layer.conf +++ b/meta-openembedded/meta-oe/conf/layer.conf @@ -54,7 +54,7 @@ PREFERRED_PROVIDER_android-tools-conf ?= "android-tools-conf" # Configures whether coreutils or uutils-coreutils is used. PREFERRED_PROVIDER_coreutils = "coreutils" PREFERRED_PROVIDER_virtual/opencl-icd ?= "opencl-icd-loader" -PREFERRED_RPROVIDER_virtual/opencl-icd ?= "opencl-icd-loader" +PREFERRED_RPROVIDER_virtual-opencl-icd ?= "opencl-icd-loader" SIGGEN_EXCLUDERECIPES_ABISAFE += " \ fbset-modes \ diff --git a/meta-openembedded/meta-oe/recipes-bsp/i2cdev/i2cdev/fix-musl.patch b/meta-openembedded/meta-oe/recipes-bsp/i2cdev/i2cdev/fix-musl.patch new file mode 100644 index 0000000000..59fd379dec --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/i2cdev/i2cdev/fix-musl.patch @@ -0,0 +1,122 @@ +From ce3affeb45a65649dda1edc9a4f0586e9db47ada Mon Sep 17 00:00:00 2001 +Message-Id: <ce3affeb45a65649dda1edc9a4f0586e9db47ada.1705064898.git.joerg.sommer@navimatix.de> +From: =?UTF-8?q?J=C3=B6rg=20Sommer?= <joerg.sommer@navimatix.de> +Date: Fri, 12 Jan 2024 13:59:51 +0100 +Subject: [PATCH] lsi2c: Replace error() by fprintf, drop error.h + +The MUSL C library doesn't support error.h. Because the only usage of this +is the *error* function in lsi2c.c, this gets replaced by a *fprintf*. This +doesn't print the program name, but keeps the message and the error +description. + +Upstream-Status: Submitted [https://github.com/costad2/i2cdev/pull/5] +--- + libi2cdev/access.c | 1 - + libi2cdev/i2c-bus-parser.c | 1 - + libi2cdev/i2c-dev-path.c | 1 - + libi2cdev/i2c-error.c | 1 - + libi2cdev/init.c | 2 -- + libi2cdev/sysfs.c | 1 - + lsi2c/lsi2c.c | 4 ++-- + 7 files changed, 2 insertions(+), 9 deletions(-) + +diff --git a/libi2cdev/access.c b/libi2cdev/access.c +index 62a3f59..2e77659 100644 +--- a/libi2cdev/access.c ++++ b/libi2cdev/access.c +@@ -16,7 +16,6 @@ + + #include "busses.h" + #include "data.h" +-#include "error.h" + #include "sysfs.h" + + #include "i2cdiscov.h" +diff --git a/libi2cdev/i2c-bus-parser.c b/libi2cdev/i2c-bus-parser.c +index c4b8688..8c760e0 100644 +--- a/libi2cdev/i2c-bus-parser.c ++++ b/libi2cdev/i2c-bus-parser.c +@@ -27,7 +27,6 @@ + #include <dirent.h> + #include <fcntl.h> + #include <errno.h> +-#include <error.h> + #include <alloca.h> + #include <search.h> + +diff --git a/libi2cdev/i2c-dev-path.c b/libi2cdev/i2c-dev-path.c +index b156db7..361761c 100644 +--- a/libi2cdev/i2c-dev-path.c ++++ b/libi2cdev/i2c-dev-path.c +@@ -11,7 +11,6 @@ + #include <string.h> + #include <errno.h> + #include <stdio.h> +-#include <error.h> + + #include <linux/limits.h> + +diff --git a/libi2cdev/i2c-error.c b/libi2cdev/i2c-error.c +index f92fb6b..540c112 100644 +--- a/libi2cdev/i2c-error.c ++++ b/libi2cdev/i2c-error.c +@@ -9,7 +9,6 @@ + + #include <stdlib.h> + #include <stdio.h> +-#include <error.h> + #include <errno.h> + #include <stdbool.h> + #include <stdarg.h> +diff --git a/libi2cdev/init.c b/libi2cdev/init.c +index 99a7edd..dfc4090 100644 +--- a/libi2cdev/init.c ++++ b/libi2cdev/init.c +@@ -16,10 +16,8 @@ + #include <errno.h> + #include <dirent.h> + #include <unistd.h> +-#include <error.h> + #include <limits.h> + #include <ctype.h> +-#include <error.h> + #include <fcntl.h> + #include <assert.h> + +diff --git a/libi2cdev/sysfs.c b/libi2cdev/sysfs.c +index 2811500..a7e13a8 100644 +--- a/libi2cdev/sysfs.c ++++ b/libi2cdev/sysfs.c +@@ -17,7 +17,6 @@ + #include <assert.h> + #include <string.h> + #include <fcntl.h> +-#include <error.h> + #include <errno.h> + + #include <sys/types.h> +diff --git a/lsi2c/lsi2c.c b/lsi2c/lsi2c.c +index 7af5313..34c6225 100644 +--- a/lsi2c/lsi2c.c ++++ b/lsi2c/lsi2c.c +@@ -38,7 +38,6 @@ + #include <stdlib.h> + #include <string.h> + #include <errno.h> +-#include <error.h> + #include <getopt.h> + #include <stdbool.h> + +@@ -205,7 +204,8 @@ static int read_config_file(const char *config_file_name) + if (err < 0) { + err = -err; + } +- error(0, err, "Failed to initialize i2cdevices"); ++ fflush(stdout); ++ fprintf(stderr, "Failed to initialize i2cdevices: %s", strerror(err)); + if (config_file) { + fclose(config_file); + } +-- +2.34.1 + diff --git a/meta-openembedded/meta-oe/recipes-bsp/i2cdev/i2cdev_git.bb b/meta-openembedded/meta-oe/recipes-bsp/i2cdev/i2cdev_git.bb index b41ecffae4..b2b5fda09e 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/i2cdev/i2cdev_git.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/i2cdev/i2cdev_git.bb @@ -17,6 +17,7 @@ PR = "git${SRCPV}" SRC_URI = "\ git://github.com/costad2/i2cdev.git;protocol=https;branch=master \ file://fix-lsi2c-makefile.patch \ + file://fix-musl.patch \ " SRCREV = "ed9ad777d842880e7ac6ca5e0de4bd2d3b4d02dc" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.1.bb index 1891eae40d..e083039232 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.1.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.1.bb @@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "9e0df1d8f857e0270cf0b32e2d1ca5a24aa7282873361785d573f72ad7 LIC_FILES_CHKSUM = "file://COPYING;md5=e413d83db6ee8f2c8e6055719096a48e" -inherit autotools pkgconfig gettext gobject-introspection vala +inherit autotools pkgconfig gettext gobject-introspection vala gtk-doc # Respect GI_DATA_ENABLED value when enabling vala-bindings: # configure: error: GObject-Introspection must be enabled for Vala bindings diff --git a/meta-openembedded/meta-oe/recipes-core/opencl/ocl-icd_2.3.2.bb b/meta-openembedded/meta-oe/recipes-core/opencl/ocl-icd_2.3.2.bb index 93fac969c9..d43ea281ae 100644 --- a/meta-openembedded/meta-oe/recipes-core/opencl/ocl-icd_2.3.2.bb +++ b/meta-openembedded/meta-oe/recipes-core/opencl/ocl-icd_2.3.2.bb @@ -15,6 +15,6 @@ inherit autotools DEPENDS = "ruby-native" PROVIDES = "virtual/opencl-icd" -RPROVIDES:${PN} = "virtual/opencl-icd" +RPROVIDES:${PN} = "virtual-opencl-icd" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-icd-loader_2023.12.14.bb b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-icd-loader_2023.12.14.bb index 6bf01a2484..146ec6e472 100644 --- a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-icd-loader_2023.12.14.bb +++ b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-icd-loader_2023.12.14.bb @@ -9,7 +9,7 @@ inherit pkgconfig cmake DEPENDS += "opencl-headers" PROVIDES = "virtual/opencl-icd" -RPROVIDES:${PN} = "virtual/opencl-icd" +RPROVIDES:${PN} = "virtual-opencl-icd" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/glade/glade_3.22.2.bb b/meta-openembedded/meta-oe/recipes-devtools/glade/glade_3.22.2.bb index 3936e04c6d..d11751a4b2 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/glade/glade_3.22.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/glade/glade_3.22.2.bb @@ -9,7 +9,7 @@ DEPENDS = "gtk+3 glib-2.0 libxml2 intltool-native \ autoconf-archive-native \ " GNOMEBASEBUILDCLASS = "autotools" -inherit features_check autotools pkgconfig gnomebase gobject-introspection mime-xdg +inherit features_check autotools pkgconfig gnomebase gobject-introspection mime-xdg gtk-doc # xfce4 depends on libwnck3, gtk+3 and libepoxy need to be built with x11 PACKAGECONFIG. # cairo would at least needed to be built with xlib. @@ -23,7 +23,4 @@ SRC_URI[sha256sum] = "edefa6eb24b4d15bd52589121dc109bc08c286157c41288deb74dd9cc3 EXTRA_OECONF += "--disable-man-pages" -FILES:${PN} += "${datadir}/* ${libdir}/glade/modules/libgladegtk.so" -FILES:${PN}-dev += "${libdir}/glade/modules/libgladegtk.la" -FILES:${PN}-dbg += "${libdir}/glade/modules/.debug/libgladegtk.so" - +FILES:${PN} += "${datadir}/glade ${datadir}/metainfo ${libdir}/glade/modules/libgladegtk.so" diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.60.0.bb b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.60.0.bb index 14fca669d3..d41a73eee4 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.60.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.60.0.bb @@ -6,7 +6,7 @@ SECTION = "libs" LICENSE = "Apache-2.0 & BSD-3-Clause & MPL-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=731e401b36f8077ae0c134b59be5c906" -DEPENDS = "c-ares protobuf protobuf-native protobuf-c protobuf-c-native openssl libnsl2 abseil-cpp re2" +DEPENDS = "c-ares protobuf protobuf-native openssl libnsl2 abseil-cpp re2 zlib" DEPENDS:append:class-target = " googletest grpc-native " DEPENDS:append:class-nativesdk = " grpc-native " diff --git a/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak/0001-meson.build-require-native-gtkdoc.patch b/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak/0001-meson.build-require-native-gtkdoc.patch new file mode 100644 index 0000000000..77b60ec98c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak/0001-meson.build-require-native-gtkdoc.patch @@ -0,0 +1,33 @@ +From 49737b1e4a74c77a8cd7ae727974d68503da087f Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Fri, 12 Jan 2024 13:52:08 +0100 +Subject: [PATCH] meson.build: require native gtkdoc + +this fixes: +| Run-time dependency gtk-doc found: NO (tried pkgconfig) +| +| ../git/meson.build:206:13: ERROR: Dependency "gtk-doc" not found, tried pkgconfig + +Upstream-Status: Submitted [https://github.com/flatpak/flatpak/pull/5650/commits/e5de3e46b917f830d7f81e9db6ed2a9b7d7db942] + +Signed-off-by: Markus Volk <f_l_k@t-online.de> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index f7f9372d..dccc3eb4 100644 +--- a/meson.build ++++ b/meson.build +@@ -203,7 +203,7 @@ appstream_dep = dependency('appstream', version : '>=0.12.0') + gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0') + libseccomp_dep = dependency('libseccomp', required : get_option('seccomp')) + gir_dep = dependency('gobject-introspection-1.0', version : '>=1.40.0', required : get_option('gir')) +-gtkdoc_dep = dependency('gtk-doc', required : get_option('gtkdoc')) ++gtkdoc_dep = dependency('gtk-doc', required : get_option('gtkdoc'), native : true) + build_gtk_doc = gtkdoc_dep.found() + + wayland_client = dependency('wayland-client', required : get_option('wayland_security_context')) +-- +2.43.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak_1.15.6.bb b/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak_1.15.6.bb index caa353bb8d..19f6f45fc1 100644 --- a/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak_1.15.6.bb +++ b/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak_1.15.6.bb @@ -7,6 +7,7 @@ SRC_URI = " \ gitsm://github.com/flatpak/flatpak;protocol=https;branch=main \ file://0001-flatpak-pc-add-pc_sysrootdir.patch \ file://0001-meson.build-require-for-native-wayland-scanner.patch \ + file://0001-meson.build-require-native-gtkdoc.patch \ " SRCREV = "27b11b93c2a80a91c9461bc6c7f5e9a201406041" diff --git a/meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb b/meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb index 3912e0a8d7..eb85a07e99 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb @@ -26,6 +26,6 @@ file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" EXTRA_OECONF = "--enable-debug --disable-static --disable-rebuilds --enable-compile-warnings=minimum" DEPENDS += "gtk+ glib-2.0 glib-2.0-native ruby-native intltool-native gnome-common-native autoconf-archive-native" -inherit features_check autotools pkgconfig gettext +inherit features_check autotools pkgconfig gettext gtk-doc REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime_3.2.13.bb b/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime_3.2.13.bb index d8a6c1d6cf..f51451d971 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime_3.2.13.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime_3.2.13.bb @@ -6,7 +6,7 @@ SECTION = "libs" DEPENDS = "glib-2.0 zlib" GNOMEBASEBUILDCLASS = "autotools" -inherit gnomebase gobject-introspection vala +inherit gnomebase gobject-introspection vala gtk-doc SRC_URI = "https://github.com/jstedfast/${BPN}/releases/download/${PV}/${BP}.tar.xz \ file://iconv-detect.h \ diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch deleted file mode 100644 index 52f0cd3388..0000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 0d5c0e9a75eca43667b0e29155b635e50622b66a Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 27 Feb 2015 21:55:36 +0000 -Subject: [PATCH] Revert "media-ctl: Don't install libmediactl and - - libv4l2subdev" - -This reverts commit 0911dce53b08b0df3066be2c75f67e8a314d8729. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Conflicts: - utils/media-ctl/Makefile.am - ---- -Upstream-Status: Pending - - utils/media-ctl/Makefile.am | 10 +++------- - 1 file changed, 3 insertions(+), 7 deletions(-) - -diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am -index c48c8d6..e255e16 100644 ---- a/utils/media-ctl/Makefile.am -+++ b/utils/media-ctl/Makefile.am -@@ -1,8 +1,7 @@ --noinst_LTLIBRARIES = libmediactl.la libv4l2subdev.la -- -+lib_LTLIBRARIES = libmediactl.la libv4l2subdev.la - libmediactl_la_SOURCES = libmediactl.c mediactl-priv.h --libmediactl_la_CFLAGS = -static $(LIBUDEV_CFLAGS) --libmediactl_la_LDFLAGS = -static $(LIBUDEV_LIBS) -+libmediactl_la_CFLAGS = $(LIBUDEV_CFLAGS) -+libmediactl_la_LDFLAGS = $(LIBUDEV_LIBS) - - media-bus-format-names.h: ../../include/linux/media-bus-format.h - $(AM_V_GEN) sed -e '/#define MEDIA_BUS_FMT/ ! d; s/.*FMT_//; /FIXED/ d; s/\t.*//; s/.*/{ \"&\", MEDIA_BUS_FMT_& },/;' \ -@@ -18,9 +17,6 @@ CLEANFILES = $(BUILT_SOURCES) - nodist_libv4l2subdev_la_SOURCES = $(BUILT_SOURCES) - libv4l2subdev_la_SOURCES = libv4l2subdev.c - libv4l2subdev_la_LIBADD = libmediactl.la --libv4l2subdev_la_CFLAGS = -static --libv4l2subdev_la_LDFLAGS = -static -- - mediactl_includedir=$(includedir)/mediactl - noinst_HEADERS = mediactl.h v4l2subdev.h - diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch new file mode 100644 index 0000000000..64c01e4977 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch @@ -0,0 +1,46 @@ +From 502c0302827cec3d2b2a69fb25189646685ef2ff Mon Sep 17 00:00:00 2001 +From: Fabio Estevam <festevam@denx.de> +Date: Fri, 12 Jan 2024 00:17:14 -0300 +Subject: [PATCH] keytable: meson: Restrict the installation of + 50-rc_keymap.conf + +Currently, meson tries to install 50-rc_keymap.conf even if systemd +is not used. + +Commit 01f2c6c58e6f ("keytable: restrict installation of 50-rc_keymap.conf"), +only allowed 50-rc_keymap.conf to be installed when both BPF and systemd +were used. + +Apply the same logic in meson to fix the problem. + +Signed-off-by: Fabio Estevam <festevam@denx.de> +Signed-off-by: Sean Young <sean@mess.org> +Upstream-Status: Backport [https://git.linuxtv.org/v4l-utils.git/commit/?id=a21924ec424c4744af6f2a794e0677eba35dd168] +--- + utils/keytable/meson.build | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/utils/keytable/meson.build b/utils/keytable/meson.build +index 4130a4bea514..76ce329eae8e 100644 +--- a/utils/keytable/meson.build ++++ b/utils/keytable/meson.build +@@ -69,6 +69,8 @@ ir_keytable_udev_rules = files( + install_data(ir_keytable_udev_rules, + install_dir : ir_keytable_system_dir / 'rules.d') + ++if ir_bpf_enabled ++if dep_systemd.found() + if have_udevdsyscallfilter + ir_keytable_systemd_files = files( + '50-rc_keymap.conf', +@@ -76,6 +78,8 @@ if have_udevdsyscallfilter + install_data(ir_keytable_systemd_files, + install_dir : systemd_systemdir / 'systemd-udevd.service.d') + endif ++endif ++endif + + # Install non-existing directory to create empty directory structure + # See: https://github.com/mesonbuild/meson/issues/2904 +-- +2.34.1 diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-original-patch-mediactl-pkgconfig.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-original-patch-mediactl-pkgconfig.patch deleted file mode 100644 index d52475974f..0000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-original-patch-mediactl-pkgconfig.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 320b8378ee30eb5e0fe83a8b397f822f2f88a4c1 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 1 Mar 2015 22:25:07 +0000 -Subject: [PATCH] %% original patch: mediactl-pkgconfig.patch - ---- -Upstream-Status: Pending - - utils/media-ctl/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am -index e255e16..ff7b417 100644 ---- a/utils/media-ctl/Makefile.am -+++ b/utils/media-ctl/Makefile.am -@@ -20,6 +20,7 @@ libv4l2subdev_la_LIBADD = libmediactl.la - mediactl_includedir=$(includedir)/mediactl - noinst_HEADERS = mediactl.h v4l2subdev.h - -+pkgconfig_DATA = libmediactl.pc - bin_PROGRAMS = media-ctl - media_ctl_SOURCES = media-ctl.c options.c options.h tools.h - media_ctl_LDADD = libmediactl.la libv4l2subdev.la diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-original-patch-export-mediactl-headers.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-original-patch-export-mediactl-headers.patch deleted file mode 100644 index f6fcee92ea..0000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-original-patch-export-mediactl-headers.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f7109d6b2fcb291824d795071c04a492d9fbc45b Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 1 Mar 2015 22:25:07 +0000 -Subject: [PATCH] %% original patch: export-mediactl-headers.patch - ---- -Upstream-Status: Pending - - utils/media-ctl/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am -index ff7b417..6ce656f 100644 ---- a/utils/media-ctl/Makefile.am -+++ b/utils/media-ctl/Makefile.am -@@ -17,8 +17,8 @@ CLEANFILES = $(BUILT_SOURCES) - nodist_libv4l2subdev_la_SOURCES = $(BUILT_SOURCES) - libv4l2subdev_la_SOURCES = libv4l2subdev.c - libv4l2subdev_la_LIBADD = libmediactl.la --mediactl_includedir=$(includedir)/mediactl --noinst_HEADERS = mediactl.h v4l2subdev.h -+otherincludedir = $(includedir)/mediactl -+otherinclude_HEADERS = mediactl.h v4l2subdev.h - - pkgconfig_DATA = libmediactl.pc - bin_PROGRAMS = media-ctl diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.24.1.bb b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb index f314d9b6ae..4ae1a18c9e 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.24.1.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb @@ -18,34 +18,30 @@ LDFLAGS:append = " -pthread" # Needs further investigation GLIBC_64BIT_TIME_FLAGS = "" -inherit autotools gettext pkgconfig +inherit meson gettext pkgconfig -PACKAGECONFIG ??= "media-ctl" -PACKAGECONFIG[media-ctl] = "--enable-v4l-utils,--disable-v4l-utils,," -PACKAGECONFIG[qv4l2] = ",--disable-qv4l2" -PACKAGECONFIG[qvidcap] = ",--disable-qvidcap" -PACKAGECONFIG[v4l2-tracer] = ",--disable-v4l2-tracer,json-c" +PACKAGECONFIG ??= "" +PACKAGECONFIG[qv4l2] = ",-Dqv4l2=disabled" +PACKAGECONFIG[qvidcap] = ",-Dqvidcap=disabled" +PACKAGECONFIG[v4l2-tracer] = ",-Dv4l2-tracer=disabled,json-c" SRC_URI = "\ - git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=stable-1.24 \ - file://0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch \ - file://0002-original-patch-mediactl-pkgconfig.patch \ - file://0003-original-patch-export-mediactl-headers.patch \ + git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=stable-1.26 \ + file://0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch \ file://0004-Do-not-use-getsubopt.patch \ " -SRCREV = "8799081b143627c9c09dea0c60ad3d1cc17cc848" +SRCREV = "4aee01a027923cab1e40969f56f8ba58d3e6c0d1" PV .= "+git${SRCPV}" S = "${WORKDIR}/git" -do_configure:prepend() { - cd ${S}; ./bootstrap.sh; cd - -} +EXTRA_OEMESON = "-Dudevdir=${base_libdir}/udev -Dv4l2-compliance-32=false -Dv4l2-ctl-32=false" -EXTRA_OECONF = "--enable-shared --with-udevdir=${base_libdir}/udev \ - --disable-v4l2-compliance-32 --disable-v4l2-ctl-32" +# Disable the erroneous installation of gconv-modules that would break glib +# like it is done in Debian and ArchLinux. +EXTRA_OEMESON += "-Dgconv=disabled" VIRTUAL-RUNTIME_ir-keytable-keymaps ?= "rc-keymaps" diff --git a/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb b/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb index 07e2e29417..5b1d021e36 100644 --- a/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb @@ -16,7 +16,10 @@ SRC_URI[sha256sum] = "f21accdadb1bb328ea3f8a13fc34d715baac6e2db66065898346322c72 DEPENDS += "bison-native flex-native wget-native gawk-native" -inherit autotools-brokensep +inherit autotools-brokensep update-alternatives +ALTERNATIVE_PRIORITY = "50" +ALTERNATIVE:${PN}-yang = "ietf-interfaces " +ALTERNATIVE_LINK_NAME[ietf-interfaces] = "${datadir}/yang/ietf-interfaces.yang" EXTRA_OECONF = "ac_cv_path_SH=/bin/sh" diff --git a/meta-openembedded/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb b/meta-openembedded/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb index 30df8e0648..85012bcfb3 100644 --- a/meta-openembedded/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb +++ b/meta-openembedded/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb @@ -15,7 +15,7 @@ SRC_URI = " \ " SRC_URI[sha256sum] = "089db78d7ac982354bdbf39d973baf09581e6904ac4c92a98c5caadb3de44680" -inherit autotools pkgconfig +inherit autotools pkgconfig gtk-doc EXTRA_OECONF = " \ --without-xml2-config \ diff --git a/meta-openembedded/meta-oe/recipes-support/rng-tools/rng-tools/default b/meta-openembedded/meta-oe/recipes-support/rng-tools/rng-tools/default new file mode 100644 index 0000000000..b9f8e03635 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/rng-tools/rng-tools/default @@ -0,0 +1 @@ +EXTRA_ARGS="-r /dev/hwrng" diff --git a/meta-openembedded/meta-oe/recipes-support/rng-tools/rng-tools/init b/meta-openembedded/meta-oe/recipes-support/rng-tools/rng-tools/init new file mode 100644 index 0000000000..13f0ecd37c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/rng-tools/rng-tools/init @@ -0,0 +1,42 @@ +#!/bin/sh +# +# This is an init script for openembedded +# Copy it to @SYSCONFDIR@/init.d/rng-tools and type +# > update-rc.d rng-tools defaults 60 +# + +rngd=@SBINDIR@/rngd +test -x "$rngd" || exit 1 + +[ -r @SYSCONFDIR@/default/rng-tools ] && . "@SYSCONFDIR@/default/rng-tools" + +case "$1" in + start) + echo -n "Starting random number generator daemon" + start-stop-daemon -S -q -x $rngd -- $EXTRA_ARGS + echo "." + ;; + stop) + echo -n "Stopping random number generator daemon" + start-stop-daemon -K -q -n rngd + echo "." + ;; + reload|force-reload) + echo -n "Signalling rng daemon restart" + start-stop-daemon -K -q -s 1 -x $rngd + start-stop-daemon -K -q -s 1 -x $rngd + ;; + restart) + echo -n "Stopping random number generator daemon" + start-stop-daemon -K -q -n rngd + echo "." + echo -n "Starting random number generator daemon" + start-stop-daemon -S -q -x $rngd -- $EXTRA_ARGS + echo "." + ;; + *) + echo "Usage: @SYSCONFDIR@/init.d/rng-tools {start|stop|reload|restart|force-reload}" + exit 1 +esac + +exit 0 diff --git a/meta-openembedded/meta-oe/recipes-support/rng-tools/rng-tools/rng-tools.service b/meta-openembedded/meta-oe/recipes-support/rng-tools/rng-tools/rng-tools.service new file mode 100644 index 0000000000..5ae2fba215 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/rng-tools/rng-tools/rng-tools.service @@ -0,0 +1,32 @@ +[Unit] +Description=Hardware RNG Entropy Gatherer Daemon +DefaultDependencies=no +Conflicts=shutdown.target +Before=sysinit.target shutdown.target +ConditionVirtualization=!container + +[Service] +EnvironmentFile=-@SYSCONFDIR@/default/rng-tools +ExecStart=@SBINDIR@/rngd -f $EXTRA_ARGS +CapabilityBoundingSet=CAP_SYS_ADMIN +IPAddressDeny=any +LockPersonality=yes +MemoryDenyWriteExecute=yes +NoNewPrivileges=yes +PrivateTmp=yes +ProtectControlGroups=yes +ProtectHome=yes +ProtectHostname=yes +ProtectKernelModules=yes +ProtectKernelLogs=yes +ProtectSystem=strict +RestrictAddressFamilies=AF_UNIX +RestrictNamespaces=yes +RestrictRealtime=yes +RestrictSUIDSGID=yes +SystemCallArchitectures=native +SystemCallErrorNumber=EPERM +SystemCallFilter=@system-service + +[Install] +WantedBy=sysinit.target diff --git a/meta-openembedded/meta-oe/recipes-support/rng-tools/rng-tools_6.16.bb b/meta-openembedded/meta-oe/recipes-support/rng-tools/rng-tools_6.16.bb new file mode 100644 index 0000000000..f0aa3ff93f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/rng-tools/rng-tools_6.16.bb @@ -0,0 +1,69 @@ +SUMMARY = "Random number generator daemon" +DESCRIPTION = "Check and feed random data from hardware device to kernel" +HOMEPAGE = "https://github.com/nhorman/rng-tools" +BUGTRACKER = "https://github.com/nhorman/rng-tools/issues" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "openssl libcap" + +SRC_URI = "git://github.com/nhorman/rng-tools.git;branch=master;protocol=https \ + file://init \ + file://default \ + file://rng-tools.service \ + " +SRCREV = "e061c313b95890eb5fa0ada0cd6eec619dafdfe2" + +S = "${WORKDIR}/git" + +inherit autotools update-rc.d systemd pkgconfig + +EXTRA_OECONF = "--without-rtlsdr" + +PACKAGECONFIG ??= "libjitterentropy" +PACKAGECONFIG:libc-musl = "libargp libjitterentropy" + +PACKAGECONFIG[libargp] = "--with-libargp,--without-libargp,argp-standalone," +PACKAGECONFIG[libjitterentropy] = "--enable-jitterentropy,--disable-jitterentropy,libjitterentropy" +PACKAGECONFIG[libp11] = "--with-pkcs11,--without-pkcs11,libp11 openssl" +PACKAGECONFIG[nistbeacon] = "--with-nistbeacon,--without-nistbeacon,curl libxml2" +PACKAGECONFIG[qrypt] = "--with-qrypt,--without-qrypt,curl" + +INITSCRIPT_PACKAGES = "${PN}-service" +INITSCRIPT_NAME:${PN}-service = "rng-tools" +INITSCRIPT_PARAMS:${PN}-service = "start 03 2 3 4 5 . stop 30 0 6 1 ." + +SYSTEMD_PACKAGES = "${PN}-service" +SYSTEMD_SERVICE:${PN}-service = "rng-tools.service" + +CFLAGS += " -DJENT_CONF_ENABLE_INTERNAL_TIMER " + +PACKAGES =+ "${PN}-service" + +FILES:${PN}-service += " \ + ${sysconfdir}/init.d/rng-tools \ + ${sysconfdir}/default/rng-tools \ +" + +# Refer autogen.sh in rng-tools +do_configure:prepend() { + cp ${S}/README.md ${S}/README +} + +do_install:append() { + install -Dm 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/rng-tools + install -Dm 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rng-tools + install -Dm 0644 ${WORKDIR}/rng-tools.service \ + ${D}${systemd_system_unitdir}/rng-tools.service + sed -i \ + -e 's,@SYSCONFDIR@,${sysconfdir},g' \ + -e 's,@SBINDIR@,${sbindir},g' \ + ${D}${sysconfdir}/init.d/rng-tools \ + ${D}${systemd_system_unitdir}/rng-tools.service + + if [ "${@bb.utils.contains('PACKAGECONFIG', 'nistbeacon', 'yes', 'no', d)}" = "yes" ]; then + sed -i \ + -e '/^IPAddressDeny=any/d' \ + -e '/^RestrictAddressFamilies=/ s/$/ AF_INET AF_INET6/' \ + ${D}${systemd_system_unitdir}/rng-tools.service + fi +} diff --git a/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools/0001-Replace-LFS-functions.patch b/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools/0001-Replace-LFS-functions.patch deleted file mode 100644 index a9f1c8601d..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools/0001-Replace-LFS-functions.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 289105253fbf342fd22cbcde2ccc1127f732ab09 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 7 Jul 2023 14:21:17 -0700 -Subject: [PATCH] Replace LFS functions - -The original functions are able to consume 64bit off_t now a days -therefore *64 equivalents can be replaced, as a side it fixes build with -musl. - -Upstream-Status: Submitted [https://github.com/jthornber/thin-provisioning-tools/pull/267] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/file_utils.rs | 10 +++++----- - src/io_engine/base.rs | 4 ++-- - src/thin/trim.rs | 2 +- - 3 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/src/file_utils.rs b/src/file_utils.rs -index 0ca3c0f..d2b3ee9 100644 ---- a/src/file_utils.rs -+++ b/src/file_utils.rs -@@ -11,18 +11,18 @@ fn test_bit(mode: u32, flag: u32) -> bool { - (mode & libc::S_IFMT) == flag - } - --fn is_file_or_blk_(info: &libc::stat64) -> bool { -+fn is_file_or_blk_(info: &libc::stat) -> bool { - test_bit(info.st_mode, libc::S_IFBLK) || test_bit(info.st_mode, libc::S_IFREG) - } - - // wrapper of libc::stat64 --fn libc_stat64(path: &Path) -> io::Result<libc::stat64> { -+fn libc_stat64(path: &Path) -> io::Result<libc::stat> { - let c_path = std::ffi::CString::new(path.as_os_str().as_bytes()) - .map_err(|e| io::Error::new(io::ErrorKind::InvalidInput, e.to_string()))?; - - unsafe { -- let mut st: libc::stat64 = std::mem::zeroed(); -- let r = libc::stat64(c_path.as_ptr(), &mut st); -+ let mut st: libc::stat = std::mem::zeroed(); -+ let r = libc::stat(c_path.as_ptr(), &mut st); - if r == 0 { - Ok(st) - } else { -@@ -56,7 +56,7 @@ fn get_device_size<P: AsRef<Path>>(path: P) -> io::Result<u64> { - let fd = file.as_raw_fd(); - let mut cap = 0u64; - unsafe { -- if libc::ioctl(fd, BLKGETSIZE64 as libc::c_ulong, &mut cap) == 0 { -+ if libc::ioctl(fd, BLKGETSIZE64 as libc::c_int, &mut cap) == 0 { - Ok(cap) - } else { - Err(io::Error::last_os_error()) -diff --git a/src/io_engine/base.rs b/src/io_engine/base.rs -index 725ebf7..db6209f 100644 ---- a/src/io_engine/base.rs -+++ b/src/io_engine/base.rs -@@ -115,7 +115,7 @@ pub trait VectoredIo { - - fn read_vectored_at(file: &File, bufs: &mut [libc::iovec], pos: u64) -> io::Result<usize> { - let ptr = bufs.as_ptr(); -- let ret = match unsafe { libc::preadv64(file.as_raw_fd(), ptr, bufs.len() as i32, pos as i64) } -+ let ret = match unsafe { libc::preadv(file.as_raw_fd(), ptr, bufs.len() as i32, pos as i64) } - { - -1 => return Err(io::Error::last_os_error()), - n => n, -@@ -125,7 +125,7 @@ fn read_vectored_at(file: &File, bufs: &mut [libc::iovec], pos: u64) -> io::Resu - - fn write_vectored_at(file: &File, bufs: &[libc::iovec], pos: u64) -> io::Result<usize> { - let ptr = bufs.as_ptr(); -- let ret = match unsafe { libc::pwritev64(file.as_raw_fd(), ptr, bufs.len() as i32, pos as i64) } -+ let ret = match unsafe { libc::pwritev(file.as_raw_fd(), ptr, bufs.len() as i32, pos as i64) } - { - -1 => return Err(io::Error::last_os_error()), - n => n, -diff --git a/src/thin/trim.rs b/src/thin/trim.rs -index 3d938ca..91a53dd 100644 ---- a/src/thin/trim.rs -+++ b/src/thin/trim.rs -@@ -135,7 +135,7 @@ impl<'a> Iterator for RangeIterator<'a> { - const BLKDISCARD: u32 = 0x1277; - fn ioctl_blkdiscard(fd: i32, range: &[u64; 2]) -> std::io::Result<()> { - unsafe { -- if libc::ioctl(fd, BLKDISCARD as libc::c_ulong, range) == 0 { -+ if libc::ioctl(fd, BLKDISCARD as libc::c_int, range) == 0 { - Ok(()) - } else { - Err(std::io::Error::last_os_error()) --- -2.41.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.0.9.bb b/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.0.9.bb index b643ad6dc8..b79fdb1a0b 100644 --- a/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.0.9.bb +++ b/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.0.9.bb @@ -10,7 +10,6 @@ S = "${WORKDIR}/git" SRC_URI = " \ git://github.com/jthornber/thin-provisioning-tools;branch=main;protocol=https \ " -SRC_URI:append:libc-musl = " file://0001-Replace-LFS-functions.patch" SRCREV = "1d60839b0a920df6476712b80f933854fb32e160" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-apispec_6.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-apispec_6.4.0.bb index 6b9f704a68..a48e1cfaee 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-apispec_6.3.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-apispec_6.4.0.bb @@ -1,10 +1,10 @@ SUMMARY = "A pluggable API specification generator. Currently supports the OpenAPI Specification (f.k.a. the Swagger specification)." HOMEPAGE = "https://github.com/marshmallow-code/apispec" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=824d596e050c0d5e3361efb438425945" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3d9c303644a2e62578f0347748a80358" inherit pypi setuptools3 -SRC_URI[sha256sum] = "b38e4479916d43f2b1e88ce15fc2fae93adf2e8d55cb59ec74ac66a827941483" +SRC_URI[sha256sum] = "42b8a6833cf154c9dbd22d006b56bf9c49c972d32d24fe716fd734e0f6b739b8" RDEPENDS:${PN} += "python3-packaging" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-engineio_4.8.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-engineio_4.8.2.bb index f88a3acf1e..9dad138ea2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-engineio_4.8.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-engineio_4.8.2.bb @@ -17,4 +17,4 @@ RDEPENDS:${PN} += " \ python3-asyncio \ " -SRC_URI[sha256sum] = "fadc39c66348f96476d8dc2d7aaee7ea0a39d96e333217f5321300677b980121" +SRC_URI[sha256sum] = "f8609e3afdda318fdc336b4ba2de8dd397bb8f9b8a1b43e56c27330e32c2e34c" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-hash_0.5.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-hash_0.6.0.bb index 683d84761c..77e6565272 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-hash_0.5.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-hash_0.6.0.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=3d7bdfe69b1ffbde073ca6e96f5c53f7" -SRC_URI[sha256sum] = "1b5f10eca7765cc385e1430eefc5ced6e2e463bb18d1365510e2e539c1a6fe4e" +SRC_URI[sha256sum] = "ae72889e60db6acbb3872c288cfa02ed157f4c27630fcd7f9c8442302c31e478" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.112.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.113.0.bb index b1614b854f..4e6bb7daf6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.112.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.113.0.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/googleapis/google-api-python-client" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI[sha256sum] = "c3bcb5fd70d57f4c94b30c0dbeade53c216febfbf1d771eeb1a2fa74bd0d6756" +SRC_URI[sha256sum] = "bcffbc8ffbad631f699cf85aa91993f3dc03060b234ca9e6e2f9135028bd9b52" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.26.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.26.2.bb index 1a4913b718..9bd0926ca6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.26.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.26.2.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" inherit pypi setuptools3 -SRC_URI[sha256sum] = "54385acca5c0fbdda510cd8585ba6f3fcb06eeecf8a6ecca39d3ee148b092590" +SRC_URI[sha256sum] = "97327dbbf58cccb58fc5a1712bba403ae76668e64814eb30f7316f7e27126b81" RDEPENDS:${PN} += "\ ${PYTHON_PN}-asyncio \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-marshmallow_3.20.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-marshmallow_3.20.2.bb index f0ca630ccd..c08aec5bec 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-marshmallow_3.20.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-marshmallow_3.20.2.bb @@ -3,16 +3,12 @@ DESCRIPTION = "Marshmallow is an ORM/ODM/framework-agnostic library for converti HOMEPAGE = "https://github.com/marshmallow-code/marshmallow" LICENSE = "MIT" LIC_FILES_CHKSUM = "\ - file://LICENSE;md5=5bccd400dedfa74364481e56aacc0b4a \ + file://LICENSE;md5=653847350fed2e0e7b02791a35b98d59 \ file://docs/license.rst;md5=13da439ad060419fb7cf364523017cfb" -SRC_URI = "git://github.com/marshmallow-code/marshmallow.git;protocol=https;branch=dev" +SRC_URI[sha256sum] = "4c1daff273513dc5eb24b219a8035559dc573c8f322558ef85f5438ddd1236dd" -SRCREV = "dda9a8014dfe1bcb35e21307cfd5a8e19615a284" - -S = "${WORKDIR}/git" - -inherit setuptools3 +inherit setuptools3 pypi PIP_INSTALL_PACKAGE = "marshmallow" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_4.25.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_4.25.2.bb index 3c770e41d3..5333d306bd 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_4.25.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_4.25.2.bb @@ -6,7 +6,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=53dbfa56f61b90215a9f8f0d527c043d" inherit pypi setuptools3 -SRC_URI[sha256sum] = "57d65074b4f5baa4ab5da1605c02be90ac20c8b40fb137d6a8df9f416b0d0ce2" +SRC_URI[sha256sum] = "fe599e175cb347efc8ee524bcd4b902d11f7262c0e569ececcb89995c15f0a5e" # http://errors.yoctoproject.org/Errors/Details/184715/ # Can't find required file: ../src/google/protobuf/descriptor.proto diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_5.10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_5.11.0.bb index 68168bb635..72471e956a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_5.10.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_5.11.0.bb @@ -9,7 +9,7 @@ inherit pypi python_setuptools_build_meta PYPI_PACKAGE = "python-socketio" -SRC_URI[sha256sum] = "01c616946fa9f67ed5cc3d1568e1c4940acfc64aeeb9ff621a53e80cabeb748a" +SRC_URI[sha256sum] = "b03186e04b942088781f6286c13604a853e5e35ed59158c51ff7af22fa032e6f" PACKAGECONFIG ?= "asyncio_client client" PACKAGECONFIG[asyncio_client] = ",,,${PYTHON_PN}-aiohttp ${PYTHON_PN}-websockets" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-web3_6.13.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-web3_6.14.0.bb index 0f0682fca4..177c6fc030 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-web3_6.13.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-web3_6.14.0.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=373fede350846fdffd23648fba504635" -SRC_URI[sha256sum] = "769ab3cfffea69c6b495c63a1aecdb522651c0304260fc25467a886d0be622e2" +SRC_URI[sha256sum] = "a3726289da9eff2ce30f9b1b49ec59e9245216f7aecbfa2007f73dbe94999717" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_4.19.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_4.19.0.bb index 02e4ef956a..e4d8b7b4de 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_4.19.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_4.19.0.bb @@ -4,7 +4,7 @@ LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "libxml-parser-perl-native exo gdk-pixbuf libxfce4ui libnotify xfce4-panel udev" -inherit xfce gobject-introspection features_check mime-xdg perlnative +inherit xfce gobject-introspection features_check mime-xdg perlnative gtk-doc # xfce4 depends on libwnck3, gtk+3 and libepoxy need to be built with x11 PACKAGECONFIG. # cairo would at least needed to be built with xlib. |