From c22fec91b4bdc260aba90b98244a4629258750b6 Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Thu, 28 Apr 2005 20:40:14 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/28 12:40:20-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/28 11:40:09-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/28 10:40:07-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/28 09:40:13-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/28 07:40:09-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/28 04:40:16-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/27 12:40:08-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/27 11:40:10-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/27 06:40:08-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/27 05:40:10-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/27 04:40:08-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/27 01:40:08-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/26 23:40:10-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/26 13:40:09-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/26 10:40:08-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/26 07:40:18-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/26 14:30:18+00:00 (none)!rwhitby Updated the ChangeLog in NOTES 2005/04/26 06:40:09-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/26 05:40:08-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/26 04:40:09-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/26 03:40:09-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/26 02:40:08-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/25 14:40:10-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/25 12:40:12-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/25 10:40:06-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/25 09:40:10-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/25 08:40:06-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/25 07:40:09-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/25 06:40:13-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/25 12:46:56+00:00 (none)!rwhitby Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded into home.(none):/home/bitbake/openembedded 2005/04/25 12:46:05+00:00 (none)!rwhitby Unslung 4.16-alpha: Added slingover script. 2005/04/25 03:40:13-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/24 16:40:07-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/24 13:40:06-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/24 12:40:06-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/24 10:40:06-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/24 09:40:15-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/24 12:57:29+00:00 (none)!rwhitby Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded into home.(none):/home/bitbake/openembedded 2005/04/24 05:40:08-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/24 04:40:08-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/24 01:40:09-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/24 00:40:08-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/23 23:58:37-07:00 kalmiopsis!jbowler Separate out packages which currently only build with glibc (i.e. not with uclibc). Add db4, openldap and the NIS tools to the list of buildable (and working) packages. 2005/04/23 23:43:13-07:00 kalmiopsis!jbowler Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded into marsco.kalmiopsis:/home/nslu2/openembedded 2005/04/23 23:40:09-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/23 23:34:34-07:00 kalmiopsis!jbowler Make green led happen at the end of all user run levels (levels 2, 3, 4, 5). 2005/04/23 23:33:15-07:00 kalmiopsis!jbowler Remove spurious patch file. Change db4 include directory to match change to db4. Make dynamic module loading work. 2005/04/23 23:31:08-07:00 kalmiopsis!jbowler Install the staging headers into include/db4 rather than include to avoid the clash with the db3 headers. Packages still use the standard name, so ipkg install db3 db4 will warn about the header overlap. 2005/04/23 12:40:07-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/23 11:40:16-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/23 03:40:22-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/23 02:40:06-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/23 01:40:08-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/23 00:40:08-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/22 22:40:19-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/22 15:40:07-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/22 14:40:07-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/22 07:40:08-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/22 06:40:10-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/22 05:40:08-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/22 04:40:15-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/22 02:40:08-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/22 01:40:07-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/22 00:40:09-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/21 20:40:09-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/21 16:40:19-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/21 23:33:36+09:30 (none)!rwhitby Added bridge-utils and sysfsutils to OpenSlug. Added the NOTES file to the Unslung image. 2005/04/21 04:40:08-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/21 03:40:08-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/21 00:40:16-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/20 17:40:12-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/20 15:40:08-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/20 14:40:07-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/20 13:40:08-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/20 12:40:09-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/20 11:40:09-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/20 10:40:06-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/20 09:40:08-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/20 22:49:35+09:30 (none)!rwhitby Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded into home.(none):/home/bitbake/openembedded 2005/04/20 22:49:04+09:30 (none)!rwhitby First draft of README and NOTES for Unslung 4.x 2005/04/20 01:40:08-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/19 23:02:44-07:00 kalmiopsis!jbowler Merge marsco.kalmiopsis:/home/nslu2/openembedded into marsco.kalmiopsis:/home/nslu2/ref 2005/04/19 23:02:18-07:00 kalmiopsis!jbowler openldap has been changed to build in 'module' mode, this breaks the pwdutils configure because it falsely assumed that -lldap provides the functionality of -ldl, patch the configuration file and add the missing dependency on openssl to the .bb file. 2005/04/19 19:40:08-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/19 17:40:08-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/19 16:40:06-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/19 12:59:07-07:00 kalmiopsis!jbowler Merge marsco.kalmiopsis:/home/nslu2/openembedded into marsco.kalmiopsis:/home/nslu2/ref 2005/04/19 12:56:29-07:00 kalmiopsis!jbowler r2 is a buildable and working system, in that slapd passes slaptest with this build using bdb (this must be set in the /etc/openldap/slapd.conf). 2005/04/19 12:40:08-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/19 08:40:10-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/19 07:40:10-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/19 06:40:09-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/19 05:40:12-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/19 04:40:08-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/19 01:40:08-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/18 23:40:07-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/18 22:40:10-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/18 19:40:07-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/18 18:40:07-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/18 15:40:09-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/18 13:40:10-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/18 12:40:09-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/18 11:40:10-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/18 09:48:49-07:00 kalmiopsis!jbowler Build fixes for openldap, openldap now installs and removes correctly. 2005/04/18 08:40:21-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/18 07:40:08-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/18 06:40:07-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/18 22:28:32+09:30 (none)!rwhitby Added /dev/dsp to Unslung 2005/04/18 03:40:08-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/18 02:40:08-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/18 00:40:09-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/17 22:32:27-07:00 kalmiopsis!jbowler Build fixes to ypserv (missing dependency) and pwdutils (required libpam, then some build fixes). 2005/04/17 22:30:30-07:00 kalmiopsis!jbowler This is a buildable but untested Linux-PAM 0.79, providing libpam. At present it only builds with glibc because some of the modules have a dependency on NIS (YP) functionality not present in uClibC. See http://www.kernel.org/pub/linux/libs/pam 2005/04/17 22:26:19-07:00 kalmiopsis!jbowler This is a working but untested build of the latest OpenLDAP, required by PAM, itself required by the standard NIS pwdutils. This version uses DB4, it is a work in progress the get the build to work with GDBM (also available in OE and more widely used.) 2005/04/17 22:23:26-07:00 kalmiopsis!jbowler This adds version 4 of the Berkely DB from Sleepycat Software. The package does not replace db3 - the APIs are sufficiently different for some software to potentially require a specific version. This package is called 'db' - Sleepycat's name, but it also provides 'db4'. The package also provides 'virtual/db', but it is the only one which does - this is for other packages which just require any relational database and are prepared to handle any API... 2005/04/17 14:40:13-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/17 10:40:27-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/17 07:40:07-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/17 06:40:07-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/17 05:40:08-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/17 04:40:08-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/17 03:40:11-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/17 01:40:08-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/16 20:40:08-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/16 01:40:07-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/16 00:40:10-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/15 22:40:06-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/15 21:40:11-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/15 14:40:11-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/15 22:20:46+09:30 (none)!rwhitby Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded into home.(none):/home/bitbake/openembedded 2005/04/15 22:18:25+09:30 (none)!rwhitby Unslung 4.14-alpha - Increased the USB disk startup wait to 10 seconds, and added the ability to divert rc.bootbin 2005/04/15 04:40:21-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/15 03:40:19-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/14 12:04:52-07:00 kalmiopsis!jbowler Buildable set of the latest Linux NIS tools. This commits source which builds but does not necessarily run yet (build tested on armeb only). pwdutils also requires a PAM implementation - not available as yet. 2005/04/14 10:40:17-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/14 09:00:27-07:00 kalmiopsis!jbowler UClibC has private copies of kernel ABI header files which must match the versions used by the kernel. The private copy of stat.h for ARM (kernel_stat.h) was incorrect. This corrects the ARMEB (big endian ARM) errors - the little endian errors simply cause truncation of values and are harmless. 2005/04/14 06:40:09-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/14 04:40:09-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/14 03:40:09-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/14 00:40:08-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/13 23:40:11-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/13 16:40:08-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/14 08:33:14+09:30 (none)!rwhitby Bumped OpenSlug version 2005/04/13 00:56:57-07:00 kalmiopsis!jbowler The non boot file systems (all the file systems not built into the kernel) are now specified in openslug.conf rather than openslug-image.bb. FAT file systems have a minimal nls set (cp437, utf8 - see the new HowTo/MountFATFileSystems on the wiki). The dependent modules - sunrpc, lockd (required by nfs) and fat, nls-base (required by vfat/msdos) are no longer specified explicitly - the corrected ipkg module RDEPENDS cause them to be brought in as required. 2005/04/12 10:05:04-07:00 kalmiopsis!jbowler Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded into marsco.kalmiopsis:/home/nslu2/openembedded 2005/04/12 09:58:24-07:00 kalmiopsis!jbowler Fix slugbug 91 Setting an override in local.conf for TARGET_OS has no effect, presumably because TARGET_OS is very low level (it is an override itself!) This change allows TARGET_OS_local to be set in local.conf (other overrides are still not possible.) 2005/04/12 09:39:58-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/12 09:16:15-07:00 kalmiopsis!jbowler Merge marsco.kalmiopsis:/home/nslu2/openembedded into marsco.kalmiopsis:/home/nslu2/ref 2005/04/12 05:40:01-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/12 04:40:00-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/12 03:40:04-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/11 20:51:24-07:00 kalmiopsis!jbowler Merge marsco.kalmiopsis:/home/nslu2/openembedded into marsco.kalmiopsis:/home/nslu2/ref 2005/04/11 15:41:34-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/11 09:41:33-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/11 04:41:40-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/11 07:39:14+09:30 (none)!rwhitby Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded into home.(none):/home/bitbake/openembedded 2005/04/11 07:38:41+09:30 (none)!rwhitby Added mysql to openslug-packages 2005/04/10 10:41:31-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/10 08:23:37-07:00 kalmiopsis!jbowler Merge marsco.kalmiopsis:/home/nslu2/openembedded into marsco.kalmiopsis:/home/nslu2/ref 2005/04/10 22:44:03+09:30 (none)!rwhitby Removed strace from openslug-packages, cause it doesn't build 2005/04/10 22:31:45+09:30 (none)!rwhitby Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded into home.(none):/home/bitbake/openembedded 2005/04/10 22:31:24+09:30 (none)!rwhitby Added expat and php to openslug-packages 2005/04/08 21:41:32-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/08 17:37:56-07:00 kalmiopsis!jbowler Merge marsco.kalmiopsis:/home/nslu2/openembedded into marsco.kalmiopsis:/home/nslu2/ref 2005/04/08 17:36:12-07:00 kalmiopsis!jbowler Generate the correct module RDEPENDS for modules from the 2.6 kernels - the module file name extension is .ko in 2.6, regular expressions have been changed to recognise both mod.o and mod.ko. Handle the modified depmod output - this outputs multiple kernel modules on one line, therefore it is necessary to split the dependency strip on white space. 2005/04/08 17:33:16-07:00 kalmiopsis!jbowler Patch depmod in the cross build case to allow it to read ELF files which have a byte sex differing from that of the host system. The patch also ensures that unaligned reads will not happen even if the ELF file alignment does not match that required for the host system. 2005/04/08 16:41:35-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/09 08:24:34+09:30 (none)!rwhitby Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded into home.(none):/home/bitbake/openembedded 2005/04/09 08:23:22+09:30 (none)!rwhitby Remove strace from openslug-packages, cause it doesn't build at the moment. 2005/04/08 15:41:30-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/08 13:41:29-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/08 12:41:37-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/08 10:41:30-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/08 04:41:37-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/08 03:41:30-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/08 02:41:35-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/07 15:41:44-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/07 11:41:30-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/07 09:41:32-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/07 08:41:35-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/07 06:41:35-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/07 03:41:31-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/06 22:14:33-10:00 (none)!dyoung Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded into builder.(none):/home/dereky/bbroot/openembedded 2005/04/06 22:13:57-10:00 (none)!dyoung Added basic audio support and bumped the kernel PR 2005/04/06 21:41:31-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/06 20:41:34-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/06 15:41:32-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/06 08:41:34-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/06 07:41:36-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/06 06:41:32-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/06 03:27:46-10:00 (none)!dyoung Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded into builder.(none):/home/dereky/bbroot/openembedded 2005/04/06 03:27:06-10:00 (none)!dyoung Add audio configuration options for unslung kernel 2005/04/06 05:41:36-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/05 16:41:30-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/05 14:41:36-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/05 10:41:33-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/05 09:41:31-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/05 08:41:30-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/05 07:41:29-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/05 23:47:32+09:30 (none)!rwhitby Unslung 4.13-alpha - switchbox updated to 4.11 2005/04/05 23:42:03+09:30 (none)!rwhitby Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded into home.(none):/home/bitbake/openembedded 2005/04/05 23:41:41+09:30 (none)!rwhitby SwitchBox 4.11 - removed portmap, and added altroot support. Note that nfsroot support syntax has changed. 2005/04/05 06:41:29-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/05 05:41:33-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/05 00:57:01-10:00 (none)!dyoung Merge 2005/04/05 00:51:04-10:00 (none)!dyoung linuxrc: Added support for alternate rootfs under expert user control. 2005/04/05 03:41:27-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/05 20:06:10+09:30 (none)!rwhitby Misc changes for switchbox linuxrc 2005/04/05 19:24:21+09:30 (none)!rwhitby Updated device-table for sdd and sde for Unslung and SwitchBox 2005/04/05 19:17:31+09:30 (none)!rwhitby Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded into home.(none):/home/bitbake/openembedded 2005/04/05 19:16:53+09:30 (none)!rwhitby Updated CVSDATE for untagged packages for Unslung, OpenSlug and SwitchBox 2005/04/05 02:41:36-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/05 01:41:31-07:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/04/05 00:41:31-07:00 bkbits.net!nslu2-linux.adm Merge bk:// --- packages/busybox/slingbox-1.00/defconfig | 8 ++--- packages/busybox/switchbox-1.00/linuxrc | 53 +++++++++++++++++++------------- packages/busybox/switchbox_1.00.bb | 2 +- 3 files changed, 37 insertions(+), 26 deletions(-) (limited to 'packages/busybox') diff --git a/packages/busybox/slingbox-1.00/defconfig b/packages/busybox/slingbox-1.00/defconfig index 192d218d57..463b3a8d19 100644 --- a/packages/busybox/slingbox-1.00/defconfig +++ b/packages/busybox/slingbox-1.00/defconfig @@ -75,7 +75,7 @@ CONFIG_UNZIP=y CONFIG_CHROOT=y # CONFIG_CMP is not set # CONFIG_CP is not set -# CONFIG_CUT is not set +CONFIG_CUT=y # CONFIG_DATE is not set # CONFIG_DD is not set # CONFIG_DF is not set @@ -98,7 +98,7 @@ CONFIG_FEATURE_FANCY_HEAD=y # CONFIG_LS is not set CONFIG_MD5SUM=y # CONFIG_MKDIR is not set -# CONFIG_MKFIFO is not set +CONFIG_MKFIFO=y # CONFIG_MKNOD is not set # CONFIG_MV is not set # CONFIG_OD is not set @@ -115,7 +115,7 @@ CONFIG_SORT=y # CONFIG_SYNC is not set CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y -# CONFIG_TEE is not set +CONFIG_TEE=y # CONFIG_TEST is not set # CONFIG_TOUCH is not set # CONFIG_TR is not set @@ -153,7 +153,7 @@ CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y # # Debian Utilities # -# CONFIG_MKTEMP is not set +CONFIG_MKTEMP=y # CONFIG_PIPE_PROGRESS is not set # CONFIG_READLINK is not set # CONFIG_RUN_PARTS is not set diff --git a/packages/busybox/switchbox-1.00/linuxrc b/packages/busybox/switchbox-1.00/linuxrc index 18a4440351..355a05b568 100644 --- a/packages/busybox/switchbox-1.00/linuxrc +++ b/packages/busybox/switchbox-1.00/linuxrc @@ -1,18 +1,15 @@ #!/bin/sh mounted= -runboot= prefroot= +runboot= /bin/mount -t proc proc /proc -/bin/echo "0x0100" > /proc/sys/kernel/real-root-dev sysconflen=`/bin/dd if=/dev/mtd1 bs=4 count=1 2>/dev/null | /usr/bin/hexdump -n 6 -e '"%02d"'` ipaddr=`/bin/dd if=/dev/mtd1 bs=1 count=$sysconflen skip=4 2>/dev/null | grep ip_addr | sed -e s/ip_addr=//` netmask=`/bin/dd if=/dev/mtd1 bs=1 count=$sysconflen skip=4 2>/dev/null | grep netmask | sed -e s/netmask=//` gateway=`/bin/dd if=/dev/mtd1 bs=1 count=$sysconflen skip=4 2>/dev/null | grep gateway | sed -e s/gateway=//` -nfsrootloc=`/bin/dd if=/dev/mtd1 bs=1 count=$sysconflen skip=4 2>/dev/null | grep nfsroot | sed -e s/nfsroot=// | cut -d, -f 1` -nfsrootopts=`/bin/dd if=/dev/mtd1 bs=1 count=$sysconflen skip=4 2>/dev/null | grep nfsroot | sed -e s/nfsroot=// | cut -d, -f 2- | sed -e s/\"//g` device=/dev/`/bin/sed -n -e 's/^\(mtd[0-9]*\): .* "FIS directory"/\1/p' /proc/mtd` length=`/bin/dd if=$device bs=2 skip=2048 2>/dev/null | /usr/bin/hexdump -n 4 -e '4/1 "%02X"' $device` @@ -22,6 +19,10 @@ if [ -z "$mounted" ] && /bin/mount -rt jffs2 /dev/mtdblock4 /mnt/jffs2 ; then /bin/echo "Preferred root device is /dev/ram0 (recovery)" mounted= prefroot= + elif [ -f /mnt/jffs2/.ramdisk ] ; then + /bin/echo "Preferred root device is /dev/ram1 (maintenence)" + mounted=/mnt/newroot + prefroot=maintenence elif [ -f /mnt/jffs2/.sda1root ] ; then /bin/echo "Preferred root device is /dev/sda1 (disk 1)" mounted=/mnt/newroot @@ -38,10 +39,10 @@ if [ -z "$mounted" ] && /bin/mount -rt jffs2 /dev/mtdblock4 /mnt/jffs2 ; then /bin/echo "Preferred root device is /dev/sdb2 (disk 2)" mounted=/mnt/newroot prefroot=sdb2 - elif [ -f /mnt/jffs2/.ramdisk ] ; then - /bin/echo "Preferred root device is /dev/ram1 (maintenence)" + elif [ -f /mnt/jffs2/.altroot ] ; then + /bin/echo "Preferred root device is a user defined blockdevice" mounted=/mnt/newroot - prefroot=maintenence + prefroot=altroot elif [ -f /mnt/jffs2/.nfsroot ] ; then /bin/echo "Preferred root device is through NFS" mounted=/mnt/newroot @@ -76,7 +77,7 @@ if [ -n "$prefroot" ] ; then /bin/dd if=/dev/zero of=/dev/ram1 bs=1k count=12k 2>/dev/null /bin/mkdir /lib /bin/ln -s /mnt/jffs2/lib/* /lib - /bin/mkdir /usr/bin + /bin/mkdir -p /usr/bin /bin/ln -s /mnt/jffs2/usr/bin/mke2fs /usr/bin /bin/ln -s /mnt/jffs2/usr/bin/find /usr/bin /bin/ln -s /mnt/jffs2/usr/bin/cpio /usr/bin @@ -107,12 +108,26 @@ if [ -n "$prefroot" ] ; then fi - if [ $prefroot = "nfsroot" ] ; then + if [ $prefroot = "altroot" ] ; then + # The altrootloc and altrootopts vars MUST be chosen here. + # ie: $altrootopts="-rt ext3" and $altrootloc=/dev/md0 + # Also modules can be loaded here. + # also if you have a really slow starting disk, you can put a large sleep value here. + . /mnt/jffs2/.altroot + + /bin/mount $altrootopts $altrootloc /mnt/newroot + if [ -L /mnt/newroot/sbin/init -o -x /mnt/newroot/sbin/init -o \ + -L /mnt/newroot/bin/init -o -x /mnt/newroot/bin/init ] ; then + /bin/echo "Root filesystem will be mounted from a user defined rootfs (altroot) ..." + else + /bin/umount /mnt/newroot + /bin/echo "Cant find valid rootfs on user defined rootfs (altroot), using jffs2 ..." + mounted=/mnt/jffs2 + prefroot=jffs2 + fi + fi - /bin/mkdir -p /lib - /bin/ln -s /mnt/jffs2/lib/* /lib - /bin/mkdir -p /sbin - /bin/ln -s /mnt/jffs2/sbin/portmap /sbin + if [ $prefroot = "nfsroot" ] ; then /sbin/insmod ixp400 /sbin/insmod ixp425_eth @@ -120,16 +135,15 @@ if [ -n "$prefroot" ] ; then /sbin/route add default gw $gateway /sbin/ifconfig lo up 127.0.0.1 - /sbin/portmap # The nfsrootloc and nfsrootopts vars can be overridden here. . /mnt/jffs2/.nfsroot - mount -o $nfsrootopts $nfsrootloc /mnt/newroot + /bin/mount $nfsrootopts $nfsrootloc /mnt/newroot if [ -L /mnt/newroot/sbin/init -o -x /mnt/newroot/sbin/init -o \ -L /mnt/newroot/bin/init -o -x /mnt/newroot/bin/init ] ; then - /bin/echo "Root filesystem will be mounted from a NFS root ..." + /bin/echo "Root filesystem will be mounted from an NFS root ..." mounted=/mnt/newroot else /bin/umount /mnt/newroot @@ -154,14 +168,11 @@ fi # Pivot if [ -n "$mounted" ] ; then - if [ $prefroot = "nfsroot" ] ; then - /usr/bin/killall portmap - fi if [ $mounted != "/mnt/jffs2" ] ; then sleep 1 /bin/umount /mnt/jffs2 fi - umount /proc + /bin/umount /proc cd $mounted if [ -x ./linuxrc -o -L ./linuxrc ] ; then runboot=/linuxrc @@ -173,7 +184,7 @@ if [ -n "$mounted" ] ; then runboot=/bin/sh fi /sbin/pivot_root . initrd - exec /usr/sbin/chroot . $runboot < dev/console > dev/console 2>&1 + exec /usr/sbin/chroot . $runboot < /dev/console 1> /dev/console 2> /dev/console fi if [ -z "$mounted" ] ; then diff --git a/packages/busybox/switchbox_1.00.bb b/packages/busybox/switchbox_1.00.bb index 7ddecf8738..d1ad177ffa 100644 --- a/packages/busybox/switchbox_1.00.bb +++ b/packages/busybox/switchbox_1.00.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.busybox.net" LICENSE = "GPL" SECTION = "base" PRIORITY = "required" -PR = "r10" +PR = "r11" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://defconfig \ -- cgit v1.2.3