diff options
author | Anton Gerasimov <anton@advancedtelematic.com> | 2016-09-02 17:55:48 +0200 |
---|---|---|
committer | Anton Gerasimov <anton@advancedtelematic.com> | 2016-09-12 14:58:42 +0200 |
commit | d0d74fbff4709ab9b093ec7785794d7f82b8e7b3 (patch) | |
tree | 26b4cc34d9e92178b41d9ed8bb3b728535b81b2a /recipes-sota | |
parent | 9f816bdb3da9412e334cb8f7a69b48523732dc77 (diff) | |
download | meta-updater-d0d74fbff4709ab9b093ec7785794d7f82b8e7b3.tar.gz |
Build OSTree natively, and its dependencies as well
Bug-AGL: SPEC-245
Change-Id: Ia5631d786c3375ba3aa0bc6ac75ebaeb358e7b03
Signed-off-by: Anton Gerasimov <anton@advancedtelematic.com>
Diffstat (limited to 'recipes-sota')
-rw-r--r-- | recipes-sota/libgsystem/libgsystem_git.bb | 37 | ||||
-rw-r--r-- | recipes-sota/ostree/ostree_git.bb | 32 |
2 files changed, 21 insertions, 48 deletions
diff --git a/recipes-sota/libgsystem/libgsystem_git.bb b/recipes-sota/libgsystem/libgsystem_git.bb deleted file mode 100644 index fe1e552..0000000 --- a/recipes-sota/libgsystem/libgsystem_git.bb +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | SUMMARY = "GIO-based library, targeted primarily for use by operating system components" | ||
2 | LICENSE = "GPLv2+" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" | ||
4 | |||
5 | SRC_URI = "gitsm://github.com/GNOME/libgsystem.git" | ||
6 | SRCREV="d606bec68ddfea78de4b03c3f3568afb71bdc1ce" | ||
7 | |||
8 | S = "${WORKDIR}/git" | ||
9 | |||
10 | DEPENDS += "attr glib-2.0 pkgconfig libcap" | ||
11 | |||
12 | RDEPENDS_${PN} = "systemd liblzma" | ||
13 | |||
14 | inherit autotools-brokensep | ||
15 | |||
16 | BBCLASSEXTEND += "native" | ||
17 | |||
18 | export STAGING_INCDIR | ||
19 | export STAGING_LIBDIR | ||
20 | |||
21 | do_configure() { | ||
22 | NOCONFIGURE=true ./autogen.sh | ||
23 | oe_runconf | ||
24 | } | ||
25 | |||
26 | do_compile_prepend() { | ||
27 | export BUILD_SYS="${BUILD_SYS}" | ||
28 | export HOST_SYS="${HOST_SYS}" | ||
29 | } | ||
30 | |||
31 | FILES_${PN} += " \ | ||
32 | ${datadir} \ | ||
33 | ${datadir}/gir-1.0 \ | ||
34 | ${datadir}/gir-1.0/GSystem-1.0.gir \ | ||
35 | ${libdir}/girepository-1.0/ \ | ||
36 | ${libdir}/girepository-1.0/GSystem-1.0.typelib \ | ||
37 | " | ||
diff --git a/recipes-sota/ostree/ostree_git.bb b/recipes-sota/ostree/ostree_git.bb index 659ee83..0e53d25 100644 --- a/recipes-sota/ostree/ostree_git.bb +++ b/recipes-sota/ostree/ostree_git.bb | |||
@@ -4,24 +4,35 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" | |||
4 | 4 | ||
5 | inherit autotools-brokensep pkgconfig systemd | 5 | inherit autotools-brokensep pkgconfig systemd |
6 | 6 | ||
7 | INHERIT_remove_class-native = "systemd" | ||
8 | |||
7 | SRC_URI = "gitsm://github.com/ostreedev/ostree.git;branch=master" | 9 | SRC_URI = "gitsm://github.com/ostreedev/ostree.git;branch=master" |
8 | SRCREV="v2016.9" | 10 | SRCREV="v2016.9" |
9 | 11 | ||
10 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
11 | 13 | ||
14 | BBCLASSEXTEND = "native" | ||
15 | |||
12 | DEPENDS += "attr libarchive glib-2.0 pkgconfig gpgme libgsystem fuse libsoup-2.4 e2fsprogs systemd" | 16 | DEPENDS += "attr libarchive glib-2.0 pkgconfig gpgme libgsystem fuse libsoup-2.4 e2fsprogs systemd" |
17 | DEPENDS_remove_class-native = "systemd-native" | ||
18 | |||
19 | RDEPENDS_${PN} = "python util-linux-libuuid util-linux-libblkid util-linux-libmount libcap xz" | ||
20 | RDEPENDS_${PN}_remove_class-native = "python-native" | ||
13 | 21 | ||
14 | RDEPENDS_${PN} = "python util-linux-libuuid util-linux-libblkid util-linux-libmount libcap liblzma" | 22 | EXTRA_OECONF = "--with-libarchive --disable-gtk-doc --disable-gtk-doc-html --disable-gtk-doc-pdf --disable-man" |
23 | |||
24 | SYSTEMD_REQUIRED = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}" | ||
25 | SYSTEMD_REQUIRED_class-native = "" | ||
26 | |||
27 | SYSTEMD_SERVICE_${PN} = "ostree-prepare-root.service ostree-remount.service" | ||
28 | SYSTEMD_SERVICE_${PN}_class-native = "" | ||
15 | 29 | ||
16 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" | 30 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" |
31 | PACKAGECONFIG_class-native = "" | ||
17 | PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,,," | 32 | PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,,," |
18 | 33 | ||
19 | EXTRA_OECONF = "--with-libarchive --disable-gtk-doc --disable-gtk-doc-html --disable-gtk-doc-pdf --disable-man" | ||
20 | |||
21 | FILES_${PN} += "${libdir}/ostree/ ${libdir}/ostbuild" | 34 | FILES_${PN} += "${libdir}/ostree/ ${libdir}/ostbuild" |
22 | 35 | ||
23 | BBCLASSEXTEND = "native" | ||
24 | |||
25 | export STAGING_INCDIR | 36 | export STAGING_INCDIR |
26 | export STAGING_LIBDIR | 37 | export STAGING_LIBDIR |
27 | 38 | ||
@@ -35,19 +46,18 @@ do_compile_prepend() { | |||
35 | export HOST_SYS="${HOST_SYS}" | 46 | export HOST_SYS="${HOST_SYS}" |
36 | } | 47 | } |
37 | 48 | ||
49 | export SYSTEMD_REQUIRED | ||
50 | |||
38 | do_install_append() { | 51 | do_install_append() { |
39 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 52 | if [ -n ${SYSTEMD_REQUIRED} ]; then |
40 | install -p -D ${S}/src/boot/ostree-prepare-root.service ${D}${systemd_unitdir}/system/ostree-prepare-root.service | 53 | install -p -D ${S}/src/boot/ostree-prepare-root.service ${D}${systemd_unitdir}/system/ostree-prepare-root.service |
41 | install -p -D ${S}/src/boot/ostree-remount.service ${D}${systemd_unitdir}/system/ostree-remount.service | 54 | install -p -D ${S}/src/boot/ostree-remount.service ${D}${systemd_unitdir}/system/ostree-remount.service |
42 | fi | 55 | fi |
43 | } | 56 | } |
44 | 57 | ||
45 | SYSTEMD_SERVICE_${PN} = "ostree-prepare-root.service ostree-remount.service" | ||
46 | FILES_${PN} += " \ | 58 | FILES_${PN} += " \ |
47 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/', '', d)} \ | 59 | ${@'${systemd_unitdir}/system/' if d.getVar('SYSTEMD_REQUIRED', True) else ''} \ |
48 | ${datadir}/gir-1.0 \ | 60 | ${datadir}/gir-1.0 \ |
49 | ${datadir}/gir-1.0/OSTree-1.0.gir \ | 61 | ${datadir}/gir-1.0/OSTree-1.0.gir \ |
50 | ${libdir}/dracut/ \ | ||
51 | ${libdir}/girepository-1.0 \ | ||
52 | ${libdir}/girepository-1.0/OSTree-1.0.typelib \ | ||
53 | " | 62 | " |
63 | |||