diff options
Diffstat (limited to 'recipes-sota')
| -rw-r--r-- | recipes-sota/ostree-initrd/files/init.sh | 2 | ||||
| -rw-r--r-- | recipes-sota/ostree/ostree_git.bb | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/recipes-sota/ostree-initrd/files/init.sh b/recipes-sota/ostree-initrd/files/init.sh index 5aa99d6..806a7b1 100644 --- a/recipes-sota/ostree-initrd/files/init.sh +++ b/recipes-sota/ostree-initrd/files/init.sh | |||
| @@ -35,7 +35,7 @@ get_ostree_sysroot() { | |||
| 35 | done | 35 | done |
| 36 | } | 36 | } |
| 37 | 37 | ||
| 38 | export PATH=/sbin:/usr/sbin:/bin:/usr/bin | 38 | export PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/lib/ostree |
| 39 | 39 | ||
| 40 | log_info "starting initrd script" | 40 | log_info "starting initrd script" |
| 41 | 41 | ||
diff --git a/recipes-sota/ostree/ostree_git.bb b/recipes-sota/ostree/ostree_git.bb index b5675ab..c2aeb2f 100644 --- a/recipes-sota/ostree/ostree_git.bb +++ b/recipes-sota/ostree/ostree_git.bb | |||
| @@ -8,7 +8,7 @@ INHERIT_remove_class-native = "systemd" | |||
| 8 | 8 | ||
| 9 | SRC_URI = "gitsm://github.com/ostreedev/ostree.git;branch=master" | 9 | SRC_URI = "gitsm://github.com/ostreedev/ostree.git;branch=master" |
| 10 | 10 | ||
| 11 | SRCREV="v2016.5" | 11 | SRCREV="v2016.11" |
| 12 | 12 | ||
| 13 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |
| 14 | 14 | ||
| @@ -20,8 +20,9 @@ DEPENDS_remove_class-native = "systemd-native" | |||
| 20 | RDEPENDS_${PN} = "python util-linux-libuuid util-linux-libblkid util-linux-libmount libcap xz" | 20 | RDEPENDS_${PN} = "python util-linux-libuuid util-linux-libblkid util-linux-libmount libcap xz" |
| 21 | RDEPENDS_${PN}_remove_class-native = "python-native" | 21 | RDEPENDS_${PN}_remove_class-native = "python-native" |
| 22 | 22 | ||
| 23 | EXTRA_OECONF = "CFLAGS='-DDISABLE_OTMPFILE' --with-libarchive --disable-gtk-doc --disable-gtk-doc-html --disable-gtk-doc-pdf --disable-man" | 23 | EXTRA_OECONF = "CFLAGS='-g' --with-libarchive --disable-gtk-doc --disable-gtk-doc-html --disable-gtk-doc-pdf --disable-man" |
| 24 | EXTRA_OEMAKE = "CFLAGS='-DDISABLE_OTMPFILE'" | 24 | EXTRA_OEMAKE = "CFLAGS='-g'" |
| 25 | EXTRA_OECONF_append_class-native = " --enable-wrpseudo-compat" | ||
| 25 | 26 | ||
| 26 | SYSTEMD_REQUIRED = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}" | 27 | SYSTEMD_REQUIRED = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}" |
| 27 | SYSTEMD_REQUIRED_class-native = "" | 28 | SYSTEMD_REQUIRED_class-native = "" |
| @@ -68,7 +69,7 @@ FILES_${PN} += " \ | |||
| 68 | 69 | ||
| 69 | PACKAGES =+ "${PN}-switchroot" | 70 | PACKAGES =+ "${PN}-switchroot" |
| 70 | 71 | ||
| 71 | FILES_${PN}-switchroot = "${sbindir}/ostree-prepare-root" | 72 | FILES_${PN}-switchroot = "${libdir}/ostree/ostree-prepare-root" |
| 72 | RDEPENDS_${PN}-switchroot = "" | 73 | RDEPENDS_${PN}-switchroot = "" |
| 73 | DEPENDS_remove_class-native = "systemd-native" | 74 | DEPENDS_remove_class-native = "systemd-native" |
| 74 | 75 | ||
