CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

ostree: drop trivial-httpd-cmdline

Browse Source 
Upstream reference:
0c36e8143d

Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 1f8808c22a)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Jose Quaresma 2023-10-27 10:13:51 +01:00 committed by Armin Kuster
parent e2bfb74c8b
commit 118169f3e0
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
meta-oe/recipes-extended/ostree/ostree_2023.6.bb
View File

@ -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)} \
"