runnix-commits Mailing List for Runnix (Page 5)
Status: Alpha
Brought to you by:
krisk84
Menu
▾
▴
runnix-commits — Commits to the runnix SVN repository
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
(18) |
May
(11) |
Jun
|
Jul
(4) |
Aug
|
Sep
|
Oct
|
Nov
(8) |
Dec
|
| 2008 |
Jan
|
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
(1) |
Feb
(2) |
Mar
(5) |
Apr
|
May
|
Jun
|
Jul
(7) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(47) |
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
(6) |
May
(9) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|
From: <kr...@us...> - 2007-05-01 18:58:07
|
Revision: 64
http://svn.sourceforge.net/runnix/?rev=64&view=rev
Author: krisk84
Date: 2007-05-01 11:58:05 -0700 (Tue, 01 May 2007)
Log Message:
-----------
Create branch for runnix 0.2
Added Paths:
-----------
branches/0.2/
Copied: branches/0.2 (from rev 63, trunk)
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:57:15
|
Revision: 63
http://svn.sourceforge.net/runnix/?rev=63&view=rev
Author: krisk84
Date: 2007-05-01 11:57:14 -0700 (Tue, 01 May 2007)
Log Message:
-----------
Create branch for 0.1
Added Paths:
-----------
branches/0.1/
Copied: branches/0.1 (from rev 41, trunk)
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:56:01
|
Revision: 62
http://svn.sourceforge.net/runnix/?rev=62&view=rev
Author: krisk84
Date: 2007-05-01 11:55:50 -0700 (Tue, 01 May 2007)
Log Message:
-----------
Create tag for runnix 0.1
Added Paths:
-----------
tags/0.1/
Copied: tags/0.1 (from rev 41, trunk)
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:51:32
|
Revision: 61
http://svn.sourceforge.net/runnix/?rev=61&view=rev
Author: krisk84
Date: 2007-05-01 11:51:25 -0700 (Tue, 01 May 2007)
Log Message:
-----------
don't install the kernel into the initrd
Modified Paths:
--------------
trunk/target/device/geni386/linux.mk
Modified: trunk/target/device/geni386/linux.mk
===================================================================
--- trunk/target/device/geni386/linux.mk 2007-05-01 18:48:05 UTC (rev 60)
+++ trunk/target/device/geni386/linux.mk 2007-05-01 18:51:25 UTC (rev 61)
@@ -54,7 +54,7 @@
LINUX_KCONFIG=$(DEVICE_DIR)/linux.config
LINUX_PATCH_DIR=$(DEVICE_DIR)/kernel-patches
-LINUX_KERNEL=$(TARGET_DIR)/boot/$(LINUX_FORMAT)
+LINUX_KERNEL=$(BUILD_DIR)/$(LINUX_FORMAT)
# Used by pcmcia-cs and others
LINUX_SOURCE_DIR=$(LINUX_DIR)
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:48:10
|
Revision: 60
http://svn.sourceforge.net/runnix/?rev=60&view=rev
Author: krisk84
Date: 2007-05-01 11:48:05 -0700 (Tue, 01 May 2007)
Log Message:
-----------
major runnix init improvements
Modified Paths:
--------------
trunk/target/generic/target_skeleton/runnix
Modified: trunk/target/generic/target_skeleton/runnix
===================================================================
--- trunk/target/generic/target_skeleton/runnix 2007-04-30 18:04:56 UTC (rev 59)
+++ trunk/target/generic/target_skeleton/runnix 2007-05-01 18:48:05 UTC (rev 60)
@@ -14,7 +14,7 @@
echo "proc mounted"
else
echo "Error mounting proc"
-exec /bin/sh
+/bin/sh
fi
mount -t tmpfs none /tmp
@@ -52,8 +52,8 @@
# Loader not found
if [ ! $DEVICE ]
then
-echo "Runnix device not found."
-exec /bin/sh
+echo "Runnix device not found"
+/bin/sh
exit
fi
@@ -66,15 +66,14 @@
fi
done
-if [ ! "$RUNIMG" ]
+if [ -f $BASE/os/default.conf ]
then
-# read -p "Please type an image name: " RUNIMG
-RUNIMG="auto"
+. $BASE/os/default.conf
fi
-if [ -f $BASE/os/default.conf ]
+if [ ! "$RUNIMG" ]
then
-. $BASE/os/default.conf
+RUNIMG="auto"
fi
#Network support - yikes
@@ -102,8 +101,6 @@
fi
-fi
-
if [ "$URL" ]
then
echo "Checking for updates..."
@@ -130,7 +127,7 @@
if `sha1sum -cs $VER.tar.gz.sha1`
then
-echo "Extracting image - please wait."
+echo "Extracting image - please wait"
cd $BASE/os
tar -xzf /tmp/$VER.tar.gz
sync
@@ -141,6 +138,7 @@
then
mv $BASE/os/$VER/* $BASE/os/ && mv /tmp/ver $BASE/os/ver
rmdir $BASE/os/$VER
+IMGVER=1
if [ "$USLEEP" ]
then
@@ -153,6 +151,7 @@
fi
fi
fi
+fi
if [ "$RUNIMG" = "auto" ]
then
@@ -161,21 +160,26 @@
RUNIMG=`ls *.run | tail -n1`
fi
-#If we have a ver file, override auto value
+#If we have a ver file, override auto/default.conf value
if [ -f $BASE/os/ver ]
then
RUNIMG=`cat $BASE/os/ver`.run
fi
-echo "Verifying image..."
+if [ ! "$IMGVER" ]
+then
+echo "Verifying $RUNIMG..."
-if `sha1sum -cs $VER.run.sha1`
+if `sha1sum -cs $RUNIMG.sha1`
then
-echo "Image verified. Booting."
+echo "$RUNIMG verified"
+IMGVER=1
else
-echo "Kris needs to put a reboot, etc in here"
+echo "$RUNIMG not verified"
fi
+fi
+
if [ -f $BASE/os/$RUNIMG.conf ]
then
. $BASE/os/$RUNIMG.conf
@@ -198,30 +202,59 @@
echo "Root mounted"
else
echo "Error mounting $RUNIMG root fs"
-exec /bin/sh
+/bin/sh
fi
-if [ ! "$INITRD" ]
+if [ "$INITRD" ]
then
-INITRD=$ROOT/boot/initrd.img
+
+if [ -r "$INITRD" ]
+then
+echo "Custom initrd $INITRD found"
+else
+INITRD=$BASE/os/initrd.img
+echo "Custom initrd not found - using $INITRD"
fi
-if [ ! "$KERN" ]
+else
+echo "Using default initrd"
+INITRD=$BASE/os/initrd.img
+fi
+
+if [ "$KERN" ]
then
+
+if [ -r "$KERN" ]
+then
+echo "Custom kernel $KERN found"
+else
KERN=$ROOT/boot/bzImage
+echo "Custom kernel not found - using $KERN"
fi
+else
+echo "Using default kernel"
+KERN=$ROOT/boot/bzImage
+fi
+
+if [ -r "$INITRD" -a -r "$KERN" ]
+then
+echo "Copying kernel and initrd to ramdisk..."
mount -t tmpfs none /mnt/tmp
-cp $INITRD /mnt/tmp/initrd.img
-cp $KERN /mnt/tmp/bzImage
-
+cp "$INITRD" /mnt/tmp/initrd.img
+cp "$KERN" /mnt/tmp/bzImage
+echo "Unmounting image..."
umount $ROOT
+else
+echo "I couldn't find your kernel and/or initrd"
+/bin/sh
+fi
if [ ! "$KCMD" ]
then
echo "You need to specify a kernel command line"
echo "I can't guess that"
-exec /bin/sh
+/bin/sh
fi
echo "Trying kexec..."
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2007-04-30 18:04:57
|
Revision: 59
http://svn.sourceforge.net/runnix/?rev=59&view=rev
Author: krisk84
Date: 2007-04-30 11:04:56 -0700 (Mon, 30 Apr 2007)
Log Message:
-----------
delete some old unused target directories
Removed Paths:
-------------
trunk/target/generic/access_point/
trunk/target/generic/firewall/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2007-04-30 16:09:30
|
Revision: 58
http://svn.sourceforge.net/runnix/?rev=58&view=rev
Author: krisk84
Date: 2007-04-30 09:09:28 -0700 (Mon, 30 Apr 2007)
Log Message:
-----------
a couple of boot fixes after testing
Modified Paths:
--------------
trunk/runnix.config
trunk/target/generic/device_table.txt
Modified: trunk/runnix.config
===================================================================
--- trunk/runnix.config 2007-04-28 01:45:01 UTC (rev 57)
+++ trunk/runnix.config 2007-04-30 16:09:28 UTC (rev 58)
@@ -227,7 +227,7 @@
# BR2_TARGET_ROOTFS_CRAMFS is not set
# BR2_TARGET_ROOTFS_CLOOP is not set
BR2_TARGET_ROOTFS_EXT2=y
-BR2_TARGET_ROOTFS_EXT2_BLOCKS=0
+BR2_TARGET_ROOTFS_EXT2_BLOCKS=4096
BR2_TARGET_ROOTFS_EXT2_INODES=0
BR2_TARGET_ROOTFS_EXT2_RESBLKS=0
BR2_TARGET_ROOTFS_EXT2_SQUASH=y
Modified: trunk/target/generic/device_table.txt
===================================================================
--- trunk/target/generic/device_table.txt 2007-04-28 01:45:01 UTC (rev 57)
+++ trunk/target/generic/device_table.txt 2007-04-30 16:09:28 UTC (rev 58)
@@ -37,7 +37,7 @@
/dev/shm d 755 0 0 - - - - -
/tmp d 1777 0 0 - - - - -
/etc d 755 0 0 - - - - -
-/home/default d 2755 1000 1000 - - - - -
+#/home/default d 2755 1000 1000 - - - - -
#<name> <type> <mode> <uid> <gid> <major> <minor> <start> <inc> <count>
/bin/busybox f 4755 0 0 - - - - -
# /etc/shadow f 600 0 0 - - - - -
@@ -68,26 +68,26 @@
/dev/ptmx c 666 0 0 5 2 - - -
/dev/ttyP c 666 0 0 57 0 0 1 4
/dev/ttyS c 666 0 0 4 64 0 1 4
-/dev/fb c 640 0 5 29 0 0 32 4
+#/dev/fb c 640 0 5 29 0 0 32 4
#/dev/ttySA c 666 0 0 204 5 0 1 3
-/dev/psaux c 666 0 0 10 1 0 0 -
+#/dev/psaux c 666 0 0 10 1 0 0 -
#/dev/ppp c 666 0 0 108 0 - - -
# Input stuff
-/dev/input d 755 0 0 - - - - -
-/dev/input/mice c 640 0 0 13 63 0 0 -
-/dev/input/mouse c 660 0 0 13 32 0 1 4
-/dev/input/event c 660 0 0 13 64 0 1 4
+#/dev/input d 755 0 0 - - - - -
+#/dev/input/mice c 640 0 0 13 63 0 0 -
+#/dev/input/mouse c 660 0 0 13 32 0 1 4
+#/dev/input/event c 660 0 0 13 64 0 1 4
#/dev/input/js c 660 0 0 13 0 0 1 4
# MTD stuff
-/dev/mtd c 640 0 0 90 0 0 2 4
-/dev/mtdblock b 640 0 0 31 0 0 1 4
+#/dev/mtd c 640 0 0 90 0 0 2 4
+#/dev/mtdblock b 640 0 0 31 0 0 1 4
#Tun/tap driver
-/dev/net d 755 0 0 - - - - -
-/dev/net/tun c 660 0 0 10 200 - - -
+#/dev/net d 755 0 0 - - - - -
+#/dev/net/tun c 660 0 0 10 200 - - -
# Audio stuff
#/dev/audio c 666 0 29 14 4 - - -
@@ -105,28 +105,28 @@
/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
# SCSI Devices
-#/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 -
-#/dev/sdb b 640 0 0 8 17 1 1 15
-#/dev/sdc b 640 0 0 8 32 0 0 -
-#/dev/sdc b 640 0 0 8 33 1 1 15
-#/dev/sdd b 640 0 0 8 48 0 0 -
-#/dev/sdd b 640 0 0 8 49 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 -
+/dev/sdb b 640 0 0 8 17 1 1 15
+/dev/sdc b 640 0 0 8 32 0 0 -
+/dev/sdc b 640 0 0 8 33 1 1 15
+/dev/sdd b 640 0 0 8 48 0 0 -
+/dev/sdd b 640 0 0 8 49 1 1 15
#/dev/sde b 640 0 0 8 64 0 0 -
#/dev/sde b 640 0 0 8 65 1 1 15
#/dev/sdf b 640 0 0 8 80 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-28 01:45:06
|
Revision: 57
http://svn.sourceforge.net/runnix/?rev=57&view=rev
Author: krisk84
Date: 2007-04-27 18:45:01 -0700 (Fri, 27 Apr 2007)
Log Message:
-----------
fix syslinux compile to use host gcc
Modified Paths:
--------------
trunk/target/x86/syslinux/syslinux.mk
Added Paths:
-----------
trunk/target/x86/syslinux/syslinux-nostack.patch
Added: trunk/target/x86/syslinux/syslinux-nostack.patch
===================================================================
--- trunk/target/x86/syslinux/syslinux-nostack.patch (rev 0)
+++ trunk/target/x86/syslinux/syslinux-nostack.patch 2007-04-28 01:45:01 UTC (rev 57)
@@ -0,0 +1,129 @@
+Only in syslinux-3.35.orig/com32/lib: libcom32.a
+diff -ur syslinux-3.35.orig/com32/lib/MCONFIG syslinux-3.35/com32/lib/MCONFIG
+--- syslinux-3.35.orig/com32/lib/MCONFIG 2007-01-28 20:56:21.000000000 -0500
++++ syslinux-3.35/com32/lib/MCONFIG 2007-04-27 21:37:18.000000000 -0400
+@@ -23,7 +23,7 @@
+
+ REQFLAGS = -g -m32 -mregparm=3 -DREGPARM=3 -D__COM32__ -I. -I./sys -I../include
+ OPTFLAGS = -Os -march=i386 -falign-functions=0 -falign-jumps=0 \
+- -falign-labels=0 -ffast-math -fomit-frame-pointer
++ -falign-labels=0 -ffast-math -fomit-frame-pointer -fno-stack-protector
+ WARNFLAGS = -W -Wall -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Winline
+
+ CFLAGS = -Wp,-MT,$@,-MD,$(dir $@).$(notdir $@).d $(OPTFLAGS) \
+Only in syslinux-3.35.orig/com32/libutil: libutil_com.a
+Only in syslinux-3.35.orig/com32/libutil: libutil_lnx.a
+diff -ur syslinux-3.35.orig/com32/libutil/Makefile syslinux-3.35/com32/libutil/Makefile
+--- syslinux-3.35.orig/com32/libutil/Makefile 2007-01-28 20:56:21.000000000 -0500
++++ syslinux-3.35/com32/libutil/Makefile 2007-04-27 21:35:54.000000000 -0400
+@@ -39,7 +39,8 @@
+ AR = ar
+ NASM = nasm
+ RANLIB = ranlib
+-CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -D__COM32__ -W -Wall -march=i386 -Os -fomit-frame-pointer -I./include -I../include
++CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -D__COM32__ -W -Wall -march=i386 -Os -fomit-frame-pointer \
++ -fno-stack-protector -I./include -I../include
+ SFLAGS = $(M32) -D__COM32__ -march=i386
+ LDFLAGS = -T ../lib/com32.ld
+ LNXCFLAGS = -I./include -W -Wall -O -g
+Only in syslinux-3.35.orig/com32/modules: chain.c32
+Only in syslinux-3.35.orig/com32/modules: cpuidtest.c32
+Only in syslinux-3.35.orig/com32/modules: dmitest.c32
+Only in syslinux-3.35.orig/com32/modules: ethersel.c32
+diff -ur syslinux-3.35.orig/com32/modules/Makefile syslinux-3.35/com32/modules/Makefile
+--- syslinux-3.35.orig/com32/modules/Makefile 2007-01-28 20:56:21.000000000 -0500
++++ syslinux-3.35/com32/modules/Makefile 2007-04-27 21:32:49.000000000 -0400
+@@ -24,7 +24,8 @@
+ AR = ar
+ NASM = nasm
+ RANLIB = ranlib
+-CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -W -Wall -march=i386 -Os -fomit-frame-pointer -I../libutil/include -I../include -D__COM32__
++CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -W -Wall -march=i386 -Os -fomit-frame-pointer \
++ -fno-stack-protector -I../libutil/include -I../include -D__COM32__
+ LNXCFLAGS = -W -Wall -O -g -I../libutil/include
+ LNXSFLAGS = -g
+ LNXLDFLAGS = -g
+Only in syslinux-3.35.orig/com32/modules: mboot.c32
+Only in syslinux-3.35.orig/com32/modules: menu.c32
+Only in syslinux-3.35.orig/com32/modules: pcitest.c32
+Only in syslinux-3.35.orig/com32/modules: vesamenu.c32
+Only in syslinux-3.35.orig/com32/samples: cat.c32
+Only in syslinux-3.35.orig/com32/samples: fancyhello.c32
+Only in syslinux-3.35.orig/com32/samples: fancyhello.lnx
+Only in syslinux-3.35.orig/com32/samples: hello.c32
+Only in syslinux-3.35.orig/com32/samples: keytest.c32
+Only in syslinux-3.35.orig/com32/samples: keytest.lnx
+diff -ur syslinux-3.35.orig/com32/samples/Makefile syslinux-3.35/com32/samples/Makefile
+--- syslinux-3.35.orig/com32/samples/Makefile 2007-01-28 20:56:21.000000000 -0500
++++ syslinux-3.35/com32/samples/Makefile 2007-04-27 21:31:13.000000000 -0400
+@@ -24,7 +24,8 @@
+ AR = ar
+ NASM = nasm
+ RANLIB = ranlib
+-CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -W -Wall -march=i386 -Os -fomit-frame-pointer -I../libutil/include -I../include -D__COM32__
++CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -W -Wall -march=i386 -Os -fomit-frame-pointer \
++ -fno-stack-protector -I../libutil/include -I../include -D__COM32__
+ LNXCFLAGS = -W -Wall -O -g -I../libutil/include
+ LNXSFLAGS = -g
+ LNXLDFLAGS = -g
+Only in syslinux-3.35.orig/com32/samples: resolv.c32
+Only in syslinux-3.35.orig/com32/samples: vesainfo.c32
+Only in syslinux-3.35.orig: copybs.com
+Only in syslinux-3.35: .depend
+diff -ur syslinux-3.35.orig/dos/Makefile syslinux-3.35/dos/Makefile
+--- syslinux-3.35.orig/dos/Makefile 2007-01-28 20:56:21.000000000 -0500
++++ syslinux-3.35/dos/Makefile 2007-04-27 21:21:28.000000000 -0400
+@@ -1,7 +1,8 @@
+ CC = gcc
+ LD = ld -m elf_i386
+ OBJCOPY = objcopy
+-OPTFLAGS = -g -Os -march=i386 -falign-functions=0 -falign-jumps=0 -falign-loops=0 -fomit-frame-pointer
++OPTFLAGS = -g -Os -march=i386 -falign-functions=0 -falign-jumps=0 \
++ -falign-loops=0 -fomit-frame-pointer -fno-stack-protector
+ INCLUDES = -include code16.h -I. -I.. -I../libfat
+ CFLAGS = -m32 -mregparm=3 -DREGPARM=3 -W -Wall -ffreestanding -msoft-float $(OPTFLAGS) $(INCLUDES)
+ LDFLAGS = -T com16.ld
+Binary files syslinux-3.35.orig/dos/syslinux.com and syslinux-3.35/dos/syslinux.com differ
+Only in syslinux-3.35.orig/extlinux: extlinux
+Only in syslinux-3.35.orig: gethostip
+Only in syslinux-3.35/memdisk: .depend
+diff -ur syslinux-3.35.orig/memdisk/Makefile syslinux-3.35/memdisk/Makefile
+--- syslinux-3.35.orig/memdisk/Makefile 2007-01-28 20:56:21.000000000 -0500
++++ syslinux-3.35/memdisk/Makefile 2007-04-27 21:20:53.000000000 -0400
+@@ -22,7 +22,8 @@
+ CC = gcc
+ CFLAGS = $(M32) $(FREE) -g -W -Wall -Wno-sign-compare \
+ -Os -fomit-frame-pointer -march=i386 $(ALIGN) \
+- -DVERSION='"$(VERSION)"' -DDATE='"$(DATE)"'
++ -DVERSION='"$(VERSION)"' -DDATE='"$(DATE)"' \
++ -fno-stack-protector
+ SFLAGS = $(M32) -march=i386 -D__ASSEMBLY__
+ LDFLAGS = $(M32) -g
+ INCLUDE = -I../com32/include
+Binary files syslinux-3.35.orig/memdisk/memdisk and syslinux-3.35/memdisk/memdisk differ
+Only in syslinux-3.35.orig: mkdiskimage
+Only in syslinux-3.35.orig/mtools: syslinux
+Binary files syslinux-3.35.orig/pxelinux.0 and syslinux-3.35/pxelinux.0 differ
+Only in syslinux-3.35.orig/sample: c32echo.c32
+Only in syslinux-3.35.orig/sample: comecho.com
+Only in syslinux-3.35.orig/sample: fd.c32
+Only in syslinux-3.35.orig/sample: filetest.c32
+Only in syslinux-3.35.orig/sample: hello2.c32
+Only in syslinux-3.35.orig/sample: hello.c32
+diff -ur syslinux-3.35.orig/sample/Makefile syslinux-3.35/sample/Makefile
+--- syslinux-3.35.orig/sample/Makefile 2007-01-28 20:56:21.000000000 -0500
++++ syslinux-3.35/sample/Makefile 2007-04-27 21:29:26.000000000 -0400
+@@ -24,7 +24,8 @@
+ AR = ar
+ NASM = nasm
+ RANLIB = ranlib
+-CFLAGS = $(M32) -W -Wall -march=i386 -Os -fomit-frame-pointer -I../com32/include
++CFLAGS = $(M32) -W -Wall -march=i386 -Os -fomit-frame-pointer \
++ -fno-stack-protector -I../com32/include
+ SFLAGS = $(M32) -march=i386
+ LDFLAGS = -s
+ OBJCOPY = objcopy
+Only in syslinux-3.35.orig/sample: syslogo.lss
+Only in syslinux-3.35.orig/unix: syslinux
+Only in syslinux-3.35.orig/unix: syslinux-nomtools
+Only in syslinux-3.35.orig/win32: syslinux.exe
Modified: trunk/target/x86/syslinux/syslinux.mk
===================================================================
--- trunk/target/x86/syslinux/syslinux.mk 2007-04-28 01:01:00 UTC (rev 56)
+++ trunk/target/x86/syslinux/syslinux.mk 2007-04-28 01:45:01 UTC (rev 57)
@@ -11,12 +11,13 @@
$(DL_DIR)/$(SYSLINUX_SOURCE):
$(WGET) -P $(DL_DIR) $(SYSLINUX_SITE)/$(SYSLINUX_SOURCE)
-$(SYSLINUX_DIR)/Makefile: $(DL_DIR)/$(SYSLINUX_SOURCE) $(SYSLINUX_PATCH)
+$(SYSLINUX_DIR)/Makefile: $(DL_DIR)/$(SYSLINUX_SOURCE)
bzcat $(DL_DIR)/$(SYSLINUX_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+ toolchain/patch-kernel.sh $(SYSLINUX_DIR) target/x86/syslinux/ \*.patch
touch -c $(SYSLINUX_DIR)/Makefile
$(SYSLINUX_DIR)/unix/syslinux: $(SYSLINUX_DIR)/Makefile
- $(MAKE) CC=gcc -C $(SYSLINUX_DIR)
+ $(MAKE1) CC=gcc -C $(SYSLINUX_DIR)
touch -c $(SYSLINUX_DIR)/unix/syslinux
syslinux: $(SYSLINUX_DIR)/unix/syslinux
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2007-04-28 01:01:12
|
Revision: 56
http://svn.sourceforge.net/runnix/?rev=56&view=rev
Author: krisk84
Date: 2007-04-27 18:01:00 -0700 (Fri, 27 Apr 2007)
Log Message:
-----------
actually build runnix image
Modified Paths:
--------------
trunk/target/generic/target_skeleton/runnix
trunk/target/x86/syslinux/syslinux.mk
Added Paths:
-----------
trunk/target/generic/target_skeleton/etc/runnix-release
trunk/toolchain/runrelease/
trunk/toolchain/runrelease/files/
trunk/toolchain/runrelease/files/INSTALL
trunk/toolchain/runrelease/files/install
trunk/toolchain/runrelease/files/rootfs_vfat/
trunk/toolchain/runrelease/files/rootfs_vfat/boot.msg
trunk/toolchain/runrelease/files/rootfs_vfat/os/
trunk/toolchain/runrelease/files/rootfs_vfat/os/default.conf
trunk/toolchain/runrelease/files/rootfs_vfat/runnix.conf.sample
trunk/toolchain/runrelease/files/rootfs_vfat/syslinux.cfg
trunk/toolchain/runrelease/runrelease.mk
Removed Paths:
-------------
trunk/target/generic/target_skeleton/runnix.new
Added: trunk/target/generic/target_skeleton/etc/runnix-release
===================================================================
--- trunk/target/generic/target_skeleton/etc/runnix-release (rev 0)
+++ trunk/target/generic/target_skeleton/etc/runnix-release 2007-04-28 01:01:00 UTC (rev 56)
@@ -0,0 +1 @@
+trunk
Modified: trunk/target/generic/target_skeleton/runnix
===================================================================
--- trunk/target/generic/target_skeleton/runnix 2007-04-27 21:45:08 UTC (rev 55)
+++ trunk/target/generic/target_skeleton/runnix 2007-04-28 01:01:00 UTC (rev 56)
@@ -1,8 +1,14 @@
#!/bin/sh
PATH=/bin:/sbin:/usr/bin:/usr/sbin
+# BASE is where the runnix partition is mounted
BASE=/mnt/base
+# ROOT is where the .run partition is mounted
+ROOT=/mnt/root
+
+DRIVES="hda hdb hdc hdd hde hdf hdg hdh sda sdb sdc sdd"
+
if `mount -t proc none /proc`
then
echo "proc mounted"
@@ -16,23 +22,39 @@
CMDLINE=`cat /proc/cmdline`
-for x in hda1 hdb1 hdc1 hdd1 hde1 hdf1 hdg1 hdh1 sda1 sdb1 sdc1 sdd1
+for x in $DRIVES
do
- if `mount -t vfat /dev/${x} $BASE > /dev/null 2>&1`
- then
- if [ -f $BASE/runnix ]
- then
- DEVICE=${x}
- fi
- fi
+if `mount -t vfat /dev/${x}1 $BASE > /dev/null 2>&1`
+then
+if [ -f $BASE/runnix ]
+then
+DEVICE=${x}
+else
+umount /dev/${x}1
+fi
+fi
done
+for x in $DRIVES
+do
+if `mount -t iso9660 -o ro /dev/${x} $BASE > /dev/null 2>&1`
+then
+if [ -f $BASE/runnix ]
+then
+DEVICE=${x}
+RODEV=yes
+else
+umount /dev/${x}
+fi
+fi
+done
+
# Loader not found
if [ ! $DEVICE ]
then
- echo "Device not found."
- exec /bin/sh
- exit
+echo "Runnix device not found."
+exec /bin/sh
+exit
fi
# get image name
@@ -59,10 +81,12 @@
if [ "$NDEV" ]
then
ifconfig lo up 127.0.0.1
+
if [ "$MAC" ]
then
ifconfig "$NDEV" hw ether "$MAC"
fi
+
if [ "$IP" = "dhcp" ]
then
echo "Configuring $NDEV with DHCP..."
@@ -70,11 +94,14 @@
else
ifconfig "$NDEV" inet "$IP" netmask "$NM"
route add -net default gw "$GW"
+
for i in $DNS
do
echo "nameserver $i" >> /tmp/etc/resolv.conf
done
+
fi
+
fi
if [ "$URL" ]
@@ -166,7 +193,7 @@
FSTYPE=ext2
fi
-if `mount -t $FSTYPE -o ro /dev/loop0 /mnt/root`
+if `mount -t $FSTYPE -o ro /dev/loop0 $ROOT`
then
echo "Root mounted"
else
@@ -176,19 +203,19 @@
if [ ! "$INITRD" ]
then
-INITRD=initrd.img
+INITRD=$ROOT/boot/initrd.img
fi
if [ ! "$KERN" ]
then
-KERN=boot/bzImage
+KERN=$ROOT/boot/bzImage
fi
mount -t tmpfs none /mnt/tmp
-cp $BASE/$INITRD /mnt/tmp/initrd.img
-cp /mnt/root/$KERN /mnt/tmp/bzImage
+cp $INITRD /mnt/tmp/initrd.img
+cp $KERN /mnt/tmp/bzImage
-umount /mnt/root
+umount $ROOT
if [ ! "$KCMD" ]
then
Deleted: trunk/target/generic/target_skeleton/runnix.new
===================================================================
--- trunk/target/generic/target_skeleton/runnix.new 2007-04-27 21:45:08 UTC (rev 55)
+++ trunk/target/generic/target_skeleton/runnix.new 2007-04-28 01:01:00 UTC (rev 56)
@@ -1,309 +0,0 @@
-#!/bin/sh
-PATH=/bin:/sbin:/usr/bin:/usr/sbin
-
-BASE=/mnt/base
-
-donet () {
-ifconfig lo0 down 2> /dev/null
-ifconfig $NDEV down 2> /dev/null
-ifconfig lo up 127.0.0.1
-if [ "$MAC" ]
-then
-ifconfig "$NDEV" hw ether "$MAC"
-fi
-if [ "$IP" = "dhcp" ]
-then
-# echo "Configuring $NDEV with DHCP..."
-udhcpc -nq -s /etc/udhcpc.script -i "$NDEV"
-else
-ifconfig "$NDEV" inet "$IP" netmask "$NM"
-echo $IP > /tmp/myip
-route add -net default gw "$GW"
-for i in $DNS
-do
-echo "nameserver $i" >> /tmp/etc/resolv.conf
-done
-fi
-
-if [ -f /tmp/myip ]
-then
-return 0
-else
-return 1
-fi
-}
-
-##Check for upgrade function
-## 0 success with upgrade available
-## 1 on general failure
-## 2 no upgrade available
-
-checkup () {
-# echo "Checking for updates..."
-
-if `wget -q -c -O /tmp/ver $URL/ver`
-then
-VER=`cat /tmp/ver`
-
-if [ -f $BASE/os/ver ]
-then
-OVER=`cat $BASE/os/ver`
-else
-OVER="NONE"
-fi
-
-if [ "$VER" = "$OVER" ]
-then
-return 2
-else
-return 0
-fi
-
-else
-return 1
-fi
-}
-
-getup () {
-echo "Downloading $URL/$VER.tar.gz - Please Wait"
-wget -c -O /tmp/$VER.tar.gz $URL/$VER.tar.gz
-wget -q -c -O /tmp/$VER.tar.gz.sha1 $URL/$VER.tar.gz.sha1
-}
-
-extract () {
-cd $BASE/os
-tar -xzf /tmp/$VER.tar.gz
-sync
-}
-
-install () {
-mv $BASE/os/$VER/* $BASE/os/ && mv /tmp/ver $BASE/os/ver
-rmdir $BASE/os/$VER
-}
-
-checkfile () {
-if `sha1sum -cs $1`
-then
-return 0
-else
-return 1
-fi
-}
-
-getconfig () {
-if [ -r $1 ]
-then
-OFILE=`basename $1`
-#cat $1 | dos2unix -u > /tmp/etc/$OFILE
-cp $1 /tmp/etc/$OFILE
-. /tmp/etc/$OFILE
-fi
-}
-
-# mount crucial filesystems
-mount -t proc none /proc
-mount -t tmpfs none /tmp
-mkdir /tmp/etc
-
-# get command line options
-CMDLINE=`cat /proc/cmdline`
-
-# figure out what we are running from
-for i in ${CMDLINE}
-do
-if `echo $i | grep -q "rundisk="`
-then
-RUNDISK=`echo $i | grep "rundisk="| sed -e 's/rundisk=//'`
-
-case $RUNDISK in
-
-cdrom|CDROM|cd|CD)
-RFSTYPE=iso9660
-RFSDEV="hda hdb hdc hdd hde hde hdf hdg hdh"
-;;
-
-usbflash|USBFLASH|usb|USB)
-RFSTYPE=vfat
-RFSDEV="sda1 sdb1 sdc1 sdd1"
-;;
-
-cf|CF)
-RFSTYPE=vfat
-RFSDEV="hda1 hdb1 hdc1 hdd1 hde1 hdf1 hdg1 hdh1"
-;;
-
-esac
-
-else
-# fallback to "auto"
-RFSTYPE=vfat
-RFSDEV="hda1 hdb1 hdc1 hdd1 hde1 hdf1 hdg1 hdh1 sda1 sdb1 sdc1 sdd1"
-
-fi
-done
-
-# look for loader
-for i in $RFSDEV
-do
- if `mount -t $RFSTYPE /dev/${i} $BASE > /dev/null 2>&1`
- then
- if [ -f $BASE/runnix ]
- then
- DEVICE=${i}
- else
- umount /dev/${i}
- fi
- fi
-done
-
-# Loader not found
-if [ ! $DEVICE ]
-then
- echo "Runnix disk not found."
- exec /bin/sh
- exit
-fi
-
-# get image name
-for i in ${CMDLINE}
-do
-if `echo $i | grep -q "runimg="`
-then
-RUNIMG=`echo $i | grep "runimg="| sed -e 's/runimg=//'`
-fi
-done
-
-if [ ! "$RUNIMG" ]
-then
-RUNIMG="auto"
-fi
-
-# get upgrade config file
-getconfig $BASE/runnix.conf
-getconfig $BASE/os/default.conf
-
-# Here we go
-
-if [ "$NDEV" ]
-then
-echo "Configuring the network..."
-donet; DONET=$?
-fi
-
-if [ "$DONET" = "0" ]
-then
-echo "Checking for updated image..."
-checkup; CHECKUP=$?
-fi
-
-if [ "$CHECKUP" = "0" ]
-then
-echo "Getting updated image..."
-getup; GETUP=$?
-fi
-
-if [ "$GETUP" = "0" ]
-then
-echo "Extracting update..."
-doup; DOUP=$?
-fi
-
-if [ "$DOUP" = "0" ]
-then
-echo "Installing update..."
-install; INSTALL=$?
-fi
-
-if [ "$USLEEP" ]
-then
-echo "Sleeping for "$USLEEP" seconds"
-sleep $USLEEP
-fi
-
-if [ "$RUNIMG" = "auto" ]
-then
-# Get the latest good one
-cd $BASE/os
-RUNIMG=`ls *.run | tail -n1`
-fi
-
-#If we have a ver file, override auto value
-if [ -f $BASE/os/ver ]
-then
-RUNIMG=`cat $BASE/os/ver`.run
-CHECKIMG=0
-fi
-
-if [ "$CHECKIMG" ]
-then
-echo "Verifying image..."
-cd $BASE/os
-if `checkfile $RUNIMG.sha1`
-then
-echo "Image verified. Booting."
-else
-# try again
-echo "Kris needs to put something in here"
-fi
-fi
-
-#grab the new config file
-getconfig $BASE/os/$RUNIMG.conf
-
-# Setup root device
-if [ ! "$OFFSET" ]
-then
-losetup /dev/loop0 $BASE/os/$RUNIMG
-else
-losetup -o "$OFFSET" /dev/loop0 $BASE/os/$RUNIMG
-fi
-
-# fill in some defaults if we don't have them
-if [ ! "$INITRD" ]
-then
-INITRD=initrd.img
-fi
-
-if [ ! "$KERN" ]
-then
-KERN=boot/bzImage
-fi
-
-if [ ! "$FSTYPE" ]
-then
-FSTYPE=ext2
-fi
-
-# Mount root device
-if `mount -t $FSTYPE -o ro /dev/loop0 /mnt/root`
-then
-echo "Root mounted"
-else
-echo "Error mounting $RUNIMG root fs"
-exec /bin/sh
-fi
-
-#copy new kernel and initrd to RAM
-mount -t tmpfs none /mnt/tmp
-cp $BASE/$INITRD /mnt/tmp/initrd.img
-cp /mnt/root/$KERN /mnt/tmp/bzImage
-
-#unmount old filesystem
-umount /mnt/root
-
-# bomb if we don't have a kernel command line
-if [ ! "$KCMD" ]
-then
-echo "You need to specify a kernel command line"
-echo "I can't guess that"
-exec /bin/sh
-fi
-
-# free up some RAM
-umount /tmp
-
-echo "Trying kexec..."
-kexec --command-line="$KCMD" --initrd=/mnt/tmp/initrd.img -f /mnt/tmp/bzImage
-
-# Just in case
-exec /bin/sh
Modified: trunk/target/x86/syslinux/syslinux.mk
===================================================================
--- trunk/target/x86/syslinux/syslinux.mk 2007-04-27 21:45:08 UTC (rev 55)
+++ trunk/target/x86/syslinux/syslinux.mk 2007-04-28 01:01:00 UTC (rev 56)
@@ -1,6 +1,6 @@
#############################################################
#
-# syslinux to make target msdos/iso9660 filesystems bootable
+# syslinux to make target msdos filesystems bootable
#
#############################################################
@@ -15,11 +15,11 @@
bzcat $(DL_DIR)/$(SYSLINUX_SOURCE) | tar -C $(BUILD_DIR) -xvf -
touch -c $(SYSLINUX_DIR)/Makefile
-$(SYSLINUX_DIR)/isolinux.bin: $(SYSLINUX_DIR)/Makefile
- $(MAKE) CC=$(TARGET_CC) -C $(SYSLINUX_DIR)
- touch -c $(SYSLINUX_DIR)/isolinux.bin
+$(SYSLINUX_DIR)/unix/syslinux: $(SYSLINUX_DIR)/Makefile
+ $(MAKE) CC=gcc -C $(SYSLINUX_DIR)
+ touch -c $(SYSLINUX_DIR)/unix/syslinux
-syslinux: $(SYSLINUX_DIR)/isolinux.bin
+syslinux: $(SYSLINUX_DIR)/unix/syslinux
syslinux-clean:
-make -C $(SYSLINUX_DIR) clean
Added: trunk/toolchain/runrelease/files/INSTALL
===================================================================
--- trunk/toolchain/runrelease/files/INSTALL (rev 0)
+++ trunk/toolchain/runrelease/files/INSTALL 2007-04-28 01:01:00 UTC (rev 56)
@@ -0,0 +1,39 @@
+# RUNNIX 0.1
+# I don't write good docs (anymore) - Kristian Kielhofner <kr...@kr...>
+
+To install:
+
+create a fat 16 filesystem on something:
+NOTE: syslinux does not seem to like dos volume names
+don't specify -N when running mkdosfs
+
+mkdosfs -F 16 /dev/something1
+
+install syslinux on it:
+
+./syslinux /dev/something1
+cat mbr.bin > /dev/something
+
+mount it:
+
+mount /dev/something1 /mnt/runnix
+
+copy runnix to it:
+
+cp -R rootfs_vfat/* /mnt/runnix/
+
+Now all you have to do is get an image!
+
+AstLinux is currently the only image available, but I will be working
+on more soon.
+
+All you should have to do is put a .run file (and its config file and other
+stuff) in /mnt/runnix/os/
+
+If you are not using a serial console, take a look at the various
+syslinux.cfg files in /mnt/runnix
+
+Have fun!
+
+--
+Kristian Kielhofner
Added: trunk/toolchain/runrelease/files/install
===================================================================
--- trunk/toolchain/runrelease/files/install (rev 0)
+++ trunk/toolchain/runrelease/files/install 2007-04-28 01:01:00 UTC (rev 56)
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+if [ ! $1 ]
+then
+echo "
+
+Usage:
+
+$0 [device]
+"
+exit 1
+fi
+
+DEVICE=$1
+
+umount /media/*
+fdisk $DEVICE
+
+rmmod usb-storage
+
+echo "Remove USB device"
+read -p "Press enter to continue"
+
+umount /media/*
+
+mkdosfs -F 16 $DEVICE"1"
+
+
Added: trunk/toolchain/runrelease/files/rootfs_vfat/boot.msg
===================================================================
--- trunk/toolchain/runrelease/files/rootfs_vfat/boot.msg (rev 0)
+++ trunk/toolchain/runrelease/files/rootfs_vfat/boot.msg 2007-04-28 01:01:00 UTC (rev 56)
@@ -0,0 +1,4 @@
+runnix 0.1 - http://www.runnix.org
+
+
+
Property changes on: trunk/toolchain/runrelease/files/rootfs_vfat/boot.msg
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/toolchain/runrelease/files/rootfs_vfat/os/default.conf
===================================================================
--- trunk/toolchain/runrelease/files/rootfs_vfat/os/default.conf (rev 0)
+++ trunk/toolchain/runrelease/files/rootfs_vfat/os/default.conf 2007-04-28 01:01:00 UTC (rev 56)
@@ -0,0 +1,40 @@
+# Default runnix config file
+#
+# This is the config file that runnix will read
+# before it attempts to do any upgrades, find
+# images, etc. This is where you define the
+# behavior of these features.
+
+# Network support
+# Runnix can upgrade your .run files from a
+# network
+# Configure the network interface here
+# Device connected to network
+NDEV="eth0"
+
+# IP address - use "dhcp" for DHCP support
+IP="dhcp"
+
+# Netmask if using static IP
+# Ignored if IP=dhcp
+#NM="255.255.255.0"
+
+# Default gateway if using static IP
+# Ignored if IP=dhcp
+#GW="192.168.0.1"
+
+# DNS Servers is using static IP
+# Ignored if IP=dhcp
+# You can specify multiple servers with spaces
+#DNS="192.168.0.1 192.168.0.2"
+
+# MAC address spoofing for the interface above
+#MAC="00:11:22:33:44:55"
+
+# URL to look for upgrade (AstLinux net4801 image by default)
+# Must be http:// or ftp://
+#URL="http://www.krisk.org/upgrade/net4801"
+
+# Sometimes we need to sleep after upgrade
+# This is a hack that you should not use
+# USLEEP="10"
Property changes on: trunk/toolchain/runrelease/files/rootfs_vfat/os/default.conf
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/toolchain/runrelease/files/rootfs_vfat/runnix.conf.sample
===================================================================
--- trunk/toolchain/runrelease/files/rootfs_vfat/runnix.conf.sample (rev 0)
+++ trunk/toolchain/runrelease/files/rootfs_vfat/runnix.conf.sample 2007-04-28 01:01:00 UTC (rev 56)
@@ -0,0 +1,42 @@
+# Sample runnix (http://www.runnix.org) configuration file
+#
+# Use this as a sample for your .run images
+#
+# Variables to read (DO NOT SET THESE)
+# $BASE - The location where runnix is mounted
+# $ROOT - The location where your .run is mounted
+#
+# Variables to set
+
+# Kernel command line
+# This is the command line runnix will pass to kexec
+# for your linux kernel
+# Like GRUB or any other bootloader, it can be any
+# option that is valid for your linux kernel
+# (kernel to be booted from your .run, most likely)
+KCMD="root=/dev/ram0 rw init=/linuxrc astlinux=geni586 astimg=trunk.run astkd=/dev/sda1 astlive ide=nodma"
+
+# Offset for root filesystem
+# If your filesystem is a hard disk image with a full
+# partition table and traditional bootloader, you can
+# have losetup skip past the bootloader and partition
+# table to find a filesystem. "32256" will usually
+# find the beginning of the first partition.
+# If undefined, runnix will not use an offset (default)
+# OFFSET="32256"
+
+# The location of the kernel runnix will boot
+# Can be any path accesible by runnix
+# If the kernel is in the runnix partition (rare), use $BASE
+# If the kernel is inside the .run file, use $ROOT
+KERN="$ROOT/boot/bzImage"
+
+# root fs type - can be anything supported by runnix kernel
+# If undefined, runnix will try everything - NOT RECOMMENDED
+FSTYPE="ext2"
+
+# The location of the initrd runnix will use with your $KERN
+# Can be any path accesible by runnix
+# If the initrd is in the runnix partition, use $BASE
+# If the initrd is inside the .run file (rare), use $ROOT
+INITRD="$BASE/os/initrd.img"
Added: trunk/toolchain/runrelease/files/rootfs_vfat/syslinux.cfg
===================================================================
--- trunk/toolchain/runrelease/files/rootfs_vfat/syslinux.cfg (rev 0)
+++ trunk/toolchain/runrelease/files/rootfs_vfat/syslinux.cfg 2007-04-28 01:01:00 UTC (rev 56)
@@ -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/toolchain/runrelease/files/rootfs_vfat/syslinux.cfg
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/toolchain/runrelease/runrelease.mk
===================================================================
--- trunk/toolchain/runrelease/runrelease.mk (rev 0)
+++ trunk/toolchain/runrelease/runrelease.mk 2007-04-28 01:01:00 UTC (rev 56)
@@ -0,0 +1,36 @@
+######################################################################
+#
+# Make a release for Runnix
+#
+######################################################################
+RUNVER=$(shell cat target/generic/target_skeleton/etc/runnix-release)
+
+$(RUNVER): syslinux ext2root
+ mkdir -p $(RUNVER)
+ cp -a toolchain/runrelease/files/* $(RUNVER)/
+ -find $(RUNVER) -type d -name .svn | xargs rm -rf
+ $(INSTALL) -D -m 0644 $(SYSLINUX_DIR)/mbr.bin $(RUNVER)/mbr.bin
+ $(INSTALL) -D -m 0755 $(SYSLINUX_DIR)/unix/syslinux $(RUNVER)/syslinux
+ $(INSTALL) -D -m 0644 $(LINUX_KERNEL) $(RUNVER)/rootfs_vfat/runnix
+ $(INSTALL) -D -m 0644 $(EXT2_TARGET) $(RUNVER)/rootfs_vfat/runnix.img
+
+runrelease: $(RUNVER)
+
+runrelease-source:
+
+runrelease-clean:
+ -rm -rf $(RUNVER)
+
+runrelease-dirclean:
+ -rm -rf $(RUNVER)
+
+runnix-config: runnix.config
+ cp runnix.config .config
+
+runnix: runnix-config oldconfig all runrelease
+
+#############################################################
+#
+# 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 21:45:12
|
Revision: 55
http://svn.sourceforge.net/runnix/?rev=55&view=rev
Author: krisk84
Date: 2007-04-27 14:45:08 -0700 (Fri, 27 Apr 2007)
Log Message:
-----------
build final runnix image
Modified Paths:
--------------
trunk/runnix.config
trunk/target/Config.in
trunk/target/ext2/Config.in
trunk/target/ext2/ext2root.mk
trunk/target/generic/device_table.txt
Added Paths:
-----------
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/runnix.config
===================================================================
--- trunk/runnix.config 2007-04-27 21:36:32 UTC (rev 54)
+++ trunk/runnix.config 2007-04-27 21:45:08 UTC (rev 55)
@@ -140,7 +140,7 @@
# BR2_PACKAGE_EXPAT is not set
# BR2_PACKAGE_E2FSPROGS is not set
# BR2_PACKAGE_FAKEROOT is not set
-# BR2_HOST_FAKEROUTE is not set
+BR2_HOST_FAKEROUTE=y
# BR2_PACKAGE_FILE is not set
# BR2_PACKAGE_GETTEXT is not set
# BR2_PACKAGE_LIBINTL is not set
@@ -217,11 +217,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="runnix.img"
+# BR2_TARGET_ROOTFS_EXT2_NONE is not set
+BR2_TARGET_ROOTFS_EXT2_GZIP=y
+# 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 is not set
# BR2_TARGET_ROOTFS_TAR is not set
Modified: trunk/target/Config.in
===================================================================
--- trunk/target/Config.in 2007-04-27 21:36:32 UTC (rev 54)
+++ trunk/target/Config.in 2007-04-27 21:45:08 UTC (rev 55)
@@ -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"
Modified: trunk/target/ext2/Config.in
===================================================================
--- trunk/target/ext2/Config.in 2007-04-27 21:36:32 UTC (rev 54)
+++ trunk/target/ext2/Config.in 2007-04-27 21:45:08 UTC (rev 55)
@@ -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-27 21:36:32 UTC (rev 54)
+++ trunk/target/ext2/ext2root.mk 2007-04-27 21:45:08 UTC (rev 55)
@@ -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,69 +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)
+ 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-27 21:36:32 UTC (rev 54)
+++ trunk/target/ext2/genext2fs-01-cvs-updates.patch 2007-04-27 21:45:08 UTC (rev 55)
@@ -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 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.
-+
-+# serial 1
-+
-+# Check whether the underlying file-system supports filenames
-+# with a leading dot. For instance MS-DOS doesn't.
-+AC_DEFUN([AM_SET_LEADING_DOT],
-+[rm -rf .tst 2>/dev/null
-+mkdir .tst 2>/dev/null
-+if test -d .tst; then
-+ am__leading_dot=.
-+else
-+ am__leading_dot=_
-+fi
-+rmdir .tst 2>/dev/null
-+AC_SUBST([am__leading_dot])])
-+
-+# Check to see how 'make' treats includes. -*- 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.
-+
-+# serial 2
-+
-+# AM_MAKE_INCLUDE()
-+# -----------------
-+# Check to see how make treats includes.
-+AC_DEFUN([AM_MAKE_INCLUDE],
-+[am_make=${MAKE-make}
-+cat > confinc << 'END'
-+am__doit:
-+ @echo done
-+.PHONY: am__doit
-+END
-+# If we don't find an include directive, just comment out the code.
-+AC_MSG_CHECKING([for style of include used by $am_make])
-+am__include="#"
-+am__quote=
-+_am_result=none
-+# First try GNU make style include.
-+echo "include confinc" > confmf
-+# We grep out `Entering directory' and `Leaving directory'
-+# messages which can occur if `w' ends up in MAKEFLAGS.
-+# In particular we don't look at `^make:' because GNU make might
-+# be invoked under some other name (usually "gmake"), in which
-+# case it prints its new name instead of `make'.
-+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-+ am__include=include
-+ am__quote=
-+ _am_result=GNU
-+fi
-+# Now try BSD make style include.
-+if test "$am__include" = "#"; then
-+ echo '.include "confinc"' > confmf
-+ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-+ am__include=.include
-+ am__quote="\""
-+ _am_result=BSD
-+ fi
-+fi
-+AC_SUBST([am__include])
-+AC_SUBST([am__quote])
-+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.
-+
-+# 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
-+
-+# AM_MISSING_PROG(NAME...
[truncated message content] |
|
From: <kr...@us...> - 2007-04-27 21:36:39
|
Revision: 54
http://svn.sourceforge.net/runnix/?rev=54&view=rev
Author: krisk84
Date: 2007-04-27 14:36:32 -0700 (Fri, 27 Apr 2007)
Log Message:
-----------
update default busybox config
Modified Paths:
--------------
trunk/package/busybox/busybox-runnix.config
trunk/target/device/geni386/Makefile.in
Removed Paths:
-------------
trunk/package/busybox/busybox.config
Modified: trunk/package/busybox/busybox-runnix.config
===================================================================
--- trunk/package/busybox/busybox-runnix.config 2007-04-27 21:06:04 UTC (rev 53)
+++ trunk/package/busybox/busybox-runnix.config 2007-04-27 21:36:32 UTC (rev 54)
@@ -1,46 +1,78 @@
#
# Automatically generated make config: don't edit
+# Busybox version: 1.4.1
+# Fri Apr 27 17:32:48 2007
#
-HAVE_DOT_CONFIG=y
+CONFIG_HAVE_DOT_CONFIG=y
#
+# Busybox Settings
+#
+
+#
# General Configuration
#
+# CONFIG_NITPICK is not set
+# CONFIG_DESKTOP is not set
# 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_BUFFERS_GO_IN_BSS is not set
+CONFIG_SHOW_USAGE=y
CONFIG_FEATURE_VERBOSE_USAGE=y
+CONFIG_FEATURE_COMPRESS_USAGE=y
# CONFIG_FEATURE_INSTALLER is not set
# CONFIG_LOCALE_SUPPORT is not set
-# CONFIG_FEATURE_DEVFS is not set
+# CONFIG_GETOPT_LONG is not set
# CONFIG_FEATURE_DEVPTS is not set
# CONFIG_FEATURE_CLEAN_UP is not set
CONFIG_FEATURE_SUID=y
+CONFIG_FEATURE_SYSLOG=y
# CONFIG_FEATURE_SUID_CONFIG is not set
# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
+# CONFIG_FEATURE_HAVE_RPC is not set
# CONFIG_SELINUX is not set
+CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
#
# Build Options
#
# CONFIG_STATIC is not set
+# CONFIG_BUILD_LIBBUSYBOX is not set
+# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set
+# CONFIG_FEATURE_SHARED_BUSYBOX 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
+# CONFIG_BUILD_AT_ONCE is not set
#
+# Debugging Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_PESSIMIZE is not set
+# CONFIG_NO_DEBUG_LIB is not set
+# CONFIG_DMALLOC is not set
+# CONFIG_EFENCE is not set
+CONFIG_INCLUDE_SUSv2=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"
+CONFIG_PREFIX="./_install"
#
+# Busybox Library Tuning
+#
+CONFIG_PASSWORD_MINLEN=6
+CONFIG_MD5_SIZE_VS_SPEED=2
+
+#
+# Applets
+#
+
+#
# Archival Utilities
#
# CONFIG_AR is not set
@@ -58,13 +90,16 @@
CONFIG_TAR=y
CONFIG_FEATURE_TAR_CREATE=y
CONFIG_FEATURE_TAR_BZIP2=y
+# CONFIG_FEATURE_TAR_LZMA is not set
# 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_OLDGNU_COMPATIBILITY is not set
CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
# CONFIG_UNCOMPRESS is not set
+# CONFIG_UNLZMA is not set
+# CONFIG_FEATURE_LZMA_FAST is not set
CONFIG_UNZIP=y
#
@@ -73,6 +108,7 @@
# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
# CONFIG_FEATURE_DEB_TAR_GZ is not set
# CONFIG_FEATURE_DEB_TAR_BZ2 is not set
+# CONFIG_FEATURE_DEB_TAR_LZMA is not set
#
# Coreutils
@@ -80,38 +116,45 @@
CONFIG_BASENAME=y
# CONFIG_CAL is not set
CONFIG_CAT=y
+# CONFIG_CATV is not set
CONFIG_CHGRP=y
CONFIG_CHMOD=y
CONFIG_CHOWN=y
CONFIG_CHROOT=y
+# CONFIG_CKSUM is not set
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_FEATURE_DD_SIGNAL_HANDLING=y
+CONFIG_FEATURE_DD_IBS_OBS=y
CONFIG_DF=y
+# CONFIG_DIFF is not set
+# CONFIG_FEATURE_DIFF_BINARY is not set
+# CONFIG_FEATURE_DIFF_DIR is not set
+# CONFIG_FEATURE_DIFF_MINIMAL is not set
CONFIG_DIRNAME=y
CONFIG_DOS2UNIX=y
CONFIG_UNIX2DOS=y
CONFIG_DU=y
-CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y
+CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
CONFIG_ECHO=y
CONFIG_FEATURE_FANCY_ECHO=y
CONFIG_ENV=y
+# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set
CONFIG_EXPR=y
+# CONFIG_EXPR_MATH_SUPPORT_64 is not set
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_INSTALL is not set
+# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
# CONFIG_LENGTH is not set
CONFIG_LN=y
CONFIG_LOGNAME=y
@@ -122,13 +165,15 @@
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 not set
# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
CONFIG_MD5SUM=y
CONFIG_MKDIR=y
+# CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set
# CONFIG_MKFIFO is not set
CONFIG_MKNOD=y
CONFIG_MV=y
+# CONFIG_FEATURE_MV_LONG_OPTIONS is not set
CONFIG_NICE=y
CONFIG_NOHUP=y
# CONFIG_OD is not set
@@ -154,10 +199,6 @@
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
@@ -168,12 +209,13 @@
CONFIG_UNAME=y
CONFIG_UNIQ=y
CONFIG_USLEEP=y
-CONFIG_UUDECODE=y
-CONFIG_UUENCODE=y
+# CONFIG_UUDECODE is not set
+# CONFIG_UUENCODE is not set
CONFIG_WATCH=y
CONFIG_WC=y
-CONFIG_WHO=y
-CONFIG_WHOAMI=y
+CONFIG_FEATURE_WC_LARGE=y
+# CONFIG_WHO is not set
+# CONFIG_WHOAMI is not set
CONFIG_YES=y
#
@@ -182,7 +224,7 @@
CONFIG_FEATURE_PRESERVE_HARDLINKS=y
#
-# Common options for ls and more
+# Common options for ls, more and telnet
#
CONFIG_FEATURE_AUTOWIDTH=y
@@ -207,60 +249,59 @@
# CONFIG_LOADKMAP is not set
CONFIG_OPENVT=y
CONFIG_RESET=y
+# CONFIG_RESIZE is not set
+# CONFIG_FEATURE_RESIZE_PRINT is not set
# CONFIG_SETCONSOLE is not set
+# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
# CONFIG_SETKEYCODES is not set
+# CONFIG_SETLOGCONS is not set
#
# Debian Utilities
#
-CONFIG_MKTEMP=y
+# CONFIG_MKTEMP is not set
# CONFIG_PIPE_PROGRESS is not set
CONFIG_READLINK=y
# CONFIG_FEATURE_READLINK_FOLLOW is not set
CONFIG_RUN_PARTS=y
+# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
# CONFIG_START_STOP_DAEMON is not set
+# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set
+# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS 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_ED is not set
+# CONFIG_PATCH is not set
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
+# CONFIG_VI is not set
+# CONFIG_FEATURE_VI_COLON is not set
+# CONFIG_FEATURE_VI_YANKMARK is not set
+# CONFIG_FEATURE_VI_SEARCH is not set
+# CONFIG_FEATURE_VI_USE_SIGNALS is not set
+# CONFIG_FEATURE_VI_DOT_CMD is not set
+# CONFIG_FEATURE_VI_READONLY is not set
+# CONFIG_FEATURE_VI_SETOPTS is not set
+# CONFIG_FEATURE_VI_SET is not set
+# CONFIG_FEATURE_VI_WIN_RESIZE is not set
+# CONFIG_FEATURE_VI_OPTIMIZE_CURSOR is not set
+CONFIG_FEATURE_ALLOW_EXEC=y
#
# Finding Utilities
#
CONFIG_FIND=y
+CONFIG_FEATURE_FIND_PRINT0=y
CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_MMIN=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_NEWER=y
# CONFIG_FEATURE_FIND_INUM is not set
CONFIG_FEATURE_FIND_EXEC=y
CONFIG_GREP=y
@@ -277,15 +318,14 @@
# Init Utilities
#
CONFIG_INIT=y
+# CONFIG_DEBUG_INIT is not set
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_FEATURE_INIT_COREDUMPS is not set
+CONFIG_FEATURE_INITRD=y
CONFIG_HALT=y
# CONFIG_MESG is not set
-CONFIG_POWEROFF=y
-CONFIG_REBOOT=y
#
# Login/Password Management Utilities
@@ -293,36 +333,127 @@
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_ADDGROUP is not set
+# CONFIG_DELGROUP is not set
+# CONFIG_ADDUSER is not set
+# CONFIG_DELUSER is not set
CONFIG_GETTY=y
CONFIG_FEATURE_UTMP=y
CONFIG_FEATURE_WTMP=y
CONFIG_LOGIN=y
+# CONFIG_LOGIN_SCRIPTS is not set
# CONFIG_FEATURE_SECURETTY is not set
CONFIG_PASSWD=y
+# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set
CONFIG_SU=y
+# CONFIG_FEATURE_SU_SYSLOG is not set
+# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set
CONFIG_SULOGIN=y
-CONFIG_VLOCK=y
+# CONFIG_VLOCK is not set
#
+# Linux Ext2 FS Progs
+#
+# CONFIG_CHATTR is not set
+CONFIG_FSCK=y
+CONFIG_LSATTR=y
+
+#
+# Linux Module Utilities
+#
+# CONFIG_INSMOD is not set
+# 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 is not set
+# CONFIG_LSMOD is not set
+# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
+# CONFIG_MODPROBE is not set
+# CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS is not set
+# CONFIG_FEATURE_MODPROBE_FANCY_ALIAS is not set
+# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
+# CONFIG_FEATURE_2_4_MODULES is not set
+# CONFIG_FEATURE_2_6_MODULES is not set
+# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
+
+#
+# Linux System Utilities
+#
+CONFIG_DMESG=y
+CONFIG_FEATURE_DMESG_PRETTY=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 is not set
+CONFIG_FDISK=y
+CONFIG_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_LONG_OPTIONS is not set
+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_FEATURE_MDEV_EXEC is not set
+# CONFIG_MKSWAP is not set
+# CONFIG_FEATURE_MKSWAP_V0 is not set
+CONFIG_MORE=y
+CONFIG_FEATURE_USE_TERMIOS=y
+CONFIG_MOUNT=y
+# CONFIG_FEATURE_MOUNT_NFS is not set
+# CONFIG_FEATURE_MOUNT_CIFS is not set
+CONFIG_FEATURE_MOUNT_FLAGS=y
+CONFIG_FEATURE_MOUNT_FSTAB=y
+CONFIG_PIVOT_ROOT=y
+CONFIG_RDATE=y
+# CONFIG_READPROFILE is not set
+# CONFIG_SETARCH is not set
+# CONFIG_SWAPONOFF is not set
+CONFIG_SWITCH_ROOT=y
+CONFIG_UMOUNT=y
+CONFIG_FEATURE_UMOUNT_ALL=y
+
+#
+# Common options for mount/umount
+#
+CONFIG_FEATURE_MOUNT_LOOP=y
+# CONFIG_FEATURE_MTAB_SUPPORT is not set
+
+#
# Miscellaneous Utilities
#
# CONFIG_ADJTIMEX is not set
# CONFIG_BBCONFIG is not set
-CONFIG_CROND=y
-CONFIG_FEATURE_CROND_CALL_SENDMAIL=y
-CONFIG_CRONTAB=y
+# CONFIG_CROND is not set
+# CONFIG_DEBUG_CROND_OPTION is not set
+# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+# CONFIG_CRONTAB is not set
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_FEATURE_DEVFS is not set
# CONFIG_EJECT is not set
CONFIG_LAST=y
CONFIG_LESS=y
+CONFIG_FEATURE_LESS_MAXLINES=9999999
CONFIG_FEATURE_LESS_BRACKETS=y
CONFIG_FEATURE_LESS_FLAGS=y
# CONFIG_FEATURE_LESS_FLAGCS is not set
@@ -339,55 +470,40 @@
# 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_MT is not set
+# CONFIG_NMETER is not set
+# CONFIG_RAIDAUTORUN is not set
+# CONFIG_READAHEAD is not set
+# CONFIG_RUNLEVEL is not set
# CONFIG_RX is not set
CONFIG_STRINGS=y
# CONFIG_SETSID is not set
+# CONFIG_TASKSET is not set
+# CONFIG_FEATURE_TASKSET_FANCY is not set
CONFIG_TIME=y
-CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG is not set
#
-# 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_ARP=y
CONFIG_ARPING=y
+# CONFIG_DNSD is not set
CONFIG_ETHER_WAKE=y
CONFIG_FAKEIDENTD=y
CONFIG_FTPGET=y
CONFIG_FTPPUT=y
+# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
CONFIG_HOSTNAME=y
# CONFIG_HTTPD is not set
-# CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY is not set
+# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
+# CONFIG_FEATURE_HTTPD_SETUID 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_CONFIG_WITH_SCRIPT_INTERPR 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
@@ -398,32 +514,38 @@
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_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_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_INETD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_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_IP=y
+CONFIG_FEATURE_IP_ADDRESS=y
+CONFIG_FEATURE_IP_LINK=y
+CONFIG_FEATURE_IP_ROUTE=y
# CONFIG_FEATURE_IP_TUNNEL is not set
-# CONFIG_IPCALC is not set
-# CONFIG_FEATURE_IPCALC_FANCY is not set
+# CONFIG_FEATURE_IP_RULE is not set
+# CONFIG_FEATURE_IP_SHORT_FORMS 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_IPRULE is not set
+CONFIG_IPCALC=y
+CONFIG_FEATURE_IPCALC_FANCY=y
+# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
+CONFIG_NAMEIF=y
CONFIG_NC=y
-# CONFIG_NC_GAPING_SECURITY_HOLE is not set
+CONFIG_NC_SERVER=y
+CONFIG_NC_EXTRA=y
CONFIG_NETSTAT=y
CONFIG_NSLOOKUP=y
CONFIG_PING=y
@@ -431,34 +553,32 @@
# CONFIG_PING6 is not set
# CONFIG_FEATURE_FANCY_PING6 is not set
CONFIG_ROUTE=y
-CONFIG_TELNET=y
-CONFIG_FEATURE_TELNET_TTYPE=y
+# CONFIG_TELNET is not set
+# CONFIG_FEATURE_TELNET_TTYPE is not set
# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
-CONFIG_TELNETD=y
-# CONFIG_FEATURE_TELNETD_INETD is not set
+# CONFIG_TELNETD is not set
+# CONFIG_FEATURE_TELNETD_STANDALONE 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_DEBUG_TFTP=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_APP_UDHCPD is not set
+# CONFIG_APP_DHCPRELAY is not set
+# CONFIG_APP_DUMPLEASES is not set
+CONFIG_APP_UDHCPC=y
+# CONFIG_FEATURE_UDHCP_SYSLOG is not set
+# CONFIG_FEATURE_UDHCP_DEBUG 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_FEATURE_WGET_LONG_OPTIONS is not set
# CONFIG_ZCIP is not set
#
@@ -468,6 +588,7 @@
CONFIG_FUSER=y
CONFIG_KILL=y
CONFIG_KILLALL=y
+# CONFIG_KILLALL5 is not set
CONFIG_PIDOF=y
# CONFIG_FEATURE_PIDOF_SINGLE is not set
# CONFIG_FEATURE_PIDOF_OMIT is not set
@@ -475,8 +596,8 @@
CONFIG_FEATURE_PS_WIDE=y
CONFIG_RENICE=y
CONFIG_BB_SYSCTL=y
-CONFIG_TOP=y
-CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
+# CONFIG_TOP is not set
+# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set
CONFIG_UPTIME=y
#
@@ -499,12 +620,13 @@
CONFIG_ASH_MATH_SUPPORT=y
CONFIG_ASH_MATH_SUPPORT_64=y
# CONFIG_ASH_GETOPTS is not set
+# CONFIG_ASH_BUILTIN_ECHO is not set
+CONFIG_ASH_BUILTIN_TEST=y
# 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_ASH_EXPAND_PRMT=y
# CONFIG_HUSH is not set
# CONFIG_LASH is not set
# CONFIG_MSH is not set
@@ -525,69 +647,25 @@
#
# 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_SYSLOGD is not set
+# CONFIG_FEATURE_ROTATE_LOGFILE is not set
+# CONFIG_FEATURE_REMOTE_LOG is not set
+# CONFIG_FEATURE_IPC_SYSLOG is not set
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=
+# CONFIG_LOGREAD is not set
# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
-CONFIG_KLOGD=y
-CONFIG_LOGGER=y
+# CONFIG_KLOGD is not set
+# CONFIG_LOGGER is not set
#
-# Linux System Utilities
+# Runit 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
+# CONFIG_RUNSV is not set
+# CONFIG_RUNSVDIR is not set
+# CONFIG_SV is not set
+# CONFIG_SVLOGD is not set
+# CONFIG_CHPST is not set
+# CONFIG_SETUIDGID is not set
+# CONFIG_ENVUIDGID is not set
+# CONFIG_ENVDIR is not set
+# CONFIG_SOFTLIMIT is not set
Deleted: trunk/package/busybox/busybox.config
===================================================================
--- trunk/package/busybox/busybox.config 2007-04-27 21:06:04 UTC (rev 53)
+++ trunk/package/busybox/busybox.config 2007-04-27 21:36:32 UTC (rev 54)
@@ -1,483 +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=y
-# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
-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=y
-# CONFIG_FEATURE_CLEAN_UP is not set
-CONFIG_FEATURE_SUID=y
-# CONFIG_FEATURE_SUID_CONFIG is not set
-# CONFIG_SELINUX is not set
-
-#
-# Build Options
-#
-# CONFIG_STATIC is not set
-CONFIG_LFS=y
-# USING_CROSS_COMPILER is not set
-EXTRA_CFLAGS_OPTIONS=""
-
-#
-# Installation Options
-#
-# CONFIG_INSTALL_NO_USR is not set
-PREFIX="./_install"
-
-#
-# Archival Utilities
-#
-# CONFIG_AR is not set
-CONFIG_BUNZIP2=y
-# CONFIG_CPIO is not set
-# CONFIG_DPKG is not set
-# CONFIG_DPKG_DEB 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
-
-#
-# 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
-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_PRINTENV is not set
-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_MD5SUM=y
-CONFIG_MKDIR=y
-# CONFIG_MKFIFO is not set
-CONFIG_MKNOD=y
-CONFIG_MV=y
-# CONFIG_NICE is not set
-# CONFIG_OD is not set
-# CONFIG_PRINTF is not set
-CONFIG_PWD=y
-# CONFIG_REALPATH is not set
-CONFIG_RM=y
-CONFIG_RMDIR=y
-# CONFIG_SEQ is not set
-CONFIG_SHA1SUM=y
-CONFIG_SLEEP=y
-# CONFIG_FEATURE_FANCY_SLEEP is not set
-CONFIG_SORT=y
-CONFIG_SORT_BIG=y
-# CONFIG_STAT 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 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 is not set
-CONFIG_WC=y
-# CONFIG_WHO is not set
-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_SETKEYCODES is not set
-
-#
-# Debian Utilities
-#
-CONFIG_MKTEMP=y
-# CONFIG_PIPE_PROGRESS is not set
-CONFIG_READLINK=y
-CONFIG_FEATURE_READLINK_FOLLOW=y
-CONFIG_RUN_PARTS=y
-CONFIG_START_STOP_DAEMON=y
-CONFIG_WHICH=y
-
-#
-# Linux Ext2 FS Progs
-#
-# CONFIG_CHATTR is not set
-# CONFIG_LSATTR is not set
-
-#
-# Editors
-#
-# CONFIG_AWK is not set
-# CONFIG_PATCH is not set
-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_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_EXTRA_QUIET=y
-CONFIG_HALT=y
-CONFIG_POWEROFF=y
-CONFIG_REBOOT=y
-# CONFIG_MESG is not set
-
-#
-# Login/Password Management Utilities
-#
-# 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_U_W_TMP is not set
-CONFIG_LOGIN=y
-CONFIG_FEATURE_SECURETTY=y
-CONFIG_PASSWD=y
-CONFIG_SU=y
-CONFIG_SULOGIN=y
-CONFIG_VLOCK=y
-
-#
-# Common options for adduser, deluser, login, su
-#
-CONFIG_FEATURE_SHADOWPASSWDS=y
-
-#
-# Miscellaneous Utilities
-#
-# CONFIG_ADJTIMEX is not set
-# CONFIG_CROND is not set
-# CONFIG_CRONTAB is not set
-CONFIG_DC=y
-# CONFIG_DEVFSD is not set
-# CONFIG_EJECT is not set
-# CONFIG_LAST is not set
-# CONFIG_HDPARM is not set
-# CONFIG_MAKEDEVS is not set
-CONFIG_MT=y
-# CONFIG_RX is not set
-CONFIG_STRINGS=y
-CONFIG_TIME=y
-# CONFIG_WATCHDOG is not set
-
-#
-# Linux Module Utilities
-#
-CONFIG_INSMOD=y
-CONFIG_FEATURE_2_4_MODULES=y
-# CONFIG_FEATURE_2_6_MODULES is not set
-# 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_LSMOD=y
-CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
-CONFIG_FEATURE_QUERY_MODULE_INTERFACE=y
-CONFIG_MODPROBE=y
-CONFIG_RMMOD=y
-CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
-
-#
-# Networking Utilities
-#
-# CONFIG_FEATURE_IPV6 is not set
-# CONFIG_ARPING is not set
-# CONFIG_ETHER_WAKE is not set
-# CONFIG_FAKEIDENTD is not set
-# CONFIG_FTPGET is not set
-# CONFIG_FTPPUT is not set
-CONFIG_HOSTNAME=y
-# CONFIG_HTTPD is not set
-CONFIG_IFCONFIG=y
-CONFIG_FEATURE_IFCONFIG_STATUS=y
-# CONFIG_FEATURE_IFCONFIG_SLIP is not set
-# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
-# CONFIG_FEATURE_IFCONFIG_HW is not set
-# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
-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 is not set
-# CONFIG_IP is not set
-# CONFIG_IPCALC 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 is not set
-CONFIG_NETSTAT=y
-CONFIG_NSLOOKUP=y
-CONFIG_PING=y
-CONFIG_FEATURE_FANCY_PING=y
-CONFIG_ROUTE=y
-CONFIG_TELNET=y
-CONFIG_FEATURE_TELNET_TTYPE=y
-# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
-# CONFIG_TELNETD is not set
-# CONFIG_TFTP is not set
-# CONFIG_TRACEROUTE is not set
-# CONFIG_VCONFIG is not set
-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=y
-CONFIG_UDHCPC=y
-CONFIG_DUMPLEASES=y
-CONFIG_FEATURE_UDHCP_SYSLOG=y
-# CONFIG_FEATURE_UDHCP_DEBUG is not set
-# CONFIG_ZCIP is not set
-
-#
-# Process Utilities
-#
-CONFIG_FREE=y
-CONFIG_KILL=y
-CONFIG_KILLALL=y
-CONFIG_PIDOF=y
-CONFIG_PS=y
-# CONFIG_RENICE is not set
-# CONFIG_TOP is not set
-CONFIG_UPTIME=y
-# CONFIG_SYSCTL is not set
-
-#
-# Another Bourne-like Shell
-#
-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_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_MAIL is not set
-CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
-# CONFIG_ASH_RANDOM_SUPPORT 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 is not set
-# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set
-CONFIG_FEATURE_COMMAND_EDITING=y
-CONFIG_FEATURE_COMMAND_HISTORY=15
-CONFIG_FEATURE_COMMAND_SAVEHISTORY=y
-CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y
-# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set
-CONFIG_FEATURE_SH_FANCY_PROMPT=y
-
-#
-# System Logging Utilities
-#
-CONFIG_SYSLOGD=y
-CONFIG_FEATURE_ROTATE_LOGFILE=y
-# CONFIG_FEATURE_REMOTE_LOG is not set
-# CONFIG_FEATURE_IPC_SYSLOG is not set
-CONFIG_KLOGD=y
-CONFIG_LOGGER=y
-
-#
-# Linux System Utilities
-#
-CONFIG_DMESG=y
-# CONFIG_FBSET 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_GETOPT=y
-CONFIG_HEXDUMP=y
-CONFIG_HWCLOCK=y
-CONFIG_FEATURE_HWCLOCK_LONGOPTIONS=y
-# CONFIG_LOSETUP is not set
-# CONFIG_MKSWAP is not set
-CONFIG_MORE=y
-CONFIG_FEATURE_USE_TERMIOS=y
-CONFIG_PIVOT_ROOT=y
-CONFIG_RDATE=y
-CONFIG_SWAPONOFF=y
-CONFIG_MOUNT=y
-# CONFIG_NFSMOUNT is not set
-CONFIG_UMOUNT=y
-# CONFIG_FEATURE_MOUNT_FORCE is not set
-
-#
-# Common options for mount/umount
-#
-CONFIG_FEATURE_MOUNT_LOOP=y
-# CONFIG_FEATURE_MTAB_SUPPORT is not set
-# CONFIG_READPROFILE is not set
-
-#
-# Debugging Options
-#
-# CONFIG_DEBUG is not set
Modified: trunk/target/device/geni386/Makefile.in
===================================================================
--- trunk/target/device/geni386/Makefile.in 2007-04-27 21:06:04 UTC (rev 53)
+++ trunk/target/device/geni386/Makefile.in 2007-04-27 21:36:32 UTC (rev 54)
@@ -6,7 +6,6 @@
BR2_PACKAGE_LINUX_CONFIG=$(GENI386_PATH)/linux.config
UCLIBC_CONFIG_FILE=$(GENI386_PATH)/uClibc.config
TARGET_SKEL2_DIR=$(GENI386_PATH)/target_skeleton
-BR2_PACKAGE_BUSYBOX_CONFIG:=$(GENI386_PATH)/busybox.config
ifeq ($(strip $(BR2_TARGET_GENI386_SERIAL)),y)
TARGET_SKEL2_DIR=$(GENI386_PATH)/target_skeleton-serial
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2007-04-27 21:06:07
|
Revision: 53
http://svn.sourceforge.net/runnix/?rev=53&view=rev
Author: krisk84
Date: 2007-04-27 14:06:04 -0700 (Fri, 27 Apr 2007)
Log Message:
-----------
target dir fixes
Modified Paths:
--------------
trunk/Makefile
Removed Paths:
-------------
trunk/target/device/geni386/target_skeleton/
trunk/target/device/geni386/target_skeleton-serial/
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2007-04-27 21:02:04 UTC (rev 52)
+++ trunk/Makefile 2007-04-27 21:06:04 UTC (rev 53)
@@ -105,6 +105,7 @@
@ln -snf ../lib $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib
$(TARGET_DIR):
+ mkdir -p $(TARGET_DIR)
if [ -f "$(TARGET_SKELETON)" ] ; then \
zcat $(TARGET_SKELETON) | tar -C $(BUILD_DIR) -xf -; \
fi;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2007-04-27 21:02:06
|
Revision: 52
http://svn.sourceforge.net/runnix/?rev=52&view=rev
Author: krisk84
Date: 2007-04-27 14:02:04 -0700 (Fri, 27 Apr 2007)
Log Message:
-----------
add support for getter_script and update default config
Modified Paths:
--------------
trunk/runnix.config
Added Paths:
-----------
trunk/toolchain/getter_script.sh
Modified: trunk/runnix.config
===================================================================
--- trunk/runnix.config 2007-04-27 20:59:00 UTC (rev 51)
+++ trunk/runnix.config 2007-04-27 21:02:04 UTC (rev 52)
@@ -25,7 +25,7 @@
#
# Build options
#
-BR2_WGET="wget --passive-ftp"
+BR2_WGET="toolchain/getter_script.sh"
BR2_SVN="svn co"
BR2_TAR_OPTIONS=""
BR2_DL_DIR="$(BASE_DIR)/dl"
@@ -34,25 +34,13 @@
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
-BR2_JLEVEL=1
+BR2_JLEVEL=2
#
# Toolchain Options
#
#
-# Kernel Header Options
-#
-# BR2_KERNEL_HEADERS_2_4_25 is not set
-# BR2_KERNEL_HEADERS_2_4_27 is not set
-# BR2_KERNEL_HEADERS_2_4_29 is not set
-# BR2_KERNEL_HEADERS_2_4_31 is not set
-# BR2_KERNEL_HEADERS_2_6_9 is not set
-# BR2_KERNEL_HEADERS_2_6_11 is not set
-BR2_KERNEL_HEADERS_2_6_12=y
-BR2_DEFAULT_KERNEL_HEADERS="2.6.12"
-
-#
# uClibc Options
#
# BR2_UCLIBC_VERSION_SNAPSHOT is not set
@@ -134,48 +122,16 @@
BR2_PACKAGE_BUSYBOX=y
# BR2_PACKAGE_BUSYBOX_SNAPSHOT is not set
BR2_PACKAGE_BUSYBOX_INSTALL_SYMLINKS=y
-BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-runnix.config"
-BR2_PACKAGE_LINUX=y
-BR2_PACKAGE_LINUX_VERSION="2.6.16.12"
-BR2_PACKAGE_LINUX_BASECONFIG="package/linux/runnix"
#
-# The minimum needed to build a uClibc development system
-#
-# BR2_PACKAGE_BASH is not set
-# 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 is not set
-# 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 is not set
-# BR2_PACKAGE_ASTMANPROXY is not set
-# BR2_PACKAGE_AT is not set
-# BR2_PACKAGE_AUTOCONF is not set
-# BR2_PACKAGE_AUTOMAKE is not set
-# BR2_PACKAGE_BERKELEYDB is not set
-# BR2_PACKAGE_BIND is not set
# BR2_PACKAGE_BISON is not set
-# BR2_PACKAGE_BOA is not set
# BR2_PACKAGE_BRIDGE 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 is not set
@@ -184,49 +140,31 @@
# BR2_PACKAGE_EXPAT is not set
# BR2_PACKAGE_E2FSPROGS is not set
# 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
# 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 is not set
# BR2_PACKAGE_INADYN is not set
# BR2_PACKAGE_IOSTAT is not set
# BR2_PACKAGE_IPROUTE2 is not set
# BR2_PACKAGE_IPSEC_TOOLS is not set
# BR2_PACKAGE_IPTABLES is not set
-# 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 is not set
# BR2_PACKAGE_LIBFLOAT is not set
-# BR2_PACKAGE_LIBGLIB12 is not set
-# BR2_PACKAGE_LIBMAD is not set
# BR2_PACKAGE_LIBPCAP is not set
-# BR2_PACKAGE_LIBPNG is not set
-# BR2_PACKAGE_LIBPRI is not set
# BR2_PACKAGE_LIBSYSFS is not set
# BR2_PACKAGE_LIBTOOL is not set
# BR2_PACKAGE_LIBUSB is not set
-# BR2_PACKAGE_LIGHTTPD is not set
-BR2_PACKAGE_LINKS=y
+# BR2_PACKAGE_LINKS is not set
# BR2_PACKAGE_LRZSZ is not set
-# BR2_PACKAGE_LTP-TESTSUITE is not set
-# BR2_PACKAGE_LTT is not set
# BR2_PACKAGE_LVM2 is not set
# BR2_PACKAGE_LZO is not set
# BR2_PACKAGE_M4 is not set
# BR2_PACKAGE_MADWIFI is not set
-# BR2_PACKAGE_MDADM is not set
-# BR2_PACKAGE_MEMTESTER is not set
-# BR2_PACKAGE_MICROCOM is not set
# BR2_PACKAGE_MICROPERL is not set
-# BR2_PACKAGE_MICROWIN is not set
# BR2_PACKAGE_MINIHTTPD is not set
# BR2_PACKAGE_MKDOSFS is not set
# BR2_PACKAGE_MODULE_INIT_TOOLS is not set
@@ -238,11 +176,8 @@
# BR2_PACKAGE_NANO is not set
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 is not set
# BR2_PACKAGE_NEWT is not set
-# BR2_PACKAGE_NTP is not set
# BR2_PACKAGE_OPENNTPD is not set
# BR2_PACKAGE_OPENSSH is not set
# BR2_PACKAGE_OPENSSL is not set
@@ -250,51 +185,31 @@
# BR2_PACKAGE_PCIUTILS is not set
# BR2_PACKAGE_PCMCIA is not set
# BR2_PACKAGE_PHP4 is not set
-# BR2_PACKAGE_PORTAGE is not set
# BR2_PACKAGE_PORTMAP is not set
# BR2_PACKAGE_PPPD 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_RSYNC=y
# BR2_PACKAGE_RUBY is not set
-# BR2_PACKAGE_RXVT is not set
# BR2_PACKAGE_SCREEN is not set
-# BR2_PACKAGE_SDL is not set
# BR2_PACKAGE_SFDISK is not set
# BR2_PACKAGE_SLANG is not set
# BR2_PACKAGE_SMARTMONTOOLS is not set
# BR2_PACKAGE_SOCAT is not set
-# BR2_PACKAGE_SOX is not set
# BR2_PACKAGE_STRACE is not set
-# BR2_PACKAGE_SYSKLOGD is not set
# BR2_PACKAGE_SYSVINIT is not set
-# BR2_PACKAGE_TCL is not set
# BR2_PACKAGE_TFTPD is not set
-# 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 is not set
# BR2_PACKAGE_UDEV is not set
# BR2_PACKAGE_UDHCP is not set
# BR2_PACKAGE_USBUTILS is not set
# BR2_PACKAGE_UTIL-LINUX is not set
-# BR2_PACKAGE_VALGRIND is not set
# BR2_PACKAGE_VSFTPD is not set
# BR2_PACKAGE_VTUN is not set
-# 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_ZLIB is not set
#
@@ -316,3 +231,10 @@
#
# BR2_TARGET_GRUB is not set
BR2_TARGET_SYSLINUX=y
+
+#
+# Runnix Target Device
+#
+BR2_TARGET_GENI386=y
+# BR2_TARGET_GENI386_SERIAL is not set
+BR2_PACKAGE_LINUX=y
Added: trunk/toolchain/getter_script.sh
===================================================================
--- trunk/toolchain/getter_script.sh (rev 0)
+++ trunk/toolchain/getter_script.sh 2007-04-27 21:02:04 UTC (rev 52)
@@ -0,0 +1,14 @@
+#!/bin/bash
+# getter_better script from gumstix
+# what a great idea...
+
+wget --passive-ftp --timeout=30 -t 2 $@ || (
+ echo Retrying from astlinux alternate site...
+ index=$#-1
+ # Copy all params into an array
+ for (( i=0; $?==0; i++ ));do a[$i]=$1; shift; done
+ # Chop all but filename from last param and prepend out URL
+ a[$index]=${a[index]/*\//http:\/\/files.astlinux.org/}
+ # Now wget that from out server
+ wget ${a[@]}
+)
Property changes on: trunk/toolchain/getter_script.sh
___________________________________________________________________
Name: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2007-04-27 20:59:05
|
Revision: 51
http://svn.sourceforge.net/runnix/?rev=51&view=rev
Author: krisk84
Date: 2007-04-27 13:59:00 -0700 (Fri, 27 Apr 2007)
Log Message:
-----------
busybox config updates
Modified Paths:
--------------
trunk/package/busybox/busybox-runnix.config
Removed Paths:
-------------
trunk/package/busybox/busybox-astlinux.config
Deleted: trunk/package/busybox/busybox-astlinux.config
===================================================================
--- trunk/package/busybox/busybox-astlinux.config 2007-04-27 20:28:05 UTC (rev 50)
+++ trunk/package/busybox/busybox-astlinux.config 2007-04-27 20:59:00 UTC (rev 51)
@@ -1,675 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Busybox version: 1.4.1
-# Wed Feb 7 11:48:53 2007
-#
-CONFIG_HAVE_DOT_CONFIG=y
-
-#
-# Busybox Settings
-#
-
-#
-# General Configuration
-#
-CONFIG_NITPICK=y
-# CONFIG_DESKTOP is not set
-# 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_SHOW_USAGE=y
-CONFIG_FEATURE_VERBOSE_USAGE=y
-CONFIG_FEATURE_COMPRESS_USAGE=y
-CONFIG_FEATURE_INSTALLER=y
-# CONFIG_LOCALE_SUPPORT is not set
-CONFIG_GETOPT_LONG=y
-CONFIG_FEATURE_DEVPTS=y
-# CONFIG_FEATURE_CLEAN_UP is not set
-CONFIG_FEATURE_SUID=y
-CONFIG_FEATURE_SYSLOG=y
-# CONFIG_FEATURE_SUID_CONFIG is not set
-# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
-CONFIG_FEATURE_HAVE_RPC=y
-# CONFIG_SELINUX is not set
-CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
-
-#
-# Build Options
-#
-# CONFIG_STATIC is not set
-# CONFIG_BUILD_LIBBUSYBOX is not set
-# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set
-# CONFIG_FEATURE_SHARED_BUSYBOX is not set
-CONFIG_LFS=y
-# CONFIG_BUILD_AT_ONCE is not set
-
-#
-# Debugging Options
-#
-# CONFIG_DEBUG is not set
-# CONFIG_DEBUG_PESSIMIZE is not set
-# CONFIG_NO_DEBUG_LIB is not set
-# CONFIG_DMALLOC is not set
-# CONFIG_EFENCE is not set
-CONFIG_INCLUDE_SUSv2=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
-CONFIG_PREFIX="./install"
-
-#
-# Busybox Library Tuning
-#
-CONFIG_PASSWORD_MINLEN=6
-CONFIG_MD5_SIZE_VS_SPEED=2
-
-#
-# Applets
-#
-
-#
-# 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_LZMA is not set
-# CONFIG_FEATURE_TAR_FROM is not set
-CONFIG_FEATURE_TAR_GZIP=y
-# CONFIG_FEATURE_TAR_COMPRESS is not set
-# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
-CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
-# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
-# CONFIG_UNCOMPRESS is not set
-# CONFIG_UNLZMA is not set
-# CONFIG_FEATURE_LZMA_FAST 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
-# CONFIG_FEATURE_DEB_TAR_LZMA is not set
-
-#
-# Coreutils
-#
-CONFIG_BASENAME=y
-# CONFIG_CAL is not set
-CONFIG_CAT=y
-# CONFIG_CATV is not set
-CONFIG_CHGRP=y
-CONFIG_CHMOD=y
-CONFIG_CHOWN=y
-CONFIG_CHROOT=y
-# CONFIG_CKSUM is not set
-CONFIG_CMP=y
-# CONFIG_COMM is not set
-CONFIG_CP=y
-CONFIG_CUT=y
-CONFIG_DATE=y
-CONFIG_FEATURE_DATE_ISOFMT=y
-CONFIG_DD=y
-CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
-# CONFIG_FEATURE_DD_IBS_OBS is not set
-CONFIG_DF=y
-CONFIG_DIFF=y
-CONFIG_FEATURE_DIFF_BINARY=y
-CONFIG_FEATURE_DIFF_DIR=y
-# CONFIG_FEATURE_DIFF_MINIMAL is not set
-CONFIG_DIRNAME=y
-CONFIG_DOS2UNIX=y
-CONFIG_UNIX2DOS=y
-CONFIG_DU=y
-CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
-CONFIG_ECHO=y
-CONFIG_FEATURE_FANCY_ECHO=y
-CONFIG_ENV=y
-# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set
-CONFIG_EXPR=y
-# CONFIG_EXPR_MATH_SUPPORT_64 is not set
-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_FEATURE_INSTALL_LONG_OPTIONS is not set
-# 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_FEATURE_MKDIR_LONG_OPTIONS is not set
-# CONFIG_MKFIFO is not set
-CONFIG_MKNOD=y
-CONFIG_MV=y
-# CONFIG_FEATURE_MV_LONG_OPTIONS is not set
-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
-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_FEATURE_WC_LARGE is not set
-CONFIG_WHO=y
-CONFIG_WHOAMI=y
-CONFIG_YES=y
-
-#
-# Common options for cp and mv
-#
-CONFIG_FEATURE_PRESERVE_HARDLINKS=y
-
-#
-# Common options for ls, more and telnet
-#
-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_RESIZE is not set
-# CONFIG_FEATURE_RESIZE_PRINT is not set
-# CONFIG_SETCONSOLE is not set
-# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
-# CONFIG_SETKEYCODES is not set
-# CONFIG_SETLOGCONS 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_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
-# CONFIG_START_STOP_DAEMON is not set
-# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set
-# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set
-CONFIG_WHICH=y
-
-#
-# Editors
-#
-CONFIG_AWK=y
-CONFIG_FEATURE_AWK_MATH=y
-# CONFIG_ED is not set
-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
-CONFIG_FEATURE_ALLOW_EXEC=y
-
-#
-# Finding Utilities
-#
-CONFIG_FIND=y
-CONFIG_FEATURE_FIND_PRINT0=y
-CONFIG_FEATURE_FIND_MTIME=y
-CONFIG_FEATURE_FIND_MMIN=y
-CONFIG_FEATURE_FIND_PERM=y
-CONFIG_FEATURE_FIND_TYPE=y
-CONFIG_FEATURE_FIND_XDEV=y
-CONFIG_FEATURE_FIND_NEWER=y
-# 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=y
-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_DEBUG_INIT is not set
-CONFIG_FEATURE_USE_INITTAB=y
-# CONFIG_FEATURE_INIT_SCTTY is not set
-# CONFIG_FEATURE_EXTRA_QUIET is not set
-# CONFIG_FEATURE_INIT_COREDUMPS is not set
-CONFIG_FEATURE_INITRD=y
-CONFIG_HALT=y
-# CONFIG_MESG is not set
-
-#
-# 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_LOGIN_SCRIPTS is not set
-# CONFIG_FEATURE_SECURETTY is not set
-CONFIG_PASSWD=y
-# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set
-CONFIG_SU=y
-CONFIG_FEATURE_SU_SYSLOG=y
-CONFIG_FEATURE_SU_CHECKS_SHELLS=y
-CONFIG_SULOGIN=y
-CONFIG_VLOCK=y
-
-#
-# Linux Ext2 FS Progs
-#
-# CONFIG_CHATTR is not set
-CONFIG_FSCK=y
-CONFIG_LSATTR=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
-CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=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
-
-#
-# Linux System Utilities
-#
-CONFIG_DMESG=y
-CONFIG_FEATURE_DMESG_PRETTY=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
-CONFIG_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_LONG_OPTIONS is not set
-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_FEATURE_MDEV_EXEC is not set
-CONFIG_MKSWAP=y
-# CONFIG_FEATURE_MKSWAP_V0 is not set
-CONFIG_MORE=y
-CONFIG_FEATURE_USE_TERMIOS=y
-CONFIG_MOUNT=y
-CONFIG_FEATURE_MOUNT_NFS=y
-# CONFIG_FEATURE_MOUNT_CIFS is not set
-CONFIG_FEATURE_MOUNT_FLAGS=y
-CONFIG_FEATURE_MOUNT_FSTAB=y
-CONFIG_PIVOT_ROOT=y
-CONFIG_RDATE=y
-# CONFIG_READPROFILE is not set
-# CONFIG_SETARCH is not set
-CONFIG_SWAPONOFF=y
-# CONFIG_SWITCH_ROOT is not set
-CONFIG_UMOUNT=y
-CONFIG_FEATURE_UMOUNT_ALL=y
-
-#
-# Common options for mount/umount
-#
-CONFIG_FEATURE_MOUNT_LOOP=y
-# CONFIG_FEATURE_MTAB_SUPPORT is not set
-
-#
-# Miscellaneous Utilities
-#
-# CONFIG_ADJTIMEX is not set
-# CONFIG_BBCONFIG is not set
-CONFIG_CROND=y
-# CONFIG_DEBUG_CROND_OPTION is not set
-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_FEATURE_DEVFS is not set
-# CONFIG_EJECT is not set
-CONFIG_LAST=y
-CONFIG_LESS=y
-CONFIG_FEATURE_LESS_MAXLINES=9999999
-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
-CONFIG_NMETER=y
-# CONFIG_RAIDAUTORUN is not set
-# CONFIG_READAHEAD is not set
-# CONFIG_RUNLEVEL is not set
-# CONFIG_RX is not set
-CONFIG_STRINGS=y
-# CONFIG_SETSID is not set
-# CONFIG_TASKSET is not set
-# CONFIG_FEATURE_TASKSET_FANCY is not set
-CONFIG_TIME=y
-CONFIG_WATCHDOG=y
-
-#
-# Networking Utilities
-#
-# CONFIG_FEATURE_IPV6 is not set
-CONFIG_ARP=y
-CONFIG_ARPING=y
-# CONFIG_DNSD is not set
-CONFIG_ETHER_WAKE=y
-CONFIG_FAKEIDENTD=y
-CONFIG_FTPGET=y
-CONFIG_FTPPUT=y
-# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
-CONFIG_HOSTNAME=y
-# CONFIG_HTTPD is not set
-# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
-# CONFIG_FEATURE_HTTPD_SETUID is not set
-# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
-# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
-# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
-# CONFIG_FEATURE_HTTPD_CGI is not set
-# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR 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 is not set
-CONFIG_FEATURE_IFUPDOWN_IFCONFIG_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_BUILTIN_ECHO=y
-CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y
-CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y
-CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y
-CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y
-# 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_FEATURE_IP_RULE is not set
-# CONFIG_FEATURE_IP_SHORT_FORMS is not set
-# CONFIG_IPADDR is not set
-# CONFIG_IPLINK is not set
-# CONFIG_IPROUTE is not set
-# CONFIG_IPTUNNEL is not set
-# CONFIG_IPRULE is not set
-CONFIG_IPCALC=y
-CONFIG_FEATURE_IPCALC_FANCY=y
-# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
-# CONFIG_NAMEIF is not set
-CONFIG_NC=y
-CONFIG_NC_SERVER=y
-# CONFIG_NC_EXTRA 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_STANDALONE is not set
-CONFIG_TFTP=y
-CONFIG_FEATURE_TFTP_GET=y
-CONFIG_FEATURE_TFTP_PUT=y
-CONFIG_FEATURE_TFTP_BLOCKSIZE=y
-CONFIG_DEBUG_TFTP=y
-CONFIG_TRACEROUTE=y
-CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
-# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
-CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y
-# CONFIG_APP_UDHCPD is not set
-# CONFIG_APP_DHCPRELAY is not set
-# CONFIG_APP_DUMPLEASES is not set
-CONFIG_APP_UDHCPC=y
-CONFIG_FEATURE_UDHCP_SYSLOG=y
-# CONFIG_FEATURE_UDHCP_DEBUG 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
-# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
-CONFIG_ZCIP=y
-
-#
-# Process Utilities
-#
-CONFIG_FREE=y
-CONFIG_FUSER=y
-CONFIG_KILL=y
-CONFIG_KILLALL=y
-CONFIG_KILLALL5=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_BUILTIN_ECHO is not set
-CONFIG_ASH_BUILTIN_TEST=y
-# CONFIG_ASH_CMDCMD 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
-
-#
-# Runit Utilities
-#
-# CONFIG_RUNSV is not set
-# CONFIG_RUNSVDIR is not set
-# CONFIG_SV is not set
-# CONFIG_SVLOGD is not set
-# CONFIG_CHPST is not set
-# CONFIG_SETUIDGID is not set
-# CONFIG_ENVUIDGID is not set
-# CONFIG_ENVDIR is not set
-# CONFIG_SOFTLIMIT is not set
Modified: trunk/package/busybox/busybox-runnix.config
===================================================================
--- trunk/package/busybox/busybox-runnix.config 2007-04-27 20:28:05 UTC (rev 50)
+++ trunk/package/busybox/busybox-runnix.config 2007-04-27 20:59:00 UTC (rev 51)
@@ -311,7 +311,7 @@
# Miscellaneous Utilities
#
# CONFIG_ADJTIMEX is not set
-CONFIG_BBCONFIG=y
+# CONFIG_BBCONFIG is not set
CONFIG_CROND=y
CONFIG_FEATURE_CROND_CALL_SENDMAIL=y
CONFIG_CRONTAB=y
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2007-04-27 20:28:07
|
Revision: 50
http://svn.sourceforge.net/runnix/?rev=50&view=rev
Author: krisk84
Date: 2007-04-27 13:28:05 -0700 (Fri, 27 Apr 2007)
Log Message:
-----------
I'd like to officially welcome runnix to the year 2007
This is the first major update to runnix in almost a
year. Updates include:
- remove kernel-headers hacks
- update to linux kernel 2.6.20
- include squashfs, unionfs for 2.6.20
- update to new astlinux-like device support
- sync packages against astlinux
Modified Paths:
--------------
trunk/Makefile
trunk/package/Config.in
trunk/package/dropbear/dropbear.mk
trunk/target/Config.in
trunk/target/Makefile.in
trunk/toolchain/Config.in
Added Paths:
-----------
trunk/target/device/
trunk/target/device/Config.in
trunk/target/device/Makefile.in
trunk/target/device/geni386/
trunk/target/device/geni386/Config.in
trunk/target/device/geni386/Makefile.in
trunk/target/device/geni386/busybox.config
trunk/target/device/geni386/kernel-patches/
trunk/target/device/geni386/kernel-patches/linux-multi-routes-2.6.20.patch
trunk/target/device/geni386/kernel-patches/linux-squashfs3.2-r2.patch
trunk/target/device/geni386/kernel-patches/linux-unionfs.patch
trunk/target/device/geni386/linux.config
trunk/target/device/geni386/linux.mk
trunk/target/device/geni386/target_skeleton/
trunk/target/device/geni386/target_skeleton-serial/
trunk/target/device/geni386/uClibc.config
Removed Paths:
-------------
trunk/package/linux/
trunk/toolchain/kernel-headers/
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2007-04-27 19:41:46 UTC (rev 49)
+++ trunk/Makefile 2007-04-27 20:28:05 UTC (rev 50)
@@ -111,6 +111,10 @@
if [ -d "$(TARGET_SKEL_DIR)" ] ; then \
cp -a $(TARGET_SKEL_DIR)/* $(TARGET_DIR)/; \
fi;
+ if [ -d "$(TARGET_SKEL2_DIR)" ] ; then \
+ cp -af $(TARGET_SKEL2_DIR)/* $(TARGET_DIR)/; \
+ fi;
+
touch $(STAGING_DIR)/fakeroot.env
-find $(TARGET_DIR) -type d -name CVS | xargs rm -rf
-find $(TARGET_DIR) -type d -name .svn | xargs rm -rf
Modified: trunk/package/Config.in
===================================================================
--- trunk/package/Config.in 2007-04-27 19:41:46 UTC (rev 49)
+++ trunk/package/Config.in 2007-04-27 20:28:05 UTC (rev 50)
@@ -3,7 +3,6 @@
comment "The default minimal system"
source "package/busybox/Config.in"
-source "package/linux/Config.in"
comment "Other stuff"
source "package/acpid/Config.in"
Modified: trunk/package/dropbear/dropbear.mk
===================================================================
--- trunk/package/dropbear/dropbear.mk 2007-04-27 19:41:46 UTC (rev 49)
+++ trunk/package/dropbear/dropbear.mk 2007-04-27 20:28:05 UTC (rev 50)
@@ -70,8 +70,8 @@
ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/dbclient
ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/dropbearkey
ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/dropbearconvert
- cp $(DROPBEAR_DIR)/S50dropbear $(TARGET_DIR)/etc/init.d/
- chmod a+x $(TARGET_DIR)/etc/init.d/S50dropbear
+ # cp $(DROPBEAR_DIR)/S50dropbear $(TARGET_DIR)/etc/init.d/
+ # chmod a+x $(TARGET_DIR)/etc/init.d/S50dropbear
dropbear: uclibc zlib $(TARGET_DIR)/$(DROPBEAR_TARGET_BINARY)
Modified: trunk/target/Config.in
===================================================================
--- trunk/target/Config.in 2007-04-27 19:41:46 UTC (rev 49)
+++ trunk/target/Config.in 2007-04-27 20:28:05 UTC (rev 50)
@@ -17,4 +17,4 @@
endmenu
-# source "target/device/Config.in"
+source "target/device/Config.in"
Modified: trunk/target/Makefile.in
===================================================================
--- trunk/target/Makefile.in 2007-04-27 19:41:46 UTC (rev 49)
+++ trunk/target/Makefile.in 2007-04-27 20:28:05 UTC (rev 50)
@@ -1,5 +1,5 @@
include target/generic/Makefile.in
-# include target/device/Makefile.in
+include target/device/Makefile.in
include target/x86/Makefile.in
include target/arm/Makefile.in
include target/powerpc/Makefile.in
Added: trunk/target/device/Config.in
===================================================================
--- trunk/target/device/Config.in (rev 0)
+++ trunk/target/device/Config.in 2007-04-27 20:28:05 UTC (rev 50)
@@ -0,0 +1,15 @@
+menu "Runnix Target Device"
+choice
+ prompt "Runnix Target Device"
+ default BR2_TARGET_GENI386
+ help
+ If you have a specific device, check it here
+
+config BR2_TARGET_GENI386
+ bool "Generic i386"
+ depends BR2_i386
+ select BR2_PACKAGE_LINUX
+
+endchoice
+source target/device/geni386/Config.in
+endmenu
Added: trunk/target/device/Makefile.in
===================================================================
--- trunk/target/device/Makefile.in (rev 0)
+++ trunk/target/device/Makefile.in 2007-04-27 20:28:05 UTC (rev 50)
@@ -0,0 +1 @@
+-include target/device/*/Makefile.in
Added: trunk/target/device/geni386/Config.in
===================================================================
--- trunk/target/device/geni386/Config.in (rev 0)
+++ trunk/target/device/geni386/Config.in 2007-04-27 20:28:05 UTC (rev 50)
@@ -0,0 +1,13 @@
+config BR2_TARGET_GENI386_SERIAL
+ bool "i386 Serial Console"
+ depends BR2_TARGET_GENI386
+ default n
+ help
+ Serial console with your i386 - 19200 8n1
+
+config BR2_PACKAGE_LINUX
+ bool "linux"
+ depends on BR2_TARGET_GENI386
+ default n
+ help
+ The Linux kernel.
Added: trunk/target/device/geni386/Makefile.in
===================================================================
--- trunk/target/device/geni386/Makefile.in (rev 0)
+++ trunk/target/device/geni386/Makefile.in 2007-04-27 20:28:05 UTC (rev 50)
@@ -0,0 +1,20 @@
+# Override the default linux configuration
+GENI386_PATH=target/device/geni386
+
+ifeq ($(strip $(BR2_TARGET_GENI386)),y)
+DEV_PATH=$(GENI386_PATH)
+BR2_PACKAGE_LINUX_CONFIG=$(GENI386_PATH)/linux.config
+UCLIBC_CONFIG_FILE=$(GENI386_PATH)/uClibc.config
+TARGET_SKEL2_DIR=$(GENI386_PATH)/target_skeleton
+BR2_PACKAGE_BUSYBOX_CONFIG:=$(GENI386_PATH)/busybox.config
+
+ifeq ($(strip $(BR2_TARGET_GENI386_SERIAL)),y)
+TARGET_SKEL2_DIR=$(GENI386_PATH)/target_skeleton-serial
+endif
+
+ifeq ($(strip $(BR2_PACKAGE_LINUX)),y)
+TARGETS+=linux
+include $(GENI386_PATH)/linux.mk
+endif
+
+endif
Added: trunk/target/device/geni386/busybox.config
===================================================================
--- trunk/target/device/geni386/busybox.config (rev 0)
+++ trunk/target/device/geni386/busybox.config 2007-04-27 20:28:05 UTC (rev 50)
@@ -0,0 +1,593 @@
+#
+# 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
Added: trunk/target/device/geni386/kernel-patches/linux-multi-routes-2.6.20.patch
===================================================================
--- trunk/target/device/geni386/kernel-patches/linux-multi-routes-2.6.20.patch (rev 0)
+++ trunk/target/device/geni386/kernel-patches/linux-multi-routes-2.6.20.patch 2007-04-27 20:28:05 UTC (rev 50)
@@ -0,0 +1,2604 @@
+diff -urN linux-2.6.20.orig/Documentation/filesystems/proc.txt linux-2.6.20/Documentation/filesystems/proc.txt
+--- linux-2.6.20.orig/Documentation/filesystems/proc.txt 2007-02-04 13:44:54.000000000 -0500
++++ linux-2.6.20/Documentation/filesystems/proc.txt 2007-02-14 11:11:28.000000000 -0500
+@@ -1682,6 +1682,15 @@
+
+ Log packets with source addresses with no known route to kernel log.
+
++loop
++----
++
++By default (loop=0) the traffic between local IP addresses
++is routed via interface "lo". Setting this flag for two
++interfaces allows traffic between their IP addresses to
++be looped externally. This is useful for setups where the
++interfaces are attached to same broadcast medium.
++
+ mc_forwarding
+ -------------
+
+@@ -1705,6 +1714,28 @@
+ (external addresses can still be spoofed), without the need for additional
+ firewall rules.
+
++forward_shared
++--------------
++
++Integer value determines if a source validation should allow forwarding of
++packets with local source address. 1 means yes, 0 means no. By default the
++flag is disabled and such packets are not forwarded.
++
++If you enable this flag on internal network, the router will forward packets
++from internal hosts with shared IP addresses no matter how the rp_filter is
++set. This flag is activated only if it is enabled both in specific device
++section and in "all" section.
++
++rp_filter_mask
++--------------
++
++Integer value representing bitmask of the mediums for which the reverse path
++protection is disabled. If the source validation results in reverse path to
++interface with medium_id value in the 1..31 range the access is allowed if the
++corresponding bit is set in the bitmask. The bitmask value is considered only
++when rp_filter is enabled. By default the bitmask is empty preserving the
++original rp_filter semantic.
++
+ secure_redirects
+ ----------------
+
+@@ -1722,6 +1753,16 @@
+
+ Determines whether to send ICMP redirects to other hosts.
+
++hidden
++------
++
++Hide addresses attached to this device from other devices. Such addresses
++will never be selected by source address autoselection mechanism, host does
++not answer broadcast ARP requests for them, does not announce them as source
++address of ARP requests, but they are still reachable via IP. This flag is
++activated only if it is enabled both in specific device section and in "all"
++section.
++
+ Routing settings
+ ----------------
+
+diff -urN linux-2.6.20.orig/Documentation/networking/ip-sysctl.txt linux-2.6.20/Documentation/networking/ip-sysctl.txt
+--- linux-2.6.20.orig/Documentation/networking/ip-sysctl.txt 2007-02-04 13:44:54.000000000 -0500
++++ linux-2.6.20/Documentation/networking/ip-sysctl.txt 2007-02-14 11:11:28.000000000 -0500
+@@ -541,6 +541,24 @@
+ forwarding - BOOLEAN
+ Enable IP forwarding on this interface.
+
++forward_shared - BOOLEAN
++ Integer value determines if a source validation should allow
++ forwarding of packets with local source address. 1 means yes,
++ 0 means no. By default the flag is disabled and such packets
++ are not forwarded.
++
++ If you enable this flag on internal network, the router will forward
++ packets from internal hosts with shared IP addresses no matter how
++ the rp_filter is set. This flag is activated only if it is
++ enabled both in specific device section and in "all" section.
++
++loop - BOOLEAN
++ By default (loop=0) the traffic between local IP addresses
++ is routed via interface "lo". Setting this flag for two
++ interfaces allows traffic between their IP addresses to
++ be looped externally. This is useful for setups where the
++ interfaces are attached to same broadcast medium.
++
+ mc_forwarding - BOOLEAN
+ Do multicast routing. The kernel needs to be compiled with CONFIG_MROUTE
+ and a multicast routing daemon is required.
+@@ -704,6 +722,24 @@
+
+
+
++hidden - BOOLEAN
++ Hide addresses attached to this device from other devices.
++ Such addresses will never be selected by source address autoselection
++ mechanism, host does not answer broadcast ARP requests for them,
++ does not announce them as source address of ARP requests, but they
++ are still reachable via IP. This flag is activated only if it is
++ enabled both in specific device section and in "all" section.
++
++rp_filter_mask - INTEGER
++
++ Integer value representing bitmask of the mediums for which the
++ reverse path protection is disabled. If the source validation
++ results in reverse path to interface with medium_id value in
++ the 1..31 range the access is allowed if the corresponding bit
++ is set in the bitmask. The bitmask value is considered only when
++ rp_filter is enabled. By default the bitmask is empty preserving
++ the original rp_filter semantic.
++
+ tag - INTEGER
+ Allows you to write a number, which can be used as required.
+ Default value is 0.
+diff -urN linux-2.6.20.orig/include/linux/inetdevice.h linux-2.6.20/include/linux/inetdevice.h
+--- linux-2.6.20.orig/include/linux/inetdevice.h 2007-02-04 13:44:54.000000000 -0500
++++ linux-2.6.20/include/linux/inetdevice.h 2007-02-14 11:11:28.000000000 -0500
+@@ -31,6 +31,10 @@
+ int no_policy;
+ int force_igmp_version;
+ int promote_secondaries;
++ int hidden;
++ int rp_filter_mask;
++ int forward_shared;
++ int loop;
+ void *sysctl;
+ };
+
+@@ -68,11 +72,13 @@
+
+ #define IN_DEV_LOG_MARTIANS(in_dev) (ipv4_devconf.log_martians || (in_dev)->cnf.log_martians)
+ #define IN_DEV_PROXY_ARP(in_dev) (ipv4_devconf.proxy_arp || (in_dev)->cnf.proxy_arp)
++#define IN_DEV_HIDDEN(in_dev) ((in_dev)->cnf.hidden && ipv4_devconf.hidden)
+ #define IN_DEV_SHARED_MEDIA(in_dev) (ipv4_devconf.shared_media || (in_dev)->cnf.shared_media)
+ #define IN_DEV_TX_REDIRECTS(in_dev) (ipv4_devconf.send_redirects || (in_dev)->cnf.send_redirects)
+ #define IN_DEV_SEC_REDIRECTS(in_dev) (ipv4_devconf.secure_redirects || (in_dev)->cnf.secure_redirects)
+ #define IN_DEV_IDTAG(in_dev) ((in_dev)->cnf.tag)
+ #define IN_DEV_MEDIUM_ID(in_dev) ((in_dev)->cnf.medium_id)
++#define IN_DEV_RPFILTER_MASK(in_dev) ((in_dev)->cnf.rp_filter_mask)
+ #define IN_DEV_PROMOTE_SECONDARIES(in_dev) (ipv4_devconf.promote_secondaries || (in_dev)->cnf.promote_secondaries)
+
+ #define IN_DEV_RX_REDIRECTS(in_dev) \
+@@ -82,6 +88,8 @@
+ (ipv4_devconf.accept_redirects || (in_dev)->cnf.accept_redirects)))
+
+ #define IN_DEV_ARPFILTER(in_dev) (ipv4_devconf.arp_filter || (in_dev)->cnf.arp_filter)
++#define IN_DEV_LOOP(in_dev) ((in_dev)->cnf.loop)
++#define IN_DEV_FORWARD_SHARED(in_dev) ((in_dev)->cnf.forward_shared && ipv4_devconf.forward_shared)
+ #define IN_DEV_ARP_ANNOUNCE(in_dev) (max(ipv4_devconf.arp_announce, (in_dev)->cnf.arp_announce))
+ #define IN_DEV_ARP_IGNORE(in_dev) (max(ipv4_devconf.arp_ignore, (in_dev)->cnf.arp_ignore))
+
+diff -urN linux-2.6.20.orig/include/linux/netfilter_ipv4/ip_nat.h linux-2.6.20/include/linux/netfilter_ipv4/ip_nat.h
+--- linux-2.6.20.orig/include/linux/netfilter_ipv4/ip_nat.h 2007-02-04 13:44:54.000000000 -0500
++++ linux-2.6.20/include/linux/netfilter_ipv4/ip_nat.h 2007-02-14 11:11:28.000000000 -0500
+@@ -63,6 +63,13 @@
+
+ struct ip_conntrack;
+
++/* Call input routing for SNAT-ed traffic */
++extern unsigned int ip_nat_route_input(unsigned int hooknum,
++ struct sk_buff **pskb,
++ const struct net_device *in,
++ const struct net_device *out,
++ int (*okfn)(struct sk_buff *));
++
+ /* Set up the info structure to map into this range. */
+ extern unsigned int ip_nat_setup_info(struct ip_conntrack *conntrack,
+ const struct ip_nat_range *range,
+diff -urN linux-2.6.20.orig/include/linux/rtnetlink.h linux-2.6.20/include/linux/rtnetlink.h
+--- linux-2.6.20.orig/include/linux/rtnetlink.h 2007-02-04 13:44:54.000000000 -0500
++++ linux-2.6.20/include/linux/rtnetlink.h 2007-02-14 11:11:28.000000000 -0500
+@@ -97,6 +97,13 @@
+ RTM_SETNEIGHTBL,
+ #define RTM_SETNEIGHTBL RTM_SETNEIGHTBL
+
++ RTM_NEWARPRULE = 68,
++#define RTM_NEWARPRULE RTM_NEWARPRULE
++ RTM_DELARPRULE,
++#define RTM_DELARPRULE RTM_DELARPRULE
++ RTM_GETARPRULE,
++#define RTM_GETARPRULE RTM_GETARPRULE
++
+ __RTM_MAX,
+ #define RTM_MAX (((__RTM_MAX + 3) & ~3) - 1)
+ };
+@@ -293,6 +300,8 @@
+ #define RTNH_F_DEAD 1 /* Nexthop is dead (used by multipath) */
+ #define RTNH_F_PERVASIVE 2 /* Do recursive gateway lookup */
+ #define RTNH_F_ONLINK 4 /* Gateway is forced on link */
++#define RTNH_F_SUSPECT 8 /* We don't know the real state */
++#define RTNH_F_BADSTATE (RTNH_F_DEAD | RTNH_F_SUSPECT)
+
+ /* Macros to handle hexthops */
+
+@@ -477,6 +486,54 @@
+ #define TCA_RTA(r) ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct tcmsg))))
+ #define TCA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct tcmsg))
+
++/******************************************************************************
++ * Definitions used in ARP tables administration
++ ****/
++
++#define ARPA_TABLE_INPUT 0
++#define ARPA_TABLE_OUTPUT 1
++#define ARPA_TABLE_FORWARD 2
++#define ARPA_TABLE_ALL -1
++
++#define ARPM_F_PREFSRC 0x0001
++#define ARPM_F_WILDIIF 0x0002
++#define ARPM_F_WILDOIF 0x0004
++#define ARPM_F_BROADCAST 0x0008
++#define ARPM_F_UNICAST 0x0010
++
++struct arpmsg
++{
++ unsigned char arpm_family;
++ unsigned char arpm_table;
++ unsigned char arpm_action;
++ unsigned char arpm_from_len;
++ unsigned char arpm_to_len;
++ unsigned char arpm__pad1;
++ unsigned short arpm__pad2;
++ unsigned arpm_pref;
++ unsigned arpm_flags;
++};
++
++enum
++{
++ ARPA_UNSPEC,
++ ARPA_FROM, /* FROM IP prefix */
++ ARPA_TO, /* TO IP prefix */
++ ARPA_LLFROM, /* FROM LL prefix */
++ ARPA_LLTO, /* TO LL prefix */
++ ARPA_LLSRC, /* New SRC lladdr */
++ ARPA_LLDST, /* New DST lladdr */
++ ARPA_IIF, /* In interface prefix */
++ ARPA_OIF, /* Out interface prefix */
++ ARPA_SRC, /* New IP SRC */
++ ARPA_DST, /* New IP DST, not used */
++ ARPA_PACKETS, /* Packets */
++};
++
++#define ARPA_MAX ARPA_PACKETS
++
++#define ARPA_RTA(r) ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct arpmsg))))
++
+ #ifndef __KERNEL__
+ /* RTnetlink multicast groups - backwards compatibility for userspace */
+ #define RTMGRP_LINK 1
+@@ -497,6 +554,8 @@
+ #define RTMGRP_DECnet_IFADDR 0x1000
+ #define RTMGRP_DECnet_ROUTE 0x4000
+
++#define RTMGRP_ARP 0x00010000
++
+ #define RTMGRP_IPV6_PREFIX 0x20000
+ #endif
+
+@@ -540,6 +599,8 @@
+ #define RTNLGRP_IPV6_PREFIX RTNLGRP_IPV6_PREFIX
+ RTNLGRP_IPV6_RULE,
+ #define RTNLGRP_IPV6_RULE RTNLGRP_IPV6_RULE
++ RTNLGRP_ARP,
++#define RTNLGRP_ARP RTNLGRP_ARP
+ __RTNLGRP_MAX
+ };
+ #define RTNLGRP_MAX (__RTNLGRP_MAX - 1)
+diff -urN linux-2.6.20.orig/include/linux/sysctl.h linux-2.6.20/include/linux/sysctl.h
+--- linux-2.6.20.orig/include/linux/sysctl.h 2007-02-04 13:44:54.000000000 -0500
++++ linux-2.6.20/include/linux/sysctl.h 2007-02-14 11:11:28.000000000 -0500
+@@ -483,6 +483,10 @@
+ NET_IPV4_CONF_ARP_IGNORE=19,
+ NET_IPV4_CONF_PROMOTE_SECONDARIES=20,
+ NET_IPV4_CONF_ARP_ACCEPT=21,
++ NET_IPV4_CONF_HIDDEN=22,
++ NET_IPV4_CONF_FORWARD_SHARED=23,
++ NET_IPV4_CONF_RP_FILTER_MASK=24,
++ NET_IPV4_CONF_LOOP=25,
+ __NET_IPV4_CONF_MAX
+ };
+
+diff -urN linux-2.6.20.orig/include/net/flow.h linux-2.6.20/include/net/flow.h
+--- linux-2.6.20.orig/include/net/flow.h 2007-02-04 13:44:54.000000000 -0500
++++ linux-2.6.20/include/net/flow.h 2007-02-14 11:11:28.000000000 -0500
+@@ -19,6 +19,8 @@
+ struct {
+ __be32 daddr;
+ __be32 saddr;
++ __be32 lsrc;
++ __be32 gw;
+ __u8 tos;
+ __u8 scope;
+ } ip4_u;
+@@ -43,6 +45,8 @@
+ #define fl6_flowlabel nl_u.ip6_u.flowlabel
+ #define fl4_dst nl_u.ip4_u.daddr
+ #define fl4_src nl_u.ip4_u.saddr
++#define fl4_lsrc nl_u.ip4_u.lsrc
++#define fl4_gw nl_u.ip4_u.gw
+ #define fl4_tos nl_u.ip4_u.tos
+ #define fl4_scope nl_u.ip4_u.scope
+
+diff -urN linux-2.6.20.orig/include/net/ip_fib.h linux-2.6.20/include/net/ip_fib.h
+--- linux-2.6.20.orig/include/net/ip_fib.h 2007-02-04 13:44:54.000000000 -0500
++++ linux-2.6.20/include/net/ip_fib.h 2007-02-14 11:11:28.000000000 -0500
+@@ -196,7 +196,8 @@
+
+ static inline void fib_select_default(const struct flowi *flp, struct fib_result *res)
+ {
+- if (FIB_RES_GW(*res) && FIB_RES_NH(*res).nh_scope == RT_SCOPE_LINK)
++ if ((FIB_RES_GW(*res) && FIB_RES_NH(*res).nh_scope == RT_SCOPE_LINK) ||
++ FIB_RES_NH(*res).nh_scope == RT_SCOPE_HOST)
+ ip_fib_main_table->tb_select_default(ip_fib_main_table, flp, res);
+ }
+
+@@ -209,6 +210,7 @@
+ extern struct fib_table *fib_new_table(u32 id);
+ extern struct fib_table *fib_get_table(u32 id);
+ extern void fib_select_default(const struct flowi *flp, struct fib_result *res);
++extern int fib_result_table(struct fib_result *res);
+
+ #endif /* CONFIG_IP_MULTIPLE_TABLES */
+
+@@ -220,7 +222,7 @@
+ extern int inet_rtm_getroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg);
+ extern int inet_dump_fib(struct sk_buff *skb, struct netlink_callback *cb);
+ extern int fib_validate_source(__be32 src, __be32 dst, u8 tos, int oif,
+- struct net_device *dev, __be32 *spec_dst, u32 *itag);
++ struct net_device *dev, __be32 *spec_dst, u32 *itag, int our);
+ extern void fib_select_multipath(const struct flowi *flp, struct fib_result *res);
+
+ struct rtentry;
+@@ -284,4 +286,6 @@
+ extern void fib_proc_exit(void);
+ #endif
+
++extern rwlock_t fib_nhflags_lock;
++
+ #endif /* _NET_FIB_H */
+diff -urN linux-2.6.20.orig/include/net/netfilter/nf_nat.h linux-2.6.20/include/net/netfilter/nf_nat.h
+--- linux-2.6.20.orig/include/net/netfilter/nf_nat.h 2007-02-04 13:44:54.000000000 -0500
++++ linux-2.6.20/include/net/netfilter/nf_nat.h 2007-02-14 11:11:28.000000000 -0500
+@@ -60,6 +60,13 @@
+
+ struct nf_conn;
+
++/* Call input routing for SNAT-ed traffic */
++extern unsigned int ip_nat_route_input(unsigned int hooknum,
++ struct sk_buff **pskb,
++ const struct net_device *in,
++ const struct net_device *out,
++ int (*okfn)(struct sk_buff *));
++
+ /* Set up the info structure to map into this range. */
+ extern unsigned int nf_nat_setup_info(struct nf_conn *ct,
+ const struct nf_nat_range *range,
+diff -urN linux-2.6.20.orig/include/net/route.h linux-2.6.20/include/net/route.h
+--- linux-2.6.20.orig/include/net/route.h 2007-02-04 13:44:54.000000000 -0500
++++ linux-2.6.20/include/net/route.h 2007-02-14 11:11:28.000000000 -0500
+@@ -117,6 +117,7 @@
+ extern int ip_route_output_key(struct rtable **, struct flowi *flp);
+ extern int ip_route_output_flow(struct rtable **rp, struct flowi *flp, struct sock *sk, int flags);
+ extern int ip_route_input(struct sk_buff*, __be32 dst, __be32 src, u8 tos, struct net_device *devin);
++extern int ip_route_input_lookup(struct sk_buff*, __be32 dst, __be32 src, u8 tos, struct net_device *devin, __be32 lsrc);
+ extern unsigned short ip_rt_frag_needed(struct iphdr *iph, unsigned short new_mtu);
+ extern void ip_rt_send_redirect(struct sk_buff *skb);
+
+diff -urN linux-2.6.20.orig/net/core/rtnetlink.c linux-2.6.20/net/core/rtnetlink.c
+--- linux-2.6.20.orig/net/core/rtnetlink.c 2007-02-04 13:44:54.000000000 -0500
++++ linux-2.6.20/net/core/rtnetlink.c 2007-02-14 11:11:28.000000000 -0500
+@@ -110,6 +110,7 @@
+ [RTM_FAM(RTM_NEWACTION)] = NLMSG_LENGTH(sizeof(struct tcamsg)),
+ [RTM_FAM(RTM_GETMULTICAST)] = NLMSG_LENGTH(sizeof(struct rtgenmsg)),
+ [RTM_FAM(RTM_GETANYCAST)] = NLMSG_LENGTH(sizeof(struct rtgenmsg)),
++ [RTM_FAM(RTM_GETARPRULE)] = NLMSG_LENGTH(sizeof(struct arpmsg)),
+ };
+
+ static const int rta_max[RTM_NR_FAMILIES] =
+@@ -122,6 +123,7 @@
+ [RTM_FAM(RTM_NEWTCLASS)] = TCA_MAX,
+ [RTM_FAM(RTM_NEWTFILTER)] = TCA_MAX,
+ [RTM_FAM(RTM_NEWACTION)] = TCAA_MAX,
++ [RTM_FAM(RTM_GETARPRULE)] = ARPA_MAX,
+ };
+
+ void __rta_fill(struct sk_buff *skb, int attrtype, int attrlen, const void *data)
+diff -urN linux-2.6.20.orig/net/ipv4/arp.c linux-2.6.20/net/ipv4/arp.c
+--- linux-2.6.20.orig/net/ipv4/arp.c 2007-02-04 13:44:54.000000000 -0500
++++ linux-2.6.20/net/ipv4/arp.c 2007-02-14 11:11:28.000000000 -0500
+@@ -72,6 +72,9 @@
+ * bonding can change the skb before
+ * sending (e.g. insert 8021q tag).
+ * Harald Welte : convert to make use of jenkins hash
++ * Julian Anastasov: "hidden" flag: hide the
++ * interface and don't reply for it
++ * Julian Anastasov: ARP filtering via netlink
+ */
+
+ #include <linux/module.h>
+@@ -96,6 +99,7 @@
+ #include <linux/proc_fs.h>
+ #include <linux/seq_file.h>
+ #include <linux/stat.h>
++#include <net/netlink.h>
+ #include <linux/init.h>
+ #include <linux/net.h>
+ #include <linux/rcupdate.h>
+@@ -203,6 +207,47 @@
+ .gc_thresh3 = 1024,
+ };
+
++struct arpf_node {
++ struct arpf_node * at_next;
++ u32 at_pref;
++ u32 at_from;
++ u32 at_from_mask;
++ u32 at_to;
++ u32 at_to_mask;
++ u32 at_src;
++ atomic_t at_packets;
++ atomic_t at_refcnt;
++ unsigned at_flags;
++ unsigned char at_from_len;
++ unsigned char at_to_len;
++ unsigned char at_action;
++ char at_dead;
++ unsigned char at_llfrom_len;
++ unsigned char at_llto_len;
++ unsigned char at_llsrc_len;
++ unsigned char at_lldst_len;
++ unsigned char at_iif_len;
++ unsigned char at_oif_len;
++ unsigned short at__pad1;
++ unsigned char at_llfrom[MAX_ADDR_LEN];
++ unsigned char at_llto[MAX_ADDR_LEN];
++ unsigned char at_llsrc[MAX_ADDR_LEN];
++ unsigned char at_lldst[MAX_ADDR_LEN];
++ char at_iif[IFNAMSIZ];
++ char at_oif[IFNAMSIZ];
++};
++
++static struct arpf_node *arp_tabs[3];
++
++static struct kmem_cache *arpf_cachep;
++
++static rwlock_t arpf_lock = RW_LOCK_UNLOCKED;
++
++static void
++arpf_send(int table, struct sk_buff *skb, u32 sip, u32 tip,
++ unsigned char *from_hw, unsigned char *to_hw,
++ struct net_device *idev, struct net_device *odev);
++
+ int arp_mc_map(__be32 addr, u8 *haddr, struct net_device *dev, int dir)
+ {
+ switch (dev->type) {
+@@ -336,21 +381,35 @@
+ __be32 target = *(__be32*)neigh->primary_key;
+ int probes = atomic_read(&neigh->probes);
+ struct in_device *in_dev = in_dev_get(dev);
++ struct in_device *in_dev2 = NULL;
++ struct net_device *dev2 = NULL;
++ int mode;
++ unsigned char tha[MAX_ADDR_LEN];
+
+ if (!in_dev)
+ return;
+
+- switch (IN_DEV_ARP_ANNOUNCE(in_dev)) {
++ mode = IN_DEV_ARP_ANNOUNCE(in_dev);
++ if (mode != 2 && skb && (dev2 = ip_dev_find(skb->nh.iph->saddr)) != NULL &&
++ (saddr = skb->nh.iph->saddr, in_dev2 = in_dev_get(dev2)) != NULL &&
++ IN_DEV_HIDDEN(in_dev2)) {
++ saddr = 0;
++ goto get;
++ }
++
++ switch (mode) {
+ default:
+ case 0: /* By default announce any local IP */
++ if (saddr)
++ break;
+ if (skb && inet_addr_type(skb->nh.iph->saddr) == RTN_LOCAL)
+ saddr = skb->nh.iph->saddr;
+ break;
+ case 1: /* Restrict announcements of saddr in same subnet */
+ if (!skb)
+ break;
+- saddr = skb->nh.iph->saddr;
+- if (inet_addr_type(saddr) == RTN_LOCAL) {
++ if (saddr || (saddr = skb->nh.iph->saddr,
++ inet_addr_type(saddr) == RTN_LOCAL)) {
+ /* saddr should be known to target */
+ if (inet_addr_onlink(in_dev, target, saddr))
+ break;
+@@ -361,6 +420,12 @@
+ break;
+ }
+
++get:
++ if (dev2) {
++ if (in_dev2)
++ in_dev_put(in_dev2);
++ dev_put(dev2);
++ }
+ if (in_dev)
+ in_dev_put(in_dev);
+ if (!saddr)
+@@ -369,8 +434,10 @@
+ if ((probes -= neigh->parms->ucast_probes) < 0) {
+ if (!(neigh->nud_state&NUD_VALID))
+ printk(KERN_DEBUG "trying to ucast probe in NUD_INVALID\n");
+- dst_ha = neigh->ha;
++ dst_ha = tha;
+ read_lock_bh(&neigh->lock);
++ memcpy(dst_ha, neigh->ha, dev->addr_len);
++ read_unlock_bh(&neigh->lock);
+ } else if ((probes -= neigh->parms->app_probes) < 0) {
+ #ifdef CONFIG_ARPD
+ neigh_app_ns(neigh);
+@@ -378,10 +445,7 @@
+ return;
+ }
+
+- arp_send(ARPOP_REQUEST, ETH_P_ARP, target, dev, saddr,
+- dst_ha, dev->dev_addr, NULL);
+- if (dst_ha)
+- read_unlock_bh(&neigh->lock);
++ arpf_send(ARPA_TABLE_OUTPUT,skb,saddr,target,NULL,dst_ha,NULL,dev);
+ }
+
+ static int arp_ignore(struct in_device *in_dev, struct net_device *dev,
+@@ -438,6 +502,26 @@
+ return flag;
+ }
+
++static int arp_hidden(u32 tip, struct net_device *dev)
++{
++ struct net_device *dev2 = NULL;
++ struct in_device *in_dev2 = NULL;
++ int ret = 0;
++
++ if (!ipv4_devconf.hidden)
++ return 0;
++
++ if ((dev2 = ip_dev_find(tip)) && dev2 != dev &&
++ (in_dev2 = in_dev_get(dev2)) && IN_DEV_HIDDEN(in_dev2))
++ ret = 1;
++ if (dev2) {
++ if (in_dev2)
++ in_dev_put(in_dev2);
++ dev_put(dev2);
++ }
++ return ret;
++}
++
+ /* OBSOLETE FUNCTIONS */
+
+ /*
+@@ -826,8 +910,9 @@
+ if (sip == 0) {
+ if (arp->ar_op == htons(ARPOP_REQUEST) &&
+ inet_addr_type(tip) == RTN_LOCAL &&
++ !arp_hidden(tip, dev) &&
+ !arp_ignore(in_dev,dev,sip,tip))
+- arp_send(ARPOP_REPLY,ETH_P_ARP,tip,dev,tip,sha,dev->dev_addr,dev->dev_addr);
++ arpf_send(ARPA_TABLE_INPUT,skb,sip,tip,sha,tha,dev,NULL);
+ goto out;
+ }
+
+@@ -846,8 +931,11 @@
+ dont_send |= arp_ignore(in_dev,dev,sip,tip);
+ if (!dont_send && IN_DEV_ARPFILTER(in_dev))
+ dont_send |= arp_filter(sip,tip,dev);
++ if (!dont_send && skb->pkt_type != PACKET_HOST)
++ dont_send |= arp_hidden(tip,dev);
+ if (!dont_send)
+- arp_send(ARPOP_REPLY,ETH_P_ARP,sip,dev,tip,sha,dev->dev_addr,sha);
++ arpf_send(ARPA_TABLE_INPUT,skb,
++ sip,tip,sha,tha,dev,NULL);
+
+ neigh_release(n);
+ }
+@@ -863,7 +951,9 @@
+ if (NEIGH_CB(skb)->flags & LOCALLY_ENQUEUED ||
+ skb->pkt_type == PACKET_HOST ||
+ in_dev->arp_parms->proxy_delay == 0) {
+- arp_send(ARPOP_REPLY,ETH_P_ARP,sip,dev,tip,sha,dev->dev_addr,sha);
++ arpf_send(ARPA_TABLE_FORWARD,skb,
++ sip,tip,sha,tha,dev,
++ rt->u.dst.dev);
+ } else {
+ pneigh_enqueue(&arp_tbl, in_dev->arp_parms, skb);
+ in_dev_put(in_dev);
+@@ -1227,6 +1317,559 @@
+ }
+
+
++static void arpf_destroy(struct arpf_node *afp)
++{
++ if (!afp->at_dead) {
++ printk(KERN_ERR "Destroying alive arp table node %p from %08lx\n", afp,
++ *(((unsigned long*)&afp)-1));
++ return;
++ }
++ kmem_cache_free(arpf_cachep, afp);
++}
++
++static inline void arpf_put(struct arpf_node *afp)
++{
++ if (atomic_dec_and_test(&afp->at_refcnt))
++ arpf_destroy(afp);
++}
++
++static inline struct arpf_node *
++arpf_lookup(int table, struct sk_buff *skb, u32 sip, u32 tip,
++ unsigned char *from_hw, unsigned char *to_hw,
++ struct net_device *idev, struct net_device *odev)
++{
++ int sz_iif = idev? strlen(idev->name) : 0;
++ int sz_oif = odev? strlen(odev->name) : 0;
++ int alen;
++ struct arpf_node *afp;
++
++ if (ARPA_TABLE_OUTPUT != table) {
++ alen = idev->addr_len;
++ } else {
++ if (!from_hw) from_hw = odev->dev_addr;
++ if (!to_hw) to_hw = odev->broadcast;
++ alen = odev->addr_len;
++ }
++
++ read_lock(&arpf_lock);
++ for (afp = arp_tabs[table]; afp; afp = afp->at_next) {
++ if ((tip ^ afp->at_to) & afp->at_to_mask)
++ continue;
++ if ((sip ^ afp->at_from) & afp->at_from_mask)
++ continue;
++ if (afp->at_llfrom_len &&
++ (afp->at_llfrom_len > alen ||
++ memcmp(from_hw, afp->at_llfrom, afp->at_llfrom_len)))
++ continue;
++ if (afp->at_llto_len &&
++ (afp->at_llto_len > alen ||
++ memcmp(to_hw, afp->at_llto, afp->at_llto_len)))
++ continue;
++ if (afp->at_iif_len &&
++ (afp->at_iif_len > sz_iif ||
++ memcmp(afp->at_iif, idev->name, afp->at_iif_len) ||
++ (sz_iif != afp->at_iif_len &&
++ !(afp->at_flags & ARPM_F_WILDIIF))))
++ continue;
++ if (afp->at_oif_len &&
++ (afp->at_oif_len > sz_oif ||
++ memcmp(afp->at_oif, odev->name, afp->at_oif_len) ||
++ (sz_oif != afp->at_oif_len &&
++ !(afp->at_flags & ARPM_F_WILDOIF))))
++ continue;
++ if (afp->at_flags & ARPM_F_BROADCAST &&
++ skb->pkt_type == PACKET_HOST)
++ continue;
++ if (afp->at_flags & ARPM_F_UNICAST &&
++ skb->pkt_type != PACKET_HOST)
++ continue;
++ if (afp->at_llsrc_len && afp->at_llsrc_len != alen)
++ continue;
++ if (afp->at_lldst_len && afp->at_lldst_len != alen)
++ continue;
++ atomic_inc(&afp->at_packets);
++ break;
++ }
++ read_unlock(&arpf_lock);
++ return afp;
++}
++
++static void
++arpf_send(int table, struct sk_buff *skb, u32 sip, u32 tip,
++ unsigned char *from_hw, unsigned char *to_hw,
++ struct net_device *idev, struct net_device *odev)
++{
++ struct arpf_node *afp = NULL;
++
++ if (!arp_tabs[table] ||
++ !(afp = arpf_lookup(table, skb, sip, tip,
++ from_hw, to_hw, idev, odev))) {
++ switch (table) {
++ case ARPA_TABLE_INPUT:
++ if (!sip) {
++ arp_send(ARPOP_REPLY, ETH_P_ARP, tip, idev, tip,
++ from_hw, idev->dev_addr,
++ idev->dev_addr);
++ break;
++ }
++ /* continue */
++ case ARPA_TABLE_FORWARD:
++ arp_send(ARPOP_REPLY, ETH_P_ARP, sip, idev, tip,
++ from_hw, idev->dev_addr, from_hw);
++ break;
++ case ARPA_TABLE_OUTPUT:
++ arp_send(ARPOP_REQUEST, ETH_P_ARP, tip, odev, sip,
++ to_hw, odev->dev_addr, NULL);
++ break;
++ }
++ return;
++ }
++
++ /* deny? */
++ if (!afp->at_action) goto out;
++
++ switch (table) {
++ case ARPA_TABLE_INPUT:
++ if (!sip) {
++ arp_send(ARPOP_REPLY, ETH_P_ARP, tip, idev, tip,
++ from_hw,
++ afp->at_llsrc_len?afp->at_llsrc:idev->dev_addr,
++ afp->at_llsrc_len?afp->at_llsrc:idev->dev_addr);
++ break;
++ }
++ /* continue */
++ case ARPA_TABLE_FORWARD:
++ arp_send(ARPOP_REPLY, ETH_P_ARP, sip, idev, tip,
++ afp->at_lldst_len?afp->at_lldst:from_hw,
++ afp->at_llsrc_len?afp->at_llsrc:idev->dev_addr,
++ afp->at_lldst_len?afp->at_lldst:from_hw);
++ break;
++ case ARPA_TABLE_OUTPUT:
++ if (afp->at_flags & ARPM_F_PREFSRC && afp->at_src == 0) {
++ struct rtable *rt;
++ struct flowi fl = { .nl_u = { .ip4_u = { .daddr = tip}},
++ .oif = odev->ifindex };
++
++ if (ip_route_output_key(&rt, &fl) < 0)
++ break;
++ sip = rt->rt_src;
++ ip_rt_put(rt);
++ if (!sip)
++ break;
++ }
++ arp_send(ARPOP_REQUEST, ETH_P_ARP, tip, odev, afp->at_src?:sip,
++ afp->at_lldst_len?afp->at_lldst:to_hw,
++ afp->at_llsrc_len?afp->at_llsrc:odev->dev_addr,
++ NULL);
++ break;
++ }
++
++out:
++ arpf_put(afp);
++}
++
++static int
++arpf_fill_node(struct sk_buff *skb, u32 pid, u32 seq, unsigned flags,
++ int event, int table, struct arpf_node *afp)
++{
++ struct arpmsg *am;
++ struct nlmsghdr *nlh;
++ u32 packets = atomic_read(&afp->at_packets);
++
++ nlh = nlmsg_put(skb, pid, seq, event, sizeof(*am), 0);
++ if (nlh == NULL)
++ return -ENOBUFS;
++ nlh->nlmsg_flags = flags;
++ am = nlmsg_data(nlh);
++ am->arpm_family = AF_UNSPEC;
++ am->arpm_table = table;
++ am->arpm_action = afp->at_action;
++ am->arpm_from_len = afp->at_from_len;
++ am->arpm_to_len = afp->at_to_len;
++ am->arpm_pref = afp->at_pref;
++ am->arpm_flags = afp->at_flags;
++ if (afp->at_from_len)
++ NLA_PUT(skb, ARPA_FROM, 4, &afp->at_from);
++ if (afp->at_to_len)
++ NLA_PUT(skb, ARPA_TO, 4, &afp->at_to);
++ if (afp->at_src || afp->at_flags & ARPM_F_PREFSRC)
++ NLA_PUT(skb, ARPA_SRC, 4, &afp->at_src);
++ if (afp->at_iif[0])
++ NLA_PUT(skb, ARPA_IIF, sizeof(afp->at_iif), afp->at_iif);
++ if (afp->at_oif[0])
++ NLA_PUT(skb, ARPA_OIF, sizeof(afp->at_oif), afp->at_oif);
++ if (afp->at_llfrom_len)
++ NLA_PUT(skb, ARPA_LLFROM, afp->at_llfrom_len, afp->at_llfrom);
++ if (afp->at_llto_len)
++ NLA_PUT(skb, ARPA_LLTO, afp->at_llto_len, afp->at_llto);
++ if (afp->at_llsrc_len)
++ NLA_PUT(skb, ARPA_LLSRC, afp->at_llsrc_len, afp->at_llsrc);
++ if (afp->at_lldst_len)
++ NLA_PUT(skb, ARPA_LLDST, afp->at_lldst_len, afp->at_lldst);
++ NLA_PUT(skb, ARPA_PACKETS, 4, &packets);
++ return nlmsg_end(skb, nlh);
++
++nla_put_failure:
++ return nlmsg_cancel(skb, nlh);
++}
++
++static void
++arpmsg_notify(struct sk_buff *oskb, struct nlmsghdr *nlh, int table,
++ struct arpf_node *afp, int event)
++{
++ struct sk_buff *skb;
++ u32 pid = oskb ? NETLINK_CB(oskb).pid : 0;
++ int payload = sizeof(struct arpmsg) + 256;
++ int err = -ENOBUFS;
++
++ skb = nlmsg_new(nlmsg_total_size(payload), GFP_KERNEL);
++ if (!skb)
++ goto errout;
++
++ err = arpf_fill_node(skb, pid, nlh->nlmsg_seq, 0, event, table, afp);
++ if (err < 0) {
++ kfree_skb(skb);
++ goto errout;
++ }
++
++ err = rtnl_notify(skb, pid, RTNLGRP_ARP, nlh, GFP_KERNEL);
++errout:
++ if (err < 0)
++ rtnl_set_sk_err(RTNLGRP_ARP, err);
++}
++
++static inline int
++arpf_str_size(int a, struct rtattr **rta, int maxlen)
++{
++ int size = 0;
++
++ if (rta[a-1] && (size = RTA_PAYLOAD(rta[a-1]))) {
++ if (size > maxlen)
++ size = maxlen;
++ }
++ return size;
++}
++
++static inline int
++arpf_get_str(int a, struct rtattr **rta, unsigned char *p,
++ int maxlen, unsigned char *l)
++{
++ int size = arpf_str_size(a, rta, maxlen);
++
++ if (size) {
++ memcpy(p, RTA_DATA(rta[a-1]), size);
++ *l = size;
++ }
++ return size;
++}
++
++#define ARPF_MATCH_U32(ind, field) ( \
++ (!rta[ind-1] && r->at_ ## field == 0) || \
++ (rta[ind-1] && \
++ *(u32*) RTA_DATA(rta[ind-1]) == r->at_ ## field))
++
++#define ARPF_MATCH_STR(ind, field) ( \
++ (!rta[ind-1] && r->at_ ## field ## _len == 0) || \
++ (rta[ind-1] && r->at_ ## field ## _len && \
++ r->at_ ## field ## _len < RTA_PAYLOAD(rta[ind-1]) && \
++ strcmp(RTA_DATA(rta[ind-1]), r->at_ ## field) == 0))
++
++#define ARPF_MATCH_DATA(ind, field) ( \
++ (!rta[ind-1] && r->at_ ## field ## _len == 0) || \
++ (rta[ind-1] && r->at_ ## field ## _len && \
++ r->at_ ## field ## _len == RTA_PAYLOAD(rta[ind-1]) && \
++ memcmp(RTA_DATA(rta[ind-1]), &r->at_ ## field, \
++ r->at_ ## field ## _len) == 0))
++
++/* RTM_NEWARPRULE/RTM_DELARPRULE/RTM_GETARPRULE */
++
++int arpf_rule_ctl(struct sk_buff *skb, struct nlmsghdr* n, void *arg)
++{
++ struct rtattr **rta = arg;
++ struct arpmsg *am = NLMSG_DATA(n);
++ struct arpf_node *r, **rp, **prevp = 0, **delp = 0, *newp = 0;
++ unsigned pref = 1;
++ int size, ret = -EINVAL;
++
++ if (am->arpm_table >= sizeof(arp_tabs)/sizeof(arp_tabs[0]))
++ goto out;
++ if (!((~am->arpm_flags) & (ARPM_F_BROADCAST|ARPM_F_UNICAST)))
++ goto out;
++ if (am->arpm_action > 1)
++ goto out;
++ if (am->arpm_to_len > 32 || am->arpm_from_len > 32)
++ goto out;
++ if (am->arpm_flags & ARPM_F_WILDIIF &&
++ (!rta[ARPA_IIF-1] || !RTA_PAYLOAD(rta[ARPA_IIF-1]) ||
++ !*(char*)RTA_DATA(rta[ARPA_IIF-1])))
++ am->arpm_flags &= ~ARPM_F_WILDIIF;
++ if (am->arpm_flags & ARPM_F_WILDOIF &&
++ (!rta[ARPA_OIF-1] || !RTA_PAYLOAD(rta[ARPA_OIF-1]) ||
++ !*(char*)RTA_DATA(rta[ARPA_OIF-1])))
++ am->arpm_flags &= ~ARPM_F_WILDOIF;
++ switch (am->arpm_table) {
++ case ARPA_TABLE_INPUT:
++ if (rta[ARPA_SRC-1] || rta[ARPA_OIF-1])
++ goto out;
++ break;
++ case ARPA_TABLE_OUTPUT:
++ if (rta[ARPA_IIF-1])
++ goto out;
++ if (am->arpm_flags & (ARPM_F_BROADCAST|ARPM_F_UNICAST))
++ goto out;
++ break;
++ case ARPA_TABLE_FORWARD:
++ if (rta[ARPA_SRC-1])
++ goto out;
++ break;
++ }
++ if (rta[ARPA_SRC-1] && !*(u32*) RTA_DATA(rta[ARPA_SRC-1]))
++ am->arpm_flags |= ARPM_F_PREFSRC;
++ else
++ am->arpm_flags &= ~ARPM_F_PREFSRC;
++
++ for (rp = &arp_tabs[am->arpm_table]; (r=*rp) != NULL; rp=&r->at_next) {
++ if (pref < r->at_pref)
++ prevp = rp;
++ if (am->arpm_pref == r->at_pref ||
++ (!am->arpm_pref &&
++ am->arpm_to_len == r->at_to_len &&
++ am->arpm_from_len == r->at_from_len &&
++ !((am->arpm_flags ^ r->at_flags) &
++ (ARPM_F_BROADCAST | ARPM_F_UNICAST |
++ ARPM_F_WILDIIF | ARPM_F_WILDOIF)) &&
++ ARPF_MATCH_U32(ARPA_TO, to) &&
++ ARPF_MATCH_U32(ARPA_FROM, from) &&
++ ARPF_MATCH_DATA(ARPA_LLFROM, llfrom) &&
++ ARPF_MATCH_DATA(ARPA_LLTO, llto) &&
++ ARPF_MATCH_STR(ARPA_IIF, iif) &&
++ ARPF_MATCH_STR(ARPA_OIF, oif) &&
++ (n->nlmsg_type != RTM_DELARPRULE ||
++ /* DEL matches more keys */
++ (am->arpm_flags == r->at_flags &&
++ am->arpm_action == r->at_action &&
++ ARPF_MATCH_U32(ARPA_SRC, src) &&
++ ARPF_MATCH_DATA(ARPA_LLSRC, llsrc) &&
++ ARPF_MATCH_DATA(ARPA_LLDST, lldst)
++ )
++ )
++ )
++ )
++ break;
++ if (am->arpm_pref && r->at_pref > am->arpm_pref) {
++ r = NULL;
++ break;
++ }
++ pref = r->at_pref+1;
++ }
++
++ /*
++ * r=NULL: *rp != NULL (stopped before next pref), pref: not valid
++ * *rp == NULL (not found), pref: ready to use
++ * r!=NULL: found, pref: not valid
++ *
++ * prevp=NULL: no free slot
++ * prevp!=NULL: free slot for rule
++ */
++
++ if (n->nlmsg_type == RTM_DELARPRULE) {
++ if (!r)
++ return -ESRCH;
++ delp = rp;
++ goto dequeue;
++ }
++
++ if (r) {
++ /* Existing rule */
++ ret = -EEXIST;
++ if (n->nlmsg_flags&NLM_F_EXCL)
++ goto out;
++
++ if (n->nlmsg_flags&NLM_F_REPLACE) {
++ pref = r->at_pref;
++ prevp = delp = rp;
++ goto replace;
++ }
++ }
++
++ if (n->nlmsg_flags&NLM_F_APPEND) {
++ if (r) {
++ pref = r->at_pref+1;
++ for (rp=&r->at_next; (r=*rp) != NULL; rp=&r->at_next) {
++ if (pref != r->at_pref)
++ break;
++ pref ++;
++ }
++ ret = -EBUSY;
++ if (!pref)
++ goto out;
++ } else if (am->arpm_pref)
++ pref = am->arpm_pref;
++ prevp = rp;
++ }
++
++ if (!(n->nlmsg_flags&NLM_F_CREATE)) {
++ ret = -ENOENT;
++ if (n->nlmsg_flags&NLM_F_EXCL || r)
++ ret = 0;
++ goto out;
++ }
++
++ if (!(n->nlmsg_flags&NLM_F_APPEND)) {
++ if (!prevp) {
++ ret = -EBUSY;
++ if (r || *rp ||
++ (!am->arpm_pref && arp_tabs[am->arpm_table]))
++ goto out;
++ prevp = rp;
++ pref = am->arpm_pref? : 99;
++ } else {
++ if (r || !am->arpm_pref) {
++ pref = (*prevp)->at_pref - 1;
++ if (am->arpm_pref && am->arpm_pref < pref)
++ pref = am->arpm_pref;
++ } else {
++ prevp = rp;
++ pref = am->arpm_pref;
++ }
++ }
++ }
++
++replace:
++
++ ret = -ENOMEM;
++ r = kmem_cache_alloc(arpf_cachep, GFP_KERNEL);
++ if (!r)
++ return ret;
++ memset(r, 0, sizeof(*r));
++
++ arpf_get_str(ARPA_LLFROM, rta, r->at_llfrom, MAX_ADDR_LEN,
++ &r->at_llfrom_len);
++ arpf_get_str(ARPA_LLTO, rta, r->at_llto, MAX_ADDR_LEN,
++ &r->at_llto_len);
++ arpf_get_str(ARPA_LLSRC, rta, r->at_llsrc, MAX_ADDR_LEN,
++ &r->at_llsrc_len);
++ arpf_get_str(ARPA_LLDST, rta, r->at_lldst, MAX_ADDR_LEN,
++ &r->at_lldst_len);
++
++ if (delp)
++ r->at_next = (*delp)->at_next;
++ else if (*prevp)
++ r->at_next = *prevp;
++
++ r->at_pref = pref;
++ r->at_from_len = am->arpm_from_len;
++ r->at_from_mask = inet_make_mask(r->at_from_len);
++ if (rta[ARPA_FROM-1])
++ r->at_from = *(u32*) RTA_DATA(rta[ARPA_FROM-1]);
++ r->at_from &= r->at_from_mask;
++ r->at_to_len = am->arpm_to_len;
++ r->at_to_mask = inet_make_mask(r->at_to_len);
++ if (rta[ARPA_TO-1])
++ r->at_to = *(u32*) RTA_DATA(rta[ARPA_TO-1]);
++ r->at_to &= r->at_to_mask;
++ if (rta[ARPA_SRC-1])
++ r->at_src = *(u32*) RTA_DATA(rta[ARPA_SRC-1]);
++ if (rta[ARPA_PACKETS-1]) {
++ u32 packets = *(u32*) RTA_DATA(rta[ARPA_PACKETS-1]);
++ atomic_set(&r->at_packets, packets);
++ }
++ atomic_set(&r->at_refcnt, 1);
++ r->at_flags = am->arpm_flags;
++ r->at_action = am->arpm_action;
++
++ if (rta[ARPA_IIF-1] && (size = RTA_PAYLOAD(rta[ARPA_IIF-1]))) {
++ if (size >= sizeof(r->at_iif))
++ size = sizeof(r->at_iif)-1;
++ memcpy(r->at_iif, RTA_DATA(rta[ARPA_IIF-1]), size);
++ r->at_iif_len = strlen(r->at_iif);
++ }
++ if (rta[ARPA_OIF-1] && (size = RTA_PAYLOAD(rta[ARPA_OIF-1]))) {
++ if (size >= sizeof(r->at_oif))
++ size = sizeof(r->at_oif)-1;
++ memcpy(r->at_oif, RTA_DATA(rta[ARPA_OIF-1]), size);
++ r->at_oif_len = strlen(r->at_oif);
++ }
++
++ newp = r;
++
++dequeue:
++
++ if (delp) {
++ r = *delp;
++ write_lock_bh(&arpf_lock);
++ if (newp) {
++ if (!rta[ARPA_PACKETS-1])
++ atomic_set(&newp->at_packets,
++ atomic_read(&r->at_packets));
++ *delp = newp;
++ } else {
++ *delp = r->at_next;
++ }
++ r->at_dead = 1;
++ write_unlock_bh(&arpf_lock);
++ arpmsg_notify(skb, n, am->arpm_table, r, RTM_DELARPRULE);
++ arpf_put(r);
++ prevp = 0;
++ }
++
++ if (newp) {
++ if (prevp) {
++ write_lock_bh(&arpf_lock);
++ *prevp = newp;
++ write_unlock_bh(&arpf_lock);
++ }
++ arpmsg_notify(skb, n, am->arpm_table, newp, RTM_NEWARPRULE);
++ }
++
++ ret = 0;
++
++out:
++ return ret;
++}
++
++int arpf_dump_table(int t, struct sk_buff *skb, struct netlink_callback *cb)
++{
++ int idx, ret = -1;
++ struct arpf_node *afp;
++ int s_idx = cb->args[1];
++
++ for (idx=0, afp = arp_tabs[t]; afp; afp = afp->at_next, idx++) {
++ if (idx < s_idx)
++ continue;
++ if (arpf_fill_node(skb, NETLINK_CB(cb->skb).pid,
++ cb->nlh->nlmsg_seq, NLM_F_MULTI, RTM_NEWARPRULE, t, afp) < 0)
++ goto out;
++ }
++
++ ret = skb->len;
++
++out:
++ cb->args[1] = idx;
++
++ return ret;
++}
++
++int arpf_dump_rules(struct sk_buff *skb, struct netlink_callback *cb)
++{
++ int idx;
++ int s_idx = cb->args[0];
++
++ read_lock_bh(&arpf_lock);
++ for (idx = 0; idx < sizeof(arp_tabs)/sizeof(arp_tabs[0]); idx++) {
++ if (idx < s_idx)
++ continue;
++ if (idx > s_idx)
++ memset(&cb->args[1], 0, sizeof(cb->args)-1*sizeof(cb->args[0]));
++ if (arpf_dump_table(idx, skb, cb) < 0)
++ break;
++ }
++ read_unlock_bh(&arpf_lock);
++ cb->args[0] = idx;
++
++ return skb->len;
++}
++
+ /*
+ * Called once on startup.
+ */
+@@ -1240,6 +1883,20 @@
+
+ void __init arp_init(void)
+ {
++ struct rtnetlink_link *link_p = rtnetlink_links[PF_UNSPEC];
++
++ arpf_cachep = kmem_cache_create("ip_arpf_cache",
++ sizeof(struct arpf_node), 0,
++ SLAB_HWCACHE_ALIGN, NULL, NULL);
++ if (!arpf_cachep)
++ panic("IP: failed to allocate ip_arpf_cache\n");
++
++ if (link_p) {
++ link_p[RTM_NEWARPRULE-RTM_BASE].doit = arpf_rule_ctl;
++ link_p[RTM_DELARPRULE-RTM_BASE].doit = arpf_rule_ctl;
++ link_p[RTM_GETARPRULE-RTM_BASE].dumpit = arpf_dump_rules;
++ }
++
+ neigh_table_init(&arp_tbl);
+
+ dev_add_pack(&arp_packet_type);
+diff -urN linux-2.6.20.orig/net/ipv4/devinet.c linux-2.6.20/net/ipv4/devinet.c
+--- linux-2.6.20.orig/net/ipv4/devinet.c 2007-02-04 13:44:54.000000000 -0500
++++ linux-2.6.20/net/ipv4/devinet.c 2007-02-14 11:11:28.000000000 -0500
+@@ -915,7 +915,8 @@
+ continue;
+
+ for_primary_ifa(in_dev) {
+- if (ifa->ifa_scope != RT_SCOPE_LINK &&
++ if (!IN_DEV_HIDDEN(in_dev) &&
++ ifa->ifa_scope != RT_SCOPE_LINK &&
+ ifa->ifa_scope <= scope) {
+ addr = ifa->ifa_local;
+ goto out_unlock_both;
+@@ -1434,6 +1435,14 @@
+ .proc_handler = &proc_dointvec,
+ },
+ {
++ .ctl_name = NET_IPV4_CONF_RP_FILTER_MASK,
++ .procname = "rp_filter_mask",
++ .data = &ipv4_devconf.rp_filter_mask,
++ .maxlen = sizeof(int),
++ .mode = 0644,
++ .proc_handler = &proc_dointvec,
++ },
++ {
+ .ctl_name = NET_IPV4_CONF_BOOTP_RELAY,
+ .procname = "bootp_relay",
+ .data = &ipv4_devconf.bootp_relay,
+@@ -1458,6 +1467,14 @@
+ .proc_handler = &proc_dointvec,
+ },
+ {
++ .ctl_name = NET_IPV4_CONF_HIDDEN,
++ .procname = "hidden",
++ .data = &ipv4_devconf.hidden,
++ .maxlen = sizeof(int),
++ .mode = 0644,
++ .proc_handler = &proc_dointvec,
++ },
++ {
+ .ctl_name = NET_IPV4_CONF_ARPFILTER,
+ .procname = "arp_filter",
+ .data = &ipv4_devconf.arp_filter,
+@@ -149...
[truncated message content] |
|
From: <kr...@us...> - 2007-04-27 19:41:49
|
Revision: 49
http://svn.sourceforge.net/runnix/?rev=49&view=rev
Author: krisk84
Date: 2007-04-27 12:41:46 -0700 (Fri, 27 Apr 2007)
Log Message:
-----------
runnix actually compiles
Modified Paths:
--------------
trunk/package/busybox/busybox.mk
trunk/package/rsync/rsync.mk
trunk/target/x86/syslinux/syslinux.mk
Added Paths:
-----------
trunk/package/sed/
trunk/package/sed/Config.in
trunk/package/sed/sed.mk
trunk/package/sed/sedcheck.sh
Modified: trunk/package/busybox/busybox.mk
===================================================================
--- trunk/package/busybox/busybox.mk 2007-04-27 19:17:54 UTC (rev 48)
+++ trunk/package/busybox/busybox.mk 2007-04-27 19:41:46 UTC (rev 49)
@@ -133,11 +133,6 @@
endif
# Just in case
-rm $(TARGET_DIR)/linuxrc
- ln -sf ../usr/sbin/astwrap $(TARGET_DIR)/bin/addgroup
- ln -sf ../usr/sbin/astwrap $(TARGET_DIR)/bin/adduser
- ln -sf ../usr/sbin/astwrap $(TARGET_DIR)/bin/delgroup
- ln -sf ../usr/sbin/astwrap $(TARGET_DIR)/bin/deluser
- ln -sf ../sbin/astwrap $(TARGET_DIR)/usr/bin/passwd
$(INITRD_DIR)/bin/busybox: $(BUSYBOX_DIR)-initrd/busybox
$(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
Modified: trunk/package/rsync/rsync.mk
===================================================================
--- trunk/package/rsync/rsync.mk 2007-04-27 19:17:54 UTC (rev 48)
+++ trunk/package/rsync/rsync.mk 2007-04-27 19:41:46 UTC (rev 49)
@@ -3,7 +3,7 @@
# rsync
#
#############################################################
-RSYNC_VER:=2.6.8
+RSYNC_VER:=2.6.9
RSYNC_SOURCE:=rsync-$(RSYNC_VER).tar.gz
RSYNC_SITE:=http://rsync.samba.org/ftp/rsync/
RSYNC_DIR:=$(BUILD_DIR)/rsync-$(RSYNC_VER)
Added: trunk/package/sed/Config.in
===================================================================
--- trunk/package/sed/Config.in (rev 0)
+++ trunk/package/sed/Config.in 2007-04-27 19:41:46 UTC (rev 49)
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_SED
+ bool "sed"
+ default n
+ help
+ Super-useful stream editor.
+
+ http://sed.sourceforge.net/
+
+ Most people will answer Y.
Added: trunk/package/sed/sed.mk
===================================================================
--- trunk/package/sed/sed.mk (rev 0)
+++ trunk/package/sed/sed.mk 2007-04-27 19:41:46 UTC (rev 49)
@@ -0,0 +1,158 @@
+#############################################################
+#
+# sed
+#
+#############################################################
+SED_VER:=4.1.4
+SED_SOURCE:=sed-$(SED_VER).tar.gz
+SED_SITE:=ftp://ftp.gnu.org/gnu/sed
+SED_CAT:=zcat
+SED_DIR1:=$(TOOL_BUILD_DIR)/sed-$(SED_VER)
+SED_DIR2:=$(BUILD_DIR)/sed-$(SED_VER)
+SED_BINARY:=sed/sed
+SED_TARGET_BINARY:=bin/sed
+ifeq ($(strip $(BUILD_WITH_LARGEFILE)),true)
+SED_CPPFLAGS=-D_FILE_OFFSET_BITS=64
+endif
+#HOST_SED_DIR:=$(STAGING_DIR)
+HOST_SED_DIR:=$(TOOL_BUILD_DIR)
+SED:=$(HOST_SED_DIR)/bin/sed -i -e
+HOST_SED_TARGET=$(shell package/sed/sedcheck.sh)
+
+$(DL_DIR)/$(SED_SOURCE):
+ mkdir -p $(DL_DIR)
+ $(WGET) -P $(DL_DIR) $(SED_SITE)/$(SED_SOURCE)
+
+sed-source: $(DL_DIR)/$(SED_SOURCE)
+
+
+#############################################################
+#
+# build sed for use on the host system
+#
+#############################################################
+$(SED_DIR1)/.unpacked: $(DL_DIR)/$(SED_SOURCE)
+ mkdir -p $(TOOL_BUILD_DIR)
+ mkdir -p $(HOST_SED_DIR)/bin;
+ $(SED_CAT) $(DL_DIR)/$(SED_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
+ touch $(SED_DIR1)/.unpacked
+
+$(SED_DIR1)/.configured: $(SED_DIR1)/.unpacked
+ (cd $(SED_DIR1); rm -rf config.cache; \
+ ./configure \
+ --prefix=$(HOST_SED_DIR) \
+ --prefix=/usr \
+ );
+ touch $(SED_DIR1)/.configured
+
+$(SED_DIR1)/$(SED_BINARY): $(SED_DIR1)/.configured
+ $(MAKE) -C $(SED_DIR1)
+
+# This stuff is needed to work around GNU make deficiencies
+build-sed-host-binary: $(SED_DIR1)/$(SED_BINARY)
+ @if [ -L $(HOST_SED_DIR)/$(SED_TARGET_BINARY) ] ; then \
+ rm -f $(HOST_SED_DIR)/$(SED_TARGET_BINARY); fi;
+ @if [ ! -f $(HOST_SED_DIR)/$(SED_TARGET_BINARY) -o $(HOST_SED_DIR)/$(SED_TARGET_BINARY) \
+ -ot $(SED_DIR1)/$(SED_BINARY) ] ; then \
+ set -x; \
+ mkdir -p $(HOST_SED_DIR)/bin; \
+ $(MAKE) DESTDIR=$(HOST_SED_DIR) -C $(SED_DIR1) install; \
+ mv $(HOST_SED_DIR)/usr/bin/sed $(HOST_SED_DIR)/bin/; \
+ rm -rf $(HOST_SED_DIR)/share/locale $(HOST_SED_DIR)/usr/info \
+ $(HOST_SED_DIR)/usr/man $(HOST_SED_DIR)/usr/share/doc; fi
+
+use-sed-host-binary:
+ @if [ -x /usr/bin/sed ] ; then \
+ SED="/usr/bin/sed" ; \
+ else \
+ if [ -x /bin/sed ] ; then \
+ SED="/bin/sed" ; \
+ fi \
+ fi ; \
+ if [ ! -e "$(HOST_SED_DIR)/$(SED_TARGET_BINARY)" ] ; then \
+ mkdir -p "$(HOST_SED_DIR)/bin"; \
+ rm -f "$(HOST_SED_DIR)/$(SED_TARGET_BINARY)"; \
+ ln -sf "$$SED" "$(HOST_SED_DIR)/$(SED_TARGET_BINARY)"; \
+ fi
+
+host-sed: $(HOST_SED_TARGET)
+
+ifeq ($(HOST_SED_TARGET),build-sed-host-binary)
+host-sed-clean:
+ $(MAKE) DESTDIR=$(HOST_SED_DIR) -C $(SED_DIR1) uninstall
+ -$(MAKE) -C $(SED_DIR1) clean
+
+host-sed-dirclean:
+ rm -rf $(SED_DIR1)
+
+else
+host-sed-clean host-sed-dirclean:
+
+endif
+
+#############################################################
+#
+# build sed for use on the target system
+#
+#############################################################
+$(SED_DIR2)/.unpacked: $(DL_DIR)/$(SED_SOURCE)
+ $(SED_CAT) $(DL_DIR)/$(SED_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ touch $(SED_DIR2)/.unpacked
+
+$(SED_DIR2)/.configured: $(SED_DIR2)/.unpacked
+ (cd $(SED_DIR2); rm -rf config.cache; \
+ $(TARGET_CONFIGURE_OPTS) \
+ CFLAGS="$(TARGET_CFLAGS)" \
+ CPPFLAGS="$(SED_CFLAGS)" \
+ ./configure \
+ --target=$(GNU_TARGET_NAME) \
+ --host=$(GNU_TARGET_NAME) \
+ --build=$(GNU_HOST_NAME) \
+ --prefix=/usr \
+ --exec-prefix=/usr \
+ --bindir=/usr/bin \
+ --sbindir=/usr/sbin \
+ --libexecdir=/usr/lib \
+ --sysconfdir=/etc \
+ --datadir=/usr/share \
+ --localstatedir=/var \
+ --mandir=/usr/man \
+ --infodir=/usr/info \
+ $(DISABLE_NLS) \
+ );
+ touch $(SED_DIR2)/.configured
+
+$(SED_DIR2)/$(SED_BINARY): $(SED_DIR2)/.configured
+ $(MAKE) CC=$(TARGET_CC) -C $(SED_DIR2)
+
+# This stuff is needed to work around GNU make deficiencies
+sed-target_binary: $(SED_DIR2)/$(SED_BINARY)
+ @if [ -L $(TARGET_DIR)/$(SED_TARGET_BINARY) ] ; then \
+ rm -f $(TARGET_DIR)/$(SED_TARGET_BINARY); fi;
+
+ @if [ ! -f $(SED_DIR2)/$(SED_BINARY) -o $(TARGET_DIR)/$(SED_TARGET_BINARY) \
+ -ot $(SED_DIR2)/$(SED_BINARY) ] ; then \
+ set -x; \
+ $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SED_DIR2) install; \
+ mv $(TARGET_DIR)/usr/bin/sed $(TARGET_DIR)/bin/; \
+ rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
+ $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc; fi
+
+sed: uclibc sed-target_binary
+
+sed-clean:
+ $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SED_DIR2) uninstall
+ -$(MAKE) -C $(SED_DIR2) clean
+
+sed-dirclean:
+ rm -rf $(SED_DIR2)
+
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_SED)),y)
+TARGETS+=sed
+endif
Added: trunk/package/sed/sedcheck.sh
===================================================================
--- trunk/package/sed/sedcheck.sh (rev 0)
+++ trunk/package/sed/sedcheck.sh 2007-04-27 19:41:46 UTC (rev 49)
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+if [ -x /usr/bin/sed ]; then
+ SED="/usr/bin/sed";
+else
+ if [ -x /bin/sed ]; then
+ SED="/bin/sed";
+ fi;
+fi;
+
+echo "HELLO" > .sedtest
+$SED -i -e "s/HELLO/GOODBYE/" .sedtest >/dev/null 2>&1
+
+if [ $? != 0 ] ; then
+ echo build-sed-host-binary
+else
+ echo use-sed-host-binary
+fi;
+rm -f .sedtest
+
+
Property changes on: trunk/package/sed/sedcheck.sh
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/target/x86/syslinux/syslinux.mk
===================================================================
--- trunk/target/x86/syslinux/syslinux.mk 2007-04-27 19:17:54 UTC (rev 48)
+++ trunk/target/x86/syslinux/syslinux.mk 2007-04-27 19:41:46 UTC (rev 49)
@@ -1,25 +1,23 @@
-ifeq ($(ARCH),i386)
#############################################################
#
# syslinux to make target msdos/iso9660 filesystems bootable
#
#############################################################
-SYSLINUX_DIR=$(TOOL_BUILD_DIR)/syslinux-3.11
-SYSLINUX_SOURCE=syslinux-3.11.tar.bz2
+SYSLINUX_DIR=$(BUILD_DIR)/syslinux-3.35
+SYSLINUX_SOURCE=syslinux-3.35.tar.bz2
SYSLINUX_SITE=http://www.kernel.org/pub/linux/utils/boot/syslinux/
$(DL_DIR)/$(SYSLINUX_SOURCE):
$(WGET) -P $(DL_DIR) $(SYSLINUX_SITE)/$(SYSLINUX_SOURCE)
-$(SYSLINUX_DIR)/Makefile: $(DL_DIR)/$(SYSLINUX_SOURCE)
- bzcat $(DL_DIR)/$(SYSLINUX_SOURCE) | tar -C $(TOOL_BUILD_DIR) -xvf -
+$(SYSLINUX_DIR)/Makefile: $(DL_DIR)/$(SYSLINUX_SOURCE) $(SYSLINUX_PATCH)
+ bzcat $(DL_DIR)/$(SYSLINUX_SOURCE) | tar -C $(BUILD_DIR) -xvf -
touch -c $(SYSLINUX_DIR)/Makefile
$(SYSLINUX_DIR)/isolinux.bin: $(SYSLINUX_DIR)/Makefile
- $(MAKE) -C $(SYSLINUX_DIR)
+ $(MAKE) CC=$(TARGET_CC) -C $(SYSLINUX_DIR)
touch -c $(SYSLINUX_DIR)/isolinux.bin
- ln -s $(SYSLINUX_DIR) $(TOOL_BUILD_DIR)/syslinux
syslinux: $(SYSLINUX_DIR)/isolinux.bin
@@ -29,8 +27,6 @@
syslinux-dirclean:
rm -rf $(SYSLINUX_DIR)
-endif
-
#############################################################
#
# 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 19:17:55
|
Revision: 48
http://svn.sourceforge.net/runnix/?rev=48&view=rev
Author: krisk84
Date: 2007-04-27 12:17:54 -0700 (Fri, 27 Apr 2007)
Log Message:
-----------
compile fixes - the first of many
Modified Paths:
--------------
trunk/package/Config.in
trunk/package/busybox/busybox.mk
Removed Paths:
-------------
trunk/package/at/
Modified: trunk/package/Config.in
===================================================================
--- trunk/package/Config.in 2007-04-27 19:12:05 UTC (rev 47)
+++ trunk/package/Config.in 2007-04-27 19:17:54 UTC (rev 48)
@@ -7,7 +7,6 @@
comment "Other stuff"
source "package/acpid/Config.in"
-source "package/at/Config.in"
source "package/bison/Config.in"
source "package/bridge/Config.in"
source "package/customize/Config.in"
Modified: trunk/package/busybox/busybox.mk
===================================================================
--- trunk/package/busybox/busybox.mk 2007-04-27 19:12:05 UTC (rev 47)
+++ trunk/package/busybox/busybox.mk 2007-04-27 19:17:54 UTC (rev 48)
@@ -19,7 +19,7 @@
BUSYBOX_UNZIP=bzcat
-BUSYBOX_CONFIG_FILE=package/busybox/busybox-astlinux.config
+BUSYBOX_CONFIG_FILE=package/busybox/busybox-runnix.config
$(DL_DIR)/$(BUSYBOX_SOURCE):
$(WGET) -P $(DL_DIR) $(BUSYBOX_SITE)/$(BUSYBOX_SOURCE)
@@ -28,10 +28,6 @@
$(BUSYBOX_DIR)/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE)
$(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-ifeq ($(BR2_PACKAGE_SYSKLOGD),y)
- # if we have external syslogd, force busybox to use it
- $(SED) "/#include.*busybox\.h/a#define CONFIG_SYSLOGD" $(BUSYBOX_DIR)/init/init.c
-endif
# Allow busybox patches.
ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y)
toolchain/patch-kernel.sh $(BUSYBOX_DIR) package/busybox busybox.\*.patch
@@ -46,10 +42,6 @@
$(BUSYBOX_DIR)-initrd/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE)
$(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
mv $(BUSYBOX_DIR) $(BUSYBOX_DIR)-initrd
-ifeq ($(BR2_PACKAGE_SYSKLOGD),y)
- # if we have external syslogd, force busybox to use it
- $(SED) "/#include.*busybox\.h/a#define CONFIG_SYSLOGD" $(BUSYBOX_DIR)-initrd/init/init.c
-endif
# Allow busybox patches.
ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y)
toolchain/patch-kernel.sh $(BUSYBOX_DIR)-initrd package/busybox busybox.\*.patch
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2007-04-27 19:12:11
|
Revision: 47
http://svn.sourceforge.net/runnix/?rev=47&view=rev
Author: krisk84
Date: 2007-04-27 12:12:05 -0700 (Fri, 27 Apr 2007)
Log Message:
-----------
MASSIVE package update
Modified Paths:
--------------
trunk/package/acpid/acpid.mk
trunk/package/at/at.mk
trunk/package/bash/bash.mk
trunk/package/busybox/Config.in
trunk/package/busybox/busybox.mk
trunk/package/dhcp/dhcp.mk
trunk/package/dhcp/dhcp_xecute.patch
trunk/package/dnsmasq/dnsmasq.init
trunk/package/dnsmasq/dnsmasq.mk
trunk/package/dropbear/dropbear.mk
trunk/package/e2fsprogs/e2fsprogs.mk
trunk/package/fakeroot/Config.in
trunk/package/fakeroot/fakeroot.mk
trunk/package/file/file.mk
trunk/package/hotplug/hotplug.mk
trunk/package/inadyn/inadyn.mk
trunk/package/iproute2/astshape.init
trunk/package/iproute2/iproute2.mk
trunk/package/ipsec-tools/ipsec-tools.mk
trunk/package/iptables/iptables.init
trunk/package/iptables/iptables.mk
trunk/package/kexectools/kexectools.mk
trunk/package/lcdproc/lcdproc.mk
trunk/package/libelf/libelf.mk
trunk/package/libusb/libusb.mk
trunk/package/links/links.mk
trunk/package/madwifi/madwifi.mk
trunk/package/microperl/microperl.mk
trunk/package/minihttpd/minihttpd.mk
trunk/package/mkdosfs/mkdosfs.mk
trunk/package/msmtp/msmtp.mk
trunk/package/mtd/Config.in
trunk/package/mtd/mtd.mk
trunk/package/netsnmp/netsnmp.mk
trunk/package/openntpd/ntpd.init
trunk/package/openntpd/openntpd.mk
trunk/package/openssh/openssh.mk
trunk/package/openssh/sshd.init
trunk/package/openssl/openssl-0.9.7e-no-fips.patch
trunk/package/openssl/openssl.mk
trunk/package/openssl/openssl.patch
trunk/package/openvpn/openvpn.mk
trunk/package/pciutils/pciutils.mk
trunk/package/pcmcia/pcmcia.mk
trunk/package/php4/php4.mk
trunk/package/pppd/pppd.mk
trunk/package/readline/readline.mk
trunk/package/screen/screen.mk
trunk/package/sfdisk/sfdisk.mk
trunk/package/strace/strace.mk
trunk/package/usbutils/usbutils.mk
trunk/package/util-linux/util-linux.mk
trunk/package/vsftpd/vsftpd.init
trunk/package/vsftpd/vsftpd.mk
trunk/package/wireless-tools/wireless-tools.mk
Added Paths:
-----------
trunk/package/acpid/acpid-buildfix.patch
trunk/package/acpid/acpid.init
trunk/package/busybox/busybox-1.4.1-binhex.patch
trunk/package/busybox/busybox-1.4.1-etherwake.patch
trunk/package/busybox/busybox-1.4.1-iproute.patch
trunk/package/busybox/busybox-1.4.1-tar_t.patch
trunk/package/busybox/busybox-1.4.1-trylink.patch
trunk/package/busybox/busybox-1.4.1-wgetSEGV.patch
trunk/package/busybox/busybox-astlinux.config
trunk/package/fakeroot/fakeroot-doc.patch
trunk/package/hotplug/diethotplug-0.5.tar
trunk/package/iproute2/astshape
trunk/package/iptables/astfw
trunk/package/iptables/iptables-no-xml.patch
trunk/package/libusb/libusb-config
trunk/package/madwifi/rt-madwifi.patch
trunk/package/mtd/mtd-osx.patch
trunk/package/netsnmp/netsnmp.init
trunk/package/openvpn/easy-rsa.tar.gz
trunk/package/openvpn/openvpn.init
trunk/package/pcmcia/pcmcia-init
trunk/package/screen/screenrc
trunk/package/sfdisk/sfdisk-linux2618.patch
trunk/package/strace/strace-linux2618.patch
trunk/package/util-linux/util-linux-remove-deprecated-functions.patch
Added: trunk/package/acpid/acpid-buildfix.patch
===================================================================
--- trunk/package/acpid/acpid-buildfix.patch (rev 0)
+++ trunk/package/acpid/acpid-buildfix.patch 2007-04-27 19:12:05 UTC (rev 47)
@@ -0,0 +1,35 @@
+diff -urN acpid-1.0.4.orig/acpid.c acpid-1.0.4/acpid.c
+--- acpid-1.0.4.orig/acpid.c 2006-05-16 14:13:13.963213500 -0500
++++ acpid-1.0.4/acpid.c 2006-05-16 14:14:10.678758000 -0500
+@@ -61,7 +61,7 @@
+ main(int argc, char **argv)
+ {
+ int event_fd;
+- int sock_fd;
++ int sock_fd = -1;
+
+ /* learn who we really are */
+ progname = (const char *)strrchr(argv[0], '/');
+@@ -386,9 +386,7 @@
+ umask(0);
+
+ /* get outta the way */
+- chdir("/");
+-
+- return 0;
++ return chdir("/");
+ }
+
+ static int
+diff -urN acpid-1.0.4.orig/ud_socket.c acpid-1.0.4/ud_socket.c
+--- acpid-1.0.4.orig/ud_socket.c 2006-05-16 14:13:13.983214750 -0500
++++ acpid-1.0.4/ud_socket.c 2006-05-16 14:14:10.678758000 -0500
+@@ -58,7 +58,7 @@
+ while (1) {
+ int newsock = 0;
+ struct sockaddr_un cliaddr;
+- int len = sizeof(struct sockaddr_un);
++ socklen_t len = sizeof(struct sockaddr_un);
+
+ newsock = accept(listenfd, (struct sockaddr *)&cliaddr, &len);
+ if (newsock < 0) {
Added: trunk/package/acpid/acpid.init
===================================================================
--- trunk/package/acpid/acpid.init (rev 0)
+++ trunk/package/acpid/acpid.init 2007-04-27 19:12:05 UTC (rev 47)
@@ -0,0 +1,45 @@
+#!/bin/sh
+
+. /etc/rc.conf
+
+start () {
+if [ -x /usr/sbin/acpid -a -r /proc/acpi/event ]
+then
+echo "Starting acpid..."
+/usr/sbin/acpid
+fi
+}
+
+stop () {
+if `ps | grep -q acpid`
+then
+echo "Stopping acpid..."
+killall acpid 2> /dev/null
+fi
+}
+
+case $1 in
+
+start)
+start
+;;
+
+stop)
+stop
+;;
+
+init)
+start
+;;
+
+restart)
+stop
+sleep 2
+start
+;;
+
+*)
+echo "Usage: start|stop|restart"
+;;
+
+esac
Property changes on: trunk/package/acpid/acpid.init
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/package/acpid/acpid.mk
===================================================================
--- trunk/package/acpid/acpid.mk 2007-04-27 18:58:37 UTC (rev 46)
+++ trunk/package/acpid/acpid.mk 2007-04-27 19:12:05 UTC (rev 47)
@@ -13,6 +13,7 @@
$(ACPID_DIR)/Makefile: $(DL_DIR)/$(ACPID_SOURCE)
zcat $(DL_DIR)/$(ACPID_SOURCE) | tar -C $(BUILD_DIR) -xvf -
$(SED) "s:ACPI_SOCKETFILE.*:ACPI_SOCKETFILE \"/tmp/acpid.socket\":" $(ACPID_DIR)/acpid.h
+ toolchain/patch-kernel.sh $(ACPID_DIR) package/acpid/ acpid\*.patch
touch -c $(ACPID_DIR)/Makefile
$(ACPID_DIR)/acpid: $(ACPID_DIR)/Makefile
@@ -26,6 +27,7 @@
mkdir -p $(TARGET_DIR)/etc/acpi/events
echo -e "event=button[ /]power\naction=/sbin/poweroff" > $(TARGET_DIR)/etc/acpi/events/powerbtn
touch -c $(TARGET_DIR)/usr/sbin/acpid
+ $(INSTALL) -D -m 0755 package/acpid/acpid.init $(TARGET_DIR)/etc/init.d/acpid
acpid: $(TARGET_DIR)/usr/sbin/acpid
@@ -33,6 +35,9 @@
acpid-clean:
-make -C $(ACPID_DIR) clean
+ rm -f $(TARGET_DIR)/usr/sbin/acpid
+ rm -f $(TARGET_DIR)/etc/init.d/acpid
+ rm -rf $(TARGET_DIR)/etc/acpi
acpid-dirclean:
rm -rf $(ACPID_DIR)
Modified: trunk/package/at/at.mk
===================================================================
--- trunk/package/at/at.mk 2007-04-27 18:58:37 UTC (rev 46)
+++ trunk/package/at/at.mk 2007-04-27 19:12:05 UTC (rev 47)
@@ -3,7 +3,7 @@
# at
#
#############################################################
-AT_VER:=3.1.9
+AT_VER:=3.1.10
AT_SOURCE:=at_$(AT_VER).tar.gz
AT_SITE:=http://ftp.debian.org/debian/pool/main/a/at
AT_DIR:=$(BUILD_DIR)/at-$(AT_VER)
Modified: trunk/package/bash/bash.mk
===================================================================
--- trunk/package/bash/bash.mk 2007-04-27 18:58:37 UTC (rev 46)
+++ trunk/package/bash/bash.mk 2007-04-27 19:12:05 UTC (rev 47)
@@ -62,8 +62,7 @@
(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
#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/busybox/Config.in
===================================================================
--- trunk/package/busybox/Config.in 2007-04-27 18:58:37 UTC (rev 46)
+++ trunk/package/busybox/Config.in 2007-04-27 19:12:05 UTC (rev 47)
@@ -30,13 +30,3 @@
busybox includes replacement applets for the package.
If you wish to just install /bin/busybox, then answer N.
-
-config BR2_PACKAGE_BUSYBOX_CONFIG
- string "BusyBox configuration file to use?"
- depends BR2_PACKAGE_BUSYBOX
- default "package/busybox/busybox.config"
- help
- Some people may wish to use their own modified BusyBox configuration
- file, and will specify their config file location with this option.
-
- Most people will just use the default BusyBox configuration file.
Added: trunk/package/busybox/busybox-1.4.1-binhex.patch
===================================================================
--- trunk/package/busybox/busybox-1.4.1-binhex.patch (rev 0)
+++ trunk/package/busybox/busybox-1.4.1-binhex.patch 2007-04-27 19:12:05 UTC (rev 47)
@@ -0,0 +1,24 @@
+--- busybox-1.4.1/include/libbb.h Wed Jan 24 22:34:48 2007
++++ busybox-1.4.1-binhex/include/libbb.h Sat Jan 27 00:32:01 2007
+@@ -690,7 +690,7 @@
+ extern const char bb_msg_standard_output[];
+
+ extern const char bb_str_default[];
+-/* NB: (bb_hexdigits_upcase[i] | 0x10) -> lowercase hex digit */
++/* NB: (bb_hexdigits_upcase[i] | 0x20) -> lowercase hex digit */
+ extern const char bb_hexdigits_upcase[];
+
+ extern const char bb_path_mtab_file[];
+--- busybox-1.4.1/libbb/xfuncs.c Wed Jan 24 22:49:25 2007
++++ busybox-1.4.1-binhex/libbb/xfuncs.c Sat Jan 27 00:32:01 2007
+@@ -340,8 +340,8 @@
+ while (count) {
+ unsigned char c = *cp++;
+ /* put lowercase hex digits */
+- *p++ = 0x10 | bb_hexdigits_upcase[c >> 4];
+- *p++ = 0x10 | bb_hexdigits_upcase[c & 0xf];
++ *p++ = 0x20 | bb_hexdigits_upcase[c >> 4];
++ *p++ = 0x20 | bb_hexdigits_upcase[c & 0xf];
+ count--;
+ }
+ return p;
Added: trunk/package/busybox/busybox-1.4.1-etherwake.patch
===================================================================
--- trunk/package/busybox/busybox-1.4.1-etherwake.patch (rev 0)
+++ trunk/package/busybox/busybox-1.4.1-etherwake.patch 2007-04-27 19:12:05 UTC (rev 47)
@@ -0,0 +1,11 @@
+--- busybox-1.4.1.orig/networking/ether-wake.c 2007-01-24 16:34:34.000000000 -0500
++++ busybox-1.4.1/networking/ether-wake.c 2007-02-07 00:49:29.000000000 -0500
+@@ -223,8 +223,6 @@
+ #if !defined(__UCLIBC__)
+ } else if (ether_hostton(hostid, eaddr) == 0) {
+ bb_debug_msg("Station address for hostname %s is %s\n\n", hostid, ether_ntoa(eaddr));
+-#else
+-# warning Need to implement ether_hostton() for uClibc
+ #endif
+ } else
+ bb_show_usage();
Added: trunk/package/busybox/busybox-1.4.1-iproute.patch
===================================================================
--- trunk/package/busybox/busybox-1.4.1-iproute.patch (rev 0)
+++ trunk/package/busybox/busybox-1.4.1-iproute.patch 2007-04-27 19:12:05 UTC (rev 47)
@@ -0,0 +1,71 @@
+diff -urN busybox-1.4.1/networking/ip.c busybox-1.4.1-iproute/networking/ip.c
+--- busybox-1.4.1/networking/ip.c 2007-01-24 22:34:34.000000000 +0100
++++ busybox-1.4.1-iproute/networking/ip.c 2007-01-27 14:07:05.000000000 +0100
+@@ -33,8 +33,9 @@
+ if (ENABLE_FEATURE_IP_LINK && matches(argv[1], "link") == 0) {
+ ret = do_iplink(argc-2, argv+2);
+ }
+- if (ENABLE_FEATURE_IP_TUNNEL &&
+- (matches(argv[1], "tunnel") == 0 || strcmp(argv[1], "tunl") == 0)) {
++ if (ENABLE_FEATURE_IP_TUNNEL
++ && (matches(argv[1], "tunnel") == 0 || strcmp(argv[1], "tunl") == 0)
++ ) {
+ ret = do_iptunnel(argc-2, argv+2);
+ }
+ if (ENABLE_FEATURE_IP_RULE && matches(argv[1], "rule") == 0) {
+diff -urN busybox-1.4.1/networking/libiproute/iproute.c busybox-1.4.1-iproute/networking/libiproute/iproute.c
+--- busybox-1.4.1/networking/libiproute/iproute.c 2007-01-24 22:34:33.000000000 +0100
++++ busybox-1.4.1-iproute/networking/libiproute/iproute.c 2007-01-27 14:07:05.000000000 +0100
+@@ -835,9 +835,11 @@
+
+ int do_iproute(int argc, char **argv)
+ {
+- static const char * const ip_route_commands[] =
+- { "add", "append", "change", "chg", "delete", "get",
+- "list", "show", "prepend", "replace", "test", "flush", 0 };
++ static const char * const ip_route_commands[] = {
++ /*0-3*/ "add", "append", "change", "chg",
++ /*4-7*/ "delete", "get", "list", "show",
++ /*8..*/ "prepend", "replace", "test", "flush", 0
++ };
+ int command_num = 6;
+ unsigned int flags = 0;
+ int cmd = RTM_NEWROUTE;
+@@ -848,7 +850,7 @@
+ command_num = index_in_substr_array(ip_route_commands, *argv);
+ }
+ switch (command_num) {
+- case 0: /* add*/
++ case 0: /* add */
+ flags = NLM_F_CREATE|NLM_F_EXCL;
+ break;
+ case 1: /* append */
+@@ -859,21 +861,20 @@
+ flags = NLM_F_REPLACE;
+ break;
+ case 4: /* delete */
+- case 5: /* del */
+ cmd = RTM_DELROUTE;
+ break;
+- case 6: /* get */
++ case 5: /* get */
+ return iproute_get(argc-1, argv+1);
+- case 7: /* list */
+- case 8: /* show */
++ case 6: /* list */
++ case 7: /* show */
+ return iproute_list_or_flush(argc-1, argv+1, 0);
+- case 9: /* prepend */
++ case 8: /* prepend */
+ flags = NLM_F_CREATE;
+- case 10: /* replace */
++ case 9: /* replace */
+ flags = NLM_F_CREATE|NLM_F_REPLACE;
+- case 11: /* test */
++ case 10: /* test */
+ flags = NLM_F_EXCL;
+- case 12: /* flush */
++ case 11: /* flush */
+ return iproute_list_or_flush(argc-1, argv+1, 1);
+ default:
+ bb_error_msg_and_die("unknown command %s", *argv);
Added: trunk/package/busybox/busybox-1.4.1-tar_t.patch
===================================================================
--- trunk/package/busybox/busybox-1.4.1-tar_t.patch (rev 0)
+++ trunk/package/busybox/busybox-1.4.1-tar_t.patch 2007-04-27 19:12:05 UTC (rev 47)
@@ -0,0 +1,76 @@
+--- busybox-1.4.1/archival/tar.c Wed Jan 24 22:49:25 2007
++++ busybox-1.4.1-tar_t/archival/tar.c Sun Feb 25 21:50:35 2007
+@@ -760,7 +760,9 @@
+ const char *tar_filename = "-";
+ unsigned opt;
+ int verboseFlag = 0;
++#if ENABLE_FEATURE_TAR_LONG_OPTIONS && ENABLE_FEATURE_TAR_FROM
+ llist_t *excludes = NULL;
++#endif
+
+ /* Initialise default values */
+ tar_handle = init_handle();
+@@ -773,7 +775,9 @@
+ "tt:vv:" // count -t,-v
+ "?:" // bail out with usage instead of error return
+ "X::T::" // cumulative lists
++#if ENABLE_FEATURE_TAR_LONG_OPTIONS && ENABLE_FEATURE_TAR_FROM
+ "\xff::" // cumulative lists for --exclude
++#endif
+ USE_FEATURE_TAR_CREATE("c:") "t:x:" // at least one of these is reqd
+ USE_FEATURE_TAR_CREATE("c--tx:t--cx:x--ct") // mutually exclusive
+ SKIP_FEATURE_TAR_CREATE("t--x:x--t"); // mutually exclusive
+@@ -788,14 +792,15 @@
+ USE_FEATURE_TAR_FROM( "T:X:")
+ USE_FEATURE_TAR_GZIP( "z" )
+ USE_FEATURE_TAR_COMPRESS("Z" )
+- ,
+- &base_dir, // -C dir
+- &tar_filename, // -f filename
+- USE_FEATURE_TAR_FROM(&(tar_handle->accept),) // T
+- USE_FEATURE_TAR_FROM(&(tar_handle->reject),) // X
+- USE_FEATURE_TAR_FROM(&excludes ,) // --exclude
+- &verboseFlag, // combined count for -t and -v
+- &verboseFlag // combined count for -t and -v
++ , &base_dir // -C dir
++ , &tar_filename // -f filename
++ USE_FEATURE_TAR_FROM(, &(tar_handle->accept)) // T
++ USE_FEATURE_TAR_FROM(, &(tar_handle->reject)) // X
++#if ENABLE_FEATURE_TAR_LONG_OPTIONS && ENABLE_FEATURE_TAR_FROM
++ , &excludes // --exclude
++#endif
++ , &verboseFlag // combined count for -t and -v
++ , &verboseFlag // combined count for -t and -v
+ );
+
+ if (verboseFlag) tar_handle->action_header = header_verbose_list;
+@@ -828,17 +833,19 @@
+ if (opt & OPT_COMPRESS)
+ get_header_ptr = get_header_tar_Z;
+
+- if (ENABLE_FEATURE_TAR_FROM) {
+- tar_handle->reject = append_file_list_to_list(tar_handle->reject);
+- /* Append excludes to reject */
+- while (excludes) {
+- llist_t *temp = excludes->link;
+- excludes->link = tar_handle->reject;
+- tar_handle->reject = excludes;
+- excludes = temp;
+- }
+- tar_handle->accept = append_file_list_to_list(tar_handle->accept);
++#if ENABLE_FEATURE_TAR_FROM
++ tar_handle->reject = append_file_list_to_list(tar_handle->reject);
++#if ENABLE_FEATURE_TAR_LONG_OPTIONS
++ /* Append excludes to reject */
++ while (excludes) {
++ llist_t *next = excludes->link;
++ excludes->link = tar_handle->reject;
++ tar_handle->reject = excludes;
++ excludes = next;
+ }
++#endif
++ tar_handle->accept = append_file_list_to_list(tar_handle->accept);
++#endif
+
+ /* Check if we are reading from stdin */
+ if (argv[optind] && *argv[optind] == '-') {
Added: trunk/package/busybox/busybox-1.4.1-trylink.patch
===================================================================
--- trunk/package/busybox/busybox-1.4.1-trylink.patch (rev 0)
+++ trunk/package/busybox/busybox-1.4.1-trylink.patch 2007-04-27 19:12:05 UTC (rev 47)
@@ -0,0 +1,14 @@
+diff -ur busybox-1.4.1.orig/scripts/trylink busybox-1.4.1/scripts/trylink
+--- busybox-1.4.1.orig/scripts/trylink 2007-01-24 16:34:36.000000000 -0500
++++ busybox-1.4.1/scripts/trylink 2007-04-18 00:57:03.000000000 -0400
+@@ -1,8 +1,8 @@
+-#!/bin/sh
++#!/bin/bash
+
+ debug=false
+
+-function try {
++try () {
+ added="$1"
+ shift
+ $debug && echo "Trying: $* $added"
Added: trunk/package/busybox/busybox-1.4.1-wgetSEGV.patch
===================================================================
--- trunk/package/busybox/busybox-1.4.1-wgetSEGV.patch (rev 0)
+++ trunk/package/busybox/busybox-1.4.1-wgetSEGV.patch 2007-04-27 19:12:05 UTC (rev 47)
@@ -0,0 +1,14 @@
+diff -urN busybox-1.4.1/networking/wget.c busybox-1.4.1-wgetSEGV/networking/wget.c
+--- busybox-1.4.1/networking/wget.c 2007-01-24 22:34:34.000000000 +0100
++++ busybox-1.4.1-wgetSEGV/networking/wget.c 2007-02-11 17:21:18.000000000 +0100
+@@ -543,7 +543,9 @@
+ p = strchr(h->host, '?'); if (!sp || (p && sp > p)) sp = p;
+ p = strchr(h->host, '#'); if (!sp || (p && sp > p)) sp = p;
+ if (!sp) {
+- h->path = "";
++ /* must be writable because of bb_get_last_path_component() */
++ static char nullstr[] = "";
++ h->path = nullstr;
+ } else if (*sp == '/') {
+ *sp = '\0';
+ h->path = sp + 1;
Added: trunk/package/busybox/busybox-astlinux.config
===================================================================
--- trunk/package/busybox/busybox-astlinux.config (rev 0)
+++ trunk/package/busybox/busybox-astlinux.config 2007-04-27 19:12:05 UTC (rev 47)
@@ -0,0 +1,675 @@
+#
+# Automatically generated make config: don't edit
+# Busybox version: 1.4.1
+# Wed Feb 7 11:48:53 2007
+#
+CONFIG_HAVE_DOT_CONFIG=y
+
+#
+# Busybox Settings
+#
+
+#
+# General Configuration
+#
+CONFIG_NITPICK=y
+# CONFIG_DESKTOP is not set
+# 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_SHOW_USAGE=y
+CONFIG_FEATURE_VERBOSE_USAGE=y
+CONFIG_FEATURE_COMPRESS_USAGE=y
+CONFIG_FEATURE_INSTALLER=y
+# CONFIG_LOCALE_SUPPORT is not set
+CONFIG_GETOPT_LONG=y
+CONFIG_FEATURE_DEVPTS=y
+# CONFIG_FEATURE_CLEAN_UP is not set
+CONFIG_FEATURE_SUID=y
+CONFIG_FEATURE_SYSLOG=y
+# CONFIG_FEATURE_SUID_CONFIG is not set
+# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
+CONFIG_FEATURE_HAVE_RPC=y
+# CONFIG_SELINUX is not set
+CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
+
+#
+# Build Options
+#
+# CONFIG_STATIC is not set
+# CONFIG_BUILD_LIBBUSYBOX is not set
+# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set
+# CONFIG_FEATURE_SHARED_BUSYBOX is not set
+CONFIG_LFS=y
+# CONFIG_BUILD_AT_ONCE is not set
+
+#
+# Debugging Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_PESSIMIZE is not set
+# CONFIG_NO_DEBUG_LIB is not set
+# CONFIG_DMALLOC is not set
+# CONFIG_EFENCE is not set
+CONFIG_INCLUDE_SUSv2=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
+CONFIG_PREFIX="./install"
+
+#
+# Busybox Library Tuning
+#
+CONFIG_PASSWORD_MINLEN=6
+CONFIG_MD5_SIZE_VS_SPEED=2
+
+#
+# Applets
+#
+
+#
+# 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_LZMA is not set
+# CONFIG_FEATURE_TAR_FROM is not set
+CONFIG_FEATURE_TAR_GZIP=y
+# CONFIG_FEATURE_TAR_COMPRESS is not set
+# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
+# CONFIG_UNCOMPRESS is not set
+# CONFIG_UNLZMA is not set
+# CONFIG_FEATURE_LZMA_FAST 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
+# CONFIG_FEATURE_DEB_TAR_LZMA is not set
+
+#
+# Coreutils
+#
+CONFIG_BASENAME=y
+# CONFIG_CAL is not set
+CONFIG_CAT=y
+# CONFIG_CATV is not set
+CONFIG_CHGRP=y
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
+CONFIG_CHROOT=y
+# CONFIG_CKSUM is not set
+CONFIG_CMP=y
+# CONFIG_COMM is not set
+CONFIG_CP=y
+CONFIG_CUT=y
+CONFIG_DATE=y
+CONFIG_FEATURE_DATE_ISOFMT=y
+CONFIG_DD=y
+CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+# CONFIG_FEATURE_DD_IBS_OBS is not set
+CONFIG_DF=y
+CONFIG_DIFF=y
+CONFIG_FEATURE_DIFF_BINARY=y
+CONFIG_FEATURE_DIFF_DIR=y
+# CONFIG_FEATURE_DIFF_MINIMAL is not set
+CONFIG_DIRNAME=y
+CONFIG_DOS2UNIX=y
+CONFIG_UNIX2DOS=y
+CONFIG_DU=y
+CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+CONFIG_ENV=y
+# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set
+CONFIG_EXPR=y
+# CONFIG_EXPR_MATH_SUPPORT_64 is not set
+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_FEATURE_INSTALL_LONG_OPTIONS is not set
+# 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_FEATURE_MKDIR_LONG_OPTIONS is not set
+# CONFIG_MKFIFO is not set
+CONFIG_MKNOD=y
+CONFIG_MV=y
+# CONFIG_FEATURE_MV_LONG_OPTIONS is not set
+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
+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_FEATURE_WC_LARGE is not set
+CONFIG_WHO=y
+CONFIG_WHOAMI=y
+CONFIG_YES=y
+
+#
+# Common options for cp and mv
+#
+CONFIG_FEATURE_PRESERVE_HARDLINKS=y
+
+#
+# Common options for ls, more and telnet
+#
+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_RESIZE is not set
+# CONFIG_FEATURE_RESIZE_PRINT is not set
+# CONFIG_SETCONSOLE is not set
+# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
+# CONFIG_SETKEYCODES is not set
+# CONFIG_SETLOGCONS 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_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
+# CONFIG_START_STOP_DAEMON is not set
+# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set
+# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set
+CONFIG_WHICH=y
+
+#
+# Editors
+#
+CONFIG_AWK=y
+CONFIG_FEATURE_AWK_MATH=y
+# CONFIG_ED is not set
+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
+CONFIG_FEATURE_ALLOW_EXEC=y
+
+#
+# Finding Utilities
+#
+CONFIG_FIND=y
+CONFIG_FEATURE_FIND_PRINT0=y
+CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_MMIN=y
+CONFIG_FEATURE_FIND_PERM=y
+CONFIG_FEATURE_FIND_TYPE=y
+CONFIG_FEATURE_FIND_XDEV=y
+CONFIG_FEATURE_FIND_NEWER=y
+# 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=y
+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_DEBUG_INIT is not set
+CONFIG_FEATURE_USE_INITTAB=y
+# CONFIG_FEATURE_INIT_SCTTY is not set
+# CONFIG_FEATURE_EXTRA_QUIET is not set
+# CONFIG_FEATURE_INIT_COREDUMPS is not set
+CONFIG_FEATURE_INITRD=y
+CONFIG_HALT=y
+# CONFIG_MESG is not set
+
+#
+# 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_LOGIN_SCRIPTS is not set
+# CONFIG_FEATURE_SECURETTY is not set
+CONFIG_PASSWD=y
+# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set
+CONFIG_SU=y
+CONFIG_FEATURE_SU_SYSLOG=y
+CONFIG_FEATURE_SU_CHECKS_SHELLS=y
+CONFIG_SULOGIN=y
+CONFIG_VLOCK=y
+
+#
+# Linux Ext2 FS Progs
+#
+# CONFIG_CHATTR is not set
+CONFIG_FSCK=y
+CONFIG_LSATTR=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
+CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=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
+
+#
+# Linux System Utilities
+#
+CONFIG_DMESG=y
+CONFIG_FEATURE_DMESG_PRETTY=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
+CONFIG_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_LONG_OPTIONS is not set
+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_FEATURE_MDEV_EXEC is not set
+CONFIG_MKSWAP=y
+# CONFIG_FEATURE_MKSWAP_V0 is not set
+CONFIG_MORE=y
+CONFIG_FEATURE_USE_TERMIOS=y
+CONFIG_MOUNT=y
+CONFIG_FEATURE_MOUNT_NFS=y
+# CONFIG_FEATURE_MOUNT_CIFS is not set
+CONFIG_FEATURE_MOUNT_FLAGS=y
+CONFIG_FEATURE_MOUNT_FSTAB=y
+CONFIG_PIVOT_ROOT=y
+CONFIG_RDATE=y
+# CONFIG_READPROFILE is not set
+# CONFIG_SETARCH is not set
+CONFIG_SWAPONOFF=y
+# CONFIG_SWITCH_ROOT is not set
+CONFIG_UMOUNT=y
+CONFIG_FEATURE_UMOUNT_ALL=y
+
+#
+# Common options for mount/umount
+#
+CONFIG_FEATURE_MOUNT_LOOP=y
+# CONFIG_FEATURE_MTAB_SUPPORT is not set
+
+#
+# Miscellaneous Utilities
+#
+# CONFIG_ADJTIMEX is not set
+# CONFIG_BBCONFIG is not set
+CONFIG_CROND=y
+# CONFIG_DEBUG_CROND_OPTION is not set
+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_FEATURE_DEVFS is not set
+# CONFIG_EJECT is not set
+CONFIG_LAST=y
+CONFIG_LESS=y
+CONFIG_FEATURE_LESS_MAXLINES=9999999
+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
+CONFIG_NMETER=y
+# CONFIG_RAIDAUTORUN is not set
+# CONFIG_READAHEAD is not set
+# CONFIG_RUNLEVEL is not set
+# CONFIG_RX is not set
+CONFIG_STRINGS=y
+# CONFIG_SETSID is not set
+# CONFIG_TASKSET is not set
+# CONFIG_FEATURE_TASKSET_FANCY is not set
+CONFIG_TIME=y
+CONFIG_WATCHDOG=y
+
+#
+# Networking Utilities
+#
+# CONFIG_FEATURE_IPV6 is not set
+CONFIG_ARP=y
+CONFIG_ARPING=y
+# CONFIG_DNSD is not set
+CONFIG_ETHER_WAKE=y
+CONFIG_FAKEIDENTD=y
+CONFIG_FTPGET=y
+CONFIG_FTPPUT=y
+# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
+CONFIG_HOSTNAME=y
+# CONFIG_HTTPD is not set
+# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
+# CONFIG_FEATURE_HTTPD_SETUID is not set
+# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
+# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
+# CONFIG_FEATURE_HTTPD_CGI is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR 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 is not set
+CONFIG_FEATURE_IFUPDOWN_IFCONFIG_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_BUILTIN_ECHO=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y
+# 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_FEATURE_IP_RULE is not set
+# CONFIG_FEATURE_IP_SHORT_FORMS is not set
+# CONFIG_IPADDR is not set
+# CONFIG_IPLINK is not set
+# CONFIG_IPROUTE is not set
+# CONFIG_IPTUNNEL is not set
+# CONFIG_IPRULE is not set
+CONFIG_IPCALC=y
+CONFIG_FEATURE_IPCALC_FANCY=y
+# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
+# CONFIG_NAMEIF is not set
+CONFIG_NC=y
+CONFIG_NC_SERVER=y
+# CONFIG_NC_EXTRA 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_STANDALONE is not set
+CONFIG_TFTP=y
+CONFIG_FEATURE_TFTP_GET=y
+CONFIG_FEATURE_TFTP_PUT=y
+CONFIG_FEATURE_TFTP_BLOCKSIZE=y
+CONFIG_DEBUG_TFTP=y
+CONFIG_TRACEROUTE=y
+CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
+# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
+CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y
+# CONFIG_APP_UDHCPD is not set
+# CONFIG_APP_DHCPRELAY is not set
+# CONFIG_APP_DUMPLEASES is not set
+CONFIG_APP_UDHCPC=y
+CONFIG_FEATURE_UDHCP_SYSLOG=y
+# CONFIG_FEATURE_UDHCP_DEBUG 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
+# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
+CONFIG_ZCIP=y
+
+#
+# Process Utilities
+#
+CONFIG_FREE=y
+CONFIG_FUSER=y
+CONFIG_KILL=y
+CONFIG_KILLALL=y
+CONFIG_KILLALL5=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_BUILTIN_ECHO is not set
+CONFIG_ASH_BUILTIN_TEST=y
+# CONFIG_ASH_CMDCMD 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
+
+#
+# Runit Utilities
+#
+# CONFIG_RUNSV is not set
+# CONFIG_RUNSVDIR is not set
+# CONFIG_SV is not set
+# CONFIG_SVLOGD is not set
+# CONFIG_CHPST is not set
+# CONFIG_SETUIDGID is not set
+# CONFIG_ENVUIDGID is not set
+# CONFIG_ENVDIR is not set
+# CONFIG_SOFTLIMIT is not set
Modified: trunk/package/busybox/busybox.mk
===================================================================
--- trunk/package/busybox/busybox.mk 2007-04-27 18:58:37 UTC (rev 46)
+++ trunk/package/busybox/busybox.mk 2007-04-27 19:12:05 UTC (rev 47)
@@ -4,26 +4,27 @@
#
#############################################################
+BUSYBOX_VER:=1.4.1
+
ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y)
# Be aware that this changes daily....
BUSYBOX_DIR:=$(BUILD_DIR)/busybox
BUSYBOX_SOURCE:=busybox-snapshot.tar.bz2
BUSYBOX_SITE:=http://www.busybox.net/downloads/snapshots
else
-BUSYBOX_VER:=1.1.0
BUSYBOX_DIR:=$(BUILD_DIR)/busybox-$(BUSYBOX_VER)
BUSYBOX_SOURCE:=busybox-$(BUSYBOX_VER).tar.bz2
BUSYBOX_SITE:=http://www.busybox.net/downloads
endif
+
BUSYBOX_UNZIP=bzcat
-BUSYBOX_CONFIG_FILE=$(subst ",, $(strip $(BR2_PACKAGE_BUSYBOX_CONFIG)))
-#"
+BUSYBOX_CONFIG_FILE=package/busybox/busybox-astlinux.config
$(DL_DIR)/$(BUSYBOX_SOURCE):
$(WGET) -P $(DL_DIR) $(BUSYBOX_SITE)/$(BUSYBOX_SOURCE)
-busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_CONFIG_FILE)
+busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_CONFIG_FILE) dependencies
$(BUSYBOX_DIR)/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE)
$(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
@@ -32,39 +33,136 @@
$(SED) "/#include.*busybox\.h/a#define CONFIG_SYSLOGD" $(BUSYBOX_DIR)/init/init.c
endif
# Allow busybox patches.
- toolchain/patch-kernel.sh $(BUSYBOX_DIR) package/busybox busybox\*.patch
- touch $(BUSYBOX_DIR)/.unpacked
+ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y)
+ toolchain/patch-kernel.sh $(BUSYBOX_DIR) package/busybox busybox.\*.patch
+else
+ toolchain/patch-kernel.sh $(BUSYBOX_DIR) package/busybox busybox-$(BUSYBOX_VER)-\*.patch
+endif
+ touch $@
+ifeq ($(strip $(BR2_INITRD_ROOTFS_EXT2)),y)
+ cp -a $(BUSYBOX_DIR) $(BUSYBOX_DIR)-initrd
+endif
+$(BUSYBOX_DIR)-initrd/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE)
+ $(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ mv $(BUSYBOX_DIR) $(BUSYBOX_DIR)-initrd
+ifeq ($(BR2_PACKAGE_SYSKLOGD),y)
+ # if we have external syslogd, force busybox to use it
+ $(SED) "/#include.*busybox\.h/a#define CONFIG_SYSLOGD" $(BUSYBOX_DIR)-initrd/init/init.c
+endif
+ # Allow busybox patches.
+ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y)
+ toolchain/patch-kernel.sh $(BUSYBOX_DIR)-initrd package/busybox busybox.\*.patch
+else
+ toolchain/patch-kernel.sh $(BUSYBOX_DIR)-initrd package/busybox busybox-$(BUSYBOX_VER)-\*.patch
+endif
+ touch $@
+
$(BUSYBOX_DIR)/.configured: $(BUSYBOX_DIR)/.unpacked $(BUSYBOX_CONFIG_FILE)
- cp $(BUSYBOX_CONFIG_FILE) $(BUSYBOX_DIR)/.config
- $(SED) "s,^CROSS.*,CROSS=$(TARGET_CROSS)\n\
- PREFIX=$(TARGET_DIR),;" $(BUSYBOX_DIR)/Rules.mak
+ cp -f $(BUSYBOX_CONFIG_FILE) $(BUSYBOX_DIR)/.config
+ $(SED) s,CONFIG_PREFIX=.*,CONFIG_PREFIX=\"$(TARGET_DIR)\", \
+ $(BUSYBOX_DIR)/.config ;
+ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y)
+ $(SED) s,CONFIG_PREFIX=.*,CONFIG_PREFIX=\"$(TARGET_DIR)\", \
+ $(BUSYBOX_DIR)/.config ;
+ $(SED) s,CROSS_COMPILER_PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \
+ $(BUSYBOX_DIR)/.config ;
+ $(SED) s,PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \
+ $(BUSYBOX_DIR)/.config ;
+endif
ifeq ($(BR2_LARGEFILE),y)
$(SED) "s/^.*CONFIG_LFS.*/CONFIG_LFS=y/;" $(BUSYBOX_DIR)/.config
else
$(SED) "s/^.*CONFIG_LFS.*/CONFIG_LFS=n/;" $(BUSYBOX_DIR)/.config
$(SED) "s/^.*FDISK_SUPPORT_LARGE_DISKS.*/FDISK_SUPPORT_LARGE_DISKS=n/;" $(BUSYBOX_DIR)/.config
endif
- yes "" | $(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" -C $(BUSYBOX_DIR) oldconfig
- touch $(BUSYBOX_DIR)/.configured
+ yes "" | $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
+ CROSS="$(TARGET_CROSS)" -C $(BUSYBOX_DIR) oldconfig
+ touch $@
+$(BUSYBOX_DIR)-initrd/.configured: $(BUSYBOX_DIR)-initrd/.unpacked $(BUSYBOX_INITRD_CONFIG_FILE)
+ cp -f $(BUSYBOX_INITRD_CONFIG_FILE) $(BUSYBOX_DIR)-initrd/.config
+ $(SED) s,CONFIG_PREFIX=.*,CONFIG_PREFIX=\"$(INITRD_DIR)\", \
+ $(BUSYBOX_DIR)-initrd/.config ;
+ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y)
+ $(SED) s,CONFIG_PREFIX=.*,CONFIG_PREFIX=\"$(INITRD_DIR)\", \
+ $(BUSYBOX_DIR)-initrd/.config ;
+ $(SED) s,CROSS_COMPILER_PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \
+ $(BUSYBOX_DIR)-initrd/.config ;
+ $(SED) s,PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \
+ $(BUSYBOX_DIR)-initrd/.config ;
+endif
+ifeq ($(BR2_LARGEFILE),y)
+ $(SED) "s/^.*CONFIG_LFS.*/CONFIG_LFS=y/;" $(BUSYBOX_DIR)-initrd/.config
+else
+ $(SED) "s/^.*CONFIG_LFS.*/CONFIG_LFS=n/;" $(BUSYBOX_DIR)-initrd/.config
+ $(SED) "s/^.*FDISK_SUPPORT_LARGE_DISKS.*/FDISK_SUPPORT_LARGE_DISKS=n/;" $(BUSYBOX_DIR)-initrd/.config
+endif
+ yes "" | $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
+ CROSS="$(TARGET_CROSS)" -C $(BUSYBOX_DIR)-initrd oldconfig
+ touch $@
+
$(BUSYBOX_DIR)/busybox: $(BUSYBOX_DIR)/.configured
- $(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
+ $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
+ CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
+ ARCH=$(LINUX_KARCH) \
EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_DIR)
+ifeq ($(BR2_PREFER_IMA)$(BR2_PACKAGE_BUSYBOX_SNAPSHOT),yy)
+ rm -f $@
+ $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
+ CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
+ ARCH=$(LINUX_KARCH) STRIP="$(STRIP)" \
+ EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_DIR) \
+ -f scripts/Makefile.IMA
+endif
+$(BUSYBOX_DIR)-initrd/busybox: $(BUSYBOX_DIR)-initrd/.configured
+ $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
+ CROSS="$(TARGET_CROSS)" PREFIX="$(INITRD_DIR)" \
+ ARCH=$(LINUX_KARCH) \
+ EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_DIR)-initrd
+ifeq ($(BR2_PREFER_IMA)$(BR2_PACKAGE_BUSYBOX_SNAPSHOT),yy)
+ rm -f $@
+ $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
+ CROSS="$(TARGET_CROSS)" PREFIX="$(INITRD_DIR)" \
+ ARCH=$(LINUX_KARCH) STRIP="$(STRIP)" \
+ EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_DIR)-initrd \
+ -f scripts/Makefile.IMA
+endif
+
$(TARGET_DIR)/bin/busybox: $(BUSYBOX_DIR)/busybox
ifeq ($(BR2_PACKAGE_BUSYBOX_INSTALL_SYMLINKS),y)
- $(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
+ $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
+ CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
+ ARCH=$(LINUX_KARCH) \
EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_DIR) install
else
install -D -m 0755 $(BUSYBOX_DIR)/busybox $(TARGET_DIR)/bin/busybox
endif
# Just in case
- -chmod a+x $(TARGET_DIR)/usr/share/udhcpc/default.script
-rm $(TARGET_DIR)/linuxrc
+ ln -sf ../usr/sbin/astwrap $(TARGET_DIR)/bin/addgroup
+ ln -sf ../usr/sbin/astwrap $(TARGET_DIR)/bin/adduser
+ ln -sf ../usr/sbin/astwrap $(TARGET_DIR)/bin/delgroup
+ ln -sf ../usr/sbin/astwrap $(TARGET_DIR)/bin/deluser
+ ln -sf ../sbin/astwrap $(TARGET_DIR)/usr/bin/passwd
+$(INITRD_DIR)/bin/busybox: $(BUSYBOX_DIR)-initrd/busybox
+ $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
+ CROSS="$(TARGET_CROSS)" PREFIX="$(INITRD_DIR)" \
+ ARCH=$(LINUX_KARCH) \
+ EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_DIR)-initrd install
+ -rm $(INITRD_DIR)/linuxrc
+ cp -a target/initrd/target_skeleton/linuxrc $(INITRD_DIR)/linuxrc
+
busybox: uclibc $(TARGET_DIR)/bin/busybox
+busybox-initrd: uclibc $(INITRD_DIR)/bin/busybox
+
+busybox-menuconfig: busybox-source $(BUSYBOX_DIR)/.configured
+ $(MAKE) __TARGET_ARCH=$(ARCH) -C $(BUSYBOX_DIR) menuconfig
+ cp -f $(BUSYBOX_DIR)/.config $(BUSYBOX_CONFIG_FILE)
+
busybox-clean:
rm -f $(TARGET_DIR)/bin/busybox
-$(MAKE) -C $(BUSYBOX_DIR) clean
@@ -76,6 +174,11 @@
# Toplevel Makefile options
#
#############################################################
+ifeq ($(strip $(BR2_INITRD_ROOTFS_EXT2)),y)
+TARGETS+=busybox-initrd
+endif
+
ifeq ($(strip $(BR2_PACKAGE_BUSYBOX)),y)
TARGETS+=busybox
endif
+
Modified: trunk/package/dhcp/dhcp.mk
===================================================================
--- trunk/package/dhcp/dhcp.mk 2007-04-27 18:58:37 UTC (rev 46)
+++ trunk/package/dhcp/dhcp.mk 2007-04-27 19:12:05 UTC (rev 47)
@@ -3,7 +3,7 @@
# dhcp
#
#############################################################
-DHCP_VER:=3.0.4
+DHCP_VER:=3.0.5
DHCP_SOURCE:=dhcp-$(DHCP_VER).tar.gz
DHCP_SITE:=ftp://ftp.isc.org/isc/dhcp
DHCP_CAT:=zcat
@@ -14,15 +14,19 @@
DHCP_SERVER_TARGET_BINARY:=usr/sbin/dhcpd
DHCP_RELAY_TARGET_BINARY:=usr/sbin/dhcrelay
DHCP_CLIENT_TARGET_BINARY:=usr/sbin/dhclient
-BVARS=PREDEFINES='-D_PATH_DHCPD_DB=\"/var/state/dhcp/dhcpd.leases\" \
+BVARS=PREDEFINES='-D_PATH_DHCPD_DB=\"/var/lib/dhcp/dhcpd.leases\" \
-D_PATH_DHCLIENT_DB=\"/var/lib/dhcp/dhclient.leases\"' \
- VARDB=/var/state/dhcp
+ VARDB=/var/lib/dhcp
$(DL_DIR)/$(DHCP_SOURCE):
$(WGET) -P $(DL_DIR) $(DHCP_SITE)/$(DHCP_SOURCE)
dhcp-source: $(DL_DIR)/$(DHCP_SOURCE)
+dhcp_server-source: dhcp-source
+dhcp_relay-source: dhcp-source
+dhcp_client-source: dhcp-source
+
$(DHCP_DIR)/.unpacked: $(DL_DIR)/$(DHCP_SOURCE)
$(DHCP_CAT) $(DL_DIR)/$(DHCP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(DHCP_DIR) package/dhcp/ dhcp\*.patch
@@ -37,21 +41,22 @@
$(STRIP) $(DHCP_DIR)/$(DHCP_RELAY_BINARY)
$(TARGET_DIR)/$(DHCP_SERVER_TARGET_BINARY): $(DHCP_DIR)/$(DHCP_RELAY_BINARY)
- # (cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp)
+ (cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp)
$(INSTALL) -m 0755 -D $(DHCP_DIR)/$(DHCP_SERVER_BINARY) $(TARGET_DIR)/$(DHCP_SERVER_TARGET_BINARY)
- $(INSTALL) -m 0755 -D package/dhcp/dhcpd.init $(TARGET_DIR)/etc/init.d/dhcpd
+ $(INSTALL) -m 0755 -D package/dhcp/init-server $(TARGET_DIR)/etc/init.d/S80dhcp-server
+ $(INSTALL) -m 0644 -D package/dhcp/dhcpd.conf $(TARGET_DIR)/etc/dhcp/dhcpd.conf
rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
$(TARGET_DIR)/$(DHCP_RELAY_TARGET_BINARY): $(DHCP_DIR)/$(DHCP_RELAY_BINARY)
- # (cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp)
+ (cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp)
$(INSTALL) -m 0755 -D $(DHCP_DIR)/$(DHCP_RELAY_BINARY) $(TARGET_DIR)/$(DHCP_RELAY_TARGET_BINARY)
- # $(INSTALL) -m 0755 -D package/dhcp/init-relay $(TARGET_DIR)/etc/init.d/S80dhcp-relay # no AstLinux equiv. yet
+ $(INSTALL) -m 0755 -D package/dhcp/init-relay $(TARGET_DIR)/etc/init.d/S80dhcp-relay
rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
$(TARGET_DIR)/$(DHCP_CLIENT_TARGET_BINARY): $(DHCP_DIR)/$(DHCP_RELAY_BINARY)
- # (cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp)
+ (cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp)
$(INSTALL) -m 0755 -D $(DHCP_DIR)/$(DHCP_CLIENT_BINARY) $(TARGET_DIR)/$(DHCP_CLIENT_TARGET_BINARY)
$(INSTALL) -m 0644 -D package/dhcp/dhclient.conf $(TARGET_DIR)/etc/dhcp/dhclient.conf
$(INSTALL) -m 0755 -D package/dhcp/dhclient-script $(TARGET_DIR)/sbin/dhclient-script
Modified: trunk/package/dhcp/dhcp_xecute.patch
===================================================================
--- trunk/package/dhcp/dhcp_xecute.patch 2007-04-27 18:58:37 UTC (rev 46)
+++ trunk/package/dhcp/dhcp_xecute.patch 2007-04-27 19:12:05 UTC (rev 47)
@@ -412,11 +412,11 @@
--- dhcp-3.0.2.orig/includes/dhctoken.h 2004-09-21 13:25:38.000000000 -0600
+++ dhcp-3.0.2/includes/dhctoken.h 2005-02-24 12:33:21.000000000 -0700
@@ -308,7 +308,8 @@
- REFRESH = 612,
DOMAIN_NAME = 613,
DO_FORWARD_UPDATE = 614,
-- KNOWN_CLIENTS = 615
-+ KNOWN_CLIENTS = 615,
+ KNOWN_CLIENTS = 615,
+- ATSFP = 616
++ ATSFP = 616,
+ EXECUTE = 616
};
Modified: trunk/package/dnsmasq/dnsmasq.init
===================================================================
--- trunk/package/dnsmasq/dnsmasq.init 2007-04-27 18:58:37 UTC (rev 46)
+++ trunk/package/dnsmasq/dnsmasq.init 2007-04-27 19:12:05 UTC (rev 47)
@@ -30,6 +30,15 @@
LAN3IPBASE=`echo $INT3IP | cut -d. -f1-3`
fi
+if [ "$LOCALDNS" ]
+then
+RCONF="/tmp/etc/resolv-up.conf"
+echo "search $DOMAIN
+nameserver 127.0.0.1" > /tmp/etc/resolv.conf
+else
+RCONF="/tmp/etc/resolv.conf"
+fi
+
echo "domain-needed
bogus-priv
local=/$DOMAIN/
@@ -45,6 +54,7 @@
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
@@ -80,7 +90,15 @@
dhcp-option=lan3,150,$INT3IP" >> /tmp/etc/dnsmasq.conf
fi
+echo "# Create /mnt/kd/dnsmasq.static to specify additional settings." >> /tmp/etc/dnsmasq.conf
+
+# read static mappings from a file
+if [ -e /mnt/kd/dnsmasq.static ]
+then
+cat /mnt/kd/dnsmasq.static >> /tmp/etc/dnsmasq.conf
fi
+
+fi
}
start () {
Modified: trunk/package/dnsmasq/dnsmasq.mk
===================================================================
--- trunk/package/dnsmasq/dnsmasq.mk 2007-04-27 18:58:37 UTC (rev 46)
+++ trunk/package/dnsmasq/dnsmasq.mk 2007-04-27 19:12:05 UTC (rev 47)
@@ -5,15 +5,9 @@
#############################################################
DNSMASQ_SITE=http://thekelleys.org.uk/dnsmasq
-ifeq ($(filter $(TARGETS),dnsmasq1),)
-DNSMASQ_UPVER=2.22
-DNSMASQ_VER=dnsmasq2
-else
-DNSMASQ_UPVER=1.18
-DNSMASQ_VER=dnsmasq1
-endif
-DNSMASQ_SOURCE=dnsmasq-$(DNSMASQ_UPVER).tar.gz
-DNSMASQ_DIR=$(BUILD_DIR)/dnsmasq-$(DNSMASQ_UPVER)
+DNSMASQ_VER=2.38
+DNSMASQ_SOURCE=dnsmasq-$(DNSMASQ_VER).tar.gz
+DNSMASQ_DIR=$(BUILD_DIR)/dnsmasq-$(DNSMASQ_VER)
DNSMASQ_BINARY=dnsmasq
DNSMASQ_TARGET_BINARY=usr/sbin/dnsmasq
@@ -36,7 +30,7 @@
$(STRIP) $(TARGET_DIR)/$(DNSMASQ_TARGET_BINARY)
$(INSTALL) -D -m 0755 package/dnsmasq/dnsmasq.init $(TARGET_DIR)/etc/init.d/dnsmasq
rm -rf $(TARGET_DIR)/usr/man
- ln -sf /tmp/etc/dnsmasq.conf $(TARGET_DIR)/etc/dnsmasq.conf
+ -ln -s /tmp/etc/dnsmasq.conf $(TARGET_DIR)/etc/dnsmasq.conf
dnsmasq: uclibc $(TARGET_DIR)/$(DNSMASQ_TARGET_BINARY)
Modified: trunk/package/dropbear/dropbear.mk
===================================================================
--- trunk/package/dropbear/dropbear.mk 2007-04-27 18:58:37 UTC (rev 46)
+++ trunk/package/dropbear/dropbear.mk 2007-04-27 19:12:05 UTC (rev 47)
@@ -70,8 +70,8 @@
ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/dbclient
ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/dropbearkey
ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/dropbearconvert
- # cp $(DROPBEAR_DIR)/S50dropbear $(TARGET_DIR)/etc/init.d/
- # chmod a+x $(TARGET_DIR)/etc/init.d/S50dropbear
+ cp $(DROPBEAR_DIR)/S50dropbear $(TARGET_DIR)/etc/init.d/
+ chmod a+x $(TARGET_DIR)/etc/init.d/S50dropbear
dropbear: uclibc zlib $(TARGET_DIR)/$(DROPBEAR_TARGET_BINARY)
Modified: trunk/package/e2fsprogs/e2fsprogs.mk
===================================================================
--- trunk/package/e2fsprogs/e2fsprogs.mk 2007-04-27 18:58:37 UTC (rev 46)
+++ trunk/package/e2fsprogs/e2fsprogs.mk 2007-04-27 19:12:05 UTC (rev 47)
@@ -3,7 +3,7 @@
# e2fsprogs
#
#############################################################
-E2FSPROGS_VER:=1.38
+E2FSPROGS_VER:=1.39
E2FSPROGS_SOURCE=e2fsprogs-$(E2FSPROGS_VER).tar.gz
E2FSPROGS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/e2fsprogs
E2FSPROGS_DIR=$(BUILD_DIR)/e2fsprogs-$(E2FSPROGS_VER)
Modified: trunk/package/fakeroot/Config.in
===================================================================
--- trunk/package/fakeroot/Config.in 2007-04-27 18:58:37 UTC (rev 46)
+++ trunk/package/fakeroot/Config.in 2007-04-27 19:12:05 UTC (rev 47)
@@ -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-27 19:12:05 UTC (rev 47)
@@ -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-27 18:58:37 UTC (rev 46)
+++ trunk/package/fakeroot/fakeroot.mk 2007-04-27 19:12:05 UTC (rev 47)
@@ -3,12 +3,13 @@
# fakeroot
#
#############################################################
-FAKEROOT_VERSION:=1.5.8
+FAKEROOT_VERSION:=1.6.5
FAKEROOT_SOURCE:=fakeroot_$(FAKEROOT_VERSION).tar.gz
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/package/file/file.mk
===================================================================
--- trunk/package/file/file.mk 2007-04-27 18:58:37 UTC (rev 46)
+++ trunk/package/file/file.mk 2007-04-27 19:12:05 UTC (rev 47)
@@ -3,11 +3,12 @@
# file
#
#############################################################
-FILE_VER:=4.15
+FILE_VER:=4.19
FILE_SOURCE:=file-$(FILE_VER).tar.gz
FILE_SITE:=ftp://ftp.astron.com/pub/file
-FILE_DIR1:=$(TOOL_BUILD_DIR)/file-$(FILE_VER)
-FILE_DIR2:=$(BUILD_DIR)/file-$(FILE_VER)
+FILE_SOURCE_DIR:=$(BUILD_DIR)/file-$(FILE_VER)
+FILE_DIR1:=$(TOOL_BUILD_DIR)/file-$(FILE_VER)-host
+FILE_DIR2:=$(BUILD_DIR)/file-$(FILE_VER)-target
FILE_CAT:=zcat
FILE_BINARY:=src/file
FILE_TARGET_BINARY:=usr/bin/file
@@ -23,13 +24,11 @@
# build file for use on the host system
#
#############################################################
-$(FILE_DIR1)/.unpacked: $(DL_DIR)/$(FILE_SOURCE)
- $(FILE_CAT) $(DL_DIR)/$(FILE_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
- touch $(FILE_DIR1)/.unpacked
-
-$(FILE_DIR1)/.configured: $(FILE_DIR1)/.unpacked
+$(FILE_DIR1)/.configured: $(FILE_SOURCE_DIR)/.unpacked
+ mkdir -p $(FILE_DIR1)
(cd $(FILE_DIR1); rm -rf config.cache; \
- ./configure \
+ CC="$(HOSTCC)" \
+ $(FILE_SOURCE_DIR)/configure \
--prefix=$(FILE_DIR1)/install \
);
touch $(FILE_DIR1)/.configured
@@ -51,16 +50,20 @@
# build file for use on the target system
#
#############################################################
-$(FILE_DIR2)/.unpacked: $(DL_DIR)/$(FILE_SOURCE)
+file-unpacked: $(FILE_SOURCE_DIR)/.unpacked
+$(FILE_SOURCE_DIR)/.unpacked: $(DL_DIR)/$(FILE_SOURCE)
$(FILE_CAT) $(DL_DIR)/$(FILE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(FILE_DIR2) package/file/ file\*.patch
- touch $(FILE_DIR2)/.unpacked
+ toolchain/patch-kernel.sh $(FILE_SOURCE_DIR) package/file/ file\*.patch
+ $(CONFIG_UPDATE) $(FILE_SOURCE_DIR)
+ touch $(FILE_SOURCE_DIR)/.unpacked
-$(FILE_DIR2)/.configured: $(FILE_DIR2)/.unpacked
+$(FILE_DIR2)/.configured: $(FILE_SOURCE_DIR)/.unpacked
+ mkdir -p $(FILE_DIR2)
(cd $(FILE_DIR2); rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
- ./configure \
+ LDFLAGS="$(TARGET_LDFLAGS)" \
+ $(FILE_SOURCE_DIR)/configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
@@ -68,6 +71,7 @@
--exec-prefix=/usr \
--bindir=/usr/bin \
--sbindir=/usr/sbin \
+ --libdir=/lib \
--libexecdir=/usr/lib \
--sysconfdir=/etc \
--datadir=/usr/share/misc \
@@ -82,13 +86,16 @@
touch $(FILE_DIR2)/.configured
$(FILE_DIR2)/$(FILE_BINARY): $(FILE_DIR2)/.configured $(TOOL_BUILD_DIR)/bin/file
- $(MAKE) $(TARGET_CONFIGURE_OPTS) LDFLAGS="-static" -C $(FILE_DIR2)
+ $(MAKE) $(TARGET_CONFIGURE_OPTS) LDFLAGS="$(TARGET_LDFLAGS) -static" -C $(FILE_DIR2)
$(TARGET_DIR)/$(FILE_TARGET_BINARY): $(FILE_DIR2)/$(FILE_BINARY)
- $(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) -C $(FILE_DIR2) install
+ $(MAKE) $(TARGET_CONFIGURE_OPTS) LDFLAGS="$(TARGET_LDFLAGS)" DESTDIR=$(TARGET_DIR) -C $(FILE_DIR2) install
-($(STRIP) $(TARGET_DIR)/usr/lib/libmagic.so.*.* > /dev/null 2>&1)
rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
+ mv $(TARGET_DIR)/lib/libmagic.a $(STAGING_DIR)/lib
+ rm -f $(TARGET_DIR)/lib/libmagic.la
+ mv $(TARGET_DIR)/usr/include/magic.h $(STAGING_DIR)/include
file: zlib uclibc $(TARGET_DIR)/$(FILE_TARGET_BINARY)
Added: trunk/package/hotplug/diethotplug-0.5.tar
===================================================================
(Binary files differ)
Property changes on: trunk/package/hotplug/diethotplug-0.5.tar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/package/hotplug/hotplug.mk
===================================================================
--- trunk/package/hotplug/hotplug.mk 2007-04-27 18:58...
[truncated message content] |
|
From: <kr...@us...> - 2007-04-27 18:58:40
|
Revision: 46
http://svn.sourceforge.net/runnix/?rev=46&view=rev
Author: krisk84
Date: 2007-04-27 11:58:37 -0700 (Fri, 27 Apr 2007)
Log Message:
-----------
still going...
Modified Paths:
--------------
trunk/package/Config.in
Removed Paths:
-------------
trunk/package/coreutils/
trunk/package/diffutils/
trunk/package/findutils/
trunk/package/gzip/
trunk/package/less/
Modified: trunk/package/Config.in
===================================================================
--- trunk/package/Config.in 2007-04-27 18:56:47 UTC (rev 45)
+++ trunk/package/Config.in 2007-04-27 18:58:37 UTC (rev 46)
@@ -5,15 +5,6 @@
source "package/busybox/Config.in"
source "package/linux/Config.in"
-comment "The minimum needed to build a uClibc development system"
-source "package/coreutils/Config.in"
-source "package/diffutils/Config.in"
-source "package/findutils/Config.in"
-source "package/flex/Config.in"
-source "toolchain/gcc/Config.in.2"
-source "toolchain/ccache/Config.in.2"
-
-
comment "Other stuff"
source "package/acpid/Config.in"
source "package/at/Config.in"
@@ -31,7 +22,6 @@
source "package/fakeroot/Config.in"
source "package/file/Config.in"
source "package/gettext/Config.in"
-source "package/gzip/Config.in"
source "package/hotplug/Config.in"
source "package/inadyn/Config.in"
source "package/iostat/Config.in"
@@ -40,7 +30,6 @@
source "package/iptables/Config.in"
source "package/kexectools/Config.in"
source "package/lcdproc/Config.in"
-source "package/less/Config.in"
source "package/libelf/Config.in"
source "package/libfloat/Config.in"
source "package/libpcap/Config.in"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2007-04-27 18:56:49
|
Revision: 45
http://svn.sourceforge.net/runnix/?rev=45&view=rev
Author: krisk84
Date: 2007-04-27 11:56:47 -0700 (Fri, 27 Apr 2007)
Log Message:
-----------
yet more deletions
Modified Paths:
--------------
trunk/package/Config.in
Removed Paths:
-------------
trunk/package/autoconf/
trunk/package/automake/
trunk/package/bzip2/
trunk/package/ed/
trunk/package/flex/
trunk/package/sed/
trunk/package/tar/
Modified: trunk/package/Config.in
===================================================================
--- trunk/package/Config.in 2007-04-27 18:54:39 UTC (rev 44)
+++ trunk/package/Config.in 2007-04-27 18:56:47 UTC (rev 45)
@@ -6,27 +6,17 @@
source "package/linux/Config.in"
comment "The minimum needed to build a uClibc development system"
-source "package/bash/Config.in"
-source "package/bzip2/Config.in"
source "package/coreutils/Config.in"
source "package/diffutils/Config.in"
-source "package/ed/Config.in"
source "package/findutils/Config.in"
source "package/flex/Config.in"
source "toolchain/gcc/Config.in.2"
source "toolchain/ccache/Config.in.2"
-source "package/grep/Config.in"
-source "package/make/Config.in"
-source "package/patch/Config.in"
-source "package/sed/Config.in"
-source "package/tar/Config.in"
comment "Other stuff"
source "package/acpid/Config.in"
source "package/at/Config.in"
-source "package/autoconf/Config.in"
-source "package/automake/Config.in"
source "package/bison/Config.in"
source "package/bridge/Config.in"
source "package/customize/Config.in"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2007-04-27 18:54:41
|
Revision: 44
http://svn.sourceforge.net/runnix/?rev=44&view=rev
Author: krisk84
Date: 2007-04-27 11:54:39 -0700 (Fri, 27 Apr 2007)
Log Message:
-----------
more deletions
Modified Paths:
--------------
trunk/package/Config.in
Removed Paths:
-------------
trunk/package/libcgicc/
Modified: trunk/package/Config.in
===================================================================
--- trunk/package/Config.in 2007-04-27 18:52:43 UTC (rev 43)
+++ trunk/package/Config.in 2007-04-27 18:54:39 UTC (rev 44)
@@ -13,7 +13,6 @@
source "package/ed/Config.in"
source "package/findutils/Config.in"
source "package/flex/Config.in"
-source "package/gawk/Config.in"
source "toolchain/gcc/Config.in.2"
source "toolchain/ccache/Config.in.2"
source "package/grep/Config.in"
@@ -28,9 +27,7 @@
source "package/at/Config.in"
source "package/autoconf/Config.in"
source "package/automake/Config.in"
-source "package/berkeleydb/Config.in"
source "package/bison/Config.in"
-source "package/boa/Config.in"
source "package/bridge/Config.in"
source "package/customize/Config.in"
source "package/dhcp/Config.in"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2007-04-27 18:52:45
|
Revision: 43
http://svn.sourceforge.net/runnix/?rev=43&view=rev
Author: krisk84
Date: 2007-04-27 11:52:43 -0700 (Fri, 27 Apr 2007)
Log Message:
-----------
remove a few more packages
Modified Paths:
--------------
trunk/package/Config.in
Removed Paths:
-------------
trunk/package/hostap/
trunk/package/ltp-testsuite/
trunk/package/ltrace/
trunk/package/ltt/
trunk/package/ntp/
Modified: trunk/package/Config.in
===================================================================
--- trunk/package/Config.in 2007-04-27 18:49:45 UTC (rev 42)
+++ trunk/package/Config.in 2007-04-27 18:52:43 UTC (rev 43)
@@ -45,7 +45,6 @@
source "package/file/Config.in"
source "package/gettext/Config.in"
source "package/gzip/Config.in"
-source "package/hostap/Config.in"
source "package/hotplug/Config.in"
source "package/inadyn/Config.in"
source "package/iostat/Config.in"
@@ -63,9 +62,6 @@
source "package/libusb/Config.in"
source "package/links/Config.in"
source "package/lrzsz/Config.in"
-source "package/ltp-testsuite/Config.in"
-source "package/ltrace/Config.in"
-source "package/ltt/Config.in"
source "package/lvm2/Config.in"
source "package/lzo/Config.in"
source "package/m4/Config.in"
@@ -83,7 +79,6 @@
source "package/ncurses/Config.in"
source "package/netsnmp/Config.in"
source "package/newt/Config.in"
-source "package/ntp/Config.in"
source "package/openntpd/Config.in"
source "package/openssh/Config.in"
source "package/openssl/Config.in"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2007-04-27 18:49:47
|
Revision: 42
http://svn.sourceforge.net/runnix/?rev=42&view=rev
Author: krisk84
Date: 2007-04-27 11:49:45 -0700 (Fri, 27 Apr 2007)
Log Message:
-----------
delete some un-needed packages
Modified Paths:
--------------
trunk/package/Config.in
Removed Paths:
-------------
trunk/package/asterisk/
trunk/package/asterisknativesounds/
trunk/package/astmanproxy/
trunk/package/berkeleydb/
trunk/package/bind/
trunk/package/boa/
trunk/package/chansccp/
trunk/package/cvs/
trunk/package/directfb/
trunk/package/flite/
trunk/package/freetype/
trunk/package/gawk/
trunk/package/jpeg/
trunk/package/libcgi/
trunk/package/libglib12/
trunk/package/libmad/
trunk/package/libpng/
trunk/package/libpri/
trunk/package/lighttpd/
trunk/package/mdadm/
trunk/package/memtester/
trunk/package/microcom/
trunk/package/microwin/
trunk/package/netkitbase/
trunk/package/netkittelnet/
trunk/package/portage/
trunk/package/python/
trunk/package/qte/
trunk/package/resconv/
trunk/package/rxvt/
trunk/package/sdl/
trunk/package/sox/
trunk/package/sysklogd/
trunk/package/tcl/
trunk/package/thttpd/
trunk/package/tinylogin/
trunk/package/tinyx/
trunk/package/tn5250/
trunk/package/ttcp/
trunk/package/valgrind/
trunk/package/wanpipe/
trunk/package/wipe/
trunk/package/xfsprogs/
trunk/package/xorg/
trunk/package/zaptel/
Modified: trunk/package/Config.in
===================================================================
--- trunk/package/Config.in 2006-06-20 03:12:04 UTC (rev 41)
+++ trunk/package/Config.in 2007-04-27 18:49:45 UTC (rev 42)
@@ -25,22 +25,16 @@
comment "Other stuff"
source "package/acpid/Config.in"
-source "package/asterisk/Config.in"
-source "package/asterisknativesounds/Config.in"
-source "package/astmanproxy/Config.in"
source "package/at/Config.in"
source "package/autoconf/Config.in"
source "package/automake/Config.in"
source "package/berkeleydb/Config.in"
-source "package/bind/Config.in"
source "package/bison/Config.in"
source "package/boa/Config.in"
source "package/bridge/Config.in"
-source "package/chansccp/Config.in"
source "package/customize/Config.in"
source "package/dhcp/Config.in"
source "package/dialog/Config.in"
-source "package/directfb/Config.in"
source "package/distcc/Config.in"
source "package/dm/Config.in"
source "package/dnsmasq/Config.in"
@@ -49,8 +43,6 @@
source "package/e2fsprogs/Config.in"
source "package/fakeroot/Config.in"
source "package/file/Config.in"
-source "package/flite/Config.in"
-source "package/freetype/Config.in"
source "package/gettext/Config.in"
source "package/gzip/Config.in"
source "package/hostap/Config.in"
@@ -60,23 +52,15 @@
source "package/iproute2/Config.in"
source "package/ipsec-tools/Config.in"
source "package/iptables/Config.in"
-source "package/jpeg/Config.in"
source "package/kexectools/Config.in"
source "package/lcdproc/Config.in"
source "package/less/Config.in"
-source "package/libcgi/Config.in"
-source "package/libcgicc/Config.in"
source "package/libelf/Config.in"
source "package/libfloat/Config.in"
-source "package/libglib12/Config.in"
-source "package/libmad/Config.in"
source "package/libpcap/Config.in"
-source "package/libpng/Config.in"
-source "package/libpri/Config.in"
source "package/libsysfs/Config.in"
source "package/libtool/Config.in"
source "package/libusb/Config.in"
-source "package/lighttpd/Config.in"
source "package/links/Config.in"
source "package/lrzsz/Config.in"
source "package/ltp-testsuite/Config.in"
@@ -86,11 +70,7 @@
source "package/lzo/Config.in"
source "package/m4/Config.in"
source "package/madwifi/Config.in"
-source "package/mdadm/Config.in"
-source "package/memtester/Config.in"
-source "package/microcom/Config.in"
source "package/microperl/Config.in"
-source "package/microwin/Config.in"
source "package/minihttpd/Config.in"
source "package/mkdosfs/Config.in"
source "package/module-init-tools/Config.in"
@@ -101,8 +81,6 @@
source "package/mtd/Config.in"
source "package/nano/Config.in"
source "package/ncurses/Config.in"
-source "package/netkitbase/Config.in"
-source "package/netkittelnet/Config.in"
source "package/netsnmp/Config.in"
source "package/newt/Config.in"
source "package/ntp/Config.in"
@@ -113,52 +91,32 @@
source "package/pciutils/Config.in"
source "package/pcmcia/Config.in"
source "package/php4/Config.in"
-source "package/portage/Config.in"
source "package/portmap/Config.in"
source "package/pppd/Config.in"
source "package/procps/Config.in"
source "package/psmisc/Config.in"
-source "package/python/Config.in"
-source "package/qte/Config.in"
source "package/raidtools/Config.in"
source "package/readline/Config.in"
-source "package/resconv/Config.in"
source "package/rsync/Config.in"
source "package/ruby/Config.in"
-source "package/rxvt/Config.in"
source "package/screen/Config.in"
-source "package/sdl/Config.in"
source "package/sfdisk/Config.in"
source "package/slang/Config.in"
source "package/smartmontools/Config.in"
source "package/socat/Config.in"
-source "package/sox/Config.in"
source "package/strace/Config.in"
-source "package/sysklogd/Config.in"
source "package/sysvinit/Config.in"
-source "package/tcl/Config.in"
source "package/tcpdump/Config.in"
source "package/tftpd/Config.in"
-source "package/thttpd/Config.in"
-source "package/tinylogin/Config.in"
-source "package/tinyx/Config.in"
-source "package/tn5250/Config.in"
-source "package/ttcp/Config.in"
source "package/udev/Config.in"
source "package/udhcp/Config.in"
source "package/usbutils/Config.in"
source "package/util-linux/Config.in"
-source "package/valgrind/Config.in"
source "package/vsftpd/Config.in"
source "package/vtun/Config.in"
-source "package/wanpipe/Config.in"
source "package/wget/Config.in"
source "package/which/Config.in"
-source "package/wipe/Config.in"
source "package/wireless-tools/Config.in"
-source "package/xfsprogs/Config.in"
-source "package/xorg/Config.in"
-source "package/zaptel/Config.in"
source "package/zlib/Config.in"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2006-06-20 03:12:08
|
Revision: 41 Author: krisk84 Date: 2006-06-19 20:12:04 -0700 (Mon, 19 Jun 2006) ViewCVS: http://svn.sourceforge.net/runnix/?rev=41&view=rev Log Message: ----------- SF test commit Modified Paths: -------------- trunk/makeimage.sh Modified: trunk/makeimage.sh =================================================================== --- trunk/makeimage.sh 2006-06-13 13:43:52 UTC (rev 40) +++ trunk/makeimage.sh 2006-06-20 03:12:04 UTC (rev 41) @@ -34,6 +34,7 @@ exit 1 fi +# loop code might be broken if [ -d /dev/loop ] then LOOPD=/dev/loop/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
