summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/openslug.conf45
-rw-r--r--conf/distro/unslung.conf2
-rw-r--r--conf/machine/nslu2.conf12
3 files changed, 46 insertions, 13 deletions
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 54a464204d..274fdec3c9 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -3,11 +3,13 @@
#@DESCRIPTION: OpenSlug Linux Distribution for the NSLU2
DISTRO_NAME = "OpenSlug"
-DISTRO_VERSION = "1.7-beta"
+DISTRO_VERSION = "1.8-beta"
DISTRO_TYPE ?= "beta"
-TARGET_FPU = "soft"
-TARGET_OS = "linux"
+TARGET_FPU_local ?= "soft"
+TARGET_FPU := "${TARGET_FPU_local}"
+TARGET_OS_local ?= "linux"
+TARGET_OS := "${TARGET_OS_local}"
USE_NLS ?= "no"
USE_NLS_glib-2.0 = "yes"
@@ -26,11 +28,43 @@ 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}"
+# Filesystem selection: set in local.conf to override. Adding entries
+# here adds the module to the image. The module must be built as part
+# of openslug-kernel (i.e. it must be specified as a module in the
+# defconfig file). The NLS support charset modules must be given
+# explicitly and must match the codepage/iocharset and NLS handling
+# for the file systems which require them. The installed lanugage
+# set is minimal but sufficient for any file system (since it uses
+# utf8). See http://www.nslu2-linux.orgwiki/HowTo/MountFATFileSystems
+# for more information on the language behaviour of the DOS file
+# systems.
+#
+# NOTE: removing kernel-module-nfs from this list will prevent NFS
+# boot (however you can do a simple flash file system boot - no
+# attached disk - and install the nfs modules from ssh.)
+OPENSLUG_EXTRA_FILESYSTEMS ?= "\
+kernel-module-nfs \
+kernel-module-vfat \
+kernel-module-ntfs \
+kernel-module-isofs \
+kernel-module-udf \
+kernel-module-nls-cp437 \
+kernel-module-nls-utf8 \
+"
+
+# This documents other file systems which are built but not installed
+# by default in the flash image.
+#
+# kernel-module-msdos - mounts a FAT file system without long file names
+# (use kernel-module-vfat, it shows the long names
+# if present.)
+# kernel-module-reiserfs - support for the reiser file system
+
+OPENSLUG_EXTRA_INSTALL ?= "${OPENSLUG_EXTRA_RDEPENDS} ${OPENSLUG_EXTRA_FILESYSTEMS}"
# These lines are for backwards compatibility and will be removed soon.
BOOTSTRAP_EXTRA_DEPENDS += "${OPENSLUG_EXTRA_DEPENDS}"
-BOOTSTRAP_EXTRA_RDEPENDS += "${OPENSLUG_EXTRA_RDEPENDS}"
+BOOTSTRAP_EXTRA_RDEPENDS += "${OPENSLUG_EXTRA_RDEPENDS} ${OPENSLUG_EXTRA_FILESYSTEMS}"
PREFERRED_PROVIDER_virtual/kernel ?= "openslug-kernel"
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
@@ -38,4 +72,3 @@ 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"
-
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index f7a765a82a..31e781bb0f 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -7,7 +7,7 @@ FEED_URIS += "native##http://ipkg.nslu2-linux.org/feeds/unslung/native"
FEED_URIS += "oe##http://ipkg.nslu2-linux.org/feeds/unslung/oe"
DISTRO_NAME = "Unslung"
-DISTRO_VERSION = "4.7-alpha"
+DISTRO_VERSION = "4.13-alpha"
DISTRO_TYPE = "beta"
TARGET_FPU = "soft"
diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf
index 9fe31196f5..f768e7a109 100644
--- a/conf/machine/nslu2.conf
+++ b/conf/machine/nslu2.conf
@@ -15,9 +15,9 @@ SERIAL_CONSOLE = "115200 ttyS0"
KERNEL_CONSOLE = "ttyS0,115200n8"
USE_VT = "0"
-CVSDATE_gnu-config-native ?= "20050221"
-CVSDATE_ipkg-utils-native ?= "20050221"
-CVSDATE_ipkg-link ?= "20050221"
-CVSDATE_uclibc ?= "20050221"
-CVSDATE_genext2fs ?= "20050221"
-CVSDATE_genext2fs-native ?= "20050221" \ No newline at end of file
+CVSDATE_gnu-config-native ?= "20050405"
+CVSDATE_ipkg-utils-native ?= "20050405"
+CVSDATE_ipkg-link ?= "20050405"
+CVSDATE_uclibc ?= "20050405"
+CVSDATE_genext2fs ?= "20050405"
+CVSDATE_genext2fs-native ?= "20050405" \ No newline at end of file