diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2005-07-03 20:36:10 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-07-03 20:36:10 +0000 |
| commit | 8983fd0d38c80a66e95fa88fa2d0314def722d85 (patch) | |
| tree | fad9d4601ec13e2cfeaf2766bc586d11cae31cac | |
| parent | 575f004e329e2d8481a61bd0db2a64f968d12ab1 (diff) | |
| parent | e97ed1e62518273ae89bdf32cc65f2caa3c050df (diff) | |
propagate from branch 'org.openembedded.dev' (head e7deec567712930f830c6a392453b58268463120)
to branch 'org.openembedded.nslu2-linux' (head bfb64dfb19eb6055f394a9ee933ebb8c93bcbe75)
| -rw-r--r-- | conf/distro/openslug.conf | 5 | ||||
| -rw-r--r-- | packages/openslug-init/openslug-init-0.10/initscripts/sysconfsetup | 4 | ||||
| -rw-r--r-- | packages/openslug-init/openslug-init_0.10.bb | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index e4b20c0e5f..22e835e257 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -91,9 +91,12 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" # Select the correct versions of the kernel and modules -PREFERRED_PROVIDER_virtual/kernel ?= "openslug-kernel" +PREFERRED_PROVIDER_virtual/kernel ?= "nslu2-kernel" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" PREFERRED_VERSION_openslug-kernel ?= "2.6.11.2" +# The nslu2-kernel version is currently tracking the latest +# Change before release! +#PREFERRED_VERSION_nslu2-kernel ?= "2.6.12.2" PREFERRED_VERSION_ixp4xx-csr ?= "1.4" PREFERRED_VERSION_ixp425-eth ?= "1.1" diff --git a/packages/openslug-init/openslug-init-0.10/initscripts/sysconfsetup b/packages/openslug-init/openslug-init-0.10/initscripts/sysconfsetup index 1940b00ff8..31ff38d7ee 100644 --- a/packages/openslug-init/openslug-init-0.10/initscripts/sysconfsetup +++ b/packages/openslug-init/openslug-init-0.10/initscripts/sysconfsetup @@ -60,9 +60,11 @@ then # is removed (to be exact, the sed script selects only lines # which match one of the two above). The lan interface, which # defaults to ixp0, is changed to the correct value for openslug, - # eth0 + # eth0. The bootproto, which LinkSys sets to static in manufacturing, + # is reset to dhcp if the IP is still the original (192.168.1.77) devio "<<$sysdev" cpb fb1,10 | sed -n '/^\[[^][]*\]$/p; s/^lan_interface=ixp0$/lan_interface=eth0/; + /^ip_addr=192\.168\.1\.77$/,/^bootproto/s/^bootproto=static$/bootproto=dhcp/; /^[-a-zA-Z0-9_][-a-zA-Z0-9_]*=/p' >/etc/default/sysconf # # The SysConf must have a hardware id, if it doesn't it has diff --git a/packages/openslug-init/openslug-init_0.10.bb b/packages/openslug-init/openslug-init_0.10.bb index 76bd00754a..bf43759aa7 100644 --- a/packages/openslug-init/openslug-init_0.10.bb +++ b/packages/openslug-init/openslug-init_0.10.bb @@ -3,7 +3,7 @@ SECTION = "console/network" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r31" +PR = "r32" SRC_URI = "file://linuxrc \ file://boot/flash \ |