Add setup-env and local.conf.sample, correct the 'bb' alias and make a

new one called bb-safe.

4 files changed, 68 insertions, 5 deletions

diff --git a/common/Make.rules b/common/Make.rules
index 8a5940af56..1a32b364ba 100644
--- a/common/Make.rules
+++ b/common/Make.rules
@@ -41,13 +41,13 @@ clobber:
 
 .PHONY: $(DISTRO)-source
 $(DISTRO)-source: $(REQUIRED_DIRS)
-	tar zcf $@.tar.gz --exclude=MT Makefile conf/auto.conf $(REQUIRED_DIRS:=/.)
+	tar zcf $@.tar.gz --exclude=MT Makefile conf/auto.conf conf/local.conf.sample $(REQUIRED_DIRS:=/.)
 
 # This target probably isn't important any longer, because the -source
 # target above does the right thing
 .PHONY:
 distclean: clobber
-	rm -rf topdir.conf conf/local.conf $(BUILD_DIRS)
+	rm -rf topdir.conf conf/local.conf common/conf/local.conf $(BUILD_DIRS)
 
 # This target is mainly for testing - it is intended to put the disto directory
 # back to its original state, it will destroy a source-tarball system (because
diff --git a/common/env b/common/env
index b41e1f4bc5..9cf757aa30 100644
--- a/common/env
+++ b/common/env
@@ -28,15 +28,15 @@ unset MFLAGS
 unset MAKEFLAGS
 #
 # make bb into a 'safe' bitbake
-alias bb="env -i \
-	CCACHE_DISABLE='${CCACHE_DISABLE}' \
-	CCACHE_DIR='${CCACHE_DIR}' \
+alias bb-safe="env -i \
+	HOME='${TOPDIR}/home' \
 	PYTHONPATH='${PYTHONPATH}' \
 	BBPATH='${BBPATH}' \
 	PATH='${PATH}' \
 	LD_LIBRARY_PATH='${LD_LIBRARY_PATH}' \
 	LANG='${LANG}' \
 	'${TOPDIR}/bitbake/bin/bitbake'"
+alias bb="'${TOPDIR}/bitbake/bin/bitbake'"
 #
 # remove TOPDIR - not required
 unset TOPDIR
diff --git a/ucslugc/conf/local.conf.sample b/ucslugc/conf/local.conf.sample
new file mode 100644
index 0000000000..d94379f7ac
--- /dev/null
+++ b/ucslugc/conf/local.conf.sample
@@ -0,0 +1,49 @@
+# 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.
+#
+#----------------------------------------------------------------------------------
+# bitbake options
+#----------------------------------------------------------------------------------
+#
+#BBINCLUDELOGS = "yes"
+#	bitbake logs build progress to per-package log files.  By default if an
+#	error occurs bitbake outputs the name of this file with an error message.
+#	If you set BBINCLUDELOGS to 'yes' then bitbake will also output the log
+#	file itself.
+#
+#BBMASK = "regular expression"
+#	bitbake examines all the .bb files listed in the BBFILES variable.  BBMASK
+#	can be used to exclude some (or, indeed, all) of these files by matching
+#	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
+#----------------------------------------------------------------------------------
+#FEED_URIS = "<name>##<url>"
+#	Define local feeds - <name> should be replaced by a name which identifies
+#	your local feed (not a generic name!) and <url> should be the location of
+#	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"
+#	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"
+#	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"
+#	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
+#	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/ucslugc/setup-env b/ucslugc/setup-env
new file mode 100644
index 0000000000..56f39fbe21
--- /dev/null
+++ b/ucslugc/setup-env
@@ -0,0 +1,14 @@
+# set up an environment for building UcSlugC
+# (it is sufficient to source common/env to do this, this
+# script, which should be sourced, exists to mirror the old
+# method).
+test -d common || {
+	test -d ../common && ln -s ../common ./common
+}
+if test -r common/env
+then
+	. common/env
+	echo 'Environment set up for UcSlugC development.'
+else
+	echo "setup-env: 'common/env' script not found" >&2
+fi