<distro>/conf/auto.conf is now generated by the Makefile

15 files changed, 48 insertions, 228 deletions

diff --git a/Makefile b/Makefile
index 9121220e73..9c50396e34 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,8 @@ update: update-master update-bitbake update-openembedded update-optware
 status: status-master status-bitbake status-openembedded status-optware
 
 .PHONY: clobber
-clobber: clobber-master clobber-bitbake clobber-openembedded clobber-optware clobber-releases
+clobber: clobber-master clobber-bitbake clobber-openembedded \
+	 clobber-unslung clobber-openslug clobber-ucslugc clobber-optware clobber-releases
 
 .PHONY: unslung build-unslung
 unslung build-unslung: unslung/.configured bitbake/.configured openembedded/.configured
@@ -75,59 +76,35 @@ setup-openembedded openembedded/.configured: MT/.configured
 	[ -e openembedded/conf/machine/nslu2.conf ] || monotone co -b org.openembedded.nslu2-linux openembedded
 	touch openembedded/.configured
 
-.PHONY: setup-unslung
-setup-unslung unslung/.configured: MT/.configured
-	[ -d unslung ]                   || ( mkdir -p unslung )
-	[ -e downloads ]                 || ( mkdir -p downloads )
-	[ -L unslung/Makefile -o ! -e unslung/Makefile ] || ( cd unslung ; mv Makefile Makefile.delete-me)
-	[ -e unslung/Makefile ]          || ( cd unslung ; ln -s ../common/openembedded.mk Makefile )
-	[ -L unslung/setup-env -o ! -e unslung/setup-env ] || ( cd unslung ; mv setup-env setup-env.delete-me )
-	[ -e unslung/setup-env ]         || ( cd unslung ; ln -s ../common/setup-env . )
-	[ -e unslung/downloads ]         || ( cd unslung ; ln -s ../downloads . )
-	[ -e unslung/bitbake ]           || ( cd unslung ; ln -s ../bitbake . )
-	[ -e unslung/openembedded ]      || ( cd unslung ; ln -s ../openembedded . )
-	[ -d unslung/conf ]              || ( mkdir -p unslung/conf )
-	[ ! -f unslung/conf/local.conf ] || ( cd unslung/conf ; mv local.conf local.conf.delete-me )
-	[ -e unslung/conf/site.conf ]    || ( cd unslung/conf ; ln -s ../../common/conf/site.conf . )
-	rm -rf unslung/tmp/cache
-	touch unslung/.configured
-
-.PHONY: setup-openslug
-setup-openslug openslug/.configured: MT/.configured
-	[ -d openslug ]                   || ( mkdir -p openslug )
-	[ -e downloads ]                 || ( mkdir -p downloads )
-	[ -L openslug/Makefile -o ! -e openslug/Makefile ] || ( cd openslug ; mv Makefile Makefile.delete-me)
-	[ -e openslug/Makefile ]          || ( cd openslug ; ln -s ../common/openembedded.mk Makefile )
-	[ -L openslug/setup-env -o ! -e openslug/setup-env ] || ( cd openslug ; mv setup-env setup-env.delete-me )
-	[ -e openslug/setup-env ]         || ( cd openslug ; ln -s ../common/setup-env . )
-	[ -e openslug/downloads ]         || ( cd openslug ; ln -s ../downloads . )
-	[ -e openslug/bitbake ]           || ( cd openslug ; ln -s ../bitbake . )
-	[ -e openslug/openembedded ]      || ( cd openslug ; ln -s ../openembedded . )
-	[ -d openslug/conf ]              || ( mkdir -p openslug/conf )
-	[ ! -f openslug/conf/local.conf ] || ( cd openslug/conf ; mv local.conf local.conf.delete-me )
-	[ -e openslug/conf/site.conf ]    || ( cd openslug/conf ; ln -s ../../common/conf/site.conf . )
-	rm -rf openslug/tmp/cache
-	touch openslug/.configured
-
-.PHONY: setup-ucslugc
-setup-ucslugc ucslugc/.configured: MT/.configured
-	[ -d ucslugc ]                   || ( mkdir -p ucslugc )
-	[ -e downloads ]                 || ( mkdir -p downloads )
-	[ -L ucslugc/Makefile -o ! -e ucslugc/Makefile ] || ( cd ucslugc ; mv Makefile Makefile.delete-me)
-	[ -e ucslugc/Makefile ]          || ( cd ucslugc ; ln -s ../common/openembedded.mk Makefile )
-	[ -L ucslugc/setup-env -o ! -e ucslugc/setup-env ] || ( cd ucslugc ; mv setup-env setup-env.delete-me )
-	[ -e ucslugc/setup-env ]         || ( cd ucslugc ; ln -s ../common/setup-env . )
-	[ -e ucslugc/downloads ]         || ( cd ucslugc ; ln -s ../downloads . )
-	[ -e ucslugc/bitbake ]           || ( cd ucslugc ; ln -s ../bitbake . )
-	[ -e ucslugc/openembedded ]      || ( cd ucslugc ; ln -s ../openembedded . )
-	[ -d ucslugc/conf ]              || ( mkdir -p ucslugc/conf )
-	[ ! -f ucslugc/conf/local.conf ] || ( cd ucslugc/conf ; mv local.conf local.conf.delete-me )
-	[ -e ucslugc/conf/site.conf ]    || ( cd ucslugc/conf ; ln -s ../../common/conf/site.conf . )
-	rm -rf ucslugc/tmp/cache
-	touch ucslugc/.configured
+.PHONY: setup-unslung setup-openslug setup-ucslugc
+setup-unslung setup-openslug setup-ucslugc: setup-%: MT/.configured
+	rm -rf $*/.configured
+	${MAKE} $*/.configured
+
+%/.configured: MT/.configured
+	[ -d $* ] || ( mkdir -p $* )
+	[ -e downloads ] || ( mkdir -p downloads )
+	[ -L $*/Makefile -o ! -e $*/Makefile ] || ( cd $* ; mv Makefile Makefile.delete-me)
+	[ -e $*/Makefile ] || ( cd $* ; ln -s ../common/openembedded.mk Makefile )
+	[ -L $*/setup-env -o ! -e $*/setup-env ] || ( cd $* ; mv setup-env setup-env.delete-me )
+	[ -e $*/setup-env ] || ( cd $* ; ln -s ../common/setup-env . )
+	[ -e $*/downloads ] || ( cd $* ; ln -s ../downloads . )
+	[ -e $*/bitbake ] || ( cd $* ; ln -s ../bitbake . )
+	[ -e $*/openembedded ] || ( cd $* ; ln -s ../openembedded . )
+	[ -d $*/conf ] || ( mkdir -p $*/conf )
+	[ ! -f $*/conf/local.conf ] || ( cd $*/conf ; mv local.conf local.conf.delete-me )
+	[ -e $*/conf/local.conf.sample ] || ( cd $*/conf ; ln -s ../../common/conf/local.conf.sample . )
+	[ -e $*/conf/site.conf ] || ( cd $*/conf ; ln -s ../../common/conf/site.conf . )
+	[ ! -f $*/conf/auto.conf ] || ( cd $*/conf ; rm -f auto.conf )
+	[ -e $*/conf/auto.conf ] || ( \
+		echo "DISTRO=\"$*\"" > $*/conf/auto.conf ; \
+		echo "MACHINE=\"nslu2\"" >> $*/conf/auto.conf \
+	)
+	rm -rf $*/tmp/cache
+	touch $*/.configured
 
 .PHONY: setup-optware
