diff mbox series

[meta-oe,2/4] ostree: drop trivial-httpd-cmdline

Message ID 20231027091353.1700511-2-jose.quaresma@foundries.io
State Under Review
Headers show
Series [meta-oe,1/4] ostree: Upgrade 2023.5 -> 2023.6 | expand

Commit Message

Jose Quaresma Oct. 27, 2023, 9:13 a.m. UTC 
Upstream reference:
https://github.com/ostreedev/ostree/commit/0c36e8143d3c95d454b65c38f923cf71d08d5eb7

Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
---
 meta-oe/recipes-extended/ostree/ostree_2023.6.bb | 10 ----------
 1 file changed, 10 deletions(-)
diff mbox series

Patch

diff --git a/meta-oe/recipes-extended/ostree/ostree_2023.6.bb b/meta-oe/recipes-extended/ostree/ostree_2023.6.bb
index f567e6afe..264440d23 100644
--- a/meta-oe/recipes-extended/ostree/ostree_2023.6.bb
+++ b/meta-oe/recipes-extended/ostree/ostree_2023.6.bb
@@ -90,7 +90,6 @@  PACKAGECONFIG[soup2] = "--with-soup, --without-soup, libsoup-2.4, , , soup3"
 PACKAGECONFIG[soup3] = "--with-soup3, --without-soup3, libsoup, , , soup2"
 PACKAGECONFIG[static] = ""
 PACKAGECONFIG[systemd] = "--with-libsystemd --with-systemdsystemunitdir=${systemd_system_unitdir}, --without-libsystemd, systemd"
-PACKAGECONFIG[trivial-httpd-cmdline] = "--enable-trivial-httpd-cmdline, --disable-trivial-httpd-cmdline"
 
 EXTRA_OECONF = " \
     ${@bb.utils.contains('PACKAGECONFIG', 'static', '--with-static-compiler=\'${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}\'', '', d)} \
@@ -138,7 +137,6 @@  PACKAGE_BEFORE_PN = " \
     ${PN}-grub \
     ${PN}-mkinitcpio \
     ${PN}-switchroot \
-    ${PN}-trivial-httpd \
 "
 
 FILES:${PN} += " \
@@ -163,13 +161,7 @@  FILES:${PN}-switchroot = " \
     ${nonarch_libdir}/${BPN}/ostree-prepare-root \
     ${systemd_system_unitdir}/ostree-prepare-root.service \
 "
-FILES:${PN}-trivial-httpd = " \
-    ${libexecdir}/libostree/ostree-trivial-httpd \
-"
 
-RDEPENDS:${PN} = " \
-    ${@bb.utils.contains('PACKAGECONFIG', 'trivial-httpd-cmdline', '${PN}-trivial-httpd', '', d)} \
-"
 RDEPENDS:${PN}-dracut = "bash"
 RDEPENDS:${PN}-mkinitcpio = "bash"
 RDEPENDS:${PN}:class-target = " \
@@ -182,7 +174,6 @@  RDEPENDS:${PN}:class-target = " \
 #
 #   xattr in DISTRO_FEATURES (default)
 #   static ostree-prepare-root
-#   ostree-trivial-httpd (requires soup - note soup and curl can coexist)
 #   overlayfs in your kernel
 #   busybox built statically
 #   C.UTF-8 locale available (default)
@@ -208,7 +199,6 @@  RDEPENDS:${PN}-ptest += " \
     tar \
     util-linux \
     xz \
-    ${PN}-trivial-httpd \
     python3-pyyaml \
     ${@bb.utils.contains('PACKAGECONFIG', 'gjs', 'gjs', '', d)} \
 "