From ba1fd62faa604bb6094bc68d141ab223a5cb6628 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Mon, 30 Mar 2026 14:31:44 +0800 Subject: [PATCH] ostree: drop soup2 option * libsoup-2.4 is deprecated, and some recipes already stop support of soup2, soup2 and soup3 cannot be used together * ostree upstream already stop test of soup2, refer [1] * Remove unnecessary comments, PACKAGECONFIG for ptest already set in bb [1] https://github.com/ostreedev/ostree/pull/3531 Signed-off-by: Changqing Li Signed-off-by: Khem Raj --- meta-oe/recipes-extended/ostree/ostree_2025.7.bb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/meta-oe/recipes-extended/ostree/ostree_2025.7.bb b/meta-oe/recipes-extended/ostree/ostree_2025.7.bb index 764daa8e37..a2094f68c3 100644 --- a/meta-oe/recipes-extended/ostree/ostree_2025.7.bb +++ b/meta-oe/recipes-extended/ostree/ostree_2025.7.bb @@ -39,9 +39,7 @@ BUILD_OPTIMIZATION:remove = "-Og" BUILD_OPTIMIZATION:append = " -O2" # Package configuration - match ostree defaults, but without rofiles-fuse -# otherwise we introduce a dependendency on meta-filesystems and swap -# soup for curl to avoid bringing in deprecated libsoup2 (though -# to run ptest requires that you have soup2 or soup3). +# otherwise we introduce a dependendency on meta-filesystems PACKAGECONFIG ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd libmount', '', d)} \ @@ -87,13 +85,13 @@ PACKAGECONFIG[openssl] = "--with-crypto=openssl, , openssl, , , glib gnutls" PACKAGECONFIG[rofiles-fuse] = "--enable-rofiles-fuse, --disable-rofiles-fuse, fuse3" PACKAGECONFIG[selinux] = "--with-selinux, --without-selinux, libselinux, bubblewrap" PACKAGECONFIG[smack] = "--with-smack, --without-smack, smack" -PACKAGECONFIG[soup2] = "--with-soup, --without-soup, libsoup-2.4, , , soup3" -PACKAGECONFIG[soup3] = "--with-soup3, --without-soup3, libsoup, , , soup2" +PACKAGECONFIG[soup3] = "--with-soup3, --without-soup3, libsoup" PACKAGECONFIG[static] = "" PACKAGECONFIG[systemd] = "--with-libsystemd --with-systemdsystemunitdir=${systemd_system_unitdir}, --without-libsystemd, systemd" EXTRA_OECONF = " \ ${@bb.utils.contains('PACKAGECONFIG', 'static', '--with-static-compiler=\'${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}\'', '', d)} \ + --without-soup \ " # Makefile-libostree.am overrides this to avoid a build problem with clang, @@ -185,7 +183,6 @@ RDEPENDS:${PN}:class-target = " \ # # Something like this in your local.conf: # -# PACKAGECONFIG:append:pn-ostree = " static soup3" # KERNEL_EXTRA_FEATURES:append = " features/overlayfs/overlayfs.scc" # TARGET_CFLAGS:append:pn-busybox = " -static" #