-setup-optware optware/.configured:
+setup-optware optware/.configured: MT/.configured
 	[ -e downloads ]        || ( mkdir -p downloads )
 	[ -e optware/Makefile ] || ( cvs -q -d :pserver:anonymous@cvs.sf.net:/cvsroot/nslu co -d optware unslung )
 	touch optware/.configured
@@ -294,6 +271,18 @@ clobber-bitbake:
 clobber-openembedded:
 	rm -rf openembedded
 
+.PHONY: clobber-unslung
+clobber-unslung:
+	rm -rf unslung
+
+.PHONY: clobber-openslug
+clobber-openslug:
+	rm -rf openslug
+
+.PHONY: clobber-ucslugc
+clobber-ucslugc:
+	rm -rf ucslugc
+
 .PHONY: clobber-optware
 clobber-optware:
 	rm -rf optware
diff --git a/ucslugc/conf/local.conf.sample b/common/conf/local.conf.sample
index d94379f7ac..c191c8ff63 100644
--- a/ucslugc/conf/local.conf.sample
+++ b/common/conf/local.conf.sample
@@ -1,7 +1,7 @@
 # Sample local configuration
 #
 # You do not need a 'local.conf' file, however you may use one to alter
-# how the UcSlugC build proceeds and to specify bitbake options.
+# how the build proceeds and to specify bitbake options.
 #
 #----------------------------------------------------------------------------------
 # bitbake options
