summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/distro/openslug.conf2
-rw-r--r--files/device_table-nslu2.txt40
-rw-r--r--files/device_table-unslung.txt40
-rw-r--r--nslu2-binary-only/nslu2-unslung-ramdisk/unslung.patch224
-rw-r--r--nslu2-binary-only/nslu2-unslung-ramdisk_2.3r25.oe4
-rw-r--r--uclibc/uclibc-cvs/dyn-ldconfig.patch16
-rw-r--r--uclibc/uclibc_cvs.oe2
7 files changed, 324 insertions, 4 deletions
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index af00ac8ec5..7bbca480fd 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -3,7 +3,7 @@
#@DESCRIPTION: OpenSlug Linux Distribution for the NSLU2
TARGET_FPU ?= "soft"
-TARGET_OS ?= "linux-uclibc"
+TARGET_OS = "linux-uclibc"
INHERIT += " package_ipk debian nslu2_flashimg"
diff --git a/files/device_table-nslu2.txt b/files/device_table-nslu2.txt
index e69de29bb2..1ad44c30e9 100644
--- a/files/device_table-nslu2.txt
+++ b/files/device_table-nslu2.txt
@@ -0,0 +1,40 @@
+# <path> <type> <mode> <uid> <gid> <major> <minor> <start> <inc> <count>
+# /dev/mem c 640 0 0 1 1 0 0 -
+# f A regular file
+# d Directory
+# c Character special device file
+# b Block special device file
+# p Fifo (named pipe)
+/dev d 755 0 0 - - - - -
+/dev/console c 622 0 0 5 1 - - -
+/dev/cua c 622 0 0 5 64 0 1 2
+/dev/flash d 755 0 0 - - - - -
+/dev/flash/config c 644 0 0 90 6 - - -
+/dev/ipsec c 644 0 0 36 10 - - -
+/dev/kmem c 640 0 0 1 2 - - -
+/dev/ledman c 644 0 0 126 0 - - -
+/dev/mem c 640 0 0 1 1 - - -
+/dev/mtd c 664 0 0 90 0 0 2 4
+/dev/mtdblock b 644 0 0 31 0 0 1 4
+/dev/mtdr c 664 0 0 90 0 1 2 4
+/dev/null c 666 0 0 1 3 - - -
+/dev/pbuttons c 664 0 0 60 0 - - -
+/dev/ppp c 644 0 0 108 0 - - -
+/dev/ptyp c 644 0 0 2 0 0 1 10
+/dev/ram b 644 0 0 1 0 0 1 4
+/dev/random c 644 0 0 1 8 - - -
+/dev/rbuttons c 644 0 0 61 0 - - -
+/dev/rtc c 644 0 0 10 135 - - -
+/dev/sda b 664 0 0 8 0 - - -
+/dev/sda b 664 0 0 8 1 1 1 4
+/dev/sdb b 664 0 0 8 16 - - -
+/dev/sdb b 664 0 0 8 17 1 1 4
+/dev/sdc b 664 0 0 8 32 - - -
+/dev/sdc b 664 0 0 8 33 1 1 4
+/dev/tty c 666 0 0 5 0 - - -
+/dev/tty c 644 0 0 4 0 0 1 10
+/dev/ttyS c 644 0 0 4 64 0 1 2
+/dev/ttyp c 644 0 0 3 0 0 1 10
+/dev/urandom c 644 0 0 1 9 - - -
+/dev/zero c 666 0 0 1 5 - - -
+/bin/tinylogin f 6755 0 0 - - - - -
diff --git a/files/device_table-unslung.txt b/files/device_table-unslung.txt
index e69de29bb2..1ad44c30e9 100644
--- a/files/device_table-unslung.txt
+++ b/files/device_table-unslung.txt
@@ -0,0 +1,40 @@
+# <path> <type> <mode> <uid> <gid> <major> <minor> <start> <inc> <count>
+# /dev/mem c 640 0 0 1 1 0 0 -
+# f A regular file
+# d Directory
+# c Character special device file
+# b Block special device file
+# p Fifo (named pipe)
+/dev d 755 0 0 - - - - -
+/dev/console c 622 0 0 5 1 - - -
+/dev/cua c 622 0 0 5 64 0 1 2
+/dev/flash d 755 0 0 - - - - -
+/dev/flash/config c 644 0 0 90 6 - - -
+/dev/ipsec c 644 0 0 36 10 - - -
+/dev/kmem c 640 0 0 1 2 - - -
+/dev/ledman c 644 0 0 126 0 - - -
+/dev/mem c 640 0 0 1 1 - - -
+/dev/mtd c 664 0 0 90 0 0 2 4
+/dev/mtdblock b 644 0 0 31 0 0 1 4
+/dev/mtdr c 664 0 0 90 0 1 2 4
+/dev/null c 666 0 0 1 3 - - -
+/dev/pbuttons c 664 0 0 60 0 - - -
+/dev/ppp c 644 0 0 108 0 - - -
+/dev/ptyp c 644 0 0 2 0 0 1 10
+/dev/ram b 644 0 0 1 0 0 1 4
+/dev/random c 644 0 0 1 8 - - -
+/dev/rbuttons c 644 0 0 61 0 - - -
+/dev/rtc c 644 0 0 10 135 - - -
+/dev/sda b 664 0 0 8 0 - - -
+/dev/sda b 664 0 0 8 1 1 1 4
+/dev/sdb b 664 0 0 8 16 - - -
+/dev/sdb b 664 0 0 8 17 1 1 4
+/dev/sdc b 664 0 0 8 32 - - -
+/dev/sdc b 664 0 0 8 33 1 1 4
+/dev/tty c 666 0 0 5 0 - - -
+/dev/tty c 644 0 0 4 0 0 1 10
+/dev/ttyS c 644 0 0 4 64 0 1 2
+/dev/ttyp c 644 0 0 3 0 0 1 10
+/dev/urandom c 644 0 0 1 9 - - -
+/dev/zero c 666 0 0 1 5 - - -
+/bin/tinylogin f 6755 0 0 - - - - -
diff --git a/nslu2-binary-only/nslu2-unslung-ramdisk/unslung.patch b/nslu2-binary-only/nslu2-unslung-ramdisk/unslung.patch
index e69de29bb2..3eba560611 100644
--- a/nslu2-binary-only/nslu2-unslung-ramdisk/unslung.patch
+++ b/nslu2-binary-only/nslu2-unslung-ramdisk/unslung.patch
@@ -0,0 +1,224 @@
+diff -BurN /dev/null/nslu/.unslung /mnt/nslu/.unslung
+--- /dev/null/nslu/.unslung 1970-01-01 09:30:00.000000000 +0930
++++ /mnt/nslu/.unslung 2004-08-30 21:46:35.000000000 +0930
+@@ -0,0 +1 @@
++V2.3R25-uNSLUng-X.Y
+\ No newline at end of file
+diff -BurN /dev/null/nslu/etc/passwd /mnt/nslu/etc/passwd
+--- /dev/null/nslu/etc/passwd 2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/passwd 2004-08-30 09:02:51.000000000 -0400
+@@ -1,4 +1,4 @@
+-root:WeeOvKUvbQ6nI:0:0:root:/root:/bin/sh
++root:t1PLUeOinN/eI:0:0:root:/root:/bin/sh
+ bin:x:1:1:bin:/bin:
+ lp:x:4:7:lp:/share/spool:
+ mail:x:8:12:mail:/var/spool/mail:
+diff -BurN /dev/null/nslu/etc/profile /mnt/nslu/etc/profile
+--- /dev/null/nslu/etc/profile 1969-12-31 19:00:00.000000000 -0500
++++ /mnt/nslu/etc/profile 2004-08-30 09:02:51.000000000 -0400
+@@ -0,0 +1,2 @@
++export PATH=$PATH:/opt/bin:/opt/sbin:/opt/usr/bin:/opt/usr/sbin
++export LD_LIBRARY_PATH=/opt/lib
+diff -BurN /dev/null/nslu/etc/rc /mnt/nslu/etc/rc
+--- /dev/null/nslu/etc/rc 2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc 2004-09-01 21:47:47.000000000 -0400
+@@ -1,4 +1,7 @@
+ ## Simple beta script to verify csr
++
++if ( [ -f /unslung/rc ] && . /unslung/rc ) ; then return 0 ; fi
++
+ /usr/bin/Set_Led r_blinking &
+ mount -t proc proc /proc
+ mount -o remount,rw /dev/root /
+diff -BurN /dev/null/nslu/etc/rc.d/rc.1 /mnt/nslu/etc/rc.d/rc.1
+--- /dev/null/nslu/etc/rc.d/rc.1 2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.1 2004-09-01 21:56:17.000000000 -0400
+@@ -1,5 +1,7 @@
+ #!/bin/sh
+
++if ( [ -f /unslung/rc.1 ] && . /unslung/rc.1 ) ; then return 0 ; fi
++
+ #/sbin/ifconfig ixp0 hw ether 00:C0:02:01:01:04
+ /bin/echo "Starting Set CGI_ds.conf:"; /etc/rc.d/rc.bootbin; check_status
+
+@@ -17,6 +19,10 @@
+ /bin/echo "Starting Crond :"; . /etc/rc.d/rc.crond
+ /bin/echo "Starting Rest Task :"; . /etc/rc.d/rc.local
+
++if [ -f /.unslung ] ; then
++ /bin/echo "Starting UNSLUNG Packages:"; ( . /etc/rc.d/rc.unslung )
++fi
++
+ /usr/bin/Set_Led ready
+ /usr/bin/Set_Led beep1
+ /bin/echo "Checking disk status :"; /usr/sbin/CheckDiskFull 2 >/dev/null
+diff -BurN /dev/null/nslu/etc/rc.d/rc.crond /mnt/nslu/etc/rc.d/rc.crond
+--- /dev/null/nslu/etc/rc.d/rc.crond 2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.crond 2004-09-01 21:56:37.000000000 -0400
+@@ -1,5 +1,7 @@
+ #!/bin/sh
+
++if ( [ -r /unslung/rc.crond ] && . /unslung/rc.crond ) ; then return 0 ; fi
++
+ if [ -n "`pidof crond`" ] ;then
+ /bin/killall crond 2>/dev/null
+ fi
+diff -BurN /dev/null/nslu/etc/rc.d/rc.halt /mnt/nslu/etc/rc.d/rc.halt
+--- /dev/null/nslu/etc/rc.d/rc.halt 2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.halt 2004-09-01 21:57:01.000000000 -0400
+@@ -1,4 +1,7 @@
+ #!/bin/sh
++
++if ( [ -r /unslung/rc.halt ] && . /unslung/rc.halt ) ; then return 0 ; fi
++
+ /bin/killall -2 upnpd &>/dev/null
+ /bin/killall nmbd &>/dev/null
+ /bin/killall smbd &>/dev/null
+diff -BurN /dev/null/nslu/etc/rc.d/rc.local /mnt/nslu/etc/rc.d/rc.local
+--- /dev/null/nslu/etc/rc.d/rc.local 2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.local 2004-09-01 21:57:17.000000000 -0400
+@@ -1,5 +1,9 @@
+ #!/bin/sh
++
+ HOSTNAME=`hostname`
++
++if ( [ -r /unslung/rc.local ] && . /unslung/rc.local ) ; then return 0 ; fi
++
+ /usr/sbin/CheckResetButton 2>/dev/null
+ /usr/sbin/CheckPowerButton 2>/dev/null
+ /usr/sbin/do_umount 2>/dev/null
+diff -BurN /dev/null/nslu/etc/rc.d/rc.modules /mnt/nslu/etc/rc.d/rc.modules
+--- /dev/null/nslu/etc/rc.d/rc.modules 2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.modules 2004-09-01 21:57:34.000000000 -0400
+@@ -1,4 +1,7 @@
+ #!/bin/sh
++
++if ( [ -f /unslung/rc.modules ] && . /unslung/rc.modules ) ; then return 0 ; fi
++
+ insmod pbuttons &>/dev/null
+ insmod rbuttons &>/dev/null
+ insmod x1226-rtc &>/dev/null
+diff -BurN /dev/null/nslu/etc/rc.d/rc.network /mnt/nslu/etc/rc.d/rc.network
+--- /dev/null/nslu/etc/rc.d/rc.network 2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.network 2004-09-01 21:57:46.000000000 -0400
+@@ -1,3 +1,6 @@
+ #!/bin/sh
++
++if ( [ -f /unslung/rc.network ] && . /unslung/rc.network ) ; then return 0 ; fi
++
+ /sbin/ifup; #check_status
+ /bin/echo "call rc.network!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+diff -BurN /dev/null/nslu/etc/rc.d/rc.quickset /mnt/nslu/etc/rc.d/rc.quickset
+--- /dev/null/nslu/etc/rc.d/rc.quickset 2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.quickset 2004-09-01 21:57:57.000000000 -0400
+@@ -1,3 +1,6 @@
+ #!/bin/sh
++
++if ( [ -f /unslung/rc.quickset ] && . /unslung/rc.quickset ) ; then return 0 ; fi
++
+ /usr/sbin/QuickSet; check_status
+ /usr/sbin/USB_Detect; check_status
+diff -BurN /dev/null/nslu/etc/rc.d/rc.quota /mnt/nslu/etc/rc.d/rc.quota
+--- /dev/null/nslu/etc/rc.d/rc.quota 2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.quota 2004-09-01 21:58:08.000000000 -0400
+@@ -1,5 +1,7 @@
+ #!/bin/sh
+
++if ( [ -f /unslung/rc.quota ] && . /unslung/rc.quota ) ; then return 0 ; fi
++
+ # Check and turn on disk quota.
+ if [ -x "/usr/bin/quotacheck" ]
+ then
+diff -BurN /dev/null/nslu/etc/rc.d/rc.reboot /mnt/nslu/etc/rc.d/rc.reboot
+--- /dev/null/nslu/etc/rc.d/rc.reboot 2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.reboot 2004-09-01 21:58:19.000000000 -0400
+@@ -1,4 +1,7 @@
+ #!/bin/sh
++
++if ( [ -r /unslung/rc.reboot ] && . /unslung/rc.reboot ) ; then return 0 ; fi
++
+ /bin/killall -2 upnpd 2>/dev/null
+ sleep 4
+ /sbin/ifdown ixp0
+diff -BurN /dev/null/nslu/etc/rc.d/rc.reset_usrgrpshare /mnt/nslu/etc/rc.d/rc.reset_usrgrpshare
+--- /dev/null/nslu/etc/rc.d/rc.reset_usrgrpshare 2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.reset_usrgrpshare 2004-09-01 21:58:36.000000000 -0400
+@@ -1,2 +1,5 @@
+ #!/bin/sh
++
++if ( [ -f /unslung/rc.reset_usrgrpshare ] && . /unslung/rc.reset_usrgrpshare ) ; then return 0 ; fi
++
+ /usr/sbin/reset_ugs;
+diff -BurN /dev/null/nslu/etc/rc.d/rc.rstimezone /mnt/nslu/etc/rc.d/rc.rstimezone
+--- /dev/null/nslu/etc/rc.d/rc.rstimezone 2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.rstimezone 2004-09-01 21:58:47.000000000 -0400
+@@ -1,4 +1,7 @@
+ #!/bin/sh
++
++if ( [ -f /unslung/rc.rstimezone ] && . /unslung/rc.rstimezone ) ; then return 0 ; fi
++
+ #TIME=`/usr/sbin/hwclock`
+ /usr/sbin/Set_TimeZone >/dev/null
+ #/bin/date -s "$TIME"
+diff -BurN /dev/null/nslu/etc/rc.d/rc.samba /mnt/nslu/etc/rc.d/rc.samba
+--- /dev/null/nslu/etc/rc.d/rc.samba 2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.samba 2004-09-01 21:58:57.000000000 -0400
+@@ -1,4 +1,7 @@
+ #!/bin/sh
++
++if ( [ -f /unslung/rc.samba ] && . /unslung/rc.samba ) ; then return 0 ; fi
++
+ if [ -n "`pidof smbd`" ] ; then
+ killall smbd 2>/dev/null
+ fi
+diff -BurN /dev/null/nslu/etc/rc.d/rc.sysinit /mnt/nslu/etc/rc.d/rc.sysinit
+--- /dev/null/nslu/etc/rc.d/rc.sysinit 2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.sysinit 2004-09-01 21:59:04.000000000 -0400
+@@ -1,7 +1,16 @@
+ #!/bin/sh
++
+ export PATH=/bin:/sbin:/usr/bin:/usr/sbin
++
++if [ -f /.unslung ] ; then
++ export PATH=${PATH}:/opt/bin:/opt/sbin:/opt/usr/bin:/opt/usr/sbin
++fi
++
+ . /etc/rc.d/rc.functions
+ . /etc/sysconfig/network
++
++if ( [ -f /unslung/rc.sysinit ] && . /unslung/rc.sysinit ) ; then return 0 ; fi
++
+ mkdir -p /var/lock/samba >/dev/null
+ /bin/echo "Creating ramfs for /var/lock/samba:"; mount -t ramfs none /var/lock/samba -o maxsize=64
+ /bin/echo "Limit the space of log folder:"; mount -t ramfs none /var/log -o maxsize=128
+diff -BurN /dev/null/nslu/etc/rc.d/rc.thttpd /mnt/nslu/etc/rc.d/rc.thttpd
+--- /dev/null/nslu/etc/rc.d/rc.thttpd 2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.thttpd 2004-09-01 21:59:13.000000000 -0400
+@@ -1,4 +1,7 @@
+ #!/bin/sh
++
++if ( [ -f /unslung/rc.thttpd ] && . /unslung/rc.thttpd ) ; then return 0 ; fi
++
+ if [ -n "`pidof thttpd`" ] ;then
+ /bin/killall thttpd 2>/dev/null
+ fi
+diff -BurN /dev/null/nslu/etc/rc.d/rc.xinetd /mnt/nslu/etc/rc.d/rc.xinetd
+--- /dev/null/nslu/etc/rc.d/rc.xinetd 2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.xinetd 2004-09-01 21:59:34.000000000 -0400
+@@ -1,4 +1,7 @@
+ #!/bin/sh
++
++if ( [ -f /unslung/rc.xinetd ] && . /unslung/rc.xinetd ) ; then return 0 ; fi
++
+ if [ -n "`pidof inetd`" ] ;then
+ killall inetd 2>/dev/null
+ # killall -9 inetd &>/dev/null
+diff -BurN /dev/null/nslu/usr/local/passwd /mnt/nslu/usr/local/passwd
+--- /dev/null/nslu/usr/local/passwd 2004-07-27 23:37:56.000000000 -0400
++++ /mnt/nslu/usr/local/passwd 2004-08-30 09:02:51.000000000 -0400
+@@ -1,4 +1,4 @@
+-root:WeeOvKUvbQ6nI:0:0:root:/root:/bin/sh
++root:t1PLUeOinN/eI:0:0:root:/root:/bin/sh
+ bin:x:1:1:bin:/bin:
+ lp:x:4:7:lp:/share/spool:
+ mail:x:8:12:mail:/var/spool/mail:
diff --git a/nslu2-binary-only/nslu2-unslung-ramdisk_2.3r25.oe b/nslu2-binary-only/nslu2-unslung-ramdisk_2.3r25.oe
index 68cebf19a1..ea5bfd0f04 100644
--- a/nslu2-binary-only/nslu2-unslung-ramdisk_2.3r25.oe
+++ b/nslu2-binary-only/nslu2-unslung-ramdisk_2.3r25.oe
@@ -1,8 +1,8 @@
SECTION = "base"
-PR = "r5"
+PR = "r6"
-UNSLUNG_VERSION = 2.3-alpha
+UNSLUNG_VERSION = 2.4-alpha
UNSLUNG_SUFFIX =
SRC_URI = "http://www.nslu2-linux.org/nslu2-linksys-ramdisk-2.3r25.tar.bz2 \
diff --git a/uclibc/uclibc-cvs/dyn-ldconfig.patch b/uclibc/uclibc-cvs/dyn-ldconfig.patch
index e69de29bb2..f97bc2fe52 100644
--- a/uclibc/uclibc-cvs/dyn-ldconfig.patch
+++ b/uclibc/uclibc-cvs/dyn-ldconfig.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- uClibc/utils/Makefile~dyn-ldconfig
++++ uClibc/utils/Makefile
+@@ -43,7 +43,7 @@
+ $(STRIPTOOL) -x -R .note -R .comment $@
+
+ ldconfig: ldconfig.c readsoname.c
+- $(CC) $(CFLAGS) -Wl,-s -static \
++ $(CC) $(CFLAGS) -Wl,-s \
+ -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" \
+ -DUCLIBC_LDSO=$(UCLIBC_LDSO) -I. -I../ldso/include \
+ $^ -o $@
diff --git a/uclibc/uclibc_cvs.oe b/uclibc/uclibc_cvs.oe
index 482c280d9d..df6bfecfd9 100644
--- a/uclibc/uclibc_cvs.oe
+++ b/uclibc/uclibc_cvs.oe
@@ -4,7 +4,7 @@ SECTION = "libs"
PRIORITY = "required"
MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
PV = "0.0cvs${CVSDATE}"
-PR = "r3"
+PR = "r4"
DEFAULT_PREFERENCE = "1"
#
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-03 19:11:30 +0000