From f5193e9a40465133df954d44a1a0e0c0abc36ec7 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Sat, 15 Apr 2006 18:04:12 +0000 Subject: Unslung: unslung-rootfs, unslung-kernel, unslung-image - rearranged NLS support, removed Linksys upgrade page --- packages/linux/unslung-kernel/defconfig | 4 +- packages/linux/unslung-kernel_2.4.22.l2.3r63.bb | 2 +- packages/meta/unslung-image.bb | 28 +----------- .../nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb | 2 +- .../nslu2-linksys-sambacodepages_2.3r63.bb | 29 +++++++++++++ packages/nslu2-binary-only/unslung-rootfs/NOTES | 25 +++++++++++ .../unslung-rootfs/rc.modules-diversion.patch | 12 +++--- .../unslung-rootfs/rc.modules-nls.patch | 10 +++++ .../nslu2-binary-only/unslung-rootfs/upgrade.cgi | 4 -- .../nslu2-binary-only/unslung-rootfs/upgrade.htm | 50 ++++++++++------------ .../nslu2-binary-only/unslung-rootfs_2.3r63.bb | 39 +++++++++++++++-- 11 files changed, 135 insertions(+), 70 deletions(-) create mode 100644 packages/nslu2-binary-only/nslu2-linksys-sambacodepages_2.3r63.bb create mode 100644 packages/nslu2-binary-only/unslung-rootfs/rc.modules-nls.patch delete mode 100755 packages/nslu2-binary-only/unslung-rootfs/upgrade.cgi (limited to 'packages') diff --git a/packages/linux/unslung-kernel/defconfig b/packages/linux/unslung-kernel/defconfig index 027dbfb80b..4f90b9dca6 100644 --- a/packages/linux/unslung-kernel/defconfig +++ b/packages/linux/unslung-kernel/defconfig @@ -996,7 +996,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_CODEPAGE_737=m # CONFIG_NLS_CODEPAGE_775 is not set -CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_850=y CONFIG_NLS_CODEPAGE_852=m # CONFIG_NLS_CODEPAGE_855 is not set # CONFIG_NLS_CODEPAGE_857 is not set @@ -1011,7 +1011,7 @@ CONFIG_NLS_CODEPAGE_866=m CONFIG_NLS_CODEPAGE_936=m CONFIG_NLS_CODEPAGE_950=m CONFIG_NLS_CODEPAGE_932=m -# CONFIG_NLS_CODEPAGE_949 is not set +CONFIG_NLS_CODEPAGE_949=m # CONFIG_NLS_CODEPAGE_874 is not set # CONFIG_NLS_ISO8859_8 is not set # CONFIG_NLS_CODEPAGE_1250 is not set diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb index 797d386f8c..60b83bade2 100644 --- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb +++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb @@ -4,7 +4,7 @@ include nslu2-linksys-kernel_2.4.22.bb DESCRIPTION = "Unslung kernel for the Linksys NSLU2 device" MAINTAINER = "NSLU2 Linux " -PR = "r10" +PR = "r11" KERNEL_SUFFIX = "unslung" diff --git a/packages/meta/unslung-image.bb b/packages/meta/unslung-image.bb index 8ab50cebf4..4a6864eefa 100644 --- a/packages/meta/unslung-image.bb +++ b/packages/meta/unslung-image.bb @@ -1,5 +1,5 @@ LICENSE = MIT -PR = "r13" +PR = "r14" IMAGE_BASENAME = "unslung" @@ -61,32 +61,6 @@ unslung_clean_image () { # Strip symbols and fix permissions on the libgcc_s.so.1 library ${STRIP} ${IMAGE_ROOTFS}/lib/libgcc_s.so.1 chmod ugo+x ${IMAGE_ROOTFS}/lib/libgcc_s.so.1 - - # Remove some of the Samba codepages to make space - # 437 (USA) - keep - # 737 (Greek) - rm -f ${IMAGE_ROOTFS}/etc/samba/codepages/codepage.737 - rm -f ${IMAGE_ROOTFS}/etc/samba/codepages/unicode_map.737 - # 850 (Latin1) - keep - # 852 (Latin2) - rm -f ${IMAGE_ROOTFS}/etc/samba/codepages/codepage.852 - rm -f ${IMAGE_ROOTFS}/etc/samba/codepages/unicode_map.852 - # 861 (Iceland) - rm -f ${IMAGE_ROOTFS}/etc/samba/codepages/codepage.861 - rm -f ${IMAGE_ROOTFS}/etc/samba/codepages/unicode_map.861 - # 866 (Russian) - rm -f ${IMAGE_ROOTFS}/etc/samba/codepages/codepage.866 - rm -f ${IMAGE_ROOTFS}/etc/samba/codepages/unicode_map.866 - # 932 (Japanese Shift-JIS) - rm -f ${IMAGE_ROOTFS}/etc/samba/codepages/codepage.932 - rm -f ${IMAGE_ROOTFS}/etc/samba/codepages/unicode_map.932 - # 936 (Simplified Chinese) - rm -f ${IMAGE_ROOTFS}/etc/samba/codepages/codepage.936 - # 949 (Korean) - rm -f ${IMAGE_ROOTFS}/etc/samba/codepages/codepage.949 - # 950 (Chinese BIG-5) - rm -f ${IMAGE_ROOTFS}/etc/samba/codepages/codepage.950 - # ISO8859-1 (Latin 1) - keep } python () { diff --git a/packages/nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb b/packages/nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb index 1843de069c..4424e99d19 100644 --- a/packages/nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb +++ b/packages/nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb @@ -9,7 +9,7 @@ SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63-2.tar.bz2" S = "${WORKDIR}/nslu2-linksys-ramdisk-2.3r63" do_install () { - ( cd ${S} ; rm -rf bin dev etc home mnt proc sbin share tmp upload usr var ) + ( cd ${S} ; rm -rf bin dev etc home lost+found mnt proc sbin share tmp upload usr var ) ( cd ${S} ; tar cvf - . ) | ( cd ${D} ; tar xvf - ) } diff --git a/packages/nslu2-binary-only/nslu2-linksys-sambacodepages_2.3r63.bb b/packages/nslu2-binary-only/nslu2-linksys-sambacodepages_2.3r63.bb new file mode 100644 index 0000000000..4aace52412 --- /dev/null +++ b/packages/nslu2-binary-only/nslu2-linksys-sambacodepages_2.3r63.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "Linksys NSLU2 Stock Firmware Samba Code Pages." +PACKAGE_ARCH = "nslu2" +SECTION = "base" +PRIORITY = "required" +PR = "r1" + +SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63-2.tar.bz2" + +S = "${WORKDIR}/nslu2-linksys-ramdisk-2.3r63" + +do_install () { + ( cd ${S} ; mkdir unslung-tmp ) + ( cd ${S}/etc ; tar cvf - samba/codepages ) | ( cd ${S}/unslung-tmp; tar xvf - ) + ( cd ${S} ; rm -rf bin dev etc home lib lost+found mnt proc sbin share tmp upload usr var ) + ( cd ${S} ; mv unslung-tmp etc ) + ( cd ${S}/etc/samba/codepages; rm -f codepage.437 unicode_map.437 ) + ( cd ${S}/etc/samba/codepages; rm -f codepage.850 unicode_map.850 ) + ( cd ${S}/etc/samba/codepages; rm -f unicode_map.ISO8859-1 ) + ( cd ${S} ; tar cvf - . ) | ( cd ${D} ; tar xvf - ) +} + +PACKAGES = "${PN}" +FILES_${PN} = "/etc/samba/codepages" + +python () { + # Don't build unless we're targeting an nslu2 + if bb.data.getVar("MACHINE", d, 1) != "nslu2": + raise bb.parse.SkipPackage("NSLU2 stock firmware Samba code pages only builds for the Linksys NSLU2") +} diff --git a/packages/nslu2-binary-only/unslung-rootfs/NOTES b/packages/nslu2-binary-only/unslung-rootfs/NOTES index ae9d7c607c..82d7448a80 100644 --- a/packages/nslu2-binary-only/unslung-rootfs/NOTES +++ b/packages/nslu2-binary-only/unslung-rootfs/NOTES @@ -487,3 +487,28 @@ Added original "netconsole" code as a kernel module Fixed problem with password changing from the GUI and automatic mounting of drives and flash devices in port 1. Remove unnecessary directory /lib/modules/2.4.22-xfs/pcmcia. + +6.8: + +First beta release. + +6.9: + +Modified /etc/rc.d/rc.modules to "insmod" any nls code page modules present. + +Code Page 850 is now compiled into the kernel instead of a kernel module, +and added Code Page 949 (as a module). + +Updated the upgrade.htm file to reflect redboot as the upgrade means. + +Remove the upgrade.cgi, upgrade_ui.htm, and upgrade_ui.cgi files from the +root image as they are no longer used, and we can always use free space. + +Rearranged portions of the build procedure to remove the samba code pages in +the rootfs bb, create a new package with the removed code pages in a new +nslu2-linksys-sambacodepages.bb file (to restore the code pages, use ipkg to +install package "nslu2-linksys-sambacodepages". Note that the rootfs and the +sambacodepages bb files must be kept in sync regarding the samba code pages +that are left in the image and the ones that are added to the package (and it +is also a good idea if the kernel defconfig reflects the inclusion of NLS +support for the code pages that are left in the image, of course). diff --git a/packages/nslu2-binary-only/unslung-rootfs/rc.modules-diversion.patch b/packages/nslu2-binary-only/unslung-rootfs/rc.modules-diversion.patch index fa7532401d..d1de027f9a 100644 --- a/packages/nslu2-binary-only/unslung-rootfs/rc.modules-diversion.patch +++ b/packages/nslu2-binary-only/unslung-rootfs/rc.modules-diversion.patch @@ -1,8 +1,10 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.modules.orig 2004-07-27 23:37:55.000000000 -0400 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.modules 2004-09-01 21:57:34.000000000 -0400 -@@ -1,2 +1,5 @@ +--- nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.modules.orig 2006-04-14 21:00:58.000000000 -0500 ++++ nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.modules 2006-04-14 21:05:47.000000000 -0500 +@@ -1,4 +1,7 @@ + #!/bin/sh + +if ( [ -f /unslung/rc.modules ] && . /unslung/rc.modules ) ; then return 0 ; fi + - insmod rbuttons &>/dev/null - insmod x1226-rtc &>/dev/null + insmod pbuttons 2>/dev/null + insmod rbuttons 2>/dev/null + insmod x1226-rtc 2>/dev/null diff --git a/packages/nslu2-binary-only/unslung-rootfs/rc.modules-nls.patch b/packages/nslu2-binary-only/unslung-rootfs/rc.modules-nls.patch new file mode 100644 index 0000000000..1eb342b715 --- /dev/null +++ b/packages/nslu2-binary-only/unslung-rootfs/rc.modules-nls.patch @@ -0,0 +1,10 @@ +--- nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.modules.orig 2006-04-14 21:05:47.000000000 -0500 ++++ nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.modules 2006-04-14 19:56:29.000000000 -0500 +@@ -6,3 +6,7 @@ + insmod rbuttons 2>/dev/null + insmod x1226-rtc 2>/dev/null + insmod ufsd 2>/dev/null ++ ++for i in /lib/modules/`/bin/uname -r`/kernel/fs/nls/nls_cp*.o ; do ++ insmod "$i" 2>/dev/null ++done diff --git a/packages/nslu2-binary-only/unslung-rootfs/upgrade.cgi b/packages/nslu2-binary-only/unslung-rootfs/upgrade.cgi deleted file mode 100755 index 0eee123550..0000000000 --- a/packages/nslu2-binary-only/unslung-rootfs/upgrade.cgi +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -/sbin/devio ">>/dev/mtdblock5" "fb#255" 2>/dev/null -/usr/sbin/DO_Reboot 2>/dev/null diff --git a/packages/nslu2-binary-only/unslung-rootfs/upgrade.htm b/packages/nslu2-binary-only/unslung-rootfs/upgrade.htm index 88644e305e..2301a89c0f 100644 --- a/packages/nslu2-binary-only/unslung-rootfs/upgrade.htm +++ b/packages/nslu2-binary-only/unslung-rootfs/upgrade.htm @@ -4,21 +4,6 @@ - @@ -81,8 +66,6 @@ function checkUpgrade() - - Current Firmware   @@ -93,15 +76,32 @@ function checkUpgrade()
- - +
Current Firmware Version:@ds_sw_version#
-
- 		@ds_sw_version#
+ + Upgrade   + + + + + +
+ + + + + +
+NOTE: You cannot use this upgrade page to install new firmware on Unslung. +You must use the Redboot mechanism in order to install new firmware instead. +
+ + +   @@ -110,12 +110,10 @@ function checkUpgrade()   -   - Enter Upgrade Mode   - Help       + +     - @@ -123,7 +121,5 @@ function checkUpgrade() - - diff --git a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb index 910ad102a9..f105e6830a 100644 --- a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb +++ b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb @@ -1,8 +1,8 @@ SECTION = "base" -PR = "r11" +PR = "r12" -DEPENDS = "nslu2-linksys-libs" +DEPENDS = "nslu2-linksys-libs nslu2-linksys-sambacodepages" SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63-2.tar.bz2 \ file://README \ @@ -43,8 +43,8 @@ SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63-2.tar.bz2 \ file://mount_usbdevfs.patch;patch=1 \ file://security-fixes.patch;patch=1 \ file://rc.sysinit-clean_var.patch;patch=1 \ + file://rc.modules-nls.patch;patch=1 \ file://upgrade.htm \ - file://upgrade.cgi \ file://telnet.htm \ file://rc.bootbin \ " @@ -66,6 +66,7 @@ do_compile () { install -m 644 ${WORKDIR}/telnet.htm ${S}/home/httpd/html/Management/telnet.htm sed -i -e 's/@version#