@@ -19,12 +19,8 @@
 #	against a regular expression.  Typically you do not want to do this because
 #	bitbake freeze can be used to generate a minimal list for BBFILES.
 #
-#NOTE: you may prefer to make a global local.conf file in common/conf to specify
-# these options, however if you do this it will be overridden (ignored) if you also
-# specify a local.conf here.
-#
 #----------------------------------------------------------------------------------
-# UcSlugC options
+# OpenSlug (and derivatives) options
 #----------------------------------------------------------------------------------
 #FEED_URIS = "<name>##<url>"
 #	Define local feeds - <name> should be replaced by a name which identifies
@@ -32,18 +28,18 @@
 #	the Packages.gz file (and, therefore, all the ipks).  This is not required;
 #	the feed defaults to the internet one.
 #
-#UCLIBC_EXTRA_DEPENDS = "packages to add to the build"
+#<DISTRO>_EXTRA_DEPENDS = "packages to add to the build"
 #	Any packages in this list will be built as depenencies of the firmware
 #	image, but they will not be included in the image (see below).
 #
-#UCLIBC_EXTRA_RDEPENDS = "packages to add to the firmware image"
+#<DISTRO>_EXTRA_RDEPENDS = "packages to add to the firmware image"
 #	Any packages in this list will be added to the firmware image.  Please do
 #	not distribute such images - make a new DISTRO.conf file following the
 #	instructions in conf/distro/ucslugc.conf
 #
-#UCLIBC_EXTRA_BBFILES = "paths of extra .bb files"
+#<DISTRO>_EXTRA_BBFILES = "paths of extra .bb files"
 #	Files in this list will be parsed by bitbake to find packages in addition
-#	to the default list of bb files in conf/distro/ucslugc-packages.conf.  The
+#	to the default list of bb files in conf/distro/<distro>-packages.conf.  The
 #	setting of this variable is irrelevant after bb freeze has been built or if
 #	bb unfreeze is built (in the latter case bitbake will examine all of the
 #	openembedded packages).
diff --git a/common/openembedded.mk b/common/openembedded.mk
index c7eaa8e5fb..c23f206122 100644
--- a/common/openembedded.mk
+++ b/common/openembedded.mk
@@ -8,7 +8,6 @@
 #
 # DISTRO - the OpenEmbedded 'distro' to build
 # MACHINE - the OpenEmbedded build target machine
-# MAKE_TARGET - the target to pass to bitbake
 #
 # All of these values are (should be, must be) quoted in double quotes
 include conf/auto.conf
@@ -19,7 +18,7 @@ FIRMWARE_DEPS = create-topdir $(BUILD_DIRS) $(REQUIRED_DIRS)
 
 # The default rule is to build the firmware in an unprotected environment.
 firmware: $(FIRMWARE_DEPS)
-	. ./setup-env; exec bitbake $(MAKE_TARGET)
+	. ./setup-env; exec bitbake $(DISTRO)-packages
 
 # This rule clobbers the environment (note that ccache uses '$HOME' by
 # default, so the cache will end up there).
