diff options
Diffstat (limited to 'meta-oe/recipes-extended/ostree')
| -rw-r--r-- | meta-oe/recipes-extended/ostree/ostree/0001-Remove-unused-linux-fs.h-includes.patch | 42 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/ostree/ostree/0001-libostree-Remove-including-sys-mount.h.patch | 29 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/ostree/ostree/0001-s390x-se-luks-gencpio-There-is-no-bashism.patch | 25 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/ostree/ostree_2024.5.bb (renamed from meta-oe/recipes-extended/ostree/ostree_2022.5.bb) | 75 |
4 files changed, 38 insertions, 133 deletions
diff --git a/meta-oe/recipes-extended/ostree/ostree/0001-Remove-unused-linux-fs.h-includes.patch b/meta-oe/recipes-extended/ostree/ostree/0001-Remove-unused-linux-fs.h-includes.patch deleted file mode 100644 index 2659e4696d..0000000000 --- a/meta-oe/recipes-extended/ostree/ostree/0001-Remove-unused-linux-fs.h-includes.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 7d32c352f628747cfadabf9fe7fcc13608e5dfe6 Mon Sep 17 00:00:00 2001 -From: Colin Walters <walters@verbum.org> -Date: Wed, 3 Aug 2022 10:37:40 -0400 -Subject: [PATCH] Remove unused `linux/fs.h` includes - -Prep for fixing conflicts introduced by newer glibc. -cc https://github.com/ostreedev/ostree/issues/2685 - -Upstream-Status: Backport [https://github.com/ostreedev/ostree/commit/edba4b33be10c05253bfa94895dfbc8477e44d76] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/libostree/ostree-repo-commit.c | 1 - - src/ostree/ot-main.c | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c -index afab3fdf..35b16c71 100644 ---- a/src/libostree/ostree-repo-commit.c -+++ b/src/libostree/ostree-repo-commit.c -@@ -30,7 +30,6 @@ - #include <sys/xattr.h> - #include <glib/gprintf.h> - #include <sys/ioctl.h> --#include <linux/fs.h> - #include <ext2fs/ext2_fs.h> - - #include "otutil.h" -diff --git a/src/ostree/ot-main.c b/src/ostree/ot-main.c -index b7b50d67..7a4405a5 100644 ---- a/src/ostree/ot-main.c -+++ b/src/ostree/ot-main.c -@@ -28,7 +28,6 @@ - #include <string.h> - #include <sys/statvfs.h> - #include <sys/mount.h> --#include <linux/fs.h> - - #include "ot-main.h" - #include "ostree.h" --- -2.37.1 - diff --git a/meta-oe/recipes-extended/ostree/ostree/0001-libostree-Remove-including-sys-mount.h.patch b/meta-oe/recipes-extended/ostree/ostree/0001-libostree-Remove-including-sys-mount.h.patch deleted file mode 100644 index 5c2792cf89..0000000000 --- a/meta-oe/recipes-extended/ostree/ostree/0001-libostree-Remove-including-sys-mount.h.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 7ff956e4088e0bdc6bfd429f99124a8a9256c181 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 6 Aug 2022 21:44:11 -0700 -Subject: [PATCH] libostree: Remove including sys/mount.h - -This conflicts with linux/mount.h which is included by linux/fs.h -with glibc 2.36+ - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/libostree/ostree-sysroot-deploy.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c -index 2dc9f58b..61b19e42 100644 ---- a/src/libostree/ostree-sysroot-deploy.c -+++ b/src/libostree/ostree-sysroot-deploy.c -@@ -23,7 +23,6 @@ - #include <gio/gunixoutputstream.h> - #include <glib-unix.h> - #include <stdint.h> --#include <sys/mount.h> - #include <sys/statvfs.h> - #include <sys/socket.h> - #include <sys/ioctl.h> --- -2.37.1 - diff --git a/meta-oe/recipes-extended/ostree/ostree/0001-s390x-se-luks-gencpio-There-is-no-bashism.patch b/meta-oe/recipes-extended/ostree/ostree/0001-s390x-se-luks-gencpio-There-is-no-bashism.patch deleted file mode 100644 index 5cf5784f14..0000000000 --- a/meta-oe/recipes-extended/ostree/ostree/0001-s390x-se-luks-gencpio-There-is-no-bashism.patch +++ /dev/null @@ -1,25 +0,0 @@ -From dd55633e49aa43dede3c8e1770ae8761487f050e Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 6 Aug 2022 21:52:31 -0700 -Subject: [PATCH] s390x-se-luks-gencpio: There is no bashism - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/libostree/s390x-se-luks-gencpio | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libostree/s390x-se-luks-gencpio b/src/libostree/s390x-se-luks-gencpio -index e821e2fe..96c1d123 100755 ---- a/src/libostree/s390x-se-luks-gencpio -+++ b/src/libostree/s390x-se-luks-gencpio -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - # This script creates new initramdisk with LUKS config within - set -euo pipefail - --- -2.37.1 - diff --git a/meta-oe/recipes-extended/ostree/ostree_2022.5.bb b/meta-oe/recipes-extended/ostree/ostree_2024.5.bb index a21c473f0a..2ea92f190c 100644 --- a/meta-oe/recipes-extended/ostree/ostree_2022.5.bb +++ b/meta-oe/recipes-extended/ostree/ostree_2024.5.bb @@ -9,6 +9,7 @@ LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" DEPENDS = " \ + glib-2.0-native \ glib-2.0 \ e2fsprogs \ libcap \ @@ -17,20 +18,17 @@ DEPENDS = " \ bison-native \ " -SRC_URI = " \ - gitsm://github.com/ostreedev/ostree;branch=main;protocol=https \ - file://0001-Remove-unused-linux-fs.h-includes.patch \ - file://0001-libostree-Remove-including-sys-mount.h.patch \ - file://0001-s390x-se-luks-gencpio-There-is-no-bashism.patch \ - file://run-ptest \ -" -SRCREV = "15740d042c9c5258a1c082b5e228cf6f115edbb0" +GITHUB_BASE_URI = "https://github.com/ostreedev/ostree/releases" +SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/libostree-${PV}.tar.xz \ + file://run-ptest \ + " +SRC_URI[sha256sum] = "bc12d8493db64152093ee5be77cf62a29cc67a4a9e430dc987103e78aada4a6f" -UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+)" +S = "${WORKDIR}/libostree-${PV}" -S = "${WORKDIR}/git" +inherit autotools bash-completion gobject-introspection github-releases gtk-doc manpages pkgconfig ptest-gnome systemd -inherit autotools bash-completion gobject-introspection gtk-doc manpages pkgconfig ptest-gnome systemd +UNKNOWN_CONFIGURE_OPT_IGNORE = "--disable-introspection --enable-introspection" # Workaround compile failure: # |../git/src/libotutil/zbase32.c:37:1: error: function returns an aggregate [-Werror=aggregate-return] @@ -41,29 +39,32 @@ BUILD_OPTIMIZATION:remove = "-Og" BUILD_OPTIMIZATION:append = " -O2" # Package configuration - match ostree defaults, but without rofiles-fuse -# otherwise we introduce a dependendency on meta-filesystems +# otherwise we introduce a dependendency on meta-filesystems and swap +# soup for curl to avoid bringing in deprecated libsoup2 (though +# to run ptest requires that you have soup2 or soup3). PACKAGECONFIG ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd libmount', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'soup3', '', d)} \ glib \ gpgme \ - soup \ + curl \ " -# We include soup because ostree can't (currently) be built without +# We include curl because ostree can't (currently) be built without # soup or curl - https://github.com/ostreedev/ostree/issues/1897 PACKAGECONFIG:class-native ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ builtin-grub2-mkconfig \ gpgme \ - soup \ + curl \ " PACKAGECONFIG:class-nativesdk ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ builtin-grub2-mkconfig \ gpgme \ - soup \ + curl \ " PACKAGECONFIG[avahi] = "--with-avahi, --without-avahi, avahi" @@ -71,6 +72,7 @@ PACKAGECONFIG[builtin-grub2-mkconfig] = "--with-builtin-grub2-mkconfig, --withou PACKAGECONFIG[curl] = "--with-curl, --without-curl, curl" PACKAGECONFIG[dracut] = "--with-dracut, --without-dracut" PACKAGECONFIG[ed25519-libsodium] = "--with-ed25519-libsodium, --without-ed25519-libsodium, libsodium" +PACKAGECONFIG[ed25519-openssl] = "--with-openssl, --without-openssl, openssl" PACKAGECONFIG[gjs] = "ac_cv_path_GJS=${bindir}/gjs" PACKAGECONFIG[glib] = "--with-crypto=glib, , , , , gnutls openssl" PACKAGECONFIG[gnutls] = "--with-crypto=gnutls, , gnutls, , , glib openssl" @@ -81,13 +83,13 @@ PACKAGECONFIG[manpages] = "--enable-man, --disable-man, libxslt-native docbook-x PACKAGECONFIG[mkinitcpio] = "--with-mkinitcpio, --without-mkinitcpio" PACKAGECONFIG[no-http2] = "--disable-http2, --enable-http2" PACKAGECONFIG[openssl] = "--with-crypto=openssl, , openssl, , , glib gnutls" -PACKAGECONFIG[rofiles-fuse] = "--enable-rofiles-fuse, --disable-rofiles-fuse, fuse" -PACKAGECONFIG[selinux] = "--with-selinux, --without-selinux, libselinux" +PACKAGECONFIG[rofiles-fuse] = "--enable-rofiles-fuse, --disable-rofiles-fuse, fuse3" +PACKAGECONFIG[selinux] = "--with-selinux, --without-selinux, libselinux, bubblewrap" PACKAGECONFIG[smack] = "--with-smack, --without-smack, smack" -PACKAGECONFIG[soup] = "--with-soup, --without-soup --disable-glibtest, libsoup-2.4" +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_unitdir}/system, --without-libsystemd, systemd" -PACKAGECONFIG[trivial-httpd-cmdline] = "--enable-trivial-httpd-cmdline, --disable-trivial-httpd-cmdline" +PACKAGECONFIG[systemd] = "--with-libsystemd --with-systemdsystemunitdir=${systemd_system_unitdir}, --without-libsystemd, systemd" EXTRA_OECONF = " \ ${@bb.utils.contains('PACKAGECONFIG', 'static', '--with-static-compiler=\'${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}\'', '', d)} \ @@ -135,13 +137,12 @@ PACKAGE_BEFORE_PN = " \ ${PN}-grub \ ${PN}-mkinitcpio \ ${PN}-switchroot \ - ${PN}-trivial-httpd \ " FILES:${PN} += " \ ${nonarch_libdir}/${BPN} \ ${nonarch_libdir}/tmpfiles.d \ - ${systemd_unitdir}/system \ + ${systemd_system_unitdir} \ ${systemd_unitdir}/system-generators \ " FILES:${PN}-dracut = " \ @@ -158,15 +159,9 @@ FILES:${PN}-mkinitcpio = " \ " FILES:${PN}-switchroot = " \ ${nonarch_libdir}/${BPN}/ostree-prepare-root \ - ${systemd_unitdir}/system/ostree-prepare-root.service \ -" -FILES:${PN}-trivial-httpd = " \ - ${libexecdir}/libostree/ostree-trivial-httpd \ + ${systemd_system_unitdir}/ostree-prepare-root.service \ " -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 = " \ @@ -177,13 +172,18 @@ RDEPENDS:${PN}:class-target = " \ # # Note that to get ptest to pass you also need: # -# xattr in DISTRO_FEATURES -# static ostree-prepare-root (PACKAGECONFIG:append:pn-ostree = " static") -# meta-python in your layers -# overlayfs in your kernel (KERNEL_EXTRA_FEATURES += "features/overlayfs/overlayfs.scc") +# xattr in DISTRO_FEATURES (default) +# static ostree-prepare-root +# overlayfs in your kernel # busybox built statically -# /var/tmp as a real filesystem (not a tmpfs) -# Sufficient disk space (IMAGE_ROOTFS_SIZE = "524288") and RAM (QB_MEM = "-m 1024") +# C.UTF-8 locale available (default) +# Sufficient disk space/RAM (e.g. core-image-sato-sdk) +# +# Something like this in your local.conf: +# +# PACKAGECONFIG:append:pn-ostree = " static soup3" +# KERNEL_EXTRA_FEATURES:append = " features/overlayfs/overlayfs.scc" +# TARGET_CFLAGS:append:pn-busybox = " -static" # RDEPENDS:${PN}-ptest += " \ attr \ @@ -193,16 +193,17 @@ RDEPENDS:${PN}-ptest += " \ diffutils \ findutils \ grep \ + locale-base-en-us \ python3-core \ python3-multiprocessing \ strace \ tar \ util-linux \ xz \ - ${PN}-trivial-httpd \ python3-pyyaml \ ${@bb.utils.contains('PACKAGECONFIG', 'gjs', 'gjs', '', d)} \ " +RDEPENDS:${PN}-ptest:remove:riscv32 = "strace" RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-utils glibc-localedata-en-us" RRECOMMENDS:${PN}:append:class-target = " kernel-module-overlay" |