summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-networking/recipes-support/ipvsadm/ipvsadm/0001-Modify-the-Makefile-for-cross-compile.patch58
-rw-r--r--meta-networking/recipes-support/ipvsadm/ipvsadm/0002-Replace-nl_handle-to-nl_sock.patch63
-rw-r--r--meta-networking/recipes-support/ipvsadm/ipvsadm/makefile-add-ldflags.patch20
-rw-r--r--meta-networking/recipes-support/ipvsadm/ipvsadm_1.29.bb (renamed from meta-networking/recipes-support/ipvsadm/ipvsadm_1.26.bb)11
4 files changed, 40 insertions, 112 deletions
diff --git a/meta-networking/recipes-support/ipvsadm/ipvsadm/0001-Modify-the-Makefile-for-cross-compile.patch b/meta-networking/recipes-support/ipvsadm/ipvsadm/0001-Modify-the-Makefile-for-cross-compile.patch
index 7c3dfe4a84..d7b0267d56 100644
--- a/meta-networking/recipes-support/ipvsadm/ipvsadm/0001-Modify-the-Makefile-for-cross-compile.patch
+++ b/meta-networking/recipes-support/ipvsadm/ipvsadm/0001-Modify-the-Makefile-for-cross-compile.patch
@@ -1,18 +1,22 @@
1From 58292175115bae7a4c3600d3022e59ea57213025 Mon Sep 17 00:00:00 2001 1From 801224257015788d3aff026bf2ae1cd8531d4fcc Mon Sep 17 00:00:00 2001
2From: Jianchuan Wang <jianchuan.wang@windriver.com> 2From: Changqing Li <changqing.li@windriver.com>
3Date: Mon, 12 Jan 2015 15:53:23 +0800 3Date: Wed, 25 Jul 2018 13:12:04 +0800
4Subject: [PATCH] Modify the Makefile for cross compile. 4Subject: [PATCH] Modify the Makefile for cross compile.
5 5
6Upstream-Status: Inappropriate [embedded specific] 6Upstream-Status: Inappropriate [embedded specific]
7 7
8Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com> 8Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com>
9
10update to version 1.29
11
12Signed-off-by: Changqing Li <changqing.li@windriver.com>
9--- 13---
10 Makefile | 23 ++++++----------------- 14 Makefile | 9 ++++-----
11 libipvs/Makefile | 3 +-- 15 libipvs/Makefile | 3 +--
12 2 files changed, 7 insertions(+), 19 deletions(-) 16 2 files changed, 5 insertions(+), 7 deletions(-)
13 17
14diff --git a/Makefile b/Makefile 18diff --git a/Makefile b/Makefile
15index e4e03cc..461c021 100644 19index 91a2991..906086d 100644
16--- a/Makefile 20--- a/Makefile
17+++ b/Makefile 21+++ b/Makefile
18@@ -35,10 +35,9 @@ ARCH = $(shell uname -m) 22@@ -35,10 +35,9 @@ ARCH = $(shell uname -m)
@@ -23,57 +27,29 @@ index e4e03cc..461c021 100644
23 INCLUDE = 27 INCLUDE =
24 SBIN = $(BUILD_ROOT)/sbin 28 SBIN = $(BUILD_ROOT)/sbin
25-MANDIR = usr/man 29-MANDIR = usr/man
26+MANDIR = usr/share/man 30+MANDIR = usr/share/man
27 MAN = $(BUILD_ROOT)/$(MANDIR)/man8 31 MAN = $(BUILD_ROOT)/$(MANDIR)/man8
28 INIT = $(BUILD_ROOT)/etc/rc.d/init.d 32 INIT = $(BUILD_ROOT)/etc/rc.d/init.d
29 MKDIR = mkdir 33 MKDIR = mkdir
30@@ -62,17 +61,7 @@ RPMBUILD = $(shell \ 34@@ -81,13 +80,13 @@ DEFINES += $(shell if [ ! -f ../ip_vs.h ]; then \
31 echo "/bin/rpm"; \
32 fi )
33
34-ifeq (,$(FORCE_GETOPT))
35-LIB_SEARCH = /lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib
36-POPT_LIB = $(shell for i in $(LIB_SEARCH); do \
37- if [ -f $$i/libpopt.a ]; then \
38- if nm $$i/libpopt.a | fgrep -q poptGetContext; then \
39- echo "-lpopt"; \
40- break; \
41- fi; \
42- fi; \
43-done)
44-endif
45+POPT_LIB = -lpopt
46
47 ifneq (,$(POPT_LIB))
48 POPT_DEFINE = -DHAVE_POPT
49@@ -81,7 +70,7 @@ endif
50 OBJS = ipvsadm.o config_stream.o dynamic_array.o
51 LIBS = $(POPT_LIB)
52 ifneq (0,$(HAVE_NL))
53-LIBS += -lnl
54+LIBS += -lnl-3 -lnl-genl-3
55 endif
56 DEFINES = -DVERSION=\"$(VERSION)\" -DSCHEDULERS=\"$(SCHEDULERS)\" \
57 -DPE_LIST=\"$(PE_LIST)\" $(POPT_DEFINE)
58@@ -91,13 +80,13 @@ DEFINES += $(shell if [ ! -f ../ip_vs.h ]; then \
59 35
60 .PHONY = all clean install dist distclean rpm rpms 36 .PHONY = all clean install dist distclean rpm rpms
61 37
62-all: libs ipvsadm 38-all: libs ipvsadm
63+all: ipvsadm 39+all: ipvsadm
64 40
65 libs: 41 libs:
66 make -C libipvs 42 make -C libipvs
67 43
68-ipvsadm: $(OBJS) $(STATIC_LIBS) 44-ipvsadm: $(OBJS) $(STATIC_LIBS)
69- $(CC) $(CFLAGS) -o $@ $^ $(LIBS) 45- $(CC) $(CFLAGS) -o $@ $^ $(LIBS)
70+ipvsadm: $(OBJS) libs 46+ipvsadm: $(OBJS) libs
71+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(STATIC_LIBS) $(LIBS) 47+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(STATIC_LIBS) $(LIBS)
72 48
73 install: all 49 install: all
74 if [ ! -d $(SBIN) ]; then $(MKDIR) -p $(SBIN); fi 50 if [ ! -d $(SBIN) ]; then $(MKDIR) -p $(SBIN); fi
75diff --git a/libipvs/Makefile b/libipvs/Makefile 51diff --git a/libipvs/Makefile b/libipvs/Makefile
76index a527a7f..b7300ec 100644 52index f845c8b..dafab30 100644
77--- a/libipvs/Makefile 53--- a/libipvs/Makefile
78+++ b/libipvs/Makefile 54+++ b/libipvs/Makefile
79@@ -1,6 +1,5 @@ 55@@ -1,6 +1,5 @@
@@ -83,7 +59,7 @@ index a527a7f..b7300ec 100644
83 CFLAGS = -Wall -Wunused -Wstrict-prototypes -g -fPIC 59 CFLAGS = -Wall -Wunused -Wstrict-prototypes -g -fPIC
84 ifneq (0,$(HAVE_NL)) 60 ifneq (0,$(HAVE_NL))
85 CFLAGS += -DLIBIPVS_USE_NL 61 CFLAGS += -DLIBIPVS_USE_NL
86@@ -18,7 +17,7 @@ SHARED_LIB = libipvs.so 62@@ -30,7 +29,7 @@ SHARED_LIB = libipvs.so
87 all: $(STATIC_LIB) $(SHARED_LIB) 63 all: $(STATIC_LIB) $(SHARED_LIB)
88 64
89 $(STATIC_LIB): libipvs.o ip_vs_nl_policy.o 65 $(STATIC_LIB): libipvs.o ip_vs_nl_policy.o
@@ -93,5 +69,5 @@ index a527a7f..b7300ec 100644
93 $(SHARED_LIB): libipvs.o ip_vs_nl_policy.o 69 $(SHARED_LIB): libipvs.o ip_vs_nl_policy.o
94 $(CC) -shared -Wl,-soname,$@ -o $@ $^ 70 $(CC) -shared -Wl,-soname,$@ -o $@ $^
95-- 71--
961.9.1 722.7.4
97 73
diff --git a/meta-networking/recipes-support/ipvsadm/ipvsadm/0002-Replace-nl_handle-to-nl_sock.patch b/meta-networking/recipes-support/ipvsadm/ipvsadm/0002-Replace-nl_handle-to-nl_sock.patch
deleted file mode 100644
index 7896d6d1ea..0000000000
--- a/meta-networking/recipes-support/ipvsadm/ipvsadm/0002-Replace-nl_handle-to-nl_sock.patch
+++ /dev/null
@@ -1,63 +0,0 @@
1From 2686213259b15df9cf1d969c5a14d62f14cfbaae Mon Sep 17 00:00:00 2001
2From: Jianchuan Wang <jianchuan.wang@windriver.com>
3Date: Thu, 8 Jan 2015 17:37:11 +0800
4Subject: [PATCH 2/2] Replace nl_handle to nl_sock.
5
6The nl_handle was replace with nl_sock in the libnl-3.
7
8Upstream-Status: Inappropriate [embedded specific]
9
10Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com>
11---
12 libipvs/libipvs.c | 10 +++++-----
13 1 file changed, 5 insertions(+), 5 deletions(-)
14
15diff --git a/libipvs/libipvs.c b/libipvs/libipvs.c
16index a157e18..21a9bfa 100644
17--- a/libipvs/libipvs.c
18+++ b/libipvs/libipvs.c
19@@ -32,7 +32,7 @@ static void* ipvs_func = NULL;
20 struct ip_vs_getinfo ipvs_info;
21
22 #ifdef LIBIPVS_USE_NL
23-static struct nl_handle *sock = NULL;
24+static struct nl_sock *sock = NULL;
25 static int family, try_nl = 1;
26 #endif
27
28@@ -73,7 +73,7 @@ int ipvs_nl_send_message(struct nl_msg *msg, nl_recvmsg_msg_cb_t func, void *arg
29 {
30 int err = EINVAL;
31
32- sock = nl_handle_alloc();
33+ sock = nl_socket_alloc();
34 if (!sock) {
35 nlmsg_free(msg);
36 return -1;
37@@ -88,7 +88,7 @@ int ipvs_nl_send_message(struct nl_msg *msg, nl_recvmsg_msg_cb_t func, void *arg
38
39 /* To test connections and set the family */
40 if (msg == NULL) {
41- nl_handle_destroy(sock);
42+ nl_socket_free(sock);
43 sock = NULL;
44 return 0;
45 }
46@@ -104,12 +104,12 @@ int ipvs_nl_send_message(struct nl_msg *msg, nl_recvmsg_msg_cb_t func, void *arg
47
48 nlmsg_free(msg);
49
50- nl_handle_destroy(sock);
51+ nl_socket_free(sock);
52
53 return 0;
54
55 fail_genl:
56- nl_handle_destroy(sock);
57+ nl_socket_free(sock);
58 sock = NULL;
59 nlmsg_free(msg);
60 errno = err;
61--
621.8.3.1
63
diff --git a/meta-networking/recipes-support/ipvsadm/ipvsadm/makefile-add-ldflags.patch b/meta-networking/recipes-support/ipvsadm/ipvsadm/makefile-add-ldflags.patch
index 1bf1eed4c3..a2c5235c37 100644
--- a/meta-networking/recipes-support/ipvsadm/ipvsadm/makefile-add-ldflags.patch
+++ b/meta-networking/recipes-support/ipvsadm/ipvsadm/makefile-add-ldflags.patch
@@ -1,19 +1,33 @@
1Add LDFLAGS variable to Makefile, make sure the extra linker flags can be passed. 1From 8aff1e965ec17262f3a5b376f7eb3e053d81905c Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Tue, 24 Jul 2018 18:18:05 +0800
4Subject: [PATCH] Add LDFLAGS variable to Makefile, make sure the extra linker
5 flags can be passed.
2 6
3Upstream-Status: Pending 7Upstream-Status: Pending
4 8
5Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 9Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
6 10
11Update to version 1.29
12
13Signed-off-by: Changqing Li <changqing.li@windriver.com>
14---
15 Makefile | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
7diff --git a/Makefile b/Makefile 18diff --git a/Makefile b/Makefile
8index 461c021..8bc9cde 100644 19index f29bbae..81beb5a 100644
9--- a/Makefile 20--- a/Makefile
10+++ b/Makefile 21+++ b/Makefile
11@@ -86,7 +86,7 @@ libs: 22@@ -86,7 +86,7 @@ libs:
12 make -C libipvs 23 make -C libipvs
13 24
14 ipvsadm: $(OBJS) libs 25 ipvsadm: $(OBJS) libs
15- $(CC) $(CFLAGS) -o $@ $(OBJS) $(STATIC_LIBS) $(LIBS) 26- $(CC) $(CFLAGS) -o $@ $(OBJS) $(STATIC_LIBS) $(LIBS)
16+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(STATIC_LIBS) $(LIBS) 27+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(STATIC_LIBS) $(LIBS)
17 28
18 install: all 29 install: all
19 if [ ! -d $(SBIN) ]; then $(MKDIR) -p $(SBIN); fi 30 if [ ! -d $(SBIN) ]; then $(MKDIR) -p $(SBIN); fi
31--
322.7.4
33
diff --git a/meta-networking/recipes-support/ipvsadm/ipvsadm_1.26.bb b/meta-networking/recipes-support/ipvsadm/ipvsadm_1.29.bb
index 2ac2b4836b..58407a1309 100644
--- a/meta-networking/recipes-support/ipvsadm/ipvsadm_1.26.bb
+++ b/meta-networking/recipes-support/ipvsadm/ipvsadm_1.29.bb
@@ -12,19 +12,18 @@ locality-based least-connection, locality-based least-connection with replicati
12destination-hashing, and source-hashing)." 12destination-hashing, and source-hashing)."
13SECTION = "net" 13SECTION = "net"
14LICENSE = "GPL-2.0" 14LICENSE = "GPL-2.0"
15LIC_FILES_CHKSUM = "file://README;beginline=40;endline=56;md5=a54cba37b64924aa5008881607942892" 15LIC_FILES_CHKSUM = "file://README;beginline=40;endline=56;md5=b4e40069f15598d0e3fe2aa177e5ec77"
16 16
17DEPENDS += "libnl popt" 17DEPENDS += "libnl popt"
18 18
19SRC_URI = "http://www.linuxvirtualserver.org/software/kernel-2.6/${BP}.tar.gz \ 19SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/utils/kernel/ipvsadm/${BP}.tar.gz \
20 file://0001-Modify-the-Makefile-for-cross-compile.patch \ 20 file://0001-Modify-the-Makefile-for-cross-compile.patch \
21 file://0002-Replace-nl_handle-to-nl_sock.patch \
22 file://0003-ipvsadm-remove-dependency-on-bash.patch \ 21 file://0003-ipvsadm-remove-dependency-on-bash.patch \
23 file://makefile-add-ldflags.patch \ 22 file://makefile-add-ldflags.patch \
24" 23"
25 24
26SRC_URI[md5sum] = "eac3ba3f62cd4dea2da353aeddd353a8" 25SRC_URI[md5sum] = "88b35030b4766b3e44ad15aacdef65c4"
27SRC_URI[sha256sum] = "6d6c46fecb1c532a892616b4445c73b71730e8790d5630f60269fd9cbee0eb2d" 26SRC_URI[sha256sum] = "297f5cd459c3eef81ed0ca32e53bf320ed6b132fe7ed6ea5e44aa6b1fbd2a7de"
28 27
29UPSTREAM_CHECK_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/ipvsadm" 28UPSTREAM_CHECK_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/ipvsadm"
30 29
@@ -37,3 +36,5 @@ do_compile() {
37do_install() { 36do_install() {
38 oe_runmake 'BUILD_ROOT=${D}' install 37 oe_runmake 'BUILD_ROOT=${D}' install
39} 38}
39
40inherit pkgconfig
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-02 15:16:04 +0000