diff options
82 files changed, 644 insertions, 264 deletions
diff --git a/meta-filesystems/conf/include/non-repro-meta-filesystems.inc b/meta-filesystems/conf/include/non-repro-meta-filesystems.inc new file mode 100644 index 0000000000..4975593277 --- /dev/null +++ b/meta-filesystems/conf/include/non-repro-meta-filesystems.inc @@ -0,0 +1,9 @@ +# List of known non-reproducible package of the meta-filesystems layer +# Please keep this list sorted +KNOWN_NON_REPRO_META_FILESYSTEMS = " \ + e2tools-ptest \ + xfsprogs-doc \ + zfs \ + zfs-dbg \ + zfs-dev \ +" diff --git a/meta-filesystems/conf/layer.conf b/meta-filesystems/conf/layer.conf index c2263c899b..2e220bfe24 100644 --- a/meta-filesystems/conf/layer.conf +++ b/meta-filesystems/conf/layer.conf @@ -15,4 +15,4 @@ LAYERVERSION_filesystems-layer = "1" LAYERDEPENDS_filesystems-layer = "core openembedded-layer networking-layer" -LAYERSERIES_COMPAT_filesystems-layer = "scarthgap" +LAYERSERIES_COMPAT_filesystems-layer = "scarthgap styhead" diff --git a/meta-gnome/conf/include/non-repro-meta-gnome.inc b/meta-gnome/conf/include/non-repro-meta-gnome.inc new file mode 100755 index 0000000000..553bc32cc6 --- /dev/null +++ b/meta-gnome/conf/include/non-repro-meta-gnome.inc @@ -0,0 +1,13 @@ +# List of known non-reproducible package of the meta-gnome layer +# Please keep this list sorted +KNOWN_NON_REPRO_META_GNOME = " \ + geary \ + geary-dbg \ + gegl-dev \ + gimp \ + gimp-dbg \ + gnome-terminal-src \ + grilo-src \ + gtk-vnc-src \ + ibus \ +" diff --git a/meta-gnome/conf/layer.conf b/meta-gnome/conf/layer.conf index 75764e64c7..89659592ee 100644 --- a/meta-gnome/conf/layer.conf +++ b/meta-gnome/conf/layer.conf @@ -17,7 +17,7 @@ LAYERVERSION_gnome-layer = "1" LAYERDEPENDS_gnome-layer = "core openembedded-layer networking-layer meta-python" -LAYERSERIES_COMPAT_gnome-layer = "scarthgap" +LAYERSERIES_COMPAT_gnome-layer = "scarthgap styhead" SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += "\ faenza-icon-theme->gdk-pixbuf \ diff --git a/meta-gnome/dynamic-layers/meta-security/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_46.0.bb b/meta-gnome/dynamic-layers/meta-security/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_46.1.bb index b9ee0e60d5..634b37971e 100644 --- a/meta-gnome/dynamic-layers/meta-security/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_46.0.bb +++ b/meta-gnome/dynamic-layers/meta-security/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_46.1.bb @@ -8,7 +8,7 @@ inherit gnomebase gettext gsettings features_check REQUIRED_DISTRO_FEATURES = "opengl" -SRC_URI[archive.sha256sum] = "e75ce17c12a6d39254dc309c31514e5ef15763f136612d641c5f6f4445e00ac4" +SRC_URI[archive.sha256sum] = "7c62a4281fdfa9522110affbf75d09973035f2adc7fa4577511d733186beb68f" DEPENDS = " \ asciidoc-native \ diff --git a/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_46.0.bb b/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_46.1.bb index 707c4b583f..eac768c8f5 100644 --- a/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_46.0.bb +++ b/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_46.1.bb @@ -22,7 +22,7 @@ inherit gnomebase gsettings gtk-icon-cache gettext features_check upstream-versi REQUIRED_DISTRO_FEATURES = "x11 opengl" -SRC_URI[archive.sha256sum] = "5e21960c174bd8606d9089bf79c70f31070ab4837919878b00db2f14af9fe718" +SRC_URI[archive.sha256sum] = "9861ff7b8abd5b7b20690ba55eb7542c7ec534b566269e29b5b1e858c1610897" do_install:prepend() { sed -i -e 's|${S}/src|${TARGET_DBGSRC_DIR}/src|g' ${B}/src/gcal-enum-types.h diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch index 4ae923f876..7d17817bc0 100644 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch @@ -1,4 +1,4 @@ -From 1a48df2a8da44410bbd767c2420d363f6180c79a Mon Sep 17 00:00:00 2001 +From 8e542784b8ca49c655df0f251a1a1dec724a522e Mon Sep 17 00:00:00 2001 From: Markus Volk <f_l_k@t-online.de> Date: Mon, 18 Mar 2024 05:50:21 +0100 Subject: [PATCH] Add meson option to pass sysroot @@ -13,16 +13,16 @@ Upstream-Status: Inappropriate [OE specific] 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meson_options.txt b/meson_options.txt -index e53d6e3f3..8fae4c824 100644 +index f415a7e..8966632 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,4 @@ +option('oe_sysroot', type: 'string', value: '', description: 'Directory for OE-sysroot') option('deprecated-declarations', type: 'feature', value: 'disabled', description: 'build with deprecated declaration warnings') option('documentation', type: 'boolean', value: false, description: 'build documentation') - option('ibus', type: 'boolean', value: true, description: 'build with IBus support') + option('location-services', type: 'feature', value: 'disabled', description: 'build with location services') diff --git a/panels/background/meson.build b/panels/background/meson.build -index 6ced050f9..df1f80896 100644 +index 6ced050..df1f808 100644 --- a/panels/background/meson.build +++ b/panels/background/meson.build @@ -24,7 +24,7 @@ common_sources += gnome.mkenums_simple( @@ -35,7 +35,7 @@ index 6ced050f9..df1f80896 100644 common_sources += gnome.mkenums( diff --git a/panels/system/meson.build b/panels/system/meson.build -index 4fee82210..979332a0e 100644 +index 4fee822..979332a 100644 --- a/panels/system/meson.build +++ b/panels/system/meson.build @@ -73,7 +73,7 @@ sources += gnome.compile_resources( @@ -47,6 +47,3 @@ index 4fee82210..979332a0e 100644 'datetime/cc-datetime-page.h' ) --- -2.44.0 - diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.0.1.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.1.bb index de11239ed5..87daec0c25 100644 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.0.1.bb +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.1.bb @@ -37,16 +37,15 @@ inherit gtk-icon-cache pkgconfig gnomebase gsettings gettext upstream-version-is REQUIRED_DISTRO_FEATURES += "opengl polkit pulseaudio systemd x11" -SRC_URI = "gitsm://gitlab.gnome.org/GNOME/gnome-control-center.git;protocol=https;nobranch=1" SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch" - -S = "${WORKDIR}/git" -SRCREV = "005f40dcfa464f113a1c95f97673bc5505fc15ad" +SRC_URI[archive.sha256sum] = "81792423019deda1d2a074c1ecf6a7e6ef3172c09cbe6f4d7995a4b5dea28312" PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" PACKAGECONFIG[cups] = ",,cups,cups" PACKAGECONFIG[ibus] = "-Dibus=true, -Dibus=false, ibus" PACKAGECONFIG[wayland] = "-Dwayland=true, -Dwayland=false, wayland" +PACKAGECONFIG[file-share] = ",,,gnome-user-share" +PACKAGECONFIG[media-share] = ",,,rygel-meta tumbler" EXTRA_OEMESON += "-Doe_sysroot=${STAGING_DIR_HOST}" @@ -72,4 +71,4 @@ FILES:${PN} += " \ FILES:${PN}-dev += "${datadir}/gettext" -RDEPENDS:${PN} += "gsettings-desktop-schemas tecla system-config-printer cups-pk-helper ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'gnome-user-share', '' , d)}" +RDEPENDS:${PN} += "gsettings-desktop-schemas tecla system-config-printer cups-pk-helper" diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_46.0.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_46.1.bb index eff5fecffe..b79f70c60c 100644 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_46.0.bb +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_46.1.bb @@ -6,7 +6,7 @@ inherit gnomebase gettext gsettings features_check REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam gobject-introspection-data" -SRC_URI[archive.sha256sum] = "d8138f88cd92df9f932309149c236fbdd77c1bc095445036ab7eb0ecda53c01a" +SRC_URI[archive.sha256sum] = "c5ba50700da77a986f0060beedacfc017e7ec82283f2a6384842a0807bc4553f" EXTRA_OEMESON += " \ -Dextension_set=all \ diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.0.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.1.bb index 907cfdf678..ed86cbcb6a 100644 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.0.bb +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.1.bb @@ -32,7 +32,7 @@ GIR_MESON_OPTION = "" # gobject-introspection is mandatory and cannot be configured REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" -SRC_URI[archive.sha256sum] = "6bc41340b6de05774e97cfe20feba86e2b3cc9c8139118f24bd84ac63e82b53e" +SRC_URI[archive.sha256sum] = "64f999844c101e63bf294d45b138de56319ad2f326282721aad0fa860653b369" SRC_URI += "file://0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch" PACKAGECONFIG ??= "bluetooth nm ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" diff --git a/meta-gnome/recipes-gnome/libgweather/libgweather4_4.4.2.bb b/meta-gnome/recipes-gnome/libgweather/libgweather4_4.4.2.bb index acf2885281..e0c8724a31 100644 --- a/meta-gnome/recipes-gnome/libgweather/libgweather4_4.4.2.bb +++ b/meta-gnome/recipes-gnome/libgweather/libgweather4_4.4.2.bb @@ -28,3 +28,7 @@ FILES:${PN} += " \ ${datadir}/libgweather-4 \ ${libdir}/libgweather-4 \ " + +do_configure:prepend() { + cp -f ${STAGING_LIBDIR}/girepository-1.0/GLib*typelib ${STAGING_LIBDIR_NATIVE}/girepository-1.0/ +} diff --git a/meta-gnome/recipes-gnome/msgraph/msgraph_0.2.1.bb b/meta-gnome/recipes-gnome/msgraph/msgraph_0.2.1.bb index 4c11a8d136..9b4a8a0352 100644 --- a/meta-gnome/recipes-gnome/msgraph/msgraph_0.2.1.bb +++ b/meta-gnome/recipes-gnome/msgraph/msgraph_0.2.1.bb @@ -2,7 +2,8 @@ SUMMARY = "libmsgraph is a GLib-based library for accessing online serive APIs u LICENSE = "LGPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=3000208d539ec061b899bce1d9ce9404" -inherit gnomebase gobject-introspection gi-docgen +inherit gnomebase gobject-introspection gi-docgen features_check +REQUIRED_DISTRO_FEATURES = "opengl" SRC_URI[archive.sha256sum] = "e0e59eaa8ae3e0a48ec0a6c2fed0470856a709248e9212b6a1d037de5792ecbb" diff --git a/meta-gnome/recipes-gnome/mutter/mutter_46.0.bb b/meta-gnome/recipes-gnome/mutter/mutter_46.1.bb index d14f161f14..b60ffefb0a 100644 --- a/meta-gnome/recipes-gnome/mutter/mutter_46.0.bb +++ b/meta-gnome/recipes-gnome/mutter/mutter_46.1.bb @@ -24,7 +24,7 @@ DEPENDS = " \ inherit gnomebase gsettings gobject-introspection gettext features_check -SRC_URI[archive.sha256sum] = "bb3f7d77aebdea9d317d3f5ef03868e4e7969da423ac495e33a16d61db2c9373" +SRC_URI[archive.sha256sum] = "63b2660dd0fa193fa662c80ee12eb8b16f2b8c3bc3896366200c79943824d51d" # x11 is still manadatory - see meson.build REQUIRED_DISTRO_FEATURES = "wayland x11 polkit" diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_45.1.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_46.1.bb index 9c0d154ec8..4092ff9dd2 100644 --- a/meta-gnome/recipes-gnome/nautilus/nautilus_45.1.bb +++ b/meta-gnome/recipes-gnome/nautilus/nautilus_46.1.bb @@ -22,7 +22,7 @@ DEPENDS = " \ inherit gnomebase gsettings gobject-introspection gi-docgen gettext features_check mime-xdg gtk-icon-cache -SRC_URI[archive.sha256sum] = "23bdaa9a85466c5937a89daddd080ed03bcc2b49e8b64af607206353bde82fe3" +SRC_URI[archive.sha256sum] = "cc1a5fdf1dd72f92e9e3f3c7ad263709a0de5391a895be9344f6a67f43887bd7" REQUIRED_DISTRO_FEATURES = "x11 opengl gobject-introspection-data" diff --git a/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gnome_46.0.bb b/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gnome_46.1.bb index c5040571cd..847907a5be 100644 --- a/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gnome_46.0.bb +++ b/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gnome_46.1.bb @@ -21,7 +21,7 @@ inherit gnomebase pkgconfig gsettings features_check REQUIRED_DISTRO_FEATURES = "polkit" -SRC_URI[archive.sha256sum] = "5d2d533597d280b7370b8f74faa40097b292b0036dbd59166e1312230500bb8b" +SRC_URI[archive.sha256sum] = "7e8d9623e9d96a89c0897616827cd441dcf2832927d38f135c722552b1172aa1" PACKAGECONFIG ?= "screenshot screencast ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" PACKAGECONFIG[wayland] = ",,wayland-native" diff --git a/meta-initramfs/conf/include/non-repro-meta-initramfs.inc b/meta-initramfs/conf/include/non-repro-meta-initramfs.inc new file mode 100755 index 0000000000..8f01f5624b --- /dev/null +++ b/meta-initramfs/conf/include/non-repro-meta-initramfs.inc @@ -0,0 +1,23 @@ +# List of known non-reproducible package of the meta-initramfs layer +# Please keep this list sorted +KNOWN_NON_REPRO_META_INITRAMFS = " \ + kexecboot-klibc \ + kexecboot-klibc-dbg \ + kexec-klibc \ + kexec-tools-klibc-dbg \ + mtdinfo-klibc \ + ubiattach-klibc \ + ubiblock-klibc \ + ubicrc32-klibc \ + ubidetach-klibc \ + ubiformat-klibc \ + ubimkvol-klibc \ + ubinfo-klibc \ + ubinize-klibc \ + ubirename-klibc \ + ubirmvol-klibc \ + ubirsvol-klibc \ + ubiupdatevol-klibc \ + ubi-utils-klibc-dbg \ + vmcore-dmesg-klibc \ +" diff --git a/meta-initramfs/conf/layer.conf b/meta-initramfs/conf/layer.conf index 25023cfc64..93ae527d42 100644 --- a/meta-initramfs/conf/layer.conf +++ b/meta-initramfs/conf/layer.conf @@ -16,7 +16,7 @@ BBFILE_PATTERN_meta-initramfs := "^${LAYERDIR}/" BBFILE_PRIORITY_meta-initramfs = "5" LAYERDEPENDS_meta-initramfs = "core" -LAYERSERIES_COMPAT_meta-initramfs = "scarthgap" +LAYERSERIES_COMPAT_meta-initramfs = "scarthgap styhead" SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ dracut->virtual/kernel \ diff --git a/meta-multimedia/conf/include/non-repro-meta-multimedia.inc b/meta-multimedia/conf/include/non-repro-meta-multimedia.inc new file mode 100755 index 0000000000..b02de42eb9 --- /dev/null +++ b/meta-multimedia/conf/include/non-repro-meta-multimedia.inc @@ -0,0 +1,15 @@ +# List of known non-reproducible package of the meta-multimedia layer +# Please keep this list sorted +KNOWN_NON_REPRO_META_MULTIMEDIA = " \ + crossguid \ + libcamera \ + libcamera-dbg \ + libcamera-src \ + libgssdp-1.6-src \ + libgupnp-1.6-src \ + libsquish-staticdev \ + oscam \ + oscam-dbg \ + oscam-src \ + rtmpdump-staticdev \ +" diff --git a/meta-multimedia/conf/layer.conf b/meta-multimedia/conf/layer.conf index 82e6f3629f..b7866cbe8c 100644 --- a/meta-multimedia/conf/layer.conf +++ b/meta-multimedia/conf/layer.conf @@ -31,4 +31,4 @@ LAYERVERSION_multimedia-layer = "1" LAYERDEPENDS_multimedia-layer = "core openembedded-layer meta-python" -LAYERSERIES_COMPAT_multimedia-layer = "scarthgap" +LAYERSERIES_COMPAT_multimedia-layer = "scarthgap styhead" diff --git a/meta-multimedia/recipes-connectivity/gupnp/gssdp/0001-gssdp-enums.c.template-use-basename-instead-of-filen.patch b/meta-multimedia/recipes-connectivity/gupnp/gssdp/0001-gssdp-enums.c.template-use-basename-instead-of-filen.patch new file mode 100644 index 0000000000..63126520e9 --- /dev/null +++ b/meta-multimedia/recipes-connectivity/gupnp/gssdp/0001-gssdp-enums.c.template-use-basename-instead-of-filen.patch @@ -0,0 +1,32 @@ +From 78270f9159a9ec7284ca39a2fbb1774347942de1 Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Wed, 24 Apr 2024 19:08:43 +0200 +Subject: [PATCH] gssdp-enums.c.template: use basename instead of filename + +This would prevent the build path from leaking into the source code. + +Signed-off-by: Markus Volk <f_l_k@t-online.de> + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gssdp/-/merge_requests/13] +--- + libgssdp/gssdp-enums.c.template | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libgssdp/gssdp-enums.c.template b/libgssdp/gssdp-enums.c.template +index 600d426..2dfb859 100644 +--- a/libgssdp/gssdp-enums.c.template ++++ b/libgssdp/gssdp-enums.c.template +@@ -3,8 +3,8 @@ + + /*** END file-header ***/ + /*** BEGIN file-production ***/ +-/* enumerations from "@filename@" */ +-#include "@filename@" ++/* enumerations from "@basename@" */ ++#include "@basename@" + /*** END file-production ***/ + /*** BEGIN value-header ***/ + GType +-- +2.44.0 + diff --git a/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.6.3.bb b/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.6.3.bb index f2e27622cc..e6ea472709 100644 --- a/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.6.3.bb +++ b/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.6.3.bb @@ -6,6 +6,7 @@ BUGTRACKER = "https://gitlab.gnome.org/GNOME/gssdp/-/issues" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" +SRC_URI:append = " file://0001-gssdp-enums.c.template-use-basename-instead-of-filen.patch" SRC_URI[archive.sha256sum] = "2fedb5afdb22cf14d5498a39a773ca89788a250fcf70118783df821e1f3f3446" GTKDOC_MESON_OPTION = 'gtk_doc' diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-gupnp-enums.c.template-use-basename-instead-of-filen.patch b/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-gupnp-enums.c.template-use-basename-instead-of-filen.patch new file mode 100644 index 0000000000..373eb4548e --- /dev/null +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-gupnp-enums.c.template-use-basename-instead-of-filen.patch @@ -0,0 +1,32 @@ +From f875a0afe24fdebdefc46d132f6722dfcb55115a Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Wed, 24 Apr 2024 18:52:45 +0200 +Subject: [PATCH] gupnp-enums.c.template: use @basename@ instead of @filename@ + +This would prevent the build path from leaking into the source code. + +Signed-off-by: Markus Volk <f_l_k@t-online.de> + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gupnp/-/merge_requests/36] +--- + libgupnp/gupnp-enums.c.template | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libgupnp/gupnp-enums.c.template b/libgupnp/gupnp-enums.c.template +index 3ce5fa4..a7ff89c 100644 +--- a/libgupnp/gupnp-enums.c.template ++++ b/libgupnp/gupnp-enums.c.template +@@ -3,8 +3,8 @@ + + /*** END file-header ***/ + /*** BEGIN file-production ***/ +-/* enumerations from "@filename@" */ +-#include "@filename@" ++/* enumerations from "@basename@" */ ++#include "@basename@" + /*** END file-production ***/ + /*** BEGIN value-header ***/ + GType +-- +2.44.0 + diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.6.6.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.6.6.bb index f1628d82ee..7d9b8a477f 100644 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.6.6.bb +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.6.6.bb @@ -8,6 +8,8 @@ DEPENDS = "e2fsprogs gssdp libsoup-3.0 libxml2" inherit gnomebase pkgconfig vala gobject-introspection SRC_URI[archive.sha256sum] = "c9dc50e8c78b3792d1b0e6c5c5f52c93e9345d3dae2891e311a993a574f5a04f" +SRC_URI += "file://0001-gupnp-enums.c.template-use-basename-instead-of-filen.patch" + SYSROOT_PREPROCESS_FUNCS += "gupnp_sysroot_preprocess" diff --git a/meta-multimedia/recipes-connectivity/rygel/rygel_0.42.4.bb b/meta-multimedia/recipes-connectivity/rygel/rygel_0.42.5.bb index 4fbdce0867..e79bd77a54 100644 --- a/meta-multimedia/recipes-connectivity/rygel/rygel_0.42.4.bb +++ b/meta-multimedia/recipes-connectivity/rygel/rygel_0.42.5.bb @@ -20,7 +20,7 @@ inherit gnomebase features_check vala gobject-introspection gettext systemd # gobject-introspection is mandatory for libmediaart-2.0 and cannot be configured REQUIRED_DISTRO_FEATURES = "gobject-introspection-data x11" -SRC_URI[archive.sha256sum] = "6310dfaa2d332b66119b9b020fad6a4bd27d9bc61faf780ca5ca0b62813303f7" +SRC_URI[archive.sha256sum] = "1133602d2e6710aade6b22aa98d93384c8d56396f344763413e96e0110b7d89f" GIR_MESON_ENABLE_FLAG = 'enabled' GIR_MESON_DISABLE_FLAG = 'disabled' @@ -28,7 +28,7 @@ GIR_MESON_DISABLE_FLAG = 'disabled' EXTRA_OEMESON = "-Dengines=gstreamer -Dplugins=${@strip_comma('${RYGEL_PLUGINS}')}" PACKAGECONFIG:append = "${@bb.utils.contains("DISTRO_FEATURES", "x11", " gtk+3", "", d)}" -PACKAGECONFIG ?= "external mpris ruih gst-launch" +PACKAGECONFIG ?= "external mpris ruih gst-launch media-export" PACKAGECONFIG[external] = "" PACKAGECONFIG[mpris] = "" @@ -60,16 +60,9 @@ do_install:append() { # Remove .la files for loadable modules rm -f ${D}/${libdir}/rygel-${LIBV}/engines/*.la rm -f ${D}/${libdir}/rygel-${LIBV}/plugins/*.la - if [ -e ${D}${nonarch_libdir}/systemd/user/rygel.service ]; then - mkdir -p ${D}${systemd_unitdir}/system - mv ${D}${nonarch_libdir}/systemd/user/rygel.service ${D}${systemd_unitdir}/system - rmdir --ignore-fail-on-non-empty ${D}${nonarch_libdir}/systemd/user \ - ${D}${nonarch_libdir}/systemd \ - ${D}${nonarch_libdir} - fi } -FILES:${PN} += "${libdir}/rygel-${LIBV}/engines ${datadir}/dbus-1 ${datadir}/icons" +FILES:${PN} += "${libdir}/rygel-${LIBV}/engines ${systemd_user_unitdir} ${datadir}/dbus-1 ${datadir}/icons" FILES:${PN}-dbg += "${libdir}/rygel-${LIBV}/engines/.debug ${libdir}/rygel-${LIBV}/plugins/.debug" PACKAGES += "${PN}-meta" @@ -77,8 +70,6 @@ ALLOW_EMPTY:${PN}-meta = "1" PACKAGES_DYNAMIC = "${PN}-plugin-*" -SYSTEMD_SERVICE:${PN} = "rygel.service" - python populate_packages:prepend () { rygel_libdir = d.expand('${libdir}/rygel-${LIBV}') postinst = d.getVar('plugin_postinst') diff --git a/meta-multimedia/recipes-multimedia/aravis/aravis_0.8.31.bb b/meta-multimedia/recipes-multimedia/aravis/aravis_0.8.31.bb index b5d7772e79..a4386e809c 100644 --- a/meta-multimedia/recipes-multimedia/aravis/aravis_0.8.31.bb +++ b/meta-multimedia/recipes-multimedia/aravis/aravis_0.8.31.bb @@ -6,7 +6,7 @@ DESCRIPTION = "\ " AUTHOR = "Emmanuel Pacaud" HOMEPAGE = "https://github.com/AravisProject/aravis" -LICENSE = "LGPL-2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS += "\ @@ -29,7 +29,7 @@ GIDOCGEN_MESON_DISABLE_FLAG = "disabled" inherit meson pkgconfig gi-docgen gobject-introspection -PACKAGECONFIG ?= "gstreamer usb viewer" +PACKAGECONFIG ?= "gstreamer usb ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'viewer', '', d)}" PACKAGECONFIG[gstreamer] = "-Dgst-plugin=enabled, -Dgst-plugin=disabled,gstreamer1.0 gstreamer1.0-plugins-base," PACKAGECONFIG[usb] = "-Dusb=enabled, -Dusb=disabled, libusb1," PACKAGECONFIG[viewer] = "-Dviewer=enabled, -Dviewer=disabled, gtk+3 gstreamer1.0-plugins-base," diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.14.bb b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.14.bb index a762fc8322..f30fffebeb 100644 --- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.14.bb +++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.14.bb @@ -100,3 +100,6 @@ USERADD_PARAM:${PN} = " \ --home ${localstatedir}/lib/mpd \ --groups audio \ --user-group mpd" + +CVE_STATUS[CVE-2020-7465] = "cpe-incorrect: The recipe used in the meta-openembedded is a different mpd package compared to the one which has the CVE issue." +CVE_STATUS[CVE-2020-7466] = "cpe-incorrect: The recipe used in the meta-openembedded is a different mpd package compared to the one which has the CVE issue." diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.20.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.20.bb index d25a20ae01..21bc408f6d 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.20.bb +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.20.bb @@ -9,7 +9,7 @@ DEPENDS = "coreutils-native fribidi libtool libgcrypt libgcrypt-native bison-nat dbus libxml2 gnutls \ tremor faad2 ffmpeg flac alsa-lib \ lua-native lua libidn \ - avahi jpeg xz libmodplug mpeg2dec \ + avahi jpeg xz libmodplug \ libmtp libopus orc libsamplerate0 libusb1 schroedinger taglib \ tiff" diff --git a/meta-multimedia/recipes-support/gst-instruments/gst-instruments_git.bb b/meta-multimedia/recipes-support/gst-instruments/gst-instruments_git.bb index df688bbcda..04d16ffe11 100644 --- a/meta-multimedia/recipes-support/gst-instruments/gst-instruments_git.bb +++ b/meta-multimedia/recipes-support/gst-instruments/gst-instruments_git.bb @@ -19,5 +19,5 @@ FILES:${PN} += "${libdir}/*" INSANE_SKIP:${PN}-dev = "dev-elf" -PACKAGECONFIG ??= "ui" +PACKAGECONFIG ??= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'ui', '', d)}" PACKAGECONFIG[ui] = "-Dui=enabled,-Dui=disabled,gtk+3" diff --git a/meta-networking/conf/include/non-repro-meta-networking.inc b/meta-networking/conf/include/non-repro-meta-networking.inc new file mode 100755 index 0000000000..e0f448fe31 --- /dev/null +++ b/meta-networking/conf/include/non-repro-meta-networking.inc @@ -0,0 +1,59 @@ +# List of known non-reproducible package of the meta-networking layer +# Please keep this list sorted +KNOWN_NON_REPRO_META_NETWORKING = " \ + blueman \ + blueman-dbg \ + blueman-src \ + civetweb-dev \ + dhcp-relay-staticdev \ + ettercap-src \ + fetchmail \ + fetchmail-dbg \ + freediameter \ + freediameter-src \ + freeradius \ + htpdate-doc \ + keepalived \ + keepalived-dbg \ + kernel-module-mdio-netlink-6.6.17-yocto-standard \ + libbearssl-staticdev \ + libfko3 \ + libfko-client \ + libfko-daemon \ + libfko-dbg \ + libmosquitto1 \ + libowfat-staticdev \ + libruli-staticdev \ + libsamba-util0 \ + mdio-netlink-dbg \ + mosquitto \ + mosquitto-dbg \ + ncftp \ + ncftp-dbg \ + ncftp-src \ + ndisc6-dbg \ + ndisc6-misc \ + ndisc6-ndisc6 \ + ndisc6-rdisc6 \ + ndisc6-rdnssd \ + ndisc6-rltraceroute6 \ + netsniff-ng-doc \ + ntpsec-src \ + openl2tp \ + openl2tp-dbg \ + ot-br-posix \ + ot-br-posix-dbg \ + postfix-cfg \ + proftpd \ + proftpd-dbg \ + proftpd-dev \ + rdist \ + rdist-dbg \ + samba-dbg \ + tayga \ + tayga-dbg \ + wolfssl \ + wolfssl-dbg \ + znc \ + znc-doc \ +" diff --git a/meta-networking/conf/layer.conf b/meta-networking/conf/layer.conf index ac5d15a0c0..0e09d8f2ad 100644 --- a/meta-networking/conf/layer.conf +++ b/meta-networking/conf/layer.conf @@ -15,7 +15,7 @@ LAYERVERSION_networking-layer = "1" LAYERDEPENDS_networking-layer = "core meta-python openembedded-layer" -LAYERSERIES_COMPAT_networking-layer = "scarthgap" +LAYERSERIES_COMPAT_networking-layer = "scarthgap styhead" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.46.0.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.46.0.bb index be30154a36..8184fcf1a1 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.46.0.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.46.0.bb @@ -76,9 +76,10 @@ EXTRA_OEMESON = "\ CFLAGS:append:libc-musl = " \ -DRTLD_DEEPBIND=0 \ " - -do_compile:prepend() { - export GI_TYPELIB_PATH="${B}}/src/libnm-client-impl${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" +do_configure:prepend() { + cp -f ${STAGING_LIBDIR}/girepository-1.0/GObject*typelib ${STAGING_LIBDIR_NATIVE}/girepository-1.0/ + cp -f ${STAGING_LIBDIR}/girepository-1.0/Gio*typelib ${STAGING_LIBDIR_NATIVE}/girepository-1.0/ + cp -f ${STAGING_LIBDIR}/girepository-1.0/GModule*typelib ${STAGING_LIBDIR_NATIVE}/girepository-1.0/ } PACKAGECONFIG ??= "readline nss ifupdown dnsmasq nmcli vala \ diff --git a/meta-networking/recipes-connectivity/openfortivpn/openfortivpn_1.21.0.bb b/meta-networking/recipes-connectivity/openfortivpn/openfortivpn_1.22.0.bb index e6c9a69ee5..568593b2d4 100644 --- a/meta-networking/recipes-connectivity/openfortivpn/openfortivpn_1.21.0.bb +++ b/meta-networking/recipes-connectivity/openfortivpn/openfortivpn_1.22.0.bb @@ -3,7 +3,7 @@ LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=3d575262a651a6f1a17210ce41bf907d" SRC_URI = "git://github.com/adrienverge/openfortivpn.git;protocol=https;branch=master" -SRCREV = "26a1fe68cc7a61c58f4f2a98862f6fcf30f9f2dc" +SRCREV = "82e4401162fc65efad8267f4cb3287c6ab6fc088" DEPENDS = "openssl" diff --git a/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.2.4.bb b/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.2.4.bb index f0f7eb5df6..7f06e0ebf3 100644 --- a/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.2.4.bb +++ b/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.2.4.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d" inherit features_check systemd -RDEPENDS:${PN} = "python3-pygobject python3-dbus" +RDEPENDS:${PN} = "python3-pygobject python3-dbus python3-json" REQUIRED_DISTRO_FEATURES = "systemd gobject-introspection-data" SRCREV = "dfd26d72793914eb3da910ef8c71de6d7c8942a2" diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.3.5.bb b/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.3.5.bb index 6696e552c7..82aab051f1 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.3.5.bb +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.3.5.bb @@ -120,3 +120,5 @@ python() { } CVE_PRODUCT = "open-vm-tools vmware:tools" +CVE_STATUS[CVE-2014-4199] = "fixed-version: No action required. The current version (12.3.5) is not affected by the CVE which affects version 10.0.3" +CVE_STATUS[CVE-2014-4200] = "fixed-version: No action required. The current version (12.3.5) is not affected by the CVE which affects version 10.0.3" diff --git a/meta-networking/recipes-support/spice/spice-gtk_0.42.bb b/meta-networking/recipes-support/spice/spice-gtk_0.42.bb index 82ce7067d9..c8a3f7f532 100644 --- a/meta-networking/recipes-support/spice/spice-gtk_0.42.bb +++ b/meta-networking/recipes-support/spice/spice-gtk_0.42.bb @@ -40,7 +40,7 @@ DEPENDS = " \ " DEPENDS:append:libc-musl = " libucontext" -RDEPENDS:${PN} = "python3-pyparsing python3-six usbids" +RDEPENDS:${PN} = "python3-pyparsing python3-six hwdata" inherit meson pkgconfig vala gobject-introspection features_check gtk-doc @@ -59,8 +59,9 @@ do_configure:prepend() { PACKAGECONFIG ??= "${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'vapi', '', d)} smartcard" PACKAGECONFIG[vapi] = "-Dvapi=enabled,-Dvapi=disabled" PACKAGECONFIG[smartcard] = "-Dsmartcard=enabled,-Dsmartcard=disabled,libcacard" +PACKAGECONFIG[webdav] = "-Dwebdav=enabled,-Dwebdav=disabled,phodav libsoup" -EXTRA_OEMESON = "-Dpie=true -Dusb-ids-path=${datadir}/usb.ids " +EXTRA_OEMESON = "-Dpie=true -Dusb-ids-path=${datadir}/hwdata/usb.ids " EXTRA_OEMESON:append:libc-musl = " -Dcoroutine=libucontext" LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -Wl,--undefined-version', '', d)}" diff --git a/meta-oe/classes/image_types_verity.bbclass b/meta-oe/classes/image_types_verity.bbclass new file mode 100644 index 0000000000..b42217c453 --- /dev/null +++ b/meta-oe/classes/image_types_verity.bbclass @@ -0,0 +1,137 @@ +# SPDX-License-Identifier: MIT +# +# Copyright Pengutronix <yocto@pengutronix.de> +# + +# Support generating a dm-verity image and the parameters required to assemble +# the corresponding table for the device-mapper driver. The latter will be +# stored in the file ${DEPLOY_DIR_IMAGE}/<IMAGE_LINK_NAME>.verity-params. Note +# that in the resulting image the hash tree data is appended to the contents of +# the original image without an explicit superblock to keep things simple and +# compact. +# +# The above mentioned parameter file can be sourced by a shell to finally create +# the desired blockdevice via "dmsetup" (found in meta-oe's recipe +# "libdevmapper"), e.g. +# +# . <IMAGE_LINK_NAME>.verity-params +# dmsetup create <dm_dev_name> --readonly --table "0 $VERITY_DATA_SECTORS \ +# verity 1 <dev> <hash_dev> \ +# $VERITY_DATA_BLOCK_SIZE $VERITY_HASH_BLOCK_SIZE \ +# $VERITY_DATA_BLOCKS $VERITY_DATA_BLOCKS \ +# $VERITY_HASH_ALGORITHM $VERITY_ROOT_HASH $VERITY_SALT \ +# 1 ignore_zero_blocks" +# +# As the hash tree data is found at the end of the image, <dev> and <hash_dev> +# should be the same blockdevice in the command shown above while <dm_dev_name> +# is the name of the to be created dm-verity-device. +# +# The root hash is calculated using a salt to make attacks more difficult. Thus, +# please grant each image recipe its own salt which could be generated e.g. via +# +# dd if=/dev/random bs=1k count=1 | sha256sum +# +# and assign it to the parameter VERITY_SALT. + +inherit image-artifact-names + +do_image_verity[depends] += "cryptsetup-native:do_populate_sysroot" + +CLASS_VERITY_SALT = "4e5f0d9b6ccac5e843598d4e4545046232b48451a399acb2106822b43679b375" +VERITY_SALT ?= "${CLASS_VERITY_SALT}" +VERITY_BLOCK_SIZE ?= "4096" +VERITY_IMAGE_FSTYPE ?= "ext4" +VERITY_IMAGE_SUFFIX ?= ".verity" +VERITY_INPUT_IMAGE ?= "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${VERITY_IMAGE_FSTYPE}" + +IMAGE_TYPEDEP:verity = "${VERITY_IMAGE_FSTYPE}" +IMAGE_TYPES_MASKED += "verity" + +python __anonymous() { + if 'verity' not in d.getVar('IMAGE_FSTYPES'): + return + + dep_task = 'do_image_{}'.format(d.getVar('VERITY_IMAGE_FSTYPE').replace('-', '_')) + bb.build.addtask('do_image_verity', 'do_image_complete', dep_task, d) +} + +python do_image_verity () { + import os + import subprocess + import shutil + + link = d.getVar('VERITY_INPUT_IMAGE') + image = os.path.realpath(link) + + verity_image_suffix = d.getVar('VERITY_IMAGE_SUFFIX') + verity = '{}{}'.format(image, verity_image_suffix) + + # For better readability the parameter VERITY_BLOCK_SIZE is specified in + # bytes. It must be a multiple of the logical sector size which is 512 bytes + # in Linux. Make sure that this is the case as otherwise the resulting + # issues would be hard to debug later. + block_size = int(d.getVar('VERITY_BLOCK_SIZE')) + if block_size % 512 != 0: + bb.fatal("VERITY_BLOCK_SIZE must be a multiple of 512!") + + salt = d.getVar('VERITY_SALT') + if salt == d.getVar('CLASS_VERITY_SALT'): + bb.warn("Please overwrite VERITY_SALT with an image specific one!") + + shutil.copyfile(image, verity) + + data_size_blocks, data_size_rest = divmod(os.stat(verity).st_size, block_size) + data_blocks = data_size_blocks + (1 if data_size_rest else 0) + data_size = data_blocks * block_size + + bb.debug(1, f"data_size_blocks: {data_size_blocks}, {data_size_rest}") + bb.debug(1, f"data_size: {data_size}") + + # Create verity image + try: + output = subprocess.check_output([ + 'veritysetup', 'format', + '--no-superblock', + '--salt={}'.format(salt), + '--data-blocks={}'.format(data_blocks), + '--data-block-size={}'.format(block_size), + '--hash-block-size={}'.format(block_size), + '--hash-offset={}'.format(data_size), + verity, verity, + ]) + except subprocess.CalledProcessError as err: + bb.fatal('%s returned with %s (%s)' % (err.cmd, err.returncode, err.output)) + + try: + with open(image + '.verity-info', 'wb') as f: + f.write(output) + except Exception as err: + bb.fatal('Unexpected error %s' % err) + + # Create verity params + params = [] + for line in output.decode('ASCII').splitlines(): + if not ':' in line: + continue + k, v = line.split(':', 1) + k = k.strip().upper().replace(' ', '_') + v = v.strip() + bb.debug(1, f"{k} {v}") + params.append('VERITY_{}={}'.format(k, v)) + + params.append('VERITY_DATA_SECTORS={}'.format(data_size//512)) + + try: + with open(image + '.verity-params', 'w') as f: + f.write('\n'.join(params)) + except Exception as err: + bb.fatal('Unexpected error %s' % err) + + # Create symlinks + for suffix in [ verity_image_suffix, '.verity-info', '.verity-params' ]: + try: + os.remove(link + suffix) + except FileNotFoundError: + pass + os.symlink(os.path.basename(image) + suffix, link + suffix) +} diff --git a/meta-oe/conf/include/non-repro-meta-oe.inc b/meta-oe/conf/include/non-repro-meta-oe.inc new file mode 100755 index 0000000000..7961d851f9 --- /dev/null +++ b/meta-oe/conf/include/non-repro-meta-oe.inc @@ -0,0 +1,107 @@ +# List of known non-reproducible package of the meta-oe layer +# Please keep this list sorted +KNOWN_NON_REPRO_META_OE = " \ + boinc-client-dev \ + cjson-ptest \ + cpuid-doc \ + crash \ + crash-dbg \ + crash-src \ + dhrystone \ + dhrystone-dbg \ + dhrystone-dev \ + dhrystone-src \ + directfb \ + directfb-dbg \ + doxygen-src \ + editorconfig-core-c-dev \ + etcd-cpp-apiv3-dev \ + fbgrab-doc \ + fluentbit-src \ + fvwm-dbg \ + fvwm-doc \ + fvwm-extra \ + gcab-src \ + gosu \ + gosu-dbg \ + gosu-dev \ + gosu-staticdev \ + gphoto2 \ + gphoto2-dbg \ + hddtemp-locale-de \ + hdf5 \ + hdf5-dbg \ + hdf5-src \ + hdf5-staticdev \ + hplip \ + hplip-dbg \ + jpnevulator-doc \ + jsonrpc-dev \ + kpatch-build \ + kpatch-doc \ + ldns \ + libbotan-3-bin \ + libbotan-3-dbg \ + libbotan-3-dev \ + libck-doc \ + libdbus-cxx-dev \ + libforms \ + libiio-src \ + libjcat-dbg \ + libjcat-ptest \ + libthrift-c-glib-zlib-src \ + libvncserver-dev \ + libwebsockets-testapps \ + libwmf \ + libyui-ncurses-dbg \ + libyui-ncurses-dev \ + lmbench-staticdev \ + log4cpp \ + lprng \ + lprng-dbg \ + lshw \ + lshw-locale-fr \ + mariadb-dbg \ + mariadb-server \ + mariadb-src \ + mce-test \ + mime-support-doc \ + minifi-cpp \ + minifi-cpp-dbg \ + minifi-cpp-src \ + mozjs-115-src \ + mpv \ + mpv-dbg \ + nana \ + nbench-byte \ + nbench-byte-dbg \ + nbench-byte-src \ + nspr-staticdev \ + openocd \ + openocd-dbg \ + pcp \ + pcp-dev \ + pcp-doc \ + pcp-src \ + perfetto \ + perfetto-dbg \ + php-phar \ + pidgin \ + pidgin-dbg \ + pim435-staticdev \ + postgresql-server-dev \ + qcbor-staticdev \ + sharutils \ + sharutils-dbg \ + smemstat-doc \ + soci-dev \ + thin-provisioning-tools-dev \ + vulkan-cts \ + vulkan-cts-dbg \ + waylandpp-dev \ + yasm-src \ + zlog-staticdev \ + zsh \ + zsh-dbg \ + zsh-src \ +" diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf index 4d9acb8cc8..d8f0f5339a 100644 --- a/meta-oe/conf/layer.conf +++ b/meta-oe/conf/layer.conf @@ -44,7 +44,7 @@ LAYERVERSION_openembedded-layer = "1" LAYERDEPENDS_openembedded-layer = "core" -LAYERSERIES_COMPAT_openembedded-layer = "scarthgap" +LAYERSERIES_COMPAT_openembedded-layer = "scarthgap styhead" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-oe/recipes-bsp/fwupd/fwupd/0001-meson-Avoid-absolute-buildtime-paths-in-generated-he.patch b/meta-oe/recipes-bsp/fwupd/fwupd/0001-meson-Avoid-absolute-buildtime-paths-in-generated-he.patch deleted file mode 100644 index 2273bdf105..0000000000 --- a/meta-oe/recipes-bsp/fwupd/fwupd/0001-meson-Avoid-absolute-buildtime-paths-in-generated-he.patch +++ /dev/null @@ -1,41 +0,0 @@ -From b1df1ed3a21b8ef0244102043a8fb88b0ccc3f91 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 17 Apr 2023 11:30:21 -0700 -Subject: [PATCH] meson: Avoid absolute buildtime paths in generated headers - -using meson.project_source_root() means the path emitted to include .h -files is absolute and it makes its way into PN-src as well, which infact -is not going to work if the -src package was used to re-build this in a -different build path. Therefore use relative path which is '.' and -relative to ${S} - -Changes -include "<abspath>/plugins/acpi-dmar/fu-acpi-dmar-plugin.h" -to -include "./plugins/acpi-dmar/fu-acpi-dmar-plugin.h" - -in generated build/src/fu-plugin-builtin.h - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/meson.build b/src/meson.build -index b9f6736..bb856ea 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -188,7 +188,7 @@ plugins_hdr = custom_target('fwupd-generate-plugins-header', - command : [ - join_paths(meson.project_source_root(), 'contrib', 'generate-plugins-header.py'), - '@OUTPUT@', -- meson.project_source_root(), -+ '.', - ','.join(plugin_names), - ], - ) --- -2.40.0 - diff --git a/meta-oe/recipes-bsp/fwupd/fwupd_1.8.9.bb b/meta-oe/recipes-bsp/fwupd/fwupd_1.9.18.bb index 1f95dee1be..d20d5ed2ae 100644 --- a/meta-oe/recipes-bsp/fwupd/fwupd_1.8.9.bb +++ b/meta-oe/recipes-bsp/fwupd/fwupd_1.9.18.bb @@ -2,12 +2,11 @@ SUMMARY = "A simple daemon to allow session software to update firmware" LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -DEPENDS = "glib-2.0 libxmlb json-glib libjcat gcab vala-native" +DEPENDS = "glib-2.0 libxmlb json-glib libjcat gcab vala-native python3-jinja2-native" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ - file://0001-meson-Avoid-absolute-buildtime-paths-in-generated-he.patch \ file://run-ptest" -SRC_URI[sha256sum] = "719a791ac4ba5988aeb93ec42778bd65d33cb075d0c093b5c04e5e1682be528a" +SRC_URI[sha256sum] = "4e554f77a8a73383a41d5637b62e6c8a8936e66cd1d18585baf29d7fe47fc4d7" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" @@ -17,14 +16,16 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit meson vala gobject-introspection systemd bash-completion pkgconfig gi-docgen ptest manpages useradd GIDOCGEN_MESON_OPTION = 'docs' -GIDOCGEN_MESON_ENABLE_FLAG = 'docgen' +GIDOCGEN_MESON_ENABLE_FLAG = 'enabled' GIDOCGEN_MESON_DISABLE_FLAG = 'disabled' +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' PACKAGECONFIG ??= "curl gnutls gudev gusb \ ${@bb.utils.filter('DISTRO_FEATURES', 'bluetooth polkit', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd offline', '', d)} \ ${@bb.utils.contains('MACHINE_FEATURES', 'efi', 'plugin_uefi_capsule plugin_uefi_pk', '', d)} \ - ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests plugin_dummy', '', d)} \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ hsi \ plugin_android_boot \ plugin_acpi_phat \ @@ -54,61 +55,59 @@ PACKAGECONFIG ??= "curl gnutls gudev gusb \ plugin_upower \ sqlite" -PACKAGECONFIG[bluetooth] = "-Dbluez=true,-Dbluez=false" +PACKAGECONFIG[bluetooth] = "-Dbluez=enabled,-Dbluez=disabled" PACKAGECONFIG[compat-cli] = "-Dcompat_cli=true,-Dcompat_cli=false" -PACKAGECONFIG[consolekit] = "-Dconsolekit=true,-Dconsolekit=false,consolekit" -PACKAGECONFIG[curl] = "-Dcurl=true,-Dcurl=false,curl" +PACKAGECONFIG[consolekit] = "-Dconsolekit=enabled,-Dconsolekit=disabled,consolekit" +PACKAGECONFIG[curl] = "-Dcurl=enabled,-Dcurl=disabled,curl" PACKAGECONFIG[firmware-packager] = "-Dfirmware-packager=true,-Dfirmware-packager=false" PACKAGECONFIG[fish-completion] = "-Dfish_completion=true,-Dfish_completion=false" -PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls" -PACKAGECONFIG[gudev] = "-Dgudev=true,-Dgudev=false,libgudev" -PACKAGECONFIG[gusb] = "-Dgusb=true,-Dgusb=false,libgusb" -PACKAGECONFIG[hsi] = "-Dhsi=true,-Dhsi=false" -PACKAGECONFIG[libarchive] = "-Dlibarchive=true,-Dlibarchive=false,libarchive" +PACKAGECONFIG[gnutls] = "-Dgnutls=enabled,-Dgnutls=disabled,gnutls" +PACKAGECONFIG[gudev] = "-Dgudev=enabled,-Dgudev=disabled,libgudev" +PACKAGECONFIG[gusb] = "-Dgusb=enabled,-Dgusb=disabled,libgusb" +PACKAGECONFIG[hsi] = "-Dhsi=enabled,-Dhsi=disabled" +PACKAGECONFIG[libarchive] = "-Dlibarchive=enabled,-Dlibarchive=disabled,libarchive" PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false" PACKAGECONFIG[metainfo] = "-Dmetainfo=true,-Dmetainfo=false" -PACKAGECONFIG[offline] = "-Doffline=true,-Doffline=false" -PACKAGECONFIG[polkit] = "-Dpolkit=true,-Dpolkit=false,polkit" -PACKAGECONFIG[sqlite] = "-Dsqlite=true,-Dsqlite=false,sqlite3" -PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" +PACKAGECONFIG[offline] = "-Doffline=enabled,-Doffline=disabled" +PACKAGECONFIG[polkit] = "-Dpolkit=enabled,-Dpolkit=disabled,polkit" +PACKAGECONFIG[sqlite] = "-Dsqlite=enabled,-Dsqlite=disabled,sqlite3" +PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd" PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,gcab-native" # TODO plugins-all meta-option that expands to all plugin_*? -PACKAGECONFIG[plugin_acpi_phat] = "-Dplugin_acpi_phat=true,-Dplugin_acpi_phat=false" +PACKAGECONFIG[plugin_acpi_phat] = "-Dplugin_acpi_phat=enabled,-Dplugin_acpi_phat=disabled" PACKAGECONFIG[plugin_android_boot] = "-Dplugin_android_boot=enabled,-Dplugin_android_boot=disabled" -PACKAGECONFIG[plugin_bcm57xx] = "-Dplugin_bcm57xx=true,-Dplugin_bcm57xx=false" -PACKAGECONFIG[plugin_cfu] = "-Dplugin_cfu=true,-Dplugin_cfu=false" -PACKAGECONFIG[plugin_dell] = "-Dplugin_dell=true,-Dplugin_dell=false,libsmbios" -PACKAGECONFIG[plugin_dummy] = "-Dplugin_dummy=true,-Dplugin_dummy=false" -PACKAGECONFIG[plugin_emmc] = "-Dplugin_emmc=true,-Dplugin_emmc=false" -PACKAGECONFIG[plugin_ep963x] = "-Dplugin_ep963x=true,-Dplugin_ep963x=false" -PACKAGECONFIG[plugin_fastboot] = "-Dplugin_fastboot=true,-Dplugin_fastboot=false" -PACKAGECONFIG[plugin_flashrom] = "-Dplugin_flashrom=true,-Dplugin_flashrom=false,flashrom" -PACKAGECONFIG[plugin_gpio] = "-Dplugin_gpio=true,-Dplugin_gpio=false" +PACKAGECONFIG[plugin_bcm57xx] = "-Dplugin_bcm57xx=enabled,-Dplugin_bcm57xx=disabled" +PACKAGECONFIG[plugin_cfu] = "-Dplugin_cfu=enabled,-Dplugin_cfu=disabled" +PACKAGECONFIG[plugin_emmc] = "-Dplugin_emmc=enabled,-Dplugin_emmc=disabled" +PACKAGECONFIG[plugin_ep963x] = "-Dplugin_ep963x=enabled,-Dplugin_ep963x=disabled" +PACKAGECONFIG[plugin_fastboot] = "-Dplugin_fastboot=enabled,-Dplugin_fastboot=disabled" +PACKAGECONFIG[plugin_flashrom] = "-Dplugin_flashrom=enabled,-Dplugin_flashrom=disabled,flashrom" +PACKAGECONFIG[plugin_gpio] = "-Dplugin_gpio=enabled,-Dplugin_gpio=disabled" PACKAGECONFIG[plugin_igsc] = "-Dplugin_igsc=enabled,-Dplugin_igsc=disabled" PACKAGECONFIG[plugin_intel_me] = "-Dplugin_intel_me=enabled,-Dplugin_intel_me=disabled" -PACKAGECONFIG[plugin_intel_spi] = "-Dplugin_intel_spi=true -Dlzma=true,-Dplugin_intel_spi=false -Dlzma=false,xz" -PACKAGECONFIG[plugin_logitech_bulkcontroller] = "-Dplugin_logitech_bulkcontroller=true,-Dplugin_logitech_bulkcontroller=false,protobuf-c-native protobuf-c" +PACKAGECONFIG[plugin_intel_spi] = "-Dplugin_intel_spi=true -Dlzma=enabled,-Dplugin_intel_spi=false -Dlzma=disabled,xz" +PACKAGECONFIG[plugin_logitech_bulkcontroller] = "-Dplugin_logitech_bulkcontroller=enabled,-Dplugin_logitech_bulkcontroller=disabled,protobuf-c-native protobuf-c" PACKAGECONFIG[plugin_logitech_scribe] = "-Dplugin_logitech_scribe=enabled,-Dplugin_logitech_scribe=disabled" -PACKAGECONFIG[plugin_modem_manager] = "-Dplugin_modem_manager=true,-Dplugin_modem_manager=false,libqmi modemmanager" -PACKAGECONFIG[plugin_msr] = "-Dplugin_msr=true,-Dplugin_msr=false,cpuid" -PACKAGECONFIG[plugin_nitrokey] = "-Dplugin_nitrokey=true,-Dplugin_nitrokey=false" -PACKAGECONFIG[plugin_nvme] = "-Dplugin_nvme=true,-Dplugin_nvme=false" -PACKAGECONFIG[plugin_parade_lspcon] = "-Dplugin_parade_lspcon=true,-Dplugin_parade_lspcon=false" -PACKAGECONFIG[plugin_pixart_rf] = "-Dplugin_pixart_rf=true,-Dplugin_pixart_rf=false" -PACKAGECONFIG[plugin_powerd] = "-Dplugin_powerd=true,-Dplugin_powerd=false" -PACKAGECONFIG[plugin_realtek_mst] = "-Dplugin_realtek_mst=true,-Dplugin_realtek_mst=false" -PACKAGECONFIG[plugin_redfish] = "-Dplugin_redfish=true,-Dplugin_redfish=false" -PACKAGECONFIG[plugin_scsi] = "-Dplugin_scsi=true,-Dplugin_scsi=false" -PACKAGECONFIG[plugin_synaptics_mst] = "-Dplugin_synaptics_mst=true,-Dplugin_synaptics_mst=false" -PACKAGECONFIG[plugin_synaptics_rmi] = "-Dplugin_synaptics_rmi=true,-Dplugin_synaptics_rmi=false" -PACKAGECONFIG[plugin_tpm] = "-Dplugin_tpm=true,-Dplugin_tpm=false,tpm2-tss" +PACKAGECONFIG[plugin_modem_manager] = "-Dplugin_modem_manager=enabled,-Dplugin_modem_manager=disabled,libqmi modemmanager" +PACKAGECONFIG[plugin_msr] = "-Dplugin_msr=enabled,-Dplugin_msr=disabled,cpuid" +PACKAGECONFIG[plugin_nitrokey] = "-Dplugin_nitrokey=enabled,-Dplugin_nitrokey=disabled" +PACKAGECONFIG[plugin_nvme] = "-Dplugin_nvme=enabled,-Dplugin_nvme=disabled" +PACKAGECONFIG[plugin_parade_lspcon] = "-Dplugin_parade_lspcon=enabled,-Dplugin_parade_lspcon=disabled" +PACKAGECONFIG[plugin_pixart_rf] = "-Dplugin_pixart_rf=enabled,-Dplugin_pixart_rf=disabled" +PACKAGECONFIG[plugin_powerd] = "-Dplugin_powerd=enabled,-Dplugin_powerd=disabled" +PACKAGECONFIG[plugin_realtek_mst] = "-Dplugin_realtek_mst=enabled,-Dplugin_realtek_mst=disabled" +PACKAGECONFIG[plugin_redfish] = "-Dplugin_redfish=enabled,-Dplugin_redfish=disabled" +PACKAGECONFIG[plugin_scsi] = "-Dplugin_scsi=enabled,-Dplugin_scsi=disabled" +PACKAGECONFIG[plugin_synaptics_mst] = "-Dplugin_synaptics_mst=enabled,-Dplugin_synaptics_mst=disabled" +PACKAGECONFIG[plugin_synaptics_rmi] = "-Dplugin_synaptics_rmi=enabled,-Dplugin_synaptics_rmi=disabled" +PACKAGECONFIG[plugin_tpm] = "-Dplugin_tpm=enabled,-Dplugin_tpm=disabled,tpm2-tss" # Turn off the capsule splash as it needs G-I at buildtime, which isn't currently supported -PACKAGECONFIG[plugin_uefi_capsule] = "-Dplugin_uefi_capsule=true -Dplugin_uefi_capsule_splash=false,-Dplugin_uefi_capsule=false,efivar fwupd-efi" -PACKAGECONFIG[plugin_uefi_pk] = "-Dplugin_uefi_pk=true,-Dplugin_uefi_pk=false" -PACKAGECONFIG[plugin_uf2] = "-Dplugin_uf2=true,-Dplugin_uf2=false" -PACKAGECONFIG[plugin_upower] = "-Dplugin_upower=true,-Dplugin_upower=false" +PACKAGECONFIG[plugin_uefi_capsule] = "-Dplugin_uefi_capsule=enabled -Dplugin_uefi_capsule_splash=disabled,-Dplugin_uefi_capsule=disabled,efivar fwupd-efi" +PACKAGECONFIG[plugin_uefi_pk] = "-Dplugin_uefi_pk=enabled,-Dplugin_uefi_pk=disabled" +PACKAGECONFIG[plugin_uf2] = "-Dplugin_uf2=enabled,-Dplugin_uf2=disabled" +PACKAGECONFIG[plugin_upower] = "-Dplugin_upower=enabled,-Dplugin_upower=disabled" # Always disable these plugins on non-x86 platforms as they don't compile or are useless DISABLE_NON_X86 = "plugin_intel_me plugin_intel_spi plugin_msr" @@ -130,6 +129,7 @@ do_install:append() { FILES:${PN} += "${libdir}/fwupd-plugins-* \ ${libdir}/fwupd-${PV} \ ${systemd_unitdir} \ + ${nonarch_libdir}/sysusers.d/fwupd.conf \ ${datadir}/fish \ ${datadir}/metainfo \ ${datadir}/icons \ diff --git a/meta-oe/recipes-connectivity/gensio/gensio_2.8.3.bb b/meta-oe/recipes-connectivity/gensio/gensio_2.8.4.bb index 533b79f477..1f85c46e2f 100644 --- a/meta-oe/recipes-connectivity/gensio/gensio_2.8.3.bb +++ b/meta-oe/recipes-connectivity/gensio/gensio_2.8.4.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ " -SRCREV = "c8e0d722794e35c71bc9bb1d79e98f926aad19e0" +SRCREV = "300644fc02b7099ca27ca5bac88c47e159ba8a6b" SRC_URI = "git://github.com/cminyard/gensio;protocol=https;branch=master" diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_1.5.0.bb b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_2.0.0.bb index 6b1af25280..af112ced88 100644 --- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_1.5.0.bb +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_2.0.0.bb @@ -8,7 +8,7 @@ inherit cmake DEPENDS += "expat" -SRCREV = "30d9f1d46258c2be4ce29b7f7f168ecdf6d4f328" +SRCREV = "e62472b210d9e7f06a5e611c23471d414c99a99c" SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master;subpath=tools" S = "${WORKDIR}/tools" diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.5.0.bb b/meta-oe/recipes-core/sdbus-c++/sdbus-c++_2.0.0.bb index 5422e08dd1..2b6bb1011a 100644 --- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.5.0.bb +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++_2.0.0.bb @@ -12,18 +12,18 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'with-exte ${@bb.utils.contains('PTEST_ENABLED', '1', 'with-tests', '', d)}" PACKAGECONFIG[with-builtin-libsystemd] = ",,sdbus-c++-libsystemd,libcap,basu" PACKAGECONFIG[with-external-libsystemd] = ",,systemd,libsystemd" -PACKAGECONFIG[with-tests] = "-DBUILD_TESTS=ON -DINSTALL_TESTS=ON -DTESTS_INSTALL_PATH=${PTEST_PATH},-DBUILD_TESTS=OFF,googletest gmock" +PACKAGECONFIG[with-tests] = "-DSDBUSCPP_BUILD_TESTS=ON -DSDBUSCPP_INSTALL_TESTS=ON -DSDBUSCPP_TESTS_INSTALL_PATH=${PTEST_PATH},-DSDBUSCPP_BUILD_TESTS=OFF,googletest gmock" DEPENDS += "expat" PV .= "+git" -SRCREV = "334fcb8833afb298270531dde369135e4b5b88fd" +SRCREV = "e62472b210d9e7f06a5e611c23471d414c99a99c" SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master \ file://run-ptest" -EXTRA_OECMAKE = "-DBUILD_CODE_GEN=OFF \ - -DBUILD_DOC=ON \ - -DBUILD_DOXYGEN_DOC=OFF" +EXTRA_OECMAKE = "-DSDBUSCPP_BUILD_CODEGEN=OFF \ + -DSDBUSCPP_BUILD_DOCS=ON \ + -DSDBUSCPP_BUILD_DOXYGEN_DOCS=OFF" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-dbs/soci/soci_4.0.3.bb b/meta-oe/recipes-dbs/soci/soci_4.0.3.bb index 25d67ff8bf..315f5d515e 100644 --- a/meta-oe/recipes-dbs/soci/soci_4.0.3.bb +++ b/meta-oe/recipes-dbs/soci/soci_4.0.3.bb @@ -3,7 +3,6 @@ HOMEPAGE = "http://soci.sourceforge.net" LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" SECTION = "libs" -DEPENDS = "boost" SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BP}/${BP}.tar.gz \ file://0001-Do-not-use-std-shuffle-with-clang-15.patch \ @@ -18,20 +17,20 @@ OBASEDIR ?= "/opt/oracle" OINCDIR = "rdbms/public" OLIBDIR = "lib" -PACKAGECONFIG[sqlite3] = "-DSOCI_SQLITE3=ON,-DSOCI_SQLITE3=OFF,sqlite3," -PACKAGECONFIG[mysql] = "-DSOCI_MYSQL=ON,-DSOCI_MYSQL=OFF,mariadb," -PACKAGECONFIG[postgresql] = "-DSOCI_POSTGRESQL=ON,-DSOCI_POSTGRESQL=OFF,postgresql," -PACKAGECONFIG[odbc] = "-DSOCI_ODBC=ON,-DSOCI_ODBC=OFF,," +PACKAGECONFIG[sqlite3] = "-DWITH_SQLITE3=ON,-DWITH_SQLITE3=OFF,sqlite3," +PACKAGECONFIG[mysql] = "-DWITH_MYSQL=ON,-DWITH_MYSQL=OFF,mariadb," +PACKAGECONFIG[postgresql] = "-DWITH_POSTGRESQL=ON,-DWITH_POSTGRESQL=OFF,postgresql," +PACKAGECONFIG[odbc] = "-DWITH_ODBC=ON,-DWITH_ODBC=OFF,," PACKAGECONFIG[empty] = "-DSOCI_EMPTY=ON,-DSOCI_EMPTY=OFF,," PACKAGECONFIG[oracle] = "-DWITH_ORACLE=ON --with-oracle-include=${OINCDIR} --with-oracle-lib=${OLIBDIR},-DWITH_ORACLE=OFF,," PACKAGECONFIG[firebird] = "-DWITH_FIREBIRD=ON,-DWITH_FIREBIRD=OFF,," -PACKAGECONFIG[ptest] = "${TESTCONFIG},,," +PACKAGECONFIG[boost] = "-DWITH_BOOST=ON,-DWITH_BOOST=OFF,boost" +PACKAGECONFIG[ptest] = "${TESTCONFIG},-DSOCI_TESTS=OFF,," # enable your backend by default we enable 'empty' -PACKAGECONFIG ??= "empty" +PACKAGECONFIG ??= "boost empty" -# Take the flags added by PACKAGECONFIG and pass them to cmake. -EXTRA_OECMAKE = "${EXTRA_OECONF} -DSOCI_LIBDIR=${libdir}" +EXTRA_OECMAKE = "-DWITH_DB2=OFF" DISABLE_STATIC = "" inherit dos2unix cmake diff --git a/meta-oe/recipes-devtools/mpich/mpich_4.2.0.bb b/meta-oe/recipes-devtools/mpich/mpich_4.2.1.bb index deb459ce57..9fd8c3bb7b 100644 --- a/meta-oe/recipes-devtools/mpich/mpich_4.2.0.bb +++ b/meta-oe/recipes-devtools/mpich/mpich_4.2.1.bb @@ -6,7 +6,7 @@ LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=7a88f0d96d0d7396a7c66bf353235b62" SRC_URI = "http://www.mpich.org/static/downloads/${PV}/mpich-${PV}.tar.gz" -SRC_URI[sha256sum] = "a64a66781b9e5312ad052d32689e23252f745b27ee8818ac2ac0c8209bc0b90e" +SRC_URI[sha256sum] = "23331b2299f287c3419727edc2df8922d7e7abbb9fd0ac74e03b9966f9ad42d7" RDEPENDS:${PN} += "bash perl libxml2" diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.11/oe-npm-cache b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.12/oe-npm-cache index f596207648..f596207648 100755 --- a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.11/oe-npm-cache +++ b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.12/oe-npm-cache diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.11.bb b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.12.bb index a61dd5018f..a61dd5018f 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.11.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.12.bb diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_20.11.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_20.12.2.bb index 9a61cfcf71..d86c38f2fc 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_20.11.1.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_20.12.2.bb @@ -1,7 +1,7 @@ DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" HOMEPAGE = "http://nodejs.org" LICENSE = "MIT & ISC & BSD-2-Clause & BSD-3-Clause & Artistic-2.0 & Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=78ad16dab3c1d15d4878c81770be0be7" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9a7fcce64128730251dbc58aa41b4674" CVE_PRODUCT = "nodejs node.js" @@ -36,7 +36,7 @@ SRC_URI:append:toolchain-clang:x86 = " \ SRC_URI:append:toolchain-clang:powerpc64le = " \ file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \ " -SRC_URI[sha256sum] = "77813edbf3f7f16d2d35d3353443dee4e61d5ee84d9e3138c7538a3c0ca5209e" +SRC_URI[sha256sum] = "d7cbcc5fbfb31e9001f3f0150bbeda59abe5dd7137aaa6273958cd59ce35ced7" S = "${WORKDIR}/node-v${PV}" diff --git a/meta-oe/recipes-devtools/python/python3-pycups_2.0.1.bb b/meta-oe/recipes-devtools/python/python3-pycups_2.0.4.bb index 1508273009..b7071fa4ff 100644 --- a/meta-oe/recipes-devtools/python/python3-pycups_2.0.1.bb +++ b/meta-oe/recipes-devtools/python/python3-pycups_2.0.4.bb @@ -14,6 +14,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS += "cups" # See https://pypi.org/project/pycups/ for data -SRC_URI[sha256sum] = "57434ce5f62548eb12949ca8217f066f4eeb21a5d6ab8b13471dce350e380c90" +SRC_URI[sha256sum] = "843e385c1dbf694996ca84ef02a7f30c28376035588f5fbeacd6bae005cf7c8d" inherit pypi python_setuptools_build_meta diff --git a/meta-oe/recipes-extended/sanlock/sanlock/0001-include-libgen.h-for-basename.patch b/meta-oe/recipes-extended/sanlock/sanlock/0001-include-libgen.h-for-basename.patch deleted file mode 100644 index 439ffc6473..0000000000 --- a/meta-oe/recipes-extended/sanlock/sanlock/0001-include-libgen.h-for-basename.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c955ac2a4d57f21351e53a5209346fdc2325a747 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 25 Mar 2024 15:12:02 -0700 -Subject: [PATCH] include libgen.h for basename - -basename prototype has been removed from string.h from latest musl [1] -compilers e.g. clang-18 flags the absense of prototype as error. therefore -include libgen.h for providing it. - -[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - wdmd/main.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/wdmd/main.c b/wdmd/main.c -index 38a99f3..7014462 100644 ---- a/wdmd/main.c -+++ b/wdmd/main.c -@@ -15,6 +15,7 @@ - #include <stddef.h> - #include <grp.h> - #include <fcntl.h> -+#include <libgen.h> - #include <string.h> - #include <errno.h> - #include <limits.h> --- -2.44.0 - diff --git a/meta-oe/recipes-extended/sanlock/sanlock_3.9.1.bb b/meta-oe/recipes-extended/sanlock/sanlock_3.9.2.bb index 1d0f8b0103..d369af1c6a 100644 --- a/meta-oe/recipes-extended/sanlock/sanlock_3.9.1.bb +++ b/meta-oe/recipes-extended/sanlock/sanlock_3.9.2.bb @@ -16,9 +16,8 @@ PV .= "+git" SRC_URI = "git://pagure.io/sanlock.git;protocol=http;branch=master \ file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch \ file://0001-add-missing-system-header-string.h.patch \ - file://0001-include-libgen.h-for-basename.patch \ - " -SRCREV = "ecf30a1ccf756776dfea440e4cf9b0b54581075f" + " +SRCREV = "e005fbec2324aa8de7e2f302e5a17483c525b1d1" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.27.bb b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.27.bb index e52ec5f291..58f2275736 100644 --- a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.27.bb +++ b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.27.bb @@ -10,7 +10,7 @@ SRC_URI = " \ " S = "${WORKDIR}/git" -DEPENDS += "virtual/libx11 virtual/libgl libxcb xcb-util-keysyms vim-native" +DEPENDS += "virtual/libx11 virtual/libgl libxcb xcb-util-keysyms" RDEPENDS:${PN} = "libxcb xcb-util-keysyms" diff --git a/meta-oe/recipes-graphics/suckless/st_0.9.2.bb b/meta-oe/recipes-graphics/suckless/st_0.9.2.bb index 5e0f2e71cc..22ad0211b6 100644 --- a/meta-oe/recipes-graphics/suckless/st_0.9.2.bb +++ b/meta-oe/recipes-graphics/suckless/st_0.9.2.bb @@ -33,3 +33,5 @@ ALTERNATIVE:${PN} = "st st-256color" ALTERNATIVE_LINK_NAME[st] = "${datadir}/terminfo/s/st" ALTERNATIVE_LINK_NAME[st-256color] = "${datadir}/terminfo/s/st-256color" + +CVE_STATUS[CVE-2017-16224] = "cpe-incorrect: The recipe used in the meta-openembedded is a different st package compared to the one which has the CVE issue." diff --git a/meta-oe/recipes-graphics/ydotool/ydotool_git.bb b/meta-oe/recipes-graphics/ydotool/ydotool_git.bb index c1427457d1..3acf70235e 100644 --- a/meta-oe/recipes-graphics/ydotool/ydotool_git.bb +++ b/meta-oe/recipes-graphics/ydotool/ydotool_git.bb @@ -16,5 +16,11 @@ EXTRA_OECMAKE = "\ -DBUILD_DOCS=OFF \ " +do_install:append() { + if ! ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + rm -rf ${D}${systemd_user_unitdir} + rmdir ${D}${nonarch_libdir}/systemd ${D}${nonarch_libdir} + fi +} SYSTEMD_SERVICE:${PN} = "ydotoold.service" SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-oe/recipes-support/asio/asio_1.28.0.bb b/meta-oe/recipes-support/asio/asio_1.30.2.bb index 84074400a6..6930381ecd 100644 --- a/meta-oe/recipes-support/asio/asio_1.28.0.bb +++ b/meta-oe/recipes-support/asio/asio_1.30.2.bb @@ -8,18 +8,15 @@ LICENSE = "BSL-1.0" DEPENDS = "openssl" -SRC_URI = " \ - ${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2 \ - file://0001-Add-the-pkgconfigdir-location.patch \ -" +SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2" inherit autotools ALLOW_EMPTY:${PN} = "1" -LIC_FILES_CHKSUM = "file://COPYING;md5=ff668366bbdb687b6029d33a5fe4b999" +LIC_FILES_CHKSUM = "file://COPYING;md5=2bfc909e030aeafefa72f764165b8d07" -SRC_URI[sha256sum] = "d0ddc2361abd2f4c823e970aaf8e28b4b31ab21b1a68af16b114fc093661e232" +SRC_URI[sha256sum] = "9f12cef05c0477eace9c68ccabd19f9e3a04b875d4768c323714cbd3a5fa3c2b" PACKAGECONFIG ??= "boost" diff --git a/meta-oe/recipes-support/asio/files/0001-Add-the-pkgconfigdir-location.patch b/meta-oe/recipes-support/asio/files/0001-Add-the-pkgconfigdir-location.patch deleted file mode 100644 index 75f083b0ed..0000000000 --- a/meta-oe/recipes-support/asio/files/0001-Add-the-pkgconfigdir-location.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 248e87869d748cfb72d3a5d3b2b91ad178172e30 Mon Sep 17 00:00:00 2001 -From: Vasileios Anagnostopoulos <anagnwstopoulos@hotmail.com> -Date: Tue, 9 May 2023 12:48:29 +0200 -Subject: [PATCH] Add the pkgconfigdir location - -This change is necessary, because while building asio in yocto the -compilation is failing and is complaining because the variable is -undefined - -Signed-off-by: Vasileios Anagnostopoulos <anagnwstopoulos@hotmail.com> -Upstream-Status: Submitted [https://github.com/chriskohlhoff/asio/pull/1294] ---- - asio/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Makefile.am b/Makefile.am -index b7760851..bc4f75b3 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,6 +1,7 @@ - AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip - - pkgconfig_DATA = asio.pc -+pkgconfigdir = $(libdir)/pkgconfig - - SUBDIRS = include src - --- -2.34.1 - diff --git a/meta-oe/recipes-support/procmail/procmail_3.22.bb b/meta-oe/recipes-support/procmail/procmail_3.22.bb index ba268de0a5..16917666a4 100644 --- a/meta-oe/recipes-support/procmail/procmail_3.22.bb +++ b/meta-oe/recipes-support/procmail/procmail_3.22.bb @@ -43,3 +43,5 @@ do_install() { oe_runmake -i BASENAME=${D}/usr MANDIR=${D}${mandir} install install -m 0644 debian/mailstat.1 ${D}${mandir}/man1 } + +CVE_STATUS[CVE-1999-0475] = "fixed-version: No action required. The current version (3.22) is not affected by the CVE." diff --git a/meta-perl/conf/include/non-repro-meta-perl.inc b/meta-perl/conf/include/non-repro-meta-perl.inc new file mode 100755 index 0000000000..9082691f67 --- /dev/null +++ b/meta-perl/conf/include/non-repro-meta-perl.inc @@ -0,0 +1,10 @@ +# List of known non-reproducible package of the meta-perl layer +# Please keep this list sorted +KNOWN_NON_REPRO_META_PERL = " \ + libencode-perl-src \ + libhtml-tree-perl \ + libhtml-tree-perl-doc \ + libmodule-build-tiny-perl \ + po4a \ + po4a-doc \ +" diff --git a/meta-perl/conf/layer.conf b/meta-perl/conf/layer.conf index 20a6a4239f..e20c8471e0 100644 --- a/meta-perl/conf/layer.conf +++ b/meta-perl/conf/layer.conf @@ -15,4 +15,4 @@ LAYERVERSION_perl-layer = "1" LAYERDEPENDS_perl-layer = "core openembedded-layer" -LAYERSERIES_COMPAT_perl-layer = "scarthgap" +LAYERSERIES_COMPAT_perl-layer = "scarthgap styhead" diff --git a/meta-python/conf/include/non-repro-meta-python.inc b/meta-python/conf/include/non-repro-meta-python.inc new file mode 100755 index 0000000000..629dc4aa04 --- /dev/null +++ b/meta-python/conf/include/non-repro-meta-python.inc @@ -0,0 +1,22 @@ +# List of known non-reproducible package of the meta-python layer +# Please keep this list sorted +KNOWN_NON_REPRO_META_PYTHON = " \ + python3-evdev-src \ + python3-frozenlist \ + python3-frozenlist-dbg \ + python3-kivy-src \ + python3-pandas \ + python3-pandas-dbg \ + python3-pandas-src \ + python3-pycocotools-src \ + python3-pydantic-core \ + python3-pynacl \ + python3-pynacl-dbg \ + python3-pynacl-src \ + python3-pyproj \ + python3-pyproj-dbg \ + python3-pyproj-src \ + python3-pyzmq \ + python3-yarl \ + python3-yarl-dbg \ +" diff --git a/meta-python/conf/layer.conf b/meta-python/conf/layer.conf index f48b28b958..998f492a49 100644 --- a/meta-python/conf/layer.conf +++ b/meta-python/conf/layer.conf @@ -14,6 +14,6 @@ LAYERVERSION_meta-python = "1" LAYERDEPENDS_meta-python = "core (>= 12) openembedded-layer" -LAYERSERIES_COMPAT_meta-python = "scarthgap" +LAYERSERIES_COMPAT_meta-python = "scarthgap styhead" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-python/recipes-devtools/python/python3-argcomplete_3.2.3.bb b/meta-python/recipes-devtools/python/python3-argcomplete_3.3.0.bb index 8d8c8a4e2e..d96861010e 100644 --- a/meta-python/recipes-devtools/python/python3-argcomplete_3.2.3.bb +++ b/meta-python/recipes-devtools/python/python3-argcomplete_3.3.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/kislyuk/argcomplete" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=2ee41112a44fe7014dce33e26468ba93" -SRC_URI[sha256sum] = "bf7900329262e481be5a15f56f19736b376df6f82ed27576fa893652c5de6c23" +SRC_URI[sha256sum] = "fd03ff4a5b9e6580569d34b273f741e85cd9e072f3feeeee3eba4891c70eda62" PYPI_PACKAGE = "argcomplete" diff --git a/meta-python/recipes-devtools/python/python3-colorlog_6.8.2.bb b/meta-python/recipes-devtools/python/python3-colorlog_6.8.2.bb index c26f4bb70e..df5fdedfc8 100644 --- a/meta-python/recipes-devtools/python/python3-colorlog_6.8.2.bb +++ b/meta-python/recipes-devtools/python/python3-colorlog_6.8.2.bb @@ -10,3 +10,5 @@ PYPI_PACKAGE = "colorlog" SRC_URI[sha256sum] = "3e3e079a41feb5a1b64f978b5ea4f46040a94f11f0e8bbb8261e3dbbeca64d44" RDEPENDS:${PN} += "python3-logging" + +BBCLASSEXTEND += "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-croniter_2.0.3.bb b/meta-python/recipes-devtools/python/python3-croniter_2.0.5.bb index ad80574a95..01ee048404 100644 --- a/meta-python/recipes-devtools/python/python3-croniter_2.0.3.bb +++ b/meta-python/recipes-devtools/python/python3-croniter_2.0.5.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b8ee59850b882cbf623188489ea748e2" PYPI_PACKAGE = "croniter" -SRC_URI[sha256sum] = "28763ad39c404e159140874f08010cfd8a18f4c2a7cea1ce73e9506a4380cfc1" +SRC_URI[sha256sum] = "f1f8ca0af64212fbe99b1bee125ee5a1b53a9c1b433968d8bca8817b79d237f3" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-gcovr_7.2.bb b/meta-python/recipes-devtools/python/python3-gcovr_7.2.bb index 8a61a2de05..517124742a 100644 --- a/meta-python/recipes-devtools/python/python3-gcovr_7.2.bb +++ b/meta-python/recipes-devtools/python/python3-gcovr_7.2.bb @@ -11,6 +11,13 @@ S = "${WORKDIR}/git" inherit setuptools3 -RDEPENDS:${PN} += "python3-jinja2 python3-lxml python3-setuptools python3-pygments python3-multiprocessing" +RDEPENDS:${PN} += " \ + python3-colorlog \ + python3-jinja2 \ + python3-lxml \ + python3-multiprocessing \ + python3-pygments \ + python3-setuptools \ +" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-grpcio-tools_1.62.1.bb b/meta-python/recipes-devtools/python/python3-grpcio-tools_1.62.2.bb index ffa2f843c7..e05b8734d6 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio-tools_1.62.1.bb +++ b/meta-python/recipes-devtools/python/python3-grpcio-tools_1.62.2.bb @@ -12,7 +12,7 @@ DEPENDS += "python3-grpcio" SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch \ file://0001-protobuf-Disable-musttail-attribute-on-mips.patch \ " -SRC_URI[sha256sum] = "a4991e5ee8a97ab791296d3bf7e8700b1445635cc1828cc98df945ca1802d7f2" +SRC_URI[sha256sum] = "5fd5e1582b678e6b941ee5f5809340be5e0724691df5299aae8226640f94e18f" RDEPENDS:${PN} = "python3-grpcio" diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.62.1.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.62.2.bb index 8405ebed02..3148f63761 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio_1.62.1.bb +++ b/meta-python/recipes-devtools/python/python3-grpcio_1.62.2.bb @@ -10,7 +10,7 @@ SRC_URI += "file://0001-Include-missing-cstdint-header.patch \ file://abseil-ppc-fixes.patch \ file://0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch \ " -SRC_URI[sha256sum] = "6c455e008fa86d9e9a9d85bb76da4277c0d7d9668a3bfa70dbe86e9f3c759947" +SRC_URI[sha256sum] = "c77618071d96b7a8be2c10701a98537823b9c65ba256c0b9067e0594cdbd954d" RDEPENDS:${PN} = "python3-protobuf" diff --git a/meta-python/recipes-devtools/python/python3-incremental_22.10.0.bb b/meta-python/recipes-devtools/python/python3-incremental_22.10.0.bb index 3d93cc05e9..503ef35a9e 100644 --- a/meta-python/recipes-devtools/python/python3-incremental_22.10.0.bb +++ b/meta-python/recipes-devtools/python/python3-incremental_22.10.0.bb @@ -5,15 +5,15 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=6ca9b07f08e2c72d48c74d363d1e0e15" SRC_URI[sha256sum] = "912feeb5e0f7e0188e6f42241d2f450002e11bbc0937c65865045854c24c0bd0" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta RDEPENDS:${PN} += " \ - python3-twisted \ + python3-twisted-core \ python3-click \ " # -native is needed to build python[3]-twisted, however, we need to take steps to # prevent a circular dependency. The build apparently does not use the part of # python-incremental which uses python-twisted, so this hack is OK. -RDEPENDS:python3-incremental-native:remove = "python3-twisted-native" +RDEPENDS:python3-incremental-native:remove = "python3-twisted-core-native" BBCLASSEXTEND = "native" diff --git a/meta-python/recipes-devtools/python/python3-protobuf_4.25.3.bb b/meta-python/recipes-devtools/python/python3-protobuf_4.25.3.bb index 8bb8a93f76..b9b03badd0 100644 --- a/meta-python/recipes-devtools/python/python3-protobuf_4.25.3.bb +++ b/meta-python/recipes-devtools/python/python3-protobuf_4.25.3.bb @@ -23,7 +23,6 @@ RDEPENDS:${PN} += " \ python3-netclient \ python3-numbers \ python3-pkgutil \ - python3-six \ python3-unittest \ " diff --git a/meta-python/recipes-devtools/python/python3-pyhamcrest_2.1.0.bb b/meta-python/recipes-devtools/python/python3-pyhamcrest_2.1.0.bb index eaa24eefe5..dcc9ebfa93 100644 --- a/meta-python/recipes-devtools/python/python3-pyhamcrest_2.1.0.bb +++ b/meta-python/recipes-devtools/python/python3-pyhamcrest_2.1.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=79391bf1501c898472d043f36e960612" SRC_URI[sha256sum] = "c6acbec0923d0cb7e72c22af1926f3e7c97b8e8d69fc7498eabacaf7c975bd9c" -inherit pypi python_setuptools_build_meta +inherit pypi python_hatchling DEPENDS += "python3-hatch-vcs-native" @@ -13,6 +13,6 @@ UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/PyHamcrest/" UPSTREAM_CHECK_REGEX = "/PyHamcrest/(?P<pver>(\d+[\.\-_]*)+)" RDEPENDS:${PN} += " \ - python3-six \ + python3-asyncio \ python3-numbers \ " diff --git a/meta-python/recipes-devtools/python/python3-pymisp_2.4.188.bb b/meta-python/recipes-devtools/python/python3-pymisp_2.4.190.bb index 59a00be154..c1389982d4 100644 --- a/meta-python/recipes-devtools/python/python3-pymisp_2.4.188.bb +++ b/meta-python/recipes-devtools/python/python3-pymisp_2.4.190.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/MISP/PyMISP" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=a3639cf5780f71b125d3e9d1dc127c20" -SRC_URI[sha256sum] = "c2313d059a9f4d1221243fcda64fb8ae11603c1745e92d57c4071aad04336696" +SRC_URI[sha256sum] = "e7374295bfd8c7d25f56867e4395a029433360d95420e39b7f78eb1d4f8b48b4" inherit python_poetry_core pypi diff --git a/meta-python/recipes-devtools/python/python3-regex_2023.12.25.bb b/meta-python/recipes-devtools/python/python3-regex_2024.4.16.bb index d7ac616083..18a6f3d65b 100644 --- a/meta-python/recipes-devtools/python/python3-regex_2023.12.25.bb +++ b/meta-python/recipes-devtools/python/python3-regex_2024.4.16.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7b5751ddd6b643203c31ff873051d069" inherit pypi setuptools3 -SRC_URI[sha256sum] = "29171aa128da69afdf4bde412d5bedc335f2ca8fcfe4489038577d05f16181e5" +SRC_URI[sha256sum] = "fa454d26f2e87ad661c4f0c5a5fe4cf6aab1e307d1b94f16ffdfcb089ba685c0" RDEPENDS:${PN} += " \ python3-stringold \ diff --git a/meta-python/recipes-devtools/python/python3-twisted_22.10.0.bb b/meta-python/recipes-devtools/python/python3-twisted_24.3.0.bb index 20b9ce2541..e5223ccd65 100644 --- a/meta-python/recipes-devtools/python/python3-twisted_22.10.0.bb +++ b/meta-python/recipes-devtools/python/python3-twisted_24.3.0.bb @@ -1,16 +1,14 @@ DESCRIPTION = "Twisted is an event-driven networking framework written in Python and licensed under the LGPL. \ Twisted supports TCP, UDP, SSL/TLS, multicast, Unix sockets, a large number of protocols \ (including HTTP, NNTP, IMAP, SSH, IRC, FTP, and others), and much more." -HOMEPAGE = "http://www.twistedmatrix.com" +HOMEPAGE = "https://twisted.org" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0f8d67f84b6e178c92d471011b2245fc" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c1c5d2c2493b848f83864bdedd67bbf5" -SRC_URI[sha256sum] = "32acbd40a94f5f46e7b42c109bfae2b302250945561783a8b7a059048f2d4d31" +SRC_URI[sha256sum] = "6b38b6ece7296b5e122c9eb17da2eeab3d98a198f50ca9efd00fb03e5b4fd4ae" -PYPI_PACKAGE = "Twisted" - -inherit pypi python_setuptools_build_meta +inherit pypi python_hatchling do_install:append() { # remove some useless files before packaging @@ -34,6 +32,7 @@ PACKAGES += "\ " DEPENDS += " \ + python3-hatch-fancy-pypi-readme-native \ python3-incremental-native \ " @@ -58,14 +57,13 @@ RDEPENDS:${PN}-core = "python3-appdirs \ python3-debugger \ python3-hyperlink \ python3-incremental \ - python3-pyhamcrest \ python3-pyserial \ python3-typing-extensions \ python3-unixadmin \ python3-zopeinterface \ " -RDEPENDS:${PN}-test = "${PN}" -RDEPENDS:${PN}-conch = "${PN}-core ${PN}-protocols python3-bcrypt python3-cryptography python3-pyasn1 python3-pickle" +RDEPENDS:${PN}-test = "${PN} python3-pyhamcrest" +RDEPENDS:${PN}-conch = "${PN}-core ${PN}-protocols python3-bcrypt python3-cryptography python3-pickle" RDEPENDS:${PN}-mail = "${PN}-core ${PN}-protocols" RDEPENDS:${PN}-names = "${PN}-core" RDEPENDS:${PN}-news = "${PN}-core ${PN}-protocols" @@ -75,8 +73,6 @@ RDEPENDS:${PN}-words += "${PN}-core" RDEPENDS:${PN}-flow += "${PN}-core" RDEPENDS:${PN}-pair += "${PN}-core" -FILES:${PN} = "${PYTHON_SITEPACKAGES_DIR}/${PYPI_PACKAGE}-${PV}.dist-info/*" - FILES:${PN}-test = " \ ${PYTHON_SITEPACKAGES_DIR}/twisted/test \ ${PYTHON_SITEPACKAGES_DIR}/twisted/*/test \ @@ -85,8 +81,6 @@ FILES:${PN}-test = " \ FILES:${PN}-protocols = " \ ${PYTHON_SITEPACKAGES_DIR}/twisted/protocols/*.py* \ - ${PYTHON_SITEPACKAGES_DIR}/twisted/protocols/gps/ \ - ${PYTHON_SITEPACKAGES_DIR}/twisted/protocols/mice/ \ ${PYTHON_SITEPACKAGES_DIR}/twisted/protocols/haproxy \ ${PYTHON_SITEPACKAGES_DIR}/twisted/protocols/__pycache__/*pyc \ " @@ -124,7 +118,6 @@ FILES:${PN}-core = " \ ${PYTHON_SITEPACKAGES_DIR}/twisted/*.py* \ ${PYTHON_SITEPACKAGES_DIR}/twisted/python/*.py* \ ${PYTHON_SITEPACKAGES_DIR}/twisted/plugins/*.py* \ - ${PYTHON_SITEPACKAGES_DIR}/Twisted*egg-info \ ${PYTHON_SITEPACKAGES_DIR}/twisted/logger \ ${PYTHON_SITEPACKAGES_DIR}/twisted/_threads \ ${PYTHON_SITEPACKAGES_DIR}/twisted/positioning \ diff --git a/meta-python/recipes-devtools/python/python3-txdbus_1.1.2.bb b/meta-python/recipes-devtools/python/python3-txdbus_1.1.2.bb index d579ca0441..1232f5e99f 100644 --- a/meta-python/recipes-devtools/python/python3-txdbus_1.1.2.bb +++ b/meta-python/recipes-devtools/python/python3-txdbus_1.1.2.bb @@ -9,4 +9,4 @@ SRC_URI[sha256sum] = "8375a5fb68a12054f0def91af800c821fb2232949337756ed975f88d8e inherit pypi setuptools3 -RDEPENDS:${PN} += "python3-six python3-twisted" +RDEPENDS:${PN} += "python3-twisted-core" diff --git a/meta-python/recipes-devtools/python/python3-yamlloader_1.3.2.bb b/meta-python/recipes-devtools/python/python3-yamlloader_1.4.1.bb index 93c58c11ca..55c48f889c 100644 --- a/meta-python/recipes-devtools/python/python3-yamlloader_1.3.2.bb +++ b/meta-python/recipes-devtools/python/python3-yamlloader_1.4.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/Phynix/yamlloader" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=6831ef36faa29329bce2420c5356f97e" -SRC_URI[sha256sum] = "7dbd98421d8090c521655f1b06ca030067f29df5253a8878126bce3a90f56817" +SRC_URI[sha256sum] = "b6fe40ecf5af596d840e920670ed3475f9813492bf6e55b24f2ad450c212bab5" inherit pypi python_setuptools_build_meta diff --git a/meta-python/recipes-extended/pywbem/python3-pywbem_1.6.3.bb b/meta-python/recipes-extended/pywbem/python3-pywbem_1.7.2.bb index 7d1ff28589..1fdcc98ca7 100644 --- a/meta-python/recipes-extended/pywbem/python3-pywbem_1.6.3.bb +++ b/meta-python/recipes-extended/pywbem/python3-pywbem_1.7.2.bb @@ -16,7 +16,7 @@ HOMEPAGE = "http://pywbem.github.io" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbc093901857fcd118f065f900982c24" -SRC_URI[sha256sum] = "78df30dee98c508620b599b8951f322a81c6c0a9d7b78ffe5e017b9417cd97b9" +SRC_URI[sha256sum] = "dc3b785840017f5fcb6381c56682598cebbfc8451851768f85e2318a84e06b68" inherit pypi setuptools3 update-alternatives diff --git a/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_1.2.1.bb b/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_1.3.0.bb index c0a5368d11..127aa8b4a3 100644 --- a/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_1.2.1.bb +++ b/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_1.3.0.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://pywbemtools.readthedocs.io/en/stable/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e23fadd6ceef8c618fc1c65191d846fa" -SRC_URI[sha256sum] = "d2ad6c383490ddb3bbb0f737d23a07c7e8c345df65f8309bc554d8455cc913dc" +SRC_URI[sha256sum] = "9d0162b74c0b34d4500c099dddfe518cadc295a1a7bfb0abefa740a134d80fea" inherit pypi setuptools3 diff --git a/meta-webserver/conf/include/non-repro-meta-webserver.inc b/meta-webserver/conf/include/non-repro-meta-webserver.inc new file mode 100755 index 0000000000..ee998ea961 --- /dev/null +++ b/meta-webserver/conf/include/non-repro-meta-webserver.inc @@ -0,0 +1,7 @@ +# List of known non-reproducible package of the meta-webserver layer +# Please keep this list sorted +KNOWN_NON_REPRO_META_WEBSERVER = " \ + netdata \ + netdata-dbg \ + php-phar \ +" diff --git a/meta-webserver/conf/layer.conf b/meta-webserver/conf/layer.conf index c0896f1a2d..717bfda471 100644 --- a/meta-webserver/conf/layer.conf +++ b/meta-webserver/conf/layer.conf @@ -17,7 +17,7 @@ LAYERVERSION_webserver = "1" LAYERDEPENDS_webserver = "core openembedded-layer" -LAYERSERIES_COMPAT_webserver = "scarthgap" +LAYERSERIES_COMPAT_webserver = "scarthgap styhead" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb b/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb index b40b148512..601ec7bcd1 100644 --- a/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb +++ b/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb @@ -57,3 +57,5 @@ SYSTEMD_SERVICE:${PN} = "thttpd.service" FILES:${PN} += "${SRV_DIR}" FILES:${PN}-dbg += "${SRV_DIR}/cgi-bin/.debug" + +CVE_STATUS[CVE-2017-10671] = "fixed-version: No action required. The current version (2.27.1) is not affected by the CVE." diff --git a/meta-xfce/conf/include/non-repro-meta-xfce.inc b/meta-xfce/conf/include/non-repro-meta-xfce.inc new file mode 100755 index 0000000000..aad6b0c24d --- /dev/null +++ b/meta-xfce/conf/include/non-repro-meta-xfce.inc @@ -0,0 +1,7 @@ +# List of known non-reproducible package of the meta-xfce layer +# Please keep this list sorted +KNOWN_NON_REPRO_META_XFCE = " \ + catfish \ + libsamba-util0 \ + samba-dbg \ +" diff --git a/meta-xfce/conf/layer.conf b/meta-xfce/conf/layer.conf index 944bd57d1f..0c7990e8e0 100644 --- a/meta-xfce/conf/layer.conf +++ b/meta-xfce/conf/layer.conf @@ -19,7 +19,7 @@ LAYERDEPENDS_xfce-layer += "multimedia-layer" LAYERDEPENDS_xfce-layer += "meta-python" LAYERDEPENDS_xfce-layer += "networking-layer" -LAYERSERIES_COMPAT_xfce-layer = "scarthgap" +LAYERSERIES_COMPAT_xfce-layer = "scarthgap styhead" SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += "\ openzone->gdk-pixbuf \ |