Merge "Bump OSTree version to v2016.11"

5 files changed, 29 insertions, 5 deletions

diff --git a/meta-sota/recipes-devtools/pseudo/files/fallback-group b/meta-sota/recipes-devtools/pseudo/files/fallback-group
new file mode 100644
index 0000000..81bf732
--- /dev/null
+++ b/meta-sota/recipes-devtools/pseudo/files/fallback-group
@@ -0,0 +1,2 @@
+root:*:0:
+mail:*:8:
diff --git a/meta-sota/recipes-devtools/pseudo/files/fallback-passwd b/meta-sota/recipes-devtools/pseudo/files/fallback-passwd
new file mode 100644
index 0000000..c1458dc
--- /dev/null
+++ b/meta-sota/recipes-devtools/pseudo/files/fallback-passwd
@@ -0,0 +1 @@
+root::0:0:root:/home/root:/bin/sh
diff --git a/meta-sota/recipes-devtools/pseudo/pseudo_1.8.1.bb b/meta-sota/recipes-devtools/pseudo/pseudo_1.8.1.bb
new file mode 100644
index 0000000..211439e
--- /dev/null
+++ b/meta-sota/recipes-devtools/pseudo/pseudo_1.8.1.bb
@@ -0,0 +1,20 @@
+require recipes-devtools/pseudo/pseudo.inc
+
+SRC_URI = " \
+    http://downloads.yoctoproject.org/releases/pseudo/${BPN}-${PV}.tar.bz2 \
+    file://fallback-passwd \
+    file://fallback-group \
+    file://0001-Add-check-for-existence-of-old-file-to-renameat.patch \
+"
+
+SRC_URI[md5sum] = "ee38e4fb62ff88ad067b1a5a3825bac7"
+SRC_URI[sha256sum] = "dac4ad2d21228053151121320f629d41dd5c0c87695ac4e7aea286c414192ab5"
+
+PSEUDO_EXTRA_OPTS ?= "--enable-force-async --without-passwd-fallback"
+
+do_install_append_class-native () {
+	install -d ${D}${sysconfdir}
+	# The fallback files should never be modified
+	install -m 444 ${WORKDIR}/fallback-passwd ${D}${sysconfdir}/passwd
+	install -m 444 ${WORKDIR}/fallback-group ${D}${sysconfdir}/group
+}
diff --git a/meta-sota/recipes-sota/ostree-initrd/files/init.sh b/meta-sota/recipes-sota/ostree-initrd/files/init.sh
index 5aa99d6..806a7b1 100644
--- a/meta-sota/recipes-sota/ostree-initrd/files/init.sh
+++ b/meta-sota/recipes-sota/ostree-initrd/files/init.sh
@@ -35,7 +35,7 @@ get_ostree_sysroot() {
 	done
 }
 
-export PATH=/sbin:/usr/sbin:/bin:/usr/bin
+export PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/lib/ostree
 
 log_info "starting initrd script"
 
diff --git a/meta-sota/recipes-sota/ostree/ostree_git.bb b/meta-sota/recipes-sota/ostree/ostree_git.bb
index b5675ab..c2aeb2f 100644
--- a/meta-sota/recipes-sota/ostree/ostree_git.bb
+++ b/meta-sota/recipes-sota/ostree/ostree_git.bb
@@ -8,7 +8,7 @@ INHERIT_remove_class-native = "systemd"
 
 SRC_URI = "gitsm://github.com/ostreedev/ostree.git;branch=master"
 
-SRCREV="v2016.5"
+SRCREV="v2016.11"
 
 S = "${WORKDIR}/git"
 
@@ -20,8 +20,9 @@ DEPENDS_remove_class-native = "systemd-native"
 RDEPENDS_${PN} = "python util-linux-libuuid util-linux-libblkid util-linux-libmount libcap xz"
 RDEPENDS_${PN}_remove_class-native = "python-native"
 
-EXTRA_OECONF = "CFLAGS='-DDISABLE_OTMPFILE' --with-libarchive --disable-gtk-doc --disable-gtk-doc-html --disable-gtk-doc-pdf --disable-man"
-EXTRA_OEMAKE = "CFLAGS='-DDISABLE_OTMPFILE'"
+EXTRA_OECONF = "CFLAGS='-g' --with-libarchive --disable-gtk-doc --disable-gtk-doc-html --disable-gtk-doc-pdf --disable-man"
+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 = ""
@@ -68,7 +69,7 @@ FILES_${PN} += " \
 
 PACKAGES =+ "${PN}-switchroot"
 
-FILES_${PN}-switchroot = "${sbindir}/ostree-prepare-root"
+FILES_${PN}-switchroot = "${libdir}/ostree/ostree-prepare-root"
 RDEPENDS_${PN}-switchroot = ""
 DEPENDS_remove_class-native = "systemd-native"