Menu
▾
▴
astlinux-commits
|
From: <kr...@us...> - 2007-03-12 01:14:56
|
Revision: 749
http://svn.sourceforge.net/astlinux/?rev=749&view=rev
Author: krisk84
Date: 2007-03-11 18:14:54 -0700 (Sun, 11 Mar 2007)
Log Message:
-----------
merge zoneinfo from 0.4 - thanks again Darrick
Modified Paths:
--------------
trunk/package/Config.in
Added Paths:
-----------
trunk/package/zoneinfo/
trunk/package/zoneinfo/Config.in
trunk/package/zoneinfo/zoneinfo.mk
Removed Paths:
-------------
trunk/package/zoneinfo/Config.in
trunk/package/zoneinfo/zoneinfo.mk
trunk/target/generic/target_skeleton/usr/share/
Modified: trunk/package/Config.in
===================================================================
--- trunk/package/Config.in 2007-03-12 01:14:19 UTC (rev 748)
+++ trunk/package/Config.in 2007-03-12 01:14:54 UTC (rev 749)
@@ -199,6 +199,7 @@
source "package/xorg/Config.in"
source "package/zaptel/Config.in"
source "package/zlib/Config.in"
+source "package/zoneinfo/Config.in"
endmenu
Copied: trunk/package/zoneinfo (from rev 748, branches/0.4/package/zoneinfo)
Deleted: trunk/package/zoneinfo/Config.in
===================================================================
--- branches/0.4/package/zoneinfo/Config.in 2007-03-12 01:14:19 UTC (rev 748)
+++ trunk/package/zoneinfo/Config.in 2007-03-12 01:14:54 UTC (rev 749)
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_ZONEINFO
- bool "zoneinfo"
- default n
- help
- Timezone Data files required by some glibc applications
- to resolve localtime correctly.
-
- ftp://elsie.nci.nih.gov/pub/
Copied: trunk/package/zoneinfo/Config.in (from rev 748, branches/0.4/package/zoneinfo/Config.in)
===================================================================
--- trunk/package/zoneinfo/Config.in (rev 0)
+++ trunk/package/zoneinfo/Config.in 2007-03-12 01:14:54 UTC (rev 749)
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_ZONEINFO
+ bool "zoneinfo"
+ default n
+ help
+ Timezone Data files required by some glibc applications
+ to resolve localtime correctly.
+
+ ftp://elsie.nci.nih.gov/pub/
Deleted: trunk/package/zoneinfo/zoneinfo.mk
===================================================================
--- branches/0.4/package/zoneinfo/zoneinfo.mk 2007-03-12 01:14:19 UTC (rev 748)
+++ trunk/package/zoneinfo/zoneinfo.mk 2007-03-12 01:14:54 UTC (rev 749)
@@ -1,48 +0,0 @@
-#############################################################
-#
-# zoneinfo
-#
-##############################################################
-ZONEINFO_VERSION :=
-ZONEINFO_SOURCE := tzcode2007c.tar.gz
-ZONEINFO_DATA := tzdata2007c.tar.gz
-ZONEINFO_SITE := ftp://elsie.nci.nih.gov/pub/
-ZONEINFO_DIR := $(BUILD_DIR)/zoneinfo
-ZONEINFO_BINARY := usr/share/zoneinfo/.tzcompiled
-
-$(DL_DIR)/$(ZONEINFO_SOURCE):
- $(WGET) -P $(DL_DIR) $(ZONEINFO_SITE)/$(ZONEINFO_SOURCE)
-
-$(DL_DIR)/$(ZONEINFO_DATA):
- $(WGET) -P $(DL_DIR) $(ZONEINFO_SITE)/$(ZONEINFO_DATA)
-
-$(ZONEINFO_DIR)/.source: $(DL_DIR)/$(ZONEINFO_SOURCE) $(DL_DIR)/$(ZONEINFO_DATA)
- mkdir $(ZONEINFO_DIR)
- zcat $(DL_DIR)/$(ZONEINFO_SOURCE) | tar -C $(ZONEINFO_DIR) $(TAR_OPTIONS) -
- zcat $(DL_DIR)/$(ZONEINFO_DATA) | tar -C $(ZONEINFO_DIR) $(TAR_OPTIONS) -
- touch $(ZONEINFO_DIR)/.source
-
-$(TARGET_DIR)/$(ZONEINFO_BINARY): $(ZONEINFO_DIR)/.source
- (cd $(ZONEINFO_DIR); \
- $(MAKE1) TZDIR=$(TARGET_DIR)/usr/share/zoneinfo posix_only \
- );
- touch $(TARGET_DIR)/$(ZONEINFO_BINARY)
-
-zoneinfo: $(TARGET_DIR)/$(ZONEINFO_BINARY)
-
-zoneinfo-source: $(DL_DIR)/$(ZONEINFO_SOURCE) $(DL_DIR)/$(ZONEINFO_DATA)
-
-zoneinfo-clean:
- -rm -rf $(TARGET_DIR)/usr/share/zoneinfo
-
-zoneinfo-dirclean:
- -rm -rf $(ZONEINFO_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_ZONEINFO)),y)
-TARGETS+=zoneinfo
-endif
Copied: trunk/package/zoneinfo/zoneinfo.mk (from rev 748, branches/0.4/package/zoneinfo/zoneinfo.mk)
===================================================================
--- trunk/package/zoneinfo/zoneinfo.mk (rev 0)
+++ trunk/package/zoneinfo/zoneinfo.mk 2007-03-12 01:14:54 UTC (rev 749)
@@ -0,0 +1,48 @@
+#############################################################
+#
+# zoneinfo
+#
+##############################################################
+ZONEINFO_VERSION :=
+ZONEINFO_SOURCE := tzcode2007c.tar.gz
+ZONEINFO_DATA := tzdata2007c.tar.gz
+ZONEINFO_SITE := ftp://elsie.nci.nih.gov/pub/
+ZONEINFO_DIR := $(BUILD_DIR)/zoneinfo
+ZONEINFO_BINARY := usr/share/zoneinfo/.tzcompiled
+
+$(DL_DIR)/$(ZONEINFO_SOURCE):
+ $(WGET) -P $(DL_DIR) $(ZONEINFO_SITE)/$(ZONEINFO_SOURCE)
+
+$(DL_DIR)/$(ZONEINFO_DATA):
+ $(WGET) -P $(DL_DIR) $(ZONEINFO_SITE)/$(ZONEINFO_DATA)
+
+$(ZONEINFO_DIR)/.source: $(DL_DIR)/$(ZONEINFO_SOURCE) $(DL_DIR)/$(ZONEINFO_DATA)
+ mkdir $(ZONEINFO_DIR)
+ zcat $(DL_DIR)/$(ZONEINFO_SOURCE) | tar -C $(ZONEINFO_DIR) $(TAR_OPTIONS) -
+ zcat $(DL_DIR)/$(ZONEINFO_DATA) | tar -C $(ZONEINFO_DIR) $(TAR_OPTIONS) -
+ touch $(ZONEINFO_DIR)/.source
+
+$(TARGET_DIR)/$(ZONEINFO_BINARY): $(ZONEINFO_DIR)/.source
+ (cd $(ZONEINFO_DIR); \
+ $(MAKE1) TZDIR=$(TARGET_DIR)/usr/share/zoneinfo posix_only \
+ );
+ touch $(TARGET_DIR)/$(ZONEINFO_BINARY)
+
+zoneinfo: $(TARGET_DIR)/$(ZONEINFO_BINARY)
+
+zoneinfo-source: $(DL_DIR)/$(ZONEINFO_SOURCE) $(DL_DIR)/$(ZONEINFO_DATA)
+
+zoneinfo-clean:
+ -rm -rf $(TARGET_DIR)/usr/share/zoneinfo
+
+zoneinfo-dirclean:
+ -rm -rf $(ZONEINFO_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_ZONEINFO)),y)
+TARGETS+=zoneinfo
+endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2007-03-18 22:09:38
|
Revision: 782
http://svn.sourceforge.net/astlinux/?rev=782&view=rev
Author: krisk84
Date: 2007-03-17 17:10:36 -0700 (Sat, 17 Mar 2007)
Log Message:
-----------
quagga routing daemon support
Modified Paths:
--------------
trunk/astlinux.config
trunk/package/Config.in
Added Paths:
-----------
trunk/package/quagga/
trunk/package/quagga/Config.in
trunk/package/quagga/Makefile.in
trunk/package/quagga/quagga-cross.patch
trunk/package/quagga/quagga-readline.patch
trunk/package/quagga/quagga.mk
Modified: trunk/astlinux.config
===================================================================
--- trunk/astlinux.config 2007-03-17 18:38:41 UTC (rev 781)
+++ trunk/astlinux.config 2007-03-18 00:10:36 UTC (rev 782)
@@ -318,6 +318,7 @@
# BR2_PACKAGE_PYTHON is not set
# BR2_PACKAGE_QTE is not set
BR2_QTE_TMAKE_VERSION="1.13"
+# BR2_PACKAGE_QUAGGA is not set
# BR2_PACKAGE_RAIDTOOLS is not set
# BR2_READLINE is not set
# BR2_PACKAGE_RESCONV is not set
Modified: trunk/package/Config.in
===================================================================
--- trunk/package/Config.in 2007-03-17 18:38:41 UTC (rev 781)
+++ trunk/package/Config.in 2007-03-18 00:10:36 UTC (rev 782)
@@ -152,6 +152,7 @@
source "package/psmisc/Config.in"
source "package/python/Config.in"
source "package/qte/Config.in"
+source "package/quagga/Config.in"
source "package/raidtools/Config.in"
source "package/readline/Config.in"
source "package/resconv/Config.in"
Added: trunk/package/quagga/Config.in
===================================================================
--- trunk/package/quagga/Config.in (rev 0)
+++ trunk/package/quagga/Config.in 2007-03-18 00:10:36 UTC (rev 782)
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_QUAGGA
+ bool "quagga"
+ default n
+ help
+ Quagga Routing Software Suite, GPL licensed IPv4/IPv6 routing
+ software.
+
+ zebra is a routing manager that implements the zebra route
+ engine. zebra supports RIPv1, RIPv2, RIPng, OSPF, OSPF6,
+ BGP4+, and BGP4-.
+
+ Quagga is free software that manages various IPv4 and IPv6 routing
+ protocols.
+
+ Currently Quagga supports BGP4, BGP4+, OSPFv2, OSPFv3, RIPv1,
+ RIPv2, and RIPng.
+
+ http://www.quagga.net
Added: trunk/package/quagga/Makefile.in
===================================================================
--- trunk/package/quagga/Makefile.in (rev 0)
+++ trunk/package/quagga/Makefile.in 2007-03-18 00:10:36 UTC (rev 782)
@@ -0,0 +1,3 @@
+ifeq ($(strip $(BR2_PACKAGE_QUAGGA)),y)
+TARGETS+=quagga
+endif
Added: trunk/package/quagga/quagga-cross.patch
===================================================================
--- trunk/package/quagga/quagga-cross.patch (rev 0)
+++ trunk/package/quagga/quagga-cross.patch 2007-03-18 00:10:36 UTC (rev 782)
@@ -0,0 +1,84 @@
+--- quagga-0.98.4/configure.orig Mon Jun 27 19:05:31 2005
++++ quagga-0.98.4/configure Mon Jul 11 20:32:07 2005
+@@ -12623,69 +12623,6 @@
+
+
+
+-echo "$as_me:$LINENO: checking for broken CMSG_FIRSTHDR" >&5
+-echo $ECHO_N "checking for broken CMSG_FIRSTHDR... $ECHO_C" >&6
+-if test "$cross_compiling" = yes; then
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-#ifdef SUNOS_5
+-#define _XPG4_2
+-#define __EXTENSIONS__
+-#endif
+-#include <stdlib.h>
+-#include <sys/types.h>
+-#include <sys/socket.h>
+-
+-main()
+-{
+- struct msghdr msg;
+- char buf[4];
+-
+- msg.msg_control = buf;
+- msg.msg_controllen = 0;
+-
+- if (CMSG_FIRSTHDR(&msg) != NULL)
+- exit(0);
+- exit (1);
+-}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- echo "$as_me:$LINENO: result: yes - using workaround" >&5
+-echo "${ECHO_T}yes - using workaround" >&6
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_BROKEN_CMSG_FIRSTHDR
+-_ACEOF
+-
+-else
+- echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-
+ echo "$as_me:$LINENO: checking route read method check" >&5
+ echo $ECHO_N "checking route read method check... $ECHO_C" >&6
+ if test "${zebra_rtread+set}" = set; then
+@@ -12783,10 +12720,7 @@
+ if test "${zebra_ipforward_path+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- for zebra_ipforward_path in /proc/net/snmp /dev/ip /dev/null;
+-do
+- test x`ls $zebra_ipforward_path 2>/dev/null` = x"$zebra_ipforward_path" && break
+-done
++ zebra_ipforward_path="/proc/net/snmp"
+ case $zebra_ipforward_path in
+ "/proc/net/snmp") IPFORWARD=ipforward_proc.o
+ zebra_ipforward_path="proc";;
Added: trunk/package/quagga/quagga-readline.patch
===================================================================
--- trunk/package/quagga/quagga-readline.patch (rev 0)
+++ trunk/package/quagga/quagga-readline.patch 2007-03-18 00:10:36 UTC (rev 782)
@@ -0,0 +1,58 @@
+--- quagga-0.98.4/configure.orig Mon Jun 27 19:05:31 2005
++++ quagga-0.98.4/configure Thu Jul 28 07:02:12 2005
+@@ -10937,7 +10937,7 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lcurses $LIBS"
++#LIBS="-lcurses $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -11071,7 +11071,8 @@
+ #define HAVE_LIBNCURSES 1
+ _ACEOF
+
+- LIBS="-lncurses $LIBS"
++# LIBS="-lncurses $LIBS"
++CURSES=-lncurses
+
+ fi
+
+@@ -11088,7 +11089,7 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lreadline $LIBS"
++LIBS="-lreadline $CURSES $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -11144,7 +11145,8 @@
+ #define HAVE_LIBREADLINE 1
+ _ACEOF
+
+- LIBS="-lreadline $LIBS"
++# LIBS="-lreadline $LIBS"
++CURSES="$CURSES -lreadline"
+
+ fi
+
+@@ -11303,7 +11305,7 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lreadline $LIBS"
++LIBS="-lreadline $CURSES $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -11365,7 +11367,7 @@
+ #define HAVE_LIBREADLINE 1
+ _ACEOF
+
+- LIBS="-lreadline $LIBS"
++# LIBS="-lreadline $LIBS"
+
+ fi
+
Added: trunk/package/quagga/quagga.mk
===================================================================
--- trunk/package/quagga/quagga.mk (rev 0)
+++ trunk/package/quagga/quagga.mk 2007-03-18 00:10:36 UTC (rev 782)
@@ -0,0 +1,95 @@
+#############################################################
+#
+# quagga
+#
+#############################################################
+QUAGGA_VERSION:=0.98.6
+QUAGGA_URL:=http://www.quagga.net/download/
+QUAGGA_DIR:=$(BUILD_DIR)/quagga-$(QUAGGA_VERSION)
+QUAGGA_SOURCE:=quagga-$(QUAGGA_VERSION).tar.gz
+
+$(DL_DIR)/$(QUAGGA_SOURCE):
+ $(WGET) -P $(DL_DIR) $(QUAGGA_URL)/$(QUAGGA_SOURCE)
+
+$(QUAGGA_DIR)/.unpacked: $(DL_DIR)/$(QUAGGA_SOURCE)
+ zcat $(DL_DIR)/$(QUAGGA_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ toolchain/patch-kernel.sh $(QUAGGA_DIR) package/quagga quagga\*.patch
+ touch $(QUAGGA_DIR)/.unpacked
+
+$(QUAGGA_DIR)/.configured: $(QUAGGA_DIR)/.unpacked
+ (cd $(QUAGGA_DIR); rm -rf config.{cache,status}; \
+ $(TARGET_CONFIGURE_OPTS) \
+ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
+ LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib" \
+ ./configure \
+ --target=$(GNU_TARGET_NAME) \
+ --host=$(GNU_TARGET_NAME) \
+ --build=$(GNU_HOST_NAME) \
+ --program-prefix="" \
+ --program-suffix="" \
+ --prefix=/usr \
+ --exec-prefix=/usr \
+ --bindir=/usr/bin \
+ --sbindir=/usr/sbin \
+ --libexecdir=/usr/lib \
+ --datadir=/usr/share \
+ --includedir=/usr/include \
+ --infodir=/usr/share/info \
+ --libdir=/usr/lib \
+ --libexecdir=/usr/lib \
+ --localstatedir=/var/run/quagga \
+ --mandir=/usr/share/man \
+ --sbindir=/usr/sbin \
+ --sysconfdir=/etc/quagga \
+ $(DISABLE_NLS) \
+ --enable-shared \
+ --disable-static \
+ --disable-ipv6 \
+ --disable-vtysh \
+ --enable-user=quagga \
+ --enable-group=quagga \
+ --enable-multipath=8 \
+ --enable-isisd \
+ );
+ touch $(QUAGGA_DIR)/.configured
+
+$(QUAGGA_DIR)/zebra/zebra: $(QUAGGA_DIR)/.configured
+ $(MAKE) -C $(QUAGGA_DIR) DESTDIR=$(STAGING_DIR) all
+
+$(STAGING_DIR)/usr/sbin/zebra: $(QUAGGA_DIR)/zebra/zebra
+ $(MAKE1) -C $(QUAGGA_DIR) DESTDIR=$(STAGING_DIR) install
+
+$(TARGET_DIR)/usr/sbin/zebra: $(STAGING_DIR)/usr/sbin/zebra
+ cp -a $(STAGING_DIR)/usr/lib/libzebra.so* $(TARGET_DIR)/usr/lib/
+ cp -a $(STAGING_DIR)/usr/lib/libospf.so* $(TARGET_DIR)/usr/lib/
+ -$(STRIP) $(TARGET_DIR)/usr/lib/libzebra.so* $(TARGET_DIR)/usr/lib/libospf.so*
+ $(INSTALL) -D -m 0755 $(STAGING_DIR)/usr/sbin/bgpd $(TARGET_DIR)/usr/sbin/bgpd
+ $(INSTALL) -D -m 0755 $(STAGING_DIR)/usr/sbin/ripd $(TARGET_DIR)/usr/sbin/ripd
+ $(INSTALL) -D -m 0755 $(STAGING_DIR)/usr/sbin/ospfd $(TARGET_DIR)/usr/sbin/ospfd
+ $(INSTALL) -D -m 0755 $(STAGING_DIR)/usr/sbin/isisd $(TARGET_DIR)/usr/sbin/isisd
+ $(INSTALL) -D -m 0755 $(STAGING_DIR)/usr/sbin/zebra $(TARGET_DIR)/usr/sbin/zebra
+ touch -c $(TARGET_DIR)/usr/sbin/zebra
+
+quagga: uclibc $(TARGET_DIR)/usr/sbin/zebra
+
+quagga-source: $(DL_DIR)/$(QUAGGA_SOURCE)
+
+quagga-patch: $(QUAGGA_DIR)/.unpacked
+
+quagga-clean:
+ -$(MAKE) -C $(QUAGGA_DIR) clean
+ -rm -f $(TARGET_DIR)/usr/sbin/zebra
+ -rm -f $(TARGET_DIR)/usr/lib/libospf*
+ -rm -f $(TARGET_DIR)/usr/lib/libzebra*
+
+quagga-dirclean:
+ rm -rf $(QUAGGA_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_QUAGGA)),y)
+TARGETS+=quagga
+endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2007-04-18 15:08:58
|
Revision: 845
http://svn.sourceforge.net/astlinux/?rev=845&view=rev
Author: krisk84
Date: 2007-04-18 08:08:53 -0700 (Wed, 18 Apr 2007)
Log Message:
-----------
fakeroot, squashfs, mkext2 updates - needs work
Modified Paths:
--------------
trunk/package/fakeroot/Config.in
trunk/package/fakeroot/fakeroot.mk
trunk/target/ext2/Config.in
trunk/target/ext2/ext2root.mk
trunk/target/squashfs/squashfsroot.mk
Added Paths:
-----------
trunk/package/fakeroot/fakeroot-doc.patch
trunk/target/ext2/genext2fs-1.4-nosquash.patch
trunk/target/ext2/genext2fs-1.4-remove_ugly_warnings.patch
Removed Paths:
-------------
trunk/target/ext2/genext2fs-01-cvs-updates.patch
trunk/target/ext2/genext2fs-02-nosquash_devtable.patch
Modified: trunk/package/fakeroot/Config.in
===================================================================
--- trunk/package/fakeroot/Config.in 2007-04-18 15:07:37 UTC (rev 844)
+++ trunk/package/fakeroot/Config.in 2007-04-18 15:08:53 UTC (rev 845)
@@ -5,3 +5,8 @@
Run commands in an environment faking root privileges.
http://joostje.op.het.net/fakeroot/
+
+# dummy for fakeroot-source
+config BR2_HOST_FAKEROUTE
+ bool
+ default n
Added: trunk/package/fakeroot/fakeroot-doc.patch
===================================================================
--- trunk/package/fakeroot/fakeroot-doc.patch (rev 0)
+++ trunk/package/fakeroot/fakeroot-doc.patch 2007-04-18 15:08:53 UTC (rev 845)
@@ -0,0 +1,20 @@
+--- fakeroot/Makefile.am.orig 2006-04-19 11:50:35.000000000 -0600
++++ fakeroot/Makefile.am 2006-04-19 11:50:59.000000000 -0600
+@@ -1,5 +1,5 @@
+ AUTOMAKE_OPTIONS=foreign
+-SUBDIRS=scripts doc test
++SUBDIRS=scripts test
+
+ noinst_LTLIBRARIES = libcommunicate.la
+ libcommunicate_la_SOURCES = communicate.c
+--- fakeroot/Makefile.in.orig 2006-04-19 11:50:43.000000000 -0600
++++ fakeroot/Makefile.in 2006-04-19 11:51:21.000000000 -0600
+@@ -230,7 +230,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = foreign
+-SUBDIRS = scripts doc test
++SUBDIRS = scripts test
+ noinst_LTLIBRARIES = libcommunicate.la
+ libcommunicate_la_SOURCES = communicate.c
+ lib_LTLIBRARIES = libfakeroot.la
Modified: trunk/package/fakeroot/fakeroot.mk
===================================================================
--- trunk/package/fakeroot/fakeroot.mk 2007-04-18 15:07:37 UTC (rev 844)
+++ trunk/package/fakeroot/fakeroot.mk 2007-04-18 15:08:53 UTC (rev 845)
@@ -3,12 +3,13 @@
# fakeroot
#
#############################################################
-FAKEROOT_VERSION:=1.2.13
+FAKEROOT_VERSION:=1.6.5
FAKEROOT_SOURCE:=fakeroot_$(FAKEROOT_VERSION).tar.gz
-FAKEROOT_SITE:=http://www.hughes-family.org/~craig/trunk/dl
+FAKEROOT_SITE:=http://ftp.debian.org/debian/pool/main/f/fakeroot
FAKEROOT_CAT:=zcat
-FAKEROOT_DIR1:=$(TOOL_BUILD_DIR)/fakeroot-$(FAKEROOT_VERSION)
-FAKEROOT_DIR2:=$(BUILD_DIR)/fakeroot-$(FAKEROOT_VERSION)
+FAKEROOT_SOURCE_DIR:=$(BUILD_DIR)/fakeroot-$(FAKEROOT_VERSION)
+FAKEROOT_DIR1:=$(TOOL_BUILD_DIR)/fakeroot-$(FAKEROOT_VERSION)-host
+FAKEROOT_DIR2:=$(BUILD_DIR)/fakeroot-$(FAKEROOT_VERSION)-target
$(DL_DIR)/$(FAKEROOT_SOURCE):
@@ -16,34 +17,41 @@
fakeroot-source: $(DL_DIR)/$(FAKEROOT_SOURCE)
+$(FAKEROOT_SOURCE_DIR)/.unpacked: $(DL_DIR)/$(FAKEROOT_SOURCE)
+ $(FAKEROOT_CAT) $(DL_DIR)/$(FAKEROOT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ # If using busybox getopt, make it be quiet.
+ $(SED) "s,getopt --version,getopt --version 2>/dev/null," \
+ $(FAKEROOT_SOURCE_DIR)/scripts/fakeroot.in
+ toolchain/patch-kernel.sh $(FAKEROOT_SOURCE_DIR) package/fakeroot/ \*.patch
+ touch $@
+
#############################################################
#
# build fakeroot for use on the host system
#
#############################################################
-$(FAKEROOT_DIR1)/.unpacked: $(DL_DIR)/$(FAKEROOT_SOURCE)
- $(FAKEROOT_CAT) $(DL_DIR)/$(FAKEROOT_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
- $(SED) "s,getopt --version,getopt --version 2>/dev/null," \
- $(FAKEROOT_DIR1)/scripts/fakeroot.in
- touch $(FAKEROOT_DIR1)/.unpacked
-$(FAKEROOT_DIR1)/.configured: $(FAKEROOT_DIR1)/.unpacked
+$(FAKEROOT_DIR1)/.configured: $(FAKEROOT_SOURCE_DIR)/.unpacked
+ mkdir -p $(FAKEROOT_DIR1)
(cd $(FAKEROOT_DIR1); rm -rf config.cache; \
CC="$(HOSTCC)" \
- ./configure \
+ $(FAKEROOT_SOURCE_DIR)/configure \
--prefix=/usr \
+ $(DISABLE_NLS) \
);
- touch $(FAKEROOT_DIR1)/.configured
+ touch $@
$(FAKEROOT_DIR1)/faked: $(FAKEROOT_DIR1)/.configured
$(MAKE) -C $(FAKEROOT_DIR1)
+ touch -c $@
$(STAGING_DIR)/usr/bin/fakeroot: $(FAKEROOT_DIR1)/faked
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(FAKEROOT_DIR1) install
$(SED) 's,^PREFIX=.*,PREFIX=$(STAGING_DIR)/usr,g' $(STAGING_DIR)/usr/bin/fakeroot
$(SED) 's,^BINDIR=.*,BINDIR=$(STAGING_DIR)/usr/bin,g' $(STAGING_DIR)/usr/bin/fakeroot
$(SED) 's,^PATHS=.*,PATHS=$(FAKEROOT_DIR1)/.libs:/lib:/usr/lib,g' $(STAGING_DIR)/usr/bin/fakeroot
+ touch -c $@
host-fakeroot: uclibc $(STAGING_DIR)/usr/bin/fakeroot
@@ -59,17 +67,14 @@
# build fakeroot for use on the target system
#
#############################################################
-$(FAKEROOT_DIR2)/.unpacked: $(DL_DIR)/$(FAKEROOT_SOURCE)
- $(FAKEROOT_CAT) $(DL_DIR)/$(FAKEROOT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- # If using busybox getopt, make it be quiet.
- $(SED) "s,getopt --version,getopt --version 2>/dev/null," \
- $(FAKEROOT_DIR2)/scripts/fakeroot.in
- touch $(FAKEROOT_DIR2)/.unpacked
-$(FAKEROOT_DIR2)/.configured: $(FAKEROOT_DIR2)/.unpacked
+$(FAKEROOT_DIR2)/.configured: $(FAKEROOT_SOURCE_DIR)/.unpacked
+ mkdir -p $(FAKEROOT_DIR2)
(cd $(FAKEROOT_DIR2); rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \
- ./configure \
+ CFLAGS="$(TARGET_CFLAGS)" \
+ LDFLAGS="$(TARGET_LDFLAGS)" \
+ $(FAKEROOT_SOURCE_DIR)/configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
@@ -85,10 +90,11 @@
--infodir=/usr/info \
$(DISABLE_NLS) \
);
- touch $(FAKEROOT_DIR2)/.configured
+ touch $@
$(FAKEROOT_DIR2)/faked: $(FAKEROOT_DIR2)/.configured
$(MAKE) CC=$(TARGET_CC) -C $(FAKEROOT_DIR2)
+ touch -c $@
$(TARGET_DIR)/usr/bin/fakeroot: $(FAKEROOT_DIR2)/faked
$(MAKE) DESTDIR=$(TARGET_DIR) -C $(FAKEROOT_DIR2) install
@@ -96,11 +102,13 @@
-mv $(TARGET_DIR)/usr/bin/$(ARCH)-linux-fakeroot $(TARGET_DIR)/usr/bin/fakeroot
rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
+ touch -c $@
fakeroot: uclibc $(TARGET_DIR)/usr/bin/fakeroot
fakeroot-clean:
$(MAKE) -C $(FAKEROOT_DIR2) clean
+ rm -f $(TARGET_DIR)/usr/bin/fake{d,root}
fakeroot-dirclean:
rm -rf $(FAKEROOT_DIR2)
@@ -114,3 +122,7 @@
ifeq ($(strip $(BR2_PACKAGE_FAKEROOT)),y)
TARGETS+=fakeroot
endif
+
+ifeq ($(strip $(BR2_HOST_FAKEROUTE)),y)
+HOST_SOURCE+=fakeroot-source
+endif
Modified: trunk/target/ext2/Config.in
===================================================================
--- trunk/target/ext2/Config.in 2007-04-18 15:07:37 UTC (rev 844)
+++ trunk/target/ext2/Config.in 2007-04-18 15:08:53 UTC (rev 845)
@@ -1,6 +1,7 @@
config BR2_TARGET_ROOTFS_EXT2
bool "ext2 root filesystem"
default y
+ select BR2_HOST_FAKEROUTE
help
Build an ext2 root filesystem
@@ -15,7 +16,7 @@
default 0
config BR2_TARGET_ROOTFS_EXT2_RESBLKS
- int "reserved blocks"
+ int "reserved blocks percentage"
depends on BR2_TARGET_ROOTFS_EXT2
default 0
@@ -29,11 +30,41 @@
depends on BR2_TARGET_ROOTFS_EXT2
default "$(IMAGE).ext2"
-config BR2_TARGET_ROOTFS_EXT2_GZ
- bool "gzip the output file"
- depends on BR2_TARGET_ROOTFS_EXT2
- default n
+choice
+ prompt "Compression method"
+ default BR2_TARGET_ROOTFS_EXT2_NONE
+ depends on BR2_TARGET_ROOTFS_EXT2
+ help
+ Select compressor for ext2 filesystem of the root filesystem
+config BR2_TARGET_ROOTFS_EXT2_NONE
+ bool "no compression"
+ help
+ Do not compress the ext2 filesystem.
+
+config BR2_TARGET_ROOTFS_EXT2_GZIP
+ bool "gzip"
+ help
+ Do compress the ext2 filesystem with gzip.
+ Note that you either have to have gzip installed on your host
+ or select to build a gzip for your host. See the packages submenu.
+
+config BR2_TARGET_ROOTFS_EXT2_BZIP2
+ bool "bzip2"
+ help
+ Do compress the ext2 filesystem with bzip2.
+ Note that you either have to have bzip2 installed on your host
+ or select to build a bzip2 for your host. See the packages submenu.
+
+config BR2_TARGET_ROOTFS_EXT2_LZMA
+ bool "lzma"
+ help
+ Do compress the ext2 filesystem with lzma.
+ Note that you either have to have lzma installed on your host
+ or select to build a lzma for your host. See the packages submenu.
+
+endchoice
+
config BR2_TARGET_ROOTFS_EXT2_COPYTO
string "also copy the image to..."
depends on BR2_TARGET_ROOTFS_EXT2
Modified: trunk/target/ext2/ext2root.mk
===================================================================
--- trunk/target/ext2/ext2root.mk 2007-04-18 15:07:37 UTC (rev 844)
+++ trunk/target/ext2/ext2root.mk 2007-04-18 15:08:53 UTC (rev 845)
@@ -3,16 +3,16 @@
# genext2fs to build to target ext2 filesystems
#
#############################################################
-GENEXT2_DIR=$(BUILD_DIR)/genext2fs-1.3
-GENEXT2_SOURCE=genext2fs_1.3.orig.tar.gz
-GENEXT2_SITE=http://ftp.debian.org/debian/pool/main/g/genext2fs
+GENEXT2_VERSION=1.4
+GENEXT2_DIR=$(BUILD_DIR)/genext2fs-$(GENEXT2_VERSION)
+GENEXT2_SOURCE=genext2fs-$(GENEXT2_VERSION).tar.gz
+GENEXT2_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/genext2fs
$(DL_DIR)/$(GENEXT2_SOURCE):
$(WGET) -P $(DL_DIR) $(GENEXT2_SITE)/$(GENEXT2_SOURCE)
$(GENEXT2_DIR)/.unpacked: $(DL_DIR)/$(GENEXT2_SOURCE)
zcat $(DL_DIR)/$(GENEXT2_SOURCE) | tar -C $(BUILD_DIR) -xvf -
- mv $(GENEXT2_DIR).orig $(GENEXT2_DIR)
toolchain/patch-kernel.sh $(GENEXT2_DIR) target/ext2/ genext2fs\*.patch
touch $(GENEXT2_DIR)/.unpacked
@@ -20,6 +20,7 @@
chmod a+x $(GENEXT2_DIR)/configure
(cd $(GENEXT2_DIR); rm -rf config.cache; \
./configure \
+ CC="$(HOSTCC)" \
--prefix=$(STAGING_DIR) \
);
touch $(GENEXT2_DIR)/.configured
@@ -50,74 +51,84 @@
endif
ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_INODES)),0)
-EXT2_OPTS += -i $(strip $(BR2_TARGET_ROOTFS_EXT2_INODES))
+EXT2_OPTS += -N $(strip $(BR2_TARGET_ROOTFS_EXT2_INODES))
endif
-ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_RESBLKS)),0)
-EXT2_OPTS += -r $(strip $(BR2_TARGET_ROOTFS_EXT2_RESBLKS))
+ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_RESBLKS)),)
+EXT2_OPTS += -m $(strip $(BR2_TARGET_ROOTFS_EXT2_RESBLKS))
endif
EXT2_BASE := $(subst ",,$(BR2_TARGET_ROOTFS_EXT2_OUTPUT))
+#")
-ifeq ($(strip $(BR2_TARGET_ROOTFS_EXT2_GZ)),y)
-EXT2_TARGET := $(EXT2_BASE).gz
+EXT2_ROOTFS_COMPRESSOR:=
+EXT2_ROOTFS_COMPRESSOR_EXT:=
+EXT2_ROOTFS_COMPRESSOR_PREREQ:=
+ifeq ($(BR2_TARGET_ROOTFS_EXT2_GZIP),y)
+EXT2_ROOTFS_COMPRESSOR:=gzip -9 -c
+EXT2_ROOTFS_COMPRESSOR_EXT:=gz
+#EXT2_ROOTFS_COMPRESSOR_PREREQ:= gzip-host
+endif
+ifeq ($(BR2_TARGET_ROOTFS_EXT2_BZIP2),y)
+EXT2_ROOTFS_COMPRESSOR:=bzip2 -9 -c
+EXT2_ROOTFS_COMPRESSOR_EXT:=bz2
+#EXT2_ROOTFS_COMPRESSOR_PREREQ:= bzip2-host
+endif
+ifeq ($(BR2_TARGET_ROOTFS_EXT2_LZMA),y)
+EXT2_ROOTFS_COMPRESSOR:=lzma -9 -c
+EXT2_ROOTFS_COMPRESSOR_EXT:=lzma
+EXT2_ROOTFS_COMPRESSOR_PREREQ:= lzma-host
+endif
+
+ifneq ($(EXT2_ROOTFS_COMPRESSOR),)
+EXT2_TARGET := $(EXT2_BASE).$(EXT2_ROOTFS_COMPRESSOR_EXT)
else
EXT2_TARGET := $(EXT2_BASE)
endif
-$(EXT2_BASE): host-fakeroot makedevs $(STAGING_DIR)/fakeroot.env genext2fs
+$(EXT2_BASE): host-fakeroot makedevs genext2fs
-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
@rm -rf $(TARGET_DIR)/usr/man
@rm -rf $(TARGET_DIR)/usr/share/man
@rm -rf $(TARGET_DIR)/usr/info
-/sbin/ldconfig -r $(TARGET_DIR) 2>/dev/null
# Use fakeroot to pretend all target binaries are owned by root
- -$(STAGING_DIR)/usr/bin/fakeroot \
- -i $(STAGING_DIR)/fakeroot.env \
- -s $(STAGING_DIR)/fakeroot.env -- \
- chown -R root:root $(TARGET_DIR)
- # Use fakeroot to make busybox setuid
- $(STAGING_DIR)/usr/bin/fakeroot \
- -i $(STAGING_DIR)/fakeroot.env \
- -s $(STAGING_DIR)/fakeroot.env -- \
- chmod 4755 $(TARGET_DIR)/bin/busybox
+ rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
+ touch $(STAGING_DIR)/.fakeroot.00000
+ cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
+ echo "chown -R 0:0 $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
+ echo "chmod 4755 $(TARGET_DIR)/bin/busybox" >> $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
+ifneq ($(TARGET_DEVICE_TABLE),)
# Use fakeroot to pretend to create all needed device nodes
- $(STAGING_DIR)/usr/bin/fakeroot \
- -i $(STAGING_DIR)/fakeroot.env \
- -s $(STAGING_DIR)/fakeroot.env -- \
- $(STAGING_DIR)/bin/makedevs \
- -d $(TARGET_DEVICE_TABLE) \
- $(TARGET_DIR)
+ echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \
+ >> $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
+endif
# Use fakeroot so genext2fs believes the previous fakery
ifeq ($(strip $(BR2_TARGET_ROOTFS_EXT2_BLOCKS)),0)
- GENEXT2_REALSIZE=`LANG=C du -l -s -c -k $(TARGET_DIR) | grep total | sed -e "s/total//"`; \
+ GENEXT2_REALSIZE=`LC_ALL=C du -s -c -k $(TARGET_DIR) | grep total | sed -e "s/total//"`; \
GENEXT2_ADDTOROOTSIZE=`if [ $$GENEXT2_REALSIZE -ge 20000 ] ; then echo 16384; else echo 2400; fi`; \
GENEXT2_SIZE=`expr $$GENEXT2_REALSIZE + $$GENEXT2_ADDTOROOTSIZE`; \
GENEXT2_ADDTOINODESIZE=`find $(TARGET_DIR) | wc -l`; \
GENEXT2_INODES=`expr $$GENEXT2_ADDTOINODESIZE + 400`; \
set -x; \
- $(STAGING_DIR)/usr/bin/fakeroot \
- -i $(STAGING_DIR)/fakeroot.env \
- -s $(STAGING_DIR)/fakeroot.env -- \
- $(GENEXT2_DIR)/genext2fs \
- -b $$GENEXT2_SIZE \
- -i $$GENEXT2_INODES \
- -d $(TARGET_DIR) \
- $(EXT2_OPTS) $(EXT2_BASE)
+ echo "$(GENEXT2_DIR)/genext2fs -b $$GENEXT2_SIZE " \
+ "-N $$GENEXT2_INODES -d $(TARGET_DIR) " \
+ "$(EXT2_OPTS) $(EXT2_BASE)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
else
- $(STAGING_DIR)/usr/bin/fakeroot \
- -i $(STAGING_DIR)/fakeroot.env \
- -s $(STAGING_DIR)/fakeroot.env -- \
- $(GENEXT2_DIR)/genext2fs \
- -d $(TARGET_DIR) \
- $(EXT2_OPTS) \
- $(EXT2_BASE)
+ echo "$(GENEXT2_DIR)/genext2fs -d $(TARGET_DIR) " \
+ "$(EXT2_OPTS) $(EXT2_BASE)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
endif
+ chmod a+x $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
+ $(STAGING_DIR)/usr/bin/fakeroot -- $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
+ -@rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
-$(EXT2_BASE).gz: $(EXT2_BASE)
- @gzip --best -fv $(EXT2_BASE)
+ifneq ($(EXT2_ROOTFS_COMPRESSOR),)
+$(EXT2_BASE).$(EXT2_ROOTFS_COMPRESSOR_EXT): $(EXT2_ROOTFS_COMPRESSOR_PREREQ) $(EXT2_BASE)
+ $(EXT2_ROOTFS_COMPRESSOR) $(EXT2_BASE) > $(EXT2_TARGET)
+endif
EXT2_COPYTO := $(strip $(subst ",,$(BR2_TARGET_ROOTFS_EXT2_COPYTO)))
+# "))
ext2root: $(EXT2_TARGET)
@ls -l $(EXT2_TARGET)
Deleted: trunk/target/ext2/genext2fs-01-cvs-updates.patch
===================================================================
--- trunk/target/ext2/genext2fs-01-cvs-updates.patch 2007-04-18 15:07:37 UTC (rev 844)
+++ trunk/target/ext2/genext2fs-01-cvs-updates.patch 2007-04-18 15:08:53 UTC (rev 845)
@@ -1,9709 +0,0 @@
-diff --exclude CVS -urN genext2fs-1.3.orig/AUTHORS genext2fs/AUTHORS
---- genext2fs-1.3.orig/AUTHORS 1969-12-31 17:00:00.000000000 -0700
-+++ genext2fs/AUTHORS 2001-05-02 12:20:05.000000000 -0600
-@@ -0,0 +1 @@
-+Xavier Bestel <xav...@fr...>
-diff --exclude CVS -urN genext2fs-1.3.orig/ChangeLog genext2fs/ChangeLog
---- genext2fs-1.3.orig/ChangeLog 1969-12-31 17:00:00.000000000 -0700
-+++ genext2fs/ChangeLog 2004-11-21 23:21:05.000000000 -0700
-@@ -0,0 +1,2 @@
-+see our cvs logs here:
-+http://cvs.sourceforge.net/viewcvs.py/genext2fs/genext2fs/
-diff --exclude CVS -urN genext2fs-1.3.orig/INSTALL genext2fs/INSTALL
---- genext2fs-1.3.orig/INSTALL 1969-12-31 17:00:00.000000000 -0700
-+++ genext2fs/INSTALL 2004-11-21 23:19:19.000000000 -0700
-@@ -0,0 +1,5 @@
-+To install, just do it the normal GNU way:
-+
-+./configure
-+make
-+sudo make install
-diff --exclude CVS -urN genext2fs-1.3.orig/Makefile.am genext2fs/Makefile.am
---- genext2fs-1.3.orig/Makefile.am 1969-12-31 17:00:00.000000000 -0700
-+++ genext2fs/Makefile.am 2002-10-16 09:41:00.000000000 -0600
-@@ -0,0 +1,11 @@
-+bin_PROGRAMS = genext2fs
-+genext2fs_SOURCES = genext2fs.c
-+man_MANS = genext2fs.8
-+
-+# test genext2fs by creating the image and comparing checksums
-+test: all
-+ sh ./test.sh
-+
-+# test genext2fs by actually mounting the created image.
-+test-mount: all
-+ sudo sh ./test-mount.sh
-diff --exclude CVS -urN genext2fs-1.3.orig/Makefile.in genext2fs/Makefile.in
---- genext2fs-1.3.orig/Makefile.in 1969-12-31 17:00:00.000000000 -0700
-+++ genext2fs/Makefile.in 2004-12-27 13:03:47.000000000 -0700
-@@ -0,0 +1,570 @@
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004 Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+@SET_MAKE@
-+
-+SOURCES = $(genext2fs_SOURCES)
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = .
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+bin_PROGRAMS = genext2fs$(EXEEXT)
-+subdir = .
-+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-+ $(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \
-+ ChangeLog INSTALL NEWS TODO depcomp install-sh missing
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-+ configure.lineno configure.status.lineno
-+mkinstalldirs = $(mkdir_p)
-+CONFIG_CLEAN_FILES =
-+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man8dir)"
-+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-+PROGRAMS = $(bin_PROGRAMS)
-+am_genext2fs_OBJECTS = genext2fs.$(OBJEXT)
-+genext2fs_OBJECTS = $(am_genext2fs_OBJECTS)
-+genext2fs_LDADD = $(LDADD)
-+DEFAULT_INCLUDES = -I. -I$(srcdir)
-+depcomp = $(SHELL) $(top_srcdir)/depcomp
-+am__depfiles_maybe = depfiles
-+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/genext2fs.Po
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(genext2fs_SOURCES)
-+DIST_SOURCES = $(genext2fs_SOURCES)
-+man8dir = $(mandir)/man8
-+NROFF = nroff
-+MANS = $(man_MANS)
-+ETAGS = etags
-+CTAGS = ctags
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+distdir = $(PACKAGE)-$(VERSION)
-+top_distdir = $(distdir)
-+am__remove_distdir = \
-+ { test ! -d $(distdir) \
-+ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-+ && rm -fr $(distdir); }; }
-+DIST_ARCHIVES = $(distdir).tar.gz
-+GZIP_ENV = --best
-+distuninstallcheck_listfiles = find . -type f -print
-+distcleancheck_listfiles = find . -type f -print
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPPFLAGS = @CPPFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EXEEXT = @EXEEXT@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+LDFLAGS = @LDFLAGS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
-+LTLIBOBJS = @LTLIBOBJS@
-+MAKEINFO = @MAKEINFO@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+STRIP = @STRIP@
-+VERSION = @VERSION@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+bindir = @bindir@
-+build_alias = @build_alias@
-+datadir = @datadir@
-+exec_prefix = @exec_prefix@
-+host_alias = @host_alias@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+oldincludedir = @oldincludedir@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
-+genext2fs_SOURCES = genext2fs.c
-+man_MANS = genext2fs.8
-+all: all-am
-+
-+.SUFFIXES:
-+.SUFFIXES: .c .o .obj
-+am--refresh:
-+ @:
-+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
-+ cd $(srcdir) && $(AUTOMAKE) --gnu \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
-+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ echo ' $(SHELL) ./config.status'; \
-+ $(SHELL) ./config.status;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ $(SHELL) ./config.status --recheck
-+
-+$(top_srcdir)/configure: $(am__configure_deps)
-+ cd $(srcdir) && $(AUTOCONF)
-+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-+install-binPROGRAMS: $(bin_PROGRAMS)
-+ @$(NORMAL_INSTALL)
-+ test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
-+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+ if test -f $$p \
-+ ; then \
-+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-+ echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-+ $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-+ else :; fi; \
-+ done
-+
-+uninstall-binPROGRAMS:
-+ @$(NORMAL_UNINSTALL)
-+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
-+ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-+ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(bindir)/$$f"; \
-+ done
-+
-+clean-binPROGRAMS:
-+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-+genext2fs$(EXEEXT): $(genext2fs_OBJECTS) $(genext2fs_DEPENDENCIES)
-+ @rm -f genext2fs$(EXEEXT)
-+ $(LINK) $(genext2fs_LDFLAGS) $(genext2fs_OBJECTS) $(genext2fs_LDADD) $(LIBS)
-+
-+mostlyclean-compile:
-+ -rm -f *.$(OBJEXT)
-+
-+distclean-compile:
-+ -rm -f *.tab.c
-+
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/genext2fs.Po@am__quote@
-+
-+.c.o:
-+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@ $(COMPILE) -c $<
-+
-+.c.obj:
-+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-+uninstall-info-am:
-+install-man8: $(man8_MANS) $(man_MANS)
-+ @$(NORMAL_INSTALL)
-+ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
-+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-+ for i in $$l2; do \
-+ case "$$i" in \
-+ *.8*) list="$$list $$i" ;; \
-+ esac; \
-+ done; \
-+ for i in $$list; do \
-+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-+ else file=$$i; fi; \
-+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+ case "$$ext" in \
-+ 8*) ;; \
-+ *) ext='8' ;; \
-+ esac; \
-+ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-+ inst=`echo $$inst | sed -e 's/^.*\///'`; \
-+ inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-+ done
-+uninstall-man8:
-+ @$(NORMAL_UNINSTALL)
-+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-+ for i in $$l2; do \
-+ case "$$i" in \
-+ *.8*) list="$$list $$i" ;; \
-+ esac; \
-+ done; \
-+ for i in $$list; do \
-+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+ case "$$ext" in \
-+ 8*) ;; \
-+ *) ext='8' ;; \
-+ esac; \
-+ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-+ inst=`echo $$inst | sed -e 's/^.*\///'`; \
-+ inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-+ echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-+ done
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+ unique=`for i in $$list; do \
-+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+ done | \
-+ $(AWK) ' { files[$$0] = 1; } \
-+ END { for (i in files) print i; }'`; \
-+ mkid -fID $$unique
-+tags: TAGS
-+
-+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
-+ $(TAGS_FILES) $(LISP)
-+ tags=; \
-+ here=`pwd`; \
-+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+ unique=`for i in $$list; do \
-+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+ done | \
-+ $(AWK) ' { files[$$0] = 1; } \
-+ END { for (i in files) print i; }'`; \
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
-+ctags: CTAGS
-+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
-+ $(TAGS_FILES) $(LISP)
-+ tags=; \
-+ here=`pwd`; \
-+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+ unique=`for i in $$list; do \
-+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+ done | \
-+ $(AWK) ' { files[$$0] = 1; } \
-+ END { for (i in files) print i; }'`; \
-+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+ $$tags $$unique
-+
-+GTAGS:
-+ here=`$(am__cd) $(top_builddir) && pwd` \
-+ && cd $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) $$here
-+
-+distclean-tags:
-+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-+
-+distdir: $(DISTFILES)
-+ $(am__remove_distdir)
-+ mkdir $(distdir)
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+ list='$(DISTFILES)'; for file in $$list; do \
-+ case $$file in \
-+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+ esac; \
-+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+ dir="/$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
-+ else \
-+ dir=''; \
-+ fi; \
-+ if test -d $$d/$$file; then \
-+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ fi; \
-+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ else \
-+ test -f $(distdir)/$$file \
-+ || cp -p $$d/$$file $(distdir)/$$file \
-+ || exit 1; \
-+ fi; \
-+ done
-+ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-+ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-+ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-+ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-+ || chmod -R a+r $(distdir)
-+dist-gzip: distdir
-+ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+ $(am__remove_distdir)
-+
-+dist-bzip2: distdir
-+ $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
-+ $(am__remove_distdir)
-+
-+dist-tarZ: distdir
-+ $(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z
-+ $(am__remove_distdir)
-+
-+dist-shar: distdir
-+ shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-+ $(am__remove_distdir)
-+
-+dist-zip: distdir
-+ -rm -f $(distdir).zip
-+ zip -rq $(distdir).zip $(distdir)
-+ $(am__remove_distdir)
-+
-+dist dist-all: distdir
-+ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+ $(am__remove_distdir)
-+
-+# This target untars the dist file and tries a VPATH configuration. Then
-+# it guarantees that the distribution is self-contained by making another
-+# tarfile.
-+distcheck: dist
-+ case '$(DIST_ARCHIVES)' in \
-+ *.tar.gz*) \
-+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\
-+ *.tar.bz2*) \
-+ bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\
-+ *.tar.Z*) \
-+ uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
-+ *.shar.gz*) \
-+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-+ *.zip*) \
-+ unzip $(distdir).zip ;;\
-+ esac
-+ chmod -R a-w $(distdir); chmod a+w $(distdir)
-+ mkdir $(distdir)/_build
-+ mkdir $(distdir)/_inst
-+ chmod a-w $(distdir)
-+ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-+ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-+ && cd $(distdir)/_build \
-+ && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-+ $(DISTCHECK_CONFIGURE_FLAGS) \
-+ && $(MAKE) $(AM_MAKEFLAGS) \
-+ && $(MAKE) $(AM_MAKEFLAGS) dvi \
-+ && $(MAKE) $(AM_MAKEFLAGS) check \
-+ && $(MAKE) $(AM_MAKEFLAGS) install \
-+ && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-+ && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-+ && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-+ distuninstallcheck \
-+ && chmod -R a-w "$$dc_install_base" \
-+ && ({ \
-+ (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-+ distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-+ } || { rm -rf "$$dc_destdir"; exit 1; }) \
-+ && rm -rf "$$dc_destdir" \
-+ && $(MAKE) $(AM_MAKEFLAGS) dist \
-+ && rm -rf $(DIST_ARCHIVES) \
-+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-+ $(am__remove_distdir)
-+ @(echo "$(distdir) archives ready for distribution: "; \
-+ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-+ sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
-+distuninstallcheck:
-+ @cd $(distuninstallcheck_dir) \
-+ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-+ || { echo "ERROR: files left after uninstall:" ; \
-+ if test -n "$(DESTDIR)"; then \
-+ echo " (check DESTDIR support)"; \
-+ fi ; \
-+ $(distuninstallcheck_listfiles) ; \
-+ exit 1; } >&2
-+distcleancheck: distclean
-+ @if test '$(srcdir)' = . ; then \
-+ echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-+ exit 1 ; \
-+ fi
-+ @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-+ || { echo "ERROR: files left in build directory after distclean:" ; \
-+ $(distcleancheck_listfiles) ; \
-+ exit 1; } >&2
-+check-am: all-am
-+check: check-am
-+all-am: Makefile $(PROGRAMS) $(MANS)
-+installdirs:
-+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man8dir)"; do \
-+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ done
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+uninstall: uninstall-am
-+
-+install-am: all-am
-+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+ `test -z '$(STRIP)' || \
-+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+ -rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+ @echo "This command is intended for maintainers to use"
-+ @echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
-+
-+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
-+
-+distclean: distclean-am
-+ -rm -f $(am__CONFIG_DISTCLEAN_FILES)
-+ -rm -rf ./$(DEPDIR)
-+ -rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+ distclean-tags
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+info: info-am
-+
-+info-am:
-+
-+install-data-am: install-man
-+
-+install-exec-am: install-binPROGRAMS
-+
-+install-info: install-info-am
-+
-+install-man: install-man8
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+ -rm -f $(am__CONFIG_DISTCLEAN_FILES)
-+ -rm -rf $(top_srcdir)/autom4te.cache
-+ -rm -rf ./$(DEPDIR)
-+ -rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man
-+
-+uninstall-man: uninstall-man8
-+
-+.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
-+ clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
-+ dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
-+ distclean-compile distclean-generic distclean-tags \
-+ distcleancheck distdir distuninstallcheck dvi dvi-am html \
-+ html-am info info-am install install-am install-binPROGRAMS \
-+ install-data install-data-am install-exec install-exec-am \
-+ install-info install-info-am install-man install-man8 \
-+ install-strip installcheck installcheck-am installdirs \
-+ maintainer-clean maintainer-clean-generic mostlyclean \
-+ mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
-+ tags uninstall uninstall-am uninstall-binPROGRAMS \
-+ uninstall-info-am uninstall-man uninstall-man8
-+
-+
-+# test genext2fs by creating the image and comparing checksums
-+test: all
-+ sh ./test.sh
-+
-+# test genext2fs by actually mounting the created image.
-+test-mount: all
-+ sudo sh ./test-mount.sh
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-diff --exclude CVS -urN genext2fs-1.3.orig/NEWS genext2fs/NEWS
---- genext2fs-1.3.orig/NEWS 1969-12-31 17:00:00.000000000 -0700
-+++ genext2fs/NEWS 2004-11-21 23:21:05.000000000 -0700
-@@ -0,0 +1 @@
-+No news yet :)
-diff --exclude CVS -urN genext2fs-1.3.orig/README genext2fs/README
---- genext2fs-1.3.orig/README 1969-12-31 17:00:00.000000000 -0700
-+++ genext2fs/README 2004-11-21 23:18:40.000000000 -0700
-@@ -0,0 +1,19 @@
-+ ABOUT
-+-----------
-+genext2fs is a mean to generate an ext2 filesystem as a normal (non-root)
-+user. It doesn't require you to mount the image file to copy files on it.
-+It doesn't even require you to be the superuser to make device nodes.
-+
-+http://sourceforge.net/projects/genext2fs
-+
-+ CONTACT
-+-------------
-+Please use the gen...@li... mailing list.
-+
-+ INSTALL
-+-------------
-+Please see the INSTALL file ;)
-+
-+ AUTHORS
-+-------------
-+Please see the AUTHORS file ;)
-diff --exclude CVS -urN genext2fs-1.3.orig/TODO genext2fs/TODO
---- genext2fs-1.3.orig/TODO 1969-12-31 17:00:00.000000000 -0700
-+++ genext2fs/TODO 2004-11-25 11:12:10.000000000 -0700
-@@ -0,0 +1,13 @@
-+Disclaimer: I'll probably never do all this ...
-+
-+- support fancy ext2 options
-+- support ext3
-+
-+- add path to -f/-d options, e.g:
-+ -f /:file.img => extract file.img at root
-+ -d /etc:/path/to/my/etc => copy /path/to/my/etc into /etc
-+
-+- add tar.gz extraction capabilities ?
-+
-+- implement truncate_node
-+- find a better way to guess filesystem's size
-diff --exclude CVS -urN genext2fs-1.3.orig/aclocal.m4 genext2fs/aclocal.m4
---- genext2fs-1.3.orig/aclocal.m4 1969-12-31 17:00:00.000000000 -0700
-+++ genext2fs/aclocal.m4 2004-12-27 13:03:45.000000000 -0700
-@@ -0,0 +1,908 @@
-+# generated automatically by aclocal 1.8.5 -*- Autoconf -*-
-+
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-+# Free Software Foundation, Inc.
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+# -*- Autoconf -*-
-+# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-+# Generated from amversion.in; do not edit by hand.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+
-+# AM_AUTOMAKE_VERSION(VERSION)
-+# ----------------------------
-+# Automake X.Y traces this macro to ensure aclocal.m4 has been
-+# generated from the m4 files accompanying Automake X.Y.
-+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"])
-+
-+# AM_SET_CURRENT_AUTOMAKE_VERSION
-+# -------------------------------
-+# Call AM_AUTOMAKE_VERSION so it can be traced.
-+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-+ [AM_AUTOMAKE_VERSION([1.8.5])])
-+
-+# AM_AUX_DIR_EXPAND
-+
-+# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-+# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
-+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-+#
-+# Of course, Automake must honor this variable whenever it calls a
-+# tool from the auxiliary directory. The problem is that $srcdir (and
-+# therefore $ac_aux_dir as well) can be either absolute or relative,
-+# depending on how configure is run. This is pretty annoying, since
-+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-+# source directory, any form will work fine, but in subdirectories a
-+# relative path needs to be adjusted first.
-+#
-+# $ac_aux_dir/missing
-+# fails when called from a subdirectory if $ac_aux_dir is relative
-+# $top_srcdir/$ac_aux_dir/missing
-+# fails if $ac_aux_dir is absolute,
-+# fails when called from a subdirectory in a VPATH build with
-+# a relative $ac_aux_dir
-+#
-+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-+# are both prefixed by $srcdir. In an in-source build this is usually
-+# harmless because $srcdir is `.', but things will broke when you
-+# start a VPATH build or use an absolute $srcdir.
-+#
-+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-+# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
-+# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-+# and then we would define $MISSING as
-+# MISSING="\${SHELL} $am_aux_dir/missing"
-+# This will work as long as MISSING is not called from configure, because
-+# unfortunately $(top_srcdir) has no meaning in configure.
-+# However there are other variables, like CC, which are often used in
-+# configure, and could therefore not use this "fixed" $ac_aux_dir.
-+#
-+# Another solution, used here, is to always expand $ac_aux_dir to an
-+# absolute PATH. The drawback is that using absolute paths prevent a
-+# configured tree to be moved without reconfiguration.
-+
-+AC_DEFUN([AM_AUX_DIR_EXPAND],
-+[dnl Rely on autoconf to set up CDPATH properly.
-+AC_PREREQ([2.50])dnl
-+# expand $ac_aux_dir to an absolute path
-+am_aux_dir=`cd $ac_aux_dir && pwd`
-+])
-+
-+# AM_CONDITIONAL -*- Autoconf -*-
-+
-+# Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+# serial 6
-+
-+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-+# -------------------------------------
-+# Define a conditional.
-+AC_DEFUN([AM_CONDITIONAL],
-+[AC_PREREQ(2.52)dnl
-+ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
-+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-+AC_SUBST([$1_TRUE])
-+AC_SUBST([$1_FALSE])
-+if $2; then
-+ $1_TRUE=
-+ $1_FALSE='#'
-+else
-+ $1_TRUE='#'
-+ $1_FALSE=
-+fi
-+AC_CONFIG_COMMANDS_PRE(
-+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-+ AC_MSG_ERROR([conditional "$1" was never defined.
-+Usually this means the macro was only invoked conditionally.])
-+fi])])
-+
-+# serial 7 -*- Autoconf -*-
-+
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
-+# Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+
-+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-+# written in clear, in which case automake, when reading aclocal.m4,
-+# will think it sees a *use*, and therefore will trigger all it's
-+# C support machinery. Also note that it means that autoscan, seeing
-+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-+
-+
-+
-+# _AM_DEPENDENCIES(NAME)
-+# ----------------------
-+# See how the compiler implements dependency checking.
-+# NAME is "CC", "CXX", "GCJ", or "OBJC".
-+# We try a few techniques and use that to set a single cache variable.
-+#
-+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-+# dependency, and given that the user is not expected to run this macro,
-+# just rely on AC_PROG_CC.
-+AC_DEFUN([_AM_DEPENDENCIES],
-+[AC_REQUIRE([AM_SET_DEPDIR])dnl
-+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-+AC_REQUIRE([AM_DEP_TRACK])dnl
-+
-+ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
-+ [$1], CXX, [depcc="$CXX" am_compiler_list=],
-+ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-+ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
-+ [depcc="$$1" am_compiler_list=])
-+
-+AC_CACHE_CHECK([dependency style of $depcc],
-+ [am_cv_$1_dependencies_compiler_type],
-+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+ # We make a subdir and do the tests there. Otherwise we can end up
-+ # making bogus files that we don't know about and never remove. For
-+ # instance it was reported that on HP-UX the gcc test will end up
-+ # making a dummy file named `D' -- because `-MD' means `put the output
-+ # in D'.
-+ mkdir conftest.dir
-+ # Copy depcomp to subdir because otherwise we won't find it if we're
-+ # using a relative directory.
-+ cp "$am_depcomp" conftest.dir
-+ cd conftest.dir
-+ # We will build objects and dependencies in a subdirectory because
-+ # it helps to detect inapplicable dependency modes. For instance
-+ # both Tru64's cc and ICC support -MD to output dependencies as a
-+ # side effect of compilation, but ICC will put the dependencies in
-+ # the current directory while Tru64 will put them in the object
-+ # directory.
-+ mkdir sub
-+
-+ am_cv_$1_dependencies_compiler_type=none
-+ if test "$am_compiler_list" = ""; then
-+ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-+ fi
-+ for depmode in $am_compiler_list; do
-+ # Setup a source with many dependencies, because some compilers
-+ # like to wrap large dependency lists on column 80 (with \), and
-+ # we should not choose a depcomp mode which is confused by this.
-+ #
-+ # We need to recreate these files for each test, as the compiler may
-+ # overwrite some of them when testing with obscure command lines.
-+ # This happens at least with the AIX C compiler.
-+ : > sub/conftest.c
-+ for i in 1 2 3 4 5 6; do
-+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+ # Solaris 8's {/usr,}/bin/sh.
-+ touch sub/conftst$i.h
-+ done
-+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+ case $depmode in
-+ nosideeffect)
-+ # after this tag, mechanisms are not by side-effect, so they'll
-+ # only be used when explicitly requested
-+ if test "x$enable_dependency_tracking" = xyes; then
-+ continue
-+ else
-+ break
-+ fi
-+ ;;
-+ none) break ;;
-+ esac
-+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+ # mode. It turns out that the SunPro C++ compiler does not properly
-+ # handle `-M -o', and we need to detect this.
-+ if depmode=$depmode \
-+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+ >/dev/null 2>conftest.err &&
-+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+ # icc doesn't choke on unknown options, it will just issue warnings
-+ # or remarks (even with -Werror). So we grep stderr for any message
-+ # that says an option was ignored or not supported.
-+ # When given -MP, icc 7.0 and 7.1 complain thusly:
-+ # icc: Command line warning: ignoring option '-M'; no argument required
-+ # The diagnosis changed in icc 8.0:
-+ # icc: Command line remark: option '-MP' not supported
-+ if (grep 'ignoring option' conftest.err ||
-+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+ am_cv_$1_dependencies_compiler_type=$depmode
-+ break
-+ fi
-+ fi
-+ done
-+
-+ cd ..
-+ rm -rf conftest.dir
-+else
-+ am_cv_$1_dependencies_compiler_type=none
-+fi
-+])
-+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-+AM_CONDITIONAL([am__fastdep$1], [
-+ test "x$enable_dependency_tracking" != xno \
-+ && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-+])
-+
-+
-+# AM_SET_DEPDIR
-+# -------------
-+# Choose a directory name for dependency files.
-+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-+AC_DEFUN([AM_SET_DEPDIR],
-+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-+])
-+
-+
-+# AM_DEP_TRACK
-+# ------------
-+AC_DEFUN([AM_DEP_TRACK],
-+[AC_ARG_ENABLE(dependency-tracking,
-+[ --disable-dependency-tracking speeds up one-time build
-+ --enable-dependency-tracking do not reject slow dependency extractors])
-+if test "x$enable_dependency_tracking" != xno; then
-+ am_depcomp="$ac_aux_dir/depcomp"
-+ AMDEPBACKSLASH='\'
-+fi
-+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-+AC_SUBST([AMDEPBACKSLASH])
-+])
-+
-+# Generate code to set up dependency tracking. -*- Autoconf -*-
-+
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+#serial 2
-+
-+# _AM_OUTPUT_DEPENDENCY_COMMANDS
-+# ------------------------------
-+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-+[for mf in $CONFIG_FILES; do
-+ # Strip MF so we end up with the name of the file.
-+ mf=`echo "$mf" | sed -e 's/:.*$//'`
-+ # Check whether this is an Automake generated Makefile or not.
-+ # We used to match only the files named `Makefile.in', but
-+ # some people rename them; so instead we look at the file content.
-+ # Grep'ing the first line is not enough: some people post-process
-+ # each Makefile.in and add a new line on top of each file to say so.
-+ # So let's grep whole file.
-+ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-+ dirpart=`AS_DIRNAME("$mf")`
-+ else
-+ continue
-+ fi
-+ grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
-+ # Extract the definition of DEP_FILES from the Makefile without
-+ # running `make'.
-+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+ test -z "$DEPDIR" && continue
-+ # When using ansi2knr, U may be empty or an underscore; expand it
-+ U=`sed -n 's/^U = //p' < "$mf"`
-+ test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
-+ # We invoke sed twice because it is the simplest approach to
-+ # changing $(DEPDIR) to its actual value in the expansion.
-+ for file in `sed -n '
-+ /^DEP_FILES = .*\\\\$/ {
-+ s/^DEP_FILES = //
-+ :loop
-+ s/\\\\$//
-+ p
-+ n
-+ /\\\\$/ b loop
-+ p
-+ }
-+ /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
-+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+ # Make sure the directory exists.
-+ test -f "$dirpart/$file" && continue
-+ fdir=`AS_DIRNAME(["$file"])`
-+ AS_MKDIR_P([$dirpart/$fdir])
-+ # echo "creating $dirpart/$file"
-+ echo '# dummy' > "$dirpart/$file"
-+ done
-+done
-+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-+
-+
-+# AM_OUTPUT_DEPENDENCY_COMMANDS
-+# -----------------------------
-+# This macro should only be invoked once -- use via AC_REQUIRE.
-+#
-+# This code is only required when automatic dependency tracking
-+# is enabled. FIXME. This creates each `.P' file that we will
-+# need in order to bootstrap the dependency handling code.
-+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-+[AC_CONFIG_COMMANDS([depfiles],
-+ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-+ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-+])
-+
-+# Do all the work for Automake. -*- Autoconf -*-
-+
-+# This macro actually does too much some checks are only needed if
-+# your package does certain things. But this isn't really a big deal.
-+
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-+# Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+# serial 11
-+
-+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-+# AM_INIT_AUTOMAKE([OPTIONS])
-+# -----------------------------------------------
-+# The call with PACKAGE and VERSION arguments is the old style
-+# call (pre autoconf-2.50), which is being phased out. PACKAGE
-+# and VERSION should now be passed to AC_INIT and removed from
-+# the call to AM_INIT_AUTOMAKE.
-+# We support both call styles for the transition. After
-+# the next Automake release, Autoconf can make the AC_INIT
-+# arguments mandatory, and then we can depend on a new Autoconf
-+# release and drop the old call support.
-+AC_DEFUN([AM_INIT_AUTOMAKE],
-+[AC_PREREQ([2.58])dnl
-+dnl Autoconf wants to disallow AM_ names. We explicitly allow
-+dnl the ones we care about.
-+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-+AC_REQUIRE([AC_PROG_INSTALL])dnl
-+# test to see if srcdir already configured
-+if test "`cd $srcdir && pwd`" != "`pwd`" &&
-+ test -f $srcdir/config.status; then
-+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-+fi
-+
-+# test whether we have cygpath
-+if test -z "$CYGPATH_W"; then
-+ if (cygpath --version) >/dev/null 2>/dev/null; then
-+ CYGPATH_W='cygpath -w'
-+ else
-+ CYGPATH_W=echo
-+ fi
-+fi
-+AC_SUBST([CYGPATH_W])
-+
-+# Define the identity of the package.
-+dnl Distinguish between old-style and new-style calls.
-+m4_ifval([$2],
-+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
-+ AC_SUBST([PACKAGE], [$1])dnl
-+ AC_SUBST([VERSION], [$2])],
-+[_AM_SET_OPTIONS([$1])dnl
-+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
-+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-+
-+_AM_IF_OPTION([no-define],,
-+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-+
-+# Some tools Automake needs.
-+AC_REQUIRE([AM_SANITY_CHECK])dnl
-+AC_REQUIRE([AC_ARG_PROGRAM])dnl
-+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-+AM_MISSING_PROG(AUTOCONF, autoconf)
-+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-+AM_MISSING_PROG(AUTOHEADER, autoheader)
-+AM_MISSING_PROG(MAKEINFO, makeinfo)
-+AM_MISSING_PROG(AMTAR, tar)
-+AM_PROG_INSTALL_SH
-+AM_PROG_INSTALL_STRIP
-+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-+# We need awk for the "check" target. The system "awk" is bad on
-+# some platforms.
-+AC_REQUIRE([AC_PROG_AWK])dnl
-+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-+
-+_AM_IF_OPTION([no-dependencies],,
-+[AC_PROVIDE_IFELSE([AC_PROG_CC],
-+ [_AM_DEPENDENCIES(CC)],
-+ [define([AC_PROG_CC],
-+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-+AC_PROVIDE_IFELSE([AC_PROG_CXX],
-+ [_AM_DEPENDENCIES(CXX)],
-+ [define([AC_PROG_CXX],
-+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-+])
-+])
-+
-+
-+# When config.status generates a header, we must update the stamp-h file.
-+# This file resides in the same directory as the config header
-+# that is generated. The stamp files are numbered to have different names.
-+
-+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-+# loop where config.status creates the headers, so we can generate
-+# our stamp files there.
-+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-+[# Compute $1's index in $config_headers.
-+_am_stamp_count=1
-+for _am_header in $config_headers :; do
-+ case $_am_header in
-+ $1 | $1:* )
-+ break ;;
-+ * )
-+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-+ esac
-+done
-+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-+
-+# AM_PROG_INSTALL_SH
-+# ------------------
-+# Define $install_sh.
-+
-+# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPO...
[truncated message content] |
|
From: <kr...@us...> - 2007-04-18 18:24:10
|
Revision: 847
http://svn.sourceforge.net/astlinux/?rev=847&view=rev
Author: krisk84
Date: 2007-04-18 11:24:10 -0700 (Wed, 18 Apr 2007)
Log Message:
-----------
include interface renaming support
Modified Paths:
--------------
trunk/package/wireless-tools/wireless-tools.mk
trunk/target/generic/target_skeleton/etc/init.d/network
trunk/target/generic/target_skeleton/stat/etc/rc.conf
Modified: trunk/package/wireless-tools/wireless-tools.mk
===================================================================
--- trunk/package/wireless-tools/wireless-tools.mk 2007-04-18 15:23:00 UTC (rev 846)
+++ trunk/package/wireless-tools/wireless-tools.mk 2007-04-18 18:24:10 UTC (rev 847)
@@ -39,6 +39,8 @@
$(INSTALL) -D -m 0755 $(WIRELESS_TOOLS_BUILD_DIR)/ifrename $(TARGET_DIR)/usr/sbin/ifrename
$(INSTALL) -D -m 0644 $(WIRELESS_TOOLS_BUILD_DIR)/libiw.so.$(WIRELESS_TOOLS_VER) \
$(TARGET_DIR)/usr/lib/libiw.so.$(WIRELESS_TOOLS_VER)
+ ln -s /tmp/etc/iftab $(TARGET_DIR)/etc/iftab
+ ln -s /tmp/etc/iftab.init $(TARGET_DIR)/etc/iftab.init
wireless-tools: $(TARGET_DIR)/sbin/iwconfig
Modified: trunk/target/generic/target_skeleton/etc/init.d/network
===================================================================
--- trunk/target/generic/target_skeleton/etc/init.d/network 2007-04-18 15:23:00 UTC (rev 846)
+++ trunk/target/generic/target_skeleton/etc/init.d/network 2007-04-18 18:24:10 UTC (rev 847)
@@ -3,6 +3,39 @@
. /etc/rc.conf
init () {
+if [ "$IFRENAME" ]
+then
+
+#clear existing iftabs
+echo -n > /tmp/etc/iftab
+echo -n > /tmp/etc/iftab.init
+
+#set COUNT
+COUNT=10
+
+for i in $IFRENAME
+do
+IF=`echo $i | cut -d: -f1`
+DRIVER=`echo $i | cut -d: -f2`
+ID=`echo $i | cut -d: -f3`
+
+COUNT=`expr $COUNT - 1`
+
+if `echo $ID | grep -q i`
+then
+RID=`echo $ID | tr -d i`
+echo "eth"$COUNT" driver $DRIVER interrupt $RID" >> /tmp/etc/iftab.init
+fi
+
+if `echo $ID | grep -q i`
+then
+RID=`echo $ID | tr -d i`
+echo "$IF driver $DRIVER interrupt $RID" >> /tmp/etc/iftab
+fi
+
+done
+fi
+
if [ -r /etc/iftab.init ]
then
echo "Remapping interfaces (init)..."
Modified: trunk/target/generic/target_skeleton/stat/etc/rc.conf
===================================================================
--- trunk/target/generic/target_skeleton/stat/etc/rc.conf 2007-04-18 15:23:00 UTC (rev 846)
+++ trunk/target/generic/target_skeleton/stat/etc/rc.conf 2007-04-18 18:24:10 UTC (rev 847)
@@ -27,6 +27,12 @@
###Interfaces
+##IFRENAME Support
+##If for some reason you need to move your interfaces around before
+##they are configured, you can do that here if you built your system
+##with wireless-tools enabled (it's included by default.
+#IFRENAME="eth0:8139too:i10 eth1:8139too:i12 eth2:8139too:i11"
+
##VLANS
##Configure vlans here. These will be created on boot BEFORE INTIF, etc are
##brought up. You can then use these values for INTIF, EXTIF, etc.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2007-04-18 21:15:43
|
Revision: 869
http://svn.sourceforge.net/astlinux/?rev=869&view=rev
Author: krisk84
Date: 2007-04-18 14:15:44 -0700 (Wed, 18 Apr 2007)
Log Message:
-----------
remove starbox config files
Removed Paths:
-------------
trunk/starbox-x.config
trunk/starbox.config
Deleted: trunk/starbox-x.config
===================================================================
--- trunk/starbox-x.config 2007-04-18 21:15:15 UTC (rev 868)
+++ trunk/starbox-x.config 2007-04-18 21:15:44 UTC (rev 869)
@@ -1,362 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-BR2_HAVE_DOT_CONFIG=y
-# BR2_alpha is not set
-# BR2_arm is not set
-# BR2_armeb is not set
-# BR2_cris is not set
-BR2_i386=y
-# BR2_m68k is not set
-# BR2_mips is not set
-# BR2_mipsel is not set
-# BR2_nios2 is not set
-# BR2_powerpc is not set
-# BR2_sh is not set
-# BR2_sparc is not set
-# BR2_x86_64 is not set
-# BR2_x86_i386 is not set
-# BR2_x86_i486 is not set
-BR2_x86_i586=y
-# BR2_x86_i686 is not set
-BR2_ARCH="i586"
-BR2_ENDIAN="LITTLE"
-
-#
-# Build options
-#
-BR2_WGET="toolchain/getter_script.sh"
-BR2_SVN="svn co"
-BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
-BR2_SOURCEFORGE_MIRROR="easynews"
-BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
-BR2_TOPDIR_PREFIX=""
-BR2_TOPDIR_SUFFIX=""
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
-BR2_JLEVEL=2
-
-#
-# Toolchain Options
-#
-
-#
-# uClibc Options
-#
-# BR2_UCLIBC_VERSION_SNAPSHOT is not set
-# BR2_ENABLE_LOCALE is not set
-# BR2_PTHREADS_NONE is not set
-# BR2_PTHREADS is not set
-# BR2_PTHREADS_OLD is not set
-BR2_PTHREADS_NATIVE=y
-
-#
-# Binutils Options
-#
-# BR2_BINUTILS_VERSION_2_14_90_0_8 is not set
-# BR2_BINUTILS_VERSION_2_15 is not set
-# BR2_BINUTILS_VERSION_2_15_94_0_2_2 is not set
-# BR2_BINUTILS_VERSION_2_15_97 is not set
-BR2_BINUTILS_VERSION_2_16_1=y
-# BR2_BINUTILS_VERSION_2_16_90_0_3 is not set
-# BR2_BINUTILS_VERSION_2_16_91_0_3 is not set
-# BR2_BINUTILS_VERSION_2_16_91_0_4 is not set
-# BR2_BINUTILS_VERSION_2_16_91_0_5 is not set
-# BR2_BINUTILS_VERSION_2_16_91_0_6 is not set
-BR2_BINUTILS_VERSION="2.16.1"
-
-#
-# Gcc Options
-#
-# BR2_GCC_VERSION_3_3_5 is not set
-# BR2_GCC_VERSION_3_3_6 is not set
-# BR2_GCC_VERSION_3_4_2 is not set
-# BR2_GCC_VERSION_3_4_3 is not set
-# BR2_GCC_VERSION_3_4_4 is not set
-BR2_GCC_VERSION_3_4_5=y
-# BR2_GCC_VERSION_4_0_0 is not set
-# BR2_GCC_VERSION_4_0_1 is not set
-# BR2_GCC_VERSION_4_0_2 is not set
-# BR2_GCC_VERSION_4_1_0 is not set
-# BR2_GCC_VERSION_4_2_0 is not set
-BR2_GCC_VERSION="3.4.5"
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
-BR2_EXTRA_GCC_CONFIG_OPTIONS=""
-BR2_INSTALL_LIBSTDCPP=y
-# BR2_INSTALL_LIBGCJ is not set
-# BR2_INSTALL_OBJC is not set
-
-#
-# Ccache Options
-#
-BR2_CCACHE=y
-
-#
-# Gdb Options
-#
-# BR2_PACKAGE_GDB is not set
-# BR2_PACKAGE_GDB_SERVER is not set
-# BR2_PACKAGE_GDB_CLIENT is not set
-
-#
-# elf2flt
-#
-# BR2_ELF2FLT is not set
-
-#
-# Common Toolchain Options
-#
-BR2_PACKAGE_SSTRIP_TARGET=y
-BR2_PACKAGE_SSTRIP_HOST=y
-BR2_ENABLE_MULTILIB=y
-BR2_LARGEFILE=y
-BR2_TARGET_OPTIMIZATION="-Os -pipe"
-BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y
-
-#
-# Package Selection for the target
-#
-
-#
-# The default minimal system
-#
-BR2_PACKAGE_BUSYBOX=y
-# BR2_PACKAGE_BUSYBOX_SNAPSHOT is not set
-BR2_PACKAGE_BUSYBOX_INSTALL_SYMLINKS=y
-BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-astlinux.config"
-
-#
-# The minimum needed to build a uClibc development system
-#
-BR2_PACKAGE_BASH=y
-# BR2_PACKAGE_BZIP2 is not set
-# BR2_PACKAGE_COREUTILS is not set
-# BR2_PACKAGE_DIFFUTILS is not set
-# BR2_PACKAGE_ED is not set
-# BR2_PACKAGE_FINDUTILS is not set
-BR2_PACKAGE_FLEX=y
-BR2_PACKAGE_FLEX_LIBFL=y
-# BR2_PACKAGE_GAWK is not set
-# BR2_PACKAGE_GCC_TARGET is not set
-# BR2_PACKAGE_CCACHE_TARGET is not set
-# BR2_PACKAGE_GREP is not set
-# BR2_PACKAGE_MAKE is not set
-# BR2_PACKAGE_PATCH is not set
-# BR2_PACKAGE_SED is not set
-# BR2_PACKAGE_TAR is not set
-
-#
-# Other stuff
-#
-BR2_PACKAGE_ACPID=y
-BR2_PACKAGE_ARNOFW=y
-BR2_PACKAGE_ASTERISK=y
-BR2_PACKAGE_ASTERISK_LIBPRI=y
-BR2_PACKAGE_ASTERISK_ZAPTEL=y
-# BR2_PACKAGE_ASTERISK_LIBPQ_CUSTOM is not set
-BR2_PACKAGE_ASTERISK_CHANSCCP=y
-# BR2_PACKAGE_ASTERISK_CHANBLUETOOTH is not set
-# BR2_PACKAGE_ASTERISK_RESCONV is not set
-# BR2_PACKAGE_ASTERISK_LOWMEMORY is not set
-# BR2_PACKAGE_ASTERISK_METERMAID is not set
-BR2_PACKAGE_ASTERISKNATIVESOUNDS=y
-BR2_PACKAGE_ASTERISKNATIVESOUNDS_ULAW=y
-# BR2_PACKAGE_ASTERISKNATIVESOUNDS_ALAW is not set
-# BR2_PACKAGE_ASTERISKNATIVESOUNDS_ILBC is not set
-# BR2_PACKAGE_ASTERISKNATIVESOUNDS_GSM is not set
-BR2_PACKAGE_ASTERISKNATIVESOUNDS_G729=y
-# BR2_PACKAGE_ASTERISKNATIVESOUNDS_SLN is not set
-BR2_PACKAGE_ASTERISKAPPBUNDLE=y
-BR2_PACKAGE_ASTERISKMQUEUE=y
-BR2_PACKAGE_ASTERISKAPPCONFERENCE=y
-BR2_PACKAGE_ASTERISKAPPCONFERENCE_G729HACK=y
-BR2_PACKAGE_DIGIUMG729=y
-BR2_PACKAGE_ASTERISKCHANMISDN=y
-# BR2_PACKAGE_APCUPSD is not set
-BR2_PACKAGE_ASTMANPROXY=y
-# BR2_PACKAGE_AT is not set
-# BR2_PACKAGE_AUTOCONF is not set
-# BR2_PACKAGE_AUTOMAKE is not set
-# BR2_PACKAGE_BC is not set
-# BR2_PACKAGE_BERKELEYDB is not set
-# BR2_PACKAGE_BIND is not set
-# BR2_PACKAGE_BISON is not set
-# BR2_PACKAGE_BLUEZ is not set
-# BR2_PACKAGE_BOA is not set
-BR2_PACKAGE_BRIDGE=y
-BR2_PACKAGE_CHANSCCP=y
-# BR2_PACKAGE_CUSTOMIZE is not set
-# BR2_PACKAGE_ISC_DHCP is not set
-BR2_PACKAGE_DIALOG=y
-# BR2_PACKAGE_DIRECTFB is not set
-# BR2_PACKAGE_DISTCC is not set
-# BR2_PACKAGE_DM is not set
-BR2_PACKAGE_DNSMASQ=y
-# BR2_PACKAGE_DROPBEAR is not set
-# BR2_PACKAGE_EXPAT is not set
-# BR2_PACKAGE_E2FSPROGS is not set
-# BR2_PACKAGE_FAKEROOT is not set
-# BR2_PACKAGE_FILE is not set
-BR2_PACKAGE_FLITE=y
-# BR2_PACKAGE_FREETYPE is not set
-# BR2_PACKAGE_GETTEXT is not set
-# BR2_PACKAGE_LIBINTL is not set
-# BR2_PACKAGE_GZIP is not set
-# BR2_PACKAGE_HOSTAP is not set
-BR2_PACKAGE_HOTPLUG=y
-BR2_PACKAGE_INADYN=y
-# BR2_PACKAGE_IOSTAT is not set
-BR2_PACKAGE_IPROUTE2=y
-BR2_PACKAGE_IPSEC_TOOLS=y
-BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT=y
-BR2_PACKAGE_IPSEC_TOOLS_NATT=y
-BR2_PACKAGE_IPSEC_TOOLS_FRAG=y
-BR2_PACKAGE_IPSEC_TOOLS_STATS=y
-# BR2_PACKAGE_IPSEC_TOOLS_IPV6 is not set
-# BR2_PACKAGE_IPSEC_TOOLS_READLINE is not set
-BR2_PACKAGE_IPSEC_TOOLS_LIBS=y
-BR2_PACKAGE_IPTABLES=y
-# BR2_PACKAGE_JPEG is not set
-BR2_PACKAGE_KEXECTOOLS=y
-# BR2_PACKAGE_LCDPROC is not set
-# BR2_PACKAGE_LESS is not set
-# BR2_PACKAGE_LIBCGI is not set
-# BR2_PACKAGE_LIBCGICC is not set
-BR2_PACKAGE_LIBELF=y
-# BR2_PACKAGE_LIBFLOAT is not set
-# BR2_PACKAGE_LIBGLIB12 is not set
-BR2_PACKAGE_LIBMAD=y
-BR2_PACKAGE_LIBPCAP=y
-# BR2_PACKAGE_LIBPNG is not set
-# BR2_PACKAGE_LIBPQ is not set
-BR2_PACKAGE_LIBPRI=y
-BR2_PACKAGE_LIBSYSFS=y
-# BR2_PACKAGE_LIBTOOL is not set
-# BR2_PACKAGE_LIBUSB is not set
-# BR2_PACKAGE_LIGHTTPD is not set
-BR2_PACKAGE_LINKS=y
-BR2_PACKAGE_LMSENSORS=y
-# BR2_PACKAGE_LRZSZ is not set
-# BR2_PACKAGE_LTP-TESTSUITE is not set
-# BR2_PACKAGE_LTRACE is not set
-# BR2_PACKAGE_LTT is not set
-# BR2_PACKAGE_LVM2 is not set
-BR2_PACKAGE_LZO=y
-# BR2_PACKAGE_M4 is not set
-BR2_PACKAGE_MADWIFI=y
-# BR2_PACKAGE_MDADM is not set
-# BR2_PACKAGE_MEMTESTER is not set
-# BR2_PACKAGE_MICROCOM is not set
-BR2_PACKAGE_MICROPERL=y
-# BR2_PACKAGE_MICROWIN is not set
-BR2_PACKAGE_MINIHTTPD=y
-BR2_PACKAGE_MKDOSFS=y
-BR2_PACKAGE_MODULE_INIT_TOOLS=y
-# BR2_PACKAGE_MODUTILS is not set
-# BR2_PACKAGE_MPG123 is not set
-# BR2_PACKAGE_MROUTED is not set
-BR2_PACKAGE_MSMTP=y
-# BR2_PACKAGE_MTD is not set
-BR2_PACKAGE_NANO=y
-BR2_PACKAGE_NCURSES=y
-# BR2_PACKAGE_NCURSES_TARGET_HEADERS is not set
-# BR2_PACKAGE_NETKITBASE is not set
-# BR2_PACKAGE_NETKITTELNET is not set
-BR2_PACKAGE_NETSNMP=y
-BR2_PACKAGE_NEWT=y
-# BR2_PACKAGE_NOCATSPLASH is not set
-# BR2_PACKAGE_NTP is not set
-BR2_PACKAGE_OPENNTPD=y
-# BR2_PACKAGE_OPENSER is not set
-BR2_PACKAGE_OPENSSH=y
-BR2_PACKAGE_OPENSSL=y
-# BR2_PACKAGE_OPENSSL_TARGET_HEADERS is not set
-BR2_PACKAGE_OPENVPN=y
-BR2_PACKAGE_PCIUTILS=y
-# BR2_PACKAGE_PCMCIA is not set
-BR2_PACKAGE_PHP4=y
-# BR2_PACKAGE_PORTAGE is not set
-BR2_PACKAGE_PORTMAP=y
-BR2_PACKAGE_PPPD=y
-# BR2_PACKAGE_PPTPD is not set
-# BR2_PACKAGE_PROCPS is not set
-# BR2_PACKAGE_PSMISC is not set
-# BR2_PACKAGE_PYTHON is not set
-# BR2_PACKAGE_QTE is not set
-BR2_QTE_TMAKE_VERSION="1.13"
-# BR2_PACKAGE_RAIDTOOLS is not set
-# BR2_READLINE is not set
-# BR2_PACKAGE_RESCONV is not set
-# BR2_PACKAGE_RP-PPPOE is not set
-BR2_PACKAGE_RSYNC=y
-# BR2_PACKAGE_RUBY is not set
-# BR2_PACKAGE_RXVT is not set
-BR2_PACKAGE_SCREEN=y
-# BR2_PACKAGE_SDL is not set
-BR2_PACKAGE_SFDISK=y
-# BR2_PACKAGE_SLANG is not set
-# BR2_PACKAGE_SMARTMONTOOLS is not set
-# BR2_PACKAGE_SOCAT is not set
-BR2_PACKAGE_SOX=y
-BR2_PACKAGE_SOX_LIBMAD=y
-BR2_PACKAGE_STRACE=y
-BR2_PACKAGE_STUNNEL=y
-BR2_PACKAGE_SYSFSUTILS=y
-# BR2_PACKAGE_SYSKLOGD is not set
-# BR2_PACKAGE_SYSVINIT is not set
-# BR2_PACKAGE_TCL is not set
-BR2_PACKAGE_TCPDUMP=y
-# BR2_PACKAGE_DHCPDUMP is not set
-BR2_PACKAGE_TFTPD=y
-# BR2_PACKAGE_THTTPD is not set
-# BR2_PACKAGE_TINYLOGIN is not set
-# BR2_PACKAGE_TINYX is not set
-# BR2_PACKAGE_TN5250 is not set
-BR2_PACKAGE_TTCP=y
-# BR2_PACKAGE_UDEV is not set
-# BR2_PACKAGE_UDHCP is not set
-BR2_PACKAGE_USBUTILS=y
-# BR2_PACKAGE_UTIL-LINUX is not set
-# BR2_PACKAGE_VALGRIND is not set
-BR2_PACKAGE_VSFTPD=y
-BR2_PACKAGE_VTUN=y
-# BR2_PACKAGE_WANPIPE is not set
-# BR2_PACKAGE_WGET is not set
-# BR2_PACKAGE_WHICH is not set
-# BR2_PACKAGE_WIPE is not set
-BR2_PACKAGE_WIRELESS_TOOLS=y
-# BR2_PACKAGE_XFSPROGS is not set
-# BR2_PACKAGE_XORG is not set
-BR2_PACKAGE_ZAPTEL=y
-BR2_PACKAGE_ZAPTEL_RHINO=y
-BR2_PACKAGE_ZLIB=y
-# BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set
-
-#
-# Target Options
-#
-
-#
-# filesystem for target device
-#
-# BR2_TARGET_ROOTFS_CRAMFS is not set
-# BR2_TARGET_ROOTFS_CLOOP is not set
-# BR2_TARGET_ROOTFS_EXT2 is not set
-# BR2_TARGET_ROOTFS_JFFS2 is not set
-# BR2_TARGET_ROOTFS_SQUASHFS is not set
-# BR2_TARGET_ROOTFS_TAR is not set
-
-#
-# bootloader for target device
-#
-BR2_TARGET_GRUB=y
-# BR2_TARGET_SYSLINUX is not set
-
-#
-# AstLinux Target Device
-#
-# BR2_TARGET_SOEKRIS_NET4801 is not set
-BR2_PACKAGE_LINUX=y
-BR2_TARGET_PCENGINES_WRAP=y
-# BR2_TARGET_GENI586 is not set
-# BR2_TARGET_VIA is not set
Deleted: trunk/starbox.config
===================================================================
--- trunk/starbox.config 2007-04-18 21:15:15 UTC (rev 868)
+++ trunk/starbox.config 2007-04-18 21:15:44 UTC (rev 869)
@@ -1,446 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-BR2_HAVE_DOT_CONFIG=y
-# BR2_alpha is not set
-# BR2_arm is not set
-# BR2_armeb is not set
-# BR2_cris is not set
-BR2_i386=y
-# BR2_m68k is not set
-# BR2_mips is not set
-# BR2_mipsel is not set
-# BR2_nios2 is not set
-# BR2_powerpc is not set
-# BR2_sh is not set
-# BR2_sparc is not set
-# BR2_x86_64 is not set
-# BR2_x86_i386 is not set
-# BR2_x86_i486 is not set
-BR2_x86_i586=y
-# BR2_x86_i686 is not set
-BR2_ARCH="i586"
-BR2_ENDIAN="LITTLE"
-
-#
-# Build options
-#
-BR2_WGET="toolchain/getter_script.sh"
-BR2_SVN="svn co"
-BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
-BR2_SOURCEFORGE_MIRROR="easynews"
-BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
-BR2_TOPDIR_PREFIX=""
-BR2_TOPDIR_SUFFIX=""
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
-BR2_JLEVEL=10
-
-#
-# Toolchain Options
-#
-
-#
-# uClibc Options
-#
-# BR2_UCLIBC_VERSION_SNAPSHOT is not set
-# BR2_ENABLE_LOCALE is not set
-# BR2_PTHREADS_NONE is not set
-# BR2_PTHREADS is not set
-# BR2_PTHREADS_OLD is not set
-BR2_PTHREADS_NATIVE=y
-
-#
-# Binutils Options
-#
-# BR2_BINUTILS_VERSION_2_14_90_0_8 is not set
-# BR2_BINUTILS_VERSION_2_15 is not set
-# BR2_BINUTILS_VERSION_2_15_94_0_2_2 is not set
-# BR2_BINUTILS_VERSION_2_16_1 is not set
-# BR2_BINUTILS_VERSION_2_16_90_0_3 is not set
-# BR2_BINUTILS_VERSION_2_16_91_0_5 is not set
-# BR2_BINUTILS_VERSION_2_16_91_0_6 is not set
-BR2_BINUTILS_VERSION_2_16_91_0_7=y
-# BR2_BINUTILS_VERSION_2_17 is not set
-# BR2_BINUTILS_VERSION_2_17_50_0_2 is not set
-# BR2_BINUTILS_VERSION_2_17_50_0_3 is not set
-# BR2_BINUTILS_VERSION_2_17_50_0_4 is not set
-# BR2_BINUTILS_VERSION_2_17_50_0_5 is not set
-# BR2_BINUTILS_VERSION_2_17_50_0_6 is not set
-# BR2_BINUTILS_VERSION_2_17_50_0_7 is not set
-# BR2_BINUTILS_VERSION_2_17_50_0_8 is not set
-# BR2_BINUTILS_VERSION_2_17_50_0_9 is not set
-# BR2_BINUTILS_VERSION_2_17_50_0_10 is not set
-BR2_BINUTILS_VERSION="2.16.91.0.7"
-BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""
-
-#
-# Gcc Options
-#
-# BR2_GCC_VERSION_3_3_5 is not set
-# BR2_GCC_VERSION_3_3_6 is not set
-# BR2_GCC_VERSION_3_4_2 is not set
-# BR2_GCC_VERSION_3_4_3 is not set
-# BR2_GCC_VERSION_3_4_4 is not set
-# BR2_GCC_VERSION_3_4_5 is not set
-# BR2_GCC_VERSION_3_4_6 is not set
-# BR2_GCC_VERSION_4_0_0 is not set
-# BR2_GCC_VERSION_4_0_1 is not set
-# BR2_GCC_VERSION_4_0_2 is not set
-# BR2_GCC_VERSION_4_0_3 is not set
-# BR2_GCC_VERSION_4_0_4 is not set
-# BR2_GCC_VERSION_4_1_0 is not set
-# BR2_GCC_VERSION_4_1_1 is not set
-BR2_GCC_VERSION_4_1_2=y
-# BR2_GCC_VERSION_4_2 is not set
-# BR2_GCC_IS_SNAP is not set
-BR2_GCC_VERSION="4.1.2"
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
-BR2_EXTRA_GCC_CONFIG_OPTIONS=""
-BR2_INSTALL_LIBSTDCPP=y
-# BR2_INSTALL_LIBGCJ is not set
-# BR2_INSTALL_OBJC is not set
-# BR2_INSTALL_FORTRAN is not set
-BR2_GCC_SHARED_LIBGCC=y
-
-#
-# Ccache Options
-#
-BR2_CCACHE=y
-
-#
-# Gdb Options
-#
-# BR2_PACKAGE_GDB is not set
-# BR2_PACKAGE_GDB_SERVER is not set
-# BR2_PACKAGE_GDB_CLIENT is not set
-
-#
-# elf2flt
-#
-# BR2_ELF2FLT is not set
-
-#
-# Common Toolchain Options
-#
-BR2_PACKAGE_SSTRIP_TARGET=y
-BR2_PACKAGE_SSTRIP_HOST=y
-BR2_ENABLE_MULTILIB=y
-BR2_LARGEFILE=y
-BR2_TARGET_OPTIMIZATION="-Os -pipe"
-BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y
-
-#
-# Package Selection for the target
-#
-
-#
-# The default minimal system
-#
-BR2_PACKAGE_BUSYBOX=y
-# BR2_PACKAGE_BUSYBOX_SNAPSHOT is not set
-BR2_PACKAGE_BUSYBOX_INSTALL_SYMLINKS=y
-
-#
-# The minimum needed to build a uClibc development system
-#
-BR2_PACKAGE_BASH=y
-# BR2_PACKAGE_BZIP2 is not set
-# BR2_PACKAGE_COREUTILS is not set
-# BR2_PACKAGE_DIFFUTILS is not set
-# BR2_PACKAGE_ED is not set
-# BR2_PACKAGE_FINDUTILS is not set
-BR2_PACKAGE_FLEX=y
-BR2_PACKAGE_FLEX_LIBFL=y
-# BR2_PACKAGE_GAWK is not set
-# BR2_PACKAGE_GCC_TARGET is not set
-BR2_EXTRA_TARGET_GCC_CONFIG_OPTIONS=""
-# BR2_PACKAGE_CCACHE_TARGET is not set
-# BR2_PACKAGE_GREP is not set
-# BR2_PACKAGE_MAKE is not set
-# BR2_PACKAGE_PATCH is not set
-# BR2_PACKAGE_SED is not set
-# BR2_PACKAGE_TAR is not set
-
-#
-# Other stuff
-#
-BR2_PACKAGE_ACPID=y
-# BR2_PACKAGE_ALSA_LIB is not set
-# BR2_PACKAGE_ALSA_UTILS is not set
-# BR2_PACKAGE_ARNOFW is not set
-BR2_PACKAGE_ASTERISK=y
-BR2_PACKAGE_ASTERISK_LIBPRI=y
-BR2_PACKAGE_ASTERISK_ZAPTEL=y
-# BR2_PACKAGE_ASTERISK_LIBPQ_CUSTOM is not set
-# BR2_PACKAGE_ASTERISK_CHANSCCP is not set
-# BR2_PACKAGE_ASTERISK_CHANBLUETOOTH is not set
-# BR2_PACKAGE_ASTERISK_RESCONV is not set
-# BR2_PACKAGE_ASTERISK_LOWMEMORY is not set
-# BR2_PACKAGE_ASTERISK_METERMAID is not set
-BR2_PACKAGE_ASTERISKNATIVESOUNDS=y
-BR2_PACKAGE_ASTERISKNATIVESOUNDS_ULAW=y
-# BR2_PACKAGE_ASTERISKNATIVESOUNDS_ALAW is not set
-# BR2_PACKAGE_ASTERISKNATIVESOUNDS_ILBC is not set
-# BR2_PACKAGE_ASTERISKNATIVESOUNDS_GSM is not set
-BR2_PACKAGE_ASTERISKNATIVESOUNDS_G729=y
-# BR2_PACKAGE_ASTERISKNATIVESOUNDS_SLN is not set
-# BR2_PACKAGE_ASTERISKAPPBUNDLE is not set
-# BR2_PACKAGE_ASTERISKMQUEUE is not set
-BR2_PACKAGE_ASTERISKAPPCONFERENCE=y
-BR2_PACKAGE_ASTERISKAPPCONFERENCE_G729HACK=y
-BR2_PACKAGE_DIGIUMG729=y
-# BR2_PACKAGE_VM-MESSENGER is not set
-BR2_PACKAGE_APCUPSD=y
-# BR2_PACKAGE_APPWEBB is not set
-BR2_PACKAGE_ASTMANPROXY=y
-# BR2_PACKAGE_AT is not set
-# BR2_PACKAGE_AUTOCONF is not set
-# BR2_PACKAGE_AUTOMAKE is not set
-BR2_PACKAGE_BC=y
-# BR2_PACKAGE_BERKELEYDB is not set
-# BR2_PACKAGE_BIND is not set
-# BR2_PACKAGE_BISON is not set
-# BR2_PACKAGE_BLUEZ is not set
-# BR2_PACKAGE_BOA is not set
-BR2_PACKAGE_BRIDGE=y
-# BR2_PACKAGE_CDP-SEND is not set
-# BR2_PACKAGE_CHANSCCP is not set
-# BR2_PACKAGE_CUSTOMIZE is not set
-# BR2_PACKAGE_ISC_DHCP is not set
-BR2_PACKAGE_DIALOG=y
-# BR2_PACKAGE_DIRECTFB is not set
-# BR2_PACKAGE_DISTCC is not set
-# BR2_PACKAGE_DM is not set
-BR2_PACKAGE_DNSMASQ=y
-# BR2_PACKAGE_DROPBEAR is not set
-# BR2_PACKAGE_EFAX is not set
-# BR2_PACKAGE_EXPAT is not set
-BR2_PACKAGE_E2FSPROGS=y
-# BR2_PACKAGE_FAKEROOT is not set
-# BR2_PACKAGE_FILE is not set
-# BR2_PACKAGE_FLITE is not set
-# BR2_PACKAGE_FREETYPE is not set
-# BR2_PACKAGE_GETTEXT is not set
-# BR2_PACKAGE_LIBINTL is not set
-# BR2_PACKAGE_LIBGMP is not set
-# BR2_PACKAGE_GZIP is not set
-# BR2_PACKAGE_HOSTAP is not set
-# BR2_PACKAGE_HOTPLUG is not set
-# BR2_PACKAGE_IAXMODEM is not set
-BR2_PACKAGE_IFTOP=y
-BR2_PACKAGE_INADYN=y
-# BR2_PACKAGE_IOSTAT is not set
-BR2_PACKAGE_IPROUTE2=y
-BR2_PACKAGE_IPSEC_TOOLS=y
-BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT=y
-BR2_PACKAGE_IPSEC_TOOLS_NATT=y
-BR2_PACKAGE_IPSEC_TOOLS_FRAG=y
-BR2_PACKAGE_IPSEC_TOOLS_STATS=y
-# BR2_PACKAGE_IPSEC_TOOLS_IPV6 is not set
-# BR2_PACKAGE_IPSEC_TOOLS_READLINE is not set
-BR2_PACKAGE_IPSEC_TOOLS_LIBS=y
-BR2_PACKAGE_IPTABLES=y
-# BR2_PACKAGE_JPEG is not set
-BR2_PACKAGE_KEXECTOOLS=y
-BR2_PACKAGE_LCDPROC=y
-# BR2_PACKAGE_LESS is not set
-# BR2_PACKAGE_LIBCGI is not set
-# BR2_PACKAGE_LIBCGICC is not set
-BR2_PACKAGE_LIBELF=y
-# BR2_PACKAGE_LIBFLOAT is not set
-BR2_PACKAGE_LIBFTDI=y
-# BR2_PACKAGE_LIBGLIB12 is not set
-BR2_PACKAGE_LIBMAD=y
-# BR2_PACKAGE_LIBNET is not set
-BR2_PACKAGE_LIBPCAP=y
-# BR2_PACKAGE_LIBPNG is not set
-# BR2_PACKAGE_LIBPQ is not set
-BR2_PACKAGE_LIBPRI=y
-BR2_PACKAGE_LIBSYSFS=y
-# BR2_PACKAGE_LIBTIFF is not set
-# BR2_PACKAGE_LIBTOOL is not set
-BR2_PACKAGE_LIBUSB=y
-# BR2_PACKAGE_LIGHTTPD is not set
-BR2_PACKAGE_LINKS=y
-BR2_PACKAGE_LMSENSORS=y
-# BR2_PACKAGE_LRZSZ is not set
-# BR2_PACKAGE_LTP-TESTSUITE is not set
-# BR2_PACKAGE_LTRACE is not set
-# BR2_PACKAGE_LTT is not set
-# BR2_PACKAGE_LVM2 is not set
-BR2_PACKAGE_LZO=y
-# BR2_PACKAGE_M4 is not set
-BR2_PACKAGE_MADWIFI=y
-# BR2_PACKAGE_MDADM is not set
-# BR2_PACKAGE_MDNSRESPONDER is not set
-# BR2_PACKAGE_MEMTESTER is not set
-# BR2_PACKAGE_MICROCOM is not set
-BR2_PACKAGE_MICROPERL=y
-# BR2_PACKAGE_MICROWIN is not set
-BR2_PACKAGE_MINIHTTPD=y
-BR2_PACKAGE_MKDOSFS=y
-BR2_PACKAGE_MODULE_INIT_TOOLS=y
-# BR2_PACKAGE_MODUTILS is not set
-# BR2_PACKAGE_LIBMPFR is not set
-# BR2_PACKAGE_MPG123 is not set
-# BR2_PACKAGE_MROUTED is not set
-BR2_PACKAGE_MSMTP=y
-# BR2_PACKAGE_MTD is not set
-BR2_PACKAGE_NANO=y
-BR2_PACKAGE_NCURSES=y
-# BR2_PACKAGE_NCURSES_TARGET_HEADERS is not set
-# BR2_PACKAGE_NETKITBASE is not set
-# BR2_PACKAGE_NETKITTELNET is not set
-BR2_PACKAGE_NETPLUG=y
-BR2_PACKAGE_NETSNMP=y
-BR2_PACKAGE_NEWT=y
-BR2_PACKAGE_NISTNET=y
-# BR2_PACKAGE_NOCATSPLASH is not set
-# BR2_PACKAGE_NTP is not set
-BR2_PACKAGE_OPENNTPD=y
-BR2_PACKAGE_OPENSER=y
-BR2_PACKAGE_OPENSER_RTPPROXY=y
-BR2_PACKAGE_OPENSSH=y
-BR2_PACKAGE_OPENSSL=y
-# BR2_PACKAGE_OPENSSL_TARGET_HEADERS is not set
-BR2_PACKAGE_OPENVPN=y
-BR2_PACKAGE_PCIUTILS=y
-# BR2_PACKAGE_PCMCIA is not set
-BR2_PACKAGE_PHP4=y
-# BR2_PACKAGE_PIKA_AOB is not set
-# BR2_PACKAGE_PORTAGE is not set
-# BR2_PACKAGE_PORTMAP is not set
-BR2_PACKAGE_PPPD=y
-# BR2_PACKAGE_PPTPD is not set
-# BR2_PACKAGE_PROCPS is not set
-# BR2_PACKAGE_PSMISC is not set
-# BR2_PACKAGE_PYTHON is not set
-# BR2_PACKAGE_QTE is not set
-BR2_QTE_TMAKE_VERSION="1.13"
-# BR2_PACKAGE_QUAGGA is not set
-# BR2_PACKAGE_RAIDTOOLS is not set
-# BR2_READLINE is not set
-# BR2_PACKAGE_RESCONV is not set
-# BR2_PACKAGE_RHINO is not set
-BR2_PACKAGE_RP-PPPOE=y
-BR2_PACKAGE_RSYNC=y
-# BR2_PACKAGE_RUBY is not set
-# BR2_PACKAGE_RXVT is not set
-# BR2_PACKAGE_SAMBA is not set
-# BR2_PACKAGE_SCHEDUTILS is not set
-BR2_PACKAGE_SCREEN=y
-# BR2_PACKAGE_SDL is not set
-BR2_PACKAGE_SFDISK=y
-# BR2_PACKAGE_SLANG is not set
-# BR2_PACKAGE_SMARTMONTOOLS is not set
-# BR2_PACKAGE_SOCAT is not set
-BR2_PACKAGE_SOX=y
-BR2_PACKAGE_SOX_LIBMAD=y
-# BR2_PACKAGE_SPANDSP is not set
-# BR2_PACKAGE_SQLITE is not set
-BR2_PACKAGE_STRACE=y
-BR2_PACKAGE_STUNNEL=y
-BR2_PACKAGE_SYSFSUTILS=y
-# BR2_PACKAGE_SYSKLOGD is not set
-# BR2_PACKAGE_SYSVINIT is not set
-# BR2_PACKAGE_TCL is not set
-BR2_PACKAGE_TCPDUMP=y
-# BR2_PACKAGE_DHCPDUMP is not set
-BR2_PACKAGE_TFTPD=y
-# BR2_PACKAGE_THTTPD is not set
-# BR2_PACKAGE_TINYLOGIN is not set
-# BR2_PACKAGE_TINYX is not set
-# BR2_PACKAGE_TN5250 is not set
-BR2_PACKAGE_TTCP=y
-# BR2_PACKAGE_UDEV is not set
-# BR2_PACKAGE_UDHCP is not set
-BR2_PACKAGE_USBUTILS=y
-# BR2_PACKAGE_UTIL-LINUX is not set
-# BR2_PACKAGE_VALGRIND is not set
-BR2_PACKAGE_VSFTPD=y
-# BR2_PACKAGE_VTUN is not set
-BR2_PACKAGE_WANPIPE=y
-# BR2_PACKAGE_WGET is not set
-# BR2_PACKAGE_WHICH is not set
-# BR2_PACKAGE_WIPE is not set
-BR2_PACKAGE_WIRELESS_TOOLS=y
-# BR2_PACKAGE_XFSPROGS is not set
-# BR2_PACKAGE_XORG is not set
-BR2_PACKAGE_ZAPTEL=y
-BR2_PACKAGE_ZLIB=y
-# BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set
-BR2_PACKAGE_ZONEINFO=y
-
-#
-# Target Options
-#
-
-#
-# filesystem for target device
-#
-# BR2_TARGET_ROOTFS_CRAMFS is not set
-# BR2_TARGET_ROOTFS_CLOOP is not set
-# BR2_TARGET_ROOTFS_EXT2 is not set
-# BR2_TARGET_ROOTFS_JFFS2 is not set
-BR2_TARGET_ROOTFS_SQUASHFS=y
-# BR2_TARGET_ROOTFS_TAR is not set
-
-#
-# bootloader for target device
-#
-BR2_TARGET_GRUB=y
-# BR2_TARGET_GRUB_SPLASH is not set
-# BR2_TARGET_GRUB_DISKLESS is not set
-# BR2_TARGET_GRUB_3c595 is not set
-# BR2_TARGET_GRUB_3c90x is not set
-# BR2_TARGET_GRUB_davicom is not set
-# BR2_TARGET_GRUB_e1000 is not set
-# BR2_TARGET_GRUB_eepro100 is not set
-# BR2_TARGET_GRUB_epic100 is not set
-# BR2_TARGET_GRUB_forcedeth is not set
-# BR2_TARGET_GRUB_natsemi is not set
-# BR2_TARGET_GRUB_ns83820 is not set
-# BR2_TARGET_GRUB_ns8390 is not set
-# BR2_TARGET_GRUB_pcnet32 is not set
-# BR2_TARGET_GRUB_pnic is not set
-# BR2_TARGET_GRUB_rtl8139 is not set
-# BR2_TARGET_GRUB_r8169 is not set
-# BR2_TARGET_GRUB_sis900 is not set
-# BR2_TARGET_GRUB_tg3 is not set
-# BR2_TARGET_GRUB_tulip is not set
-# BR2_TARGET_GRUB_tlan is not set
-# BR2_TARGET_GRUB_undi is not set
-# BR2_TARGET_GRUB_via_rhine is not set
-# BR2_TARGET_GRUB_w89c840 is not set
-# BR2_TARGET_SYSLINUX is not set
-
-#
-# make initrd
-#
-BR2_INITRD_ROOTFS_EXT2=y
-BR2_INITRD_ROOTFS_EXT2_BLOCKS=0
-BR2_INITRD_ROOTFS_EXT2_INODES=0
-BR2_INITRD_ROOTFS_EXT2_RESBLKS=0
-BR2_INITRD_ROOTFS_EXT2_SQUASH=y
-BR2_INITRD_ROOTFS_EXT2_OUTPUT="initrd.img"
-BR2_INITRD_ROOTFS_EXT2_GZ=y
-BR2_INITRD_ROOTFS_EXT2_COPYTO=""
-
-#
-# make bootable iso
-#
-BR2_TARGET_ISO=y
-
-#
-# AstLinux Target Device
-#
-# BR2_TARGET_GENI586 is not set
-# BR2_TARGET_GUMSTIX_BASIXCONNEX is not set
-# BR2_TARGET_GUMSTIX_NETSTIX is not set
-# BR2_TARGET_SOEKRIS_NET4801 is not set
-BR2_TARGET_VIA=y
-# BR2_TARGET_PCENGINES_WRAP is not set
-# BR2_TARGET_RT is not set
-BR2_PACKAGE_LINUX=y
-BR2_TARGET_VIA_SERIAL=y
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2007-04-18 23:00:51
|
Revision: 873
http://svn.sourceforge.net/astlinux/?rev=873&view=rev
Author: krisk84
Date: 2007-04-18 16:00:51 -0700 (Wed, 18 Apr 2007)
Log Message:
-----------
upgrade to binutils 2.17.50.0.14
Modified Paths:
--------------
trunk/astlinux.config
trunk/toolchain/binutils/Config.in
Added Paths:
-----------
trunk/toolchain/binutils/2.17.50.0.14/
trunk/toolchain/binutils/2.17.50.0.14/100-uclibc-conf.patch
trunk/toolchain/binutils/2.17.50.0.14/110-arm-eabi-conf.patch
trunk/toolchain/binutils/2.17.50.0.14/300-001_ld_makefile_patch.patch
trunk/toolchain/binutils/2.17.50.0.14/300-012_check_ldrunpath_length.patch
Modified: trunk/astlinux.config
===================================================================
--- trunk/astlinux.config 2007-04-18 22:32:32 UTC (rev 872)
+++ trunk/astlinux.config 2007-04-18 23:00:51 UTC (rev 873)
@@ -60,7 +60,7 @@
# BR2_BINUTILS_VERSION_2_16_90_0_3 is not set
# BR2_BINUTILS_VERSION_2_16_91_0_5 is not set
# BR2_BINUTILS_VERSION_2_16_91_0_6 is not set
-BR2_BINUTILS_VERSION_2_16_91_0_7=y
+# BR2_BINUTILS_VERSION_2_16_91_0_7 is not set
# BR2_BINUTILS_VERSION_2_17 is not set
# BR2_BINUTILS_VERSION_2_17_50_0_2 is not set
# BR2_BINUTILS_VERSION_2_17_50_0_3 is not set
@@ -71,7 +71,8 @@
# BR2_BINUTILS_VERSION_2_17_50_0_8 is not set
# BR2_BINUTILS_VERSION_2_17_50_0_9 is not set
# BR2_BINUTILS_VERSION_2_17_50_0_10 is not set
-BR2_BINUTILS_VERSION="2.16.91.0.7"
+BR2_BINUTILS_VERSION_2_17_50_0_14=y
+BR2_BINUTILS_VERSION="2.17.50.0.14"
BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""
#
@@ -219,6 +220,7 @@
# BR2_PACKAGE_EXPAT is not set
BR2_PACKAGE_E2FSPROGS=y
# BR2_PACKAGE_FAKEROOT is not set
+# BR2_HOST_FAKEROUTE is not set
# BR2_PACKAGE_FILE is not set
# BR2_PACKAGE_FLITE is not set
# BR2_PACKAGE_FREETYPE is not set
Added: trunk/toolchain/binutils/2.17.50.0.14/100-uclibc-conf.patch
===================================================================
--- trunk/toolchain/binutils/2.17.50.0.14/100-uclibc-conf.patch (rev 0)
+++ trunk/toolchain/binutils/2.17.50.0.14/100-uclibc-conf.patch 2007-04-18 23:00:51 UTC (rev 873)
@@ -0,0 +1,139 @@
+--- binutils-2.16.91.0.7/bfd/configure
++++ binutils-2.16.91.0.7/bfd/configure
+@@ -3576,7 +3576,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux-gnu*)
++linux-gnu*|linux-uclibc*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+--- binutils-2.16.91.0.7/binutils/configure
++++ binutils-2.16.91.0.7/binutils/configure
+@@ -3411,7 +3411,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux-gnu*)
++linux-gnu*|linux-uclibc*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+--- binutils-2.16.91.0.7/configure
++++ binutils-2.16.91.0.7/configure
+@@ -1270,7 +1270,7 @@
+ am33_2.0-*-linux*)
+ noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
+ ;;
+- sh-*-linux*)
++ sh*-*-linux*)
+ noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
+ ;;
+ sh*-*-pe|mips*-*-pe|*arm-wince-pe)
+@@ -1578,7 +1578,7 @@
+ romp-*-*)
+ noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}"
+ ;;
+- sh-*-* | sh64-*-*)
++ sh*-*-* | sh64-*-*)
+ case "${host}" in
+ i[3456789]86-*-vsta) ;; # don't add gprof back in
+ i[3456789]86-*-go32*) ;; # don't add gprof back in
+--- binutils-2.16.91.0.7/configure.ac
++++ binutils-2.16.91.0.7/configure.ac
+@@ -468,7 +468,7 @@
+ am33_2.0-*-linux*)
+ noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
+ ;;
+- sh-*-linux*)
++ sh*-*-linux*)
+ noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
+ ;;
+ sh*-*-pe|mips*-*-pe|*arm-wince-pe)
+@@ -776,7 +776,7 @@
+ romp-*-*)
+ noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}"
+ ;;
+- sh-*-* | sh64-*-*)
++ sh*-*-* | sh64-*-*)
+ case "${host}" in
+ i[[3456789]]86-*-vsta) ;; # don't add gprof back in
+ i[[3456789]]86-*-go32*) ;; # don't add gprof back in
+--- binutils-2.16.91.0.7/gas/configure
++++ binutils-2.16.91.0.7/gas/configure
+@@ -3411,7 +3411,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux-gnu*)
++linux-gnu*|linux-uclibc*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+--- binutils-2.16.91.0.7/gprof/configure
++++ binutils-2.16.91.0.7/gprof/configure
+@@ -3419,6 +3419,11 @@
+ lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+ ;;
+
++linux-uclibc*)
++ lt_cv_deplibs_check_method=pass_all
++ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
++ ;;
++
+ netbsd* | knetbsd*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+ lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
+--- binutils-2.16.91.0.7/ld/configure
++++ binutils-2.16.91.0.7/ld/configure
+@@ -3413,7 +3413,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux-gnu*)
++linux-gnu*|linux-uclibc*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+--- binutils-2.16.91.0.7/libtool.m4
++++ binutils-2.16.91.0.7/libtool.m4
+@@ -739,7 +739,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux-gnu*)
++linux-gnu*|linux-uclibc*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+--- binutils-2.16.91.0.7/ltconfig
++++ binutils-2.16.91.0.7/ltconfig
+@@ -602,6 +602,7 @@
+
+ # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
+ case $host_os in
++linux-uclibc*) ;;
+ linux-gnu*) ;;
+ linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
+ esac
+@@ -1247,7 +1248,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux-gnu*)
++linux-gnu*|linux-uclibc*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+--- binutils-2.16.91.0.7/opcodes/configure
++++ binutils-2.16.91.0.7/opcodes/configure
+@@ -3579,7 +3579,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux-gnu*)
++linux-gnu*|linux-uclibc*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
Added: trunk/toolchain/binutils/2.17.50.0.14/110-arm-eabi-conf.patch
===================================================================
--- trunk/toolchain/binutils/2.17.50.0.14/110-arm-eabi-conf.patch (rev 0)
+++ trunk/toolchain/binutils/2.17.50.0.14/110-arm-eabi-conf.patch 2007-04-18 23:00:51 UTC (rev 873)
@@ -0,0 +1,24 @@
+diff -urN binutils-2.16.91.0.7.orig/configure binutils-2.16.91.0.7/configure
+--- binutils-2.16.91.0.7.orig/configure 2006-05-31 14:54:24.000000000 +0300
++++ binutils-2.16.91.0.7/configure 2006-05-31 14:55:53.000000000 +0300
+@@ -1299,7 +1299,7 @@
+ arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* )
+ noconfigdirs="$noconfigdirs target-libffi target-qthreads"
+ ;;
+- arm*-*-linux-gnueabi)
++ arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi)
+ noconfigdirs="$noconfigdirs target-libffi target-qthreads"
+ noconfigdirs="$noconfigdirs target-libjava target-libobjc"
+ ;;
+diff -urN binutils-2.16.91.0.7.orig/configure.ac binutils-2.16.91.0.7/configure.ac
+--- binutils-2.16.91.0.7.orig/configure.ac 2006-05-31 14:54:24.000000000 +0300
++++ binutils-2.16.91.0.7/configure.ac 2006-05-31 14:55:53.000000000 +0300
+@@ -497,7 +497,7 @@
+ arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* )
+ noconfigdirs="$noconfigdirs target-libffi target-qthreads"
+ ;;
+- arm*-*-linux-gnueabi)
++ arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi)
+ noconfigdirs="$noconfigdirs target-libffi target-qthreads"
+ noconfigdirs="$noconfigdirs target-libjava target-libobjc"
+ ;;
Added: trunk/toolchain/binutils/2.17.50.0.14/300-001_ld_makefile_patch.patch
===================================================================
--- trunk/toolchain/binutils/2.17.50.0.14/300-001_ld_makefile_patch.patch (rev 0)
+++ trunk/toolchain/binutils/2.17.50.0.14/300-001_ld_makefile_patch.patch 2007-04-18 23:00:51 UTC (rev 873)
@@ -0,0 +1,50 @@
+#!/bin/sh -e
+## 001_ld_makefile_patch.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: correct where ld scripts are installed
+## DP: Author: Chris Chimelis <ch...@de...>
+## DP: Upstream status: N/A
+## DP: Date: ??
+
+if [ $# -ne 1 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+ -patch) patch $patch_opts -p1 < $0;;
+ -unpatch) patch $patch_opts -p1 -R < $0;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- binutils-2.16.91.0.1/ld/Makefile.am
++++ binutils-2.16.91.0.1/ld/Makefile.am
+@@ -20,7 +20,7 @@
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+
+ EMUL = @EMUL@
+ EMULATION_OFILES = @EMULATION_OFILES@
+--- binutils-2.16.91.0.1/ld/Makefile.in
++++ binutils-2.16.91.0.1/ld/Makefile.in
+@@ -268,7 +268,7 @@
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ BASEDIR = $(srcdir)/..
+ BFDDIR = $(BASEDIR)/bfd
+ INCDIR = $(BASEDIR)/include
Added: trunk/toolchain/binutils/2.17.50.0.14/300-012_check_ldrunpath_length.patch
===================================================================
--- trunk/toolchain/binutils/2.17.50.0.14/300-012_check_ldrunpath_length.patch (rev 0)
+++ trunk/toolchain/binutils/2.17.50.0.14/300-012_check_ldrunpath_length.patch 2007-04-18 23:00:51 UTC (rev 873)
@@ -0,0 +1,47 @@
+#!/bin/sh -e
+## 012_check_ldrunpath_length.dpatch by Chris Chimelis <ch...@de...>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Only generate an RPATH entry if LD_RUN_PATH is not empty, for
+## DP: cases where -rpath isn't specified. (#151024)
+
+if [ $# -ne 1 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+ -patch) patch $patch_opts -p1 < $0;;
+ -unpatch) patch $patch_opts -p1 -R < $0;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em binutils-2.15/ld/emultempl/elf32.em
+--- /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em 2004-05-21 23:12:58.000000000 +0100
++++ binutils-2.15/ld/emultempl/elf32.em 2004-05-21 23:12:59.000000000 +0100
+@@ -692,6 +692,8 @@
+ && command_line.rpath == NULL)
+ {
+ lib_path = (const char *) getenv ("LD_RUN_PATH");
++ if ((lib_path) && (strlen (lib_path) == 0))
++ lib_path = NULL;
+ if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
+ force))
+ break;
+@@ -871,6 +873,8 @@
+ rpath = command_line.rpath;
+ if (rpath == NULL)
+ rpath = (const char *) getenv ("LD_RUN_PATH");
++ if ((rpath) && (strlen (rpath) == 0))
++ rpath = NULL;
+ if (! (bfd_elf_size_dynamic_sections
+ (output_bfd, command_line.soname, rpath,
+ command_line.filter_shlib,
Modified: trunk/toolchain/binutils/Config.in
===================================================================
--- trunk/toolchain/binutils/Config.in 2007-04-18 22:32:32 UTC (rev 872)
+++ trunk/toolchain/binutils/Config.in 2007-04-18 23:00:51 UTC (rev 873)
@@ -4,7 +4,7 @@
choice
prompt "Binutils Version"
- default BR2_BINUTILS_VERSION_2_16_91_0_7
+ default BR2_BINUTILS_VERSION_2_17
help
Select the version of binutils you wish to use.
@@ -80,6 +80,9 @@
depends !BR2_nios2
bool "binutils 2.17.50.0.10"
+ config BR2_BINUTILS_VERSION_2_17_50_0_14
+ depends !BR2_nios2
+ bool "binutils 2.17.50.0.14"
endchoice
config BR2_BINUTILS_VERSION
@@ -102,6 +105,7 @@
default "2.17.50.0.8" if BR2_BINUTILS_VERSION_2_17_50_0_8
default "2.17.50.0.9" if BR2_BINUTILS_VERSION_2_17_50_0_9
default "2.17.50.0.10" if BR2_BINUTILS_VERSION_2_17_50_0_10
+ default "2.17.50.0.14" if BR2_BINUTILS_VERSION_2_17_50_0_14
config BR2_EXTRA_BINUTILS_CONFIG_OPTIONS
string "Additional binutils options"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2007-04-19 16:20:23
|
Revision: 896
http://svn.sourceforge.net/astlinux/?rev=896&view=rev
Author: krisk84
Date: 2007-04-19 09:20:25 -0700 (Thu, 19 Apr 2007)
Log Message:
-----------
merge fixes from s2s branch
Modified Paths:
--------------
trunk/package/bash/bash.mk
trunk/package/flex/flex.mk
trunk/package/libelf/libelf.mk
trunk/package/libpri/libpri.mk
trunk/package/minihttpd/minihttpd.mk
trunk/package/netsnmp/netsnmp.mk
trunk/package/nistnet/nistnet.mk
trunk/package/openntpd/openntpd.mk
trunk/package/stunnel/stunnel.mk
trunk/toolchain/getter_script.sh
Added Paths:
-----------
trunk/target/x86/grub/grub.400-nic_update2.patch.bz2
trunk/target/x86/grub/splash.xpm.gz
Removed Paths:
-------------
trunk/target/x86/grub/grub.100-autoreconf.patch
Modified: trunk/package/bash/bash.mk
===================================================================
--- trunk/package/bash/bash.mk 2007-04-19 15:59:24 UTC (rev 895)
+++ trunk/package/bash/bash.mk 2007-04-19 16:20:25 UTC (rev 896)
@@ -62,8 +62,8 @@
(cd $(TARGET_DIR)/bin; /bin/ln -fs bash sh)
rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
- $(STRIP) $(TARGET_DIR)/usr/bin/bash
- $(STRIP) $(TARGET_DIR)/usr/bin/bashbug
+ $(STRIP) $(TARGET_DIR)/bin/bash
+ $(STRIP) $(TARGET_DIR)/bin/bashbug
#If both bash and busybox are selected, make certain bash wins
#the fight over who gets to own the /bin/sh symlink
Modified: trunk/package/flex/flex.mk
===================================================================
--- trunk/package/flex/flex.mk 2007-04-19 15:59:24 UTC (rev 895)
+++ trunk/package/flex/flex.mk 2007-04-19 16:20:25 UTC (rev 896)
@@ -4,7 +4,6 @@
#
#############################################################
FLEX_SOURCE:=flex_2.5.4a.orig.tar.gz
-FLEX_PATCH:=flex_2.5.4a-24.diff.gz
FLEX_SITE:=http://ftp.debian.org/debian/pool/main/f/flex
FLEX_DIR:=$(BUILD_DIR)/flex-2.5.4
FLEX_CAT:=zcat
@@ -14,14 +13,10 @@
$(DL_DIR)/$(FLEX_SOURCE):
$(WGET) -P $(DL_DIR) $(FLEX_SITE)/$(FLEX_SOURCE)
-$(DL_DIR)/$(FLEX_PATCH):
- $(WGET) -P $(DL_DIR) $(FLEX_SITE)/$(FLEX_PATCH)
+flex-source: $(DL_DIR)/$(FLEX_SOURCE)
-flex-source: $(DL_DIR)/$(FLEX_SOURCE) $(DL_DIR)/$(FLEX_PATCH)
-
$(FLEX_DIR)/.unpacked: $(DL_DIR)/$(FLEX_SOURCE) $(DL_DIR)/$(FLEX_PATCH)
$(FLEX_CAT) $(DL_DIR)/$(FLEX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- #toolchain/patch-kernel.sh $(FLEX_DIR) $(DL_DIR) $(FLEX_PATCH)
touch $(FLEX_DIR)/.unpacked
$(FLEX_DIR)/.configured: $(FLEX_DIR)/.unpacked
@@ -49,49 +44,48 @@
$(FLEX_DIR)/$(FLEX_BINARY): $(FLEX_DIR)/.configured
$(MAKE1) -C $(FLEX_DIR)
+ touch -c $(FLEX_DIR)/$(FLEX_BINARY)
-$(TARGET_DIR)/$(FLEX_TARGET_BINARY): $(FLEX_DIR)/$(FLEX_BINARY)
+$(STAGING_DIR)/$(FLEX_TARGET_BINARY): $(FLEX_DIR)/$(FLEX_BINARY)
$(MAKE1) \
- prefix=$(TARGET_DIR)/usr \
- exec_prefix=$(TARGET_DIR)/usr \
- bindir=$(TARGET_DIR)/usr/bin \
- sbindir=$(TARGET_DIR)/usr/sbin \
- libexecdir=$(TARGET_DIR)/usr/lib \
- datadir=$(TARGET_DIR)/usr/share \
- sysconfdir=$(TARGET_DIR)/etc \
- sharedstatedir=$(TARGET_DIR)/usr/com \
- localstatedir=$(TARGET_DIR)/var \
- libdir=$(TARGET_DIR)/usr/lib \
- infodir=$(TARGET_DIR)/usr/info \
- mandir=$(TARGET_DIR)/usr/man \
- includedir=$(TARGET_DIR)/usr/include \
+ prefix=$(STAGING_DIR)/usr \
+ exec_prefix=$(STAGING_DIR)/usr \
+ bindir=$(STAGING_DIR)/usr/bin \
+ sbindir=$(STAGING_DIR)/usr/sbin \
+ libexecdir=$(STAGING_DIR)/usr/lib \
+ datadir=$(STAGING_DIR)/usr/share \
+ sysconfdir=$(STAGING_DIR)/etc \
+ sharedstatedir=$(STAGING_DIR)/usr/com \
+ localstatedir=$(STAGING_DIR)/var \
+ libdir=$(STAGING_DIR)/usr/lib \
+ infodir=$(STAGING_DIR)/usr/info \
+ mandir=$(STAGING_DIR)/usr/man \
+ includedir=$(STAGING_DIR)/usr/include \
-C $(FLEX_DIR) install
ifeq ($(strip $(BR2_PACKAGE_FLEX_LIBFL)),y)
install -D $(FLEX_DIR)/libfl.a $(STAGING_DIR)/lib/libfl.a
endif
- rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
- $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc $(TARGET_DIR)/usr/include
- (cd $(TARGET_DIR)/usr/bin; rm flex flex++)
+ touch -c $(STAGING_DIR)/$(FLEX_TARGET_BINARY)
-flex: uclibc $(TARGET_DIR)/$(FLEX_TARGET_BINARY)
+flex: uclibc $(STAGING_DIR)/$(FLEX_TARGET_BINARY)
flex-clean:
$(MAKE) \
- prefix=$(TARGET_DIR)/usr \
- exec_prefix=$(TARGET_DIR)/usr \
- bindir=$(TARGET_DIR)/usr/bin \
- sbindir=$(TARGET_DIR)/usr/sbin \
- libexecdir=$(TARGET_DIR)/usr/lib \
- datadir=$(TARGET_DIR)/usr/share \
- sysconfdir=$(TARGET_DIR)/etc \
- sharedstatedir=$(TARGET_DIR)/usr/com \
- localstatedir=$(TARGET_DIR)/var \
- libdir=$(TARGET_DIR)/usr/lib \
- infodir=$(TARGET_DIR)/usr/info \
- mandir=$(TARGET_DIR)/usr/man \
- includedir=$(TARGET_DIR)/usr/include \
+ prefix=$(STAGING_DIR)/usr \
+ exec_prefix=$(STAGING_DIR)/usr \
+ bindir=$(STAGING_DIR)/usr/bin \
+ sbindir=$(STAGING_DIR)/usr/sbin \
+ libexecdir=$(STAGING_DIR)/usr/lib \
+ datadir=$(STAGING_DIR)/usr/share \
+ sysconfdir=$(STAGING_DIR)/etc \
+ sharedstatedir=$(STAGING_DIR)/usr/com \
+ localstatedir=$(STAGING_DIR)/var \
+ libdir=$(STAGING_DIR)/usr/lib \
+ infodir=$(STAGING_DIR)/usr/info \
+ mandir=$(STAGING_DIR)/usr/man \
+ includedir=$(STAGING_DIR)/usr/include \
-C $(FLEX_DIR) uninstall
- rm -f $(TARGET_DIR)/usr/bin/lex
+ rm -f $(TARGET_DIR)/usr/bin/flex
ifeq ($(strip $(BR2_PACKAGE_FLEX_LIBFL)),y)
-rm $(STAGING_DIR)/lib/libfl.a
endif
Modified: trunk/package/libelf/libelf.mk
===================================================================
--- trunk/package/libelf/libelf.mk 2007-04-19 15:59:24 UTC (rev 895)
+++ trunk/package/libelf/libelf.mk 2007-04-19 16:20:25 UTC (rev 896)
@@ -35,17 +35,16 @@
);
touch $(LIBELF_DIR)/.configured;
-$(LIBELF_DIR)/libelf.so.$(LIBELF_VER): $(LIBELF_DIR)/.configured
+$(LIBELF_DIR)/lib/libelf.a: $(LIBELF_DIR)/.configured
$(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(LIBELF_DIR)
-$(STAGING_DIR)/usr/lib/libelf.a: $(LIBELF_DIR)/libelf.so.$(LIBELF_VER)
+$(STAGING_DIR)/usr/lib/libelf.a: $(LIBELF_DIR)/lib/libelf.a
$(MAKE1) $(TARGET_CONFIGURE_OPTS) ${INSTALL}="install -D" \
instroot=$(STAGING_DIR) -C $(LIBELF_DIR) install
+ touch -c $(STAGING_DIR)/usr/lib/libelf.a
-$(TARGET_DIR)/usr/lib/libelf.so.$(LIBELF_VER): $(STAGING_DIR)/usr/lib/libelf.a
+libelf: uclibc $(STAGING_DIR)/usr/lib/libelf.a
-libelf: uclibc $(TARGET_DIR)/usr/lib/libelf.so.$(LIBELF_VER)
-
libelf-source: $(DL_DIR)/$(LIBELF_SOURCE)
libelf-clean:
Modified: trunk/package/libpri/libpri.mk
===================================================================
--- trunk/package/libpri/libpri.mk 2007-04-19 15:59:24 UTC (rev 895)
+++ trunk/package/libpri/libpri.mk 2007-04-19 16:20:25 UTC (rev 896)
@@ -8,7 +8,7 @@
LIBPRI_SITE := ftp://ftp.digium.com/pub/libpri/releases
LIBPRI_DIR := $(BUILD_DIR)/libpri-$(LIBPRI_VERSION)
LIBPRI_BINARY := libpri.so.1.0
-LIBPRI_TARGET_BINARY := usr/lib/libpri.so.1.0
+LIBPRI_TARGET_BINARY := lib/libpri.so.1.0
$(DL_DIR)/$(LIBPRI_SOURCE):
$(WGET) -P $(DL_DIR) $(LIBPRI_SITE)/$(LIBPRI_SOURCE)
@@ -39,7 +39,7 @@
libpri-clean:
rm -Rf $(STAGING_DIR)/include/libpri.h
rm -Rf $(STAGING_DIR)/usr/lib/libpri*
- rm -Rf $(TARGET_DIR)/usr/lib/libpri*
+ rm -Rf $(TARGET_DIR)/lib/libpri*
-$(MAKE) -C $(LIBPRI_DIR) clean
libpri-dirclean:
Modified: trunk/package/minihttpd/minihttpd.mk
===================================================================
--- trunk/package/minihttpd/minihttpd.mk 2007-04-19 15:59:24 UTC (rev 895)
+++ trunk/package/minihttpd/minihttpd.mk 2007-04-19 16:20:25 UTC (rev 896)
@@ -9,7 +9,7 @@
MINIHTTPD_DIR:=$(BUILD_DIR)/mini_httpd-$(MINIHTTPD_VER)
MINIHTTPD_CAT:=zcat
MINIHTTPD_BINARY:=mini_httpd
-MINIHTTPD_TARGET_BINARY:=sbin/mini_httpd
+MINIHTTPD_TARGET_BINARY:=usr/sbin/mini_httpd
MINIHTTPD_ROOT:=/stat/var
MINIHTTPD_WEB_DIR:=$(MINIHTTPD_ROOT)/www
@@ -25,17 +25,20 @@
touch $(MINIHTTPD_DIR)/.configured
$(MINIHTTPD_DIR)/$(MINIHTTPD_BINARY): $(MINIHTTPD_DIR)/.configured
- $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) SSL_DEFS=-DUSE_SSL SSL_INC=-I$(STAGING_DIR)/include/openssl \
+ $(MAKE) $(TARGET_CONFIGURE_OPTS)SSL_DEFS=-DUSE_SSL SSL_INC=-I$(STAGING_DIR)/include/openssl \
SSL_LIBS="-L$(STAGING_DIR)/lib -lssl -lcrypto" -C $(MINIHTTPD_DIR)
+ touch -c $(MINIHTTPD_DIR)/$(MINIHTTPD_BINARY)
-
$(TARGET_DIR)/$(MINIHTTPD_TARGET_BINARY): $(MINIHTTPD_DIR)/$(MINIHTTPD_BINARY)
- $(INSTALL) -D $(MINIHTTPD_DIR)/$(MINIHTTPD_BINARY) $(TARGET_DIR)/usr/$(MINIHTTPD_TARGET_BINARY)
+ $(INSTALL) -D $(MINIHTTPD_DIR)/$(MINIHTTPD_BINARY) $(TARGET_DIR)/$(MINIHTTPD_TARGET_BINARY)
$(INSTALL) -D $(MINIHTTPD_DIR)/htpasswd $(TARGET_DIR)/usr/bin/htpasswd
+ $(STRIP) $(TARGET_DIR)/$(MINIHTTPD_TARGET_BINARY)
+ $(STRIP) $(TARGET_DIR)/usr/bin/htpasswd
mkdir -p $(TARGET_DIR)/stat/var
rsync -a --exclude=".svn" package/minihttpd/www $(TARGET_DIR)/stat/var/
$(INSTALL) -D -m 0755 package/minihttpd/mini_httpd.init $(TARGET_DIR)/etc/init.d/mini_httpd
ln -sf /tmp/etc/mini_httpd.conf $(TARGET_DIR)/etc/mini_httpd.conf
+ touch -c $(TARGET_DIR)/$(MINIHTTPD_TARGET_BINARY)
minihttpd: uclibc $(TARGET_DIR)/$(MINIHTTPD_TARGET_BINARY)
Modified: trunk/package/netsnmp/netsnmp.mk
===================================================================
--- trunk/package/netsnmp/netsnmp.mk 2007-04-19 15:59:24 UTC (rev 895)
+++ trunk/package/netsnmp/netsnmp.mk 2007-04-19 16:20:25 UTC (rev 896)
@@ -60,9 +60,6 @@
--mandir=/usr/man \
--infodir=/usr/info \
);
-
-
-
touch $(NETSNMP_DIR)/.configured
$(NETSNMP_DIR)/agent/snmpd: $(NETSNMP_DIR)/.configured
@@ -93,6 +90,7 @@
cp $(NETSNMP_DIR)/agent/mibgroup/util_funcs.h $(STAGING_DIR)/include/net-snmp
cp $(NETSNMP_DIR)/agent/mibgroup/mibincl.h $(STAGING_DIR)/include/net-snmp/library
cp $(NETSNMP_DIR)/agent/mibgroup/header_complex.h $(STAGING_DIR)/include/net-snmp/agent
+ touch -c $(TARGET_DIR)/usr/sbin/snmpd
netsnmp: uclibc openssl $(LMSENSORS) $(TARGET_DIR)/usr/sbin/snmpd
Modified: trunk/package/nistnet/nistnet.mk
===================================================================
--- trunk/package/nistnet/nistnet.mk 2007-04-19 15:59:24 UTC (rev 895)
+++ trunk/package/nistnet/nistnet.mk 2007-04-19 16:20:25 UTC (rev 896)
@@ -8,8 +8,8 @@
NISTNET_SOURCE := nistnet.2.0.12c.tar.gz
NISTNET_SITE := http://www-x.antd.nist.gov/nistnet/dist
NISTNET_DIR := $(BUILD_DIR)/nistnet-$(NISTNET_VERSION)
-NISTNET_BINARY := kernel/nistnet.ko
-NISTNET_TARGET_BINARY := lib/modules/$(LINUX_VER)/misc/nistnet.ko
+NISTNET_BINARY := cli/cnistnet
+NISTNET_TARGET_BINARY := usr/sbin/cnistnet
$(DL_DIR)/$(NISTNET_SOURCE):
$(WGET) -P $(DL_DIR) $(NISTNET_SITE)/$(NISTNET_SOURCE)
@@ -29,25 +29,20 @@
$(MAKE1) -C $(NISTNET_DIR) CC=$(TARGET_CC) TOPDIR=$(BUILD_DIR)/linux KDIR=$(BUILD_DIR)/linux \
$(TARGET_CONFIGURE_OPTS) SUB_DIRS="math lib cli kernel" HOSTCC=gcc
-$(TARGET_DIR)/lib/modules/$(LINUX_VER)/misc/nistnet.ko: $(NISTNET_DIR)/$(NISTNET_BINARY)
- $(INSTALL) -D -m 0755 $(NISTNET_DIR)/cli/cnistnet $(TARGET_DIR)/usr/sbin/cnistnet
+$(TARGET_DIR)/$(NISTNET_TARGET_BINARY): $(NISTNET_DIR)/$(NISTNET_BINARY)
$(INSTALL) -D -m 0755 $(NISTNET_DIR)/cli/hitbox $(TARGET_DIR)/usr/sbin/hitbox
- # $(INSTALL) -D -m 0755 $(NISTNET_DIR)/cli/mungebox $(TARGET_DIR)/usr/sbin/mungebox
- # $(INSTALL) -D -m 0755 $(NISTNET_DIR)/cli/nistspy $(TARGET_DIR)/usr/sbin/nistspy
- -$(STRIP) $(TARGET_DIR)/usr/sbin/cnistnet
- -$(STRIP) $(TARGET_DIR)/usr/sbin/hitbox
- # -$(STRIP) $(TARGET_DIR)/usr/sbin/mungebox
- # -$(STRIP) $(TARGET_DIR)/usr/sbin/nistspy
- $(INSTALL) -D -m 0644 $(NISTNET_DIR)/$(NISTNET_BINARY) $(TARGET_DIR)/lib/modules/$(LINUX_VER)/misc/nistnet.ko
+ $(STRIP) $(TARGET_DIR)/usr/sbin/hitbox
+ $(INSTALL) -D -m 0644 $(NISTNET_DIR)/kernel/nistnet.ko $(TARGET_DIR)/lib/modules/$(LINUX_VER)/misc/nistnet.ko
$(INSTALL) -D -m 0755 package/nistnet/nistnet.init $(TARGET_DIR)/etc/init.d/nistnet
- # -$(STRIP) $(TARGET_DIR)/$(NISTNET_TARGET_BINARY)
ifeq ($(strip $(BR2_PACKAGE_MINIHTTPD)),y)
$(INSTALL) -D -m 0755 package/nistnet/nistnet.php $(TARGET_DIR)/stat/var/www/admin/nistnet.php
endif
+ $(INSTALL) -D -m 0755 $(NISTNET_DIR)/$(NISTNET_BINARY) $(TARGET_DIR)/$(NISTNET_TARGET_BINARY)
+ $(STRIP) $(TARGET_DIR)/$(NISTNET_TARGET_BINARY)
/sbin/depmod -ae -F $(BUILD_DIR)/linux/System.map -b $(BUILD_DIR)/root -r $(LINUX_VER)
- touch -c $(TARGET_DIR)/lib/modules/$(LINUX_VER)/misc/nistnet.ko
+ touch -c $(TARGET_DIR)/$(NISTNET_TARGET_BINARY)
-nistnet: uclibc linux $(TARGET_DIR)/lib/modules/$(LINUX_VER)/misc/nistnet.ko
+nistnet: uclibc linux $(TARGET_DIR)/$(NISTNET_TARGET_BINARY)
nistnet-source: $(DL_DIR)/$(NISTNET_SOURCE)
@@ -59,9 +54,7 @@
-rm $(TARGET_DIR)/lib/modules/$(LINUX_VER)/misc/nistnet.ko
-rm $(TARGET_DIR)/etc/init.d/nistnet
/sbin/depmod -ae -F $(BUILD_DIR)/linux/System.map -b $(BUILD_DIR)/root -r $(LINUX_VER)
-ifeq ($(strip $(BR2_PACKAGE_MINIHTTPD)),y)
-rm $(TARGET_DIR)/stat/var/www/admin/nistnet.php
-endif
-$(MAKE) -C $(NISTNET_DIR) clean
nistnet-dirclean:
Modified: trunk/package/openntpd/openntpd.mk
===================================================================
--- trunk/package/openntpd/openntpd.mk 2007-04-19 15:59:24 UTC (rev 895)
+++ trunk/package/openntpd/openntpd.mk 2007-04-19 16:20:25 UTC (rev 896)
@@ -9,7 +9,7 @@
OPENNTPD_DIR:=$(BUILD_DIR)/openntpd-$(OPENNTPD_VERSION)
OPENNTPD_CAT:=zcat
OPENNTPD_BINARY:=ntpd
-OPENNTPD_TARGET_BINARY:=usr/sbin/foo
+OPENNTPD_TARGET_BINARY:=usr/sbin/ntpd
$(DL_DIR)/$(OPENNTPD_SOURCE):
$(WGET) -P $(DL_DIR) $(OPENNTPD_SITE)/$(OPENNTPD_SOURCE)
@@ -34,11 +34,12 @@
$(OPENNTPD_DIR)/$(OPENNTPD_BINARY): $(OPENNTPD_DIR)/.configured
$(MAKE) CC=$(TARGET_CC) -C $(OPENNTPD_DIR)
+ touch -c $(OPENNTPD_DIR)/$(OPENNTPD_BINARY)
$(TARGET_DIR)/$(OPENNTPD_TARGET_BINARY): $(OPENNTPD_DIR)/$(OPENNTPD_BINARY)
-rm $(TARGET_DIR)/etc/ntpd.conf
$(MAKE) DESTDIR=$(TARGET_DIR) STRIP_OPT="" -C $(OPENNTPD_DIR) install
- -$(STRIP) $(TARGET_DIR)/usr/sbin/ntpd
+ -$(STRIP) $(TARGET_DIR)/$(OPENNTPD_TARGET_BINARY)
$(INSTALL) -D -m 0755 package/openntpd/ntpd.init $(TARGET_DIR)/etc/init.d/ntpd
echo "_ntp:x:123:123:OpenNTPD:/usr/share/empty:/bin/false" >> $(TARGET_DIR)/etc/passwd
echo "_ntp:!:3656:0:99999:7:::" >> $(TARGET_DIR)/etc/shadow
@@ -47,18 +48,19 @@
rm -Rf $(TARGET_DIR)/usr/man
rm $(TARGET_DIR)/etc/ntpd.conf
ln -sf /tmp/etc/ntpd.conf $(TARGET_DIR)/etc/ntpd.conf
+ touch -c $(TARGET_DIR)/$(OPENNTPD_TARGET_BINARY)
-ntpd: uclibc $(TARGET_DIR)/$(OPENNTPD_TARGET_BINARY)
+openntpd: uclibc $(TARGET_DIR)/$(OPENNTPD_TARGET_BINARY)
-ntpd-source: $(DL_DIR)/$(OPENNTPD_SOURCE)
+openntpd-source: $(DL_DIR)/$(OPENNTPD_SOURCE)
-ntpd-clean:
+openntpd-clean:
#$(MAKE) DESTDIR=$(TARGET_DIR) -C $(OPENNTPD_DIR) uninstall
rm -f $(TARGET_DIR)/usr/sbin/ntpd
rm -f $(TARGET_DIR)/etc/init.d/ntpd
-$(MAKE) -C $(OPENNTPD_DIR) clean
-ntpd-dirclean:
+openntpd-dirclean:
rm -rf $(OPENNTPD_DIR)
#############################################################
@@ -67,6 +69,6 @@
#
#############################################################
ifeq ($(strip $(BR2_PACKAGE_OPENNTPD)),y)
-TARGETS+=ntpd
+TARGETS+=openntpd
endif
Modified: trunk/package/stunnel/stunnel.mk
===================================================================
--- trunk/package/stunnel/stunnel.mk 2007-04-19 15:59:24 UTC (rev 895)
+++ trunk/package/stunnel/stunnel.mk 2007-04-19 16:20:25 UTC (rev 896)
@@ -53,7 +53,7 @@
ln -s /tmp/etc/stunnel.conf $(TARGET_DIR)/etc/stunnel.conf
install -D -m 0755 package/stunnel/stunnel.init $(TARGET_DIR)/etc/init.d/stunnel
install -D -m 0755 -c $(STUNNEL_DIR)/src/stunnel $(TARGET_DIR)/usr/sbin/stunnel
- $(STRIP) $(TARGET_DIR)/usr/bin/stunnel > /dev/null 2>&1
+ $(STRIP) $(TARGET_DIR)/usr/sbin/stunnel > /dev/null 2>&1
stunnel: uclibc $(TARGET_DIR)/usr/sbin/stunnel
Deleted: trunk/target/x86/grub/grub.100-autoreconf.patch
===================================================================
--- trunk/target/x86/grub/grub.100-autoreconf.patch 2007-04-19 15:59:24 UTC (rev 895)
+++ trunk/target/x86/grub/grub.100-autoreconf.patch 2007-04-19 16:20:25 UTC (rev 896)
@@ -1,1407 +0,0 @@
-diff -rup grub-0.97.oorig/aclocal.m4 grub-0.97/aclocal.m4
---- grub-0.97.oorig/aclocal.m4 2005-05-08 04:41:18.000000000 +0200
-+++ grub-0.97/aclocal.m4 2006-03-12 14:00:35.000000000 +0100
-@@ -1,7 +1,7 @@
--# generated automatically by aclocal 1.9.4 -*- Autoconf -*-
-+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
-
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
--# Free Software Foundation, Inc.
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005 Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -11,23 +11,11 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
-
--# -*- Autoconf -*-
--# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
--# Generated from amversion.in; do not edit by hand.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
- # AM_AUTOMAKE_VERSION(VERSION)
- # ----------------------------
-@@ -40,26 +28,15 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api
- # Call AM_AUTOMAKE_VERSION so it can be traced.
- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-- [AM_AUTOMAKE_VERSION([1.9.4])])
--
--# AM_AUX_DIR_EXPAND
--
--# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-+ [AM_AUTOMAKE_VERSION([1.9.6])])
-
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
-+# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
- # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
- # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
-@@ -106,26 +83,16 @@ AC_PREREQ([2.50])dnl
- am_aux_dir=`cd $ac_aux_dir && pwd`
- ])
-
--# AM_CONDITIONAL -*- Autoconf -*-
-+# AM_CONDITIONAL -*- Autoconf -*-
-
--# Copyright (C) 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# serial 6
-+# serial 7
-
- # AM_CONDITIONAL(NAME, SHELL-CONDITION)
- # -------------------------------------
-@@ -149,26 +116,15 @@ AC_CONFIG_COMMANDS_PRE(
- Usually this means the macro was only invoked conditionally.]])
- fi])])
-
--# serial 7 -*- Autoconf -*-
-
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
- # Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
-+# serial 8
-
- # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
- # written in clear, in which case automake, when reading aclocal.m4,
-@@ -177,7 +133,6 @@ fi])])
- # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
--
- # _AM_DEPENDENCIES(NAME)
- # ----------------------
- # See how the compiler implements dependency checking.
-@@ -317,27 +272,16 @@ AM_CONDITIONAL([AMDEP], [test "x$enable_
- AC_SUBST([AMDEPBACKSLASH])
- ])
-
--# Generate code to set up dependency tracking. -*- Autoconf -*-
--
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
--# Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
-+# Generate code to set up dependency tracking. -*- Autoconf -*-
-
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--#serial 2
-+#serial 3
-
- # _AM_OUTPUT_DEPENDENCY_COMMANDS
- # ------------------------------
-@@ -396,30 +340,19 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
- ])
-
--# Do all the work for Automake. -*- Autoconf -*-
-+# Do all the work for Automake. -*- Autoconf -*-
-
--# This macro actually does too much some checks are only needed if
--# your package does certain things. But this isn't really a big deal.
--
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
- # Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# serial 12
-
--# serial 11
-+# This macro actually does too much. Some checks are only needed if
-+# your package does certain things. But this isn't really a big deal.
-
- # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
- # AM_INIT_AUTOMAKE([OPTIONS])
-@@ -521,51 +454,27 @@ for _am_header in $config_headers :; do
- done
- echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-
-+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
- # AM_PROG_INSTALL_SH
- # ------------------
- # Define $install_sh.
--
--# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
- AC_DEFUN([AM_PROG_INSTALL_SH],
- [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
- install_sh=${install_sh-"$am_aux_dir/install-sh"}
- AC_SUBST(install_sh)])
-
--# -*- Autoconf -*-
--# Copyright (C) 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# serial 1
-+# serial 2
-
- # Check whether the underlying file-system supports filenames
- # with a leading dot. For instance MS-DOS doesn't.
-@@ -580,28 +489,17 @@ fi
- rmdir .tst 2>/dev/null
- AC_SUBST([am__leading_dot])])
-
--# Add --enable-maintainer-mode option to configure.
-+# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
- # From Jim Meyering
-
--# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004
-+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
- # Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
--# serial 3
-+# serial 4
-
- AC_DEFUN([AM_MAINTAINER_MODE],
- [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-@@ -620,26 +518,15 @@ AC_DEFUN([AM_MAINTAINER_MODE],
-
- AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-
--# Check to see how 'make' treats includes. -*- Autoconf -*-
--
--# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
-+# Check to see how 'make' treats includes. -*- Autoconf -*-
-
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# serial 2
-+# serial 3
-
- # AM_MAKE_INCLUDE()
- # -----------------
-@@ -683,27 +570,16 @@ AC_MSG_RESULT([$_am_result])
- rm -f confinc confmf
- ])
-
--# -*- Autoconf -*-
--
--
--# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
-+# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# serial 3
-+# serial 4
-
- # AM_MISSING_PROG(NAME, PROGRAM)
- # ------------------------------
-@@ -729,27 +605,16 @@ else
- fi
- ])
-
-+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
- # AM_PROG_MKDIR_P
- # ---------------
- # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
--
--# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
-+#
- # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
- # created by `make install' are always world readable, even if the
- # installer happens to have an overly restrictive umask (e.g. 077).
-@@ -803,26 +668,15 @@ else
- fi
- AC_SUBST([mkdir_p])])
-
--# Helper functions for option handling. -*- Autoconf -*-
-+# Helper functions for option handling. -*- Autoconf -*-
-
--# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# serial 2
-+# serial 3
-
- # _AM_MANGLE_OPTION(NAME)
- # -----------------------
-@@ -847,28 +701,16 @@ AC_DEFUN([_AM_SET_OPTIONS],
- AC_DEFUN([_AM_IF_OPTION],
- [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
--#
--# Check to make sure that the build environment is sane.
--#
--
--# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
-+# Check to make sure that the build environment is sane. -*- Autoconf -*-
-
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# serial 3
-+# serial 4
-
- # AM_SANITY_CHECK
- # ---------------
-@@ -911,25 +753,14 @@ Check your system clock])
- fi
- AC_MSG_RESULT(yes)])
-
--# AM_PROG_INSTALL_STRIP
--
--# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
-+# AM_PROG_INSTALL_STRIP
-+# ---------------------
- # One issue with vendor `install' (even GNU) is that you can't
- # specify the program used to strip binaries. This is especially
- # annoying in cross-compiling environments, where the build's strip
-@@ -952,25 +783,13 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
- # Check how to create a tarball. -*- Autoconf -*-
-
--# Copyright (C) 2004 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
--# serial 1
-+# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
-+# serial 2
-
- # _AM_PROG_TAR(FORMAT)
- # --------------------
-Only in grub-0.97/: autom4te.cache
-diff -rup grub-0.97.oorig/configure grub-0.97/configure
---- grub-0.97.oorig/configure 2005-05-08 04:48:12.000000000 +0200
-+++ grub-0.97/configure 2006-03-12 14:00:38.000000000 +0100
-@@ -311,7 +311,7 @@ ac_includes_default="\
- # include <unistd.h>
- #endif"
-
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT PERL CC ac_ct_CC CFLAGS LDFLAGS CPPFLAGS EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CCAS RANLIB ac_ct_RANLIB STAGE1_CFLAGS STAGE2_CFLAGS GRUB_CFLAGS OBJCOPY ac_ct_OBJCOPY GRUB_LIBS CPP EGREP NETBOOT_SUPPORT_TRUE NETBOOT_SUPPORT_FALSE DISKLESS_SUPPORT_TRUE DISKLESS_SUPPORT_FALSE HERCULES_SUPPORT_TRUE HERCULES_SUPPORT_FALSE SERIAL_SUPPORT_TRUE SERIAL_SUPPORT_FALSE SERIAL_SPEED_SIMULATION_TRUE SERIAL_SPEED_SIMULATION_FALSE BUILD_EXAMPLE_KERNEL_TRUE BUILD_EXAMPLE_KERNEL_FALSE FSYS_CFLAGS NET_CFLAGS NET_EXTRAFLAGS NETBOOT_DRIVERS CCASFLAGS LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT PERL CC ac_ct_CC CFLAGS LDFLAGS CPPFLAGS EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CCAS RANLIB ac_ct_RANLIB STAGE1_CFLAGS STAGE2_CFLAGS GRUB_CFLAGS OBJCOPY ac_ct_OBJCOPY GRUB_LIBS CPP EGREP NETBOOT_SUPPORT_TRUE NETBOOT_SUPPORT_FALSE DISKLESS_SUPPORT_TRUE DISKLESS_SUPPORT_FALSE GRAPHICS_SUPPORT_TRUE GRAPHICS_SUPPORT_FALSE HERCULES_SUPPORT_TRUE HERCULES_SUPPORT_FALSE SERIAL_SUPPORT_TRUE SERIAL_SUPPORT_FALSE SERIAL_SPEED_SIMULATION_TRUE SERIAL_SPEED_SIMULATION_FALSE BUILD_EXAMPLE_KERNEL_TRUE BUILD_EXAMPLE_KERNEL_FALSE FSYS_CFLAGS NET_CFLAGS NET_EXTRAFLAGS NETBOOT_DRIVERS CCASFLAGS LIBOBJS LTLIBOBJS'
- ac_subst_files=''
-
- # Initialize some variables set by options.
-@@ -914,6 +914,7 @@ Optional Features:
- set the default memory location for WD/SMC
- --enable-cs-scan=LIST probe for CS89x0 base address using LIST
- --enable-diskless enable diskless support
-+ --disable-graphics disable graphics terminal support
- --disable-hercules disable hercules terminal support
- --disable-serial disable serial terminal support
- --enable-serial-speed-simulation
-@@ -1032,7 +1033,7 @@ esac
- else
- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
- fi
-- cd $ac_popdir
-+ cd "$ac_popdir"
- done
- fi
-
-@@ -2631,8 +2632,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -2690,8 +2690,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -2807,8 +2806,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -2862,8 +2860,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -2908,8 +2905,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -2953,8 +2949,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3458,8 +3453,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3523,8 +3517,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3595,8 +3588,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3656,8 +3648,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4095,8 +4086,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4161,8 +4151,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4234,8 +4223,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4300,8 +4288,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4366,8 +4353,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4440,8 +4426,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4506,8 +4491,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4597,8 +4581,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4673,8 +4656,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4745,8 +4727,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -5070,8 +5051,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -5241,8 +5221,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -5313,8 +5292,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -5966,6 +5944,22 @@ else
- fi
-
-
-+# Check whether --enable-graphics or --disable-graphics was given.
-+if test "${enable_graphics+set}" = set; then
-+ enableval="$enable_graphics"
-+
-+fi;
-+
-+
-+if test "x$enable_graphics" != xno; then
-+ GRAPHICS_SUPPORT_TRUE=
-+ GRAPHICS_SUPPORT_FALSE='#'
-+else
-+ GRAPHICS_SUPPORT_TRUE='#'
-+ GRAPHICS_SUPPORT_FALSE=
-+fi
-+
-+
- # Check whether --enable-hercules or --disable-hercules was given.
- if test "${enable_hercules+set}" = set; then
- enableval="$enable_hercules"
-@@ -6270,6 +6264,13 @@ echo "$as_me: error: conditional \"DISKL
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
-+if test -z "${GRAPHICS_SUPPORT_TRUE}" && test -z "${GRAPHICS_SUPPORT_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"GRAPHICS_SUPPORT\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"GRAPHICS_SUPPORT\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
- if test -z "${HERCULES_SUPPORT_TRUE}" && test -z "${HERCULES_SUPPORT_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"HERCULES_SUPPORT\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
-@@ -6907,6 +6908,8 @@ s,@NETBOOT_SUPPORT_TRUE@,$NETBOOT_SUPPOR
- s,@NETBOOT_SUPPORT_FALSE@,$NETBOOT_SUPPORT_FALSE,;t t
- s,@DISKLESS_SUPPORT_TRUE@,$DISKLESS_SUPPORT_TRUE,;t t
- s,@DISKLESS_SUPPORT_FALSE@,$DISKLESS_SUPPORT_FALSE,;t t
-+s,@GRAPHICS_SUPPORT_TRUE@,$GRAPHICS_SUPPORT_TRUE,;t t
-+s,@GRAPHICS_SUPPORT_FALSE@,$GRAPHICS_SUPPORT_FALSE,;t t
- s,@HERCULES_SUPPORT_TRUE@,$HERCULES_SUPPORT_TRUE,;t t
- s,@HERCULES_SUPPORT_FALSE@,$HERCULES_SUPPORT_FALSE,;t t
- s,@SERIAL_SUPPORT_TRUE@,$SERIAL_SUPPORT_TRUE,;t t
-@@ -7088,11 +7091,6 @@ esac
- *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
- esac
-
-- if test x"$ac_file" != x-; then
-- { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
-- rm -f "$ac_file"
-- fi
- # Let's still pretend it is `configure' which instantiates (i.e., don't
- # use $as_me), people would be surprised to read:
- # /* config.h. Generated by config.status. */
-@@ -7131,6 +7129,12 @@ echo "$as_me: error: cannot find input f
- fi;;
- esac
- done` || { (exit 1); exit 1; }
-+
-+ if test x"$ac_file" != x-; then
-+ { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+ rm -f "$ac_file"
-+ fi
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- sed "$ac_vpsub
-diff -rup grub-0.97.oorig/docs/Makefile.in grub-0.97/docs/Makefile.in
---- grub-0.97.oorig/docs/Makefile.in 2005-05-08 04:42:34.000000000 +0200
-+++ grub-0.97/docs/Makefile.in 2006-03-12 14:00:43.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.4 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -15,8 +15,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kernel_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -120,6 +118,8 @@ ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- FSYS_CFLAGS = @FSYS_CFLAGS@
-+GRAPHICS_SUPPORT_FALSE = @GRAPHICS_SUPPORT_FALSE@
-+GRAPHICS_SUPPORT_TRUE = @GRAPHICS_SUPPORT_TRUE@
- GRUB_CFLAGS = @GRUB_CFLAGS@
- GRUB_LIBS = @GRUB_LIBS@
- HERCULES_SUPPORT_FALSE = @HERCULES_SUPPORT_FALSE@
-@@ -304,9 +304,11 @@ kernel-kernel.obj: kernel.c
- restore=: && backupdir="$(am__leading_dot)am$$$$" && \
- am__cwd=`pwd` && cd $(srcdir) && \
- rm -rf $$backupdir && mkdir $$backupdir && \
-- for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
-- if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
-- done; \
-+ if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
-+ for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
-+ if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
-+ done; \
-+ else :; fi && \
- cd "$$am__cwd"; \
- if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
- -o $@ $<; \
-@@ -371,10 +373,11 @@ multiboot.dvi: multiboot.texi $(multiboo
- multiboot.pdf: multiboot.texi $(multiboot_TEXINFOS)
- multiboot.html: multiboot.texi $(multiboot_TEXINFOS)
- .dvi.ps:
-+ TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
- $(DVIPS) -o $@ $<
-
- uninstall-info-am:
-- $(PRE_UNINSTALL)
-+ @$(PRE_UNINSTALL)
- @if (install-info --version && \
- install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
- list='$(INFO_DEPS)'; \
-@@ -390,7 +393,7 @@ uninstall-info-am:
- relfile=`echo "$$file" | sed 's|^.*/||'`; \
- relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \
- (if cd "$(DESTDIR)$(infodir)"; then \
-- echo " rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9])"; \
-+ echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]"; \
- rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \
- else :; fi); \
- done
-@@ -403,10 +406,13 @@ dist-info: $(INFO_DEPS)
- $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \
- esac; \
- if test -f $$base; then d=.; else d=$(srcdir); fi; \
-- for file in $$d/$$base*; do \
-- relfile=`expr "$$file" : "$$d/\(.*\)"`; \
-- test -f $(distdir)/$$relfile || \
-- cp -p $$file $(distdir)/$$relfile; \
-+ base_i=`echo "$$base" | sed 's|\.info$$||;s|$$|.i|'`; \
-+ for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] $$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \
-+ if test -f $$file; then \
-+ relfile=`expr "$$file" : "$$d/\(.*\)"`; \
-+ test -f $(distdir)/$$relfile || \
-+ cp -p $$file $(distdir)/$$relfile; \
-+ else :; fi; \
- done; \
- done
-
-diff -rup grub-0.97.oorig/grub/Makefile.in grub-0.97/grub/Makefile.in
---- grub-0.97.oorig/grub/Makefile.in 2005-05-08 04:42:34.000000000 +0200
-+++ grub-0.97/grub/Makefile.in 2006-03-12 14:00:43.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.4 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,8 +14,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(grub_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -97,6 +95,8 @@ ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- FSYS_CFLAGS = @FSYS_CFLAGS@
-+GRAPHICS_SUPPORT_FALSE = @GRAPHICS_SUPPORT_FALSE@
-+GRAPHICS_SUPPORT_TRUE = @GRAPHICS_SUPPORT_TRUE@
- GRUB_CFLAGS = @GRUB_CFLAGS@
- GRUB_LIBS = @GRUB_LIBS@
- HERCULES_SUPPORT_FALSE = @HERCULES_SUPPORT_FALSE@
-diff -rup grub-0.97.oorig/lib/Makefile.in grub-0.97/lib/Makefile.in
---- grub-0.97.oorig/lib/Makefile...
[truncated message content] |
|
From: <kr...@us...> - 2007-04-24 18:23:48
|
Revision: 928
http://svn.sourceforge.net/astlinux/?rev=928&view=rev
Author: krisk84
Date: 2007-04-24 11:23:47 -0700 (Tue, 24 Apr 2007)
Log Message:
-----------
merge AstLinux release support from s2s branch
Modified Paths:
--------------
trunk/makeimage.sh
trunk/target/device/Gumstix/Makefile.in
trunk/target/device/geni586/Makefile.in
trunk/target/device/net4801/Makefile.in
trunk/target/device/via/Makefile.in
trunk/target/device/wrap/Makefile.in
Added Paths:
-----------
trunk/toolchain/astrelease/
trunk/toolchain/astrelease/astrelease.mk
Removed Paths:
-------------
trunk/toolchain/astrelease/astrelease.mk
Modified: trunk/makeimage.sh
===================================================================
--- trunk/makeimage.sh 2007-04-24 18:21:56 UTC (rev 927)
+++ trunk/makeimage.sh 2007-04-24 18:23:47 UTC (rev 928)
@@ -33,9 +33,8 @@
if [ -f disk.img ]
then
-echo "You already have a disk.img"
-echo "You must remove it or move it to continue"
-exit 1
+echo "You already have a disk.img - exiting"
+exit 0
fi
if [ -d /dev/loop ]
Modified: trunk/target/device/Gumstix/Makefile.in
===================================================================
--- trunk/target/device/Gumstix/Makefile.in 2007-04-24 18:21:56 UTC (rev 927)
+++ trunk/target/device/Gumstix/Makefile.in 2007-04-24 18:23:47 UTC (rev 928)
@@ -1,5 +1,6 @@
# Override the default uClibc configuration
ifeq ($(strip $(BR2_TARGET_GUMSTIX_BASIXCONNEX)),y)
+DEV_PATH=target/device/Gumstix/basix-connex
UCLIBC_CONFIG_FILE:=target/device/Gumstix/basix-connex/uClibc.config
BR2_PACKAGE_BUSYBOX_CONFIG:=target/device/Gumstix/basix-connex/busybox.config
TARGET_SKEL2_DIR=target/device/Gumstix/basix-connex/target_skeleton
Modified: trunk/target/device/geni586/Makefile.in
===================================================================
--- trunk/target/device/geni586/Makefile.in 2007-04-24 18:21:56 UTC (rev 927)
+++ trunk/target/device/geni586/Makefile.in 2007-04-24 18:23:47 UTC (rev 928)
@@ -2,6 +2,7 @@
GENI586_PATH=target/device/geni586
ifeq ($(strip $(BR2_TARGET_GENI586)),y)
+DEV_PATH=$(GENI586_PATH)
BR2_PACKAGE_LINUX_CONFIG=$(GENI586_PATH)/linux.config
UCLIBC_CONFIG_FILE=$(GENI586_PATH)/uClibc.config
TARGET_SKEL2_DIR=$(GENI586_PATH)/target_skeleton
Modified: trunk/target/device/net4801/Makefile.in
===================================================================
--- trunk/target/device/net4801/Makefile.in 2007-04-24 18:21:56 UTC (rev 927)
+++ trunk/target/device/net4801/Makefile.in 2007-04-24 18:23:47 UTC (rev 928)
@@ -2,6 +2,7 @@
SOEKRIS_NET4801_PATH=target/device/net4801
ifeq ($(strip $(BR2_TARGET_SOEKRIS_NET4801)),y)
+DEV_PATH=$(SOEKRIS_NET4801_PATH)
BR2_PACKAGE_LINUX_CONFIG=$(SOEKRIS_NET4801_PATH)/linux.config
UCLIBC_CONFIG_FILE=$(SOEKRIS_NET4801_PATH)/uClibc.config
TARGET_SKEL2_DIR=$(SOEKRIS_NET4801_PATH)/target_skeleton
Modified: trunk/target/device/via/Makefile.in
===================================================================
--- trunk/target/device/via/Makefile.in 2007-04-24 18:21:56 UTC (rev 927)
+++ trunk/target/device/via/Makefile.in 2007-04-24 18:23:47 UTC (rev 928)
@@ -2,6 +2,7 @@
VIA_PATH=target/device/via
ifeq ($(strip $(BR2_TARGET_VIA)),y)
+DEV_PATH=$(VIA_PATH)
BR2_PACKAGE_LINUX_CONFIG=$(VIA_PATH)/linux.config
UCLIBC_CONFIG_FILE=$(VIA_PATH)/uClibc.config
TARGET_SKEL2_DIR=$(VIA_PATH)/target_skeleton
Modified: trunk/target/device/wrap/Makefile.in
===================================================================
--- trunk/target/device/wrap/Makefile.in 2007-04-24 18:21:56 UTC (rev 927)
+++ trunk/target/device/wrap/Makefile.in 2007-04-24 18:23:47 UTC (rev 928)
@@ -3,6 +3,7 @@
# We no longer use the same config as the net4801
ifeq ($(strip $(BR2_TARGET_PCENGINES_WRAP)),y)
+DEV_PATH=$(PCENGINES_WRAP_PATH)
BR2_PACKAGE_LINUX_CONFIG=$(PCENGINES_WRAP_PATH)/linux.config
UCLIBC_CONFIG_FILE=$(PCENGINES_WRAP_PATH)/uClibc.config
TARGET_SKEL2_DIR=$(PCENGINES_WRAP_PATH)/target_skeleton
Copied: trunk/toolchain/astrelease (from rev 927, branches/s2s/toolchain/astrelease)
Deleted: trunk/toolchain/astrelease/astrelease.mk
===================================================================
--- branches/s2s/toolchain/astrelease/astrelease.mk 2007-04-24 18:21:56 UTC (rev 927)
+++ trunk/toolchain/astrelease/astrelease.mk 2007-04-24 18:23:47 UTC (rev 928)
@@ -1,46 +0,0 @@
-######################################################################
-#
-# Make a release for AstLinux
-#
-######################################################################
-ASTVER=$(shell cat target/generic/target_skeleton/etc/astlinux-release)
-IMGSIZE=48
-
-disk.img: grub
- sudo ./makeimage.sh $(IMGSIZE)
-
-$(ASTVER).tar.gz: ext2initrd squashfsroot disk.img
- mkdir -p $(ASTVER)
- cp disk.img $(ASTVER)/$(ASTVER).run
- (cd $(ASTVER); sha1sum $(ASTVER).run > $(ASTVER).run.sha1)
- touch $(ASTVER)/astflag
- sed -e s/ASTVER/$(ASTVER)/g $(DEV_PATH)/runnix/runnix.conf > \
- $(ASTVER)/$(ASTVER).run.conf
-ifneq ($(wildcard $(DEV_PATH)/runnix/initrd.img),)
- cp $(DEV_PATH)/runnix/initrd.img $(ASTVER)/initrd.img
-else
- cp $(INITRD_EXT2_BASE).gz $(ASTVER)/initrd.img
-endif
- tar -cvzf $(ASTVER).tar.gz $(ASTVER)
- touch -c $(ASTVER).tar.gz
-
-$(ASTVER).tar.gz.sha1: $(ASTVER).tar.gz
- sha1sum $(ASTVER).tar.gz > $(ASTVER).tar.gz.sha1
- touch -c $(ASTVER).tar.gz.sha1
-
-astrelease: $(ASTVER).tar.gz.sha1
-
-astrelease-source:
-
-astrelease-clean:
- -rm -f $(ASTVER).tar.gz
- -rm -f $(ASTVER).tar.gz.sha1
-
-astrelease-dirclean:
- -rm -rf $(ASTVER)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
Copied: trunk/toolchain/astrelease/astrelease.mk (from rev 927, branches/s2s/toolchain/astrelease/astrelease.mk)
===================================================================
--- trunk/toolchain/astrelease/astrelease.mk (rev 0)
+++ trunk/toolchain/astrelease/astrelease.mk 2007-04-24 18:23:47 UTC (rev 928)
@@ -0,0 +1,46 @@
+######################################################################
+#
+# Make a release for AstLinux
+#
+######################################################################
+ASTVER=$(shell cat target/generic/target_skeleton/etc/astlinux-release)
+IMGSIZE=48
+
+disk.img: grub
+ sudo ./makeimage.sh $(IMGSIZE)
+
+$(ASTVER).tar.gz: ext2initrd squashfsroot disk.img
+ mkdir -p $(ASTVER)
+ cp disk.img $(ASTVER)/$(ASTVER).run
+ (cd $(ASTVER); sha1sum $(ASTVER).run > $(ASTVER).run.sha1)
+ touch $(ASTVER)/astflag
+ sed -e s/ASTVER/$(ASTVER)/g $(DEV_PATH)/runnix/runnix.conf > \
+ $(ASTVER)/$(ASTVER).run.conf
+ifneq ($(wildcard $(DEV_PATH)/runnix/initrd.img),)
+ cp $(DEV_PATH)/runnix/initrd.img $(ASTVER)/initrd.img
+else
+ cp $(INITRD_EXT2_BASE).gz $(ASTVER)/initrd.img
+endif
+ tar -cvzf $(ASTVER).tar.gz $(ASTVER)
+ touch -c $(ASTVER).tar.gz
+
+$(ASTVER).tar.gz.sha1: $(ASTVER).tar.gz
+ sha1sum $(ASTVER).tar.gz > $(ASTVER).tar.gz.sha1
+ touch -c $(ASTVER).tar.gz.sha1
+
+astrelease: $(ASTVER).tar.gz.sha1
+
+astrelease-source:
+
+astrelease-clean:
+ -rm -f $(ASTVER).tar.gz
+ -rm -f $(ASTVER).tar.gz.sha1
+
+astrelease-dirclean:
+ -rm -rf $(ASTVER)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2007-04-27 15:36:19
|
Revision: 977
http://svn.sourceforge.net/astlinux/?rev=977&view=rev
Author: krisk84
Date: 2007-04-27 08:36:20 -0700 (Fri, 27 Apr 2007)
Log Message:
-----------
livecd, runnix, device table fixes
Modified Paths:
--------------
trunk/astlinux.config
trunk/target/Config.in
trunk/target/generic/device_table.txt
Added Paths:
-----------
trunk/target/device/geni586/runnix/
trunk/target/device/geni586/runnix/runnix.conf
Modified: trunk/astlinux.config
===================================================================
--- trunk/astlinux.config 2007-04-26 21:40:09 UTC (rev 976)
+++ trunk/astlinux.config 2007-04-27 15:36:20 UTC (rev 977)
@@ -193,7 +193,7 @@
BR2_PACKAGE_DIGIUMG729=y
BR2_PACKAGE_ASTERISKCHANMISDN=y
# BR2_PACKAGE_VM-MESSENGER is not set
-# BR2_PACKAGE_APCUPSD is not set
+BR2_PACKAGE_APCUPSD=y
# BR2_PACKAGE_APPWEBB is not set
BR2_PACKAGE_ASTMANPROXY=y
# BR2_PACKAGE_AT is not set
@@ -221,7 +221,7 @@
# BR2_PACKAGE_EXPAT is not set
BR2_PACKAGE_E2FSPROGS=y
# BR2_PACKAGE_FAKEROOT is not set
-# BR2_HOST_FAKEROUTE is not set
+BR2_HOST_FAKEROUTE=y
# BR2_PACKAGE_FILE is not set
# BR2_PACKAGE_FLITE is not set
# BR2_PACKAGE_FREETYPE is not set
@@ -272,7 +272,6 @@
# BR2_PACKAGE_LTP-TESTSUITE is not set
# BR2_PACKAGE_LTRACE is not set
# BR2_PACKAGE_LTT is not set
-# BR2_PACKAGE_LVM2 is not set
BR2_PACKAGE_LZO=y
# BR2_PACKAGE_M4 is not set
BR2_PACKAGE_MADWIFI=y
@@ -341,7 +340,6 @@
BR2_PACKAGE_STRACE=y
BR2_PACKAGE_STUNNEL=y
BR2_PACKAGE_SYSFSUTILS=y
-# BR2_PACKAGE_SYSKLOGD is not set
# BR2_PACKAGE_SYSVINIT is not set
# BR2_PACKAGE_TCL is not set
BR2_PACKAGE_TCPDUMP=y
@@ -375,11 +373,26 @@
#
#
+# Target Device Table
+#
+TARGET_DEVICE_TABLE="target/generic/device_table.txt"
+
+#
# filesystem for target device
#
# BR2_TARGET_ROOTFS_CRAMFS is not set
# BR2_TARGET_ROOTFS_CLOOP is not set
-# BR2_TARGET_ROOTFS_EXT2 is not set
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_BLOCKS=0
+BR2_TARGET_ROOTFS_EXT2_INODES=0
+BR2_TARGET_ROOTFS_EXT2_RESBLKS=0
+BR2_TARGET_ROOTFS_EXT2_SQUASH=y
+BR2_TARGET_ROOTFS_EXT2_OUTPUT="$(IMAGE).ext2"
+BR2_TARGET_ROOTFS_EXT2_NONE=y
+# BR2_TARGET_ROOTFS_EXT2_GZIP is not set
+# BR2_TARGET_ROOTFS_EXT2_BZIP2 is not set
+# BR2_TARGET_ROOTFS_EXT2_LZMA is not set
+BR2_TARGET_ROOTFS_EXT2_COPYTO=""
# BR2_TARGET_ROOTFS_JFFS2 is not set
BR2_TARGET_ROOTFS_SQUASHFS=y
# BR2_TARGET_ROOTFS_TAR is not set
Modified: trunk/target/Config.in
===================================================================
--- trunk/target/Config.in 2007-04-26 21:40:09 UTC (rev 976)
+++ trunk/target/Config.in 2007-04-27 15:36:20 UTC (rev 977)
@@ -1,5 +1,11 @@
menu "Target Options"
+comment "Target Device Table"
+
+config TARGET_DEVICE_TABLE
+ string "Dev. Table Filename"
+ default "target/generic/device_table.txt"
+
comment "filesystem for target device"
source "target/cramfs/Config.in"
Added: trunk/target/device/geni586/runnix/runnix.conf
===================================================================
--- trunk/target/device/geni586/runnix/runnix.conf (rev 0)
+++ trunk/target/device/geni586/runnix/runnix.conf 2007-04-27 15:36:20 UTC (rev 977)
@@ -0,0 +1,10 @@
+# Kernel command line
+KCMD="root=/dev/ram0 rw init=/linuxrc astlinux=geni586 astimg=ASTVER.run astkd=/dev/sda1 astlive ide=nodma"
+# Offset for root filesystem
+# OFFSET="32256"
+# location of kernel binary inside root
+KERN="boot/bzImage"
+# root fs type
+FSTYPE="ext2"
+# initrd location relative to runnix /
+INITRD="os/initrd.img"
Modified: trunk/target/generic/device_table.txt
===================================================================
--- trunk/target/generic/device_table.txt 2007-04-26 21:40:09 UTC (rev 976)
+++ trunk/target/generic/device_table.txt 2007-04-27 15:36:20 UTC (rev 977)
@@ -100,18 +100,18 @@
/stat/dev/hda b 640 0 0 3 1 1 1 15
/stat/dev/hdb b 640 0 0 3 64 0 0 -
/stat/dev/hdb b 640 0 0 3 65 1 1 15
-#/stat/dev/hdc b 640 0 0 22 0 0 0 -
-#/stat/dev/hdc b 640 0 0 22 1 1 1 15
-#/stat/dev/hdd b 640 0 0 22 64 0 0 -
-#/stat/dev/hdd b 640 0 0 22 65 1 1 15
-#/stat/dev/hde b 640 0 0 33 0 0 0 -
-#/stat/dev/hde b 640 0 0 33 1 1 1 15
-#/stat/dev/hdf b 640 0 0 33 64 0 0 -
-#/stat/dev/hdf b 640 0 0 33 65 1 1 15
-#/stat/dev/hdg b 640 0 0 34 0 0 0 -
-#/stat/dev/hdg b 640 0 0 34 1 1 1 15
-#/stat/dev/hdh b 640 0 0 34 64 0 0 -
-#/stat/dev/hdh b 640 0 0 34 65 1 1 15
+/stat/dev/hdc b 640 0 0 22 0 0 0 -
+/stat/dev/hdc b 640 0 0 22 1 1 1 15
+/stat/dev/hdd b 640 0 0 22 64 0 0 -
+/stat/dev/hdd b 640 0 0 22 65 1 1 15
+/stat/dev/hde b 640 0 0 33 0 0 0 -
+/stat/dev/hde b 640 0 0 33 1 1 1 15
+/stat/dev/hdf b 640 0 0 33 64 0 0 -
+/stat/dev/hdf b 640 0 0 33 65 1 1 15
+/stat/dev/hdg b 640 0 0 34 0 0 0 -
+/stat/dev/hdg b 640 0 0 34 1 1 1 15
+/stat/dev/hdh b 640 0 0 34 64 0 0 -
+/stat/dev/hdh b 640 0 0 34 65 1 1 15
# SCSI Devices
/stat/dev/sda b 640 0 0 8 0 0 0 -
@@ -211,18 +211,18 @@
/dev/hda b 640 0 0 3 1 1 1 15
/dev/hdb b 640 0 0 3 64 0 0 -
/dev/hdb b 640 0 0 3 65 1 1 15
-#/dev/hdc b 640 0 0 22 0 0 0 -
-#/dev/hdc b 640 0 0 22 1 1 1 15
-#/dev/hdd b 640 0 0 22 64 0 0 -
-#/dev/hdd b 640 0 0 22 65 1 1 15
-#/dev/hde b 640 0 0 33 0 0 0 -
-#/dev/hde b 640 0 0 33 1 1 1 15
-#/dev/hdf b 640 0 0 33 64 0 0 -
-#/dev/hdf b 640 0 0 33 65 1 1 15
-#/dev/hdg b 640 0 0 34 0 0 0 -
-#/dev/hdg b 640 0 0 34 1 1 1 15
-#/dev/hdh b 640 0 0 34 64 0 0 -
-#/dev/hdh b 640 0 0 34 65 1 1 15
+/dev/hdc b 640 0 0 22 0 0 0 -
+/dev/hdc b 640 0 0 22 1 1 1 15
+/dev/hdd b 640 0 0 22 64 0 0 -
+/dev/hdd b 640 0 0 22 65 1 1 15
+/dev/hde b 640 0 0 33 0 0 0 -
+/dev/hde b 640 0 0 33 1 1 1 15
+/dev/hdf b 640 0 0 33 64 0 0 -
+/dev/hdf b 640 0 0 33 65 1 1 15
+/dev/hdg b 640 0 0 34 0 0 0 -
+/dev/hdg b 640 0 0 34 1 1 1 15
+/dev/hdh b 640 0 0 34 64 0 0 -
+/dev/hdh b 640 0 0 34 65 1 1 15
/dev/sda b 640 0 0 8 0 0 0 -
/dev/sda b 640 0 0 8 1 1 1 15
/dev/sdb b 640 0 0 8 16 0 0 -
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2007-04-30 19:25:39
|
Revision: 991
http://svn.sourceforge.net/astlinux/?rev=991&view=rev
Author: krisk84
Date: 2007-04-30 12:25:36 -0700 (Mon, 30 Apr 2007)
Log Message:
-----------
update runnix configs, make runnix the default for astrelease
Modified Paths:
--------------
trunk/target/device/geni586/runnix/runnix.conf
trunk/toolchain/astrelease/astrelease.mk
Added Paths:
-----------
trunk/target/device/net4801/runnix/
trunk/target/device/net4801/runnix/runnix.conf
trunk/target/device/via/runnix/
trunk/target/device/via/runnix/runnix.conf
trunk/target/device/wrap/runnix/
trunk/target/device/wrap/runnix/runnix.conf
Modified: trunk/target/device/geni586/runnix/runnix.conf
===================================================================
--- trunk/target/device/geni586/runnix/runnix.conf 2007-04-30 18:32:49 UTC (rev 990)
+++ trunk/target/device/geni586/runnix/runnix.conf 2007-04-30 19:25:36 UTC (rev 991)
@@ -2,9 +2,9 @@
KCMD="root=/dev/ram0 rw init=/linuxrc astlinux=geni586 astimg=ASTVER.run astkd=/dev/sda1 astlive ide=nodma"
# Offset for root filesystem
# OFFSET="32256"
-# location of kernel binary inside root
-KERN="boot/bzImage"
+# location of kernel binary inside root (include mountpoint)
+KERN="/mnt/root/boot/bzImage"
# root fs type
-FSTYPE="ext2"
+FSTYPE="squashfs"
# initrd location relative to runnix /
-INITRD="os/initrd.img"
+INITRD="/mnt/base/os/initrd.img"
Added: trunk/target/device/net4801/runnix/runnix.conf
===================================================================
--- trunk/target/device/net4801/runnix/runnix.conf (rev 0)
+++ trunk/target/device/net4801/runnix/runnix.conf 2007-04-30 19:25:36 UTC (rev 991)
@@ -0,0 +1,10 @@
+# Kernel command line
+KCMD="root=/dev/ram0 rw init=/linuxrc console=ttyS0,19200n8 astimg=ASTVER.run astlinux=net4801 astkd=/dev/sda1 astlive ide=nodma"
+# Offset for root filesystem
+# OFFSET="32256"
+# location of kernel binary inside root (include mountpoint)
+KERN="/mnt/root/boot/bzImage"
+# root fs type
+FSTYPE="squashfs"
+# initrd location relative to runnix /
+INITRD="/mnt/base/os/initrd.img"
Added: trunk/target/device/via/runnix/runnix.conf
===================================================================
--- trunk/target/device/via/runnix/runnix.conf (rev 0)
+++ trunk/target/device/via/runnix/runnix.conf 2007-04-30 19:25:36 UTC (rev 991)
@@ -0,0 +1,10 @@
+# Kernel command line
+KCMD="root=/dev/ram0 rw init=/linuxrc astlinux=via astimg=ASTVER.run astkd=/dev/sda1 astlive ide=nodma"
+# Offset for root filesystem
+# OFFSET="32256"
+# location of kernel binary inside root (include mountpoint)
+KERN="/mnt/root/boot/bzImage"
+# root fs type
+FSTYPE="squashfs"
+# initrd location relative to runnix /
+INITRD="/mnt/base/os/initrd.img"
Added: trunk/target/device/wrap/runnix/runnix.conf
===================================================================
--- trunk/target/device/wrap/runnix/runnix.conf (rev 0)
+++ trunk/target/device/wrap/runnix/runnix.conf 2007-04-30 19:25:36 UTC (rev 991)
@@ -0,0 +1,10 @@
+# Kernel command line
+KCMD="root=/dev/ram0 rw init=/linuxrc console=ttyS0,38400n8 astimg=ASTVER.run astlinux=wrap astkd=/dev/sda1 astlive ide=nodma reboot=bios"
+# Offset for root filesystem
+# OFFSET="32256"
+# location of kernel binary inside root (include mountpoint)
+KERN="/mnt/root/boot/bzImage"
+# root fs type
+FSTYPE="squashfs"
+# initrd location relative to runnix /
+INITRD="/mnt/base/os/initrd.img"
Modified: trunk/toolchain/astrelease/astrelease.mk
===================================================================
--- trunk/toolchain/astrelease/astrelease.mk 2007-04-30 18:32:49 UTC (rev 990)
+++ trunk/toolchain/astrelease/astrelease.mk 2007-04-30 19:25:36 UTC (rev 991)
@@ -4,15 +4,10 @@
#
######################################################################
ASTVER=$(shell cat target/generic/target_skeleton/etc/astlinux-release)
-IMGSIZE=48
-disk.img: grub
- sudo ./makeimage.sh $(IMGSIZE)
-
-$(ASTVER).tar.gz: ext2initrd squashfsroot ext2root
+$(ASTVER).tar.gz: ext2initrd squashfsroot
mkdir -p $(ASTVER)
- # cp disk.img $(ASTVER)/$(ASTVER).run
- cp $(EXT2_TARGET) $(ASTVER)/$(ASTVER).run
+ cp $(SQUASHFS_TARGET) $(ASTVER)/$(ASTVER).run
(cd $(ASTVER); sha1sum $(ASTVER).run > $(ASTVER).run.sha1)
touch $(ASTVER)/astflag
sed -e s/ASTVER/$(ASTVER)/g $(DEV_PATH)/runnix/runnix.conf > \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2007-05-01 16:04:03
|
Revision: 994
http://svn.sourceforge.net/astlinux/?rev=994&view=rev
Author: krisk84
Date: 2007-05-01 09:04:02 -0700 (Tue, 01 May 2007)
Log Message:
-----------
a few iptables fixes - we now support NODMZPORTS
Modified Paths:
--------------
trunk/package/iptables/astfw
trunk/target/generic/target_skeleton/stat/etc/rc.conf
Modified: trunk/package/iptables/astfw
===================================================================
--- trunk/package/iptables/astfw 2007-04-30 19:32:01 UTC (rev 993)
+++ trunk/package/iptables/astfw 2007-05-01 16:04:02 UTC (rev 994)
@@ -151,7 +151,7 @@
iptables -N USER-FORWARD
iptables -A FORWARD -j USER-FORWARD
-#allow forwaring from each interface to the internet...
+#allow forwarding from each interface to the internet...
for i in $EXTIFS
do
iptables -A FORWARD -i $INTIF -o $i -j ACCEPT
@@ -167,6 +167,10 @@
fi
done
+#Create user NAT table and send everything through it
+iptables -t nat -N USER-PREROUTING
+iptables -t nat -A PREROUTING -j USER-PREROUTING
+
#Setup 1:1 Maps...
for i in $EXTIFS
do
@@ -233,19 +237,44 @@
IF="$INTIF"
fi
-if [ "$DMZSRC" ]
+if [ "$NODMZPORTS" ]
then
-
-for i in $DMZSRC
+for i in $NODMZPORTS
do
-iptables -t nat -A PREROUTING -p tcp -i $EXTIF -s \! "$i" -j DNAT --to-destination $DMZIP
-iptables -t nat -A PREROUTING -p udp -i $EXTIF -s \! "$i" -j DNAT --to-destination $DMZIP
+if `echo $i | grep -q "u"`
+then
+PROTOCOL=udp
+fi
-iptables -A FORWARD -i $EXTIF -o $IF -s \! "$i" -d $DMZIP -m state --state NEW -p tcp -j ACCEPT
-iptables -A FORWARD -i $EXTIF -o $IF -s \! "$i" -d $DMZIP -m state --state NEW -p udp -j ACCEPT
+if `echo $i | grep -q "t"`
+then
+PROTOCOL=tcp
+fi
+
+PORT=`echo $i | tr -d itu`
+
+if [ "$DMZSRC" ]
+then
+iptables -t nat -A PREROUTING -i $EXTIF -s "$DMZSRC" -p $PROTOCOL -m $PROTOCOL --dport $PORT -j DNAT --to-destination "$DMZIP":"$PORT"
+iptables -A FORWARD -i $EXTIF -d $DMZIP -s "$DMZSRC" -p $PROTOCOL -m $PROTOCOL --dport $PORT -j ACCEPT
+else
+iptables -t nat -A PREROUTING -i $EXTIF -p $PROTOCOL -m $PROTOCOL --dport $PORT -j DNAT --to-destination "$DMZIP":"$PORT"
+iptables -A FORWARD -i $EXTIF -d $DMZIP -p $PROTOCOL -m $PROTOCOL --dport $PORT -j ACCEPT
+fi
+
done
+fi
+if [ "$DMZSRC" ]
+then
+
+iptables -t nat -A PREROUTING -p tcp -i $EXTIF -s \! "$DMZSRC" -j DNAT --to-destination $DMZIP
+iptables -t nat -A PREROUTING -p udp -i $EXTIF -s \! "$DMZSRC" -j DNAT --to-destination $DMZIP
+
+iptables -A FORWARD -i $EXTIF -o $IF -s \! "$DMZSRC" -d $DMZIP -m state --state NEW -p tcp -j ACCEPT
+iptables -A FORWARD -i $EXTIF -o $IF -s \! "$DMZSRC" -d $DMZIP -m state --state NEW -p udp -j ACCEPT
+
else
iptables -t nat -A PREROUTING -p tcp -i $EXTIF -j DNAT --to-destination $DMZIP
Modified: trunk/target/generic/target_skeleton/stat/etc/rc.conf
===================================================================
--- trunk/target/generic/target_skeleton/stat/etc/rc.conf 2007-04-30 19:32:01 UTC (rev 993)
+++ trunk/target/generic/target_skeleton/stat/etc/rc.conf 2007-05-01 16:04:02 UTC (rev 994)
@@ -195,6 +195,10 @@
##a real name or another variable from this file.
#DMZIPIF="$INT2IF"
+##You can also specify a list of ports to bypass your DMZSRC exclusion.
+##Use this if you need to connect to a specific service on DMZIP from DMZSRC
+#NODMZPORTS="t25 t110 t143"
+
##PPPoE support from Roaring Penguin. If you define PPPOEUSER below, AstLinux
##will run rp-pppoe on your $PPPOEIF. You will also need to set EXTIF to "ppp0".
##PPPoE kernel support
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2007-05-01 18:43:13
|
Revision: 996
http://svn.sourceforge.net/astlinux/?rev=996&view=rev
Author: krisk84
Date: 2007-05-01 11:43:15 -0700 (Tue, 01 May 2007)
Log Message:
-----------
various init fixes
Modified Paths:
--------------
trunk/package/asterisk/asterisk.init
trunk/target/generic/target_skeleton/etc/rc
Modified: trunk/package/asterisk/asterisk.init
===================================================================
--- trunk/package/asterisk/asterisk.init 2007-05-01 16:04:52 UTC (rev 995)
+++ trunk/package/asterisk/asterisk.init 2007-05-01 18:43:15 UTC (rev 996)
@@ -87,15 +87,18 @@
modprobe pikainline
fi
+if `which pikacf > /dev/null 2> /dev/null`
+then
if [ -r /usr/share/pika/montecarlo/conf/pikaconfig.xml ]
then
echo "PikaInline already configured..."
else
mount -o rw,remount /
-echo "Running initial configuration for pikainlineMM..."
+echo "Running initial configuration for PikaInline..."
pikacf -a /dev/null 1>/dev/null &
mount -o ro,remount /
fi
+fi
}
start () {
Modified: trunk/target/generic/target_skeleton/etc/rc
===================================================================
--- trunk/target/generic/target_skeleton/etc/rc 2007-05-01 16:04:52 UTC (rev 995)
+++ trunk/target/generic/target_skeleton/etc/rc 2007-05-01 18:43:15 UTC (rev 996)
@@ -236,8 +236,11 @@
then
ln -sf /mnt/kd/rc.conf /tmp/etc/rc.conf
else
+if [ -f /stat/etc/rc.conf ]
+then
cp -a /stat/etc/rc.conf /tmp/etc/rc.conf
fi
+fi
if [ -d /stat/etc/rc.conf.d ]
then
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2007-05-03 18:47:28
|
Revision: 1004
http://svn.sourceforge.net/astlinux/?rev=1004&view=rev
Author: krisk84
Date: 2007-05-03 11:46:47 -0700 (Thu, 03 May 2007)
Log Message:
-----------
build with runnix booting by default
Modified Paths:
--------------
trunk/target/Config.in
trunk/toolchain/astrelease/astrelease.mk
Added Paths:
-----------
trunk/target/x86/runnix/
trunk/target/x86/runnix/Config.in
trunk/target/x86/runnix/runnix.mk
Modified: trunk/target/Config.in
===================================================================
--- trunk/target/Config.in 2007-05-03 16:13:47 UTC (rev 1003)
+++ trunk/target/Config.in 2007-05-03 18:46:47 UTC (rev 1004)
@@ -18,6 +18,7 @@
comment "bootloader for target device"
source "target/x86/grub/Config.in"
+source "target/x86/runnix/Config.in"
source "target/x86/syslinux/Config.in"
source "target/powerpc/yaboot/Config.in"
source "target/arm/u-boot/Config.in"
Added: trunk/target/x86/runnix/Config.in
===================================================================
--- trunk/target/x86/runnix/Config.in (rev 0)
+++ trunk/target/x86/runnix/Config.in 2007-05-03 18:46:47 UTC (rev 1004)
@@ -0,0 +1,9 @@
+config BR2_TARGET_RUNNIX
+ bool "runnix"
+ default n
+ depends on BR2_i386
+ select BR2_TARGET_SYSLINUX
+ help
+ The runnix bootloader for x86 systems
+
+ http://www.runnix.org
Added: trunk/target/x86/runnix/runnix.mk
===================================================================
--- trunk/target/x86/runnix/runnix.mk (rev 0)
+++ trunk/target/x86/runnix/runnix.mk 2007-05-03 18:46:47 UTC (rev 1004)
@@ -0,0 +1,41 @@
+#############################################################
+#
+# runnix
+#
+#############################################################
+RUNNIX_VER:=0.2.1
+RUNNIX_SOURCE:=runnix-$(RUNNIX_VER).tar.gz
+RUNNIX_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/runnix
+RUNNIX_DIR:=$(BUILD_DIR)/runnix-$(RUNNIX_VER)
+RUNNIX_CAT:=zcat
+RUNNIX_TARGET_DIR=$(BUILD_DIR)/runfs
+
+$(DL_DIR)/$(RUNNIX_SOURCE):
+ $(WGET) -P $(DL_DIR) $(RUNNIX_SITE)/$(RUNNIX_SOURCE)
+
+$(RUNNIX_DIR)/.unpacked: $(DL_DIR)/$(RUNNIX_SOURCE)
+ $(RUNNIX_CAT) $(DL_DIR)/$(RUNNIX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ touch $(RUNNIX_DIR)/.unpacked
+
+$(RUNNIX_TARGET_DIR)/runnix: $(RUNNIX_DIR)/.unpacked
+ mkdir -p $(RUNNIX_TARGET_DIR)
+ cp -a $(RUNNIX_DIR)/rootfs_vfat/* $(RUNNIX_TARGET_DIR)
+ touch -c $(RUNNIX_TARGET_DIR)/runnix
+
+runnix: $(RUNNIX_TARGET_DIR)/runnix
+
+runnix-clean:
+ -rm $(RUNNIX_TARGET_DIR)
+
+runnix-dirclean:
+ -rm -rf $(RUNNIX_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_TARGET_RUNNIX)),y)
+TARGETS+=runnix
+endif
+
Modified: trunk/toolchain/astrelease/astrelease.mk
===================================================================
--- trunk/toolchain/astrelease/astrelease.mk 2007-05-03 16:13:47 UTC (rev 1003)
+++ trunk/toolchain/astrelease/astrelease.mk 2007-05-03 18:46:47 UTC (rev 1004)
@@ -24,8 +24,14 @@
sha1sum $(ASTVER).tar.gz > $(ASTVER).tar.gz.sha1
touch -c $(ASTVER).tar.gz.sha1
-astrelease: $(ASTVER).tar.gz.sha1
+$(RUNNIX_TARGET_DIR)/os/ver:
+ cp $(ASTVER)/* $(RUNNIX_TARGET_DIR)/os/
+ echo $(ASTVER) > $(RUNNIX_TARGET_DIR)/os/ver
+astrelease: ext2initrd squashfsroot $(ASTVER).tar.gz.sha1
+
+runfs: runnix $(RUNNIX_TARGET_DIR)/os/ver
+
astrelease-source:
astrelease-clean:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2007-05-03 19:02:47
|
Revision: 1006
http://svn.sourceforge.net/astlinux/?rev=1006&view=rev
Author: krisk84
Date: 2007-05-03 12:02:45 -0700 (Thu, 03 May 2007)
Log Message:
-----------
copy custom syslinux.cfg files for runnix based on platform
Modified Paths:
--------------
trunk/toolchain/astrelease/astrelease.mk
Added Paths:
-----------
trunk/target/device/geni586/runnix/syslinux.cfg
trunk/target/device/net4801/runnix/syslinux.cfg
trunk/target/device/wrap/runnix/syslinux.cfg
Added: trunk/target/device/geni586/runnix/syslinux.cfg
===================================================================
--- trunk/target/device/geni586/runnix/syslinux.cfg (rev 0)
+++ trunk/target/device/geni586/runnix/syslinux.cfg 2007-05-03 19:02:45 UTC (rev 1006)
@@ -0,0 +1,10 @@
+# serial 0 19200
+# console 1
+default runnix
+timeout 5
+prompt 1
+display boot.msg
+
+label runnix
+ kernel runnix
+ append initrd=runnix.img root=/dev/ram0 rw init=/runnix runimg=auto rootdelay=10
Property changes on: trunk/target/device/geni586/runnix/syslinux.cfg
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/target/device/net4801/runnix/syslinux.cfg
===================================================================
--- trunk/target/device/net4801/runnix/syslinux.cfg (rev 0)
+++ trunk/target/device/net4801/runnix/syslinux.cfg 2007-05-03 19:02:45 UTC (rev 1006)
@@ -0,0 +1,10 @@
+serial 0 19200
+console 1
+default runnix
+timeout 5
+prompt 1
+display boot.msg
+
+label runnix
+ kernel runnix
+ append initrd=runnix.img console=ttyS0,19200n8 root=/dev/ram0 rw init=/runnix runimg=auto ide=nodma
Property changes on: trunk/target/device/net4801/runnix/syslinux.cfg
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/target/device/wrap/runnix/syslinux.cfg
===================================================================
--- trunk/target/device/wrap/runnix/syslinux.cfg (rev 0)
+++ trunk/target/device/wrap/runnix/syslinux.cfg 2007-05-03 19:02:45 UTC (rev 1006)
@@ -0,0 +1,10 @@
+serial 0 38400
+console 1
+default runnix
+timeout 5
+prompt 1
+display boot.msg
+
+label runnix
+ kernel runnix
+ append initrd=runnix.img console=ttyS0,38400n8 root=/dev/ram0 rw init=/runnix runimg=auto ide=nodma reboot=bios
Property changes on: trunk/target/device/wrap/runnix/syslinux.cfg
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/toolchain/astrelease/astrelease.mk
===================================================================
--- trunk/toolchain/astrelease/astrelease.mk 2007-05-03 18:48:38 UTC (rev 1005)
+++ trunk/toolchain/astrelease/astrelease.mk 2007-05-03 19:02:45 UTC (rev 1006)
@@ -26,11 +26,12 @@
$(RUNNIX_TARGET_DIR)/os/ver:
cp $(ASTVER)/* $(RUNNIX_TARGET_DIR)/os/
+ cp $(DEV_PATH)/runnix/syslinux.cfg $(RUNNIX_TARGET_DIR)/syslinux.cfg
echo $(ASTVER) > $(RUNNIX_TARGET_DIR)/os/ver
astrelease: ext2initrd squashfsroot $(ASTVER).tar.gz.sha1
-runfs: runnix $(RUNNIX_TARGET_DIR)/os/ver
+runfs: astrelease runnix $(RUNNIX_TARGET_DIR)/os/ver
astrelease-source:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2007-05-03 19:13:00
|
Revision: 1007
http://svn.sourceforge.net/astlinux/?rev=1007&view=rev
Author: krisk84
Date: 2007-05-03 12:12:38 -0700 (Thu, 03 May 2007)
Log Message:
-----------
fixups for runnix/astrelease
Modified Paths:
--------------
trunk/target/x86/runnix/runnix.mk
trunk/toolchain/astrelease/astrelease.mk
Modified: trunk/target/x86/runnix/runnix.mk
===================================================================
--- trunk/target/x86/runnix/runnix.mk 2007-05-03 19:02:45 UTC (rev 1006)
+++ trunk/target/x86/runnix/runnix.mk 2007-05-03 19:12:38 UTC (rev 1007)
@@ -8,7 +8,7 @@
RUNNIX_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/runnix
RUNNIX_DIR:=$(BUILD_DIR)/runnix-$(RUNNIX_VER)
RUNNIX_CAT:=zcat
-RUNNIX_TARGET_DIR=$(BUILD_DIR)/runfs
+RUNFS_DIR=$(BUILD_DIR)/runfs
$(DL_DIR)/$(RUNNIX_SOURCE):
$(WGET) -P $(DL_DIR) $(RUNNIX_SITE)/$(RUNNIX_SOURCE)
@@ -17,19 +17,27 @@
$(RUNNIX_CAT) $(DL_DIR)/$(RUNNIX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
touch $(RUNNIX_DIR)/.unpacked
-$(RUNNIX_TARGET_DIR)/runnix: $(RUNNIX_DIR)/.unpacked
- mkdir -p $(RUNNIX_TARGET_DIR)
- cp -a $(RUNNIX_DIR)/rootfs_vfat/* $(RUNNIX_TARGET_DIR)
- touch -c $(RUNNIX_TARGET_DIR)/runnix
+$(RUNFS_DIR)/runnix: $(RUNNIX_DIR)/.unpacked
+ mkdir -p $(RUNFS_DIR)
+ cp -a $(RUNNIX_DIR)/rootfs_vfat/* $(RUNFS_DIR)
+ touch -c $(RUNFS_DIR)/runnix
-runnix: $(RUNNIX_TARGET_DIR)/runnix
+runnix: $(RUNFS_DIR)/runnix
-runnix-clean:
- -rm -rf $(RUNNIX_TARGET_DIR)
+runfs-dirclean:
+ -rm -rf $(RUNFS_DIR)
runnix-dirclean:
-rm -rf $(RUNNIX_DIR)
+$(RUNFS_DIR)/os/ver:
+ cp $(ASTVER)/* $(RUNFS_DIR)/os/
+ -rm $(RUNFS_DIR)/*.sample
+ cp $(DEV_PATH)/runnix/syslinux.cfg $(RUNFS_DIR)/syslinux.cfg
+ echo $(ASTVER) > $(RUNFS_DIR)/os/ver
+
+runfs: astrelease runnix $(RUNFS_DIR)/os/ver
+
#############################################################
#
# Toplevel Makefile options
Modified: trunk/toolchain/astrelease/astrelease.mk
===================================================================
--- trunk/toolchain/astrelease/astrelease.mk 2007-05-03 19:02:45 UTC (rev 1006)
+++ trunk/toolchain/astrelease/astrelease.mk 2007-05-03 19:12:38 UTC (rev 1007)
@@ -24,17 +24,8 @@
sha1sum $(ASTVER).tar.gz > $(ASTVER).tar.gz.sha1
touch -c $(ASTVER).tar.gz.sha1
-$(RUNNIX_TARGET_DIR)/os/ver:
- cp $(ASTVER)/* $(RUNNIX_TARGET_DIR)/os/
- cp $(DEV_PATH)/runnix/syslinux.cfg $(RUNNIX_TARGET_DIR)/syslinux.cfg
- echo $(ASTVER) > $(RUNNIX_TARGET_DIR)/os/ver
-
astrelease: ext2initrd squashfsroot $(ASTVER).tar.gz.sha1
-runfs: astrelease runnix $(RUNNIX_TARGET_DIR)/os/ver
-
-astrelease-source:
-
astrelease-clean:
-rm -f $(ASTVER).tar.gz
-rm -f $(ASTVER).tar.gz.sha1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2007-05-15 14:07:56
|
Revision: 1056
http://svn.sourceforge.net/astlinux/?rev=1056&view=rev
Author: krisk84
Date: 2007-05-15 07:07:55 -0700 (Tue, 15 May 2007)
Log Message:
-----------
additional support for runnix with serial ports
Modified Paths:
--------------
trunk/target/device/geni586/Makefile.in
trunk/target/device/net4801/Makefile.in
trunk/target/device/net5501/Makefile.in
trunk/target/device/via/Makefile.in
trunk/target/device/wrap/Makefile.in
trunk/toolchain/astrelease/astrelease.mk
Added Paths:
-----------
trunk/target/device/geni586/runnix-serial/
trunk/target/device/geni586/runnix-serial/runnix.conf
trunk/target/device/geni586/runnix-serial/syslinux.cfg
trunk/target/device/via/runnix/syslinux.cfg
trunk/target/device/via/runnix-serial/
trunk/target/device/via/runnix-serial/runnix.conf
trunk/target/device/via/runnix-serial/syslinux.cfg
Modified: trunk/target/device/geni586/Makefile.in
===================================================================
--- trunk/target/device/geni586/Makefile.in 2007-05-15 14:06:54 UTC (rev 1055)
+++ trunk/target/device/geni586/Makefile.in 2007-05-15 14:07:55 UTC (rev 1056)
@@ -7,9 +7,11 @@
UCLIBC_CONFIG_FILE=$(GENI586_PATH)/uClibc.config
TARGET_SKEL2_DIR=$(GENI586_PATH)/target_skeleton
BR2_PACKAGE_BUSYBOX_CONFIG:=$(GENI586_PATH)/busybox.config
+TARGET_RUNNIX_DIR=$(GENI586_PATH)/runnix
ifeq ($(strip $(BR2_TARGET_GENI586_SERIAL)),y)
TARGET_SKEL2_DIR=$(GENI586_PATH)/target_skeleton-serial
+TARGET_RUNNIX_DIR=$(GENI586_PATH)/runnix-serial
endif
ifeq ($(strip $(BR2_PACKAGE_LINUX)),y)
Added: trunk/target/device/geni586/runnix-serial/runnix.conf
===================================================================
--- trunk/target/device/geni586/runnix-serial/runnix.conf (rev 0)
+++ trunk/target/device/geni586/runnix-serial/runnix.conf 2007-05-15 14:07:55 UTC (rev 1056)
@@ -0,0 +1,10 @@
+# Kernel command line
+KCMD="root=/dev/ram0 rw init=/linuxrc console=ttyS0,19200n8 astlinux=geni586 astimg=ASTVER.run astkd=/dev/sda1 astlive ide=nodma"
+# Offset for root filesystem
+# OFFSET="32256"
+# location of kernel binary inside root (include mountpoint)
+KERN="/mnt/root/boot/bzImage"
+# root fs type
+FSTYPE="squashfs"
+# initrd location relative to runnix /
+INITRD="/mnt/base/os/initrd.img"
Added: trunk/target/device/geni586/runnix-serial/syslinux.cfg
===================================================================
--- trunk/target/device/geni586/runnix-serial/syslinux.cfg (rev 0)
+++ trunk/target/device/geni586/runnix-serial/syslinux.cfg 2007-05-15 14:07:55 UTC (rev 1056)
@@ -0,0 +1,10 @@
+serial 0 19200
+console 1
+default runnix
+timeout 5
+prompt 1
+display boot.msg
+
+label runnix
+ kernel runnix
+ append initrd=runnix.img root=/dev/ram0 rw init=/runnix console=ttyS0,19200n8 runimg=auto rootdelay=10
Property changes on: trunk/target/device/geni586/runnix-serial/syslinux.cfg
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/target/device/net4801/Makefile.in
===================================================================
--- trunk/target/device/net4801/Makefile.in 2007-05-15 14:06:54 UTC (rev 1055)
+++ trunk/target/device/net4801/Makefile.in 2007-05-15 14:07:55 UTC (rev 1056)
@@ -7,6 +7,7 @@
UCLIBC_CONFIG_FILE=$(SOEKRIS_NET4801_PATH)/uClibc.config
TARGET_SKEL2_DIR=$(SOEKRIS_NET4801_PATH)/target_skeleton
BR2_PACKAGE_BUSYBOX_CONFIG:=$(SOEKRIS_NET4801_PATH)/busybox.config
+TARGET_RUNNIX_DIR=$(SOEKRIS_NET4801_PATH)/runnix
ifeq ($(strip $(BR2_PACKAGE_LINUX)),y)
TARGETS+=linux
Modified: trunk/target/device/net5501/Makefile.in
===================================================================
--- trunk/target/device/net5501/Makefile.in 2007-05-15 14:06:54 UTC (rev 1055)
+++ trunk/target/device/net5501/Makefile.in 2007-05-15 14:07:55 UTC (rev 1056)
@@ -7,6 +7,7 @@
UCLIBC_CONFIG_FILE=$(SOEKRIS_NET5501_PATH)/uClibc.config
TARGET_SKEL2_DIR=$(SOEKRIS_NET5501_PATH)/target_skeleton
BR2_PACKAGE_BUSYBOX_CONFIG:=$(SOEKRIS_NET5501_PATH)/busybox.config
+TARGET_RUNNIX_DIR=$(SOEKRIS_NET5501_PATH)/runnix
ifeq ($(strip $(BR2_PACKAGE_LINUX)),y)
TARGETS+=linux
Modified: trunk/target/device/via/Makefile.in
===================================================================
--- trunk/target/device/via/Makefile.in 2007-05-15 14:06:54 UTC (rev 1055)
+++ trunk/target/device/via/Makefile.in 2007-05-15 14:07:55 UTC (rev 1056)
@@ -7,9 +7,11 @@
UCLIBC_CONFIG_FILE=$(VIA_PATH)/uClibc.config
TARGET_SKEL2_DIR=$(VIA_PATH)/target_skeleton
BR2_PACKAGE_BUSYBOX_CONFIG:=$(VIA_PATH)/busybox.config
+TARGET_RUNNIX_DIR=$(VIA_PATH)/runnix
ifeq ($(strip $(BR2_TARGET_VIA_SERIAL)),y)
TARGET_SKEL2_DIR=$(VIA_PATH)/target_skeleton-serial
+TARGET_RUNNIX_DIR=$(VIA_PATH)/runnix-serial
endif
ifeq ($(strip $(BR2_PACKAGE_LINUX)),y)
Added: trunk/target/device/via/runnix/syslinux.cfg
===================================================================
--- trunk/target/device/via/runnix/syslinux.cfg (rev 0)
+++ trunk/target/device/via/runnix/syslinux.cfg 2007-05-15 14:07:55 UTC (rev 1056)
@@ -0,0 +1,10 @@
+# serial 0 19200
+# console 1
+default runnix
+timeout 5
+prompt 1
+display boot.msg
+
+label runnix
+ kernel runnix
+ append initrd=runnix.img root=/dev/ram0 rw init=/runnix runimg=auto rootdelay=10
Property changes on: trunk/target/device/via/runnix/syslinux.cfg
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/target/device/via/runnix-serial/runnix.conf
===================================================================
--- trunk/target/device/via/runnix-serial/runnix.conf (rev 0)
+++ trunk/target/device/via/runnix-serial/runnix.conf 2007-05-15 14:07:55 UTC (rev 1056)
@@ -0,0 +1,10 @@
+# Kernel command line
+KCMD="root=/dev/ram0 rw init=/linuxrc console=ttyS0,19200n8 astlinux=via astimg=ASTVER.run astkd=/dev/sda1 astlive ide=nodma"
+# Offset for root filesystem
+# OFFSET="32256"
+# location of kernel binary inside root (include mountpoint)
+KERN="/mnt/root/boot/bzImage"
+# root fs type
+FSTYPE="squashfs"
+# initrd location relative to runnix /
+INITRD="/mnt/base/os/initrd.img"
Added: trunk/target/device/via/runnix-serial/syslinux.cfg
===================================================================
--- trunk/target/device/via/runnix-serial/syslinux.cfg (rev 0)
+++ trunk/target/device/via/runnix-serial/syslinux.cfg 2007-05-15 14:07:55 UTC (rev 1056)
@@ -0,0 +1,10 @@
+serial 0 19200
+console 1
+default runnix
+timeout 5
+prompt 1
+display boot.msg
+
+label runnix
+ kernel runnix
+ append initrd=runnix.img root=/dev/ram0 rw init=/runnix console=ttyS0,19200n8 runimg=auto rootdelay=10
Property changes on: trunk/target/device/via/runnix-serial/syslinux.cfg
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/target/device/wrap/Makefile.in
===================================================================
--- trunk/target/device/wrap/Makefile.in 2007-05-15 14:06:54 UTC (rev 1055)
+++ trunk/target/device/wrap/Makefile.in 2007-05-15 14:07:55 UTC (rev 1056)
@@ -8,6 +8,7 @@
UCLIBC_CONFIG_FILE=$(PCENGINES_WRAP_PATH)/uClibc.config
TARGET_SKEL2_DIR=$(PCENGINES_WRAP_PATH)/target_skeleton
BR2_PACKAGE_BUSYBOX_CONFIG:=$(PCENGINES_WRAP_PATH)/busybox.config
+TARGET_RUNNIX_DIR=$(PCENGINES_WRAP_PATH)/runnix
ifeq ($(strip $(BR2_PACKAGE_LINUX)),y)
TARGETS+=linux
Modified: trunk/toolchain/astrelease/astrelease.mk
===================================================================
--- trunk/toolchain/astrelease/astrelease.mk 2007-05-15 14:06:54 UTC (rev 1055)
+++ trunk/toolchain/astrelease/astrelease.mk 2007-05-15 14:07:55 UTC (rev 1056)
@@ -10,7 +10,7 @@
cp $(SQUASHFS_TARGET) $(ASTVER)/$(ASTVER).run
(cd $(ASTVER); sha1sum $(ASTVER).run > $(ASTVER).run.sha1)
touch $(ASTVER)/astflag
- sed -e s/ASTVER/$(ASTVER)/g $(DEV_PATH)/runnix/runnix.conf > \
+ sed -e s/ASTVER/$(ASTVER)/g $(TARGET_RUNNIX_DIR)/runnix.conf > \
$(ASTVER)/$(ASTVER).run.conf
ifneq ($(wildcard $(DEV_PATH)/runnix/initrd.img),)
cp $(DEV_PATH)/runnix/initrd.img $(ASTVER)/initrd.img
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dha...@us...> - 2007-05-23 05:37:23
|
Revision: 1068
http://svn.sourceforge.net/astlinux/?rev=1068&view=rev
Author: dhartman
Date: 2007-05-22 22:37:23 -0700 (Tue, 22 May 2007)
Log Message:
-----------
initial opendns support
Modified Paths:
--------------
trunk/package/dnsmasq/dnsmasq.init
trunk/target/generic/target_skeleton/stat/etc/rc.conf
Modified: trunk/package/dnsmasq/dnsmasq.init
===================================================================
--- trunk/package/dnsmasq/dnsmasq.init 2007-05-18 20:26:45 UTC (rev 1067)
+++ trunk/package/dnsmasq/dnsmasq.init 2007-05-23 05:37:23 UTC (rev 1068)
@@ -58,6 +58,13 @@
dhcp-leasefile=/var/db/dnsmasq.leases
cache-size=150" > /tmp/etc/dnsmasq.conf
+if [ "$OPENDNS" -a "$OPENDNS" = "yes" ]
+then
+echo "nameserver 208.67.222.222
+nameserver 208.67.220.220" > /tmp/etc/resolv.opendns.conf
+echo "resolv-file=/tmp/etc/resolv.opendns.conf" >> /tmp/etc/dnsmasq.conf
+fi
+
if [ "$NFSDROOTPATH" ]
then
echo "dhcp-option=lan,17,$NFSDROOTPATH" >> /tmp/etc/dnsmasq.conf
Modified: trunk/target/generic/target_skeleton/stat/etc/rc.conf
===================================================================
--- trunk/target/generic/target_skeleton/stat/etc/rc.conf 2007-05-18 20:26:45 UTC (rev 1067)
+++ trunk/target/generic/target_skeleton/stat/etc/rc.conf 2007-05-23 05:37:23 UTC (rev 1068)
@@ -141,6 +141,10 @@
##for DNS resolution on THIS machine.
#LOCALDNS=yes
+##Use OpenDNS servers
+##This setting overrides the dns servers used by dnsmasq
+#OPENDNS=yes
+
##If you do not define the INTIF, I will not try to start one.
##If you do not define the INTIF, I will also not start the following services:
##dnsmasq iptables astshape (PBX only mode)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dha...@us...> - 2007-05-24 14:22:32
|
Revision: 1073
http://svn.sourceforge.net/astlinux/?rev=1073&view=rev
Author: dhartman
Date: 2007-05-24 07:22:25 -0700 (Thu, 24 May 2007)
Log Message:
-----------
reverse opendns commits
Modified Paths:
--------------
trunk/package/dnsmasq/dnsmasq.init
trunk/target/generic/target_skeleton/stat/etc/rc.conf
Modified: trunk/package/dnsmasq/dnsmasq.init
===================================================================
--- trunk/package/dnsmasq/dnsmasq.init 2007-05-24 04:45:02 UTC (rev 1072)
+++ trunk/package/dnsmasq/dnsmasq.init 2007-05-24 14:22:25 UTC (rev 1073)
@@ -34,18 +34,11 @@
then
RCONF="/tmp/etc/resolv-up.conf"
echo "search $DOMAIN
-nameserver 127.0.0.1" > /tmp/etc/resolv-up.conf
+nameserver 127.0.0.1" > /tmp/etc/resolv.conf
else
RCONF="/tmp/etc/resolv.conf"
fi
-if [ "$OPENDNS" ]
-then
-echo "nameserver 208.67.222.222
-nameserver 208.67.220.220" >> /tmp/etc/resolv-up.conf
-RCONF="tmp/etc/resolv-up.conf"
-fi
-
echo "domain-needed
bogus-priv
local=/$DOMAIN/
@@ -153,3 +146,4 @@
;;
esac
+
Modified: trunk/target/generic/target_skeleton/stat/etc/rc.conf
===================================================================
--- trunk/target/generic/target_skeleton/stat/etc/rc.conf 2007-05-24 04:45:02 UTC (rev 1072)
+++ trunk/target/generic/target_skeleton/stat/etc/rc.conf 2007-05-24 14:22:25 UTC (rev 1073)
@@ -141,10 +141,6 @@
##for DNS resolution on THIS machine.
#LOCALDNS=yes
-##Use OpenDNS servers
-##This setting overrides the dns servers used by dnsmasq
-#OPENDNS=yes
-
##If you do not define the INTIF, I will not try to start one.
##If you do not define the INTIF, I will also not start the following services:
##dnsmasq iptables astshape (PBX only mode)
@@ -625,3 +621,4 @@
## End rc.conf ##
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2007-05-29 20:08:52
|
Revision: 1077
http://svn.sourceforge.net/astlinux/?rev=1077&view=rev
Author: krisk84
Date: 2007-05-29 13:08:48 -0700 (Tue, 29 May 2007)
Log Message:
-----------
- update to support IPv6 anywhere possible
- disable SMP on geni586
- default to tsc for IP QoS
- delete extra busybox config files - they
are confusing
There will need to be more testing to make
sure that IPv6 works like it is supposed to!
Modified Paths:
--------------
trunk/package/appweb/appweb.mk
trunk/package/busybox/busybox-astlinux.config
trunk/package/ipsec-tools/Config.in
trunk/package/ipsec-tools/ipsec-tools.mk
trunk/package/iptables/iptables.mk
trunk/package/php5/php5.mk
trunk/package/quagga/quagga.mk
trunk/package/wget/wget.mk
trunk/target/device/geni586/linux.config
Removed Paths:
-------------
trunk/package/iptables/iptables-no-xml.patch
trunk/target/device/geni586/busybox.config
trunk/target/device/net4801/busybox.config
trunk/target/device/net5501/busybox.config
trunk/target/device/via/busybox.config
trunk/target/device/wrap/busybox.config
Modified: trunk/package/appweb/appweb.mk
===================================================================
--- trunk/package/appweb/appweb.mk 2007-05-29 20:06:51 UTC (rev 1076)
+++ trunk/package/appweb/appweb.mk 2007-05-29 20:08:48 UTC (rev 1077)
@@ -35,7 +35,6 @@
--enable-access-log \
--enable-config-parse \
--disable-config-save \
- --disable-ipv6 \
--enable-run-as-service \
--disable-samples \
--enable-squeeze \
Modified: trunk/package/busybox/busybox-astlinux.config
===================================================================
--- trunk/package/busybox/busybox-astlinux.config 2007-05-29 20:06:51 UTC (rev 1076)
+++ trunk/package/busybox/busybox-astlinux.config 2007-05-29 20:08:48 UTC (rev 1077)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.4.1
-# Wed Feb 7 11:48:53 2007
+# Tue May 29 14:19:22 2007
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -60,7 +60,7 @@
CONFIG_INSTALL_APPLET_SYMLINKS=y
# CONFIG_INSTALL_APPLET_HARDLINKS is not set
# CONFIG_INSTALL_APPLET_DONT is not set
-CONFIG_PREFIX="./install"
+CONFIG_PREFIX="/home/kris/projects/astlinux-trunk/build_i586/root"
#
# Busybox Library Tuning
@@ -490,7 +490,7 @@
#
# Networking Utilities
#
-# CONFIG_FEATURE_IPV6 is not set
+CONFIG_FEATURE_IPV6=y
CONFIG_ARP=y
CONFIG_ARPING=y
# CONFIG_DNSD is not set
@@ -521,7 +521,7 @@
# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN=y
CONFIG_FEATURE_IFUPDOWN_IPV4=y
-# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
+CONFIG_FEATURE_IFUPDOWN_IPV6=y
# CONFIG_FEATURE_IFUPDOWN_IPX is not set
# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
CONFIG_INETD=y
@@ -554,8 +554,8 @@
CONFIG_NSLOOKUP=y
CONFIG_PING=y
CONFIG_FEATURE_FANCY_PING=y
-# CONFIG_PING6 is not set
-# CONFIG_FEATURE_FANCY_PING6 is not set
+CONFIG_PING6=y
+CONFIG_FEATURE_FANCY_PING6=y
CONFIG_ROUTE=y
CONFIG_TELNET=y
CONFIG_FEATURE_TELNET_TTYPE=y
@@ -581,7 +581,7 @@
CONFIG_WGET=y
CONFIG_FEATURE_WGET_STATUSBAR=y
CONFIG_FEATURE_WGET_AUTHENTICATION=y
-# CONFIG_FEATURE_WGET_IP6_LITERAL is not set
+CONFIG_FEATURE_WGET_IP6_LITERAL=y
# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
CONFIG_ZCIP=y
Modified: trunk/package/ipsec-tools/Config.in
===================================================================
--- trunk/package/ipsec-tools/Config.in 2007-05-29 20:06:51 UTC (rev 1076)
+++ trunk/package/ipsec-tools/Config.in 2007-05-29 20:08:48 UTC (rev 1077)
@@ -41,14 +41,6 @@
depends on BR2_PACKAGE_IPSEC_TOOLS
bool "Enable statistics logging function."
-config BR2_PACKAGE_IPSEC_TOOLS_IPV6
- default y
- depends on BR2_PACKAGE_IPSEC_TOOLS
- bool "Enable IPv6 support"
- help
- This option has no effect if uClibc has been compiled without
- IPv6 support.
-
config BR2_PACKAGE_IPSEC_TOOLS_READLINE
default n
depends on BR2_PACKAGE_IPSEC_TOOLS
Modified: trunk/package/ipsec-tools/ipsec-tools.mk
===================================================================
--- trunk/package/ipsec-tools/ipsec-tools.mk 2007-05-29 20:06:51 UTC (rev 1076)
+++ trunk/package/ipsec-tools/ipsec-tools.mk 2007-05-29 20:08:48 UTC (rev 1077)
@@ -41,20 +41,6 @@
IPSEC_TOOLS_CONFIG_FLAGS+= --disable-stats
endif
-# At first check, if uClibc supports IPv6
-ifeq ($(shell grep -qs '__UCLIBC_HAS_IPV6__ 1' \
- $(STAGING_DIR)/include/bits/uClibc_config.h && echo IPV6), IPV6)
-
-ifeq ($(strip $(BR2_PACKAGE_IPSEC_TOOLS_IPV6)), y)
-IPSEC_TOOLS_CONFIG_FLAGS+= --enable-ipv6
-else
-IPSEC_TOOLS_CONFIG_FLAGS+= --disable-ipv6
-endif
-
-else # ignore user's choice if it doesn't
-IPSEC_TOOLS_CONFIG_FLAGS+= --disable-ipv6
-endif
-
ifneq ($(strip $(BR2_PACKAGE_IPSEC_TOOLS_READLINE)), y)
IPSEC_TOOLS_CONFIG_FLAGS+= --without-readline
endif
@@ -82,7 +68,7 @@
--enable-dpd \
--disable-gssapi \
--with-kernel-headers=$(STAGING_DIR)/include \
- $(IPSEC_TOOLS_CONFIG_FLAGS) \
+ --enable-ipv6 \
);
touch $(IPSEC_TOOLS_DIR)/.configured
Deleted: trunk/package/iptables/iptables-no-xml.patch
===================================================================
--- trunk/package/iptables/iptables-no-xml.patch 2007-05-29 20:06:51 UTC (rev 1076)
+++ trunk/package/iptables/iptables-no-xml.patch 2007-05-29 20:08:48 UTC (rev 1077)
@@ -1,32 +0,0 @@
---- iptables-1.3.7/Makefile 2006-12-04 03:16:01.000000000 -0800
-+++ /tmp/Makefile 2006-12-04 16:16:26.000000000 -0800
-@@ -27,7 +27,7 @@
- RELEASE_DIR:=/tmp
-
- # Need libc6 for this. FIXME: Should covert to autoconf.
--ifeq ($(shell [ -f /usr/include/netinet/ip6.h ] && echo YES), YES)
-+ifeq ($(shell grep -q '__UCLIBC_HAS_IPV6__ 1' /home/craig/code/gumstix/trunk/build_arm_nofpu/staging_dir/include/bits/uClibc_config.h && echo YES), YES)
- DO_IPV6:=1
- endif
-
-@@ -48,9 +48,9 @@
-
- # No longer experimental.
- ifneq ($(DO_MULTI), 1)
--EXTRAS+=iptables-save iptables-restore iptables-xml
-+EXTRAS+=iptables-save iptables-restore
- endif
--EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/iptables-save $(DESTDIR)$(BINDIR)/iptables-restore $(DESTDIR)$(BINDIR)/iptables-xml $(DESTDIR)$(MANDIR)/man8/iptables-restore.8 $(DESTDIR)$(MANDIR)/man8/iptables-save.8
-+EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/iptables-save $(DESTDIR)$(BINDIR)/iptables-restore $(DESTDIR)$(MANDIR)/man8/iptables-restore.8 $(DESTDIR)$(MANDIR)/man8/iptables-save.8
-
- ifeq ($(DO_IPV6), 1)
- EXTRAS+=ip6tables ip6tables.o ip6tables.8
-@@ -129,7 +129,7 @@
- $(CC) $(CFLAGS) -DIPT_LIB_DIR=\"$(IPT_LIBDIR)\" -c -o $@ $<
-
- ifeq ($(DO_MULTI), 1)
--iptables: iptables-multi.c iptables-save.c iptables-restore.c iptables-xml.c iptables-standalone.c iptables.o $(STATIC_LIBS) libiptc/libiptc.a
-+iptables: iptables-multi.c iptables-save.c iptables-restore.c iptables-standalone.c iptables.o $(STATIC_LIBS) libiptc/libiptc.a
- $(CC) $(CFLAGS) -DIPTABLES_MULTI -DIPT_LIB_DIR=\"$(IPT_LIBDIR)\" $(LDFLAGS) -o $@ $^ $(LDLIBS)
- else
- iptables: iptables-standalone.c iptables.o $(STATIC_LIBS) libiptc/libiptc.a
Modified: trunk/package/iptables/iptables.mk
===================================================================
--- trunk/package/iptables/iptables.mk 2007-05-29 20:06:51 UTC (rev 1076)
+++ trunk/package/iptables/iptables.mk 2007-05-29 20:08:48 UTC (rev 1077)
@@ -16,31 +16,27 @@
touch $(IPTABLES_BUILD_DIR)/.unpacked
$(IPTABLES_BUILD_DIR)/.configured: $(IPTABLES_BUILD_DIR)/.unpacked
- # Allow patches. Needed for openwrt for instance.
toolchain/patch-kernel.sh $(IPTABLES_BUILD_DIR) package/iptables/ iptables\*.patch
- # hotwire iptables to NOT support ipv6
- $(SED) "s;\[ -f /usr/include/netinet/ip6.h \];grep -q '__UCLIBC_HAS_IPV6__ 1' \
- $(STAGING_DIR)/include/bits/uClibc_config.h;" $(IPTABLES_BUILD_DIR)/Makefile
touch $(IPTABLES_BUILD_DIR)/.configured
$(IPTABLES_BUILD_DIR)/iptables: $(IPTABLES_BUILD_DIR)/.configured
$(TARGET_CONFIGURE_OPTS) \
$(MAKE) -C $(IPTABLES_BUILD_DIR) \
- DO_IPV6=0 NO_SHARED_LIBS=1 \
- KERNEL_DIR=$(BUILD_DIR)/linux PREFIX=/usr \
+ DO_IPV6=1 NO_SHARED_LIBS=1 \
+ KERNEL_DIR=$(LINUX_DIR) PREFIX=/usr \
CC=$(TARGET_CC) COPT_FLAGS="$(TARGET_CFLAGS)"
$(TARGET_DIR)/usr/sbin/iptables: $(IPTABLES_BUILD_DIR)/iptables
$(TARGET_CONFIGURE_OPTS) \
$(MAKE) -C $(IPTABLES_BUILD_DIR) \
- DO_IPV6=0 NO_SHARED_LIBS=1 \
- KERNEL_DIR=$(BUILD_DIR)/linux PREFIX=/usr \
+ DO_IPV6=1 NO_SHARED_LIBS=1 \
+ KERNEL_DIR=$(LINUX_DIR) PREFIX=/usr \
CC=$(TARGET_CC) COPT_FLAGS="$(TARGET_CFLAGS)" \
DESTDIR=$(STAGING_DIR) install
- cp -a $(STAGING_DIR)/usr/sbin/iptables* $(TARGET_DIR)/usr/sbin/
- # cp -a $(STAGING_DIR)/usr/lib/iptables $(TARGET_DIR)/usr/lib/
- $(STRIP) -g $(TARGET_DIR)/usr/sbin/iptables*
- # $(STRIP) -g $(TARGET_DIR)/usr/lib/iptables/*.so
+ $(INSTALL) -D -m 0755 $(STAGING_DIR)/usr/sbin/iptables $(TARGET_DIR)/usr/sbin/iptables
+ $(INSTALL) -D -m 0755 $(STAGING_DIR)/usr/sbin/ip6tables $(TARGET_DIR)/usr/sbin/ip6tables
+ $(STRIP) $(TARGET_DIR)/usr/sbin/iptables
+ $(STRIP) $(TARGET_DIR)/usr/sbin/ip6tables
$(INSTALL) -D -m 0755 package/iptables/iptables.init $(TARGET_DIR)/etc/init.d/iptables
$(INSTALL) -D -m 0755 package/iptables/astfw $(TARGET_DIR)/usr/sbin/astfw
@@ -49,12 +45,11 @@
iptables-source: $(DL_DIR)/$(IPTABLES_SOURCE)
iptables-clean:
- # $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(IPTABLES_BUILD_DIR) uninstall
- -$(MAKE) -C $(IPTABLES_BUILD_DIR) clean
- rm -rf $(STAGING_DIR)/usr/sbin/iptables*
- rm -rf $(TARGET_DIR)/usr/sbin/iptables*
- # rm -rf $(STAGING_DIR)/usr/lib/iptables
- # rm -rf $(TARGET_DIR)/usr/lib/iptables
+ -$(MAKE) -C $(IPTABLES_BUILD_DIR) KERNEL_DIR=$(LINUX_DIR) clean
+ -rm -rf $(STAGING_DIR)/usr/sbin/iptables
+ -rm -rf $(TARGET_DIR)/usr/sbin/iptables
+ -rm -rf $(STAGING_DIR)/usr/sbin/ip6tables
+ -rm -rf $(TARGET_DIR)/usr/sbin/ip6tables
rm -rf $(TARGET_DIR)/etc/init.d/iptables
iptables-dirclean:
Modified: trunk/package/php5/php5.mk
===================================================================
--- trunk/package/php5/php5.mk 2007-05-29 20:06:51 UTC (rev 1076)
+++ trunk/package/php5/php5.mk 2007-05-29 20:08:48 UTC (rev 1077)
@@ -32,7 +32,7 @@
--without-iconv --without-pear --without-gd --disable-simplexml \
--disable-bcmath --disable-libxml --disable-dom --disable-xml \
--disable-xmlreader --disable-xmlwriter --without-sqlite \
- --without-pdo-sqlite --disable-ipv6 \
+ --without-pdo-sqlite \
);
touch $(PHP5_DIR)/.configured;
Modified: trunk/package/quagga/quagga.mk
===================================================================
--- trunk/package/quagga/quagga.mk 2007-05-29 20:06:51 UTC (rev 1076)
+++ trunk/package/quagga/quagga.mk 2007-05-29 20:08:48 UTC (rev 1077)
@@ -44,7 +44,6 @@
$(DISABLE_NLS) \
--enable-shared \
--disable-static \
- --disable-ipv6 \
--disable-vtysh \
--enable-user=quagga \
--enable-group=quagga \
Modified: trunk/package/wget/wget.mk
===================================================================
--- trunk/package/wget/wget.mk 2007-05-29 20:06:51 UTC (rev 1076)
+++ trunk/package/wget/wget.mk 2007-05-29 20:08:48 UTC (rev 1077)
@@ -27,7 +27,6 @@
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
--prefix=/ \
- --disable-ipv6 \
$(DISABLE_NLS) \
);
touch $(WGET_DIR)/.configured
Deleted: trunk/target/device/geni586/busybox.config
===================================================================
--- trunk/target/device/geni586/busybox.config 2007-05-29 20:06:51 UTC (rev 1076)
+++ trunk/target/device/geni586/busybox.config 2007-05-29 20:08:48 UTC (rev 1077)
@@ -1,593 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-HAVE_DOT_CONFIG=y
-
-#
-# General Configuration
-#
-# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
-# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
-CONFIG_FEATURE_BUFFERS_GO_IN_BSS=y
-CONFIG_FEATURE_VERBOSE_USAGE=y
-# CONFIG_FEATURE_INSTALLER is not set
-# CONFIG_LOCALE_SUPPORT is not set
-# CONFIG_FEATURE_DEVFS is not set
-# CONFIG_FEATURE_DEVPTS is not set
-# CONFIG_FEATURE_CLEAN_UP is not set
-CONFIG_FEATURE_SUID=y
-# CONFIG_FEATURE_SUID_CONFIG is not set
-# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
-# CONFIG_SELINUX is not set
-
-#
-# Build Options
-#
-# CONFIG_STATIC is not set
-CONFIG_LFS=y
-# USING_CROSS_COMPILER is not set
-CROSS_COMPILER_PREFIX=""
-EXTRA_CFLAGS_OPTIONS=""
-CONFIG_FEATURE_SUSv2=y
-CONFIG_FEATURE_SUSv2_OBSOLETE=y
-
-#
-# Installation Options
-#
-# CONFIG_INSTALL_NO_USR is not set
-CONFIG_INSTALL_APPLET_SYMLINKS=y
-# CONFIG_INSTALL_APPLET_HARDLINKS is not set
-# CONFIG_INSTALL_APPLET_DONT is not set
-PREFIX="./_install"
-
-#
-# Archival Utilities
-#
-# CONFIG_AR is not set
-# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
-CONFIG_BUNZIP2=y
-# CONFIG_CPIO is not set
-# CONFIG_DPKG is not set
-# CONFIG_DPKG_DEB is not set
-# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
-CONFIG_GUNZIP=y
-# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set
-CONFIG_GZIP=y
-# CONFIG_RPM2CPIO is not set
-# CONFIG_RPM is not set
-CONFIG_TAR=y
-CONFIG_FEATURE_TAR_CREATE=y
-CONFIG_FEATURE_TAR_BZIP2=y
-# CONFIG_FEATURE_TAR_FROM is not set
-CONFIG_FEATURE_TAR_GZIP=y
-# CONFIG_FEATURE_TAR_COMPRESS is not set
-# CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY is not set
-CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
-# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
-# CONFIG_UNCOMPRESS is not set
-CONFIG_UNZIP=y
-
-#
-# Common options for cpio and tar
-#
-# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
-# CONFIG_FEATURE_DEB_TAR_GZ is not set
-# CONFIG_FEATURE_DEB_TAR_BZ2 is not set
-
-#
-# Coreutils
-#
-CONFIG_BASENAME=y
-# CONFIG_CAL is not set
-CONFIG_CAT=y
-CONFIG_CHGRP=y
-CONFIG_CHMOD=y
-CONFIG_CHOWN=y
-CONFIG_CHROOT=y
-CONFIG_CMP=y
-# CONFIG_COMM is not set
-CONFIG_CP=y
-CONFIG_CUT=y
-CONFIG_DATE=y
-
-#
-# date (forced enabled for use with watch)
-#
-CONFIG_FEATURE_DATE_ISOFMT=y
-CONFIG_DD=y
-CONFIG_DF=y
-CONFIG_DIRNAME=y
-CONFIG_DOS2UNIX=y
-CONFIG_UNIX2DOS=y
-CONFIG_DU=y
-CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y
-CONFIG_ECHO=y
-CONFIG_FEATURE_FANCY_ECHO=y
-CONFIG_ENV=y
-CONFIG_EXPR=y
-CONFIG_FALSE=y
-# CONFIG_FOLD is not set
-CONFIG_HEAD=y
-# CONFIG_FEATURE_FANCY_HEAD is not set
-CONFIG_HOSTID=y
-CONFIG_ID=y
-CONFIG_INSTALL=y
-# CONFIG_LENGTH is not set
-CONFIG_LN=y
-CONFIG_LOGNAME=y
-CONFIG_LS=y
-CONFIG_FEATURE_LS_FILETYPES=y
-CONFIG_FEATURE_LS_FOLLOWLINKS=y
-CONFIG_FEATURE_LS_RECURSIVE=y
-CONFIG_FEATURE_LS_SORTFILES=y
-CONFIG_FEATURE_LS_TIMESTAMPS=y
-CONFIG_FEATURE_LS_USERNAME=y
-CONFIG_FEATURE_LS_COLOR=y
-# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
-CONFIG_MD5SUM=y
-CONFIG_MKDIR=y
-# CONFIG_MKFIFO is not set
-CONFIG_MKNOD=y
-CONFIG_MV=y
-CONFIG_NICE=y
-CONFIG_NOHUP=y
-# CONFIG_OD is not set
-# CONFIG_PRINTENV is not set
-# CONFIG_PRINTF is not set
-CONFIG_PWD=y
-CONFIG_REALPATH=y
-CONFIG_RM=y
-CONFIG_RMDIR=y
-CONFIG_SEQ=y
-CONFIG_SHA1SUM=y
-CONFIG_SLEEP=y
-# CONFIG_FEATURE_FANCY_SLEEP is not set
-CONFIG_SORT=y
-CONFIG_FEATURE_SORT_BIG=y
-CONFIG_STAT=y
-# CONFIG_FEATURE_STAT_FORMAT is not set
-CONFIG_STTY=y
-# CONFIG_SUM is not set
-CONFIG_SYNC=y
-CONFIG_TAIL=y
-CONFIG_FEATURE_FANCY_TAIL=y
-CONFIG_TEE=y
-CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
-CONFIG_TEST=y
-
-#
-# test (forced enabled for use with shell)
-#
-CONFIG_FEATURE_TEST_64=y
-CONFIG_TOUCH=y
-CONFIG_TR=y
-# CONFIG_FEATURE_TR_CLASSES is not set
-# CONFIG_FEATURE_TR_EQUIV is not set
-CONFIG_TRUE=y
-CONFIG_TTY=y
-CONFIG_UNAME=y
-CONFIG_UNIQ=y
-CONFIG_USLEEP=y
-CONFIG_UUDECODE=y
-CONFIG_UUENCODE=y
-CONFIG_WATCH=y
-CONFIG_WC=y
-CONFIG_WHO=y
-CONFIG_WHOAMI=y
-CONFIG_YES=y
-
-#
-# Common options for cp and mv
-#
-CONFIG_FEATURE_PRESERVE_HARDLINKS=y
-
-#
-# Common options for ls and more
-#
-CONFIG_FEATURE_AUTOWIDTH=y
-
-#
-# Common options for df, du, ls
-#
-CONFIG_FEATURE_HUMAN_READABLE=y
-
-#
-# Common options for md5sum, sha1sum
-#
-CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
-
-#
-# Console Utilities
-#
-CONFIG_CHVT=y
-CONFIG_CLEAR=y
-CONFIG_DEALLOCVT=y
-# CONFIG_DUMPKMAP is not set
-# CONFIG_LOADFONT is not set
-# CONFIG_LOADKMAP is not set
-CONFIG_OPENVT=y
-CONFIG_RESET=y
-# CONFIG_SETCONSOLE is not set
-# CONFIG_SETKEYCODES is not set
-
-#
-# Debian Utilities
-#
-CONFIG_MKTEMP=y
-# CONFIG_PIPE_PROGRESS is not set
-CONFIG_READLINK=y
-# CONFIG_FEATURE_READLINK_FOLLOW is not set
-CONFIG_RUN_PARTS=y
-# CONFIG_START_STOP_DAEMON is not set
-CONFIG_WHICH=y
-
-#
-# Linux Ext2 FS Progs
-#
-# CONFIG_CHATTR is not set
-CONFIG_E2FSCK=y
-CONFIG_FSCK=y
-CONFIG_LSATTR=y
-CONFIG_MKE2FS=y
-CONFIG_TUNE2FS=y
-CONFIG_E2LABEL=y
-CONFIG_FINDFS=y
-
-#
-# Editors
-#
-CONFIG_AWK=y
-CONFIG_FEATURE_AWK_MATH=y
-CONFIG_PATCH=y
-CONFIG_SED=y
-CONFIG_VI=y
-CONFIG_FEATURE_VI_COLON=y
-CONFIG_FEATURE_VI_YANKMARK=y
-CONFIG_FEATURE_VI_SEARCH=y
-CONFIG_FEATURE_VI_USE_SIGNALS=y
-CONFIG_FEATURE_VI_DOT_CMD=y
-CONFIG_FEATURE_VI_READONLY=y
-CONFIG_FEATURE_VI_SETOPTS=y
-CONFIG_FEATURE_VI_SET=y
-CONFIG_FEATURE_VI_WIN_RESIZE=y
-CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
-
-#
-# Finding Utilities
-#
-CONFIG_FIND=y
-CONFIG_FEATURE_FIND_MTIME=y
-CONFIG_FEATURE_FIND_PERM=y
-CONFIG_FEATURE_FIND_TYPE=y
-CONFIG_FEATURE_FIND_XDEV=y
-# CONFIG_FEATURE_FIND_NEWER is not set
-# CONFIG_FEATURE_FIND_INUM is not set
-CONFIG_FEATURE_FIND_EXEC=y
-CONFIG_GREP=y
-CONFIG_FEATURE_GREP_EGREP_ALIAS=y
-CONFIG_FEATURE_GREP_FGREP_ALIAS=y
-CONFIG_FEATURE_GREP_CONTEXT=y
-CONFIG_XARGS=y
-# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
-CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
-CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
-CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
-
-#
-# Init Utilities
-#
-CONFIG_INIT=y
-CONFIG_FEATURE_USE_INITTAB=y
-CONFIG_FEATURE_INITRD=y
-# CONFIG_FEATURE_INIT_COREDUMPS is not set
-# CONFIG_FEATURE_INIT_SCTTY is not set
-# CONFIG_FEATURE_EXTRA_QUIET is not set
-CONFIG_HALT=y
-# CONFIG_MESG is not set
-CONFIG_POWEROFF=y
-CONFIG_REBOOT=y
-
-#
-# Login/Password Management Utilities
-#
-CONFIG_FEATURE_SHADOWPASSWDS=y
-# CONFIG_USE_BB_SHADOW is not set
-# CONFIG_USE_BB_PWD_GRP is not set
-CONFIG_ADDGROUP=y
-CONFIG_DELGROUP=y
-CONFIG_ADDUSER=y
-CONFIG_DELUSER=y
-CONFIG_GETTY=y
-CONFIG_FEATURE_UTMP=y
-CONFIG_FEATURE_WTMP=y
-CONFIG_LOGIN=y
-# CONFIG_FEATURE_SECURETTY is not set
-CONFIG_PASSWD=y
-CONFIG_SU=y
-CONFIG_SULOGIN=y
-CONFIG_VLOCK=y
-
-#
-# Miscellaneous Utilities
-#
-# CONFIG_ADJTIMEX is not set
-CONFIG_BBCONFIG=y
-CONFIG_CROND=y
-CONFIG_FEATURE_CROND_CALL_SENDMAIL=y
-CONFIG_CRONTAB=y
-CONFIG_DC=y
-# CONFIG_DEVFSD is not set
-# CONFIG_DEVFSD_MODLOAD is not set
-# CONFIG_DEVFSD_FG_NP is not set
-# CONFIG_DEVFSD_VERBOSE is not set
-# CONFIG_EJECT is not set
-CONFIG_LAST=y
-CONFIG_LESS=y
-CONFIG_FEATURE_LESS_BRACKETS=y
-CONFIG_FEATURE_LESS_FLAGS=y
-# CONFIG_FEATURE_LESS_FLAGCS is not set
-# CONFIG_FEATURE_LESS_MARKS is not set
-# CONFIG_FEATURE_LESS_REGEXP is not set
-CONFIG_HDPARM=y
-CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
-CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y
-CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y
-# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
-# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
-CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y
-CONFIG_MAKEDEVS=y
-# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
-CONFIG_FEATURE_MAKEDEVS_TABLE=y
-# CONFIG_MOUNTPOINT is not set
-CONFIG_MT=y
-# BB_APPLET_RUNLEVEL is not set
-# CONFIG_RX is not set
-CONFIG_STRINGS=y
-# CONFIG_SETSID is not set
-CONFIG_TIME=y
-CONFIG_WATCHDOG=y
-
-#
-# Linux Module Utilities
-#
-CONFIG_INSMOD=y
-# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
-# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
-# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
-CONFIG_RMMOD=y
-CONFIG_LSMOD=y
-CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
-CONFIG_MODPROBE=y
-CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y
-
-#
-# Options common to multiple modutils
-#
-CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
-# CONFIG_FEATURE_2_4_MODULES is not set
-CONFIG_FEATURE_2_6_MODULES=y
-# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
-
-#
-# Networking Utilities
-#
-# CONFIG_FEATURE_IPV6 is not set
-CONFIG_ARPING=y
-CONFIG_ETHER_WAKE=y
-CONFIG_FAKEIDENTD=y
-CONFIG_FTPGET=y
-CONFIG_FTPPUT=y
-CONFIG_HOSTNAME=y
-# CONFIG_HTTPD is not set
-# CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY is not set
-# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
-# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
-# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
-# CONFIG_FEATURE_HTTPD_SETUID is not set
-# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
-# CONFIG_FEATURE_HTTPD_CGI is not set
-# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
-# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
-CONFIG_IFCONFIG=y
-CONFIG_FEATURE_IFCONFIG_STATUS=y
-# CONFIG_FEATURE_IFCONFIG_SLIP is not set
-CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
-CONFIG_FEATURE_IFCONFIG_HW=y
-CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
-CONFIG_IFUPDOWN=y
-# CONFIG_FEATURE_IFUPDOWN_IP is not set
-CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y
-CONFIG_FEATURE_IFUPDOWN_IPV4=y
-# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
-# CONFIG_FEATURE_IFUPDOWN_IPX is not set
-# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
-CONFIG_INETD=y
-# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_ECHO is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DISCARD is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_TIME is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DAYTIME is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_CHARGEN is not set
-# CONFIG_FEATURE_INETD_RPC is not set
-# CONFIG_IP is not set
-# CONFIG_FEATURE_IP_ADDRESS is not set
-# CONFIG_FEATURE_IP_LINK is not set
-# CONFIG_FEATURE_IP_ROUTE is not set
-# CONFIG_FEATURE_IP_TUNNEL is not set
-# CONFIG_IPCALC is not set
-# CONFIG_FEATURE_IPCALC_FANCY is not set
-# CONFIG_IPADDR is not set
-# CONFIG_IPLINK is not set
-# CONFIG_IPROUTE is not set
-# CONFIG_IPTUNNEL is not set
-# CONFIG_NAMEIF is not set
-CONFIG_NC=y
-# CONFIG_NC_GAPING_SECURITY_HOLE is not set
-CONFIG_NETSTAT=y
-CONFIG_NSLOOKUP=y
-CONFIG_PING=y
-CONFIG_FEATURE_FANCY_PING=y
-# CONFIG_PING6 is not set
-# CONFIG_FEATURE_FANCY_PING6 is not set
-CONFIG_ROUTE=y
-CONFIG_TELNET=y
-CONFIG_FEATURE_TELNET_TTYPE=y
-# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
-CONFIG_TELNETD=y
-# CONFIG_FEATURE_TELNETD_INETD is not set
-CONFIG_TFTP=y
-CONFIG_FEATURE_TFTP_GET=y
-CONFIG_FEATURE_TFTP_PUT=y
-CONFIG_FEATURE_TFTP_BLOCKSIZE=y
-CONFIG_FEATURE_TFTP_DEBUG=y
-CONFIG_TRACEROUTE=y
-CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
-# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
-# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
-CONFIG_VCONFIG=y
-CONFIG_WGET=y
-CONFIG_FEATURE_WGET_STATUSBAR=y
-CONFIG_FEATURE_WGET_AUTHENTICATION=y
-# CONFIG_FEATURE_WGET_IP6_LITERAL is not set
-
-#
-# udhcp Server/Client
-#
-# CONFIG_UDHCPD is not set
-CONFIG_UDHCPC=y
-# CONFIG_DUMPLEASES is not set
-CONFIG_FEATURE_UDHCP_SYSLOG=y
-# CONFIG_FEATURE_UDHCP_DEBUG is not set
-# CONFIG_ZCIP is not set
-
-#
-# Process Utilities
-#
-CONFIG_FREE=y
-CONFIG_FUSER=y
-CONFIG_KILL=y
-CONFIG_KILLALL=y
-CONFIG_PIDOF=y
-# CONFIG_FEATURE_PIDOF_SINGLE is not set
-# CONFIG_FEATURE_PIDOF_OMIT is not set
-CONFIG_PS=y
-CONFIG_FEATURE_PS_WIDE=y
-CONFIG_RENICE=y
-CONFIG_BB_SYSCTL=y
-CONFIG_TOP=y
-CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
-CONFIG_UPTIME=y
-
-#
-# Shells
-#
-CONFIG_FEATURE_SH_IS_ASH=y
-# CONFIG_FEATURE_SH_IS_HUSH is not set
-# CONFIG_FEATURE_SH_IS_LASH is not set
-# CONFIG_FEATURE_SH_IS_MSH is not set
-# CONFIG_FEATURE_SH_IS_NONE is not set
-CONFIG_ASH=y
-
-#
-# Ash Shell Options
-#
-CONFIG_ASH_JOB_CONTROL=y
-# CONFIG_ASH_READ_NCHARS is not set
-# CONFIG_ASH_READ_TIMEOUT is not set
-CONFIG_ASH_ALIAS=y
-CONFIG_ASH_MATH_SUPPORT=y
-CONFIG_ASH_MATH_SUPPORT_64=y
-# CONFIG_ASH_GETOPTS is not set
-# CONFIG_ASH_CMDCMD is not set
-# CONFIG_ASH_BUILTIN_ECHO is not set
-# CONFIG_ASH_MAIL is not set
-CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
-# CONFIG_ASH_RANDOM_SUPPORT is not set
-# CONFIG_ASH_EXPAND_PRMT is not set
-# CONFIG_HUSH is not set
-# CONFIG_LASH is not set
-# CONFIG_MSH is not set
-
-#
-# Bourne Shell Options
-#
-CONFIG_FEATURE_SH_EXTRA_QUIET=y
-# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set
-CONFIG_FEATURE_COMMAND_EDITING=y
-# CONFIG_FEATURE_COMMAND_EDITING_VI is not set
-CONFIG_FEATURE_COMMAND_HISTORY=100
-CONFIG_FEATURE_COMMAND_SAVEHISTORY=y
-CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y
-CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION=y
-CONFIG_FEATURE_SH_FANCY_PROMPT=y
-
-#
-# System Logging Utilities
-#
-CONFIG_SYSLOGD=y
-CONFIG_FEATURE_ROTATE_LOGFILE=y
-CONFIG_FEATURE_REMOTE_LOG=y
-CONFIG_FEATURE_IPC_SYSLOG=y
-CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
-CONFIG_LOGREAD=y
-# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
-CONFIG_KLOGD=y
-CONFIG_LOGGER=y
-
-#
-# Linux System Utilities
-#
-CONFIG_DMESG=y
-# CONFIG_FBSET is not set
-# CONFIG_FEATURE_FBSET_FANCY is not set
-# CONFIG_FEATURE_FBSET_READMODE is not set
-# CONFIG_FDFLUSH is not set
-CONFIG_FDFORMAT=y
-CONFIG_FDISK=y
-FDISK_SUPPORT_LARGE_DISKS=y
-CONFIG_FEATURE_FDISK_WRITABLE=y
-# CONFIG_FEATURE_AIX_LABEL is not set
-# CONFIG_FEATURE_SGI_LABEL is not set
-# CONFIG_FEATURE_SUN_LABEL is not set
-# CONFIG_FEATURE_OSF_LABEL is not set
-# CONFIG_FEATURE_FDISK_ADVANCED is not set
-# CONFIG_FREERAMDISK is not set
-# CONFIG_FSCK_MINIX is not set
-# CONFIG_MKFS_MINIX is not set
-# CONFIG_FEATURE_MINIX2 is not set
-CONFIG_GETOPT=y
-CONFIG_HEXDUMP=y
-CONFIG_HWCLOCK=y
-CONFIG_FEATURE_HWCLOCK_LONGOPTIONS=y
-CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
-# CONFIG_IPCRM is not set
-# CONFIG_IPCS is not set
-CONFIG_LOSETUP=y
-# CONFIG_MDEV is not set
-# CONFIG_FEATURE_MDEV_CONF is not set
-CONFIG_MKSWAP=y
-CONFIG_MORE=y
-CONFIG_FEATURE_USE_TERMIOS=y
-CONFIG_PIVOT_ROOT=y
-# CONFIG_SWITCH_ROOT is not set
-CONFIG_RDATE=y
-# CONFIG_READPROFILE is not set
-CONFIG_SWAPONOFF=y
-CONFIG_MOUNT=y
-CONFIG_FEATURE_MOUNT_NFS=y
-CONFIG_UMOUNT=y
-
-#
-# Common options for mount/umount
-#
-CONFIG_FEATURE_MOUNT_LOOP=y
-# CONFIG_FEATURE_MTAB_SUPPORT is not set
-
-#
-# Debugging Options
-#
-# CONFIG_DEBUG is not set
-# CONFIG_NO_DEBUG_LIB is not set
-# CONFIG_DMALLOC is not set
-# CONFIG_EFENCE is not set
Modified: trunk/target/device/geni586/linux.config
===================================================================
--- trunk/target/device/geni586/linux.config 2007-05-29 20:06:51 UTC (rev 1076)
+++ trunk/target/device/geni586/linux.config 2007-05-29 20:08:48 UTC (rev 1077)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.20
-# Sat Mar 24 15:48:42 2007
+# Tue May 29 14:15:30 2007
#
CONFIG_X86_32=y
CONFIG_GENERIC_TIME=y
@@ -22,6 +22,7 @@
# Code maturity level options
#
CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
CONFIG_LOCK_KERNEL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
@@ -41,7 +42,6 @@
# CONFIG_AUDIT is not set
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
-# CONFIG_CPUSETS is not set
CONFIG_SYSFS_DEPRECATED=y
# CONFIG_RELAY is not set
CONFIG_INITRAMFS_SOURCE=""
@@ -76,7 +76,6 @@
CONFIG_MODVERSIONS=y
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_KMOD=y
-CONFIG_STOP_MACHINE=y
#
# Block layer
@@ -102,7 +101,7 @@
#
# Processor type and features
#
-CONFIG_SMP=y
+# CONFIG_SMP is not set
CONFIG_X86_PC=y
# CONFIG_X86_ELAN is not set
# CONFIG_X86_VOYAGER is not set
@@ -156,13 +155,12 @@
CONFIG_X86_INTEL_USERCOPY=y
CONFIG_X86_TSC=y
CONFIG_HPET_TIMER=y
-CONFIG_NR_CPUS=4
-CONFIG_SCHED_SMT=y
-CONFIG_SCHED_MC=y
# CONFIG_PREEMPT_NONE is not set
# CONFIG_PREEMPT_VOLUNTARY is not set
CONFIG_PREEMPT=y
CONFIG_PREEMPT_BKL=y
+CONFIG_X86_UP_APIC=y
+CONFIG_X86_UP_IOAPIC=y
CONFIG_X86_LOCAL_APIC=y
CONFIG_X86_IO_APIC=y
CONFIG_X86_MCE=y
@@ -204,7 +202,6 @@
# CONFIG_MATH_EMULATION is not set
CONFIG_MTRR=y
# CONFIG_EFI is not set
-CONFIG_IRQBALANCE=y
CONFIG_SECCOMP=y
# CONFIG_HZ_100 is not set
# CONFIG_HZ_250 is not set
@@ -216,7 +213,6 @@
CONFIG_PHYSICAL_START=0x100000
# CONFIG_RELOCATABLE is not set
CONFIG_PHYSICAL_ALIGN=0x100000
-# CONFIG_HOTPLUG_CPU is not set
# CONFIG_COMPAT_VDSO is not set
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -227,11 +223,15 @@
# CONFIG_PM_LEGACY is not set
# CONFIG_PM_DEBUG is not set
# CONFIG_PM_SYSFS_DEPRECATED is not set
+# CONFIG_SOFTWARE_SUSPEND is not set
#
# ACPI (Advanced Configuration and Power Interface) Support
#
CONFIG_ACPI=y
+CONFIG_ACPI_SLEEP=y
+CONFIG_ACPI_SLEEP_PROC_FS=y
+# CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
# CONFIG_ACPI_AC is not set
# CONFIG_ACPI_BATTERY is not set
CONFIG_ACPI_BUTTON=y
@@ -356,13 +356,27 @@
# IP: Virtual Server Configuration
#
# CONFIG_IP_VS is not set
-# CONFIG_IPV6 is not set
-# CONFIG_INET6_XFRM_TUNNEL is not set
-# CONFIG_INET6_TUNNEL is not set
+CONFIG_IPV6=m
+CONFIG_IPV6_PRIVACY=y
+# CONFIG_IPV6_ROUTER_PREF is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=y
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
CONFIG_NETWORK_SECMARK=y
CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set
-# CONFIG_BRIDGE_NETFILTER is not set
+CONFIG_BRIDGE_NETFILTER=y
#
# Core Netfilter Configuration
@@ -413,6 +427,7 @@
CONFIG_NETFILTER_XT_MATCH_MARK=m
CONFIG_NETFILTER_XT_MATCH_POLICY=m
CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
CONFIG_NETFILTER_XT_MATCH_QUOTA=m
CONFIG_NETFILTER_XT_MATCH_REALM=m
@@ -469,6 +484,27 @@
CONFIG_IP_NF_ARP_MANGLE=m
#
+# IPv6: Netfilter Configuration (EXPERIMENTAL)
+#
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_QUEUE=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_OWNER=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_RAW=m
+
+#
# Bridge: Netfilter Configuration
#
# CONFIG_BRIDGE_NF_EBTABLES is not set
@@ -505,9 +541,9 @@
#
CONFIG_NET_SCHED=y
CONFIG_NET_SCH_FIFO=y
-CONFIG_NET_SCH_CLK_JIFFIES=y
+# CONFIG_NET_SCH_CLK_JIFFIES is not set
# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
-# CONFIG_NET_SCH_CLK_CPU is not set
+CONFIG_NET_SCH_CLK_CPU=y
#
# Queueing/Scheduling
@@ -1388,6 +1424,7 @@
# CONFIG_I2C_ALI15X3 is not set
# CONFIG_I2C_AMD756 is not set
# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_ELEKTOR is not set
# CONFIG_I2C_I801 is not set
# CONFIG_I2C_I810 is not set
# CONFIG_I2C_PIIX4 is not set
@@ -2058,7 +2095,7 @@
# CONFIG_DEBUG_FS is not set
# CONFIG_HEADERS_CHECK is not set
# CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=15
+CONFIG_LOG_BUF_SHIFT=14
CONFIG_DEBUG_BUGVERBOSE=y
CONFIG_EARLY_PRINTK=y
CONFIG_X86_FIND_SMP_CONFIG=y
@@ -2138,9 +2175,5 @@
CONFIG_IOMAP_COPY=y
CONFIG_GENERIC_HARDIRQS=y
CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_X86_SMP=y
-CONFIG_X86_HT=y
CONFIG_X86_BIOS_REBOOT=y
-CONFIG_X86_TRAMPOLINE=y
CONFIG_KTIME_SCALAR=y
Deleted: trunk/target/device/net4801/busybox.config
===================================================================
--- trunk/target/device/net4801/busybox.config 2007-05-29 20:06:51 UTC (rev 1076)
+++ trunk/target/device/net4801/busybox.config 2007-05-29 20:08:48 UTC (rev 1077)
@@ -1,593 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-HAVE_DOT_CONFIG=y
-
-#
-# General Configuration
-#
-# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
-# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
-CONFIG_FEATURE_BUFFERS_GO_IN_BSS=y
-CONFIG_FEATURE_VERBOSE_USAGE=y
-# CONFIG_FEATURE_INSTALLER is not set
-# CONFIG_LOCALE_SUPPORT is not set
-# CONFIG_FEATURE_DEVFS is not set
-# CONFIG_FEATURE_DEVPTS is not set
-# CONFIG_FEATURE_CLEAN_UP is not set
-CONFIG_FEATURE_SUID=y
-# CONFIG_FEATURE_SUID_CONFIG is not set
-# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
-# CONFIG_SELINUX is not set
-
-#
-# Build Options
-#
-# CONFIG_STATIC is not set
-CONFIG_LFS=y
-# USING_CROSS_COMPILER is not set
-CROSS_COMPILER_PREFIX=""
-EXTRA_CFLAGS_OPTIONS=""
-CONFIG_FEATURE_SUSv2=y
-CONFIG_FEATURE_SUSv2_OBSOLETE=y
-
-#
-# Installation Options
-#
-# CONFIG_INSTALL_NO_USR is not set
-CONFIG_INSTALL_APPLET_SYMLINKS=y
-# CONFIG_INSTALL_APPLET_HARDLINKS is not set
-# CONFIG_INSTALL_APPLET_DONT is not set
-PREFIX="./_install"
-
-#
-# Archival Utilities
-#
-# CONFIG_AR is not set
-# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
-CONFIG_BUNZIP2=y
-# CONFIG_CPIO is not set
-# CONFIG_DPKG is not set
-# CONFIG_DPKG_DEB is not set
-# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
-CONFIG_GUNZIP=y
-# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set
-CONFIG_GZIP=y
-# CONFIG_RPM2CPIO is not set
-# CONFIG_RPM is not set
-CONFIG_TAR=y
-CONFIG_FEATURE_TAR_CREATE=y
-CONFIG_FEATURE_TAR_BZIP2=y
-# CONFIG_FEATURE_TAR_FROM is not set
-CONFIG_FEATURE_TAR_GZIP=y
-# CONFIG_FEATURE_TAR_COMPRESS is not set
-# CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY is not set
-CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
-# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
-# CONFIG_UNCOMPRESS is not set
-CONFIG_UNZIP=y
-
-#
-# Common options for cpio and tar
-#
-# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
-# CONFIG_FEATURE_DEB_TAR_GZ is not set
-# CONFIG_FEATURE_DEB_TAR_BZ2 is not set
-
-#
-# Coreutils
-#
-CONFIG_BASENAME=y
-# CONFIG_CAL is not set
-CONFIG_CAT=y
-CONFIG_CHGRP=y
-CONFIG_CHMOD=y
-CONFIG_CHOWN=y
-CONFIG_CHROOT=y
-CONFIG_CMP=y
-# CONFIG_COMM is not set
-CONFIG_CP=y
-CONFIG_CUT=y
-CONFIG_DATE=y
-
-#
-# date (forced enabled for use with watch)
-#
-CONFIG_FEATURE_DATE_ISOFMT=y
-CONFIG_DD=y
-CONFIG_DF=y
-CONFIG_DIRNAME=y
-CONFIG_DOS2UNIX=y
-CONFIG_UNIX2DOS=y
-CONFIG_DU=y
-CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y
-CONFIG_ECHO=y
-CONFIG_FEATURE_FANCY_ECHO=y
-CONFIG_ENV=y
-CONFIG_EXPR=y
-CONFIG_FALSE=y
-# CONFIG_FOLD is not set
-CONFIG_HEAD=y
-# CONFIG_FEATURE_FANCY_HEAD is not set
-CONFIG_HOSTID=y
-CONFIG_ID=y
-CONFIG_INSTALL=y
-# CONFIG_LENGTH is not set
-CONFIG_LN=y
-CONFIG_LOGNAME=y
-CONFIG_LS=y
-CONFIG_FEATURE_LS_FILETYPES=y
-CONFIG_FEATURE_LS_FOLLOWLINKS=y
-CONFIG_FEATURE_LS_RECURSIVE=y
-CONFIG_FEATURE_LS_SORTFILES=y
-CONFIG_FEATURE_LS_TIMESTAMPS=y
-CONFIG_FEATURE_LS_USERNAME=y
-CONFIG_FEATURE_LS_COLOR=y
-# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
-CONFIG_MD5SUM=y
-CONFIG_MKDIR=y
-# CONFIG_MKFIFO is not set
-CONFIG_MKNOD=y
-CONFIG_MV=y
-CONFIG_NICE=y
-CONFIG_NOHUP=y
-# CONFIG_OD is not set
-# CONFIG_PRINTENV is not set
-# CONFIG_PRINTF is not set
-CONFIG_PWD=y
-CONFIG_REALPATH=y
-CONFIG_RM=y
-CONFIG_RMDIR=y
-CONFIG_SEQ=y
-CONFIG_SHA1SUM=y
-CONFIG_SLEEP=y
-# CONFIG_FEATURE_FANCY_SLEEP is not set
-CONFIG_SORT=y
-CONFIG_FEATURE_SORT_BIG=y
-CONFIG_STAT=y
-# CONFIG_FEATURE_STAT_FORMAT is not set
-CONFIG_STTY=y
-# CONFIG_SUM is not set
-CONFIG_SYNC=y
-CONFIG_TAIL=y
-CONFIG_FEATURE_FANCY_TAIL=y
-CONFIG_TEE=y
-CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
-CONFIG_TEST=y
-
-#
-# test (forced enabled for use with shell)
-#
-CONFIG_FEATURE_TEST_64=y
-CONFIG_TOUCH=y
-CONFIG_TR=y
-# CONFIG_FEATURE_TR_CLASSES is not set
-# CONFIG_FEATURE_TR_EQUIV is not set
-CONFIG_TRUE=y
-CONFIG_TTY=y
-CONFIG_UNAME=y
-CONFIG_UNIQ=y
-CONFIG_USLEEP=y
-CONFIG_UUDECODE=y
-CONFIG_UUENCODE=y
-CONFIG_WATCH=y
-CONFIG_WC=y
-CONFIG_WHO=y
-CONFIG_WHOAMI=y
-CONFIG_YES=y
-
-#
-# Common options for cp and mv
-#
-CONFIG_FEATURE_PRESERVE_HARDLINKS=y
-
-#
-# Common options for ls and more
-#
-CONFIG_FEATURE_AUTOWIDTH=y
-
-#
-# Common options for df, du, ls
-#
-CONFIG_FEATURE_HUMAN_READABLE=y
-
-#
-# Common options for md5sum, sha1sum
-#
-CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
-
-#
-# Console Utilities
-#
-CONFIG_CHVT=y
-CONFIG_CLEAR=y
-CONFIG_DEALLOCVT=y
-# CONFIG_DUMPKMAP is not set
-# CONFIG_LOADFONT is not set
-# CONFIG_LOADKMAP is not set
-CONFIG_OPENVT=y
-CONFIG_RESET=y
-# CONFIG_SETCONSOLE is not set
-# CONFIG_SETKEYCODES is not set
-
-#
-# Debian Utilities
-#
-CONFIG_MKTEMP=y
-# CONFIG_PIPE_PROGRESS is not set
-CONFIG_READLINK=y
-# CONFIG_FEATURE_READLINK_FOLLOW is not set
-CONFIG_RUN_PARTS=y
-# CONFIG_START_STOP_DAEMON is not set
-CONFIG_WHICH=y
-
-#
-# Linux Ext2 FS Progs
-#
-# CONFIG_CHATTR is not set
-CONFIG_E2FSCK=y
-CONFIG_FSCK=y
-CONFIG_LSATTR=y
-CONFIG_MKE2FS=y
-CONFIG_TUNE2FS=y
-CONFIG_E2LABEL=y
-CONFIG_FINDFS=y
-
-#
-# Editors
-#
-CONFIG_AWK=y
-CONFIG_FEATURE_AWK_MATH=y
-CONFIG_PATCH=y
-CONFIG_SED=y
-CONFIG_VI=y
-CONFIG_FEATURE_VI_COLON=y
-CONFIG_FEATURE_VI_YANKMARK=y
-CONFIG_FEATURE_VI_SEARCH=y
-CONFIG_FEATURE_VI_USE_SIGNALS=y
-CONFIG_FEATURE_VI_DOT_CMD=y
-CONFIG_FEATURE_VI_READONLY=y
-CONFIG_FEATURE_VI_SETOPTS=y
-CONFIG_FEATURE_VI_SET=y
-CONFIG_FEATURE_VI_WIN_RESIZE=y
-CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
-
-#
-# Finding Utilities
-#
-CONFIG_FIND=y
-CONFIG_FEATURE_FIND_MTIME=y
-CONFIG_FEATURE_FIND_PERM=y
-CONFIG_FEATURE_FIND_TYPE=y
-CONFIG_FEATURE_FIND_XDEV=y
-# CONFIG_FEATURE_FIND_NEWER is not set
-# CONFIG_FEATURE_FIND_INUM is not set
-CONFIG_FEATURE_FIND_EXEC=y
-CONFIG_GREP=y
-CONFIG_FEATURE_GREP_EGREP_ALIAS=y
-CONFIG_FEATURE_GREP_FGREP_ALIAS=y
-CONFIG_FEATURE_GREP_CONTEXT=y
-CONFIG_XARGS=y
-# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
-CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
-CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
-CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
-
-#
-# Init Utilities
-#
-CONFIG_INIT=y
-CONFIG_FEATURE_USE_INITTAB=y
-CONFIG_FEATURE_INITRD=y
-# CONFIG_FEATURE_INIT_COREDUMPS is not set
-# CONFIG_FEATURE_INIT_SCTTY is not set
-# CONFIG_FEATURE_EXTRA_QUIET is not set
-CONFIG_HALT=y
-# CONFIG_MESG is not set
-CONFIG_POWEROFF=y
-CONFIG_REBOOT=y
-
-#
-# Login/Password Management Utilities
-#
-CONFIG_FEATURE_SHADOWPASSWDS=y
-# CONFIG_USE_BB_SHADOW is not set
-# CONFIG_USE_BB_PWD_GRP is not set
-CONFIG_ADDGROUP=y
-CONFIG_DELGROUP=y
-CONFIG_ADDUSER=y
-CONFIG_DELUSER=y
-CONFIG_GETTY=y
-CONFIG_FEATURE_UTMP=y
-CONFIG_FEATURE_WTMP=y
-CONFIG_LOGIN=y
-# CONFIG_FEATURE_SECURETTY is not set
-CONFIG_PASSWD=y
-CONFIG_SU=y
-CONFIG_SULOGIN=y
-CONFIG_VLOCK=y
-
-#
-# Miscellaneous Utilities
-#
-# CONFIG_ADJTIMEX is not set
-CONFIG_BBCONFIG=y
-CONFIG_CROND=y
-CONFIG_FEATURE_CROND_CALL_SENDMAIL=y
-CONFIG_CRONTAB=y
-CONFIG_DC=y
-# CONFIG_DEVFSD is not set
-# CONFIG_DEVFSD_MODLOAD is not set
-# CONFIG_DEVFSD_FG_NP is not set
-# CONFIG_DEVFSD_VERBOSE is not set
-# CONFIG_EJECT is not set
-CONFIG_LAST=y
-CONFIG_LESS=y
-CONFIG_FEATURE_LESS_BRACKETS=y
-CONFIG_FEATURE_LESS_FLAGS=y
-# CONFIG_FEATURE_LESS_FLAGCS is not set
-# CONFIG_FEATURE_LESS_MARKS is not set
-# CONFIG_FEATURE_LESS_REGEXP is not set
-CONFIG_HDPARM=y
-CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
-CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y
-CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y
-# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
-# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
-CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y
-CONFIG_MAKEDEVS=y
-# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
-CONFIG_FEATURE_MAKEDEVS_TABLE=y
-# CONFIG_MOUNTPOINT is not set
-CONFIG_MT=y
-# BB_APPLET_RUNLEVEL is not set
-# CONFIG_RX is not set
-CONFIG_STRINGS=y
-# CONFIG_SETSID is not set
-CONFIG_TIME=y
-CONFIG_WATCHDOG=y
-
-#
-# Linux Module Utilities
-#
-CONFIG_INSMOD=y
-# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
-# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
-# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
-CONFIG_RMMOD=y
-CONFIG_LSMOD=y
-CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
-CONFIG_MODPROBE=y
-CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y
-
-#
-# Options common to multiple modutils
-#
-CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
-# CONFIG_FEATURE_2_4_MODULES is not set
-CONFIG_FEATURE_2_6_MODULES=y
-# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
-
-#
-# Networking Utilities
-#
-# CONFIG_FEATURE_IPV6 is not set
-CONFIG_ARPING=y
-CONFIG_ETHER_WAKE=y
-CONFIG_FAKEIDENTD=y
-CONFIG_FTPGET=y
-CONFIG_FTPPUT=y
-CONFIG_HOSTNAME=y
-# CONFIG_HTTPD is not set
-# CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY is not set
-# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
-# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
-# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
-# CONFIG_FEATURE_HTTPD_SETUID is not set
-# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
-# CONFIG_FEATURE_HTTPD_CGI is not set
-# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
-# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
-CONFIG_IFCONFIG=y
-CONFIG_FEATURE_IFCONFIG_STATUS=y
-# CONFIG_FEATURE_IFCONFIG_SLIP is not set
-CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
-CONFIG_FEATURE_IFCONFIG_HW=y
-CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
-CONFIG_IFUPDOWN=y
-# CONFIG_FEATURE_IFUPDOWN_IP is not set
-CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y
-CONFIG_FEATURE_IFUPDOWN_IPV4=y
-# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
-# CONFIG_FEATURE_IFUPDOWN_IPX is not set
-# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
-CONFIG_INETD=y
-# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_ECHO is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DISCARD is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_TIME is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DAYTIME is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_CHARGEN is not set
-# CONFIG_FEATURE_INETD_RPC is not set
-# CONFIG_IP is not set
-# CONFIG_FEATURE_IP_ADDRESS is not set
-# CONFIG_FEATURE_IP_LINK is not set
-# CONFIG_FEATURE_IP_ROUTE is not set
-# CONFIG_FEATURE_IP_TUNNEL is not set
-# CONFIG_IPCALC is not set
-# CONFIG_FEATURE_IPCALC_FANCY is not set
-# CONFIG_IPADDR is not set
-# CONFIG_IPLINK is not set
-# CONFIG_IPROUTE is not set
-# CONFIG_IPTUNNEL is not set
-# CONFIG_NAMEIF is not set
-CONFIG_NC=y
-# CONFIG_NC_GAPING_SECURITY_HOLE is not set
-CONFIG_NETSTAT=y
-CONFIG_NSLOOKUP=y
-CONFIG_PING=y
-CONFIG_FEATURE_FANCY_PING=y
-# CONFIG_PING6 is not set
-# CONFIG_FEATURE_FANCY_PING6 is not set
-CONFIG_ROUTE=y
-CONFIG_TELNET=y
-CONFIG_FEATURE_TELNET_TTYPE=y
-# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
-CONFIG_TELNETD=y
-# CONFIG_FEATURE_TELNETD_INETD is not set
-CONFIG_TFTP=y
-CONFIG_FEATURE_TFTP_GET=y
-CONFIG_FEATURE_TFTP_PUT=y
-CONFIG_FEATURE_TFTP_BLOCKSIZE=y
-CONFIG_FEATURE_TFTP_DEBUG=y
-CONFIG_TRACEROUTE=y
-CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
-# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
-# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
-CONFIG_VCONFIG=y
-CONFIG_WGET=y
-CONFIG_FEATURE_WGET_STATUSBAR=y
-CONFIG_FEATURE_WGET_AUTHENTICATION=y
-# CONFIG_FEATURE_WGET_IP6_LITERAL is not set
-
-#
-# udhcp Server/Client
-#
-# CONFIG_UDHCPD is not set
-CONFIG_UDHCPC=y
-# CONFIG_DUMPLEASES is not set
-CONFIG_FEATURE_UDHCP_SYSLOG=y
-# CONFIG_FEATURE_UDHCP_DEBUG is not set
-# CONFIG_ZCIP is not set
-
-#
-# Process Utilities
-#
-CONFIG_FREE=y
-CONFIG_FUSER=y
-CONFIG_KILL=y
-CONFIG_KILLALL=y
-CONFIG_PIDOF=y
-# CONFIG_FEATURE_PIDOF_SINGLE is not set
-# CONFIG_FEATURE_PIDOF_OMIT is not set
-CONFIG_PS=y
-CONFIG_FEATURE_PS_WIDE=y
-CONFIG_RENICE=y
-CONFIG_BB_SYSCTL=y
-CONFIG_TOP=y
-CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
-CONFIG_UPTIME=y
-
-#
-# Shells
-#
-CONFIG_FEATURE_SH_IS_ASH=y
-# CONFIG_FEATURE_SH_IS_HUSH is not set
-# CONFIG_FEATURE_SH_IS_LASH is not set
-# CONFIG_FEATURE_SH_IS_MSH is not set
-# CONFIG_FEATURE_SH_IS_NONE is not set
-CONFIG_ASH=y
-
-#
-# Ash Shell Options
-#
-CONFIG_ASH_JOB_CONTROL=y
-# CONFIG_ASH_READ_NCHARS is not set
-# CONFIG_ASH_READ_TIMEOUT is not set
-CONFIG_ASH_ALIAS=y
-CONFIG_ASH_MATH_SUPPORT=y
-CONFIG_ASH_MATH_SUPPORT_64=y
-# CONFIG_ASH_GETOPTS is not set
-# CONFIG_ASH_CMDCMD is not set
-# CONFIG_ASH_BUILTIN_ECHO is not set
-# CONFIG_ASH_MAIL is not set
-CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
-# CONFIG_ASH_RANDOM_SUPPORT is not set
-# CONFIG_ASH_EXPAND_PRMT is not set
-# CONFIG_HUSH is not set
-# CONFIG_LASH is not set
-# CONFIG_MSH is not set
-
-#
-# Bourne Shell Options
-#
-CONFIG_FEATURE_SH_EXTRA_QUIET=y
-# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set
-CONFIG_FEATURE_COMMAND_EDITING=y
-# CONFIG_FEATURE_COMMAND_EDITING_VI is not set
-CONFIG_FEATURE_COMMAND_HISTORY=100
-CONFIG_FEATURE_COMMAND_SAVEHISTORY=y
-CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y
-CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION=y
-CONFIG_FEATURE_SH_FANCY_PROMPT=y
-
-#
-# System Logging Utilities
-#
-CONFIG_SYSLOGD=y
-CONFIG_FEATURE_ROTATE_LOGFILE=y
-CONFIG_FEATURE_REMOTE_LOG=y
-CONFIG_FEATURE_IPC_SYSLOG=y
-CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
-CONFIG_LOGREAD=y
-# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
-CONFIG_KLOGD=y
-CONFIG_LOGGER=y
-
-#
-# Linux System Utilities
-#
-CONFIG_DMESG=y
-# CONFIG_FBSET is not set
-# CONFIG_FEATURE_FBSET_FANCY is not set
-# CONFIG_FEATURE_FBSET_READMODE is not set
-# CONFIG_FDFLUSH is not set
-CONFIG_FDFORMAT=y
-CONFIG_FDISK=y
-FDISK_SUPPORT_LARGE_DISKS=y
-CONFIG_FEATURE_FDISK_WRITABLE=y
-# CONFIG_FEATURE_AIX_LABEL is not set
-# CONFIG_FEATURE_SGI_LABEL is not set
-# CONFIG_FEATURE_SUN_LABEL is not set
-# CONFIG_FEATURE_OSF_LABEL is not set
-# CONFIG_FEATURE_FDISK_ADVANCED is not set
-# CONFIG_FREERAMDISK is not set
-# CONFIG_FSCK_MINIX is not set
-# CONFIG_MKFS_MINIX is not set
-# CONFIG_FEATURE_MINIX2 is not set
-CONFIG_GETOPT=y
-CONFIG_HEXDUMP=y
-CONFIG_HWCLOCK=y
-CONFIG_FEATURE_HWCLOCK_LONGOPTIONS=y
-CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
-# CONFIG_IPCRM is not set
-# CONFIG_IPCS is not set
-CONFIG_LOSETUP=y
-# CONFIG_MDEV is not set
-# CONFIG_FEATURE_MDEV_CONF is not set
-CONFIG_MKSWAP=y
-CONFIG_MORE=y
-CONFIG_FEATURE_USE_TERMIOS=y
-CONFIG_PIVOT_ROOT=y
-# CONFIG_SWITCH_ROOT is not set
-CONFIG_RDATE=y
-# CONFIG_READPROFILE is not set
-CONFIG_SWAPONOFF=y
-CONFIG_MOUNT=y
-CONFIG_FEATURE_MOUNT_NFS=y
-CONFIG_UMOUNT=y
-
-#
-# Common options for mount/umount
-#
-CONFIG_FEATURE_MOUNT_LOOP=y
-# CONFIG_FEATURE_MTAB_SUPPORT is not set
-
-#
-# Debugging Options
-#
-# CONFIG_DEBUG is not set
-# CONFIG_NO_DEBUG_LIB is not set
-# CONFIG_DMALLOC is not set
-# CONFIG_EFENCE is not set
Deleted: trunk/target/device/net5501/busybox.config
===================================================================
--- trunk/target/device/net5501/busybox.config 2007-05-29 20:06:51 UTC (rev 1076)
+++ trunk/target/device/net5501/busybox.config 2007-05-29 20:08:48 UTC (rev 1077)
@@ -1,593 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-HAVE_DOT_CONFIG=y
-
-#
-# General Configuration
-#
-# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
-# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
-CONFIG_FEATURE_BUFFERS_GO_IN_BSS=y
-CONFIG_FEATURE_VERBOSE_USAGE=y
-# CONFIG_FEATURE_INSTALLER is not set
-# CONFIG_LOCALE_SUPPORT is not set
-# CONFIG_FEATURE_DEVFS is not set
-# CONFIG_FEATURE_DEVPTS is not set
-# CONFIG_FEATURE_CLEAN_UP is not set
-CONFIG_FEATURE_SUID=y
-# CONFIG_FEATURE_SUID_CONFIG is not set
-# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
-# CONFIG_SELINUX is not set
-
-#
-# Build Options
-#
-# CONFIG_STATIC is not set
-CONFIG_LFS=y
-# USING_CROSS_COMPILER is not set
-CROSS_COMPILER_PREFIX=""
-EXTRA_CFLAGS_OPTIONS=""
-CONFIG_FEATURE_SUSv2=y
-CONFIG_FEATURE_SUSv2_OBSOLETE=y
-
-#
-# Installation Options
-#
-# CONFIG_INSTALL_NO_USR is not set
-CONFIG_INSTALL_APPLET_SYMLINKS=y
-# CONFIG_INSTALL_APPLET_HARDLINKS is not set
-# CONFIG_INSTALL_APPLET_DONT is not set
-PREFIX="./_install"
-
-#
-# Archival Utilities
-#
-# CONFIG_AR is not set
-# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
-CONFIG_BUNZIP2=y
-# CONFIG_CPIO is not set
-# CONFIG_DPKG is not set
-# CONFIG_DPKG_DEB is not set
-# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
-CONFIG_GUNZIP=y
-# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set
-CONFIG_GZIP=y
-# CONFIG_RPM2CPIO is not set
-# CONFIG_RPM is not set
-CONFIG_TAR=y
-CONFIG_FEATURE_TAR_CREATE=y
-CONFIG_FEATURE_TAR_BZIP2=y
-# CONFIG_FEATURE_TAR_FROM is not set
-CONFIG_FEATURE_TAR_GZIP=y
-# CONFIG_FEATURE_TAR_COMPRESS is not set
-# CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY is not set
-CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
-# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
-# CONFIG_UNCOMPRESS is not set
-CONFIG_UNZIP=y
-
-#
-# Common options for cpio and tar
-#
-# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
-# CONFIG_FEATURE_DEB_TAR_GZ is not set
-# CONFIG_FEATURE_DEB_TAR_BZ2 is not set
-
-#
-# Coreutils
-#
-CONFIG_BASENAME=y
-# CONFIG_CAL is not set
-CONFIG_CAT=y
-CONFIG_CHGRP=y
-CONFIG_CHMOD=y
-CONFIG_CHOWN=y
-CONFIG_CHROOT=y
-CONFIG_CMP=y
-# CONFIG_COMM is not set
-CONFIG_CP=y
-CONFIG_CUT=y
-CONFIG_DATE=y
-
-#
-# date (forced enabled for use with watch)
-#
-CONFIG_FEATURE_DATE_ISOFMT=y
-CONFIG_DD=y
-CONFIG_DF=y
-CONFIG_DIRNAME=y
-CONFIG_DOS2UNIX=y
-CONFIG_UNIX2DOS=y
-CONFIG_DU=y
-CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y
-CONFIG_ECHO=y
-CONFIG_FEATURE_FANCY_ECHO=y
-CONFIG_ENV=y
-CONFIG_EXPR=y
-CONFIG_FALSE=y
-# CONFIG_FOLD is not set
-CONFIG_HEAD=y
-# CONFIG_FEATURE_FANCY_HEAD is not set
-CONFIG_HOSTID=y
-CONFIG_ID=y
-CONFIG_INSTALL=y
-# CONFIG_LENGTH is not set
-CONFIG_LN=y
-CONFIG_LOGNAME=y
-CONFIG_LS=y
-CONFIG_FEATURE_LS_FILETYPES=y
-CONFIG_FEATURE_LS_FOLLOWLINKS=y
-CONFIG_FEATURE_LS_RECURSIVE=y
-CONFIG_FEATURE_LS_SORTFILES=y
-CONFIG_FEATURE_LS_TIMESTAMPS=y
-CONFIG_FEATURE_LS_USERNAME=y
-CONFIG_FEATURE_LS_COLOR=y
-# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
-CONFIG_MD5SUM=y
-CONFIG_MKDIR=y
-# CONFIG_MKFIFO is not set
-CONFIG_MKNOD=y
-CONFIG_MV=y
-CONFIG_NICE=y
-CONFIG_NOHUP=y
-# CONFIG_OD is not set
-# CONFIG_PRINTENV is not set
-# CONFIG_PRINTF is not set
-CONFIG_PWD=y
-CONFIG_REALPATH=y
-CONFIG_RM=y
-CONFIG_RMDIR=y
-CONFIG_SEQ=y
-CONFIG_SHA1SUM=y
-CONFIG_SLEEP=y
-# CONFIG_FEATURE_FANCY_SLEEP is not set
-CONFIG_SORT=y
-CONFIG_FEATURE_SORT_BIG=y
-CONFIG_STAT=y
-# CONFIG_FEATURE_STAT_FORMAT is not set
-CONFIG_STTY=y
-# CONFIG_SUM is not set
-CONFIG_SYNC=y
-CONFIG_TAIL=y
-CONFIG_FEATURE_FANCY_TAIL=y
-CONFIG_TEE=y
-CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
-CONFIG_TEST=y
-
-#
-# test (forced enabled for use with shell)
-#
-CONFIG_FEATURE_TEST_64=y
-CONFIG_TOUCH=y
-CONFIG_TR=y
-# CONFIG_FEATURE_TR_CLASSES is not set
-# CONFIG_FEATURE_TR_EQUIV is not set
-CONFIG_TRUE=y
-CONFIG_TTY=y
-CONFIG_UNAME=y
-CONFIG_UNIQ=y
-CONFIG_USLEEP=y
-CONFIG_UUDECODE=y
-CONFIG_UUENCODE=y
-CONFIG_WATCH=y
-CONFIG_WC=y
-CONFIG_WHO=y
-CONFIG_WHOAMI=y
-CONFIG_YES=y
-
-#
-# Common options for cp and mv
-#
-CONFIG_FEATURE_PRESERVE_HARDLINKS=y
-
-#
-# Common options for ls and more
-#
-CONFIG_FEATURE_AUTOWIDTH=y
-
-#
-# Common options for df, du, ls
-#
-CONFIG_FEATURE_HUMAN_READABLE=y
-
-#
-# Common options for md5sum, sha1sum
-#
-CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
-
-#
-# Console Utilities
-#
-CONFIG_CHVT=y
-CONFIG_CLEAR=y
-CONFIG_DEALLOCVT=y
-# CONFIG_DUMPKMAP is not set
-# CONFIG_LOADFONT is not set
-# CONFIG_LOADKMAP is not set
-CONFIG_OPENVT=y
-CONFIG_RESET=y
-# CONFIG_SETCONSOLE is not set
-# CONFIG_SETKEYCODES is not set
-
-#
-# Debian Utilities
-#
-CONFIG_MKTEMP=y
-# CONFIG_PIPE_PROGRESS is not set
-CONFIG_READLINK=y
-# CONFIG_FEATURE_READLINK_FOLLOW is not set
-CONFIG_RUN_PARTS=y
-# CONFIG_START_STOP_DAEMON is not set
-CONFIG_WHICH=y
-
-#
-# Linux Ext2 FS Progs
-#
-# CONFIG_CHATTR is not set
-CONFIG_E2FSCK=y
-CONFIG_FSCK=y
-CONFIG_LSATTR=y
-CONFIG_MKE2FS=y
-CONFIG_TUNE2FS=y
-CONFIG_E2LABEL=y
-CONFIG_FINDFS=y
-
-#
-# Editors
-#
-CONFIG_AWK=y
-CONFIG_FEATURE_AWK_MATH=y
-CONFIG_PATCH=y
-CONFIG_SED=y
-CONFIG_VI=y
-CONFIG_FEATURE_VI_COLON=y
-CONFIG_FEATURE_VI_YANKMARK=y
-CONFIG_FEATURE_VI_SEARCH=y
-CONFIG_FEATURE_VI_USE_SIGNALS=y
-CONFIG_FEATURE_VI_DOT_CMD=y
-CONFIG_FEATURE_VI_READONLY=y
-CONFIG_FEATURE_VI_SETOPTS=y
-CONFIG_FEATURE_VI_SET=y
-CONFIG_FEATURE_VI_WIN_RESIZE=y
-CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
-
-#
-# Finding Utilities
-#
-CONFIG_FIND=y
-CONFIG_FEATURE_FIND_MTIME=y
-CONFIG_FEATURE_FIND_PERM=y
-CONFIG_FEATURE_FIND_TYPE=y
-CONFIG_FEATURE_FIND_XDEV=y
-# CONFIG_FEATURE_FIND_NEWER is not set
-# CONFIG_FEATURE_FIND_INUM is not set
-CONFIG_FEATURE_FIND_EXEC=y
-CONFIG_GREP=y
-CONFIG_FEATURE_GREP_EGREP_ALIAS=y
-CONFIG_FEATURE_GREP_FGREP_ALIAS=y
-CONFIG_FEATURE_GREP_CONTEXT=y
-CONFIG_XARGS=y
-# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
-CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
-CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
-CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
-
-#
-# Init Utilities
-#
-CONFIG_INIT=y
-CONFIG_FEATURE_USE_INITTAB=y
-CONFIG_FEATURE_INITRD=y
-# CONFIG_FEATURE_INIT_COREDUMPS is not set
-# CONFIG_FEATURE_INIT_SCTTY is not set
-# CONFIG_FEATURE_EXTRA_QUIET is not set
-CONFIG_HALT=y
-# CONFIG_MESG is not set
-CONFIG_POWEROFF=y
-CONFIG_REBOOT=y
-
-#
-# Login/Password Management Utilities
-#
-CONFIG_FEATURE_SHADOWPASSWDS=y
-# CONFIG_USE_BB_SHADOW is not set
-# CONFIG_USE_BB_PWD_GRP is not set
-CONFIG_ADDGROUP=y
-CONFIG_DELGROUP=y
-CONFIG_ADDUSER=y
-CONFIG_DELUSER=y
-CONFIG_GETTY=y
-CONFIG_FEATURE_UTMP=y
-CONFIG_FEATURE_WTMP=y
-CONFIG_LOGIN=y
-# CONFIG_FEATURE_SECURETTY is not set
-CONFIG_PASSWD=y
-CONFIG_SU=y
-CONFIG_SULOGIN=y
-CONFIG_VLOCK=y
-
-#
-# Miscellaneous Utilities
-#
-# CONFIG_ADJTIMEX is not set
-CONFIG_BBCONFIG=y
-CONFIG_CROND=y
-CONFIG_FEATURE_CROND_CALL_SENDMAIL=y
-CONFIG_CRONTAB=y
-CONFIG_DC=y
-# CONFIG_DEVFSD is not set
-# CONFIG_DEVFSD_MODLOAD is not set
-# CONFIG_DEVFSD_FG_NP is not set
-# CONFIG_DEVFSD_VERBOSE is not set
-# CONFIG_EJECT is not set
-CONFIG_LAST=y
-CONFIG_LESS=y
-CONFIG_FEATURE_LESS_BRACKETS=y
-CONFIG_FEATURE_LESS_FLAGS=y
-# CONFIG_FEATURE_LESS_FLAGCS is not set
-# CONFIG_FEATURE_LESS_MARKS is not set
-# CONFIG_FEATURE_LESS_REGEXP is not set
-CONFIG_HDPARM=y
-CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
-CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y
-CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y
-# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
-# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
-CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y
-CONFIG_MAKEDEVS=y
-# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
-CONFIG_FEATURE_MAKEDEVS_TABLE=y
-# CONFIG_MOUNTPOINT is not set
-CONFIG_MT=y
-# BB_APPLET_RUNLEVEL is not set
-# CONFIG_RX is not set
-CONFIG_STRINGS=y
-# CONFIG_SETSID is not set
-CONFIG_TIME=y
-CONFIG_WATCHDOG=y
-
-#
-# Linux Module Utilities
-#
-CONFIG_INSMOD=y
-# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
-# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
-# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
-CONFIG_RMMOD=y
-CONFIG_LSMOD=y
-CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
-CONFIG_MODPROBE=y
-CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y
-
-#
-# Options common to multiple modutils
-#
-CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
-# CONFIG_FEATURE_2_4_MODULES is not set
-CONFIG_FEATURE_2_6_MODULES=y
-# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
-
-#
-# Networking Utilities
-#
-# CONFIG_FEATURE_IPV6 is not set
-CONFIG_ARPING=y
-CONFIG_ETHER_WAKE=y
-CONFIG_FAKEIDENTD=y
-CONFIG_FTPGET=y
-CONFIG_FTPPUT=y
-CONFIG_HOSTNAME=y
-# CONFIG_HTTPD is not set
-# CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY is not set
-# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
-# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
-# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
-# CONFIG_FEATURE_HTTPD_SETUID is not set
-# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
-# CONFIG_FEATURE_HTTPD_CGI is not set
-# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
-# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
-CONFIG_IFCONFIG=y
-CONFIG_FEATURE_IFCONFIG_STATUS=y
-# CONFIG_FEATURE_IFCONFIG_SLIP is not set
-CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
-CONFIG_FEATURE_IFCONFIG_HW=y
-CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
-CONFIG_IFUPDOWN=y
-# CONFIG_FEATURE_IFUPDOWN_IP is not set
-CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y
-CONFIG_FEATURE_IFUPDOWN_IPV4=y
-# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
-# CONFIG_FEATURE_IFUPDOWN_IPX is not set
-# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
-CONFIG_INETD=y
-# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_ECHO is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DISCARD is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_TIME is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DAYTIME is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_CHARGEN is not set
-# CONFIG_FEATURE_INETD_RPC is not set
-# CONFIG_IP is not set
-# CONFIG_FEATURE_IP_ADDRESS is not set
-# CONFIG_FEATURE_IP_LINK is not set
-# CONFIG_FEATURE_IP_ROUTE is not set
-# CONFIG_FEATURE_IP_TUNNEL is not set
-# CONFIG_IPCALC is not set
-# CONFIG_FEATURE_IPCALC_FANCY is not set
-# CONFIG_IPADDR is not set
-# CONFIG_IPLINK is not set
-# CONFIG_IPROUTE is not set
-# CONFIG_IPTUNNEL is not set
-# CONFIG_NAMEIF is not set
-CONFIG_NC=y
-# CONFIG_NC_GAPING_SECURITY_HOLE is not set
-CONFIG_NETSTAT=y
-CONFIG_NSLOOKUP=y
-CONFIG_PING=y
-CONFIG_FEATURE_FANCY_PING=y
-# CONFIG_PING6 is not set
-# CONFIG_FEATURE_FANCY_PING6 is not set
-CONFIG_ROUTE=y
-CONFIG_TELNET=y
-CONFIG_FEATURE_TELNET_TTYPE=y
-# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
-CONFIG_TELNETD=y
-# CONFIG_FEATURE_TELNETD_INETD is not set
-CONFIG_TFTP=y
-CONFIG_FEATURE_TFTP_GET=y
-CONFIG_FEATURE_TFTP_PUT=y
-CONFIG_FEATURE_TFTP_BLOCKSIZE=y
-CONFIG_FEATURE_TFTP_DEBUG=y
-CONFIG_TRACEROUTE=y
-CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
-# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
-# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
-CONFIG_VCONFIG=y
-CONFIG_WGET=y
-CONFIG_FEATURE_WGET_STATUSBAR=y
-CONFIG_FEATURE_WGET_AUTHENTICATION=y
-# CONFIG_FEATURE_WGET_IP6_LITERAL is not set
-
-#
-# udhcp Server/Client
-#
-# CONFIG_UDHCPD is not set
-CONFIG_UDHCPC=y
-# CONFIG_DUMPLEASES is not set
-CONFIG_FEATURE_UDHCP_SYSLOG=y
-# CONFIG_FEATURE_UDHCP_DEBUG is not set
-# CONFIG_ZCIP is not set
-
-#
-# Process Utilities
-#
-CONFIG_FREE=y
-CONFIG_FUSER=y
-CONFIG_KILL=y
-CONFIG_KILLALL=y
-CONFIG_PIDOF=y
-# CONFIG_FEATURE_PIDOF_SINGLE is not set
-# CONFIG_FEATURE_PIDOF_OMIT is not set
-CONFIG_PS=y
-CONFIG_FEATURE_PS_WIDE=y
-CONFIG_RENICE=y
-CONFIG_BB_SYSCTL=y
-CONFIG_TOP=y
-CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
-CONFIG_UPTIME=y
-
-#
-# Shells
-#
-CONFIG_FEATURE_SH_IS_ASH=y
-# CONFIG_FEATURE_SH_IS_HUSH is not set
-# CONFIG_FEATURE_SH_IS_LASH is not set
-# CONFIG_FEATURE_SH_IS_MSH is not set
-# CONFIG_FEATURE_SH_IS_NONE is not set
-CONFIG_ASH=y
-
-#
-# Ash Shell Options
-#
-CONFIG_ASH_JOB_CONTROL=y
-# CONFIG_ASH_READ_NCHARS is not set
-# CONFIG_ASH_READ_TIMEOUT is not set
-CONFIG_ASH_ALIAS=y
-CONFIG_ASH_MATH_SUPPORT=y
-CONFIG_ASH_MATH_SUPPORT_64=y
-# CONFIG_ASH_GETOPTS is not set
-# CONFIG_ASH_CMDCMD is not set
-# CONFIG_ASH_BUILTIN_ECHO is not set
-# CONFIG_ASH_MAIL is not set
-CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
-# CONFIG_ASH_RANDOM_SUPPORT is not set
-# CONFIG_ASH_EXPAND_PRMT is not set
-# CONFIG_HUSH is not set
-# CONFIG_LASH is not set
-# CONFIG_MSH is not set
-
-#
-# Bourne Shell Options
-#
-CONFIG_FEATURE_SH_EXTRA_QUIET=y
-# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set
-CONFIG_FEATURE_COMMAND_EDITING=y
-# CONFIG_FEATURE_COMMAND_EDITING_VI is not set
-CONFIG_FEATURE_COMMAND_HISTORY=100
-CONFIG_FEATURE_COMMAND_SAVEHISTORY=y
-CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y
-CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION=y
-CONFIG_FEATURE_SH_FANCY_PROMPT=y
-
-#
-# System Logging Utilities
-#
-CONFIG_SYSLOGD=y
-CONFIG_FEATURE_ROTATE_LOGFILE=y
-CONFIG_FEATURE_REMOTE_LOG=y
-CONFIG_FEATURE_IPC_SYSLOG=y
-CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
-CONFIG_LOGREAD=y
-# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
-CONFIG_KLOGD=y
-CONFIG_LOGGER=y
-
-#
-# Linux System Utilities
-#
-CONFIG_DMESG=y
-# CONFIG_FBSET is not set
-# CONFIG_FEATURE_FBSET_FANCY is not set
-# CONFIG_FEATURE_FBSET_READMODE is not set
-# CONFIG_FDFLUSH is not set
-CONFIG_FDFORMAT=y
-CONFIG_FDISK=y
-FDISK_SUPPORT_LARGE_DISKS=y
-CONFIG_FEATURE_FDISK_WRITABLE=y
-# CONFIG_FEATURE_AIX_LABEL is not set
-# CONFIG_FEATURE_SGI_LABEL is not set
-# CONFIG_FEATURE_SUN_LABEL is not set
-# CONFIG_FEATURE_OSF_LABEL is not set
-# CONFIG_FEATURE_FDISK_ADVANCED is not set
-# CONFIG_FREERAMDISK is not set
-# CONFIG_FSCK_MINIX is not set
-# CONFIG_MKFS_MINIX is not set
-# CONFIG_FEATURE_MINIX2 is not set
-CONFIG_GETOPT=y
-CONFIG_HEXDUMP=y
-CONFIG_HWCLOCK=y
-CONFIG_FEATURE_HWCLOCK_LONGOPTIONS=y
-CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
-# CONFIG_IPCRM is not set
-# CONFIG_IPCS is not set
-CONFIG_LOSETUP=y
-# CONFIG_MDEV is not set
-# CONFIG_FEATURE_MDEV_CONF is not set
-CONFIG_MKSWAP=y
-CONFIG_MORE=y
-CONFIG_FEATURE_USE_TERMIOS=y
-CONFIG_PIVOT_ROOT=y
-# CONFIG_SWITCH_ROOT is not set
-CONFIG_RDATE=y
-# CONFIG_READPROFILE is not set
-CONFIG_SWAPONOFF=y
-CONFIG_MOUNT=y
-CONFIG_FEATURE_MOUNT_NFS=y
-CONFIG_UMOUNT=y
-
-#
-# Common options for mount/umount
-#
-CONFIG_FEATURE_MOUNT_LOOP=y
-# CONFIG_FEATURE_MTAB_SUPPORT is not set
-
-#
-# Debugging Options
-#
-# CONFIG_DEBUG is not set
-# CONFIG_NO_DEBUG_LIB is not set
-# CONFIG_DMALLOC is not set
-# CONFIG_EFENCE is not set
Deleted: trunk/target/device/via/busybox.config
===================================================================
--- trunk/target/device/via/busybox.config 2007-05-29 20:06:51 UTC (rev 1076)
+++ trunk/target/device/via/busybox.config 2007-05-29 20:08:48 UTC (rev 1077)
@@ -1,593 +0,0 @@
-#
-# Automatically generated make confi...
[truncated message content] |
|
From: <kr...@us...> - 2007-07-05 20:52:11
|
Revision: 1122
http://svn.sourceforge.net/astlinux/?rev=1122&view=rev
Author: krisk84
Date: 2007-07-05 13:52:11 -0700 (Thu, 05 Jul 2007)
Log Message:
-----------
various build fixes to cleanup menus and dependencies
Modified Paths:
--------------
trunk/astlinux.config
trunk/package/Config.in
trunk/package/apcupsd/Config.in
trunk/package/asterisk/Config.in
trunk/package/lmsensors/Config.in
trunk/package/sysfsutils/sysfsutils.mk
trunk/package/tcpdump/Config.in
trunk/package/wanpipe/Config.in
trunk/package/zaptel/Config.in
Removed Paths:
-------------
trunk/package/chansccp/Config.in
trunk/package/libpri/Config.in
trunk/package/libsysfs/
Modified: trunk/astlinux.config
===================================================================
--- trunk/astlinux.config 2007-07-05 19:44:46 UTC (rev 1121)
+++ trunk/astlinux.config 2007-07-05 20:52:11 UTC (rev 1122)
@@ -171,10 +171,9 @@
# BR2_PACKAGE_ALSA_UTILS is not set
BR2_PACKAGE_ARNOFW=y
BR2_PACKAGE_ASTERISK=y
-BR2_PACKAGE_ASTERISK_LIBPRI=y
-BR2_PACKAGE_ASTERISK_ZAPTEL=y
+BR2_PACKAGE_LIBPRI=y
# BR2_PACKAGE_ASTERISK_LIBPQ_CUSTOM is not set
-BR2_PACKAGE_ASTERISK_CHANSCCP=y
+BR2_PACKAGE_CHANSCCP=y
# BR2_PACKAGE_ASTERISK_CHANBLUETOOTH is not set
# BR2_PACKAGE_ASTERISK_RESCONV is not set
# BR2_PACKAGE_ASTERISK_LOWMEMORY is not set
@@ -207,7 +206,6 @@
# BR2_PACKAGE_BOA is not set
BR2_PACKAGE_BRIDGE=y
# BR2_PACKAGE_CDP-SEND is not set
-BR2_PACKAGE_CHANSCCP=y
# BR2_PACKAGE_CUSTOMIZE is not set
# BR2_PACKAGE_ISC_DHCP is not set
BR2_PACKAGE_DIALOG=y
@@ -259,8 +257,6 @@
BR2_PACKAGE_LIBPCAP=y
# BR2_PACKAGE_LIBPNG is not set
# BR2_PACKAGE_LIBPQ is not set
-BR2_PACKAGE_LIBPRI=y
-BR2_PACKAGE_LIBSYSFS=y
# BR2_PACKAGE_LIBTIFF is not set
# BR2_PACKAGE_LIBTOOL is not set
BR2_PACKAGE_LIBUSB=y
Modified: trunk/package/Config.in
===================================================================
--- trunk/package/Config.in 2007-07-05 19:44:46 UTC (rev 1121)
+++ trunk/package/Config.in 2007-07-05 20:52:11 UTC (rev 1122)
@@ -51,7 +51,6 @@
source "package/boa/Config.in"
source "package/bridge/Config.in"
source "package/cdp-send/Config.in"
-source "package/chansccp/Config.in"
source "package/customize/Config.in"
source "package/dhcp/Config.in"
source "package/dialog/Config.in"
@@ -95,8 +94,6 @@
source "package/libpcap/Config.in"
source "package/libpng/Config.in"
source "package/libpq/Config.in"
-source "package/libpri/Config.in"
-source "package/libsysfs/Config.in"
source "package/libtiff/Config.in"
source "package/libtool/Config.in"
source "package/libusb/Config.in"
Modified: trunk/package/apcupsd/Config.in
===================================================================
--- trunk/package/apcupsd/Config.in 2007-07-05 19:44:46 UTC (rev 1121)
+++ trunk/package/apcupsd/Config.in 2007-07-05 20:52:11 UTC (rev 1122)
@@ -1,6 +1,7 @@
config BR2_PACKAGE_APCUPSD
bool "apcupsd"
default n
+ select BR2_PACKAGE_LIBUSB
help
apcupsd is a daemon for controlling APC ups'
http://www.apcupsd.org/
Modified: trunk/package/asterisk/Config.in
===================================================================
--- trunk/package/asterisk/Config.in 2007-07-05 19:44:46 UTC (rev 1121)
+++ trunk/package/asterisk/Config.in 2007-07-05 20:52:11 UTC (rev 1122)
@@ -8,22 +8,13 @@
help
Asterisk - the Open Source PBX
-config BR2_PACKAGE_ASTERISK_LIBPRI
+config BR2_PACKAGE_LIBPRI
bool "Asterisk PRI Support"
default n
depends BR2_PACKAGE_ASTERISK
- select BR2_PACKAGE_LIBPRI
help
Compile Asterisk with PRI support - only useful with zaptel
-config BR2_PACKAGE_ASTERISK_ZAPTEL
- bool "Asterisk ZAP Support"
- default n
- depends BR2_PACKAGE_ASTERISK
- select BR2_PACKAGE_ZAPTEL
- help
- Compile Asterisk with zaptel support
-
config BR2_PACKAGE_ASTERISK_LIBPQ_CUSTOM
bool "Asterisk Custom PostgreSQL Support"
default n
@@ -32,11 +23,10 @@
help
Compile Asterisk with custom PostgreSQL support
-config BR2_PACKAGE_ASTERISK_CHANSCCP
+config BR2_PACKAGE_CHANSCCP
bool "Asterisk chan_sccp Support"
default n
depends BR2_PACKAGE_ASTERISK
- select BR2_PACKAGE_CHANSCCP
help
Compile Asterisk with chan_sccp from the chan_sccp project on berlios
Deleted: trunk/package/chansccp/Config.in
===================================================================
--- trunk/package/chansccp/Config.in 2007-07-05 19:44:46 UTC (rev 1121)
+++ trunk/package/chansccp/Config.in 2007-07-05 20:52:11 UTC (rev 1122)
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_CHANSCCP
- bool "chansccp"
- default n
- help
- chan_sccp - Use Cisco phones with Asterisk
-
- http://chan-sccp.berlios.de/
-
Deleted: trunk/package/libpri/Config.in
===================================================================
--- trunk/package/libpri/Config.in 2007-07-05 19:44:46 UTC (rev 1121)
+++ trunk/package/libpri/Config.in 2007-07-05 20:52:11 UTC (rev 1122)
@@ -1,6 +0,0 @@
-config BR2_PACKAGE_LIBPRI
- bool "libpri"
- default n
- help
- libpri - PRI (Primary Rate ISDN) library for Asterisk
-
Modified: trunk/package/lmsensors/Config.in
===================================================================
--- trunk/package/lmsensors/Config.in 2007-07-05 19:44:46 UTC (rev 1121)
+++ trunk/package/lmsensors/Config.in 2007-07-05 20:52:11 UTC (rev 1122)
@@ -1,6 +1,7 @@
config BR2_PACKAGE_LMSENSORS
bool "lmsensors"
default n
+ select BR2_PACKAGE_SYSFSUTILS
help
lmsensors - Hardware monitoring software package
Modified: trunk/package/sysfsutils/sysfsutils.mk
===================================================================
--- trunk/package/sysfsutils/sysfsutils.mk 2007-07-05 19:44:46 UTC (rev 1121)
+++ trunk/package/sysfsutils/sysfsutils.mk 2007-07-05 20:52:11 UTC (rev 1122)
@@ -49,13 +49,16 @@
sysfsutils: $(TARGET_DIR)/$(SYSFSUTILS_TARGET_BINARY)
+libsysfs: sysfsutils
+
sysfsutils-source: $(DL_DIR)/$(SYSFSUTILS_SOURCE)
sysfsutils-clean:
-$(MAKE) -C $(SYSFSUTILS_BUILD_DIR) clean
+ rm -rf $(TARGET_DIR)lib/libsysfs.s*
sysfsutils-dirclean:
- rm -rf $(SYSFSUTILS_BUILD_DIR)
+ - rm -rf $(SYSFSUTILS_BUILD_DIR)
#############################################################
#
# Toplevel Makefile options
Modified: trunk/package/tcpdump/Config.in
===================================================================
--- trunk/package/tcpdump/Config.in 2007-07-05 19:44:46 UTC (rev 1121)
+++ trunk/package/tcpdump/Config.in 2007-07-05 20:52:11 UTC (rev 1122)
@@ -1,7 +1,7 @@
config BR2_PACKAGE_TCPDUMP
bool "tcpdump"
default n
- depends BR2_PACKAGE_LIBPCAP
+ select BR2_PACKAGE_LIBPCAP
help
A tool for network monitoring and data acquisition.
Modified: trunk/package/wanpipe/Config.in
===================================================================
--- trunk/package/wanpipe/Config.in 2007-07-05 19:44:46 UTC (rev 1121)
+++ trunk/package/wanpipe/Config.in 2007-07-05 20:52:11 UTC (rev 1122)
@@ -1,5 +1,7 @@
config BR2_PACKAGE_WANPIPE
bool "wanpipe"
+ select BR2_PACKAGE_ZAPTEL
+ select BR2_PACKAGE_FLEX
default n
help
Wanpipe - Support for Sangoma cards
Modified: trunk/package/zaptel/Config.in
===================================================================
--- trunk/package/zaptel/Config.in 2007-07-05 19:44:46 UTC (rev 1121)
+++ trunk/package/zaptel/Config.in 2007-07-05 20:52:11 UTC (rev 1122)
@@ -2,7 +2,7 @@
bool "zaptel"
default n
depends on BR2_PACKAGE_LINUX
- depends on BR2_PACKAGE_NEWT
+ select BR2_PACKAGE_NEWT
help
Zaptel - Linux drivers and utilities for Zapata and Digium cards
for use with Asterisk:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2007-07-09 20:24:07
|
Revision: 1126
http://svn.sourceforge.net/astlinux/?rev=1126&view=rev
Author: krisk84
Date: 2007-07-09 13:24:07 -0700 (Mon, 09 Jul 2007)
Log Message:
-----------
disable ipv6 in core components. What a glimpse into
the nightmare we will all face in the next few years...
Modified Paths:
--------------
trunk/package/busybox/busybox-astlinux.config
trunk/target/device/geni586/linux.config
trunk/toolchain/uClibc/uClibc.config
Modified: trunk/package/busybox/busybox-astlinux.config
===================================================================
--- trunk/package/busybox/busybox-astlinux.config 2007-07-09 17:44:27 UTC (rev 1125)
+++ trunk/package/busybox/busybox-astlinux.config 2007-07-09 20:24:07 UTC (rev 1126)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.4.1
-# Tue May 29 14:19:22 2007
+# Mon Jul 9 16:22:39 2007
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -490,7 +490,7 @@
#
# Networking Utilities
#
-CONFIG_FEATURE_IPV6=y
+# CONFIG_FEATURE_IPV6 is not set
CONFIG_ARP=y
CONFIG_ARPING=y
# CONFIG_DNSD is not set
@@ -521,7 +521,7 @@
# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN=y
CONFIG_FEATURE_IFUPDOWN_IPV4=y
-CONFIG_FEATURE_IFUPDOWN_IPV6=y
+# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
# CONFIG_FEATURE_IFUPDOWN_IPX is not set
# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
CONFIG_INETD=y
@@ -554,8 +554,8 @@
CONFIG_NSLOOKUP=y
CONFIG_PING=y
CONFIG_FEATURE_FANCY_PING=y
-CONFIG_PING6=y
-CONFIG_FEATURE_FANCY_PING6=y
+# CONFIG_PING6 is not set
+# CONFIG_FEATURE_FANCY_PING6 is not set
CONFIG_ROUTE=y
CONFIG_TELNET=y
CONFIG_FEATURE_TELNET_TTYPE=y
@@ -581,7 +581,7 @@
CONFIG_WGET=y
CONFIG_FEATURE_WGET_STATUSBAR=y
CONFIG_FEATURE_WGET_AUTHENTICATION=y
-CONFIG_FEATURE_WGET_IP6_LITERAL=y
+# CONFIG_FEATURE_WGET_IP6_LITERAL is not set
# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
CONFIG_ZCIP=y
Modified: trunk/target/device/geni586/linux.config
===================================================================
--- trunk/target/device/geni586/linux.config 2007-07-09 17:44:27 UTC (rev 1125)
+++ trunk/target/device/geni586/linux.config 2007-07-09 20:24:07 UTC (rev 1126)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.20
-# Thu May 31 10:44:52 2007
+# Mon Jul 9 16:20:31 2007
#
CONFIG_X86_32=y
CONFIG_GENERIC_TIME=y
@@ -356,23 +356,9 @@
# IP: Virtual Server Configuration
#
# CONFIG_IP_VS is not set
-CONFIG_IPV6=m
-CONFIG_IPV6_PRIVACY=y
-# CONFIG_IPV6_ROUTER_PREF is not set
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=y
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_IPV6_SUBTREES=y
+# CONFIG_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
CONFIG_NETWORK_SECMARK=y
CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set
@@ -484,27 +470,6 @@
CONFIG_IP_NF_ARP_MANGLE=m
#
-# IPv6: Netfilter Configuration (EXPERIMENTAL)
-#
-CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_IP6_NF_QUEUE=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_OWNER=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_LOG=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_RAW=m
-
-#
# Bridge: Netfilter Configuration
#
# CONFIG_BRIDGE_NF_EBTABLES is not set
Modified: trunk/toolchain/uClibc/uClibc.config
===================================================================
--- trunk/toolchain/uClibc/uClibc.config 2007-07-09 17:44:27 UTC (rev 1125)
+++ trunk/toolchain/uClibc/uClibc.config 2007-07-09 20:24:07 UTC (rev 1126)
@@ -91,7 +91,7 @@
#
# Networking Support
#
-UCLIBC_HAS_IPV6=y
+# UCLIBC_HAS_IPV6 is not set
UCLIBC_HAS_RPC=y
UCLIBC_HAS_FULL_RPC=y
UCLIBC_HAS_REENTRANT_RPC=y
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2007-07-19 05:13:37
|
Revision: 1145
http://svn.sourceforge.net/astlinux/?rev=1145&view=rev
Author: krisk84
Date: 2007-07-18 21:59:13 -0700 (Wed, 18 Jul 2007)
Log Message:
-----------
Numerous openser and rtpproxy fixes and improvements:
- Update to OpenSER 1.2.1
- Enable tls by default
- Create openser user and group
- Install dbtext openserctl by default
- Make sure we install bash into target
- Enable many new config variables for both
OpenSER and rtpproxy - see rc.conf
Modified Paths:
--------------
trunk/package/openser/Config.in
trunk/package/openser/openser.init
trunk/package/openser/openser.mk
trunk/target/generic/target_skeleton/stat/etc/rc.conf
Modified: trunk/package/openser/Config.in
===================================================================
--- trunk/package/openser/Config.in 2007-07-19 02:34:21 UTC (rev 1144)
+++ trunk/package/openser/Config.in 2007-07-19 04:59:13 UTC (rev 1145)
@@ -1,6 +1,8 @@
config BR2_PACKAGE_OPENSER
bool "openser"
default n
+ select BR2_PACKAGE_BASH
+ select BR2_PACKAGE_OPENSSL
help
OpenSER is a mature and flexible open source SIP server (RFC3261).
Modified: trunk/package/openser/openser.init
===================================================================
--- trunk/package/openser/openser.init 2007-07-19 02:34:21 UTC (rev 1144)
+++ trunk/package/openser/openser.init 2007-07-19 04:59:13 UTC (rev 1145)
@@ -3,6 +3,8 @@
. /etc/rc.conf
init () {
+mkdir /var/run/openser
+
if [ -d /mnt/kd/openser ]
then
ln -s /mnt/kd/openser /tmp/etc/openser
@@ -17,24 +19,36 @@
}
start () {
+
+if [ ! "$RTPPROXY_SOCKET" ]
+then
+RTPPROXY_SOCKET="udp:127.0.0.1:7890"
+fi
+
+if [ ! "$RTPPROXY_TOS" ]
+then
+RTPPROXY_TOS="0x18"
+fi
+
if [ "$RTPPROXY_IP" ]
then
echo "Starting rtpproxy..."
-rtpproxy -l $RTPPROXY_IP -s unix:/var/run/rtpproxy.sock
+rtpproxy -l "$RTPPROXY_IP" -s "$RTPPROXY_SOCKET" -t "$RTPPROXY_TOS"
fi
-if [ -f /tmp/etc/openser/openser.cfg ]
+if [ "$OPENSERUSER" -a "$OPENSERGROUP" -a -r /etc/openser/openser.cfg ]
then
echo "Starting openser..."
-openser
+
+openser -u "$OPENSERUSER" -g "$OPENSERGROUP" -P /var/run/openser.pid
fi
}
stop () {
-if [ -f /tmp/etc/openser/openser.cfg ]
+if [ -r /var/run/openser.pid ]
then
echo "Stopping openser..."
-killall openser 2> /dev/null
+kill `cat /var/run/openser.pid`
fi
if [ -r /var/run/rtpproxy.pid ]
Modified: trunk/package/openser/openser.mk
===================================================================
--- trunk/package/openser/openser.mk 2007-07-19 02:34:21 UTC (rev 1144)
+++ trunk/package/openser/openser.mk 2007-07-19 04:59:13 UTC (rev 1145)
@@ -3,10 +3,10 @@
# openser & rtpproxy
#
##############################################################
-OPENSER_VERSION := 1.1.1-notls_src
+OPENSER_VERSION := 1.2.1-tls_src
OPENSER_SOURCE := openser-$(OPENSER_VERSION).tar.gz
-OPENSER_SITE := http://www.openser.org/pub/openser/1.1.1/src
-OPENSER_DIR := $(BUILD_DIR)/openser-1.1.1-notls
+OPENSER_SITE := http://www.openser.org/pub/openser/1.2.1/src
+OPENSER_DIR := $(BUILD_DIR)/openser-1.2.1-tls
OPENSER_BINARY := openser
OPENSER_TARGET_BINARY := usr/sbin/openser
@@ -65,10 +65,11 @@
prefix="" \
bin-prefix=/usr/ \
cfg-prefix=/ \
- extra_defs="-DUSE_PTHREAD_MUTEX " \
+ extra_defs="-DUSE_PTHREAD_MUTEX " \
CC="$(TARGET_CC)" \
ARCH="$(ARCH)" \
CFLAGS="$(TARGET_CFLAGS)" \
+ TLS=1 \
all
touch -c $(TARGET_DIR)/$(OPENSER_BINARY)
@@ -79,7 +80,13 @@
ln -sf /tmp/etc/openser $(TARGET_DIR)/etc/openser
$(INSTALL) -D -m 0640 package/openser/openser.cfg $(TARGET_DIR)/stat/etc/openser/openser.cfg
$(INSTALL) -D -m 0755 package/openser/openser.init $(TARGET_DIR)/etc/init.d/openser
- $(INSTALL) -D -m 0755 $(OPENSER_DIR)/scripts/openserctl $(TARGET_DIR)/usr/sbin/openserctl
+ # $(INSTALL) -D -m 0755 $(OPENSER_DIR)/scripts/openserctl $(TARGET_DIR)/usr/sbin/openserctl
+ $(INSTALL) -D -m 0755 $(OPENSER_DIR)/scripts/sc.dbtext $(TARGET_DIR)/usr/sbin/openserctl
+ sed -e 's,/bin/sh,/bin/bash,' -i $(TARGET_DIR)/usr/sbin/openserctl
+ sed -e 's,/usr/local/etc/openser,/etc/openser,g' -i $(TARGET_DIR)/usr/sbin/openserctl
+ echo "openser:x:5060:5060:openser:/usr/share/empty:/bin/false" >> $(TARGET_DIR)/etc/passwd
+ echo "openser:!:3656:0:99999:7:::" >> $(TARGET_DIR)/etc/shadow
+ echo "openser:x:5060:" >> $(TARGET_DIR)/etc/group
$(INSTALL) -D -m 0755 $(OPENSER_DIR)/$(OPENSER_BINARY) $(TARGET_DIR)/$(OPENSER_TARGET_BINARY)
$(STRIP) $(TARGET_DIR)/$(OPENSER_TARGET_BINARY)
touch -c $(TARGET_DIR)/$(OPENSER_TARGET_BINARY)
@@ -95,7 +102,7 @@
rtpproxy-dirclean:
-rm -rf $(RTPPROXY_DIR)
-openser: uclibc $(TARGET_DIR)/$(OPENSER_TARGET_BINARY)
+openser: uclibc bash openssl $(TARGET_DIR)/$(OPENSER_TARGET_BINARY)
openser-source: $(DL_DIR)/$(OPENSER_SOURCE)
Modified: trunk/target/generic/target_skeleton/stat/etc/rc.conf
===================================================================
--- trunk/target/generic/target_skeleton/stat/etc/rc.conf 2007-07-19 02:34:21 UTC (rev 1144)
+++ trunk/target/generic/target_skeleton/stat/etc/rc.conf 2007-07-19 04:59:13 UTC (rev 1145)
@@ -490,11 +490,19 @@
##For diskless clients, the image to use for booting.
#BOOTPFILE="/pxelinux.0"
+##OpenSER Support
+##If your build was compiled with OpenSER, you can configure that here
+##OpenSER will not start until you define a user and group to run under
+#OPENSERUSER="openser"
+#OPENSERGROUP="openser"
+
##rtpproxy support
##If your build was built with rtpproxy support, you can configure the
##listen IP here. This is really only useful if you have OpenSER too
##You can use other variables from this file
#RTPPROXY_IP="$EXTIP"
+#RTPPROXY_SOCKET="udp:127.0.0.1:7890"
+#RTPPROXY_TOS="0x18"
###Mail Config
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dha...@us...> - 2007-08-09 12:39:51
|
Revision: 1159
http://astlinux.svn.sourceforge.net/astlinux/?rev=1159&view=rev
Author: dhartman
Date: 2007-08-09 05:39:20 -0700 (Thu, 09 Aug 2007)
Log Message:
-----------
add support to disable dhcp on eth2 or 3
Modified Paths:
--------------
trunk/package/dnsmasq/dnsmasq.init
trunk/target/generic/target_skeleton/stat/etc/rc.conf
Modified: trunk/package/dnsmasq/dnsmasq.init
===================================================================
--- trunk/package/dnsmasq/dnsmasq.init 2007-08-08 20:32:31 UTC (rev 1158)
+++ trunk/package/dnsmasq/dnsmasq.init 2007-08-09 12:39:20 UTC (rev 1159)
@@ -68,6 +68,10 @@
echo "dhcp-boot=$BOOTPFILE,$HOSTNAME.$DOMAIN,$INTIP" >> /tmp/etc/dnsmasq.conf
fi
+if [ "$INT2IFDNS" -a "$INT2IFDNS" = "off" ]
+then
+echo "# DNS disabled on INT2IF" >> /tmp/etc/dnsmasq.conf
+else
if [ "$INT2IF" ]
then
echo "
@@ -78,7 +82,11 @@
dhcp-option=lan2,66,$INT2IP
dhcp-option=lan2,150,$INT2IP" >> /tmp/etc/dnsmasq.conf
fi
+fi
+if [ "$INT2IFDNS" -a "$INT2IFDNS" = "off" ]
+then
+echo "# DNS disabled on INT3IF" >> /tmp/etc/dnsmasq.conf
if [ "$INT3IF" ]
then
echo "
@@ -89,6 +97,7 @@
dhcp-option=lan3,66,$INT3IP
dhcp-option=lan3,150,$INT3IP" >> /tmp/etc/dnsmasq.conf
fi
+fi
echo "# Create /mnt/kd/dnsmasq.static to specify additional settings." >> /tmp/etc/dnsmasq.conf
Modified: trunk/target/generic/target_skeleton/stat/etc/rc.conf
===================================================================
--- trunk/target/generic/target_skeleton/stat/etc/rc.conf 2007-08-08 20:32:31 UTC (rev 1158)
+++ trunk/target/generic/target_skeleton/stat/etc/rc.conf 2007-08-09 12:39:20 UTC (rev 1159)
@@ -141,6 +141,10 @@
##for DNS resolution on THIS machine.
#LOCALDNS=yes
+##Disable DHCP on INT2 or INT3
+#INT2IFDNS=off
+#INT3IFDNS=off
+
##If you do not define the INTIF, I will not try to start one.
##If you do not define the INTIF, I will also not start the following services:
##dnsmasq iptables astshape (PBX only mode)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2007-09-06 20:47:35
|
Revision: 1227
http://astlinux.svn.sourceforge.net/astlinux/?rev=1227&view=rev
Author: krisk84
Date: 2007-09-06 13:47:38 -0700 (Thu, 06 Sep 2007)
Log Message:
-----------
improve astrelease versioning
Modified Paths:
--------------
trunk/target/generic/target_skeleton/etc/astlinux-release
trunk/toolchain/astrelease/astrelease.mk
Modified: trunk/target/generic/target_skeleton/etc/astlinux-release
===================================================================
--- trunk/target/generic/target_skeleton/etc/astlinux-release 2007-09-05 18:59:42 UTC (rev 1226)
+++ trunk/target/generic/target_skeleton/etc/astlinux-release 2007-09-06 20:47:38 UTC (rev 1227)
@@ -1 +1 @@
-trunk
+svn
Modified: trunk/toolchain/astrelease/astrelease.mk
===================================================================
--- trunk/toolchain/astrelease/astrelease.mk 2007-09-05 18:59:42 UTC (rev 1226)
+++ trunk/toolchain/astrelease/astrelease.mk 2007-09-06 20:47:38 UTC (rev 1227)
@@ -4,15 +4,16 @@
#
######################################################################
-# ASTVERTEST=$(shell cat target/generic/target_skeleton/etc/astlinux-release)
+ASTURL= $(shell svn info | grep URL | cut -d" " -f2)
+ASTBASE= $(shell basename $(ASTURL))
+ASTREV= $(shell svn info | grep 'Revision' | cut -d" " -f2)
-ifeq ($(shell cat target/generic/target_skeleton/etc/astlinux-release),trunk)
- ASTVER = SVN-$(shell svn info | grep 'Last Changed Rev' | cut -d\ -f4)
+ifeq ($(shell cat target/generic/target_skeleton/etc/astlinux-release),svn)
+ ASTVER = astlinux-$(ASTBASE)-$(ASTREV)
else
ASTVER = $(shell cat target/generic/target_skeleton/etc/astlinux-release)
endif
-
$(ASTVER).tar.gz: ext2initrd squashfsroot
mkdir -p $(ASTVER)
cp $(SQUASHFS_TARGET) $(ASTVER)/$(ASTVER).run
@@ -32,8 +33,11 @@
sha1sum $(ASTVER).tar.gz > $(ASTVER).tar.gz.sha1
touch -c $(ASTVER).tar.gz.sha1
-astrelease: ext2initrd squashfsroot $(ASTVER).tar.gz.sha1
+astver:
+ echo $(ASTVER) > $(TARGET_DIR)/etc/astlinux-release
+astrelease: astver ext2initrd squashfsroot $(ASTVER).tar.gz.sha1
+
astrelease-clean:
-rm -f $(ASTVER).tar.gz
-rm -f $(ASTVER).tar.gz.sha1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2007-09-20 18:49:19
|
Revision: 1261
http://astlinux.svn.sourceforge.net/astlinux/?rev=1261&view=rev
Author: krisk84
Date: 2007-09-20 11:49:15 -0700 (Thu, 20 Sep 2007)
Log Message:
-----------
Pretty significant update to AstLinux behavior.
- You can now specify INT2IF, INT3IF, etc even if
you don't have an INTIF defined. Makes sense...
- Add new variables - NODHCP, DHCPRANGE
- Got rid (sort of) of NOINTDNS variables
- Various improvements to sanity checks for variables,
etc.
Modified Paths:
--------------
trunk/package/dnsmasq/dnsmasq.init
trunk/package/iproute2/astshape.init
trunk/package/iptables/astfw
trunk/package/iptables/iptables.init
trunk/target/generic/target_skeleton/stat/etc/rc.conf
Modified: trunk/package/dnsmasq/dnsmasq.init
===================================================================
--- trunk/package/dnsmasq/dnsmasq.init 2007-09-19 14:50:29 UTC (rev 1260)
+++ trunk/package/dnsmasq/dnsmasq.init 2007-09-20 18:49:15 UTC (rev 1261)
@@ -8,7 +8,7 @@
fi
init () {
-if [ "$INTIF" ]
+if [ "$INTIF" -o "$INT2IF" -o "$INT3IF" ]
then
if [ -f /mnt/kd/dnsmasq.leases ]
@@ -18,18 +18,62 @@
touch /var/db/dnsmasq.leases
fi
+if [ "$INTIF" -a "$INTIP" ]
+then
LANIPBASE=`echo $INTIP | cut -d. -f1-3`
+fi
-if [ "$INT2IF" ]
+if [ "$INT2IF" -a "$INT2IP" ]
then
LAN2IPBASE=`echo $INT2IP | cut -d. -f1-3`
fi
-if [ "$INT3IF" ]
+if [ "$INT3IF" -a "$INT3IP" ]
then
LAN3IPBASE=`echo $INT3IP | cut -d. -f1-3`
fi
+rm -f /tmp/etc/dnsmasq.conf
+
+if [ "$DHCPRANGE" ]
+then
+DSTART=`echo $DHCPRANGE | cut -d: -f1`
+DEND=`echo $DHCPRANGE | cut -d: -f2`
+else
+DSTART=100
+DEND=252
+fi
+
+if [ "$INTIFDNS" -o "$INT2IFDNS" -o "$INT3IFDNS" ]
+then
+echo "WARNING: The INTIFDNS variables are now INTIFDHCP
+but you should probably use the newer NODHCP instead.
+Please see the sample rc.conf"
+fi
+
+if [ "$NODHCP" ]
+then
+for i in $NODHCP
+do
+
+if [ "$i" = "$INTIF" ]
+then
+INTIFDHCP=off
+fi
+
+if [ "$i" = "$INT2IF" ]
+then
+INT2IFDHCP=off
+fi
+
+if [ "$i" = "$INT3IF" ]
+then
+INT3IFDHCP=off
+fi
+
+done
+fi
+
if [ "$LOCALDNS" ]
then
RCONF="/tmp/etc/resolv-up.conf"
@@ -44,19 +88,11 @@
local=/$DOMAIN/
expand-hosts
domain=$DOMAIN
-dhcp-range=lan,$LANIPBASE.100,$LANIPBASE.252,24h
read-ethers
-
-dhcp-option=lan,3,$INTIP
-dhcp-option=lan,6,$INTIP
-dhcp-option=lan,42,$INTIP
-dhcp-option=lan,66,$HOSTNAME.$DOMAIN
-dhcp-option=lan,150,$INTIP
-
# dhcp-lease-max=153
resolv-file=$RCONF
dhcp-leasefile=/var/db/dnsmasq.leases
-cache-size=150" > /tmp/etc/dnsmasq.conf
+cache-size=150" >> /tmp/etc/dnsmasq.conf
if [ "$NFSDROOTPATH" ]
then
@@ -68,14 +104,30 @@
echo "dhcp-boot=$BOOTPFILE,$HOSTNAME.$DOMAIN,$INTIP" >> /tmp/etc/dnsmasq.conf
fi
-if [ "$INT2IFDNS" -a "$INT2IFDNS" = "off" ]
+if [ "$INTIFDHCP" -a "$INTIFDHCP" = "off" ]
then
-echo "# DNS disabled on INT2IF" >> /tmp/etc/dnsmasq.conf
+echo "# DHCP disabled on $INTIF" >> /tmp/etc/dnsmasq.conf
else
-if [ "$INT2IF" ]
+if [ "$INTIF" -a "$LANIPBASE" ]
then
echo "
-dhcp-range=lan2,$LAN2IPBASE.100,$LAN2IPBASE.252,24h
+dhcp-range=lan,$LANIPBASE.$DSTART,$LANIPBASE.$DEND,24h
+dhcp-option=lan,3,$INTIP
+dhcp-option=lan,6,$INTIP
+dhcp-option=lan,42,$INTIP
+dhcp-option=lan,66,$HOSTNAME.$DOMAIN
+dhcp-option=lan,150,$INTIP" >> /tmp/etc/dnsmasq.conf
+fi
+fi
+
+if [ "$INT2IFDHCP" -a "$INT2IFDHCP" = "off" ]
+then
+echo "# DHCP disabled on $INT2IF" >> /tmp/etc/dnsmasq.conf
+else
+if [ "$INT2IF" -a "$LAN2IPBASE" ]
+then
+echo "
+dhcp-range=lan2,$LAN2IPBASE.$DSTART,$LAN2IPBASE.$DEND,24h
dhcp-option=lan2,3,$INT2IP
dhcp-option=lan2,6,$INT2IP
dhcp-option=lan2,42,$INT2IP
@@ -84,13 +136,13 @@
fi
fi
-if [ "$INT3IFDNS" -a "$INT3IFDNS" = "off" ]
+if [ "$INT3IFDHCP" -a "$INT3IFDHCP" = "off" ]
then
-echo "# DNS disabled on INT3IF" >> /tmp/etc/dnsmasq.conf
-if [ "$INT3IF" ]
+echo "# DHCP disabled on $INT3IF" >> /tmp/etc/dnsmasq.conf
+if [ "$INT3IF" -a "$LAN3IPBASE" ]
then
echo "
-dhcp-range=lan3,$LAN3IPBASE.100,$LAN3IPBASE.252,24h
+dhcp-range=lan3,$LAN3IPBASE.$DSTART,$LAN3IPBASE.$DEND,24h
dhcp-option=lan3,3,$INT3IP
dhcp-option=lan3,6,$INT3IP
dhcp-option=lan3,42,$INT3IP
@@ -111,7 +163,7 @@
}
start () {
-if [ "$INTIF" ]
+if [ "$INTIF" -o "$INT2IF" -o "$INT3IF" ]
then
if [ -r /etc/dnsmasq.conf ]
then
Modified: trunk/package/iproute2/astshape.init
===================================================================
--- trunk/package/iproute2/astshape.init 2007-09-19 14:50:29 UTC (rev 1260)
+++ trunk/package/iproute2/astshape.init 2007-09-20 18:49:15 UTC (rev 1261)
@@ -12,7 +12,7 @@
fi
done
-if [ "$INTIF" ]
+if [ "$INTIF" -o "$INT2IF" -o "$INT3IF" ]
then
RUN=0
else
@@ -47,7 +47,7 @@
}
stop () {
-if [ ! "$INTIF" ]
+if [ ! "$INTIF" -o "$INT2IF" -o "$INT3IF" ]
then
exit
fi
Modified: trunk/package/iptables/astfw
===================================================================
--- trunk/package/iptables/astfw 2007-09-19 14:50:29 UTC (rev 1260)
+++ trunk/package/iptables/astfw 2007-09-20 18:49:15 UTC (rev 1261)
@@ -55,7 +55,11 @@
iptables -A INPUT -i lo -j ACCEPT
#Allow INPUT from INTIF
+
+if [ "$INTIF" ]
+then
iptables -A INPUT -i $INTIF -j ACCEPT
+fi
if [ "$INT2IF" ]
then
@@ -154,7 +158,11 @@
#allow forwarding from each interface to the internet...
for i in $EXTIFS
do
+
+if [ "$INTIF" ]
+then
iptables -A FORWARD -i $INTIF -o $i -j ACCEPT
+fi
if [ "$INT2IF" ]
then
Modified: trunk/package/iptables/iptables.init
===================================================================
--- trunk/package/iptables/iptables.init 2007-09-19 14:50:29 UTC (rev 1260)
+++ trunk/package/iptables/iptables.init 2007-09-20 18:49:15 UTC (rev 1261)
@@ -3,7 +3,7 @@
. /etc/rc.conf
start () {
-if [ "$INTIF" ]
+if [ "$INTIF" -o "$INT2IF" -o "$INT3IF" ]
then
if [ ! -x /usr/sbin/iptables ]
@@ -40,7 +40,7 @@
}
stop () {
-if [ "$INTIF" ]
+if [ "$INTIF" -o "$INT2IF" -o "$INT3IF" ]
then
if [ ! -x /usr/sbin/iptables ]
Modified: trunk/target/generic/target_skeleton/stat/etc/rc.conf
===================================================================
--- trunk/target/generic/target_skeleton/stat/etc/rc.conf 2007-09-19 14:50:29 UTC (rev 1260)
+++ trunk/target/generic/target_skeleton/stat/etc/rc.conf 2007-09-20 18:49:15 UTC (rev 1261)
@@ -156,12 +156,22 @@
##for DNS resolution on THIS machine.
#LOCALDNS=yes
-##Disable DHCP on INT2 or INT3
-#INT2IFDNS=off
-#INT3IFDNS=off
+##You don't have to use DHCP + DNS with all of your internal interfaces.
+##Here you can specify a list of interfaces that will not have a DHCP range
+##associated with them. You can use real interface names or variables.
+##I recommend variables. Seperate multiple IFs with spaces.
+#NODHCP="$INT2IF"
+##DHCP Range
+##Here you can define the range of IP addresses for your local networks.
+##This value will apply to all of your INTIFs. We will automatically calculate
+##the first three octets. Just tell me which range I should give out leases for.
+##In this example, if INTIP=192.168.0.1, we will give out leases for
+##192.168.0.100 - 192.168.0.252
+#DHCPRANGE="100:252"
+
##If you do not define the INTIF, I will not try to start one.
-##If you do not define the INTIF, I will also not start the following services:
+##If you do not define any INTIF(s), I will also not start the following services:
##dnsmasq iptables astshape (PBX only mode)
##PBX Only mode is enabled by default from 0.2.8.10
#INTIF=eth1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X