summaryrefslogtreecommitdiff
path: root/conf/distro
diff options
context:
space:
mode:
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/openslug.conf27
1 files changed, 14 insertions, 13 deletions
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 761f7dec4b..eb39766950 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -3,7 +3,7 @@
#@DESCRIPTION: OpenSlug Linux Distribution for the NSLU2
DISTRO_NAME = "OpenSlug"
-DISTRO_VERSION = "1.5-beta"
+DISTRO_VERSION = "1.6-beta"
TARGET_FPU = "soft"
TARGET_OS = "linux"
@@ -17,22 +17,23 @@ IMAGE_FSTYPES = "jffs2"
OPENSLUG_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-openslug.txt')}"
EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000 -D ${OPENSLUG_DEVICE_TABLE}"
-OPENSLUG_EXTRA_DEPENDS += "virtual/kernel module-init-tools mtd-utils modutils-initscripts"
-OPENSLUG_EXTRA_RDEPENDS += "kernel-module-usbnet kernel-module-usbserial \
-kernel-module-pegasus kernel-module-p8022 kernel-module-kaweth \
-module-init-tools mtd-utils modutils-initscripts"
+OPENSLUG_EXTRA_DEPENDS ?= ""
+OPENSLUG_EXTRA_RDEPENDS ?= "\
+kernel-module-usbnet \
+kernel-module-pegasus kernel-module-p8022 kernel-module-kaweth \
+kernel-module-usbserial \
+kernel-module-pl2303 kernel-module-ftdi-sio"
-OPENSLUG_EXTRA_INSTALL += "${OPENSLUG_EXTRA_RDEPENDS}"
-
-# Whether to use the old shell hotplug or the new C hotplug is a
-# distribution decision.
-#OPENSLUG_EXTRA_DEPENDS += "linux-hotplug"
-#OPENSLUG_EXTRA_RDEPENDS += "linux-hotplug"
-OPENSLUG_EXTRA_DEPENDS += "hotplug-ng"
-OPENSLUG_EXTRA_RDEPENDS += "hotplug-ng"
+OPENSLUG_EXTRA_INSTALL ?= "${OPENSLUG_EXTRA_RDEPENDS}"
+# These lines are for backwards compatibility and will be removed soon.
BOOTSTRAP_EXTRA_DEPENDS += "${OPENSLUG_EXTRA_DEPENDS}"
BOOTSTRAP_EXTRA_RDEPENDS += "${OPENSLUG_EXTRA_RDEPENDS}"
PREFERRED_PROVIDER_virtual/kernel ?= "openslug-kernel"
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
+
+PREFERRED_VERSION_openslug-kernel ?= "2.6.11.2"
+PREFERRED_VERSION_ixp4xx-csr ?= "1.4"
+PREFERRED_VERSION_ixp425-eth ?= "1.1"
+