Remove the step to create a UcSlugC binary image (for upslug), thereby

removing the requirement for linksys firmware - this is a partial fix,
at present linksys firmware is still required to build an image for
upslug, so to use UcSlugC after this it will be necessary, for the
moment, to have an existing OpenSlug or UcSlugC system with reflash.

1 files changed, 27 insertions, 4 deletions

diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf
index 39251c5375..69e70cd41e 100644
--- a/conf/distro/ucslugc.conf
+++ b/conf/distro/ucslugc.conf
@@ -7,6 +7,7 @@
 #----------------------------------------------------------------------------------
 DISTRO_NAME = "UcSlugC"
 DISTRO_VERSION = "1.1-beta"
+DISTRO_FEED = "unstable"
 DISTRO_TYPE ?= "beta"
 
 TARGET_FPU = "soft"
@@ -19,7 +20,7 @@ ARM_INTERWORK = ":thumb-interwork"
 USE_NLS ?= "no"
 USE_NLS_glib-2.0 = "yes"
 
-INHERIT += " package_ipk debian nslu2-jffs2-image"
+INHERIT += " package_ipk debian"
 
 # The OVERRIDES are modified here so that 'openslug' overrides are picked up if
 # present (ucslugc overrides take precedence).
@@ -46,11 +47,15 @@ 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 += "cross##http://ipkg.nslu2-linux.org/feeds/ucslugc/cross/${DISTRO_VERSION}"
-FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/ucslugc/native/${DISTRO_VERSION}"
+#
+#NOTE: at present there is no released feed for ucslugc, therefore this feed
+# is set to the 'unstable' version.  In released images DISTRO_FEED will typically
+# be DISTRO_VERSION.
+FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/ucslugc/cross/${DISTRO_FEED}"
+FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/ucslugc/native/${DISTRO_FEED}"
 
 #
-# Uncomment the following to get the unstable feeds
+# Uncomment the following to get the unstable feeds in a released version.
 #FEED_URIS_append += "unstable_cross##http://ipkg.nslu2-linux.org/feeds/ucslugc/cross/unstable"
 #FEED_URIS_append += "unstable_native##http://ipkg.nslu2-linux.org/feeds/ucslugc/native/unstable"
 
@@ -76,6 +81,24 @@ CMDLINE_DEBUG = "noirqdebug"
 # root file system), if this is not the case the following must not be done!
 IMAGE_PREPROCESS_COMMAND = "rm ${IMAGE_ROOTFS}/boot/zImage*;"
 
+# Building a full image.  If you add the following extra commands will be
+# appended to the openslug-image build by classes/nslu2-jffs2-image.bbclass
+# (note that you can, instead, simply add 'inherit nslu2-jffs2-image' to
+# openslug-image.bb).  If you do this you will need to find a source for the
+# LinkSys software to be placed in the full image - 'RedBoot' (the boot loader),
+# 'Trailer' (just a bunch of bytes to flag the image as valid) and 'SysConf'
+# (actually just a block of unset data - you could modify this to pre-configure
+# the SysConf partition of the image).  If you own an NSLU2 then this data is
+# already in the flash of the NSLU2 and you can download it (including new
+# versions) from the LinkSys web site - the bbclass will output information
+# about where to put the downloaded data.
+#
+#NOTE: you do not actually need the boot loader in normal use because it is
+# *not* overwritten by a standard upslug upgrade, so you can make an image with
+# just non-LinkSys software which can be flashed into the NSLU2.
+
+#INHERIT += " nslu2-jffs2-image"
+
 # EXTRA PACKAGES
 # --------------
 # UcSlugC builds an openslug-image with no extra packages - to add packages to the