diff options
| -rw-r--r-- | meta-oe/recipes-extended/ostree/ostree_2023.3.bb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta-oe/recipes-extended/ostree/ostree_2023.3.bb b/meta-oe/recipes-extended/ostree/ostree_2023.3.bb index 3129dc1140..dc771ce28a 100644 --- a/meta-oe/recipes-extended/ostree/ostree_2023.3.bb +++ b/meta-oe/recipes-extended/ostree/ostree_2023.3.bb | |||
| @@ -42,7 +42,7 @@ BUILD_OPTIMIZATION:append = " -O2" | |||
| 42 | # Package configuration - match ostree defaults, but without rofiles-fuse | 42 | # Package configuration - match ostree defaults, but without rofiles-fuse |
| 43 | # otherwise we introduce a dependendency on meta-filesystems and swap | 43 | # otherwise we introduce a dependendency on meta-filesystems and swap |
| 44 | # soup for curl to avoid bringing in deprecated libsoup2 (though | 44 | # soup for curl to avoid bringing in deprecated libsoup2 (though |
| 45 | # to run ptest requires that you have soup). | 45 | # to run ptest requires that you have soup2 or soup3). |
| 46 | PACKAGECONFIG ??= " \ | 46 | PACKAGECONFIG ??= " \ |
| 47 | ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ | 47 | ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ |
| 48 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd libmount', '', d)} \ | 48 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd libmount', '', d)} \ |
| @@ -85,7 +85,8 @@ PACKAGECONFIG[openssl] = "--with-crypto=openssl, , openssl, , , glib gnutls" | |||
| 85 | PACKAGECONFIG[rofiles-fuse] = "--enable-rofiles-fuse, --disable-rofiles-fuse, fuse3" | 85 | PACKAGECONFIG[rofiles-fuse] = "--enable-rofiles-fuse, --disable-rofiles-fuse, fuse3" |
| 86 | PACKAGECONFIG[selinux] = "--with-selinux, --without-selinux, libselinux, bubblewrap" | 86 | PACKAGECONFIG[selinux] = "--with-selinux, --without-selinux, libselinux, bubblewrap" |
| 87 | PACKAGECONFIG[smack] = "--with-smack, --without-smack, smack" | 87 | PACKAGECONFIG[smack] = "--with-smack, --without-smack, smack" |
| 88 | PACKAGECONFIG[soup] = "--with-soup, --without-soup --disable-glibtest, libsoup-2.4" | 88 | PACKAGECONFIG[soup2] = "--with-soup, --without-soup, libsoup-2.4, , , soup3" |
| 89 | PACKAGECONFIG[soup3] = "--with-soup3, --without-soup3, libsoup, , , soup2" | ||
| 89 | PACKAGECONFIG[static] = "" | 90 | PACKAGECONFIG[static] = "" |
| 90 | PACKAGECONFIG[systemd] = "--with-libsystemd --with-systemdsystemunitdir=${systemd_system_unitdir}, --without-libsystemd, systemd" | 91 | PACKAGECONFIG[systemd] = "--with-libsystemd --with-systemdsystemunitdir=${systemd_system_unitdir}, --without-libsystemd, systemd" |
| 91 | PACKAGECONFIG[trivial-httpd-cmdline] = "--enable-trivial-httpd-cmdline, --disable-trivial-httpd-cmdline" | 92 | PACKAGECONFIG[trivial-httpd-cmdline] = "--enable-trivial-httpd-cmdline, --disable-trivial-httpd-cmdline" |
| @@ -188,7 +189,7 @@ RDEPENDS:${PN}:class-target = " \ | |||
| 188 | # | 189 | # |
| 189 | # Something like this in your local.conf: | 190 | # Something like this in your local.conf: |
| 190 | # | 191 | # |
| 191 | # PACKAGECONFIG:append:pn-ostree = " static soup" | 192 | # PACKAGECONFIG:append:pn-ostree = " static soup3" |
| 192 | # KERNEL_EXTRA_FEATURES:append = " features/overlayfs/overlayfs.scc" | 193 | # KERNEL_EXTRA_FEATURES:append = " features/overlayfs/overlayfs.scc" |
| 193 | # TARGET_CFLAGS:append:pn-busybox = " -static" | 194 | # TARGET_CFLAGS:append:pn-busybox = " -static" |
| 194 | # | 195 | # |
