diff options
| author | Patrick Vacek <patrickvacek@gmail.com> | 2018-10-10 09:08:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-10 09:08:47 +0200 |
| commit | f855696de9d4bdecd2374eefcd11898fcb529b50 (patch) | |
| tree | 20d1646797a3c72c2b20b1a30c59ba07f27d8875 | |
| parent | 751e8b6e46acc957b6ec47c30868835be4c89d52 (diff) | |
| parent | ba1181e2fc9afe7a913df7fd5e2f55e2e7ae99f4 (diff) | |
| download | meta-updater-f855696de9d4bdecd2374eefcd11898fcb529b50.tar.gz | |
Merge pull request #403 from agners/drop-libgsystem
Drop libgsystem
| -rw-r--r-- | recipes-sota/ostree/ostree_git.bb | 2 | ||||
| -rw-r--r-- | recipes-support/libgsystem/libgsystem_git.bb | 40 |
2 files changed, 1 insertions, 41 deletions
diff --git a/recipes-sota/ostree/ostree_git.bb b/recipes-sota/ostree/ostree_git.bb index 501d636..3e3c951 100644 --- a/recipes-sota/ostree/ostree_git.bb +++ b/recipes-sota/ostree/ostree_git.bb | |||
| @@ -15,7 +15,7 @@ S = "${WORKDIR}/git" | |||
| 15 | 15 | ||
| 16 | BBCLASSEXTEND = "native" | 16 | BBCLASSEXTEND = "native" |
| 17 | 17 | ||
| 18 | DEPENDS += "attr bison-native libarchive libcap glib-2.0 gpgme libgsystem fuse e2fsprogs curl xz" | 18 | DEPENDS += "attr bison-native libarchive libcap glib-2.0 gpgme fuse e2fsprogs curl xz" |
| 19 | DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" | 19 | DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" |
| 20 | RDEPENDS_${PN}-dracut = "bash" | 20 | RDEPENDS_${PN}-dracut = "bash" |
| 21 | 21 | ||
diff --git a/recipes-support/libgsystem/libgsystem_git.bb b/recipes-support/libgsystem/libgsystem_git.bb deleted file mode 100644 index e2b362f..0000000 --- a/recipes-support/libgsystem/libgsystem_git.bb +++ /dev/null | |||
| @@ -1,40 +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 | inherit autotools-brokensep gobject-introspection | ||
| 11 | |||
| 12 | DEPENDS += "attr glib-2.0 pkgconfig libcap gtk-doc-native gpgme" | ||
| 13 | RDEPENDS_${PN} = "xz " | ||
| 14 | RDEPENDS_${PN}_append = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}" | ||
| 15 | |||
| 16 | RDEPENDS_${PN}_remove_class-native = "systemd-native" | ||
| 17 | |||
| 18 | BBCLASSEXTEND = "native" | ||
| 19 | |||
| 20 | export STAGING_INCDIR | ||
| 21 | export STAGING_LIBDIR | ||
| 22 | |||
| 23 | do_configure() { | ||
| 24 | #NOCONFIGURE=true ./autogen.sh | ||
| 25 | autoreconf -vfi | ||
| 26 | oe_runconf | ||
| 27 | } | ||
| 28 | |||
| 29 | do_compile_prepend() { | ||
| 30 | export BUILD_SYS="${BUILD_SYS}" | ||
| 31 | export HOST_SYS="${HOST_SYS}" | ||
| 32 | } | ||
| 33 | |||
| 34 | FILES_${PN} += " \ | ||
| 35 | ${datadir} \ | ||
| 36 | ${datadir}/gir-1.0 \ | ||
| 37 | ${datadir}/gir-1.0/GSystem-1.0.gir \ | ||
| 38 | ${libdir}/girepository-1.0/ \ | ||
| 39 | ${libdir}/girepository-1.0/GSystem-1.0.typelib \ | ||
| 40 | " | ||
