diff options
| author |   Jose Quaresma <quaresma.jose@gmail.com> | 2023-10-27 10:13:51 +0100 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2023-11-01 08:16:30 -0400 |
| commit | 118169f3e02f7251c82f4427de590c0203da7969 (patch) | |
| tree | 79785004cf232c29b6ad04cdda86b2e3602a1280 | |
| parent | e2bfb74c8be64c170686b5275d910bbb28a667b7 (diff) | |
| download | meta-openembedded-118169f3e02f7251c82f4427de590c0203da7969.tar.gz | |
ostree: drop trivial-httpd-cmdline
Upstream reference:
https://github.com/ostreedev/ostree/commit/0c36e8143d3c95d454b65c38f923cf71d08d5eb7
Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 1f8808c22a29a35eb183250267df1e1010979641)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | meta-oe/recipes-extended/ostree/ostree_2023.6.bb | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/meta-oe/recipes-extended/ostree/ostree_2023.6.bb b/meta-oe/recipes-extended/ostree/ostree_2023.6.bb index f567e6afe3..264440d235 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)} \ " |