From: nslu2-linux.adm@bkbits.net Date: Sat, 11 Jun 2005 15:40:07 +0000 (+0000) Subject: Merge bk://oe-devel.bkbits.net/openembedded X-Git-Tag: Release-2010-05/1~13944 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7fb4f35e794a40cf1ce444aa155c587a00ced5e;p=openembedded.git Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/06/11 16:53:44+02:00 (none)!br1 Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into null.(none):/data/mtx/src/build/unstable.wrt/openembedded 2005/06/11 16:53:15+02:00 (none)!br1 wrt54 updates: use minimal init "miniint", wrt specific config files for uClibc and busybox, added "nvram" BKrev: 42ab05d7sJq1G3I2D6IwTgkY4x9iEQ --- diff --git a/conf/machine/wrt54.conf b/conf/machine/wrt54.conf index f5c9166d98..a9c9b799c2 100644 --- a/conf/machine/wrt54.conf +++ b/conf/machine/wrt54.conf @@ -3,9 +3,11 @@ #@DESCRIPTION: Machine configuration for the MIPS based WRT54G(S) devices TARGET_ARCH = "mipsel" -#TARGET_CC_ARCH = "-Os -mips2" +TARGET_CC_ARCH = "-Os" IPKG_ARCHS = "all mipsel ${MACHINE}" +SERIAL_CONSOLE = "tts/0" + ROUTER_MODULES = "ipv6 \ ipsec \ mip6-mn \ @@ -18,8 +20,8 @@ ip-gre ip-tables ipip \ input uinput \ " -BOOTSTRAP_EXTRA_DEPENDS = "" -BOOTSTRAP_EXTRA_RDEPENDS = "" +BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel" +BOOTSTRAP_EXTRA_RDEPENDS = "kernel-module-wl kernel-module-et" BOOTSTRAP_EXTRA_RRECOMMENDS = "" PREFERRED_PROVIDER_virtual/kernel = "linux-wrt" diff --git a/packages/base-files/base-files/wrt54/fstab b/packages/base-files/base-files/wrt54/fstab index e69de29bb2..c1e52f8927 100644 --- a/packages/base-files/base-files/wrt54/fstab +++ b/packages/base-files/base-files/wrt54/fstab @@ -0,0 +1,7 @@ +# /etc/fstab: static file system information. wrt +# +# +rootfs / auto defaults 1 1 +tmpfs /var tmpfs size=50% 0 0 +proc /proc proc defaults 0 0 +devpts /dev/pts devpts mode=0620,gid=5 0 0 diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index 57bf381129..3a08535ee9 100644 --- a/packages/base-files/base-files_3.0.14.bb +++ b/packages/base-files/base-files_3.0.14.bb @@ -148,6 +148,7 @@ do_install_append_nylon() { rm ${D}${sysconfdir}/resolv.conf touch ${D}${sysconfdir}/resolv.conf rm -r ${D}/mnt/* + rm -r ${D}/media } do_install_append_openslug() { diff --git a/packages/busybox/busybox-1.00/wrt54/defconfig b/packages/busybox/busybox-1.00/wrt54/defconfig new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/meta/nylon-image-mini.bb b/packages/meta/nylon-image-mini.bb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/mini-init b/packages/mini-init new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/miniinit/files/inittab b/packages/miniinit/files/inittab new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/miniinit/files/rcS b/packages/miniinit/files/rcS new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/miniinit/miniinit.bb b/packages/miniinit/miniinit.bb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/uclibc/uclibc-0.9.27/wrt54/uClibc.config b/packages/uclibc/uclibc-0.9.27/wrt54/uClibc.config new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/wrt/nvram.bb b/packages/wrt/nvram.bb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/wrt/nvram/nvram-Makefile.diff b/packages/wrt/nvram/nvram-Makefile.diff new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/wrt/wrt-init.bb b/packages/wrt/wrt-init.bb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/wrt/wrt-init/mount b/packages/wrt/wrt-init/mount new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/wrt/wrt-init/wrtboot b/packages/wrt/wrt-init/wrtboot new file mode 100644 index 0000000000..e69de29bb2