diff options
author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2012-12-13 10:35:23 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2012-12-16 21:11:42 +0100 |
commit | a861972b27e4030410ba481a79b459532f68c0d1 (patch) | |
tree | d154c99a948022ea0b3b756e981debf1ac7f5b36 /meta-oe/recipes-connectivity/networkmanager | |
parent | f95109e3e04ee167fd0ceb80e62f7cfec81802de (diff) | |
download | meta-openembedded-contrib-a861972b27e4030410ba481a79b459532f68c0d1.tar.gz |
modemmanager: update to 0.6.0.0
* All *.a files moved to -staticdev
* MJ: fixed *.la packaging
Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-connectivity/networkmanager')
-rw-r--r-- | meta-oe/recipes-connectivity/networkmanager/modemmanager/dont-include-private-glib-headers.patch | 94 | ||||
-rw-r--r-- | meta-oe/recipes-connectivity/networkmanager/modemmanager_0.6.0.0.bb (renamed from meta-oe/recipes-connectivity/networkmanager/modemmanager_0.5.bb) | 16 |
2 files changed, 9 insertions, 101 deletions
diff --git a/meta-oe/recipes-connectivity/networkmanager/modemmanager/dont-include-private-glib-headers.patch b/meta-oe/recipes-connectivity/networkmanager/modemmanager/dont-include-private-glib-headers.patch deleted file mode 100644 index 71dffc0262..0000000000 --- a/meta-oe/recipes-connectivity/networkmanager/modemmanager/dont-include-private-glib-headers.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 28f64090dfa15097587bbea69209df10b8ab8593 Mon Sep 17 00:00:00 2001 -From: Aleksander Morgado <aleksander@lanedo.com> -Date: Mon, 24 Oct 2011 19:09:11 +0000 -Subject: core: don't include private headers from glib - -The "glib/gtypes.h" is now considered private, and only "glib.h" should be -included directly. ---- -diff --git a/src/mm-at-serial-port.h b/src/mm-at-serial-port.h -index 5d5f13f..cec5dc3 100644 ---- a/src/mm-at-serial-port.h -+++ b/src/mm-at-serial-port.h -@@ -18,7 +18,6 @@ - #define MM_AT_SERIAL_PORT_H - - #include <glib.h> --#include <glib/gtypes.h> - #include <glib-object.h> - - #include "mm-serial-port.h" -diff --git a/src/mm-manager.h b/src/mm-manager.h -index 1c98458..c6a64bd 100644 ---- a/src/mm-manager.h -+++ b/src/mm-manager.h -@@ -17,7 +17,6 @@ - #ifndef MM_MANAGER_H - #define MM_MANAGER_H - --#include <glib/gtypes.h> - #include <glib-object.h> - #include <dbus/dbus-glib.h> - #include "mm-modem.h" -diff --git a/src/mm-modem-base.h b/src/mm-modem-base.h -index 933aae1..be11af6 100644 ---- a/src/mm-modem-base.h -+++ b/src/mm-modem-base.h -@@ -18,7 +18,6 @@ - #define MM_MODEM_BASE_H - - #include <glib.h> --#include <glib/gtypes.h> - #include <glib-object.h> - - #include "mm-port.h" -diff --git a/src/mm-plugin-base.h b/src/mm-plugin-base.h -index 4b0932c..5b049a4 100644 ---- a/src/mm-plugin-base.h -+++ b/src/mm-plugin-base.h -@@ -17,7 +17,6 @@ - #define MM_PLUGIN_BASE_H - - #include <glib.h> --#include <glib/gtypes.h> - #include <glib-object.h> - - #define G_UDEV_API_IS_SUBJECT_TO_CHANGE -diff --git a/src/mm-port.h b/src/mm-port.h -index 4bcffd4..df935db 100644 ---- a/src/mm-port.h -+++ b/src/mm-port.h -@@ -17,7 +17,6 @@ - #define MM_PORT_H - - #include <glib.h> --#include <glib/gtypes.h> - #include <glib-object.h> - - typedef enum { -diff --git a/src/mm-qcdm-serial-port.h b/src/mm-qcdm-serial-port.h -index 2786ee8..605016d 100644 ---- a/src/mm-qcdm-serial-port.h -+++ b/src/mm-qcdm-serial-port.h -@@ -18,7 +18,6 @@ - #define MM_QCDM_SERIAL_PORT_H - - #include <glib.h> --#include <glib/gtypes.h> - #include <glib-object.h> - - #include "mm-serial-port.h" -diff --git a/src/mm-serial-port.h b/src/mm-serial-port.h -index eb12cbb..9450926 100644 ---- a/src/mm-serial-port.h -+++ b/src/mm-serial-port.h -@@ -18,7 +18,6 @@ - #define MM_SERIAL_PORT_H - - #include <glib.h> --#include <glib/gtypes.h> - #include <glib-object.h> - - #include "mm-port.h" --- -cgit v0.9.0.2-2-gbebe diff --git a/meta-oe/recipes-connectivity/networkmanager/modemmanager_0.5.bb b/meta-oe/recipes-connectivity/networkmanager/modemmanager_0.6.0.0.bb index 55e083a857..60a5425e2a 100644 --- a/meta-oe/recipes-connectivity/networkmanager/modemmanager_0.5.bb +++ b/meta-oe/recipes-connectivity/networkmanager/modemmanager_0.6.0.0.bb @@ -3,23 +3,25 @@ DEPENDS = "ppp udev glib-2.0" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -PR = "r1" +PR = "r0" inherit gnome gettext -SRC_URI = "${GNOME_MIRROR}/ModemManager/${@gnome_verdir("${PV}")}/ModemManager-${PV}.tar.bz2 \ -file://dont-include-private-glib-headers.patch" +SRC_URI = "${GNOME_MIRROR}/ModemManager/${@gnome_verdir("${PV}")}/ModemManager-${PV}.tar.xz" -SRC_URI[md5sum] = "cd04109506e88bf4c4cd3e7ce0034c08" -SRC_URI[sha256sum] = "108de70537b1193634883fa6b3642b130a23f4c04d901cb15caeceb486af6152" +SRC_URI[md5sum] = "f32640f6672d997ec0887307186e9639" +SRC_URI[sha256sum] = "d4468300cf4aa7baf21c8564fa515e578056f34de5a64f452b053331f89e8ae2" S = "${WORKDIR}/ModemManager-${PV}" FILES_${PN}-dbg += "${libdir}/ModemManager/.debug \ ${libdir}/pppd/*/.debug" FILES_${PN}-dev += "${datadir}/dbus-1/interfaces \ - ${libdir}/ModemManager/*a \ - ${libdir}/pppd/*/*a" + ${libdir}/pppd/*/*.la \ + ${libdir}/ModemManager/*.la" +FILES_${PN}-staticdev += "\ + ${libdir}/ModemManager/*.a \ + ${libdir}/pppd/*/*.a" FILES_${PN} += "${datadir}/dbus-1/*services/ \ ${libdir}/ModemManager/*.so \ ${libdir}/pppd/*/*.so \ |