[oe] [PATCH 01/12] libnl: rename libnl2 to libnl as used in openembedded-core

Koen Kooi koen at dominion.thruhere.net
Thu Mar 24 12:03:21 UTC 2011


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 24-03-11 12:01, Koen Kooi wrote:
> On 18-03-11 15:00, Martin Jansa wrote:
>> * libnl1/libnl2 still conflicts even when using separate includedir so
>>   it will be easier for distro maintainers to use only libnl1 or libnl2
>>   by PREFERRED_VERSION
> 
>> Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
> 
> I added this into my maintenance staging branch:
> http://dominion.thruhere.net/git/cgit.cgi/openembedded/log/?h=2011.03-maintenance
> 
> If testing shows no regressions I'm going to do a pull request for it
> next week.

FWIW from
http://git.angstrom-distribution.org/cgi-bin/cgit.cgi/testlab/diff/beagleboard/GNOME-image/depends.dot?id=97bcd1b4d01073a30a54a1387a89a54fc9fa3fe3:

diff --git a/beagleboard/GNOME-image/depends.dot
b/beagleboard/GNOME-image/depends.dot
index f7b7cb3..ee4b521 100644
- --- a/beagleboard/GNOME-image/depends.dot
+++ b/beagleboard/GNOME-image/depends.dot
@@ -5924,8 +5924,6 @@ libnet_dbus_perl -> libdbus_1_3;
 libnet_dbus_perl -> libc6;
 libnl_genl2 -> libnl2;
 libnl_genl2 -> libc6;
- -libnl1 -> libc6;
- -libnl1 -> libgcc1;
 libnl2 -> libc6;
 libnl2 -> libgcc1;
 libnm_util1 -> libdbus_glib_1_2;
@@ -7166,7 +7164,7 @@ networkmanager -> libgio_2_0_0;
 networkmanager -> libgmodule_2_0_0;
 networkmanager -> policykit;
 networkmanager -> eggdbus;
- -networkmanager -> libnl1;
+networkmanager -> libgcc1;
 networkmanager -> iptables [style=dotted];
 networkmanager_locale_de -> libnm_util1;
 networkmanager_locale_de -> virtual_locale_de;

Seems to be working as expected!
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNizMIMkyGM64RGpERAsjkAKCk1B/gFOSkDBwDgXCmRWxmIIws0QCgtneF
DFp11bVF08UQKUrP+2/dgYQ=
=FWub
-----END PGP SIGNATURE-----





More information about the Openembedded-devel mailing list