summaryrefslogtreecommitdiff
path: root/package/linux-atm
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-12-17 16:36:04 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2009-12-17 16:36:04 (GMT)
commitbb17a19fcc7f7d10369eed7f6c8662f6e4df9d4b (patch)
treeacd8cde7844e2039275049a769461e640afff9ca /package/linux-atm
parent11a25b78e7c010ed5f2b60fc85a5ac952a4c0e73 (diff)
enable cfgfs and atm
- make cfgfs work for ag241 - split mtd to separate package to control dependencies - update linux-atm package to latest upstream - enable atm kernel module building
Diffstat (limited to 'package/linux-atm')
-rw-r--r--package/linux-atm/Config.in9
-rw-r--r--package/linux-atm/Config.in.lib10
-rw-r--r--package/linux-atm/Makefile8
-rw-r--r--package/linux-atm/patches/patch-src_Makefile_in12
-rw-r--r--package/linux-atm/patches/patch-src_led_main_c11
-rw-r--r--package/linux-atm/patches/patch-src_qgen_Makefile_in29
-rw-r--r--package/linux-atm/patches/patch-src_qgen_ql_l_c12
-rw-r--r--package/linux-atm/patches/patch-src_sigd_Makefile_in7
-rw-r--r--package/linux-atm/patches/patch-src_sigd_cfg_l_c12
-rw-r--r--package/linux-atm/patches/patch-src_sigd_cfg_l_l10
-rw-r--r--package/linux-atm/patches/patch-src_switch_Makefile_in11
-rw-r--r--package/linux-atm/patches/patch-src_switch_cfg_l_c12
-rw-r--r--package/linux-atm/patches/patch-src_switch_cfg_l_l10
-rw-r--r--package/linux-atm/patches/patch-src_switch_debug_Makefile_in7
-rw-r--r--package/linux-atm/patches/patch-src_switch_tcp_Makefile_in9
-rw-r--r--package/linux-atm/patches/patch-src_test_Makefile_in12
-rw-r--r--package/linux-atm/patches/patch-src_test_ispl_l_c12
-rw-r--r--package/linux-atm/patches/patch-src_test_ttcp_c21
18 files changed, 71 insertions, 143 deletions
diff --git a/package/linux-atm/Config.in b/package/linux-atm/Config.in
index e89db02..3991c67 100644
--- a/package/linux-atm/Config.in
+++ b/package/linux-atm/Config.in
@@ -2,20 +2,13 @@ config ADK_COMPILE_LINUX_ATM
bool
default n
help
-
-config ADK_PACKAGE_LIBATM
- prompt "libatm............................. ATM Library for Linux"
- tristate
- default n
- depends on !ADK_HOST_FREEBSD
- help
- ATM Library for linux
config ADK_PACKAGE_BR2684CTL
prompt "br2684ctl......................... RFC2684 bridging utility"
tristate
default n
select ADK_PACKAGE_LIBATM
+ select ADK_COMPILE_LINUX_ATM
depends on !ADK_HOST_FREEBSD
help
Utility for setting up ATM RFC2684 bridging mode.
diff --git a/package/linux-atm/Config.in.lib b/package/linux-atm/Config.in.lib
new file mode 100644
index 0000000..6c3e92d
--- /dev/null
+++ b/package/linux-atm/Config.in.lib
@@ -0,0 +1,10 @@
+config ADK_PACKAGE_LIBATM
+ prompt "libatm............................ ATM Library for Linux"
+ tristate
+ default n
+ select ADK_COMPILE_LINUX_ATM
+ select ADK_KPACKAGE_KMOD_ATM
+ depends on !ADK_HOST_FREEBSD
+ help
+ ATM Library for linux.
+
diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile
index edb2778..2f32e7a 100644
--- a/package/linux-atm/Makefile
+++ b/package/linux-atm/Makefile
@@ -4,14 +4,16 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= linux-atm
-PKG_VERSION:= 2.5.0
+PKG_VERSION:= 2.5.1
PKG_RELEASE:= 1
-PKG_MD5SUM:= 0b45a0e801fac7093ce4b0cadf419965
-PKG_DESCR:= ATM library for linux
+PKG_MD5SUM:= 9560b0e1f410a05b849dfdab465dd758
+PKG_DESCR:= ATM library and tools for Linux
PKG_SECTION:= libs
PKG_URL:= http://linux-atm.sourceforge.net
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=linux-atm/}
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz
+
PKG_DESCR_1:= br2684ctl
PKG_DEPENDS_1:= libatm
PKG_SECTION_1:= net
diff --git a/package/linux-atm/patches/patch-src_Makefile_in b/package/linux-atm/patches/patch-src_Makefile_in
index be1ca26..843577f 100644
--- a/package/linux-atm/patches/patch-src_Makefile_in
+++ b/package/linux-atm/patches/patch-src_Makefile_in
@@ -1,11 +1,11 @@
---- linux-atm-2.5.0.orig/src/Makefile.in 2007-12-29 21:31:30.000000000 +0100
-+++ linux-atm-2.5.0/src/Makefile.in 2009-12-11 15:54:54.000000000 +0100
-@@ -179,7 +179,7 @@ target_os = @target_os@
- target_vendor = @target_vendor@
+--- linux-atm-2.5.1.orig/src/Makefile.in 2009-11-30 17:21:16.000000000 +0100
++++ linux-atm-2.5.1/src/Makefile.in 2009-12-17 16:12:07.284420844 +0100
+@@ -214,7 +214,7 @@ target_vendor = @target_vendor@
+ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
--SUBDIRS = include lib test debug qgen saal sigd maint arpd ilmid man led lane \
-+SUBDIRS = include lib debug qgen saal sigd maint arpd ilmid man led lane \
+-SUBDIRS = include lib test debug qgen q2931 saal sigd maint arpd ilmid man led lane \
++SUBDIRS = include lib debug qgen q2931 saal sigd maint arpd ilmid man led lane \
mpoad oamd switch config extra br2684
all: all-recursive
diff --git a/package/linux-atm/patches/patch-src_led_main_c b/package/linux-atm/patches/patch-src_led_main_c
deleted file mode 100644
index 63c5b5e..0000000
--- a/package/linux-atm/patches/patch-src_led_main_c
+++ /dev/null
@@ -1,11 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- linux-atm-2.5.0.orig/src/led/main.c 2005-10-06 19:27:50.000000000 +0200
-+++ linux-atm-2.5.0/src/led/main.c 2009-06-01 22:38:27.000000000 +0200
-@@ -31,6 +31,7 @@
- #endif
-
- /* Global includes */
-+#include <limits.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <sys/time.h>
diff --git a/package/linux-atm/patches/patch-src_qgen_Makefile_in b/package/linux-atm/patches/patch-src_qgen_Makefile_in
index 5c4bf49..211ff90 100644
--- a/package/linux-atm/patches/patch-src_qgen_Makefile_in
+++ b/package/linux-atm/patches/patch-src_qgen_Makefile_in
@@ -1,33 +1,20 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- linux-atm-2.5.0.orig/src/qgen/Makefile.in 2007-12-29 21:31:35.000000000 +0100
-+++ linux-atm-2.5.0/src/qgen/Makefile.in 2009-05-29 22:15:30.511416896 +0200
-@@ -92,9 +92,9 @@ AWK = @AWK@
- CC = @CC_FOR_BUILD@
- CCDEPMODE = @CCDEPMODE@
- CC_FOR_BUILD = @CC_FOR_BUILD@
--CFLAGS = @CFLAGS@
-+CFLAGS = -I../include
+--- linux-atm-2.5.1.orig/src/qgen/Makefile.in 2009-11-30 17:21:18.000000000 +0100
++++ linux-atm-2.5.1/src/qgen/Makefile.in 2009-12-17 16:17:11.216421967 +0100
+@@ -91,7 +91,7 @@ CC_FOR_BUILD = @CC_FOR_BUILD@
+ CFLAGS = @CFLAGS_FOR_BUILD@
+ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-+CPPFLAGS =
++CPPFLAGS =
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
-@@ -116,7 +116,7 @@ INSTALL_DATA = @INSTALL_DATA@
+@@ -114,7 +114,7 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-+LDFLAGS=
++LDFLAGS =
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -208,7 +208,7 @@ top_srcdir = @top_srcdir@
- qgen_SOURCES = common.c common.h file.c file.h first.c ql_y.y ql_l.l qgen.c \
- qgen.h second.c third.c
-
--qgen_LDADD = -lfl
-+qgen_LDADD =
- q_dump_SOURCES = common.c
- q_dump_LDADD = qd.dump.standalone.o
- # FIXME: paulsch: We don't really depend on qd.dump.o or q.out.o here, but this
diff --git a/package/linux-atm/patches/patch-src_qgen_ql_l_c b/package/linux-atm/patches/patch-src_qgen_ql_l_c
deleted file mode 100644
index ac01beb..0000000
--- a/package/linux-atm/patches/patch-src_qgen_ql_l_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- linux-atm-2.5.0.orig/src/qgen/ql_l.c 2007-12-24 20:46:13.000000000 +0100
-+++ linux-atm-2.5.0/src/qgen/ql_l.c 2009-05-29 22:10:55.010199430 +0200
-@@ -23,6 +23,8 @@
-
- /* end standard C headers. */
-
-+int yywrap(void) { return 1; }
-+
- /* flex integer type definitions */
-
- #ifndef FLEXINT_H
diff --git a/package/linux-atm/patches/patch-src_sigd_Makefile_in b/package/linux-atm/patches/patch-src_sigd_Makefile_in
index d48ea25..faa5a13 100644
--- a/package/linux-atm/patches/patch-src_sigd_Makefile_in
+++ b/package/linux-atm/patches/patch-src_sigd_Makefile_in
@@ -1,7 +1,6 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- linux-atm-2.5.0.orig/src/sigd/Makefile.in 2007-12-29 21:31:36.000000000 +0100
-+++ linux-atm-2.5.0/src/sigd/Makefile.in 2009-05-29 22:17:18.374156943 +0200
-@@ -223,7 +223,7 @@ atmsigd_XTRAS = mess.o $(top_builddir)/s
+--- linux-atm-2.5.1.orig/src/sigd/Makefile.in 2009-11-30 17:21:19.000000000 +0100
++++ linux-atm-2.5.1/src/sigd/Makefile.in 2009-12-17 16:21:42.636433571 +0100
+@@ -244,7 +244,7 @@ atmsigd_XTRAS = mess.o $(top_builddir)/s
$(top_builddir)/src/lib/libatm.la \
$(top_builddir)/src/saal/libsaal.a
diff --git a/package/linux-atm/patches/patch-src_sigd_cfg_l_c b/package/linux-atm/patches/patch-src_sigd_cfg_l_c
deleted file mode 100644
index 91ace0a..0000000
--- a/package/linux-atm/patches/patch-src_sigd_cfg_l_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- linux-atm-2.5.0.orig/src/sigd/cfg_l.c 2007-12-24 20:46:31.000000000 +0100
-+++ linux-atm-2.5.0/src/sigd/cfg_l.c 2009-05-29 22:21:00.552981945 +0200
-@@ -23,6 +23,8 @@
-
- /* end standard C headers. */
-
-+int yywrap(void) { return 1; }
-+
- /* flex integer type definitions */
-
- #ifndef FLEXINT_H
diff --git a/package/linux-atm/patches/patch-src_sigd_cfg_l_l b/package/linux-atm/patches/patch-src_sigd_cfg_l_l
new file mode 100644
index 0000000..38bde1e
--- /dev/null
+++ b/package/linux-atm/patches/patch-src_sigd_cfg_l_l
@@ -0,0 +1,10 @@
+--- linux-atm-2.5.1.orig/src/sigd/cfg_l.l 2004-09-25 13:25:48.000000000 +0200
++++ linux-atm-2.5.1/src/sigd/cfg_l.l 2009-12-17 16:26:08.528422011 +0100
+@@ -16,6 +16,7 @@
+
+ #include "cfg_y.h"
+
++int yywrap(void) { return 1; }
+
+ static int lineno = 1;
+ static int token; /* f@#%ing flex doesn't grok return after BEGIN */
diff --git a/package/linux-atm/patches/patch-src_switch_Makefile_in b/package/linux-atm/patches/patch-src_switch_Makefile_in
new file mode 100644
index 0000000..4a29818
--- /dev/null
+++ b/package/linux-atm/patches/patch-src_switch_Makefile_in
@@ -0,0 +1,11 @@
+--- linux-atm-2.5.1.orig/src/switch/Makefile.in 2009-11-30 17:21:19.000000000 +0100
++++ linux-atm-2.5.1/src/switch/Makefile.in 2009-12-17 16:30:47.392542123 +0100
+@@ -249,7 +249,7 @@ target_vendor = @target_vendor@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = . debug tcp
++SUBDIRS = . tcp
+ noinst_LIBRARIES = libsw.a
+ swc_SOURCES = swc.c swc.h
+ swc_LDADD = $(top_builddir)/src/lib/libatm.la
diff --git a/package/linux-atm/patches/patch-src_switch_cfg_l_c b/package/linux-atm/patches/patch-src_switch_cfg_l_c
deleted file mode 100644
index c0f08dc..0000000
--- a/package/linux-atm/patches/patch-src_switch_cfg_l_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- linux-atm-2.5.0.orig/src/switch/cfg_l.c 2007-12-24 20:47:23.000000000 +0100
-+++ linux-atm-2.5.0/src/switch/cfg_l.c 2009-05-29 22:27:33.024571460 +0200
-@@ -23,6 +23,8 @@
-
- /* end standard C headers. */
-
-+int yywrap(void) { return 1; }
-+
- /* flex integer type definitions */
-
- #ifndef FLEXINT_H
diff --git a/package/linux-atm/patches/patch-src_switch_cfg_l_l b/package/linux-atm/patches/patch-src_switch_cfg_l_l
new file mode 100644
index 0000000..ec00bc6
--- /dev/null
+++ b/package/linux-atm/patches/patch-src_switch_cfg_l_l
@@ -0,0 +1,10 @@
+--- linux-atm-2.5.1.orig/src/switch/cfg_l.l 2001-10-10 00:33:08.000000000 +0200
++++ linux-atm-2.5.1/src/switch/cfg_l.l 2009-12-17 16:37:59.408538574 +0100
+@@ -15,6 +15,7 @@
+
+ #include "cfg_y.h"
+
++int yywrap(void) { return 1; }
+
+ static int lineno = 1;
+ static int token; /* f@#%ing flex doesn't grok return after BEGIN */
diff --git a/package/linux-atm/patches/patch-src_switch_debug_Makefile_in b/package/linux-atm/patches/patch-src_switch_debug_Makefile_in
index 34f1db7..2d8fa57 100644
--- a/package/linux-atm/patches/patch-src_switch_debug_Makefile_in
+++ b/package/linux-atm/patches/patch-src_switch_debug_Makefile_in
@@ -1,7 +1,6 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- linux-atm-2.5.0.orig/src/switch/debug/Makefile.in 2007-12-29 21:31:36.000000000 +0100
-+++ linux-atm-2.5.0/src/switch/debug/Makefile.in 2009-05-29 22:23:13.656360541 +0200
-@@ -191,7 +191,7 @@ sw_debug_SOURCES = debug.c
+--- linux-atm-2.5.1.orig/src/switch/debug/Makefile.in 2009-11-30 17:21:19.000000000 +0100
++++ linux-atm-2.5.1/src/switch/debug/Makefile.in 2009-12-17 16:28:31.520542232 +0100
+@@ -199,7 +199,7 @@ sw_debug_SOURCES = debug.c
sw_debug_XTRAS = $(top_builddir)/src/switch/libsw.a \
$(top_builddir)/src/lib/libatm.la
diff --git a/package/linux-atm/patches/patch-src_switch_tcp_Makefile_in b/package/linux-atm/patches/patch-src_switch_tcp_Makefile_in
index e40a65b..f23a644 100644
--- a/package/linux-atm/patches/patch-src_switch_tcp_Makefile_in
+++ b/package/linux-atm/patches/patch-src_switch_tcp_Makefile_in
@@ -1,12 +1,11 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- linux-atm-2.5.0.orig/src/switch/tcp/Makefile.in 2007-12-29 21:31:37.000000000 +0100
-+++ linux-atm-2.5.0/src/switch/tcp/Makefile.in 2009-05-29 22:35:16.037506912 +0200
-@@ -191,7 +191,7 @@ sw_tcp_SOURCES = tcpsw.c
+--- linux-atm-2.5.1.orig/src/switch/tcp/Makefile.in 2009-11-30 17:21:19.000000000 +0100
++++ linux-atm-2.5.1/src/switch/tcp/Makefile.in 2009-12-17 16:33:08.832418828 +0100
+@@ -199,7 +199,7 @@ sw_tcp_SOURCES = tcpsw.c
sw_tcp_XTRAS = $(top_builddir)/src/switch/libsw.a \
$(top_builddir)/src/lib/libatm.la
-sw_tcp_LDADD = $(sw_tcp_XTRAS) -lfl
-+sw_tcp_LDADD = $(sw_tcp_XTRAS)
++sw_tcp_LDADD = $(sw_tcp_XTRAS)
sw_tcp_DEPENDENCIES = $(sw_tcp_XTRAS)
EXTRA_DIST = mkfiles README
all: all-am
diff --git a/package/linux-atm/patches/patch-src_test_Makefile_in b/package/linux-atm/patches/patch-src_test_Makefile_in
deleted file mode 100644
index af972e5..0000000
--- a/package/linux-atm/patches/patch-src_test_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- linux-atm-2.5.0.orig/src/test/Makefile.in 2007-12-29 21:31:37.000000000 +0100
-+++ linux-atm-2.5.0/src/test/Makefile.in 2009-05-29 21:38:58.834444157 +0200
-@@ -275,7 +275,7 @@ br_SOURCES = br.c
- bw_SOURCES = bw.c
- isp_SOURCES = isp.c isp.h ispl_y.y ispl_l.l
- isp_XTRAS = $(LDADD)
--isp_LDADD = $(isp_XTRAS) -lfl
-+isp_LDADD = $(isp_XTRAS)
- isp_DEPENDENCIES = $(isp_XTRAS) errnos.inc
- window_SOURCES = window.c
- CLEANFILES = errnos.inc
diff --git a/package/linux-atm/patches/patch-src_test_ispl_l_c b/package/linux-atm/patches/patch-src_test_ispl_l_c
deleted file mode 100644
index e7a8af5..0000000
--- a/package/linux-atm/patches/patch-src_test_ispl_l_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- linux-atm-2.5.0.orig/src/test/ispl_l.c 2007-12-24 20:46:06.000000000 +0100
-+++ linux-atm-2.5.0/src/test/ispl_l.c 2009-05-29 21:41:01.398113709 +0200
-@@ -23,6 +23,8 @@
-
- /* end standard C headers. */
-
-+int yywrap(void) { return 1; }
-+
- /* flex integer type definitions */
-
- #ifndef FLEXINT_H
diff --git a/package/linux-atm/patches/patch-src_test_ttcp_c b/package/linux-atm/patches/patch-src_test_ttcp_c
deleted file mode 100644
index e436e9d..0000000
--- a/package/linux-atm/patches/patch-src_test_ttcp_c
+++ /dev/null
@@ -1,21 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- linux-atm-2.5.0.orig/src/test/ttcp.c 2005-04-18 18:18:28.000000000 +0200
-+++ linux-atm-2.5.0/src/test/ttcp.c 2009-05-29 21:27:32.488378268 +0200
-@@ -331,7 +331,7 @@ int no_check = 0;
- /* xmitr */
- if (optind == argc)
- goto usage;
-- bzero((char *)&sinhim, sizeof(sinhim));
-+ memset((char *)&sinhim, 0, sizeof(sinhim));
- if (atoi(host) > 0 ) {
- /* Numeric */
- sinhim.sin_family = AF_INET;
-@@ -345,7 +345,7 @@ int no_check = 0;
- if ((addr=gethostbyname(host)) == NULL)
- err("bad hostname");
- sinhim.sin_family = addr->h_addrtype;
-- bcopy(addr->h_addr,(char*)&addr_tmp, addr->h_length);
-+ memcpy((char*)&addr_tmp, addr->h_addr, addr->h_length);
- #if defined(cray)
- sinhim.sin_addr = addr_tmp;
- #else