[yocto] [meta-cgl][PATCH 3/6] remove lksctp-tools from meta-cgl
Adrian Dudau
adrian.dudau at enea.com
Mon Mar 14 08:12:23 PDT 2016
lksctp-tools was initially added with the aim to fulfill STD.3.1. The
Linux kernel >2.6 includes support for the base features of SCTP, so
there is no need for the package.
Besides that, there is already a recipe defined in meta-networking that
is kept up to date. If a P2 requirement will require lksctp-tools, we
can add it from there.
CGL requirement STD.3.1
Signed-off-by: Adrian Dudau <adrian.dudau at enea.com>
Signed-off-by: Siva Borra <siva.borra at enea.com>
---
.../packagegroups/packagegroup-cgl-middleware.bb | 1 -
.../lksctp-tools/files/static-libraries-fix.patch | 60 ----------------------
.../recipes-cgl/lksctp-tools/lksctp-tools.inc | 47 -----------------
.../recipes-cgl/lksctp-tools/lksctp-tools_1.0.7.bb | 38 --------------
4 files changed, 146 deletions(-)
delete mode 100644 meta-cgl-common/recipes-cgl/lksctp-tools/files/static-libraries-fix.patch
delete mode 100644 meta-cgl-common/recipes-cgl/lksctp-tools/lksctp-tools.inc
delete mode 100644 meta-cgl-common/recipes-cgl/lksctp-tools/lksctp-tools_1.0.7.bb
diff --git a/meta-cgl-common/packagegroups/packagegroup-cgl-middleware.bb b/meta-cgl-common/packagegroups/packagegroup-cgl-middleware.bb
index 23735f3..448e038 100644
--- a/meta-cgl-common/packagegroups/packagegroup-cgl-middleware.bb
+++ b/meta-cgl-common/packagegroups/packagegroup-cgl-middleware.bb
@@ -49,7 +49,6 @@ RDEPENDS_packagegroup-cgl-middleware = "\
vlan \
corosync \
iscsi-initiator-utils \
- lksctp-tools \
openais \
openipmi \
openhpi \
diff --git a/meta-cgl-common/recipes-cgl/lksctp-tools/files/static-libraries-fix.patch b/meta-cgl-common/recipes-cgl/lksctp-tools/files/static-libraries-fix.patch
deleted file mode 100644
index 745db9b..0000000
--- a/meta-cgl-common/recipes-cgl/lksctp-tools/files/static-libraries-fix.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-When running "./configure --disable-shared --enable-
-static" the build fails with the following error:
-
-gcc -g -Wall -Wstrict-prototypes -Wimplicit-function-
-declaration -g -O2 -o nagle_snd
-nagle_snd.o ../../src/lib/.libs/libsctp.a ../../src/t
-estlib/.libs/libsctputil.a
-../../src/testlib/.libs/libsctputil.a(sctputil.o): In
-function `test_peer_addr':
-/home/roubert/src/lksctp/lksctp-tools-
-1.0.6/src/testlib/sctputil.c:376: undefined reference
-to `sctp_getpaddrs'
-/home/roubert/src/lksctp/lksctp-tools-
-1.0.6/src/testlib/sctputil.c:382: undefined reference
-to `sctp_freepaddrs'
-/home/roubert/src/lksctp/lksctp-tools-
-1.0.6/src/testlib/sctputil.c:416: undefined reference
-to `sctp_freepaddrs'
-/home/roubert/src/lksctp/lksctp-tools-
-1.0.6/src/testlib/sctputil.c:400: undefined reference
-to `sctp_freepaddrs'
-collect2: ld returned 1 exit status
-make[3]: *** [nagle_snd] Error 1
-
-Changing the order of libsctp.a and libsctputil.a
-fixes this. The attached patch updates
-src/apps/Makefile.am and src/func_tests/Makefile.am
-to do that.
-
-Patch submitted by Fredrik Roubert <roubert at sf.net>.
-Patch needed reformatation because it did not applies as it was.
-
-diff -Naur a/src/apps/Makefile.am b/src/apps/Makefile.am
---- a/src/apps/Makefile.am 2014-07-04 14:57:42.707977872 +0200
-+++ b/src/apps/Makefile.am 2014-07-04 14:59:12.336231677 +0200
-@@ -8,8 +8,8 @@
- INCLUDES = -I. -I$(top_srcdir)/src/include -I$(top_srcdir)/src/testlib
- AM_CFLAGS = -g -Wall -Wstrict-prototypes -Wimplicit-function-declaration
- AM_LDFLAGS =
--LDADD = $(top_builddir)/src/lib/libsctp.la \
-- $(top_builddir)/src/testlib/libsctputil.la
-+LDADD = $(top_builddir)/src/testlib/libsctputil.la \
-+ $(top_builddir)/src/lib/libsctp.la
-
- # programs to be installed with the distriubution
- bin_PROGRAMS = sctp_darn sctp_test
-diff -Naur a/src/func_tests/Makefile.am b/src/func_tests/Makefile.am
---- a/src/func_tests/Makefile.am 2014-07-04 15:04:48.678188041 +0200
-+++ b/src/func_tests/Makefile.am 2014-07-04 15:13:24.624769819 +0200
-@@ -8,8 +8,8 @@
- INCLUDES = -I. -I$(top_srcdir)/src/include -I$(top_srcdir)/src/testlib
- AM_CFLAGS = -g -Wall -Wstrict-prototypes -Wimplicit-function-declaration
- AM_LDFLAGS = -lpthread
--LDADD = $(top_builddir)/src/lib/libsctp.la \
-- $(top_builddir)/src/testlib/libsctputil.la
-+LDADD = $(top_builddir)/src/testlib/libsctputil.la \
-+ $(top_builddir)/src/lib/libsctp.la
-
- V6FLAGS = -DCONFIG_IPV6=1 -DTEST_V6=1 ${DEFS} ${INCLUDES} ${CFLAGS}
-
diff --git a/meta-cgl-common/recipes-cgl/lksctp-tools/lksctp-tools.inc b/meta-cgl-common/recipes-cgl/lksctp-tools/lksctp-tools.inc
deleted file mode 100644
index 08a2073..0000000
--- a/meta-cgl-common/recipes-cgl/lksctp-tools/lksctp-tools.inc
+++ /dev/null
@@ -1,47 +0,0 @@
-DESCRIPTION = "The Linux Kernel Stream Control Transmission Protocol (lksctp) project"
-SECTION = "libs"
-PRIORITY = "optional"
-LICENSE = "LGPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=0c56db0143f4f80c369ee3af7425af6e"
-
-S = "${WORKDIR}/${BPN}-${PV}"
-
-INC_PR = "r1"
-
-BBCLASSEXTEND = "native"
-
-inherit autotools-brokensep pkgconfig binconfig
-
-EXTRA_OEMAKE="LIB=${libdir} exec_prefix=${exec_prefix} libdir=${libdir}"
-EXTRA_OECONF="--prefix=${libdir}"
-
-do_install_append_virtclass-native() {
- :
-}
-
-RREPLACES_${PN}= "lksctp"
-
-LEAD_SONAME = "libsctp.so"
-
-PACKAGES =+ "${PN}-withsctp ${PN}-utils"
-
-FILES_${PN} = "${libexecdir}/* ${libdir}/lib*${SOLIBS} \
- ${sysconfdir} ${sharedstatedir} ${localstatedir} \
- ${base_libdir}/*${SOLIBS}"
-
-FILES_${PN}-dev += " \
- ${datadir}/lksctp-tools/checksctp.c \
- ${datadir}/lksctp-tools/sctp_socket.c \
- ${datadir}/lksctp-tools/sctp_bind.c \
- ${datadir}/lksctp-tools/sctp_darn.c \
- ${datadir}/lksctp-tools/sctp_load_libs.c \
- ${datadir}/lksctp-tools/sctp_sockopt.c \
- ${datadir}/lksctp-tools/sctp_socket.h \
- ${datadir}/lksctp-tools/sctp_test.c \
- ${datadir}/lksctp-tools/sctp_darn.h"
-
-FILES_${PN}-utils = " \
- ${bindir}/sctp_test \
- ${bindir}/sctp_darn \
- ${bindir}/checksctp \
- ${bindir}/withsctp"
diff --git a/meta-cgl-common/recipes-cgl/lksctp-tools/lksctp-tools_1.0.7.bb b/meta-cgl-common/recipes-cgl/lksctp-tools/lksctp-tools_1.0.7.bb
deleted file mode 100644
index 454c9ff..0000000
--- a/meta-cgl-common/recipes-cgl/lksctp-tools/lksctp-tools_1.0.7.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-require lksctp-tools.inc
-
-FILESEXTRAPATHS_prepend = "${THISDIR}/files:"
-SRC_URI += " \
- ${SOURCEFORGE_MIRROR}/lksctp/lksctp-tools-${PV}.tar.gz \
- file://static-libraries-fix.patch \
- "
-
-inherit pkgconfig autotools
-
-SRC_URI[md5sum] = "047562b40537eb3be5d5ec3ae0a2198b"
-SRC_URI[sha256sum] = "e920e89d110cff9847f1d86a1d7a23a156a8abcc9e65a35655d687fd08377595"
-
-FILES_${PN}-dev += " \
- ${libdir}/lksctp-tools/*.so \
- ${libdir}/*.so \
- ${base_libdir}/*.so \
- ${base_libdir}/lksctp-tools/*.so \
- /usr/lib/lksctp-tools/*.so"
-FILES_${PN}-staticdev = " \
- ${libdir}/lksctp-tools/*.a \
- ${libdir}/*.a \
- ${base_libdir}/*.a \
- ${base_libdir}/lksctp-tools/*.a \
- /usr/lib/lksctp-tools/*.a"
-
-FILES_${PN}-withsctp-dev = " \
- ${libdir}/lksctp-tools/*.so \
- ${libdir}/*.so \
- ${base_libdir}/*.so \
- ${base_libdir}/lksctp-tools/*.so \
- /usr/lib/lksctp-tools/*.so"
-FILES_${PN}-withsctp-staticdev = " \
- ${libdir}/lksctp-tools/*.a \
- ${libdir}/*.a \
- ${base_libdir}/*.a \
- ${base_libdir}/lksctp-tools/*.a \
- /usr/lib/lksctp-tools/*.a"
--
1.9.1
More information about the yocto
mailing list