Removed all traces of oe-symlinks from the master makefiles

diff --git a/Makefile b/Makefile
index f9586cd..4774d8e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,23 +12,23 @@ all: update build
 build: build-unslung build-openslug build-optware
 
 .PHONY: setup
-setup: setup-master setup-bitbake setup-openembedded setup-oe-symlinks setup-optware
+setup: setup-master setup-bitbake setup-openembedded setup-optware
 
 .PHONY: setup-developer
-setup-developer: setup-master setup-bitbake setup-openembedded setup-oe-symlinks-developer setup-optware-developer
+setup-developer: setup-master setup-bitbake setup-openembedded setup-optware-developer
 
 .PHONY: update
 update: update-master update-bitbake update-openembedded update-optware
 
 .PHONY: clobber
-clobber: clobber-optware clobber-oe-symlinks clobber-openembedded clobber-bitbake
+clobber: clobber-optware clobber-openembedded clobber-bitbake
 
 .PHONY: unslung build-unslung
-unslung build-unslung: unslung/Makefile bitbake/bin/bitbake openembedded/conf/machine/nslu2.conf oe-symlinks/packages
+unslung build-unslung: unslung/Makefile bitbake/bin/bitbake openembedded/conf/machine/nslu2.conf
        ( cd unslung ; make )
 
 .PHONY: openslug build-openslug
-openslug build-openslug: openslug/Makefile bitbake/bin/bitbake openembedded/conf/machine/nslu2.conf oe-symlinks/packages
+openslug build-openslug: openslug/Makefile bitbake/bin/bitbake openembedded/conf/machine/nslu2.conf
        ( cd openslug ; make )
 
 .PHONY: optware build-optware
@@ -66,15 +66,6 @@ setup-openembedded openembedded/conf/machine/nslu2.conf:
        ${MAKE} MT/revision
        [ -e openembedded/conf/machine/nslu2.conf ] || monotone co -b org.openembedded.nslu2-linux openembedded
 
-.PHONY: setup-oe-symlinks
-setup-oe-symlinks oe-symlinks/packages:
-       [ -e oe-symlinks/packages ] || ( svn co svn://svn.berlios.de/openslug/trunk/openslug/nslu2-linux oe-symlinks )
-
-.PHONY: setup-oe-symlinks-developer
-setup-oe-symlinks-developer:
-       [ -e oe-symlinks ] && ( mv oe-symlinks oe-symlinks-user )
-       svn co svn+ssh://${SVN_USER}@svn.berlios.de/svnroot/repos/openslug/trunk/openslug/nslu2-linux oe-symlinks
-
 .PHONY: setup-optware
 setup-optware optware/Makefile:
        ${MAKE} downloads
@@ -141,10 +132,6 @@ update-openembedded: openembedded/conf/machine/nslu2.conf
          monotone merge -b org.openembedded.nslu2-linux ; \
        fi
 
-.PHONY: update-oe-symlinks
-update-oe-symlinks: oe-symlinks/packages
-       ( cd oe-symlinks ; svn update )
-
 .PHONY: update-optware
 update-optware: optware/Makefile
        ( cd optware ; cvs update -d -P )
@@ -157,10 +144,6 @@ clobber-bitbake:
 clobber-openembedded:
        rm -rf openembedded
 
-.PHONY: clobber-oe-symlinks
-clobber-oe-symlinks:
-       rm -rf oe-symlinks
-
 .PHONY: clobber-optware
 clobber-optware:
        rm -rf optware

diff --git a/openslug/Makefile b/openslug/Makefile
index 2d8bf76..6a8caf8 100644 (file)
--- a/openslug/Makefile
+++ b/openslug/Makefile
@@ -17,10 +17,9 @@ setup-env:
        [ -e bitbake ]      || ( ln -s ../bitbake . )
        [ -e downloads ]    || ( ln -s ../downloads . )
        [ -e openembedded ] || ( ln -s ../openembedded . )
-       [ -e oe-symlinks ]  || ( ln -s ../oe-symlinks . )
        echo 'OEROOT='`pwd` > setup-env
        echo 'OESYS=$$OEROOT/bitbake/' >> setup-env
-       echo 'PKGDIR=$$OEROOT/openembedded/' >> setup-env
+       echo 'export PKGDIR=$$OEROOT/openembedded/' >> setup-env
        echo 'OEBUILD=$$OEROOT' >> setup-env
        echo 'export PYTHONPATH=$$OESYS/lib' >>setup-env
        echo 'export BBPATH=$$OEBUILD:$$PKGDIR:$$OESYS' >> setup-env
@@ -42,9 +41,9 @@ clobber:
        rm -rf tmp
 
 openslug-source:
-       tar zcvf openslug-source.tar.gz --exclude=MT Makefile bitbake conf openembedded oe-symlinks
+       tar zcvf openslug-source.tar.gz --exclude=MT Makefile bitbake conf openembedded
 
 distclean: clobber
-       rm -rf setup-env conf/local.conf bitbake downloads openembedded oe-symlinks
+       rm -rf setup-env conf/local.conf bitbake downloads openembedded
 
 # End of Makefile

diff --git a/unslung/Makefile b/unslung/Makefile
index b644530..aecf3ab 100644 (file)
--- a/unslung/Makefile
+++ b/unslung/Makefile
@@ -17,10 +17,9 @@ setup-env:
        [ -e bitbake ]      || ( ln -s ../bitbake . )
        [ -e downloads ]    || ( ln -s ../downloads . )
        [ -e openembedded ] || ( ln -s ../openembedded . )
-       [ -e oe-symlinks ]  || ( ln -s ../oe-symlinks . )
        echo 'OEROOT='`pwd` > setup-env
        echo 'OESYS=$$OEROOT/bitbake/' >> setup-env
-       echo 'PKGDIR=$$OEROOT/openembedded/' >> setup-env
+       echo 'export PKGDIR=$$OEROOT/openembedded/' >> setup-env
        echo 'OEBUILD=$$OEROOT' >> setup-env
        echo 'BBPATH=$$OEBUILD:$$PKGDIR:$$OESYS' >> setup-env
        echo 'PATH=$$OESYS/bin/:$$PATH' >> setup-env
@@ -30,6 +29,8 @@ setup-env:
        echo 'unset LC_CTYPE' >> setup-env
        echo 'unset CC' >> setup-env
        echo 'unset CXX' >> setup-env
+       echo 'unset MFLAGS' >> setup-env
+       echo 'unset MAKEFLAGS' >> setup-env
        echo 'alias bb=bitbake' >> setup-env
        echo 'echo Environment set up for Unslung development.' >> setup-env
 
@@ -40,9 +41,9 @@ clobber:
        rm -rf tmp
 
 unslung-source:
-       tar zcvf unslung-source.tar.gz --exclude=MT Makefile bitbake conf openembedded oe-symlinks
+       tar zcvf unslung-source.tar.gz --exclude=MT Makefile bitbake conf openembedded
 
 distclean: clobber
-       rm -f setup-env conf/local.conf bitbake downloads openembedded oe-symlinks
+       rm -f setup-env conf/local.conf bitbake downloads openembedded
 
 # End of Makefile