openslug: move to new configuration file organisation, use IAL 2.0, remove zImage (all versions)

  - configuration changes plus a move to use IAL 2.0 for the ethernet
  - support and to remove zImage from the default rootfs.  This makes
  - a lot more space (now around 1MByte) available in the rootfs.

1 files changed, 34 insertions, 91 deletions

diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index de0a4f46fd..a7c21bca2f 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -7,25 +7,17 @@
 #----------------------------------------------------------------------------------
 DISTRO_NAME = "OpenSlug"
 DISTRO_VERSION = "2.8-beta"
-DISTRO_TYPE ?= "beta"
+DISTRO_FEED = "unstable"
+DISTRO_TYPE = "beta"
 
-TARGET_FPU = "soft"
-TARGET_OS = "linux"
-
-USE_NLS ?= "no"
-USE_NLS_glib-2.0 = "yes"
-
-INHERIT += " package_ipk debian nslu2-jffs2-image"
+# nslu2-jffs2-image builds a complete image (not just the parts)
+INHERIT += "nslu2-jffs2-image"
 
 # 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
+# the .bb files for the packages to build - see ucslugc-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
@@ -33,30 +25,12 @@ include conf/distro/freeze.conf
 #  (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}"
-
-#
-# Uncomment the following to get the unstable feeds
-#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"
+FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/openslug/cross/${DISTRO_FEED}"
+FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/openslug/native/${DISTRO_FEED}"
 
 #----------------------------------------------------------------------------------
 # 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}"
-
-# 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,
@@ -89,38 +63,20 @@ OPENSLUG_STANDARD_RDEPENDS += "${OPENSLUG_EXT2_PROGS}"
 OPENSLUG_STANDARD_DEPENDS += "reiserfsprogs"
 OPENSLUG_STANDARD_RDEPENDS += "${OPENSLUG_REISER_PROGS}"
 
-# These lines add a build of the 'upslug2' program which may be
-# used to download the final image to an NSLU2.  The program can
-# be found within the staging/<host>/bin directory.  It must
-# be run as root but may be safely installed setuid root.
-OPENSLUG_STANDARD_DEPENDS += "upslug2-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"
 
-# This adds udev support in the root fs. 
-OPENSLUG_STANDARD_DEPENDS += "udev"
-OPENSLUG_STANDARD_RDEPENDS += "udev"
-
-# 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 ucslugc 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
-# 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
+# Filesystem selection.  Adding entries here adds the module to the
+# image.  The module must be built as part of nslu2-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.
 #
@@ -129,7 +85,7 @@ OPENSLUG_EXTRA_RDEPENDS ?= "${OPENSLUG_STANDARD_RDEPENDS}"
 # 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 ?= "\
+OPENSLUG_STANDARD_RDEPENDS += "\
 kernel-module-ext2 \
 kernel-module-jbd \
 kernel-module-ext3 \
@@ -150,39 +106,26 @@ kernel-module-nls-utf8 \
 #                       (use kernel-module-vfat, it shows the long names
 #                       if present.)
 
-OPENSLUG_EXTRA_INSTALL ?= "${OPENSLUG_EXTRA_RDEPENDS} ${OPENSLUG_EXTRA_FILESYSTEMS}"
+# 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 nslu2-bag for a more minimal configuration and some
+# more instructions about how to make a non-openslug image.
+NSLU2_EXTRA_DEPENDS  = "${OPENSLUG_STANDARD_DEPENDS}"
+NSLU2_EXTRA_RDEPENDS = "${OPENSLUG_STANDARD_RDEPENDS}"
 
 #----------------------------------------------------------------------------------
 # 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"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
-
-# compiler/binary/library versions (unslung uses different ones so these
-# cannot be in nslu2.conf)
-PREFERRED_VERSION_binutils ?= "2.16"
-PREFERRED_VERSION_binutils-cross ?= "2.16"
-PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
-PREFERRED_VERSION_gcc-cross ?= "3.4.4"
-PREFERRED_VERSION_gcc ?= "3.4.4"
-PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627"
-
-# Select the smallest provider of x11 libraries
-PREFERRED_PROVIDER_x11 ?= "diet-x11"
-CVSDATE_diet-x11 ?= "20051005"
-
-# 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"
-PREFERRED_VERSION_openslug-kernel ?= "2.6.14-rc5"
-
-PREFERRED_PROVIDER_virtual/ixp-eth ?= "ixp425-eth"
-PREFERRED_VERSION_ixp4xx-csr ?= "1.4"
-PREFERRED_VERSION_ixp425-eth ?= "1.1"
-PREFERRED_VERSION_ixp-osal ?= "2.0"
-PREFERRED_VERSION_ixp400-eth ?= "1.4"
-
 PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r29"
+
+#----------------------------------------------------------------------------------
+# BASE VERSION SELECTION
+#----------------------------------------------------------------------------------
+# b - big-endian
+# a - ARM instruction set, no interwork
+# g - glibc
+#
+# Interwork must be turned off here
+NSLU2_INTERWORK = ""
+include conf/distro/nslu2-bag.conf