Re: [meta-oe][PATCH V2 06/17] networkmanager: Update to 1.0.6

From: Martin Jansa <martin.jansa@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: Re: [meta-oe][PATCH V2 06/17] networkmanager: Update to 1.0.6
Date: Mon, 16 Nov 2015 22:29:30 +0100	[thread overview]
Message-ID: <20151116212930.GF2240@jama> (raw)
In-Reply-To: <1447271300-4153-7-git-send-email-adrian.freihofer@gmail.com>

[-- Attachment #1: Type: text/plain, Size: 4161 bytes --]

On Wed, Nov 11, 2015 at 08:48:09PM +0100, Adrian Freihofer wrote:
> Signed-off-by: Adrian Freihofer <adrian.freihofer@gmail.com>
> ---
>  ...tworkmanager_1.0.4.bb => networkmanager_1.0.6.bb} | 20 ++++++++++++++------
>  1 file changed, 14 insertions(+), 6 deletions(-)
>  rename meta-oe/recipes-connectivity/networkmanager/{networkmanager_1.0.4.bb => networkmanager_1.0.6.bb} (81%)
> 
> diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.4.bb b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb
> similarity index 81%
> rename from meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.4.bb
> rename to meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb
> index 310a83b..d529b4a 100644
> --- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.4.bb
> +++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb
> @@ -2,18 +2,21 @@ SUMMARY = "NetworkManager"
>  SECTION = "net/misc"
>  
>  LICENSE = "GPLv2+"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \
> +                    file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \
> +                    file://docs/api/html/license.html;md5=51d7fb67bde992e58533a8481cee070b"
>  
>  DEPENDS = "libnl dbus dbus-glib libgudev wireless-tools nss util-linux libndp"
>  
> -inherit gnome gettext systemd
> +inherit gnomebase gettext systemd
>  
>  SRC_URI = " \
>      ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \
>      file://0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch \
>  "
> -SRC_URI[md5sum] = "7eabef7bd3bbdd6dc0473dd32aeac924"
> -SRC_URI[sha256sum] = "e4099fa2f4f4b8d95d0ad9fdd03ec20960845085fa500bf79aecbf54cee018c9"
> +
> +SRC_URI[md5sum] = "00f5f9ec69725a9f9b99366853c6f73e"
> +SRC_URI[sha256sum] = "38ea002403e3b884ffa9aae25aea431d2a8420f81f4919761c83fb92648254bd"
>  
>  S = "${WORKDIR}/NetworkManager-${PV}"
>  
> @@ -31,15 +34,15 @@ EXTRA_OECONF = " \
>      --with-dnsmasq=${bindir}/dnsmasq \
>  "
>  
> -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)}"
> +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)}"
>  PACKAGECONFIG[systemd] = " \
>      --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \
>      --without-systemdsystemunitdir, \
>      polkit \
>  "
>  # consolekit is not picked by shlibs, so add it to RDEPENDS too
> -PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5"
>  PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit"
> +PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5"
>  PACKAGECONFIG[concheck] = "--with-libsoup=yes,--with-libsoup=no,libsoup-2.4"
>  PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager"
>  PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp"
> @@ -73,8 +76,13 @@ FILES_${PN}-dbg += " \
>  "
>  
>  FILES_${PN}-dev += " \
> +    ${datadir}/NetworkManager/gdb-cmd \
> +"
> +
> +FILES_${PN}-staticdev += " \

.la files belong to normal -dev and libdir is already included, I've
removed this change when cherry-picking to master-next. see
bitbake.conf:

FILES_${PN}-dev = "${includedir} ${FILES_SOLIBSDEV} ${libdir}/*.la \
                ${libdir}/*.o ${libdir}/pkgconfig ${datadir}/pkgconfig \
                ${datadir}/aclocal ${base_libdir}/*.o \
                ${libdir}/${BPN}/*.la ${base_libdir}/*.la"

>      ${libdir}/pppd/*/*.la \
>      ${libdir}/NetworkManager/*.la \
> +    ${libdir}/*.la \
>  "
>  
>  FILES_${PN}-tests = " \
> -- 
> 2.4.3
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]