summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorJohn Bowler <jbowler@nslu2-linux.org>2005-08-01 00:03:09 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-08-01 00:03:09 +0000
commitf1fa325bda1a07938f7a94f201264e0d655f5804 (patch)
treef24d0c5f7386f25a3d26430f50fe6bde71f226ff /common
parentcd0f59d82098ec2008c8a657542a8574721ecb94 (diff)
Add setup-env and local.conf.sample, correct the 'bb' alias and make a
new one called bb-safe.
Diffstat (limited to 'common')
-rw-r--r--common/Make.rules4
-rw-r--r--common/env6
2 files changed, 5 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