summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-extended/ostree
diff options
context:
space:
mode:
authorJose Quaresma <quaresma.jose@gmail.com>2023-10-27 10:13:51 +0100
committerKhem Raj <raj.khem@gmail.com>2023-10-27 08:28:49 -0700
commit1f8808c22a29a35eb183250267df1e1010979641 (patch)
tree9a063abe3487ec9a1b3400cd42cff021fd3e6395 /meta-oe/recipes-extended/ostree
parentfadf647d3ec0d3b948841defa5574b60ba223310 (diff)
downloadmeta-openembedded-1f8808c22a29a35eb183250267df1e1010979641.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>
Diffstat (limited to 'meta-oe/recipes-extended/ostree')
-rw-r--r--meta-oe/recipes-extended/ostree/ostree_2023.6.bb10
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 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"
90PACKAGECONFIG[soup3] = "--with-soup3, --without-soup3, libsoup, , , soup2" 90PACKAGECONFIG[soup3] = "--with-soup3, --without-soup3, libsoup, , , soup2"
91PACKAGECONFIG[static] = "" 91PACKAGECONFIG[static] = ""
92PACKAGECONFIG[systemd] = "--with-libsystemd --with-systemdsystemunitdir=${systemd_system_unitdir}, --without-libsystemd, systemd" 92PACKAGECONFIG[systemd] = "--with-libsystemd --with-systemdsystemunitdir=${systemd_system_unitdir}, --without-libsystemd, systemd"
93PACKAGECONFIG[trivial-httpd-cmdline] = "--enable-trivial-httpd-cmdline, --disable-trivial-httpd-cmdline"
94 93
95EXTRA_OECONF = " \ 94EXTRA_OECONF = " \
96 ${@bb.utils.contains('PACKAGECONFIG', 'static', '--with-static-compiler=\'${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}\'', '', d)} \ 95 ${@bb.utils.contains('PACKAGECONFIG', 'static', '--with-static-compiler=\'${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}\'', '', d)} \
@@ -138,7 +137,6 @@ PACKAGE_BEFORE_PN = " \
138 ${PN}-grub \ 137 ${PN}-grub \
139 ${PN}-mkinitcpio \ 138 ${PN}-mkinitcpio \
140 ${PN}-switchroot \ 139 ${PN}-switchroot \
141 ${PN}-trivial-httpd \
142" 140"
143 141
144FILES:${PN} += " \ 142FILES:${PN} += " \
@@ -163,13 +161,7 @@ FILES:${PN}-switchroot = " \
163 ${nonarch_libdir}/${BPN}/ostree-prepare-root \ 161 ${nonarch_libdir}/${BPN}/ostree-prepare-root \
164 ${systemd_system_unitdir}/ostree-prepare-root.service \ 162 ${systemd_system_unitdir}/ostree-prepare-root.service \
165" 163"
166FILES:${PN}-trivial-httpd = " \
167 ${libexecdir}/libostree/ostree-trivial-httpd \
168"
169 164
170RDEPENDS:${PN} = " \
171 ${@bb.utils.contains('PACKAGECONFIG', 'trivial-httpd-cmdline', '${PN}-trivial-httpd', '', d)} \
172"
173RDEPENDS:${PN}-dracut = "bash" 165RDEPENDS:${PN}-dracut = "bash"
174RDEPENDS:${PN}-mkinitcpio = "bash" 166RDEPENDS:${PN}-mkinitcpio = "bash"
175RDEPENDS:${PN}:class-target = " \ 167RDEPENDS:${PN}:class-target = " \
@@ -182,7 +174,6 @@ RDEPENDS:${PN}:class-target = " \
182# 174#
183# xattr in DISTRO_FEATURES (default) 175# xattr in DISTRO_FEATURES (default)
184# static ostree-prepare-root 176# static ostree-prepare-root
185# ostree-trivial-httpd (requires soup - note soup and curl can coexist)
186# overlayfs in your kernel 177# overlayfs in your kernel
187# busybox built statically 178# busybox built statically
188# C.UTF-8 locale available (default) 179# C.UTF-8 locale available (default)
@@ -208,7 +199,6 @@ RDEPENDS:${PN}-ptest += " \
208 tar \ 199 tar \
209 util-linux \ 200 util-linux \
210 xz \ 201 xz \
211 ${PN}-trivial-httpd \
212 python3-pyyaml \ 202 python3-pyyaml \
213 ${@bb.utils.contains('PACKAGECONFIG', 'gjs', 'gjs', '', d)} \ 203 ${@bb.utils.contains('PACKAGECONFIG', 'gjs', 'gjs', '', d)} \
214" 204"