From 54ed6730ababb4a8c7157965ff07ff8b5d1b954e Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Mon, 29 Jul 2024 18:01:26 +0100 Subject: ostree: Upgrade 2024.6 -> 2024.7 $ git --no-pager log --oneline v2024.6...v2024.7 4941d9cd (tag: v2024.7) Release 2024.7 4b96359e Merge pull request #3277 from cgwalters/karg-disable-composefs e226c876 prepare-root: Add `ostree.prepare-root.composefs` 5378fe2a Merge pull request #3276 from cgwalters/parse-bool 65ff4041 prepare-root: Gather kernel cmdline early 26abca71 keyfile-utils: Add API to parse tristate strings 47edd1a2 keyfile-utils: Add API to parse tristate strings 97fb1112 Merge pull request #3275 from ueno/wip/dueno/glib-2.44 a0bd1894 libostree: Remove compatibility code with GLib < 2.44 d7eb9a10 Merge pull request #3273 from cgwalters/drop-library-printf 772801fa sysroot: Use journal rather than printf() 9b977e28 Merge pull request #3265 from lukewarmtemp/2023.8-3-coverity-scan e99693c7 prepare: Create global var for tmp_sysroot_etc d528083c repo: Fix `dir_or_file_path` memory leak 20d5bc84 commit: Null terminate `target_buf` var dc9eaef1 tree: Fix `name` memory leak 0ea7d2e3 Merge pull request #3269 from cgwalters/fix-ordering 1db6911e Merge pull request #3270 from cgwalters/bump-runners 0153abe4 ci: Bump bootc e2e to latest ubuntu, drop docker 1544d205 Merge pull request #3268 from ueno/wip/dueno/composefs-doc-fixes b0ab531e remount: Drop `Before=systemd-sysusers.service` 371540f9 repo: Remove leftover OpenSSL includes 023888d8 docs/composefs: Fix reference to `ostree sign` f280b121 Merge pull request #3266 from ericcurtin/if-file-missing-on-relabel-continue e25ca809 remount: ignore ENOENT error during SELinux relabeling 8f559e94 Merge pull request #3261 from cgwalters/validate-xattrs e19f7324 core: Validate that xattr names aren't empty ac6ba439 Merge pull request #3259 from cgwalters/c9s-buildroot 3ef9ae95 ci: Add buildroot to c9s build 114118e4 Merge pull request #3258 from cgwalters/prepare-comments f63b7512 docs: Describe `/boot/ostree` b6052306 Merge pull request #3253 from cgwalters/prepare-comments a2ae2879 Merge pull request #3252 from cgwalters/checkout-cfs f041e025 prepare-root: Cleanup comments c0a715f1 checkout: Add API to directly checkout composefs e84dc966 Merge pull request #3249 from ericcurtin/add-webos 1ab70be7 Merge pull request #3250 from ericcurtin/minor-bootloader-doc-change bee18edf docs: make /ostree/root.X clearer as symlinks fef5feca docs: add webOS as users of libostree 64a09da0 Merge pull request #3246 from jmarrero/release-2024.6 32bec27a configure: post-release version bump Signed-off-by: Jose Quaresma Signed-off-by: Khem Raj --- meta-oe/recipes-extended/ostree/ostree_2024.6.bb | 215 ----------------------- meta-oe/recipes-extended/ostree/ostree_2024.7.bb | 215 +++++++++++++++++++++++ 2 files changed, 215 insertions(+), 215 deletions(-) delete mode 100644 meta-oe/recipes-extended/ostree/ostree_2024.6.bb create mode 100644 meta-oe/recipes-extended/ostree/ostree_2024.7.bb (limited to 'meta-oe') diff --git a/meta-oe/recipes-extended/ostree/ostree_2024.6.bb b/meta-oe/recipes-extended/ostree/ostree_2024.6.bb deleted file mode 100644 index 7f30dbfc5a..0000000000 --- a/meta-oe/recipes-extended/ostree/ostree_2024.6.bb +++ /dev/null @@ -1,215 +0,0 @@ -SUMMARY = "Versioned Operating System Repository." -DESCRIPTION = "libostree is both a shared library and suite of command line \ -tools that combines a \"git-like\" model for committing and downloading \ -bootable filesystem trees, along with a layer for deploying them and managing \ -the bootloader configuration." -HOMEPAGE = "https://ostree.readthedocs.io" -LICENSE = "LGPL-2.1-only" - -LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" - -DEPENDS = " \ - glib-2.0-native \ - glib-2.0 \ - e2fsprogs \ - libcap \ - zlib \ - xz \ - bison-native \ -" - -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] = "8b61c856697aa412f2f1724322ada40bdd7b1bf9e7783e2c594faa7a594f868f" - -S = "${WORKDIR}/libostree-${PV}" - -inherit autotools bash-completion gobject-introspection github-releases 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] -# so remove -Og and use -O2 as workaround -DEBUG_OPTIMIZATION:remove = "-Og" -DEBUG_OPTIMIZATION:append = " -O2" -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 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 \ - curl \ -" - -# 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 \ - curl \ -" - -PACKAGECONFIG:class-nativesdk ??= " \ - ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ - builtin-grub2-mkconfig \ - gpgme \ - curl \ -" - -PACKAGECONFIG[avahi] = "--with-avahi, --without-avahi, avahi" -PACKAGECONFIG[builtin-grub2-mkconfig] = "--with-builtin-grub2-mkconfig, --without-builtin-grub2-mkconfig" -PACKAGECONFIG[composefs] = "--with-composefs, --without-composefs, composefs" -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" -PACKAGECONFIG[gpgme] = "--with-gpgme, --without-gpgme, gpgme" -PACKAGECONFIG[libarchive] = "--with-libarchive, --without-libarchive, libarchive" -PACKAGECONFIG[libmount] = "--with-libmount, --without-libmount, util-linux" -PACKAGECONFIG[manpages] = "--enable-man, --disable-man, libxslt-native docbook-xsl-stylesheets-native" -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, fuse3" -PACKAGECONFIG[selinux] = "--with-selinux, --without-selinux, libselinux, bubblewrap" -PACKAGECONFIG[smack] = "--with-smack, --without-smack, smack" -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" - -EXTRA_OECONF = " \ - ${@bb.utils.contains('PACKAGECONFIG', 'static', '--with-static-compiler=\'${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}\'', '', d)} \ -" - -# Makefile-libostree.am overrides this to avoid a build problem with clang, -# but that fix breaks cross compilation and we don't need it -EXTRA_OEMAKE = " \ - INTROSPECTION_SCANNER_ENV= \ -" - -EXTRA_OECONF:class-native = " \ - --enable-wrpseudo-compat \ - --disable-otmpfile \ -" - -EXTRA_OECONF:class-nativesdk = " \ - --enable-wrpseudo-compat \ - --disable-otmpfile \ -" - -# Path to ${prefix}/lib/ostree/ostree-grub-generator is hardcoded on the -# do_configure stage so we do depend on it -SYSROOT_DIR = "${STAGING_DIR_TARGET}" -SYSROOT_DIR:class-native = "${STAGING_DIR_NATIVE}" -do_configure[vardeps] += "SYSROOT_DIR" - -do_configure:prepend() { - # this reflects what autogen.sh does, but the OE wrappers for autoreconf - # allow it to work without the other gyrations which exist there - cp ${S}/libglnx/Makefile-libglnx.am ${S}/libglnx/Makefile-libglnx.am.inc - cp ${S}/bsdiff/Makefile-bsdiff.am ${S}/bsdiff/Makefile-bsdiff.am.inc -} - -do_install:append:class-native() { - create_wrapper ${D}${bindir}/ostree OSTREE_GRUB2_EXEC="${STAGING_LIBDIR_NATIVE}/ostree/ostree-grub-generator" -} - -do_install:append:class-nativesdk() { - create_wrapper ${D}${bindir}/ostree OSTREE_GRUB2_EXEC="\$OECORE_NATIVE_SYSROOT/usr/lib/ostree/ostree-grub-generator" -} - -PACKAGE_BEFORE_PN = " \ - ${PN}-dracut \ - ${PN}-grub \ - ${PN}-mkinitcpio \ - ${PN}-switchroot \ -" - -FILES:${PN} += " \ - ${nonarch_libdir}/${BPN} \ - ${nonarch_libdir}/tmpfiles.d \ - ${systemd_system_unitdir} \ - ${systemd_unitdir}/system-generators \ -" -FILES:${PN}-dracut = " \ - ${sysconfdir}/dracut.conf.d \ - ${libdir}/dracut \ -" -FILES:${PN}-grub = " \ - ${sysconfdir}/grub.d \ - ${libexecdir}/libostree/grub2-15_ostree \ -" -FILES:${PN}-mkinitcpio = " \ - ${sysconfdir}/ostree-mkinitcpio.conf \ - ${libdir}/initcpio \ -" -FILES:${PN}-switchroot = " \ - ${nonarch_libdir}/${BPN}/ostree-prepare-root \ - ${systemd_system_unitdir}/ostree-prepare-root.service \ -" - -RDEPENDS:${PN}-dracut = "bash" -RDEPENDS:${PN}-mkinitcpio = "bash" -RDEPENDS:${PN}:class-target = " \ - ${@bb.utils.contains('PACKAGECONFIG', 'gpgme', 'gnupg', '', d)} \ - ${PN}-switchroot \ -" - -# -# Note that to get ptest to pass you also need: -# -# xattr in DISTRO_FEATURES (default) -# static ostree-prepare-root -# overlayfs in your kernel -# busybox built statically -# 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 \ - bash \ - coreutils \ - cpio \ - diffutils \ - findutils \ - grep \ - locale-base-en-us \ - python3-core \ - python3-multiprocessing \ - strace \ - tar \ - util-linux \ - xz \ - 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" - -SYSTEMD_SERVICE:${PN} = "ostree-remount.service ostree-finalize-staged.path" -SYSTEMD_SERVICE:${PN}-switchroot = "ostree-prepare-root.service" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-extended/ostree/ostree_2024.7.bb b/meta-oe/recipes-extended/ostree/ostree_2024.7.bb new file mode 100644 index 0000000000..8cecf53349 --- /dev/null +++ b/meta-oe/recipes-extended/ostree/ostree_2024.7.bb @@ -0,0 +1,215 @@ +SUMMARY = "Versioned Operating System Repository." +DESCRIPTION = "libostree is both a shared library and suite of command line \ +tools that combines a \"git-like\" model for committing and downloading \ +bootable filesystem trees, along with a layer for deploying them and managing \ +the bootloader configuration." +HOMEPAGE = "https://ostree.readthedocs.io" +LICENSE = "LGPL-2.1-only" + +LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" + +DEPENDS = " \ + glib-2.0-native \ + glib-2.0 \ + e2fsprogs \ + libcap \ + zlib \ + xz \ + bison-native \ +" + +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] = "72451efffe5a10acb4cfdd6eb849db97fa9e61a81e4113fc656eece77eb93355" + +S = "${WORKDIR}/libostree-${PV}" + +inherit autotools bash-completion gobject-introspection github-releases 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] +# so remove -Og and use -O2 as workaround +DEBUG_OPTIMIZATION:remove = "-Og" +DEBUG_OPTIMIZATION:append = " -O2" +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 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 \ + curl \ +" + +# 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 \ + curl \ +" + +PACKAGECONFIG:class-nativesdk ??= " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ + builtin-grub2-mkconfig \ + gpgme \ + curl \ +" + +PACKAGECONFIG[avahi] = "--with-avahi, --without-avahi, avahi" +PACKAGECONFIG[builtin-grub2-mkconfig] = "--with-builtin-grub2-mkconfig, --without-builtin-grub2-mkconfig" +PACKAGECONFIG[composefs] = "--with-composefs, --without-composefs, composefs" +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" +PACKAGECONFIG[gpgme] = "--with-gpgme, --without-gpgme, gpgme" +PACKAGECONFIG[libarchive] = "--with-libarchive, --without-libarchive, libarchive" +PACKAGECONFIG[libmount] = "--with-libmount, --without-libmount, util-linux" +PACKAGECONFIG[manpages] = "--enable-man, --disable-man, libxslt-native docbook-xsl-stylesheets-native" +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, fuse3" +PACKAGECONFIG[selinux] = "--with-selinux, --without-selinux, libselinux, bubblewrap" +PACKAGECONFIG[smack] = "--with-smack, --without-smack, smack" +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" + +EXTRA_OECONF = " \ + ${@bb.utils.contains('PACKAGECONFIG', 'static', '--with-static-compiler=\'${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}\'', '', d)} \ +" + +# Makefile-libostree.am overrides this to avoid a build problem with clang, +# but that fix breaks cross compilation and we don't need it +EXTRA_OEMAKE = " \ + INTROSPECTION_SCANNER_ENV= \ +" + +EXTRA_OECONF:class-native = " \ + --enable-wrpseudo-compat \ + --disable-otmpfile \ +" + +EXTRA_OECONF:class-nativesdk = " \ + --enable-wrpseudo-compat \ + --disable-otmpfile \ +" + +# Path to ${prefix}/lib/ostree/ostree-grub-generator is hardcoded on the +# do_configure stage so we do depend on it +SYSROOT_DIR = "${STAGING_DIR_TARGET}" +SYSROOT_DIR:class-native = "${STAGING_DIR_NATIVE}" +do_configure[vardeps] += "SYSROOT_DIR" + +do_configure:prepend() { + # this reflects what autogen.sh does, but the OE wrappers for autoreconf + # allow it to work without the other gyrations which exist there + cp ${S}/libglnx/Makefile-libglnx.am ${S}/libglnx/Makefile-libglnx.am.inc + cp ${S}/bsdiff/Makefile-bsdiff.am ${S}/bsdiff/Makefile-bsdiff.am.inc +} + +do_install:append:class-native() { + create_wrapper ${D}${bindir}/ostree OSTREE_GRUB2_EXEC="${STAGING_LIBDIR_NATIVE}/ostree/ostree-grub-generator" +} + +do_install:append:class-nativesdk() { + create_wrapper ${D}${bindir}/ostree OSTREE_GRUB2_EXEC="\$OECORE_NATIVE_SYSROOT/usr/lib/ostree/ostree-grub-generator" +} + +PACKAGE_BEFORE_PN = " \ + ${PN}-dracut \ + ${PN}-grub \ + ${PN}-mkinitcpio \ + ${PN}-switchroot \ +" + +FILES:${PN} += " \ + ${nonarch_libdir}/${BPN} \ + ${nonarch_libdir}/tmpfiles.d \ + ${systemd_system_unitdir} \ + ${systemd_unitdir}/system-generators \ +" +FILES:${PN}-dracut = " \ + ${sysconfdir}/dracut.conf.d \ + ${libdir}/dracut \ +" +FILES:${PN}-grub = " \ + ${sysconfdir}/grub.d \ + ${libexecdir}/libostree/grub2-15_ostree \ +" +FILES:${PN}-mkinitcpio = " \ + ${sysconfdir}/ostree-mkinitcpio.conf \ + ${libdir}/initcpio \ +" +FILES:${PN}-switchroot = " \ + ${nonarch_libdir}/${BPN}/ostree-prepare-root \ + ${systemd_system_unitdir}/ostree-prepare-root.service \ +" + +RDEPENDS:${PN}-dracut = "bash" +RDEPENDS:${PN}-mkinitcpio = "bash" +RDEPENDS:${PN}:class-target = " \ + ${@bb.utils.contains('PACKAGECONFIG', 'gpgme', 'gnupg', '', d)} \ + ${PN}-switchroot \ +" + +# +# Note that to get ptest to pass you also need: +# +# xattr in DISTRO_FEATURES (default) +# static ostree-prepare-root +# overlayfs in your kernel +# busybox built statically +# 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 \ + bash \ + coreutils \ + cpio \ + diffutils \ + findutils \ + grep \ + locale-base-en-us \ + python3-core \ + python3-multiprocessing \ + strace \ + tar \ + util-linux \ + xz \ + 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" + +SYSTEMD_SERVICE:${PN} = "ostree-remount.service ostree-finalize-staged.path" +SYSTEMD_SERVICE:${PN}-switchroot = "ostree-prepare-root.service" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf