diff options
Diffstat (limited to 'recipes-sota/ostree/ostree_git.bb')
-rw-r--r-- | recipes-sota/ostree/ostree_git.bb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/recipes-sota/ostree/ostree_git.bb b/recipes-sota/ostree/ostree_git.bb index d444669..b6adf9b 100644 --- a/recipes-sota/ostree/ostree_git.bb +++ b/recipes-sota/ostree/ostree_git.bb | |||
@@ -14,7 +14,9 @@ S = "${WORKDIR}/git" | |||
14 | 14 | ||
15 | BBCLASSEXTEND = "native" | 15 | BBCLASSEXTEND = "native" |
16 | 16 | ||
17 | DEPENDS += "attr libarchive glib-2.0 pkgconfig gpgme libgsystem fuse libsoup-2.4 e2fsprogs systemd" | 17 | DEPENDS += "attr libarchive glib-2.0 pkgconfig gpgme libgsystem fuse libsoup-2.4 e2fsprogs" |
18 | DEPENDS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}" | ||
19 | |||
18 | DEPENDS_remove_class-native = "systemd-native" | 20 | DEPENDS_remove_class-native = "systemd-native" |
19 | 21 | ||
20 | RDEPENDS_${PN} = "python util-linux-libuuid util-linux-libblkid util-linux-libmount libcap xz os-release" | 22 | RDEPENDS_${PN} = "python util-linux-libuuid util-linux-libblkid util-linux-libmount libcap xz os-release" |
@@ -25,7 +27,7 @@ EXTRA_OEMAKE = "CFLAGS='-g'" | |||
25 | EXTRA_OECONF_append_class-native = " --enable-wrpseudo-compat" | 27 | EXTRA_OECONF_append_class-native = " --enable-wrpseudo-compat" |
26 | 28 | ||
27 | SYSTEMD_REQUIRED = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}" | 29 | SYSTEMD_REQUIRED = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}" |
28 | SYSTEMD_REQUIRED_class-native = "" | 30 | SYSTEMD_REQUIRED_class-native = "false" |
29 | 31 | ||
30 | SYSTEMD_SERVICE_${PN} = "ostree-prepare-root.service ostree-remount.service" | 32 | SYSTEMD_SERVICE_${PN} = "ostree-prepare-root.service ostree-remount.service" |
31 | SYSTEMD_SERVICE_${PN}_class-native = "" | 33 | SYSTEMD_SERVICE_${PN}_class-native = "" |
@@ -52,8 +54,7 @@ do_compile_prepend() { | |||
52 | export SYSTEMD_REQUIRED | 54 | export SYSTEMD_REQUIRED |
53 | 55 | ||
54 | do_install_append() { | 56 | do_install_append() { |
55 | if [ -n ${SYSTEMD_REQUIRED} ]; then | 57 | if [ "$SYSTEMD_REQUIRED" == "true" ]; then |
56 | install -p -D ${S}/src/boot/ostree-prepare-root.service ${D}${systemd_unitdir}/system/ostree-prepare-root.service | ||
57 | install -p -D ${S}/src/boot/ostree-remount.service ${D}${systemd_unitdir}/system/ostree-remount.service | 58 | install -p -D ${S}/src/boot/ostree-remount.service ${D}${systemd_unitdir}/system/ostree-remount.service |
58 | fi | 59 | fi |
59 | } | 60 | } |