diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-02-06 10:54:20 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-02-06 10:54:20 +0000 |
| commit | f382b01ff8e36a8b92a23b6e934ebefe65eb721a (patch) | |
| tree | 08f9b75bebaa6b71b3d3d37df3bb43ade5bb2bec /conf | |
| parent | 256042cd776f4160c2b6aaadc3f634926279339f (diff) | |
| parent | f760c0cf3ee6e45126784e0c79a94ebe900f4347 (diff) | |
merge of '531b56411734b2c857cc1bcb737fcccef9833ab1'
and '5c2c70f1ecf63e84f8c487423e9c7d65a4f05d8e'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/include/angstrom.inc | 1 | ||||
| -rw-r--r-- | conf/distro/include/slugos.inc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index c057d1a05e..79ec27af72 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -50,3 +50,4 @@ DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove thi # We want images supporting the following features (for task-base) DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost pci" +DISTRO_FEATURES_nslu2le = "nfs smbfs alsa bluetooth ext2 usbhost pci" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index ba61355ba8..c0401d93d3 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -35,7 +35,7 @@ #DISTRO_TYPE # The following may be overridden to make sub-versions -SLUGOS_VERSION = "4.2" +SLUGOS_VERSION = "4.3" DISTRO_REVISION ?= "" DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # For release (only): |