Re: [pkg-wpa-devel] libnl3 soname change
Am Montag, 19. Dezember 2011, 09:03:47 schrieb Gaudenz Steinlin:
> Hi
>
> On Sun, 18 Dec 2011 20:16:08 +0100, Heiko Stübner <heiko@sntech.de> wrote:
> > Hi,
> >
> > Am Donnerstag 15 Dezember 2011, 22:13:43 schrieb Stefan Lippers-Hollmann:
> > > Hi
> > >
> > > On Thursday 15 December 2011, Joey Hess wrote:
> > > > Heiko Stübner wrote:
> > > > > So the question would be on how to proceed to get this into
> > > > > unstable without breaking to much.
> > >
> > > [...]
> > >
> > > I have prepared and tested (for the non-udeb cases, see below) iw[1]
> > > and wpasupplicant[2] in svn now, likewise hostapd[3] will switch to
> > > libnl-3 >= 3.2 (from libnl1) after it gets available in unstable (no
> > > urgency at all).
> > >
> > > Something seems to be missing for the udeb handling though:
> > > Package: wpasupplicant-udeb
> > > [...]
> > > Depends: libc6-udeb (>= 2.13), libcrypto1.0.0-udeb (>= 1.0.0),
> > > libnl-3-200-udeb (>= 3.2.3), libnl-genl-3-200, busybox-udeb
> > > ^^^^^^^^^^^^^^^^ I'm not overly familiar with udeb specifics, but I
> > > think this is
> > > missing something equivalent to
> > >
> > > DEB_DH_MAKESHLIBS_ARGS_libnl-3-200 := -V"libnl-3-200 (>=
> > >
> > > $(DEB_UPSTREAM_VERSION))" --add-udeb=$(udeb) in libnl3's debian/rules.
> >
> > my understanding of udeb handling is also only rudimentary :-)
> >
> > As I did not split the udeb libnl-genl-3 resides at the moment in
> > libnl-3-200- udeb. The dependencies all have a "-udeb" in its package
> > name, but libnl- genl-3-200 has not. So my guess would be, that a
> > libnl-genl-3-200-udeb is also necessary.
>
> I'll try to look into the udeb issues but not before Thursday this week.
> If anyone has time to do this before I'm more than happy. If you have
> any specific questions I can answer mails even before.
does the following look remotely sane? (I.e. it creates a
libnl-genl-3-200-udeb with the correct library)
From c826b7a811a7931dd151b9c28aad93eda7af321f Mon Sep 17 00:00:00 2001
From: Heiko Stuebner <heiko.stuebner@nexst4.de>
Date: Mon, 19 Dec 2011 10:30:51 +0100
Subject: [PATCH 1/2] create a libnl-genl-udeb
---
debian/control | 12 ++++++++++++
debian/libnl-3-200-udeb.install | 1 -
debian/libnl-genl-3-200-udeb.install | 1 +
debian/rules | 6 ++++--
4 files changed, 17 insertions(+), 3 deletions(-)
create mode 100644 debian/libnl-genl-3-200-udeb.install
diff --git a/debian/control b/debian/control
index 83e4402..dd12909 100644
--- a/debian/control
+++ b/debian/control
@@ -175,3 +175,15 @@ Description: library for dealing with netlink sockets
netlink family specific interfaces.
.
This package is a udeb. It's only useful inside of debian-installer.
+
+Package: libnl-genl-3-200-udeb
+Architecture: linux-any
+XC-Package-Type: udeb
+Section: debian-installer
+Depends: libnl-3-200-udeb (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Description: library for dealing with netlink sockets - generic netlink
+ This is a library for applications dealing with netlink sockets.
+ The library provides an interface for raw netlink messaging and various
+ netlink family specific interfaces.
+ .
+ This package is a udeb. It's only useful inside of debian-installer.
diff --git a/debian/libnl-3-200-udeb.install b/debian/libnl-3-200-udeb.install
index 3268d25..009ef8a 100644
--- a/debian/libnl-3-200-udeb.install
+++ b/debian/libnl-3-200-udeb.install
@@ -1,2 +1 @@
usr/lib/libnl-3.so.*
-usr/lib/libnl-genl-3.so.*
diff --git a/debian/libnl-genl-3-200-udeb.install b/debian/libnl-genl-3-200-udeb.install
new file mode 100644
index 0000000..8e7c1cc
--- /dev/null
+++ b/debian/libnl-genl-3-200-udeb.install
@@ -0,0 +1 @@
+usr/lib/libnl-genl-3.so.*
diff --git a/debian/rules b/debian/rules
index e724974..c287b81 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,8 @@
DEB_BUILDDIR = debian/build
DEB_MAKE_FLAVORS = main udeb
-udeb=libnl-3-200-udeb
+udeb_libnl=libnl-3-200-udeb
+udeb_libnl_genl=libnl-genl-3-200-udeb
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
@@ -14,7 +15,8 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk
CFLAGS += $(if $(findstring udeb,$(cdbs_make_curflavor)),-Os)
DEB_DH_STRIP_ARGS := --dbg-package=libnl-3-200-dbg
-DEB_DH_MAKESHLIBS_ARGS_libnl-3-200 := -V"libnl-3-200 (>= $(DEB_UPSTREAM_VERSION))" --add-udeb=$(udeb)
+DEB_DH_MAKESHLIBS_ARGS_libnl-3-200 := -V"libnl-3-200 (>= $(DEB_UPSTREAM_VERSION))" --add-udeb=$(udeb_libnl)
+DEB_DH_MAKESHLIBS_ARGS_libnl-genl-3-200 := -V"libnl-genl-3-200 (>= $(DEB_UPSTREAM_VERSION))" --add-udeb=$(udeb_libnl_genl)
DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp
DEB_MAKE_DESTDIRSKEL_udeb = $(CURDIR)/debian/tmp/udeb
--
1.7.5.4
Reply to: