Changes for morty branch (sync with AGL's meta-sota)

1 files changed, 8 insertions, 6 deletions

diff --git a/recipes-sota/ostree/ostree_git.bb b/recipes-sota/ostree/ostree_git.bb
index 67b5047..5775dfa 100644
--- a/recipes-sota/ostree/ostree_git.bb
+++ b/recipes-sota/ostree/ostree_git.bb
@@ -8,13 +8,13 @@ INHERIT_remove_class-native = "systemd"
 
 SRC_URI = "gitsm://github.com/ostreedev/ostree.git;branch=master"
 
-SRCREV="37c07d2f1c90b12bcfba85a7d900f81a7c362eb4"
+SRCREV="6517a8a27a1386e7cb5482e7cb2919fe92721ccf"
 
 S = "${WORKDIR}/git"
 
 BBCLASSEXTEND = "native"
 
-DEPENDS += "attr libarchive glib-2.0 pkgconfig gpgme libgsystem fuse libsoup-2.4 e2fsprogs"
+DEPENDS += "attr libarchive glib-2.0 pkgconfig gpgme libgsystem fuse libsoup-2.4 e2fsprogs gtk-doc-native"
 DEPENDS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}"
 
 DEPENDS_remove_class-native = "systemd-native"
@@ -27,12 +27,12 @@ EXTRA_OEMAKE = "CFLAGS='-g'"
 EXTRA_OECONF_append_class-native = " --enable-wrpseudo-compat"
 
 SYSTEMD_REQUIRED = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}"
-SYSTEMD_REQUIRED_class-native = "false"
+SYSTEMD_REQUIRED_class-native = ""
 
 SYSTEMD_SERVICE_${PN} = "ostree-prepare-root.service ostree-remount.service"
 SYSTEMD_SERVICE_${PN}_class-native = ""
 
-PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
 PACKAGECONFIG_class-native = ""
 PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/ --with-dracut"
 
@@ -42,7 +42,8 @@ export STAGING_INCDIR
 export STAGING_LIBDIR
 
 do_configure() {
- NOCONFIGURE=true ./autogen.sh
+ unset docdir
+ NOCONFIGURE=1 ./autogen.sh
  oe_runconf
 }
 
@@ -54,7 +55,8 @@ do_compile_prepend() {
 export SYSTEMD_REQUIRED
 
 do_install_append() {
- if [ "$SYSTEMD_REQUIRED" == "true" ]; then
+ if [ -n $SYSTEMD_REQUIRED ]; then
+  install -p -D ${S}/src/boot/ostree-prepare-root.service ${D}${systemd_unitdir}/system/ostree-prepare-root.service
   install -p -D ${S}/src/boot/ostree-remount.service ${D}${systemd_unitdir}/system/ostree-remount.service
  fi
 }