Renamed common/setup-openembedded to common/setup-env due to makefile target conflict.

diff --git a/Makefile b/Makefile
index 6e36e75..700ca40 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -64,7 +64,7 @@ setup-monotone monotone/nslu2-linux.db:
 downloads:
        [ -e $@ ] || mkdir -p $@
 
-unslung/Makefile openslug/Makefile common/openembedded.mk common/setup-openembedded MT/revision:
+unslung/Makefile openslug/Makefile common/openembedded.mk common/setup-env MT/revision:
        ${MAKE} downloads
        [ -e monotone/nslu2-linux.db ] || ( ${MAKE} monotone/nslu2-linux.db )
        [ -e MT/revision ] || ( monotone -d monotone/nslu2-linux.db co -b org.nslu2-linux.dev . )
@@ -94,14 +94,14 @@ setup-openslug-2.3-beta releases/OpenSlug-2.3-beta/Makefile: downloads
 .PHONY: setup-ucslugc
 setup-ucslugc ucslugc/Makefile:
        ${MAKE} MT/revision
-       [ -d ucslugc ]                    || ( mkdir -p ucslugc )
-       [ -e ucslugc/Makefile ]           || ( cd ucslugc ; ln -s ../common/openembedded.mk Makefile )
-       [ -e ucslugc/setup-openembedded ] || ( cd ucslugc ; ln -s ../common/setup-openembedded . )
-       [ -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 )
-       [ -e ucslugc/conf/site.conf ]     || ( cd ucslugc/conf ; ln -s ../../common/conf/site.conf . )
+       [ -d ucslugc ]                || ( mkdir -p ucslugc )
+       [ -e ucslugc/Makefile ]       || ( cd ucslugc ; ln -s ../common/openembedded.mk Makefile )
+       [ -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 )
+       [ -e ucslugc/conf/site.conf ] || ( cd ucslugc/conf ; ln -s ../../common/conf/site.conf . )
 
 .PHONY: setup-optware
 setup-optware optware/Makefile:

diff --git a/common/openembedded.mk b/common/openembedded.mk
index e826f6e..88a1439 100644 (file)
--- a/common/openembedded.mk
+++ b/common/openembedded.mk
@@ -8,7 +8,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-openembedded; exec bitbake $${MAKE_TARGET}
+       . ./setup-env; exec bitbake $${MAKE_TARGET}
 
 # This rule clobbers the environment (note that ccache uses '$HOME' by
 # default, so the cache will end up there).
@@ -40,7 +40,7 @@ clobber:
 
 .PHONY: source
 source: $(REQUIRED_DIRS)
-       tar zcf $${DISTRO}.tar.gz --exclude=MT Makefile setup-openembedded conf/site.conf conf/auto.conf \
+       tar zcf $${DISTRO}.tar.gz --exclude=MT Makefile setup-env conf/site.conf conf/auto.conf \
                conf/local.conf.sample $(REQUIRED_DIRS:=/.)
 
 # This target probably isn't important any longer, because the -source