summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2007-02-07 13:03:31 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2007-02-07 13:03:31 +0000
commitdfae9a6612d08957da965f5b32d063e7f2a55e97 (patch)
treefd168b212935230f8e596a07ca82234b3eeb082b /conf
parent256042cd776f4160c2b6aaadc3f634926279339f (diff)
parent4b81868aeec5a0a640df6d493ee2bdeb7eec5233 (diff)
merge of 531b56411734b2c857cc1bcb737fcccef9833ab1
and f70da3815672ac605b525b2d9d2ee990d53d421f
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/include/angstrom.inc1
-rw-r--r--conf/distro/include/slugos.inc2
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):