summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-extended/ostree/ostree_2025.7.bb9
1 files 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"
39BUILD_OPTIMIZATION:append = " -O2" 39BUILD_OPTIMIZATION:append = " -O2"
40 40
41# Package configuration - match ostree defaults, but without rofiles-fuse 41# Package configuration - match ostree defaults, but without rofiles-fuse
42# otherwise we introduce a dependendency on meta-filesystems and swap 42# otherwise we introduce a dependendency on meta-filesystems
43# soup for curl to avoid bringing in deprecated libsoup2 (though
44# to run ptest requires that you have soup2 or soup3).
45PACKAGECONFIG ??= " \ 43PACKAGECONFIG ??= " \
46 ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ 44 ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \
47 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd libmount', '', d)} \ 45 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd libmount', '', d)} \
@@ -87,13 +85,13 @@ PACKAGECONFIG[openssl] = "--with-crypto=openssl, , openssl, , , glib gnutls"
87PACKAGECONFIG[rofiles-fuse] = "--enable-rofiles-fuse, --disable-rofiles-fuse, fuse3" 85PACKAGECONFIG[rofiles-fuse] = "--enable-rofiles-fuse, --disable-rofiles-fuse, fuse3"
88PACKAGECONFIG[selinux] = "--with-selinux, --without-selinux, libselinux, bubblewrap" 86PACKAGECONFIG[selinux] = "--with-selinux, --without-selinux, libselinux, bubblewrap"
89PACKAGECONFIG[smack] = "--with-smack, --without-smack, smack" 87PACKAGECONFIG[smack] = "--with-smack, --without-smack, smack"
90PACKAGECONFIG[soup2] = "--with-soup, --without-soup, libsoup-2.4, , , soup3" 88PACKAGECONFIG[soup3] = "--with-soup3, --without-soup3, libsoup"
91PACKAGECONFIG[soup3] = "--with-soup3, --without-soup3, libsoup, , , soup2"
92PACKAGECONFIG[static] = "" 89PACKAGECONFIG[static] = ""
93PACKAGECONFIG[systemd] = "--with-libsystemd --with-systemdsystemunitdir=${systemd_system_unitdir}, --without-libsystemd, systemd" 90PACKAGECONFIG[systemd] = "--with-libsystemd --with-systemdsystemunitdir=${systemd_system_unitdir}, --without-libsystemd, systemd"
94 91
95EXTRA_OECONF = " \ 92EXTRA_OECONF = " \
96 ${@bb.utils.contains('PACKAGECONFIG', 'static', '--with-static-compiler=\'${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}\'', '', d)} \ 93 ${@bb.utils.contains('PACKAGECONFIG', 'static', '--with-static-compiler=\'${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}\'', '', d)} \
94 --without-soup \
97" 95"
98 96
99# Makefile-libostree.am overrides this to avoid a build problem with clang, 97# Makefile-libostree.am overrides this to avoid a build problem with clang,
@@ -185,7 +183,6 @@ RDEPENDS:${PN}:class-target = " \
185# 183#
186# Something like this in your local.conf: 184# Something like this in your local.conf:
187# 185#
188# PACKAGECONFIG:append:pn-ostree = " static soup3"
189# KERNEL_EXTRA_FEATURES:append = " features/overlayfs/overlayfs.scc" 186# KERNEL_EXTRA_FEATURES:append = " features/overlayfs/overlayfs.scc"
190# TARGET_CFLAGS:append:pn-busybox = " -static" 187# TARGET_CFLAGS:append:pn-busybox = " -static"
191# 188#