Add support for UcSlugC builds.

(1) the 'standard' settings in local.conf.template (from the nslu2-linux.org
master makefile) have been folded back into the three distro .conf files.
(2) openslug-image now builds for any NSLU2 distro
(3) ucslugc configuration added
(4) more comments in the openslug and ucslugc configuration files

1 files changed, 77 insertions, 29 deletions

diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 4c22206a49..80cf489b5b 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -2,13 +2,36 @@
 #@NAME: OpenSlug
 #@DESCRIPTION: OpenSlug Linux Distribution for the NSLU2
 
+#----------------------------------------------------------------------------------
+# STANDARD OpenSlug DEFINITIONS
+#----------------------------------------------------------------------------------
 DISTRO_NAME = "OpenSlug"
 DISTRO_VERSION = "2.4-beta"
 DISTRO_TYPE ?= "beta"
 
-# pull in the frozen list of bbfiles
+TARGET_FPU = "soft"
+TARGET_OS = "linux"
+
+USE_NLS ?= "no"
+USE_NLS_glib-2.0 = "yes"
+
+INHERIT += " package_ipk debian nslu2_flashimg"
+
+# NOTE: to build new packages set OPENSLUG_EXTRA_BBFILES to the full path name to
+# the .bb files for the packages to build - see openslug-packages.conf in this
+# directory
+OPENSLUG_EXTRA_BBFILES ?= ""
+
+# pull in the frozen list of bbfiles - this sets BBFILES and this will override any
+# setting in local.conf
 include conf/distro/freeze.conf
 
+#----------------------------------------------------------------------------------
+# FEEDS
+#  The following lines define where on the internet OpenSlug looks for packages
+#  when downloading new packages or updating existing packages.  Additional feeds
+#  (such as a local feed) can be defined in local.conf
+#----------------------------------------------------------------------------------
 # Add to the user's feeds from local.conf (there may be none)
 FEED_URIS_append_linux += "cross##http://ipkg.nslu2-linux.org/feeds/openslug/cross/${DISTRO_VERSION}"
 FEED_URIS_append_linux += "native##http://ipkg.nslu2-linux.org/feeds/openslug/native/${DISTRO_VERSION}"
@@ -18,35 +41,24 @@ FEED_URIS_append_linux += "native##http://ipkg.nslu2-linux.org/feeds/openslug/na
 #FEED_URIS_append_linux += "unstable_cross##http://ipkg.nslu2-linux.org/feeds/openslug/cross/unstable"
 #FEED_URIS_append_linux += "unstable_native##http://ipkg.nslu2-linux.org/feeds/openslug/native/unstable"
 
-
-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"
-
-INHERIT += " package_ipk debian nslu2_flashimg"
-
+#----------------------------------------------------------------------------------
+# FIRMWARE CONFIGURATION
+#----------------------------------------------------------------------------------
+# IMAGE BUILD OPTIONS
+# -------------------
 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  ?= "e2fsprogs reiserfsprogs upslug-native lrzsz"
-
-# NOTE: to build new packages set OPENSLUG_EXTRA_BBFILES to the full path name to
-# the .bb files for the packages to build - see openslug-packages.conf in this
-# directory
-OPENSLUG_EXTRA_BBFILES ?= ""
-
 # CMDLINE* macros define the kernel command line.  CMDLINE_DEBUG is provided
 # to enable/disable debugging in the distro.  Here noirqdebug is used to
 # remove the messages about unhandled interrupts - people debugging interrupt
 # issues in the kernel need to cancel this (set CMDLINE_DEBUG empty in local.conf)
 CMDLINE_DEBUG = "noirqdebug"
 
+# EXTRA PACKAGES
+# --------------
 # 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.
@@ -54,13 +66,47 @@ CMDLINE_DEBUG = "noirqdebug"
 # 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 \
-kernel-module-pl2303 kernel-module-ftdi-sio"
+
+# The standard firmware contents and additional packages built as requirements
+# of the firmware are defined here in OPENSLUG_STANDARD_RDEPENDS and
+# OPENSLUG_STANDARD_DEPENDS respectively.
+OPENSLUG_STANDARD_DEPENDS = ""
+OPENSLUG_STANDARD_RDEPENDS = ""
+
+# Support for a variety of file systems is built in to the openslug
+# image, programs to format disks with these file systems may be
+# added or removed.  By default ext2. ext3 and reiserfs supported
+# is included by the following lines.
+# 
+# These lines add support for formatting ext2 and ext3 file systems
+# on a hard disk attached to the NSLU2.  ext3 is the standard Linux
+# file system.
+OPENSLUG_STANDARD_DEPENDS += "e2fsprogs"
+OPENSLUG_STANDARD_RDEPENDS += "${OPENSLUG_EXT2_PROGS}"
+
+# These lines add support for formatting reiserfs file systems on
+# a hard disk.
+OPENSLUG_STANDARD_DEPENDS += "reiserfsprogs"
+OPENSLUG_STANDARD_RDEPENDS += "${OPENSLUG_REISER_PROGS}"
+
+# These lines add a build of the 'upslug' program which may be
+# used to download the final image to an NSLU2.  The program can
+# be found within the tmp/work/upslug-native* directory.
+OPENSLUG_STANDARD_DEPENDS += "upslug-native"
+
+# These lines add support for an X/Y/ZModem package called lrzsz
+# (this is of use for people with modified NSLU2 hardware which
+# supports a serial port.)
+OPENSLUG_STANDARD_DEPENDS += "lrzsz"
+OPENSLUG_STANDARD_RDEPENDS += "lrzsz"
+
+# The 'standard' values are the defaults for the 'extra' packages added
+# to the firmware image.  None of these things are requirements to have
+# a bootable, useable, system however they *are* expected to be present
+# in OpenSlug - see osuclibc for a more minimal configuration and some
+# more instructions about how to make a non-openslug image.
+OPENSLUG_EXTRA_DEPENDS  ?= "${OPENSLUG_STANDARD_DEPENDS}"
+OPENSLUG_EXTRA_RDEPENDS ?= "${OPENSLUG_STANDARD_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
@@ -73,6 +119,8 @@ kernel-module-pl2303 kernel-module-ftdi-sio"
 # for more information on the language behaviour of the DOS file
 # systems.
 #
+# KERNEL LEVEL FILE SYSTEM SUPPORT
+# --------------------------------
 # 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.)
@@ -99,6 +147,9 @@ kernel-module-nls-utf8 \
 
 OPENSLUG_EXTRA_INSTALL ?= "${OPENSLUG_EXTRA_RDEPENDS} ${OPENSLUG_EXTRA_FILESYSTEMS}"
 
+#----------------------------------------------------------------------------------
+# PACKAGE VERSION CONTROL
+#----------------------------------------------------------------------------------
 # Select the correct versions of the compiler tools (note that there
 # is also some selection in machine/nslu2.conf)
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
@@ -108,9 +159,6 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 # 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"
-
-# Tracking the latest version, so the following is commented out.
-# Uncomment it before release!
 PREFERRED_VERSION_openslug-kernel ?= "2.6.12.2"
 
 PREFERRED_VERSION_ixp4xx-csr ?= "1.4"