From: Martin Jansa <martin.jansa@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: Re: [meta-oe][PATCH 1/7] modemmanager: update to 0.6.0.0
Date: Thu, 13 Dec 2012 18:17:41 +0100 [thread overview]
Message-ID: <20121213171741.GD3356@jama.jama.net> (raw)
In-Reply-To: <1355394929-25182-2-git-send-email-marcin.juszkiewicz@linaro.org>
[-- Attachment #1: Type: text/plain, Size: 6955 bytes --]
On Thu, Dec 13, 2012 at 11:35:23AM +0100, Marcin Juszkiewicz wrote:
> All *.a files moved to -staticdev
>
> Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
> ---
> .../dont-include-private-glib-headers.patch | 94 ----------------------
> ...modemmanager_0.5.bb => modemmanager_0.6.0.0.bb} | 16 ++--
> 2 files changed, 8 insertions(+), 102 deletions(-)
> delete mode 100644 meta-oe/recipes-connectivity/networkmanager/modemmanager/dont-include-private-glib-headers.patch
> rename meta-oe/recipes-connectivity/networkmanager/{modemmanager_0.5.bb => modemmanager_0.6.0.0.bb} (59%)
>
> 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 71dffc0..0000000
> --- 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
> similarity index 59%
> rename from meta-oe/recipes-connectivity/networkmanager/modemmanager_0.5.bb
> rename to meta-oe/recipes-connectivity/networkmanager/modemmanager_0.6.0.0.bb
> index 55e083a..a58685b 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,23 @@ 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"
> +FILES_${PN}-dev += "${datadir}/dbus-1/interfaces"
> +FILES_${PN}-staticdev += "\
> + ${libdir}/ModemManager/*.a \
> + ${libdir}/pppd/*/*.a"
> FILES_${PN} += "${datadir}/dbus-1/*services/ \
> ${libdir}/ModemManager/*.so \
> ${libdir}/pppd/*/*.so \
It's better, it builds now :).
But FILES_* changes are not correct, keep *.la in PN-dev.
WARNING: QA Issue: modemmanager: Files/directories were installed but
not shipped
/usr/lib/ModemManager/libmm-plugin-zte.la
/usr/lib/ModemManager/libmm-plugin-mbm.la
/usr/lib/ModemManager/libmm-plugin-moto-c.la
/usr/lib/ModemManager/libmm-plugin-huawei.la
/usr/lib/ModemManager/libmm-plugin-iridium.la
/usr/lib/ModemManager/libmm-plugin-longcheer.la
/usr/lib/ModemManager/libmm-plugin-option.la
/usr/lib/ModemManager/libmm-plugin-x22x.la
/usr/lib/ModemManager/libmm-plugin-wavecom.la
/usr/lib/ModemManager/libmm-plugin-cinterion.la
/usr/lib/ModemManager/libmm-plugin-novatel.la
/usr/lib/ModemManager/libmm-plugin-generic.la
/usr/lib/ModemManager/libmm-plugin-samsung.la
/usr/lib/ModemManager/libmm-plugin-nokia.la
/usr/lib/ModemManager/libmm-plugin-linktop.la
/usr/lib/ModemManager/libmm-plugin-simtech.la
/usr/lib/ModemManager/libmm-plugin-sierra.la
/usr/lib/ModemManager/libmm-plugin-hso.la
/usr/lib/ModemManager/libmm-plugin-anydata.la
/usr/lib/ModemManager/libmm-plugin-gobi.la
/usr/lib/pppd/2.4.5/mm-test-pppd-plugin.la
Cheers,
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
next prev parent reply other threads:[~2012-12-13 17:32 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-13 10:35 Another set of changes from world build Marcin Juszkiewicz
2012-12-13 10:35 ` [meta-oe][PATCH 1/7] modemmanager: update to 0.6.0.0 Marcin Juszkiewicz
2012-12-13 17:17 ` Martin Jansa [this message]
2012-12-13 10:35 ` [meta-oe][PATCH 2/7] samba: added gnu-configize for AArch64 support Marcin Juszkiewicz
2012-12-13 10:35 ` [meta-oe][PATCH 3/7] dialog: " Marcin Juszkiewicz
2012-12-13 10:35 ` [meta-oe][PATCH 4/7] xterm: " Marcin Juszkiewicz
2012-12-13 10:35 ` [meta-oe][PATCH 5/7] xorg-sgml-doctools: added LIC_FILES_CHKSUM Marcin Juszkiewicz
2012-12-13 11:03 ` Martin Jansa
2012-12-13 11:20 ` Marcin Juszkiewicz
2012-12-13 10:35 ` [meta-oe][PATCH 6/7] florence: added gnome-doc-utils and libnotify to dependencies Marcin Juszkiewicz
2012-12-13 10:35 ` [meta-oe][PATCH 7/7] florence: move to meta-gnome due to libnotify Marcin Juszkiewicz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121213171741.GD3356@jama.jama.net \
--to=martin.jansa@gmail.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.