aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/libnl
diff options
context:
space:
mode:
Diffstat (limited to 'recipes/libnl')
-rw-r--r--recipes/libnl/files/fix-pc-file.patch11
-rw-r--r--recipes/libnl/libnl.inc9
-rw-r--r--recipes/libnl/libnl/fix-pc-file.patch (renamed from recipes/libnl/libnl2/fix-pc-file.patch)0
-rw-r--r--recipes/libnl/libnl/fix-pktloc-dep-race.patch (renamed from recipes/libnl/libnl2/fix-pktloc-dep-race.patch)0
-rw-r--r--recipes/libnl/libnl1-1.1/build.only.static.lib.patch79
-rw-r--r--recipes/libnl/libnl1-1.1/dont-link-libnl-from-sysroot.patch (renamed from recipes/libnl/files/dont-link-libnl-from-sysroot.patch)0
-rw-r--r--recipes/libnl/libnl1-1.1/fix-includes.patch (renamed from recipes/libnl/files/fix-includes.patch)0
-rw-r--r--recipes/libnl/libnl1-1.1/local-includes.patch (renamed from recipes/libnl/files/local-includes.patch)0
-rw-r--r--recipes/libnl/libnl1-1.1/netlink-local-fix.patch (renamed from recipes/libnl/files/netlink-local-fix.patch)0
-rw-r--r--recipes/libnl/libnl1-1.1/respect-ldflags.patch (renamed from recipes/libnl/files/respect-ldflags.patch)0
-rw-r--r--recipes/libnl/libnl1_1.1.bb (renamed from recipes/libnl/libnl_1.1.bb)13
-rw-r--r--recipes/libnl/libnl_2.0.bb (renamed from recipes/libnl/libnl2_2.0.bb)13
-rw-r--r--recipes/libnl/libnl_git.bb (renamed from recipes/libnl/libnl2_git.bb)19
13 files changed, 103 insertions, 41 deletions
diff --git a/recipes/libnl/files/fix-pc-file.patch b/recipes/libnl/files/fix-pc-file.patch
deleted file mode 100644
index 77f3e88562..0000000000
--- a/recipes/libnl/files/fix-pc-file.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: git/libnl-2.0.pc.in
-===================================================================
---- git.orig/libnl-2.0.pc.in
-+++ git/libnl-2.0.pc.in
-@@ -6,5 +6,5 @@
- 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}
diff --git a/recipes/libnl/libnl.inc b/recipes/libnl/libnl.inc
new file mode 100644
index 0000000000..6f502b1019
--- /dev/null
+++ b/recipes/libnl/libnl.inc
@@ -0,0 +1,9 @@
+DESCRIPTION = "libnl is a library for applications dealing with netlink sockets"
+SECTION = "libs/network"
+LICENSE = "LGPL"
+HOMEPAGE = "http://www.infradead.org/~tgr/libnl/"
+
+INC_PR = "r5"
+
+inherit autotools pkgconfig
+
diff --git a/recipes/libnl/libnl2/fix-pc-file.patch b/recipes/libnl/libnl/fix-pc-file.patch
index 17666fbadf..17666fbadf 100644
--- a/recipes/libnl/libnl2/fix-pc-file.patch
+++ b/recipes/libnl/libnl/fix-pc-file.patch
diff --git a/recipes/libnl/libnl2/fix-pktloc-dep-race.patch b/recipes/libnl/libnl/fix-pktloc-dep-race.patch
index ee217441b6..ee217441b6 100644
--- a/recipes/libnl/libnl2/fix-pktloc-dep-race.patch
+++ b/recipes/libnl/libnl/fix-pktloc-dep-race.patch
diff --git a/recipes/libnl/libnl1-1.1/build.only.static.lib.patch b/recipes/libnl/libnl1-1.1/build.only.static.lib.patch
new file mode 100644
index 0000000000..770a3924f7
--- /dev/null
+++ b/recipes/libnl/libnl1-1.1/build.only.static.lib.patch
@@ -0,0 +1,79 @@
+diff -uNr libnl-1.1.orig//lib/Makefile libnl-1.1/lib/Makefile
+--- libnl-1.1.orig//lib/Makefile 2011-03-23 15:50:32.310534329 +0100
++++ libnl-1.1/lib/Makefile 2011-03-23 15:50:43.926534326 +0100
+@@ -33,18 +33,24 @@
+ DEPS := $(CIN:%.c=%.d)
+ OBJ := $(CIN:%.c=%.o)
+ CFLAGS += -fPIC
++OUT_LIB := $(PACKAGE_NAME)1.a
+ OUT_SLIB := $(PACKAGE_NAME).so.$(PACKAGE_VERSION)
+ LN_SLIB := $(PACKAGE_NAME).so
+ LN1_SLIB := $(LN_SLIB).1
+
+ export
+
+-.PHONY: all clean install librtn.a $(OUT_SLIB)
++.PHONY: all clean install librtn.a $(OUT_SLIB) $(OUT_LIB)
+
+
+ all:
+- @echo " MAKE $(OUT_SLIB)"; \
+- $(MAKE) $(OUT_SLIB)
++ @echo " MAKE $(OUT_LIB)"; \
++ $(MAKE) $(OUT_LIB)
++
++$(OUT_LIB): ../Makefile.opts $(OBJ)
++ @echo " LD $(OUT_LIB)"; \
++ echo $(AR) rs $(OUT_LIB) $(OBJ)
++ $(AR) rs $(OUT_LIB) $(OBJ)
+
+ $(OUT_SLIB): ../Makefile.opts $(OBJ)
+ @echo " LD $(OUT_SLIB)"; \
+@@ -56,8 +62,8 @@
+
+ clean:
+ @echo " CLEAN lib"; \
+- $(RM) -f $(OBJ) $(OUT_SLIB) $(LN_SLIB) $(LN1_SLIB); \
+- $(RM) -f $(DEPS) $(OUT_SLIB) $(LN_SLIB) $(LN1_SLIB)
++ $(RM) -f $(OBJ) $(OUT_SLIB) $(OUT_LIB) $(LN_SLIB) $(LN1_SLIB); \
++ $(RM) -f $(DEPS) $(OUT_SLIB) $(OUT_LIB) $(LN_SLIB) $(LN1_SLIB)
+
+ distclean:
+ @echo " DISTCLEAN lib"; \
+@@ -65,11 +71,7 @@
+
+ install:
+- mkdir -p $(DESTDIR)$(libdir)/
+- install -m 0644 $(OUT_SLIB) $(DESTDIR)$(libdir)
+- rm -f $(DESTDIR)$(libdir)/$(LN1_SLIB)
+- $(LN) -s $(OUT_SLIB) $(DESTDIR)$(libdir)/$(LN1_SLIB)
+- rm -f $(DESTDIR)$(libdir)/$(LN_SLIB)
+- $(LN) -s $(LN1_SLIB) $(DESTDIR)$(libdir)/$(LN_SLIB)
++ mkdir -p $(DESTDIR)$(libdir)/libnl1
++ install -m 0644 $(OUT_LIB) $(DESTDIR)$(libdir)/libnl1
+
+ $(DEPS): ../Makefile.opts
+
+diff -uNr libnl-1.1.orig//Makefile libnl-1.1/Makefile
+--- libnl-1.1.orig//Makefile 2008-01-14 16:48:45.000000000 +0100
++++ libnl-1.1/Makefile 2011-03-23 16:53:12.438533242 +0100
+@@ -13,7 +13,7 @@
+ include Makefile.opts
+ endif
+
+-SUBDIRS := lib include doc src tests
++SUBDIRS := lib include doc
+ .PHONY: all clean distclean install gendoc $(SUBDIRS)
+
+ all: Makefile.opts
+diff -uNr libnl-1.1.orig//libnl-1.pc.in libnl-1.1/libnl-1.pc.in
+--- libnl-1.1.orig//libnl-1.pc.in 2008-01-14 16:48:45.000000000 +0100
++++ libnl-1.1/libnl-1.pc.in 2011-03-23 16:57:18.084533174 +0100
+@@ -6,5 +6,5 @@
+ Name: libnl
+ Description: Convenience library for netlink sockets
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -lnl
+-Cflags:
++Libs: -L${libdir}/libnl1 -lnl1 -lm
++Cflags: -I${includedir}/libnl1
diff --git a/recipes/libnl/files/dont-link-libnl-from-sysroot.patch b/recipes/libnl/libnl1-1.1/dont-link-libnl-from-sysroot.patch
index beb63617ac..beb63617ac 100644
--- a/recipes/libnl/files/dont-link-libnl-from-sysroot.patch
+++ b/recipes/libnl/libnl1-1.1/dont-link-libnl-from-sysroot.patch
diff --git a/recipes/libnl/files/fix-includes.patch b/recipes/libnl/libnl1-1.1/fix-includes.patch
index b172fd2f86..b172fd2f86 100644
--- a/recipes/libnl/files/fix-includes.patch
+++ b/recipes/libnl/libnl1-1.1/fix-includes.patch
diff --git a/recipes/libnl/files/local-includes.patch b/recipes/libnl/libnl1-1.1/local-includes.patch
index 85659db6d7..85659db6d7 100644
--- a/recipes/libnl/files/local-includes.patch
+++ b/recipes/libnl/libnl1-1.1/local-includes.patch
diff --git a/recipes/libnl/files/netlink-local-fix.patch b/recipes/libnl/libnl1-1.1/netlink-local-fix.patch
index 51c6736025..51c6736025 100644
--- a/recipes/libnl/files/netlink-local-fix.patch
+++ b/recipes/libnl/libnl1-1.1/netlink-local-fix.patch
diff --git a/recipes/libnl/files/respect-ldflags.patch b/recipes/libnl/libnl1-1.1/respect-ldflags.patch
index ba97dc6724..ba97dc6724 100644
--- a/recipes/libnl/files/respect-ldflags.patch
+++ b/recipes/libnl/libnl1-1.1/respect-ldflags.patch
diff --git a/recipes/libnl/libnl_1.1.bb b/recipes/libnl/libnl1_1.1.bb
index f1b2a9d485..3569867cc0 100644
--- a/recipes/libnl/libnl_1.1.bb
+++ b/recipes/libnl/libnl1_1.1.bb
@@ -1,11 +1,9 @@
-DESCRIPTION = "libnl is a library for applications dealing with netlink sockets"
-SECTION = "libs/network"
-LICENSE = "LGPL"
-HOMEPAGE = "http://www.infradead.org/~tgr/libnl/"
+require libnl.inc
-PR = "r4"
+PR = "${INC_PR}.0"
-inherit autotools pkgconfig
+# move it to extra subdirectory
+includedir = "${prefix}/include/libnl1"
CFLAGS += '-DVLAN_FLAG_REORDER_HDR=1'
@@ -16,8 +14,9 @@ SRC_URI = "\
file://respect-ldflags.patch \
file://netlink-local-fix.patch \
file://dont-link-libnl-from-sysroot.patch \
+ file://build.only.static.lib.patch \
"
-
+S = "${WORKDIR}/libnl-${PV}"
SRC_URI[md5sum] = "ae970ccd9144e132b68664f98e7ceeb1"
SRC_URI[sha256sum] = "35cea4cfb6cd8af0cafa0f34fff81def5a1f193b8b8384299b4b21883e22edc3"
diff --git a/recipes/libnl/libnl2_2.0.bb b/recipes/libnl/libnl_2.0.bb
index 7e9336e68a..d1cbc0beeb 100644
--- a/recipes/libnl/libnl2_2.0.bb
+++ b/recipes/libnl/libnl_2.0.bb
@@ -1,22 +1,15 @@
-DESCRIPTION = "libnl2 is a library for applications dealing with netlink sockets"
-SECTION = "libs/network"
-LICENSE = "LGPL"
-HOMEPAGE = "http://www.infradead.org/~tgr/libnl/"
+require libnl.inc
PE = "1"
-PR = "r2"
+PR = "${INC_PR}.0"
DEPENDS = "flex-native bison-native"
-inherit autotools pkgconfig
-
-includedir = ${prefix}/include/libnl2
-
-S = "${WORKDIR}/libnl-${PV}"
SRC_URI = "\
http://www.infradead.org/~tgr/libnl/files/libnl-${PV}.tar.gz \
file://fix-pc-file.patch \
file://fix-pktloc-dep-race.patch \
"
+
SRC_URI[md5sum] = "6aaf1e9802a17a7d702bb0638044ffa7"
SRC_URI[sha256sum] = "5a40dc903d3ca1074da7424b908bec8ff16936484798c7e46e53e9db8bc87a9c"
diff --git a/recipes/libnl/libnl2_git.bb b/recipes/libnl/libnl_git.bb
index b667815924..a4a37a8b12 100644
--- a/recipes/libnl/libnl2_git.bb
+++ b/recipes/libnl/libnl_git.bb
@@ -1,24 +1,17 @@
-DESCRIPTION = "libnl2 is a library for applications dealing with netlink sockets"
-SECTION = "libs/network"
-LICENSE = "LGPL"
-HOMEPAGE = "http://www.infradead.org/~tgr/libnl/"
-SRCREV = "d378220c96c3c8b6f27dca33e7d8ba03318f9c2d"
-PV = "1.9+gitr${SRCPV}"
+require libnl.inc
+
PE = "1"
-PR = "r3"
+PV = "1.9+gitr${SRCPV}"
+PR = "${INC_PR}.0"
DEPENDS = "flex-native bison-native"
-inherit autotools
-
-includedir = ${prefix}/include/libnl2
-
+S = "${WORKDIR}/git"
+SRCREV = "d378220c96c3c8b6f27dca33e7d8ba03318f9c2d"
SRC_URI = "\
git://git.kernel.org/pub/scm/libs/netlink/libnl.git;protocol=git \
file://fix-pc-file.patch \
- file://fix-pktloc-dep-race.patch \
"
-S = "${WORKDIR}/git"
PACKAGES =+ "${PN}-route ${PN}-nf ${PN}-genl ${PN}-cli"
FILES_${PN}-route = "${libdir}/libnl-route.so.*"
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-06-18 22:14:37 +0000