From 9bca3262df0c162d210ae036bb20899da3685f5d Mon Sep 17 00:00:00 2001 From: Ricardo Salveti Date: Fri, 25 Oct 2019 15:21:20 -0300 Subject: Drop ostree_git in favor of the ostree recipe from meta-oe. A newer ostree recipe is now provided via the meta-oe layer, so drop local ostree_git recipe in favor of the latest one from meta-oe. Local bbappend created to enable curl, libarchive and ostree-grub-generator, which were all enabled by default in ostree_git, besides disabling soup as that is not really needed with curl (and wasn't previously enabled). Signed-off-by: Ricardo Salveti --- ...clare-ostree_boot_SCRIPTS-and-append-valu.patch | 60 +++++++++++++++++++ recipes-extended/ostree/ostree_%.bbappend | 18 ++++++ recipes-sota/ostree/ostree_git.bb | 69 ---------------------- 3 files changed, 78 insertions(+), 69 deletions(-) create mode 100644 recipes-extended/ostree/ostree/0001-Makefile-declare-ostree_boot_SCRIPTS-and-append-valu.patch create mode 100644 recipes-extended/ostree/ostree_%.bbappend delete mode 100644 recipes-sota/ostree/ostree_git.bb diff --git a/recipes-extended/ostree/ostree/0001-Makefile-declare-ostree_boot_SCRIPTS-and-append-valu.patch b/recipes-extended/ostree/ostree/0001-Makefile-declare-ostree_boot_SCRIPTS-and-append-valu.patch new file mode 100644 index 0000000..1f8a06b --- /dev/null +++ b/recipes-extended/ostree/ostree/0001-Makefile-declare-ostree_boot_SCRIPTS-and-append-valu.patch @@ -0,0 +1,60 @@ +From de8e0765a4a54f0367999f682ce4cc53bfaa60b0 Mon Sep 17 00:00:00 2001 +From: Ricardo Salveti +Date: Tue, 5 Nov 2019 21:16:07 -0300 +Subject: [PATCH] Makefile: declare ostree_boot_SCRIPTS and append values + +ostree_boot_SCRIPTS was being set on both Makefile-boot.am and +Makefile-switchroot.am, causing the first one to be replaced by the +other at the final Makefile, so declare as empty and append on both +places instead. + +Upstream-Status: Backport + +Signed-off-by: Ricardo Salveti +--- + Makefile-boot.am | 2 +- + Makefile-decls.am | 1 + + Makefile-switchroot.am | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/Makefile-boot.am b/Makefile-boot.am +index b4d4a1af..b51928f0 100644 +--- a/Makefile-boot.am ++++ b/Makefile-boot.am +@@ -60,7 +60,7 @@ grub2configdir = $(sysconfdir)/grub.d + INSTALL_DATA_HOOKS += install-grub2-config-hook + else + # We're using our internal generator +-ostree_boot_SCRIPTS = src/boot/grub2/ostree-grub-generator ++ostree_boot_SCRIPTS += src/boot/grub2/ostree-grub-generator + endif + + EXTRA_DIST += src/boot/dracut/module-setup.sh \ +diff --git a/Makefile-decls.am b/Makefile-decls.am +index 115c19fb..086ee138 100644 +--- a/Makefile-decls.am ++++ b/Makefile-decls.am +@@ -47,6 +47,7 @@ typelibdir = $(libdir)/girepository-1.0 + typelib_DATA = + gsettings_SCHEMAS = + ostree_bootdir = $(prefix)/lib/ostree ++ostree_boot_SCRIPTS = + ostree_boot_PROGRAMS = + + # This initializes some more variables +diff --git a/Makefile-switchroot.am b/Makefile-switchroot.am +index ff44d4bc..b81b843f 100644 +--- a/Makefile-switchroot.am ++++ b/Makefile-switchroot.am +@@ -42,7 +42,7 @@ if BUILDOPT_USE_STATIC_COMPILER + # to get autotools to install this as an executable but without generating rules + # to make it itself which we have specified manually. See + # https://lists.gnu.org/archive/html/help-gnu-utils/2007-01/msg00007.html +-ostree_boot_SCRIPTS = ostree-prepare-root ++ostree_boot_SCRIPTS += ostree-prepare-root + + ostree-prepare-root : $(ostree_prepare_root_SOURCES) + $(STATIC_COMPILER) -o $@ -static $(top_srcdir)/src/switchroot/ostree-prepare-root.c $(ostree_prepare_root_CPPFLAGS) $(AM_CFLAGS) $(DEFAULT_INCLUDES) -DOSTREE_PREPARE_ROOT_STATIC=1 +-- +2.24.0 + diff --git a/recipes-extended/ostree/ostree_%.bbappend b/recipes-extended/ostree/ostree_%.bbappend new file mode 100644 index 0000000..cf2f24f --- /dev/null +++ b/recipes-extended/ostree/ostree_%.bbappend @@ -0,0 +1,18 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += " \ + file://0001-Makefile-declare-ostree_boot_SCRIPTS-and-append-valu.patch \ +" + +PACKAGECONFIG_append = " curl libarchive static" +PACKAGECONFIG_class-native_append = " curl" +PACKAGECONFIG_remove = "soup" +PACKAGECONFIG_class-native_remove = "soup" + +EXTRA_OECONF += " \ + --with-builtin-grub2-mkconfig \ +" + +FILES_${PN} += " \ + ${libdir}/ostree/ostree-grub-generator \ +" diff --git a/recipes-sota/ostree/ostree_git.bb b/recipes-sota/ostree/ostree_git.bb deleted file mode 100644 index 93ae6e7..0000000 --- a/recipes-sota/ostree/ostree_git.bb +++ /dev/null @@ -1,69 +0,0 @@ -SUMMARY = "Tool for managing bootable, immutable, versioned filesystem trees" -HOMEPAGE = "https://ostree.readthedocs.io/en/latest/" -LICENSE = "LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" - -inherit autotools pkgconfig systemd bash-completion gobject-introspection - -SRC_URI = "gitsm://github.com/ostreedev/ostree.git;branch=master" - -SRCREV = "f3eba6bcec39c163eb831c02c148ffa483292906" - -PV = "v2018.9" - -S = "${WORKDIR}/git" - -BBCLASSEXTEND = "native" - -DEPENDS += "attr bison-native libarchive libcap glib-2.0 gpgme fuse e2fsprogs curl xz" -DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -RDEPENDS_${PN}-dracut = "bash" - -CFLAGS_append = " -Wno-error=missing-prototypes" -EXTRA_OECONF = "--disable-gtk-doc --disable-man --with-smack --with-builtin-grub2-mkconfig --with-curl --without-soup" -EXTRA_OECONF_append_class-native = " --enable-wrpseudo-compat" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/ --with-dracut" - -# 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" - -SYSTEMD_SERVICE_${PN} = "ostree-prepare-root.service ostree-remount.service ostree-finalize-staged.service" - -export BUILD_SYS -export HOST_SYS -export STAGING_INCDIR -export STAGING_LIBDIR - -do_configure_prepend() { - unset docdir - NOCONFIGURE=1 "${S}/autogen.sh" -} - -do_install_append_class-native() { - create_wrapper ${D}${bindir}/ostree OSTREE_GRUB2_EXEC="${STAGING_LIBDIR_NATIVE}/ostree/ostree-grub-generator" -} - -PACKAGES += " \ - ${PN}-switchroot \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'ostree-dracut', '', d)} \ -" - -FILES_${PN} = "${bindir} \ - ${sysconfdir}/ostree \ - ${datadir}/ostree \ - ${libdir}/*.so.* \ - ${libdir}/ostree/ostree-grub-generator \ - ${libdir}/ostree/ostree-remount \ - ${libdir}/girepository-1.0/* \ - ${@bb.utils.contains('DISTRO_FEATURES','systemd','${libdir}/tmpfiles.d', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES','systemd','${systemd_unitdir}/system/*.path', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES','systemd','${systemd_unitdir}/system-generators', '', d)} \ -" -FILES_${PN}-dev += " ${datadir}/gir-1.0" -FILES_${PN}-dracut = "${sysconfdir}/dracut.conf.d ${libdir}/dracut" -FILES_${PN}-switchroot = "${libdir}/ostree/ostree-prepare-root" -- cgit v1.2.3-54-g00ecf