diff options
| -rw-r--r-- | conf/distro/openslug.conf | 2 | ||||
| -rw-r--r-- | conf/distro/unslung.conf | 2 | ||||
| -rw-r--r-- | packages/linux/openslug-kernel-2.6.11.2/anonymiser.patch | 22 | ||||
| -rw-r--r-- | packages/linux/unslung-kernel-2.3r25/anonymiser.patch | 24 | ||||
| -rw-r--r-- | packages/nslu2-binary-only/unslung-rootfs-2.3r25/NOTES | 15 | ||||
| -rw-r--r-- | packages/nslu2-binary-only/unslung-rootfs_2.3r25.bb | 4 |
6 files changed, 65 insertions, 4 deletions
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index 045b7a426d..fdc27019e7 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: OpenSlug Linux Distribution for the NSLU2 DISTRO_NAME = "OpenSlug" -DISTRO_VERSION = "1.9-beta" +DISTRO_VERSION = "1.10-beta" DISTRO_TYPE ?= "beta" TARGET_FPU_local ?= "soft" diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf index c9e4d505d9..accab44ed5 100644 --- a/conf/distro/unslung.conf +++ b/conf/distro/unslung.conf @@ -7,7 +7,7 @@ FEED_URIS += "native##http://ipkg.nslu2-linux.org/feeds/unslung/native" FEED_URIS += "oe##http://ipkg.nslu2-linux.org/feeds/unslung/oe" DISTRO_NAME = "Unslung" -DISTRO_VERSION = "4.19-alpha" +DISTRO_VERSION = "4.20-beta" DISTRO_TYPE = "beta" TARGET_FPU = "soft" diff --git a/packages/linux/openslug-kernel-2.6.11.2/anonymiser.patch b/packages/linux/openslug-kernel-2.6.11.2/anonymiser.patch index e69de29bb2..3384b15fe2 100644 --- a/packages/linux/openslug-kernel-2.6.11.2/anonymiser.patch +++ b/packages/linux/openslug-kernel-2.6.11.2/anonymiser.patch @@ -0,0 +1,22 @@ +--- linux-2.6.11.2/scripts/mkcompile_h.orig 2005-05-07 05:27:02.440000000 +0000 ++++ linux-2.6.11.2/scripts/mkcompile_h 2005-05-07 05:28:30.360000000 +0000 +@@ -43,16 +43,9 @@ + echo \#define UTS_VERSION \"`echo $UTS_VERSION | $UTS_TRUNCATE`\" + + echo \#define LINUX_COMPILE_TIME \"`LC_ALL=C LANG=C date +%T`\" +- echo \#define LINUX_COMPILE_BY \"`whoami`\" +- echo \#define LINUX_COMPILE_HOST \"`hostname | $UTS_TRUNCATE`\" +- +- if [ -x /bin/dnsdomainname ]; then +- echo \#define LINUX_COMPILE_DOMAIN \"`dnsdomainname | $UTS_TRUNCATE`\" +- elif [ -x /bin/domainname ]; then +- echo \#define LINUX_COMPILE_DOMAIN \"`domainname | $UTS_TRUNCATE`\" +- else +- echo \#define LINUX_COMPILE_DOMAIN +- fi ++ echo \#define LINUX_COMPILE_BY \"openslug\" ++ echo \#define LINUX_COMPILE_HOST \"openslug.org\" ++ echo \#define LINUX_COMPILE_DOMAIN \"openslug.org\" + + echo \#define LINUX_COMPILER \"`$CC -v 2>&1 | tail -n 1`\" + ) > .tmpcompile diff --git a/packages/linux/unslung-kernel-2.3r25/anonymiser.patch b/packages/linux/unslung-kernel-2.3r25/anonymiser.patch index e69de29bb2..61201031fa 100644 --- a/packages/linux/unslung-kernel-2.3r25/anonymiser.patch +++ b/packages/linux/unslung-kernel-2.3r25/anonymiser.patch @@ -0,0 +1,24 @@ +--- linux-2.4.22/Makefile.orig 2004-12-26 13:11:25.000000000 +1030 ++++ linux-2.4.22/Makefile 2004-12-26 13:12:32.000000000 +1030 +@@ -431,12 +431,15 @@ + @LANG=C echo ' '`date` >> .ver1 + @echo \#define UTS_VERSION \"`cat .ver1 | $(uts_truncate)`\" > .ver + @LANG=C echo \#define LINUX_COMPILE_TIME \"`date +%T`\" >> .ver +- @echo \#define LINUX_COMPILE_BY \"`whoami`\" >> .ver +- @echo \#define LINUX_COMPILE_HOST \"`hostname | $(uts_truncate)`\" >> .ver +- @([ -x /bin/dnsdomainname ] && /bin/dnsdomainname > .ver1) || \ +- ([ -x /bin/domainname ] && /bin/domainname > .ver1) || \ +- echo > .ver1 +- @echo \#define LINUX_COMPILE_DOMAIN \"`cat .ver1 | $(uts_truncate)`\" >> .ver ++# @echo \#define LINUX_COMPILE_BY \"`whoami`\" >> .ver ++ @echo \#define LINUX_COMPILE_BY \"unslung\" >> .ver ++# @echo \#define LINUX_COMPILE_HOST \"`hostname | $(uts_truncate)`\" >> .ver ++ @echo \#define LINUX_COMPILE_HOST \"unslung.org\" >> .ver ++# @([ -x /bin/dnsdomainname ] && /bin/dnsdomainname > .ver1) || \ ++# ([ -x /bin/domainname ] && /bin/domainname > .ver1) || \ ++# echo > .ver1 ++# @echo \#define LINUX_COMPILE_DOMAIN \"`cat .ver1 | $(uts_truncate)`\" >> .ver ++ @echo \#define LINUX_COMPILE_DOMAIN \"unslung.org\" >> .ver + @echo \#define LINUX_COMPILER \"`$(CC) $(CFLAGS) -v 2>&1 | tail -n 1`\" >> .ver + @mv -f .ver $@ + @rm -f .ver1 diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/NOTES b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/NOTES index 1f1201a697..6257571afb 100644 --- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/NOTES +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/NOTES @@ -405,5 +405,20 @@ Added /dev/dsp and updated the README and NOTES files. Added the /sbin/slingover script for migrating packages from the 3.x locations. +4.17: +Developer-only release booting straight from jffs2 instead of using switchbox. +4.18: + +A number of /linuxrc fixes. Removed support for alternate rootfs under expert +user control (expert users can now just edit the /linuxrc in jffs2 directly). + +4.19: + +Removed all trace of switchbox from the firmware. This saves 128Kb of flash, +and about 1MB of RAM. + +4.20: + +First public release of 4.x firmware. diff --git a/packages/nslu2-binary-only/unslung-rootfs_2.3r25.bb b/packages/nslu2-binary-only/unslung-rootfs_2.3r25.bb index 684a0d7cbd..3b9ab411e8 100644 --- a/packages/nslu2-binary-only/unslung-rootfs_2.3r25.bb +++ b/packages/nslu2-binary-only/unslung-rootfs_2.3r25.bb @@ -1,8 +1,8 @@ SECTION = "base" -PR = "r63" +PR = "r64" -UNSLUNG_VERSION = "4.19-alpha" +UNSLUNG_VERSION = "4.20-beta" DEPENDS = "nslu2-linksys-libs" |