aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf/distro/include/slugos.inc4
-rw-r--r--conf/distro/slugos.conf2
-rw-r--r--recipes/meta/slugos-packages.bb10
3 files changed, 8 insertions, 8 deletions
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 0451fc1f38..7ca8b7a072 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -20,8 +20,8 @@ SLUGOS_VERSION = "6.0"
DISTRO_REVISION ?= ""
DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
# For release (only):
-# DISTRO_FEED ?= "${SLUGOS_VERSION}-${DISTRO_TYPE}"
-DISTRO_FEED ?= "unstable"
+DISTRO_FEED ?= "${SLUGOS_VERSION}-${DISTRO_TYPE}"
+#DISTRO_FEED ?= "unstable"
THUMB_INTERWORK = "yes"
# "yes" "no"
diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf
index 4679d95c3b..235cf6f0c7 100644
--- a/conf/distro/slugos.conf
+++ b/conf/distro/slugos.conf
@@ -3,7 +3,7 @@
#@DESCRIPTION: SlugOS Linux Distribution for the NSLU2
DISTRO_NAME = "SlugOS"
-DISTRO_TYPE = "alpha"
+DISTRO_TYPE = "beta"
ARM_INSTRUCTION_SET = "thumb"
IPKG_VARIANT ?= "opkg"
diff --git a/recipes/meta/slugos-packages.bb b/recipes/meta/slugos-packages.bb
index 648fd40928..5f2cdee079 100644
--- a/recipes/meta/slugos-packages.bb
+++ b/recipes/meta/slugos-packages.bb
@@ -5,7 +5,7 @@
DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
HOMEPAGE = "http://www.nslu2-linux.org"
LICENSE = "MIT"
-PR = "r77"
+PR = "r78"
CONFLICTS = "db3"
COMPATIBLE_MACHINE = "nslu2|ixp4xx"
@@ -219,9 +219,6 @@ SLUGOS_PACKAGES = "\
wget \
wireless-tools \
wpa-supplicant \
- wview-sim \
- wview-vpro \
- wview-wxt510 \
xinetd \
yp-tools ypbind ypserv \
zd1211-firmware \
@@ -253,11 +250,14 @@ SLUGOS_X11_PACKAGES = "\
# Packages that are broken but need to be fixed!
#
# - madwifi-ng: needs newer version for updated IXP4XX kernel
-# - vsftpd: broken in general, needs libcap added to recipe
+# - wview-*: references host libs
#
SLUGOS_BROKEN_BUT_NEED_FIXING_PACKAGES = "\
madwifi-ng \
ftpd-topfield \
+ wview-sim \
+ wview-vpro \
+ wview-wxt510 \
"
# Packages currently broken on all platforms