From: Saul Wold <sgw@linux.intel.com>
To: Mihai Prica <mihai.prica@intel.com>
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [PATCH 1/3 v2] libnl: upgrade to 3.2.14
Date: Tue, 04 Dec 2012 15:44:46 -0800 [thread overview]
Message-ID: <50BE8AEE.5090202@linux.intel.com> (raw)
In-Reply-To: <1354663994-20221-2-git-send-email-sgw@linux.intel.com>
On 12/04/2012 03:33 PM, Saul Wold wrote:
> From: Mihai Prica <mihai.prica@intel.com>
>
> * Based on the 3.2.9 recipe from meta-oe
> * Modified the patches to work with the new name of the library file (libnl-3.so)
>
> Signed-off-by: Mihai Prica <mihai.prica@intel.com>
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> .../libnl/{libnl-2.0 => libnl}/fix-pc-file.patch | 14 ++++----
> .../fix-pktloc_syntax_h-race.patch | 27 ++++++++------
> meta/recipes-support/libnl/libnl_2.0.bb | 27 --------------
> meta/recipes-support/libnl/libnl_3.2.14.bb | 41 ++++++++++++++++++++++
> 4 files changed, 65 insertions(+), 44 deletions(-)
> rename meta/recipes-support/libnl/{libnl-2.0 => libnl}/fix-pc-file.patch (52%)
> rename meta/recipes-support/libnl/{libnl-2.0 => libnl}/fix-pktloc_syntax_h-race.patch (57%)
> delete mode 100644 meta/recipes-support/libnl/libnl_2.0.bb
> create mode 100644 meta/recipes-support/libnl/libnl_3.2.14.bb
>
> diff --git a/meta/recipes-support/libnl/libnl-2.0/fix-pc-file.patch b/meta/recipes-support/libnl/libnl/fix-pc-file.patch
> similarity index 52%
> rename from meta/recipes-support/libnl/libnl-2.0/fix-pc-file.patch
> rename to meta/recipes-support/libnl/libnl/fix-pc-file.patch
> index 85afe8f..fe8b833 100644
> --- a/meta/recipes-support/libnl/libnl-2.0/fix-pc-file.patch
> +++ b/meta/recipes-support/libnl/libnl/fix-pc-file.patch
> @@ -4,14 +4,14 @@ Some packages are asking only for libnl-2.0, but expects to get also
> libnl-genl, libnl-nf libnl-route, easiest way to fix them is here.
>
> Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
> -Index: libnl-2.0/libnl-2.0.pc.in
> +Index: libnl-3.2.14/libnl-3.0.pc.in
> ===================================================================
> ---- libnl-2.0.orig/libnl-2.0.pc.in
> -+++ libnl-2.0/libnl-2.0.pc.in
> -@@ -6,5 +6,5 @@
> +--- libnl-3.2.14.orig/libnl-3.0.pc.in
> ++++ libnl-3.2.14/libnl-3.0.pc.in
> +@@ -6,5 +6,5 @@ includedir=@includedir@
> Name: libnl
> Description: Convenience library for netlink sockets
> Version: @PACKAGE_VERSION@
> --Libs: -L${libdir} -lnl
> -+Libs: -L${libdir} -lnl -lnl-genl -lnl-nf -lnl-route
> - Cflags: -I${includedir}
> +-Libs: -L${libdir} -lnl-@MAJ_VERSION@
> ++Libs: -L${libdir} -lnl-@MAJ_VERSION@ -lnl-genl-@MAJ_VERSION@ -lnl-nf-@MAJ_VERSION@ -lnl-route-@MAJ_VERSION@
> + Cflags: -I${includedir}/libnl@MAJ_VERSION@
> diff --git a/meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch b/meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch
> similarity index 57%
> rename from meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch
> rename to meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch
> index ea32e82..332ec01 100644
> --- a/meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch
> +++ b/meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch
> @@ -6,24 +6,31 @@ newer version so we can assume this issue is fixed upstream
>
> Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
>
> -Index: libnl-2.0/lib/Makefile.am
> +Index: libnl-3.2.14/lib/Makefile.am
> ===================================================================
> ---- libnl-2.0.orig/lib/Makefile.am
> -+++ libnl-2.0/lib/Makefile.am
> -@@ -27,11 +27,16 @@ CLEANFILES = \
> - route/pktloc_grammar.c route/pktloc_grammar.h \
> - route/pktloc_syntax.c route/pktloc_syntax.h
> +--- libnl-3.2.14.orig/lib/Makefile.am
> ++++ libnl-3.2.14/lib/Makefile.am
> +@@ -39,9 +39,12 @@ CLEANFILES = \
>
> -+BUILT_SOURCES = route/pktloc_syntax.h route/pktloc_grammar.h
> -+
> # Hack to avoid using ylwrap. It does not function correctly in combination
> # with --header-file=
> +route/pktloc.lo: route/pktloc_syntax.h route/pktloc_grammar.h
> +route/pktloc_grammar.h: route/pktloc_grammar.c
> route/pktloc_grammar.c: route/pktloc_grammar.l
> - $(LEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^
> + $(AM_V_GEN) $(LEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^
>
> +route/pktloc_syntax.h: route/pktloc_syntax.c
> route/pktloc_syntax.c: route/pktloc_syntax.y
> - $(YACC) -d $(YFLAGS) -o $@ $^
> + $(AM_V_GEN) $(YACC) -d $(YFLAGS) -o $@ $^
>
> +@@ -89,7 +92,9 @@ BUILT_SOURCES = \
> + route/cls/ematch_grammar.c \
> + route/cls/ematch_syntax.c \
> + route/pktloc_grammar.c \
> +- route/pktloc_syntax.c
> ++ route/pktloc_syntax.c \
> ++ route/pktloc_syntax.h \
> ++ route/pktloc_grammar.h
> +
> + EXTRA_DIST = \
> + route/pktloc_grammar.l \
> diff --git a/meta/recipes-support/libnl/libnl_2.0.bb b/meta/recipes-support/libnl/libnl_2.0.bb
> deleted file mode 100644
> index c96e7db..0000000
> --- a/meta/recipes-support/libnl/libnl_2.0.bb
> +++ /dev/null
> @@ -1,27 +0,0 @@
> -DESCRIPTION = "libnl is a library for applications dealing with netlink sockets."
> -HOMEPAGE = "http://www.infradead.org/~tgr/libnl/"
> -SECTION = "libs/network"
> -
> -LICENSE = "LGPLv2.1"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=2b41e13261a330ee784153ecbb6a82bc"
> -
> -DEPENDS = "flex-native bison-native"
> -PE = "1"
> -PR = "r6"
> -
I did not catch this at first because it came as, but you need to
preserve the PE for package updates, it stands for Package Epoch and
needs to be preserved.
Sau!
> -SRC_URI = "\
> - http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz \
> - file://fix-pktloc_syntax_h-race.patch \
> - file://fix-pc-file.patch \
> -"
> -
> -SRC_URI[md5sum] = "6aaf1e9802a17a7d702bb0638044ffa7"
> -SRC_URI[sha256sum] = "5a40dc903d3ca1074da7424b908bec8ff16936484798c7e46e53e9db8bc87a9c"
> -
> -inherit autotools pkgconfig
> -
> -PACKAGES =+ "${PN}-route ${PN}-nf ${PN}-genl ${PN}-cli"
> -FILES_${PN}-route = "${libdir}/libnl-route.so.*"
> -FILES_${PN}-nf = "${libdir}/libnl-nf.so.*"
> -FILES_${PN}-genl = "${libdir}/libnl-genl.so.*"
> -FILES_${PN}-cli = "${libdir}/libnl-cli.so.*"
> diff --git a/meta/recipes-support/libnl/libnl_3.2.14.bb b/meta/recipes-support/libnl/libnl_3.2.14.bb
> new file mode 100644
> index 0000000..70920f3
> --- /dev/null
> +++ b/meta/recipes-support/libnl/libnl_3.2.14.bb
> @@ -0,0 +1,41 @@
> +DESCRIPTION = "libnl is a library for applications dealing with netlink sockets."
> +HOMEPAGE = "http://www.infradead.org/~tgr/libnl/"
> +SECTION = "libs/network"
> +
> +PR = "r0"
> +
> +LICENSE = "LGPLv2.1"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
> +
> +DEPENDS = "flex-native bison-native"
> +
> +SRC_URI = "http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz \
> + file://fix-pktloc_syntax_h-race.patch \
> + file://fix-pc-file.patch "
> +
> +SRC_URI[md5sum] = "81d44f530aa0af1638a220c413baec05"
> +SRC_URI[sha256sum] = "6bb043eea08765bada37a053d932f073db9d51e7a8cd419e237c785ba6369e2c"
> +
> +inherit autotools pkgconfig
> +
> +FILES_${PN} = "${libdir}/libnl-3.so.* \
> + ${libdir}/libnl.so.* \
> + ${sysconfdir}"
> +RREPLACES_${PN} = "libnl2"
> +RCONFLICTS_${PN} = "libnl2"
> +FILES_${PN}-dbg += "${libdir}/libnl/cli/*/.debug"
> +FILES_${PN}-dev += "${libdir}/libnl/cli/*/*.so \
> + ${libdir}/libnl/cli/*/*.la"
> +FILES_${PN}-staticdev += "${libdir}/libnl/cli/*/*.a"
> +
> +PACKAGES += "${PN}-cli ${PN}-route ${PN}-nf ${PN}-genl"
> +FILES_${PN}-cli = "${libdir}/libnl-cli-3.so.* \
> + ${libdir}/libnl/cli/*/*.so.* \
> + ${sbindir}/nl-*"
> +FILES_${PN}-route = "${libdir}/libnl-route-3.so.*"
> +FILES_${PN}-nf = "${libdir}/libnl-nf-3.so.*"
> +FILES_${PN}-genl = "${libdir}/libnl-genl-3.so.* \
> + ${libdir}/libnl-genl.so.* \
> + ${sbindir}/genl-ctrl-list"
> +RREPLACES_${PN}-genl = "libnl-genl2 libnl-genl-3-200"
> +RCONFLICTS_${PN}-genl = "libnl-genl2 libnl-genl-3-200"
>
next prev parent reply other threads:[~2012-12-04 23:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-04 23:33 [PATCH 0/3 v2] libnl update and friends Saul Wold
2012-12-04 23:33 ` [PATCH 1/3 v2] libnl: upgrade to 3.2.14 Saul Wold
2012-12-04 23:44 ` Saul Wold [this message]
2012-12-04 23:33 ` [PATCH 2/3 v2] wpa-supplicant: configured to work with libnl 3.2.14 Saul Wold
2012-12-04 23:33 ` [PATCH 3/3 v2] libpcap: PR bump because of PU for libnl Saul Wold
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=50BE8AEE.5090202@linux.intel.com \
--to=sgw@linux.intel.com \
--cc=mihai.prica@intel.com \
--cc=openembedded-core@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox