diff options
29 files changed, 177 insertions, 178 deletions
diff --git a/package/Config.in b/package/Config.in index 1cc29c402..c6f714d74 100644 --- a/package/Config.in +++ b/package/Config.in @@ -55,6 +55,7 @@ source "package/dosfstools/Config.in" source "package/e2fsprogs/Config.in" source "package/fuse/Config.in" source "package/mdadm/Config.in" +source "package/mtd/Config.in" source "package/lvm/Config.in" source "package/parted/Config.in" source "package/util-linux-ng/Config.in" @@ -236,6 +237,7 @@ endmenu menu "Firewall / Routing / Bridging" source "package/arpd/Config.in" source "package/bridge-utils/Config.in" +source "package/linux-atm/Config.in" source "package/cutter/Config.in" source "package/ebtables/Config.in" source "package/ether-wake/Config.in" @@ -243,7 +245,6 @@ source "package/iproute2/Config.in" source "package/ipset/Config.in" source "package/iptables/Config.in" source "package/knock/Config.in" -source "package/linux-atm/Config.in" source "package/macchanger/Config.in" source "package/netstat-nat/Config.in" source "package/quagga/Config.in" @@ -407,6 +408,7 @@ source "package/id3lib/Config.in" source "package/libao/Config.in" source "package/libaudiofile/Config.in" source "package/libart/Config.in" +source "package/linux-atm/Config.in.lib" source "package/libcli/Config.in" source "package/curl/Config.in.lib" source "package/libdaemon/Config.in" diff --git a/package/cfgfs/Config.in b/package/cfgfs/Config.in index fcda6c97e..911027433 100644 --- a/package/cfgfs/Config.in +++ b/package/cfgfs/Config.in @@ -5,11 +5,13 @@ config ADK_PACKAGE_CFGFS select BUSYBOX_MD5SUM select BUSYBOX_XARGS select BUSYBOX_FEATURE_SORT_BIG + select ADK_PACKAGE_MTD depends on \ ADK_LINUX_X86_ALIX1C || \ ADK_LINUX_X86_ALIX2D || \ ADK_LINUX_X86_WRAP || \ ADK_LINUX_CRIS_FOXBOARD || \ + ADK_LINUX_MIPS_AG241 || \ ADK_LINUX_MIPS_RB532 default y help diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index 50d571e90..17ab5e6a7 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cfgfs PKG_VERSION:= 1.0.6 -PKG_RELEASE:= 3 +PKG_RELEASE:= 4 PKG_DESCR:= compressed config filesystem PKG_SECTION:= base @@ -21,14 +21,11 @@ BUILD_STYLE:= auto do-configure: mkdir -p ${WRKBUILD} ${CP} ./src/* ${WRKBUILD} - ${TARGET_CC} ${TCPPFLAGS} ${TCFLAGS} -o ${WRKBUILD}/mtd ${WRKBUILD}/mtd.c do-install: ${INSTALL_DIR} ${IDIR_CFGFS}/sbin ${INSTALL_BIN} ${WRKBUILD}/fwcf.sh ${IDIR_CFGFS}/sbin/cfgfs - ${INSTALL_BIN} ${WRKBUILD}/fwcf.helper.out ${IDIR_CFGFS}/sbin/cfgfs.helper -ifeq ($(ARCH),cris) - ${INSTALL_BIN} ${WRKBUILD}/mtd ${IDIR_CFGFS}/sbin/mtd -endif + ${INSTALL_BIN} ${WRKBUILD}/fwcf.helper.out \ + ${IDIR_CFGFS}/sbin/cfgfs.helper include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/iptables/Config.in b/package/iptables/Config.in index 5b82599ad..56dd79cc9 100644 --- a/package/iptables/Config.in +++ b/package/iptables/Config.in @@ -21,16 +21,6 @@ config ADK_PACKAGE_IPTABLES http://www.iptables.org/ -config ADK_PACKAGE_IPTABLES_UTILS - prompt "iptables-utils.................. Save and restore utilities" - tristate - default n - depends on ADK_PACKAGE_IPTABLES - help - iptables-save and iptables-restore for Iptables (IPv4) - - http://www.iptables.org/ - config ADK_PACKAGE_IP6TABLES prompt "ip6tables......................... IPv6 firewall administration tool" tristate diff --git a/package/linux-atm/Config.in b/package/linux-atm/Config.in index e89db02d1..3991c679f 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 000000000..6c3e92d21 --- /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 edb277885..2f32e7aa8 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 be1ca26b5..843577f7f 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 63c5b5e9b..000000000 --- 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 5c4bf490e..211ff90ff 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 ac01bebfb..000000000 --- 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 d48ea25e7..faa5a1385 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 91ace0a91..000000000 --- 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 000000000..38bde1e58 --- /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 000000000..4a2981839 --- /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 c0f08dc69..000000000 --- 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 000000000..ec00bc66b --- /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 34f1db7da..2d8fa57d2 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 e40a65b23..f23a64405 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 af972e59e..000000000 --- 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 e7a8af5f2..000000000 --- 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 e436e9d9d..000000000 --- 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 diff --git a/package/mtd/Config.in b/package/mtd/Config.in new file mode 100644 index 000000000..aacc297b5 --- /dev/null +++ b/package/mtd/Config.in @@ -0,0 +1,9 @@ +config ADK_PACKAGE_MTD + prompt "mtd................................ mtd utility" + tristate + depends on \ + ADK_LINUX_CRIS_FOXBOARD || \ + ADK_LINUX_MIPS_AG241 + default n + help + MTD utility. diff --git a/package/mtd/Makefile b/package/mtd/Makefile new file mode 100644 index 000000000..67aa1f30c --- /dev/null +++ b/package/mtd/Makefile @@ -0,0 +1,32 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include ${TOPDIR}/rules.mk + +PKG_NAME:= mtd +PKG_VERSION:= 1.0 +PKG_RELEASE:= 1 +PKG_DESCR:= MTD utility +PKG_SECTION:= base + +WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} +NO_DISTFILES:= 1 + +include ${TOPDIR}/mk/package.mk + +$(eval $(call PKG_template,MTD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +BUILD_STYLE:= manual +INSTALL_STYLE:= manual + +do-build: + mkdir -p ${WRKBUILD} + ${CP} ./src/* ${WRKBUILD} + ${TARGET_CC} ${TCPPFLAGS} ${TCFLAGS} -o ${WRKBUILD}/mtd \ + ${WRKBUILD}/mtd.c + +do-install: + ${INSTALL_DIR} ${IDIR_MTD}/sbin + ${INSTALL_BIN} ${WRKBUILD}/mtd ${IDIR_MTD}/sbin/mtd + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/cfgfs/src/mtd.c b/package/mtd/src/mtd.c index 6812c5e31..6812c5e31 100644 --- a/package/cfgfs/src/mtd.c +++ b/package/mtd/src/mtd.c diff --git a/target/Config.in b/target/Config.in index 7fcc049fd..2ff9ce4dd 100644 --- a/target/Config.in +++ b/target/Config.in @@ -557,7 +557,8 @@ config ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK create an read-only initramfs system. config ADK_TARGET_ROOTFS_SQUASHFS - bool "squashfs read-only root filesystem" + bool "Compressed read-only root filesystem (squashfs)" + select ADK_KERNEL_SQUASHFS depends on \ ADK_LINUX_CRIS_FOXBOARD || \ ADK_LINUX_MIPS_AG241 || \ diff --git a/target/ag241/patches/ar7.patch b/target/ag241/patches/ar7.patch index a09ea1c18..8b28e854c 100644 --- a/target/ag241/patches/ar7.patch +++ b/target/ag241/patches/ar7.patch @@ -76,6 +76,40 @@ diff -Nur linux-2.6.32.orig/arch/mips/kernel/traps.c linux-2.6.32/arch/mips/kern } return (void *)old_handler; } +diff -Nur linux-2.6.32.orig/drivers/mtd/ar7part.c linux-2.6.32/drivers/mtd/ar7part.c +--- linux-2.6.32.orig/drivers/mtd/ar7part.c 2009-12-03 04:51:21.000000000 +0100 ++++ linux-2.6.32/drivers/mtd/ar7part.c 2009-12-17 10:51:32.044434005 +0100 +@@ -28,7 +28,7 @@ + #include <linux/bootmem.h> + #include <linux/magic.h> + +-#define AR7_PARTS 4 ++#define AR7_PARTS 5 + #define ROOT_OFFSET 0xe0000 + + #define LOADER_MAGIC1 le32_to_cpu(0xfeedfa42) +@@ -122,14 +122,19 @@ + + ar7_parts[2].name = "linux"; + ar7_parts[2].offset = pre_size; +- ar7_parts[2].size = master->size - pre_size - post_size; ++ ar7_parts[2].size = master->size - pre_size - post_size - 2*master->erasesize; + ar7_parts[2].mask_flags = 0; + + ar7_parts[3].name = "rootfs"; + ar7_parts[3].offset = root_offset; +- ar7_parts[3].size = master->size - root_offset - post_size; ++ ar7_parts[3].size = master->size - root_offset - post_size - 2*master->erasesize; + ar7_parts[3].mask_flags = 0; + ++ ar7_parts[4].name = "cfgfs"; ++ ar7_parts[4].offset = master->size - 2*master->erasesize; ++ ar7_parts[4].size = 2*master->erasesize; ++ ar7_parts[4].mask_flags = 0; ++ + *pparts = ar7_parts; + return AR7_PARTS; + } diff -Nur linux-2.6.32.orig/drivers/mtd/maps/physmap.c linux-2.6.32/drivers/mtd/maps/physmap.c --- linux-2.6.32.orig/drivers/mtd/maps/physmap.c 2009-12-03 04:51:21.000000000 +0100 +++ linux-2.6.32/drivers/mtd/maps/physmap.c 2009-12-16 20:12:01.388510102 +0100 diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs index a9c2668ae..8631b486e 100644 --- a/target/linux/config/Config.in.fs +++ b/target/linux/config/Config.in.fs @@ -17,6 +17,10 @@ config ADK_KPACKAGE_KMOD_EXPORTFS default n help +config ADK_KERNEL_SQUASHFS + boolean + default n + config ADK_KERNEL_EXT2_FS boolean default n diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network index 349f4a9fd..05995b8b2 100644 --- a/target/linux/config/Config.in.network +++ b/target/linux/config/Config.in.network @@ -40,23 +40,23 @@ config ADK_KERNEL_LLC tristate default n -#config ADK_KPACKAGE_KMOD_ATM -# prompt "kmod-atm.......................... Asynchronous Transfer Mode (ATM)" -# tristate -# default n -# help -# ATM is a high-speed networking technology for Local Area Networks -# and Wide Area Networks. It uses a fixed packet size and is -# connection oriented, allowing for the negotiation of minimum -# bandwidth requirements. -# -# In order to participate in an ATM network, your Linux box needs an -# ATM networking card. If you have that, say Y here and to the driver -# of your ATM card below. -# -# Note that you need a set of user-space programs to actually make use -# of ATM. See the file <file:Documentation/networking/atm.txt> for -# further details. +config ADK_KPACKAGE_KMOD_ATM + prompt "kmod-atm.......................... Asynchronous Transfer Mode (ATM)" + tristate + default n + help + ATM is a high-speed networking technology for Local Area Networks + and Wide Area Networks. It uses a fixed packet size and is + connection oriented, allowing for the negotiation of minimum + bandwidth requirements. + + In order to participate in an ATM network, your Linux box needs an + ATM networking card. If you have that, say Y here and to the driver + of your ATM card below. + + Note that you need a set of user-space programs to actually make use + of ATM. See the file <file:Documentation/networking/atm.txt> for + further details. config ADK_KPACKAGE_KMOD_BRIDGE prompt "kmod-net-bridge................... 802.1d Ethernet Bridging" |