From b480099179a200a86cf2b4e46941c005f44c2435 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Tue, 2 Nov 2004 23:16:15 +0000 Subject: Merge openembedded@openembedded.bkbits.net:packages-devel into handhelds.org:/home/kergoth/code/packages 2004/11/02 17:15:23-06:00 handhelds.org!kergoth Upgrade udev to 042, kill old versions to reduce maintainance headaches. 2004/11/02 16:46:24-06:00 handhelds.org!kergoth Merge http://nslu2-linux.bkbits.net/packages into handhelds.org:/home/kergoth/code/packages 2004/11/03 09:48:56+11:00 black.lan!peteru Merge nslu2-linux@nslu2-linux.bkbits.net:packages into black.lan:/home/slug/bk/packages 2004/11/03 09:36:32+11:00 black.lan!peteru kernel, ramdisk and image variants. Currently ramdisk variants are broken. Pushing anyway, so that OE experts can help with fixing the issue. 2004/10/31 13:48:09-10:00 (none)!dereky defconfig: Add raid lines 2004/11/01 09:26:07+10:30 (none)!rwhitby Added the -able image to Unslung 2004/11/01 01:37:33+11:00 black.lan!peteru Create a new image for unslung-able. 2004/10/31 10:33:14+10:30 (none)!rwhitby Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages into home.(none):/home/openembedded/packages 2004/10/31 10:31:48+10:30 (none)!rwhitby Added slingbox to Unslung image 2004/10/31 10:25:02+10:30 (none)!rwhitby Added slingbox to Unslung image 2004/10/30 16:34:07-04:00 rant-central.com!CodeWhacker Merge bk://nslu2-linux.bkbits.net/packages into rant-central.com:/home/roy/workspace/NSLU2/oe/packages 2004/10/30 16:29:33-04:00 rant-central.com!CodeWhacker Rearrange tar args in ipkg-build to avoid the error messages some tar versions produce when there are args after the source files list. 2004/10/29 11:18:45+09:30 (none)!rwhitby Unslung: Make sure that /root exists after unslinging. 2004/10/29 09:54:54+09:30 (none)!rwhitby Unslung: Fixed the unsling script so it removes conflicting files from an old unslung root partition. 2004/10/28 17:00:22-07:00 bkbits.net!nslu2-linux.adm Merge bk://openembedded.bkbits.net/packages into bkbits.net:/repos/n/nslu2-linux/packages 2004/10/25 14:23:02-04:00 uottawa.ca!stephane Added /dev entry for NSLU2's software-based I2C adapter. 2004/10/25 14:21:22-04:00 uottawa.ca!stephane Initial integration of Kas11's x1205-rtc drivers. 2004/10/25 23:49:37+09:30 (none)!rwhitby Fixed a bug in nslu2-unslung-ramdisk 2004/10/25 22:35:52+09:30 (none)!rwhitby Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages into home.(none):/home/openembedded/packages 2004/10/25 05:58:22-07:00 bkbits.net!nslu2-linux.adm Merge bk://openembedded.bkbits.net/packages into bkbits.net:/repos/n/nslu2-linux/packages 2004/10/25 22:21:41+09:30 (none)!rwhitby Unslung: Added the Unslung Doc link to the User Guide page, and added the flashfs script. 2004/10/25 10:15:35+02:00 (none)!chriz Fix for Genesys Logic based devices (e.g. gl811e). For details refer to: http://www.mail-archive.com/linux-usb-users@lists.sourceforge.net/msg10941.html http://www.mail-archive.com/linux-usb-users@lists.sourceforge.net/msg10981.html BKrev: 4188153fr__wrRFQlfc9zi6SJ3JVsw --- BitKeeper/etc/logging_ok | 5 + busybox/slingbox-1.00/defconfig | 0 busybox/slingbox-1.00/slingbox.patch | 0 busybox/slingbox_1.00.oe | 0 initscripts/initscripts-1.0/device_table.txt | 1 + ipkg-utils/files/fix-ipkg-tar.patch | 0 ipkg-utils/ipkg-utils_1.6cvs.oe | 3 +- linux/nslu2-linksys-2.4.22/gl811e.patch | 0 linux/nslu2-linksys_2.4.22.oe | 1 + linux/nslu2-openslug-2.6.7/defconfig | 1 + linux/nslu2-openslug-2.6.7/x1205-rtc.patch | 0 linux/nslu2-openslug_2.6.7.oe | 3 + linux/nslu2-unslung-kernel-2.3r25/able/defconfig | 0 .../able/missing_usb_ioctls.patch | 0 linux/nslu2-unslung-kernel-able_2.3r25.oe | 0 meta/unslung-ext3flash-image.oe | 0 meta/unslung-image-able.oe | 0 meta/unslung-image-base.oe | 29 ++++++ meta/unslung-image-ext3flash.oe | 0 meta/unslung-image-standard.oe | 0 meta/unslung-image-vfatdisk2-image.oe | 0 meta/unslung-image-vfatdisk2.oe | 0 meta/unslung-image.oe | 2 +- meta/unslung-standard-image.oe | 0 meta/unslung-vfatdisk2-image.oe | 0 .../nslu2-unslung-ramdisk-able_2.3r25.oe | 0 .../nslu2-unslung-ramdisk-ext3flash_2.3r25.oe | 0 .../nslu2-unslung-ramdisk-standard_2.3r25.oe | 0 .../nslu2-unslung-ramdisk-vfatdisk2_2.3r25.oe | 0 .../nslu2-unslung-ramdisk/able/linuxrc | 0 nslu2-binary-only/nslu2-unslung-ramdisk/flashfs | 0 nslu2-binary-only/nslu2-unslung-ramdisk/unsling | 113 +++++++++++++++++++++ nslu2-binary-only/nslu2-unslung-ramdisk_2.3r25.oe | 31 +++--- udev/udev-026/flags.patch | 0 udev/udev-026/sh-not-bash.patch | 0 udev/udev-032/flags.patch | 0 udev/udev-032/noasmlinkage.patch | 0 udev/udev-032/tmpfs.patch | 0 udev/udev-042/flags.patch | 0 udev/udev-042/init | 0 udev/udev-042/noasmlinkage.patch | 0 udev/udev-042/tmpfs.patch | 0 udev/udev_026.oe | 33 ------ udev/udev_032.oe | 39 ------- udev/udev_042.oe | 0 45 files changed, 168 insertions(+), 93 deletions(-) create mode 100644 busybox/slingbox-1.00/defconfig create mode 100644 busybox/slingbox-1.00/slingbox.patch create mode 100644 busybox/slingbox_1.00.oe create mode 100644 ipkg-utils/files/fix-ipkg-tar.patch create mode 100644 linux/nslu2-linksys-2.4.22/gl811e.patch create mode 100644 linux/nslu2-openslug-2.6.7/x1205-rtc.patch create mode 100644 linux/nslu2-unslung-kernel-2.3r25/able/defconfig create mode 100644 linux/nslu2-unslung-kernel-2.3r25/able/missing_usb_ioctls.patch create mode 100644 linux/nslu2-unslung-kernel-able_2.3r25.oe delete mode 100644 meta/unslung-ext3flash-image.oe create mode 100644 meta/unslung-image-able.oe create mode 100644 meta/unslung-image-ext3flash.oe create mode 100644 meta/unslung-image-standard.oe create mode 100644 meta/unslung-image-vfatdisk2-image.oe create mode 100644 meta/unslung-image-vfatdisk2.oe delete mode 100644 meta/unslung-standard-image.oe delete mode 100644 meta/unslung-vfatdisk2-image.oe create mode 100644 nslu2-binary-only/nslu2-unslung-ramdisk-able_2.3r25.oe create mode 100644 nslu2-binary-only/nslu2-unslung-ramdisk-ext3flash_2.3r25.oe create mode 100644 nslu2-binary-only/nslu2-unslung-ramdisk-standard_2.3r25.oe create mode 100644 nslu2-binary-only/nslu2-unslung-ramdisk-vfatdisk2_2.3r25.oe create mode 100644 nslu2-binary-only/nslu2-unslung-ramdisk/able/linuxrc create mode 100644 nslu2-binary-only/nslu2-unslung-ramdisk/flashfs delete mode 100644 udev/udev-026/flags.patch delete mode 100644 udev/udev-026/sh-not-bash.patch delete mode 100644 udev/udev-032/flags.patch delete mode 100644 udev/udev-032/noasmlinkage.patch delete mode 100644 udev/udev-032/tmpfs.patch create mode 100644 udev/udev-042/flags.patch create mode 100644 udev/udev-042/init create mode 100644 udev/udev-042/noasmlinkage.patch create mode 100644 udev/udev-042/tmpfs.patch delete mode 100644 udev/udev_026.oe delete mode 100644 udev/udev_032.oe create mode 100644 udev/udev_042.oe diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index ace1e0b8ae..35531a9c2c 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -5,8 +5,10 @@ a0868066@lta0868066.ent.ti.com br1@null.(none) buildroot@mithis.com chris@chrislaptop.(none) +chriz@i74-copy.(none) cwiiis@chris.(none) cwiiis@chrislaptop.(none) +dereky@builder.(none) emte@t.(none) erich@erichl.mine.nu erich@erichv.mine.nu @@ -51,6 +53,7 @@ mickeyl@allanon.vanille.de mickeyl@gandalf.tm.informatik.uni-frankfurt.de mickeyl@r2d2.tm.informatik.uni-frankfurt.de mithro@mithis.com +nslu2-linux.adm@bkbits.net nslu2-linux.adm@hostme.bitkeeper.com oe@sugarcube.dyndns.org openembedded.adm@bkbits.net @@ -62,6 +65,7 @@ pb@stealth.nexus.co.uk pb@workhouse.(none) pb@workhouse.nexus.co.uk pb_@gandalf.tm.informatik.uni-frankfurt.de +peteru@black.lan phillim@linux.local ral@alwin.at.home red@quarm.(none) @@ -72,6 +76,7 @@ roy@rant-central.com rwhitby@home.(none) schurig@mnz66.mn-logistik.de schurig@schurig.homelinux.net +stephane@gauss.mathstat.uottawa.ca szczepan@home.hrw.one.pl szczepan@hrw.local tgall@www.rochcivictheatre.org diff --git a/busybox/slingbox-1.00/defconfig b/busybox/slingbox-1.00/defconfig new file mode 100644 index 0000000000..e69de29bb2 diff --git a/busybox/slingbox-1.00/slingbox.patch b/busybox/slingbox-1.00/slingbox.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/busybox/slingbox_1.00.oe b/busybox/slingbox_1.00.oe new file mode 100644 index 0000000000..e69de29bb2 diff --git a/initscripts/initscripts-1.0/device_table.txt b/initscripts/initscripts-1.0/device_table.txt index 54c1331f0b..7d2379c75f 100644 --- a/initscripts/initscripts-1.0/device_table.txt +++ b/initscripts/initscripts-1.0/device_table.txt @@ -32,6 +32,7 @@ /dev/hdc b 660 0 6 22 0 - - - /dev/hdc b 660 0 6 22 1 1 1 20 /dev/initctl p 600 0 0 - - - - +/dev/i2c0 c 660 0 0 89 0 - - - /dev/inportbm c 660 0 0 10 2 - - - /dev/input/event c 660 0 0 13 64 0 1 4 /dev/ircomm0 c 640 0 0 161 0 - - - diff --git a/ipkg-utils/files/fix-ipkg-tar.patch b/ipkg-utils/files/fix-ipkg-tar.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/ipkg-utils/ipkg-utils_1.6cvs.oe b/ipkg-utils/ipkg-utils_1.6cvs.oe index 4aa5435c41..06c565ad34 100644 --- a/ipkg-utils/ipkg-utils_1.6cvs.oe +++ b/ipkg-utils/ipkg-utils_1.6cvs.oe @@ -10,7 +10,8 @@ PV_append = "${CVSDATE}" PR = "r5" SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=ipkg-utils \ - file://fix-ipkg-link.patch;patch=1 " + file://fix-ipkg-link.patch;patch=1 \ + file://fix-ipkg-tar.patch;patch=1 " SRC_URI_append_beagle = " file://fix-ipkg-link-beagle.patch;patch=1 " S = "${WORKDIR}/ipkg-utils" diff --git a/linux/nslu2-linksys-2.4.22/gl811e.patch b/linux/nslu2-linksys-2.4.22/gl811e.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/linux/nslu2-linksys_2.4.22.oe b/linux/nslu2-linksys_2.4.22.oe index 1aca13cd04..8f2623d947 100644 --- a/linux/nslu2-linksys_2.4.22.oe +++ b/linux/nslu2-linksys_2.4.22.oe @@ -14,6 +14,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-2.4.22.tar.bz2 \ file://gcc-registerparanoia.patch;patch=1 \ file://linux-2.4.24-attribute-used.patch;patch=1 \ file://usbnet.patch;patch=1 \ + file://gl811e.patch;patch=1 \ file://defconfig" S = "${WORKDIR}/linux-2.4.22" diff --git a/linux/nslu2-openslug-2.6.7/defconfig b/linux/nslu2-openslug-2.6.7/defconfig index 74450c16b6..1e6a933531 100644 --- a/linux/nslu2-openslug-2.6.7/defconfig +++ b/linux/nslu2-openslug-2.6.7/defconfig @@ -755,6 +755,7 @@ CONFIG_I2C_SENSOR=y # Other I2C Chip support # CONFIG_SENSORS_EEPROM=y +CONFIG_SENSORS_X1205=y # CONFIG_SENSORS_PCF8574 is not set # CONFIG_SENSORS_PCF8591 is not set # CONFIG_SENSORS_RTC8564 is not set diff --git a/linux/nslu2-openslug-2.6.7/x1205-rtc.patch b/linux/nslu2-openslug-2.6.7/x1205-rtc.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/linux/nslu2-openslug_2.6.7.oe b/linux/nslu2-openslug_2.6.7.oe index 8d6c797144..e40d8c03bc 100644 --- a/linux/nslu2-openslug_2.6.7.oe +++ b/linux/nslu2-openslug_2.6.7.oe @@ -10,6 +10,8 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.7.tar.bz2 \ file://arm-Makefile.patch;patch=1 \ file://ipx4xx-pci.patch;patch=1 \ file://arm-timer.patch;patch=1 \ + file://x1205-rtc.patch;patch=1;pnum=0 \ + cvs://anonymous@cvs.sourceforge.net/cvsroot/nslu;module=anyu2/source;method=pserver \ file://defconfig" S = "${WORKDIR}/linux-2.6.7" @@ -25,6 +27,7 @@ CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_CONSOLE}" do_configure_prepend() { install -m 0644 ${WORKDIR}/defconfig ${S}/.config + install -m 0644 ${WORKDIR}/source/x1205-rtc.c ${S}/drivers/i2c/chips/x1205-rtc.c echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config rm -rf ${S}/include/asm-arm/arch ${S}/include/asm-arm/proc \ ${S}/include/asm-arm/.proc ${S}/include/asm-arm/.arch diff --git a/linux/nslu2-unslung-kernel-2.3r25/able/defconfig b/linux/nslu2-unslung-kernel-2.3r25/able/defconfig new file mode 100644 index 0000000000..e69de29bb2 diff --git a/linux/nslu2-unslung-kernel-2.3r25/able/missing_usb_ioctls.patch b/linux/nslu2-unslung-kernel-2.3r25/able/missing_usb_ioctls.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/linux/nslu2-unslung-kernel-able_2.3r25.oe b/linux/nslu2-unslung-kernel-able_2.3r25.oe new file mode 100644 index 0000000000..e69de29bb2 diff --git a/meta/unslung-ext3flash-image.oe b/meta/unslung-ext3flash-image.oe deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/meta/unslung-image-able.oe b/meta/unslung-image-able.oe new file mode 100644 index 0000000000..e69de29bb2 diff --git a/meta/unslung-image-base.oe b/meta/unslung-image-base.oe index e69de29bb2..061b77c9bc 100644 --- a/meta/unslung-image-base.oe +++ b/meta/unslung-image-base.oe @@ -0,0 +1,29 @@ +IMAGE_LINGUAS = "" +USE_DEVFS = "1" + +UNSLUNG_BASE_PACKAGES = "nslu2-unslung-ramdisk slingbox ipkg wget" + +IPKG_INSTALL = "${UNSLUNG_BASE_PACKAGES}" + +DEPENDS ?= "virtual/kernel ${UNSLUNG_BASE_PACKAGES}" +IMAGE_BASENAME ?= "unslung" + +UNSLUNG_DEVICE_TABLE = "${@oe.which(oe.data.getVar('OEPATH', d, 1), 'files/device_table-unslung.txt')}" +EXTRA_IMAGECMD_ext2.gz = "-f ${UNSLUNG_DEVICE_TABLE}" + +IMAGE_PREPROCESS_COMMAND += "unslung_clean_image; " + +inherit image_ipk + +# Note that anything in this function must be repeatable without having to rebuild the rootfs +unslung_clean_image () { + + # Remove all traces of the ipkg stuff we did to get this rootfs + rm -rf ${IMAGE_ROOTFS}/usr/lib/ipkg + if [ -f ${IMAGE_ROOTFS}/usr/bin/ipkg-cl ]; then + rm -f ${IMAGE_ROOTFS}/usr/bin/ipkg + mv ${IMAGE_ROOTFS}/usr/bin/ipkg-cl ${IMAGE_ROOTFS}/usr/bin/ipkg + fi + rm -f ${IMAGE_ROOTFS}/usr/bin/update-alternatives + +} diff --git a/meta/unslung-image-ext3flash.oe b/meta/unslung-image-ext3flash.oe new file mode 100644 index 0000000000..e69de29bb2 diff --git a/meta/unslung-image-standard.oe b/meta/unslung-image-standard.oe new file mode 100644 index 0000000000..e69de29bb2 diff --git a/meta/unslung-image-vfatdisk2-image.oe b/meta/unslung-image-vfatdisk2-image.oe new file mode 100644 index 0000000000..e69de29bb2 diff --git a/meta/unslung-image-vfatdisk2.oe b/meta/unslung-image-vfatdisk2.oe new file mode 100644 index 0000000000..e69de29bb2 diff --git a/meta/unslung-image.oe b/meta/unslung-image.oe index dc51ef35e6..f17a295c5f 100644 --- a/meta/unslung-image.oe +++ b/meta/unslung-image.oe @@ -1 +1 @@ -DEPENDS = "unslung-standard-image unslung-ext3flash-image unslung-vfatdisk2-image" +DEPENDS = "unslung-standard-image unslung-ext3flash-image unslung-vfatdisk2-image unslung-able-image" diff --git a/meta/unslung-standard-image.oe b/meta/unslung-standard-image.oe deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/meta/unslung-vfatdisk2-image.oe b/meta/unslung-vfatdisk2-image.oe deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/nslu2-binary-only/nslu2-unslung-ramdisk-able_2.3r25.oe b/nslu2-binary-only/nslu2-unslung-ramdisk-able_2.3r25.oe new file mode 100644 index 0000000000..e69de29bb2 diff --git a/nslu2-binary-only/nslu2-unslung-ramdisk-ext3flash_2.3r25.oe b/nslu2-binary-only/nslu2-unslung-ramdisk-ext3flash_2.3r25.oe new file mode 100644 index 0000000000..e69de29bb2 diff --git a/nslu2-binary-only/nslu2-unslung-ramdisk-standard_2.3r25.oe b/nslu2-binary-only/nslu2-unslung-ramdisk-standard_2.3r25.oe new file mode 100644 index 0000000000..e69de29bb2 diff --git a/nslu2-binary-only/nslu2-unslung-ramdisk-vfatdisk2_2.3r25.oe b/nslu2-binary-only/nslu2-unslung-ramdisk-vfatdisk2_2.3r25.oe new file mode 100644 index 0000000000..e69de29bb2 diff --git a/nslu2-binary-only/nslu2-unslung-ramdisk/able/linuxrc b/nslu2-binary-only/nslu2-unslung-ramdisk/able/linuxrc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/nslu2-binary-only/nslu2-unslung-ramdisk/flashfs b/nslu2-binary-only/nslu2-unslung-ramdisk/flashfs new file mode 100644 index 0000000000..e69de29bb2 diff --git a/nslu2-binary-only/nslu2-unslung-ramdisk/unsling b/nslu2-binary-only/nslu2-unslung-ramdisk/unsling index e69de29bb2..f0345aba70 100644 --- a/nslu2-binary-only/nslu2-unslung-ramdisk/unsling +++ b/nslu2-binary-only/nslu2-unslung-ramdisk/unsling @@ -0,0 +1,113 @@ +#!/bin/sh + +# Only do this if we have booted from the ramdisk. + +if [ "`cat /proc/sys/kernel/real-root-dev`" != 256 ] ; then + echo "Cannot unsling an active unslung root partition!" + exit 0 +fi + +# Set or seach for target disk + +if [ $# -gt 1 ] ; then + echo "Usage: $0 [flash|hdd]" + exit 1 +fi + +if [ $# -eq 1 ] ; then + if [ "$1" = "flash" -o "$1" = "hdd" ] ; then + targ=/share/$1/conf + else + echo "Usage: $0 [flash|hdd]" + exit 1 + fi +elif [ -d /share/hdd/conf/lost+found ] ; then + targ=/share/hdd/conf +elif [ -d /share/flash/conf/lost+found ] ; then + targ=/share/flash/conf +else + echo "Cannot locate target root partition" + exit 1 +fi + +echo "Target root partition is $targ" + +echo "Removing conflicts from old unslung root partition." +rm -f $targ/bin/ipkg + +# Unsling it! + +copyfiles=".unslung bin dev etc home lib linuxrc mnt sbin usr" + +echo "Copying ramdisk files to new unslung root partition." +cd / +tar cf - $copyfiles | ( cd $targ ; tar xf - ) + +# Create other required directories. + +echo "Creating required mount points and empty directories." + +rm -rf $targ/tmp && mkdir $targ/tmp + +[ ! -d $targ/share ] && mkdir $targ/share +[ ! -d $targ/share/flash ] && mkdir $targ/share/flash +[ ! -d $targ/share/flash/conf ] && mkdir $targ/share/flash/conf +[ ! -d $targ/share/flash/data ] && mkdir $targ/share/flash/data +[ ! -d $targ/share/hdd ] && mkdir $targ/share/hdd +[ ! -d $targ/share/hdd/conf ] && mkdir $targ/share/hdd/conf +[ ! -d $targ/share/hdd/data ] && mkdir $targ/share/hdd/data +[ ! -d $targ/mnt ] && mkdir $targ/mnt +[ ! -d $targ/mnt/backup ] && mkdir $targ/mnt/backup +[ ! -d $targ/mnt/repair ] && mkdir $targ/mnt/repair +[ ! -d $targ/mnt/tmpmnt ] && mkdir $targ/mnt/tmpmnt +[ ! -d $targ/proc ] && mkdir $targ/proc +[ ! -d $targ/upload ] && mkdir $targ/upload +[ ! -d $targ/var ] && mkdir $targ/var +[ ! -d $targ/var/empty ] && mkdir $targ/var/empty +[ ! -d $targ/var/lock ] && mkdir $targ/var/lock +[ ! -d $targ/var/log ] && mkdir $targ/var/log +[ ! -d $targ/var/run ] && mkdir $targ/var/run +[ ! -d $targ/var/tmp ] && mkdir $targ/var/tmp + +# Ensure /unslung is there. + +if [ ! -d $targ/unslung ] ; then + + echo "Creating new /unslung directory on unslung root partition." + + mkdir $targ/unslung + +else + echo "Preserving existing /unslung directory on unslung root partition." +fi + +# Ensure /root is there. + +if [ ! -d $targ/root ] ; then + + echo "Creating new /root directory on unslung root partition." + + mkdir $targ/root + +else + echo "Preserving existing /root directory on unslung root partition." +fi + +# Ensure /opt is there. + +if [ ! -d $targ/opt ] ; then + + echo "Creating new /opt directory on unslung root partition." + + mkdir $targ/opt + +else + echo "Preserving existing /opt directory on unslung root partition." +fi + +echo "Unslinging any default root passwords." + +[ -f $targ/passwd ] && sed -i -e 's/^root:WeeOvKUvbQ6nI:0:0:root:/root:t1PLUeOinN\/eI:0:0:root:/' $targ/passwd +[ -f $targ/usr/local/passwd ] && sed -i -e 's/^root:WeeOvKUvbQ6nI:0:0:root:/root:t1PLUeOinN\/eI:0:0:root:/' $targ/usr/local/passwd + +exit 0 diff --git a/nslu2-binary-only/nslu2-unslung-ramdisk_2.3r25.oe b/nslu2-binary-only/nslu2-unslung-ramdisk_2.3r25.oe index ea5bfd0f04..b45ff2d34a 100644 --- a/nslu2-binary-only/nslu2-unslung-ramdisk_2.3r25.oe +++ b/nslu2-binary-only/nslu2-unslung-ramdisk_2.3r25.oe @@ -1,38 +1,31 @@ SECTION = "base" -PR = "r6" +PR = "r9" -UNSLUNG_VERSION = 2.4-alpha +UNSLUNG_VERSION = 2.7-alpha UNSLUNG_SUFFIX = SRC_URI = "http://www.nslu2-linux.org/nslu2-linksys-ramdisk-2.3r25.tar.bz2 \ file://linuxrc \ + file://flashfs \ file://rc.unslung \ file://unsling \ file://unslung.patch \ file://ipkg.conf" S = "${WORKDIR}/nslu2-linksys-ramdisk-2.3r25" -ROOT_NEW_DIRS = "/opt" -ROOT_NEW_FILES = ".unslung linuxrc" -SBIN_NEW_FILES = "unsling" -ETC_PATCHED_FILES = "passwd rc" -ETC_NEW_FILES = "profile ipkg.conf" -RC_PATCHED_FILES = "rc.1 rc.crond rc.halt rc.local rc.modules \ - rc.network rc.quickset rc.quota rc.reboot \ - rc.reset_usrgrpshare rc.rstimezone rc.samba \ - rc.sysinit rc.thttpd rc.xinetd" -RC_NEW_FILES = "rc.unslung" -HTML_PATCHED_FILES = "home.htm" -LOCAL_PATCHED_FILES = "passwd" - do_compile () { - cp ${WORKDIR}/linuxrc ${S}/linuxrc - cp ${WORKDIR}/unsling ${S}/sbin/unsling - cp ${WORKDIR}/ipkg.conf ${S}/etc/ipkg.conf - cp ${WORKDIR}/rc.unslung ${S}/etc/rc.d/rc.unslung sed -e s/X.Y/${UNSLUNG_VERSION}${UNSLUNG_SUFFIX}/ ${WORKDIR}/unslung.patch | patch -d ${S} -p3 sed -i -e s/@version#/@version#-uNSLUng-${UNSLUNG_VERSION}${UNSLUNG_SUFFIX}/ ${S}/home/httpd/html/home.htm + sed -i -e 's|> <|>Unslung Doco<|' \ + ${S}/home/httpd/html/manhead.htm + install -m 755 ${WORKDIR}/linuxrc ${S}/linuxrc + install -m 755 ${WORKDIR}/flashfs ${S}/sbin/flashfs + install -m 755 ${WORKDIR}/unsling ${S}/sbin/unsling + install -m 755 ${WORKDIR}/rc.unslung ${S}/etc/rc.d/rc.unslung + install -m 755 ${WORKDIR}/ipkg.conf ${S}/etc/ipkg.conf + install -d ${S}/opt/doc + ln -s /opt/doc ${S}/home/httpd/html/Unslung } do_install () { diff --git a/udev/udev-026/flags.patch b/udev/udev-026/flags.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/udev/udev-026/sh-not-bash.patch b/udev/udev-026/sh-not-bash.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/udev/udev-032/flags.patch b/udev/udev-032/flags.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/udev/udev-032/noasmlinkage.patch b/udev/udev-032/noasmlinkage.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/udev/udev-032/tmpfs.patch b/udev/udev-032/tmpfs.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/udev/udev-042/flags.patch b/udev/udev-042/flags.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/udev/udev-042/init b/udev/udev-042/init new file mode 100644 index 0000000000..e69de29bb2 diff --git a/udev/udev-042/noasmlinkage.patch b/udev/udev-042/noasmlinkage.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/udev/udev-042/tmpfs.patch b/udev/udev-042/tmpfs.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/udev/udev_026.oe b/udev/udev_026.oe deleted file mode 100644 index cb6fc08dba..0000000000 --- a/udev/udev_026.oe +++ /dev/null @@ -1,33 +0,0 @@ -SECTION = "base" -DESCRIPTION = " udev is a program which dynamically creates and removes device nodes from \ -/dev/. It responds to /sbin/hotplug device events and requires a 2.6 kernel." - -SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ - file://flags.patch;patch=1 \ - file://sh-not-bash.patch;patch=1" - -bindir = "/bin" -sbindir = "/sbin" -libdir = "/lib" -udevdir ?= "/udev" - -EXTRA_OEMAKE_append = " 'prefix=${prefix}' \ - 'udevdir=${udevdir}' \ - 'exec_prefix=${prefix}' \ - 'etcdir=${sysconfdir}' \ - 'sbindir=${sbindir}' \ - 'mandir=${mandir}' \ - 'hotplugdir=${sysconfdir}/hotplug.d/default' \ - 'configdir=${sysconfdir}/udev/'" -export LD = "${CC}" - -do_install () { - oe_runmake 'DESTDIR=${D}' install - if [ "${udevdir}" == "/dev" ]; then - install -m 0755 ${S}/extras/start_udev ${D}/etc/init.d/start_udev - install -d ${D}/etc/rcS.d - ln -s /etc/init.d/start_udev ${D}/etc/rcS.d/S37start_udev - else - chmod 0755 ${D}/etc/init.d/udev - fi -} diff --git a/udev/udev_032.oe b/udev/udev_032.oe deleted file mode 100644 index edc3a881cf..0000000000 --- a/udev/udev_032.oe +++ /dev/null @@ -1,39 +0,0 @@ -PR = "r1" -SECTION = "base" -DESCRIPTION = " udev is a program which dynamically creates and removes device nodes from \ -/dev/. It responds to /sbin/hotplug device events and requires a 2.6 kernel." - -SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ - file://flags.patch;patch=1 \ - file://tmpfs.patch;patch=1 \ - file://noasmlinkage.patch;patch=1" - -usrbindir := "${bindir}" -bindir = "/bin" -sbindir = "/sbin" -libdir = "/lib" -udevdir ?= "/udev" - -FILES_${PN} += "${usrbindir}" - -EXTRA_OEMAKE_append = " 'prefix=${prefix}' \ - 'udevdir=${udevdir}' \ - 'exec_prefix=${prefix}' \ - 'etcdir=${sysconfdir}' \ - 'sbindir=${sbindir}' \ - 'usrbindir=${usrbindir}' \ - 'mandir=${mandir}' \ - 'hotplugdir=${sysconfdir}/hotplug.d/default' \ - 'configdir=${sysconfdir}/udev/'" -export LD = "${CC}" - -do_install () { - oe_runmake 'DESTDIR=${D}' install - if [ "${udevdir}" == "/dev" ]; then - install -m 0755 ${S}/extras/start_udev ${D}/etc/init.d/start_udev - install -d ${D}/etc/rcS.d - ln -s /etc/init.d/start_udev ${D}/etc/rcS.d/S03start_udev - else - chmod 0755 ${D}/etc/init.d/udev - fi -} diff --git a/udev/udev_042.oe b/udev/udev_042.oe new file mode 100644 index 0000000000..e69de29bb2 -- cgit v1.2.3