diff --git a/openslug/.mtn2git_empty b/openslug/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openslug/.mtn2git_empty
+++ /dev/null
diff --git a/openslug/conf/.mt-ignore b/openslug/conf/.mt-ignore
deleted file mode 100644
index f21e1b217b..0000000000
--- a/openslug/conf/.mt-ignore
+++ /dev/null
@@ -1 +0,0 @@
-local.conf
diff --git a/openslug/conf/.mtn2git_empty b/openslug/conf/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openslug/conf/.mtn2git_empty
+++ /dev/null
diff --git a/openslug/conf/auto.conf b/openslug/conf/auto.conf
deleted file mode 100644
index 7e2a406f79..0000000000
--- a/openslug/conf/auto.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# OpenSlug bitbake configuration
-DISTRO="openslug"
-MACHINE="nslu2"
-MAKE_TARGET="openslug-packages"
\ No newline at end of file
diff --git a/openslug/conf/local.conf.template b/openslug/conf/local.conf.template
deleted file mode 100644
index 45fae8f0d7..0000000000
--- a/openslug/conf/local.conf.template
+++ /dev/null
@@ -1,94 +0,0 @@
-OEROOT = "%%%OEROOT%%%"
-
-# Use this to specify where OE should place the downloaded sources into
-DL_DIR = "${OEROOT}/downloads"
-
-# BBFILES defines the list of .bb files to consider when looking for a
-# way to build a package.  This gets overridden in the openslug and
-# unslung .conf files.  PKGDIR defines where to find the 'packages'
-# directory containing the package sub-directories.
-PKGDIR := "${OEROOT}/openembedded"
-BBFILES := "${PKGDIR}/packages/*/*.bb"
-
-# Use the OEMASK below to instruct OE to _NOT_ consider some .oe files
-# This is a regulary expression, so be sure to get your parenthesis balanced.
-OEMASK = ""
-
-# Uncomment this if you want to use a prebuilt toolchain. You will need to
-# provide packages for toolchain and additional libraries yourself. You also
-# have to set PATH in your environment to make sure OE finds additional binaries.
-# Note: You will definitely need to say:
-#     ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
-# to build any of two Linux 2.4 Embedix kernels,
-# i.e. openzaurus-sa-2.4.18 and openzaurus-pxa-2.4.18 - and don't forget
-# to rename the binaries as instructed in the Wiki.
-# ASSUME_PROVIDED = "virtual/${TARGET_PREFIX}gcc virtual/libc"
-
-# Select between multiple alternative providers, if more than one is eligible.
-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"
-
-# Uncomment this to specify where OE should create its temporary files.
-# Note that a full build of everything in OE will take GigaBytes of hard
-# disk space, so make sure to free enough space. The default TMPDIR is
-# <build directory>/tmp
-TMPDIR = ${OEROOT}/tmp
-
-# Uncomment this to specify a machine to build for. See the conf directory
-# for machines currently known to OpenEmbedded.
-MACHINE = "nslu2"
-
-# Uncomment this to select a distribution policy. See the conf directory
-# for distributions currently known to OpenEmbedded.
-DISTRO = "openslug"
-
-# Add to this any extra projects (packages) to be built with the image
-# (look in openembedded/packages/openslug-packages.bb for a list of
-# packages known to build with openslug.)
-OPENSLUG_EXTRA_DEPENDS = ""
-
-# Add to this specific built .ipk package names to add to the image.
-# These will be included in the root flash file system stored on the
-# NSLU2.  Be careful not to fill the file system, OpenSlug will not
-# boot if the file system is close to full.
-OPENSLUG_EXTRA_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_EXT2_PROGS is defined in
-# openembedded/conf/distro/openslug.conf)
-OPENSLUG_EXTRA_DEPENDS += "e2fsprogs"
-OPENSLUG_EXTRA_RDEPENDS += "${OPENSLUG_EXT2_PROGS}"
-
-# These lines add support for formatting reiserfs file systems on
-# a hard disk.
-OPENSLUG_EXTRA_DEPENDS += "reiserfsprogs"
-OPENSLUG_EXTRA_RDEPENDS += "reiserfsprogs"
-
-# 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_EXTRA_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_EXTRA_DEPENDS += "lrzsz"
-OPENSLUG_EXTRA_RDEPENDS += "lrzsz"
-
-
-# Uncomment this to disable the parse cache (not recommended).
-CACHE = "${OEROOT}/tmp/cache"
-
-# Uncomment this if you want OE to emit the log if a build fails.
-OEINCLUDELOGS = "yes"
-
-# INHERIT += "src_distribute_local pkg_distribute"
-
-# EDIT THIS FILE and then remove the line below before using!
diff --git a/ucslugc/.mtn2git_empty b/ucslugc/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/ucslugc/.mtn2git_empty
+++ /dev/null
diff --git a/ucslugc/conf/.mtn2git_empty b/ucslugc/conf/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/ucslugc/conf/.mtn2git_empty
+++ /dev/null
diff --git a/ucslugc/conf/auto.conf b/ucslugc/conf/auto.conf
deleted file mode 100644
index a70e98fc7b..0000000000
--- a/ucslugc/conf/auto.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# UcSlugC bitbake configuration
-DISTRO="ucslugc"
-MACHINE="nslu2"
-MAKE_TARGET="ucslugc-packages"
diff --git a/unslung/.mtn2git_empty b/unslung/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/unslung/.mtn2git_empty
+++ /dev/null
diff --git a/unslung/conf/.mtn2git_empty b/unslung/conf/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/unslung/conf/.mtn2git_empty
+++ /dev/null
diff --git a/unslung/conf/auto.conf b/unslung/conf/auto.conf
deleted file mode 100644
index 7ec443ca0b..0000000000
--- a/unslung/conf/auto.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# Unslung bitbake configuration
-DISTRO="unslung"
-MACHINE="nslu2"
-MAKE_TARGET="unslung-packages"
\ No newline at end of file
diff --git a/unslung/conf/local.conf.template b/unslung/conf/local.conf.template
deleted file mode 100644
index db24fdf849..0000000000
--- a/unslung/conf/local.conf.template
+++ /dev/null
@@ -1,57 +0,0 @@
-OEROOT = "%%%OEROOT%%%"
-
-# Use this to specify where OE should place the downloaded sources into
-DL_DIR = "${OEROOT}/downloads"
-
-# BBFILES defines the list of .bb files to consider when looking for a
-# way to build a package.  This gets overridden in the openslug and
-# unslung .conf files.  PKGDIR defines where to find the 'packages'
-# directory containing the package sub-directories.
-PKGDIR := "${OEROOT}/openembedded"
-BBFILES := "${PKGDIR}/packages/*/*.bb"
-
-# Use the OEMASK below to instruct OE to _NOT_ consider some .oe files
-# This is a regulary expression, so be sure to get your parenthesis balanced.
-OEMASK = ""
-
-# Uncomment this if you want to use a prebuilt toolchain. You will need to
-# provide packages for toolchain and additional libraries yourself. You also
-# have to set PATH in your environment to make sure OE finds additional binaries.
-# Note: You will definitely need to say:
-#     ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
-# to build any of two Linux 2.4 Embedix kernels,
-# i.e. openzaurus-sa-2.4.18 and openzaurus-pxa-2.4.18 - and don't forget
-# to rename the binaries as instructed in the Wiki.
-# ASSUME_PROVIDED = "virtual/${TARGET_PREFIX}gcc virtual/libc"
-
-# Select between multiple alternative providers, if more than one is eligible.
-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"
-
-# Uncomment this to specify where OE should create its temporary files.
-# Note that a full build of everything in OE will take GigaBytes of hard
-# disk space, so make sure to free enough space. The default TMPDIR is
-# <build directory>/tmp
-TMPDIR = ${OEROOT}/tmp
-
-# Uncomment this to specify a machine to build for. See the conf directory
-# for machines currently known to OpenEmbedded.
-MACHINE = "nslu2"
-
-# Uncomment this to select a distribution policy. See the conf directory
-# for distributions currently known to OpenEmbedded.
-DISTRO = "unslung"
-
-OPENSLUG_EXTRA_DEPENDS = ""
-OPENSLUG_EXTRA_RDEPENDS = ""
-
-# Uncomment this to disable the parse cache (not recommended).
-CACHE = "${OEROOT}/tmp/cache"
-
-# Uncomment this if you want OE to emit the log if a build fails.
-OEINCLUDELOGS = "yes"
-
-# INHERIT += "src_distribute_local pkg_distribute"
-
-# EDIT THIS FILE and then remove the line below before using!