From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 21 Feb 2005 13:49:25 +0000 (+0000)
Subject: Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
X-Git-Tag: Release-2010-05/1~14898
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a98fc46b9b1ee293d9923d1df2d94ffe4aaac333;p=openembedded.git

Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into home.(none):/home/slug/openembedded

2005/02/22 00:16:01+10:30 (none)!rwhitby
OpenSlug-1.1-alpha, versioned, with rw initrd.

BKrev: 4219e6e5o2rUzT9CS-dH6N4B3ljthg
---

diff --git a/packages/linux/openslug-kernel_2.6.9.bb b/packages/linux/openslug-kernel_2.6.9.bb
index 15497bfab9..5e1097aa31 100644
--- a/packages/linux/openslug-kernel_2.6.9.bb
+++ b/packages/linux/openslug-kernel_2.6.9.bb
@@ -2,7 +2,7 @@ SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the Linksys NSLU2 device"
 LICENSE = "GPL"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-PR = "r2"
+PR = "r3"
 
 KERNEL_SUFFIX = "openslug"
 
@@ -29,7 +29,7 @@ KERNEL_IMAGETYPE = "zImage"
 CMDLINE_CONSOLE ?= "ttyS0,115200n8"
 #CMDLINE_ROOT = "root=/dev/slug rootfstype=ext2,jffs2 initrd=0x01000000,10M mem=32M@0x00000000"
 #CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 mem=32M@0x00000000"
-CMDLINE_ROOT = "root=/dev/ram0 rootfstype=ext2,jffs2 initrd=0x01000000,10M init=/linuxrc mem=32M@0x00000000"
+CMDLINE_ROOT = "root=/dev/ram0 rw rootfstype=ext2,jffs2 initrd=0x01000000,10M init=/linuxrc mem=32M@0x00000000"
 CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_CONSOLE}"
 
 do_configure_prepend() {
diff --git a/packages/openslug-init/openslug-init_0.10.bb b/packages/openslug-init/openslug-init_0.10.bb
index ed5b440386..897f70f27f 100644
--- a/packages/openslug-init/openslug-init_0.10.bb
+++ b/packages/openslug-init/openslug-init_0.10.bb
@@ -2,7 +2,9 @@ DESCRIPTION = "Openslug initial network config via sysconf"
 SECTION = "console/network"
 LICENSE = "GPL"
 DEPENDS = "base-files"
-PR = "r4"
+PR = "r5"
+
+OPENSLUG_VERSION = "1.1-alpha"
 
 SRC_URI = "file://sysconfsetup \
 	   file://kern_header.c"
@@ -17,6 +19,8 @@ do_compile() {
 }
 
 do_install() {
+	echo "OpenSlug-${OPENSLUG_VERSION}" > ${D}/.openslug
+
         install -d ${D}/${sysconfdir} \
                    ${D}/${sysconfdir}/init.d \
                    ${D}/${sysconfdir}/rcS.d \
@@ -29,4 +33,4 @@ do_install() {
 	ln  -s /etc/init.d/sysconfsetup ${D}/${sysconfdir}/rcS.d/S39sysconfsetup
 }
 
-FILES_${PN} += "/initrd"
+FILES_${PN} = "/"