Image description changes: packages not required for a

bootable image have been moved to the openslug.conf
file so that an image can be built without them (by
overriding the OPENSLUG_EXTRA_RDEPENDS variable.)

Image release name changed to 1.20-pre1

BKrev: 4297436cqk3HFrq4AoEgLcOBYWcbpw

1 files changed, 16 insertions, 7 deletions

diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 59575f0810..5ab025e8f9 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.12-beta"
+DISTRO_VERSION = "1.20-pre1"
 DISTRO_TYPE ?= "beta"
 
 TARGET_FPU_local ?= "soft"
@@ -21,8 +21,18 @@ 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  ?= ""
+OPENSLUG_EXTRA_DEPENDS  ?= "e2fsprogs reiserfsprogs lrzsz"
+
+# Filesystem support modules are listed in here for easy removal,
+# as is the lrzsz serial package and other kernel modules which are
+# not absolutely required for boot.
+# NOTE: only jffs2 support is an absolute requirement of boot, even
+# the ext2/ext3 support is optional!
+OPENSLUG_EXT2_PROGS =  "e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-e2fsck"
+OPENSLUG_REISER_PROGS = "reiserfsprogs"
 OPENSLUG_EXTRA_RDEPENDS ?= "\
+lrzsz \
+${OPENSLUG_EXT2_PROGS} ${OPENSLUG_REISER_PROGS} \
 kernel-module-usbnet \
 kernel-module-pegasus kernel-module-p8022 kernel-module-kaweth \
 kernel-module-usbserial \
@@ -43,11 +53,14 @@ kernel-module-pl2303 kernel-module-ftdi-sio"
 # 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-ext2 \
+kernel-module-ext3 \
 kernel-module-nfs \
 kernel-module-vfat \
 kernel-module-ntfs \
 kernel-module-isofs \
 kernel-module-udf \
+kernel-module-reiserfs \
 kernel-module-nls-cp437 \
 kernel-module-nls-utf8 \
 "
@@ -58,14 +71,10 @@ kernel-module-nls-utf8 \
 # 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} ${OPENSLUG_EXTRA_FILESYSTEMS}"
-
+# Select the correct versions of the kernel and modules
 PREFERRED_PROVIDER_virtual/kernel ?= "openslug-kernel"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"