diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2011-11-07 14:38:32 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-11-07 17:20:34 +0100 |
| commit | 3112dceb46e6eb82864c945c16ba0f406b888af6 (patch) | |
| tree | 4ec139912fa57a64788a5a3ec99d8d3e1052577f | |
| parent | 37b7c23afc091d752a83f3ff284490c8613d180c (diff) | |
| download | meta-openembedded-3112dceb46e6eb82864c945c16ba0f406b888af6.tar.gz | |
libnl: drop 2.0 and git recipes, now there is usable in oe-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
| -rw-r--r-- | meta-oe/recipes-support/libnl/libnl/fix-pc-file.patch | 11 | ||||
| -rw-r--r-- | meta-oe/recipes-support/libnl/libnl/fix-pktloc-dep-race.patch | 20 | ||||
| -rw-r--r-- | meta-oe/recipes-support/libnl/libnl_2.0.bb | 23 | ||||
| -rw-r--r-- | meta-oe/recipes-support/libnl/libnl_git.bb | 20 |
4 files changed, 0 insertions, 74 deletions
diff --git a/meta-oe/recipes-support/libnl/libnl/fix-pc-file.patch b/meta-oe/recipes-support/libnl/libnl/fix-pc-file.patch deleted file mode 100644 index 17666fbadf..0000000000 --- a/meta-oe/recipes-support/libnl/libnl/fix-pc-file.patch +++ /dev/null | |||
| @@ -1,11 +0,0 @@ | |||
| 1 | Index: libnl-2.0/libnl-2.0.pc.in | ||
| 2 | =================================================================== | ||
| 3 | --- libnl-2.0.orig/libnl-2.0.pc.in | ||
| 4 | +++ libnl-2.0/libnl-2.0.pc.in | ||
| 5 | @@ -6,5 +6,5 @@ | ||
| 6 | Name: libnl | ||
| 7 | Description: Convenience library for netlink sockets | ||
| 8 | Version: @PACKAGE_VERSION@ | ||
| 9 | -Libs: -L${libdir} -lnl | ||
| 10 | +Libs: -L${libdir} -lnl -lnl-genl -lnl-nf -lnl-route | ||
| 11 | Cflags: -I${includedir} | ||
diff --git a/meta-oe/recipes-support/libnl/libnl/fix-pktloc-dep-race.patch b/meta-oe/recipes-support/libnl/libnl/fix-pktloc-dep-race.patch deleted file mode 100644 index ee217441b6..0000000000 --- a/meta-oe/recipes-support/libnl/libnl/fix-pktloc-dep-race.patch +++ /dev/null | |||
| @@ -1,20 +0,0 @@ | |||
| 1 | Index: libnl-2.0/lib/Makefile.am | ||
| 2 | =================================================================== | ||
| 3 | --- libnl-2.0.orig/lib/Makefile.am | ||
| 4 | +++ libnl-2.0/lib/Makefile.am | ||
| 5 | @@ -27,11 +27,15 @@ CLEANFILES = \ | ||
| 6 | route/pktloc_grammar.c route/pktloc_grammar.h \ | ||
| 7 | route/pktloc_syntax.c route/pktloc_syntax.h | ||
| 8 | |||
| 9 | +BUILT_SOURCES = route/pktloc_syntax.h route/pktloc_grammar.h | ||
| 10 | + | ||
| 11 | # Hack to avoid using ylwrap. It does not function correctly in combination | ||
| 12 | # with --header-file= | ||
| 13 | +route/pktloc_grammar.h: route/pktloc_grammar.c | ||
| 14 | route/pktloc_grammar.c: route/pktloc_grammar.l | ||
| 15 | $(LEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^ | ||
| 16 | |||
| 17 | +route/pktloc_syntax.h: route/pktloc_syntax.c | ||
| 18 | route/pktloc_syntax.c: route/pktloc_syntax.y | ||
| 19 | $(YACC) -d $(YFLAGS) -o $@ $^ | ||
| 20 | |||
diff --git a/meta-oe/recipes-support/libnl/libnl_2.0.bb b/meta-oe/recipes-support/libnl/libnl_2.0.bb deleted file mode 100644 index e646e3d0e5..0000000000 --- a/meta-oe/recipes-support/libnl/libnl_2.0.bb +++ /dev/null | |||
| @@ -1,23 +0,0 @@ | |||
| 1 | require libnl.inc | ||
| 2 | PE = "1" | ||
| 3 | PR = "${INC_PR}.0" | ||
| 4 | |||
| 5 | LICENSE = "LGPLv2.1" | ||
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=2b41e13261a330ee784153ecbb6a82bc" | ||
| 7 | |||
| 8 | DEPENDS = "flex-native bison-native" | ||
| 9 | |||
| 10 | SRC_URI = "\ | ||
| 11 | http://www.infradead.org/~tgr/libnl/files/libnl-${PV}.tar.gz \ | ||
| 12 | file://fix-pc-file.patch \ | ||
| 13 | file://fix-pktloc-dep-race.patch \ | ||
| 14 | " | ||
| 15 | |||
| 16 | SRC_URI[md5sum] = "6aaf1e9802a17a7d702bb0638044ffa7" | ||
| 17 | SRC_URI[sha256sum] = "5a40dc903d3ca1074da7424b908bec8ff16936484798c7e46e53e9db8bc87a9c" | ||
| 18 | |||
| 19 | PACKAGES =+ "${PN}-route ${PN}-nf ${PN}-genl ${PN}-cli" | ||
| 20 | FILES_${PN}-route = "${libdir}/libnl-route.so.*" | ||
| 21 | FILES_${PN}-nf = "${libdir}/libnl-nf.so.*" | ||
| 22 | FILES_${PN}-genl = "${libdir}/libnl-genl.so.*" | ||
| 23 | FILES_${PN}-cli = "${libdir}/libnl-cli.so.*" | ||
diff --git a/meta-oe/recipes-support/libnl/libnl_git.bb b/meta-oe/recipes-support/libnl/libnl_git.bb deleted file mode 100644 index a4a37a8b12..0000000000 --- a/meta-oe/recipes-support/libnl/libnl_git.bb +++ /dev/null | |||
| @@ -1,20 +0,0 @@ | |||
| 1 | require libnl.inc | ||
| 2 | |||
| 3 | PE = "1" | ||
| 4 | PV = "1.9+gitr${SRCPV}" | ||
| 5 | PR = "${INC_PR}.0" | ||
| 6 | |||
| 7 | DEPENDS = "flex-native bison-native" | ||
| 8 | |||
| 9 | S = "${WORKDIR}/git" | ||
| 10 | SRCREV = "d378220c96c3c8b6f27dca33e7d8ba03318f9c2d" | ||
| 11 | SRC_URI = "\ | ||
| 12 | git://git.kernel.org/pub/scm/libs/netlink/libnl.git;protocol=git \ | ||
| 13 | file://fix-pc-file.patch \ | ||
| 14 | " | ||
| 15 | |||
| 16 | PACKAGES =+ "${PN}-route ${PN}-nf ${PN}-genl ${PN}-cli" | ||
| 17 | FILES_${PN}-route = "${libdir}/libnl-route.so.*" | ||
| 18 | FILES_${PN}-nf = "${libdir}/libnl-nf.so.*" | ||
| 19 | FILES_${PN}-genl = "${libdir}/libnl-genl.so.*" | ||
| 20 | FILES_${PN}-cli = "${libdir}/libnl-cli.so.*" | ||
