From b04b2fa1571edbdcb6fa4f198b02b3ba7bbb51ca Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 15 Jul 2008 21:36:37 +0930 Subject: [PATCH] Moved master directory back to common to allow for a smooth upgrade --- Makefile | 91 +++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 44 insertions(+), 47 deletions(-) diff --git a/Makefile b/Makefile index 91829e7..302954c 100644 --- a/Makefile +++ b/Makefile @@ -24,31 +24,31 @@ build: .PHONY: setup ifneq ($(HOST_MACHINE),armeb) -setup: setup-master setup-kernel setup-bitbake setup-openembedded setup-unslung \ +setup: setup-common setup-kernel setup-bitbake setup-openembedded setup-unslung \ setup-slugos setup-angstrom setup-optware setup-openwrt else -setup: setup-master setup-optware +setup: setup-common setup-optware endif .PHONY: setup-developer -setup-developer: setup-master setup-bitbake setup-openembedded setup-optware-developer setup-openwrt-developer +setup-developer: setup-common setup-bitbake setup-openembedded setup-optware-developer setup-openwrt-developer .PHONY: update ifneq ($(HOST_MACHINE),armeb) -update: update-master update-kernel update-bitbake update-openembedded update-optware update-openwrt +update: update-common update-kernel update-bitbake update-openembedded update-optware update-openwrt else -update: update-master update-optware +update: update-common update-optware endif .PHONY: status -status: status-master status-kernel status-bitbake status-openembedded status-optware status-openwrt +status: status-common status-kernel status-bitbake status-openembedded status-optware status-openwrt .PHONY: clobber clobber: clobber-unslung clobber-slugos clobber-angstrom \ clobber-optware clobber-openwrt .PHONY: distclean -distclean: distclean-master distclean-bitbake distclean-openembedded \ +distclean: distclean-common distclean-bitbake distclean-openembedded \ distclean-unslung distclean-slugos distclean-angstrom \ distclean-optware distclean-releases distclean-openwrt @@ -208,14 +208,14 @@ build-openslug-%-beta: releases/slugos-%-beta/.configured OE_SNAPSHOT_SITE := http://www.openembedded.org/snapshots -.PHONY: setup-master -.PRECIOUS: master/.git/config -setup-master master/.git/config: - [ -e master/.git/config ] || \ +.PHONY: setup-common +.PRECIOUS: common/.git/config +setup-common common/.git/config: + [ -e common/.git/config ] || \ ( git clone git://repo.or.cz/nslu2-linux/master.git && \ rm -f Makefile && \ - ln -s master/Makefile Makefile ) - touch master/.git/config + ln -s common/Makefile Makefile ) + touch common/.git/config .PHONY: setup-kernel .PRECIOUS: kernel/.git/config @@ -228,26 +228,26 @@ setup-kernel kernel/.git/config: .PHONY: setup-bitbake .PRECIOUS: bitbake/.git/config -setup-bitbake bitbake/.git/config: master/.git/config +setup-bitbake bitbake/.git/config: common/.git/config [ -e bitbake/.git/config ] || \ git clone git://git.openmoko.org/git/bitbake.git bitbake touch bitbake/.git/config .PHONY: setup-openembedded .PRECIOUS: openembedded/.git/config -setup-openembedded openembedded/.git/config: master/.git/config +setup-openembedded openembedded/.git/config: common/.git/config [ -e openembedded/.git/config ] || \ git clone git://git.openembedded.net/org.openembedded.dev openembedded touch openembedded/.git/config .PHONY: setup-openwrt .PRECIOUS: openwrt/.configured -setup-openwrt openwrt/.configured: master/.git/config +setup-openwrt openwrt/.configured: common/.git/config [ -e downloads ] || ( mkdir -p downloads ) [ -e openwrt/Makefile ] || \ ( svn co https://svn.openwrt.org/openwrt/trunk openwrt ) [ -e openwrt/dl ] || ( ln -s ../downloads openwrt/dl ) - [ -e openwrt/.config ] || ( cp master/conf/openwrt.config openwrt/.config ) + [ -e openwrt/.config ] || ( cp common/conf/openwrt.config openwrt/.config ) ( cd openwrt ; \ ./scripts/feeds update ; \ ./scripts/feeds install -a ; \ @@ -284,14 +284,14 @@ setup-openwrt-developer: .PHONY: setup-unslung setup-slugos setup-angstrom setup-unslung setup-slugos setup-angstrom: \ - setup-%: master/.git/config + setup-%: common/.git/config rm -rf $*/.configured ${MAKE} $*/.configured # This pattern rule has to come before the subsequent %/.configured openembedded pattern rule. .PHONY: setup-slugos-%-beta .PRECIOUS: releases/slugos-%-beta/.configured -setup-slugos-%-beta releases/slugos-%-beta/.configured: master/.git/config +setup-slugos-%-beta releases/slugos-%-beta/.configured: common/.git/config [ -e releases/slugos-$*-beta ] || ( \ mkdir -p releases ; \ svn checkout http://svn.nslu2-linux.org/svnroot/slugos/releases/slugos-$*-beta \ @@ -306,7 +306,7 @@ setup-slugos-%-beta releases/slugos-%-beta/.configured: master/.git/config # This pattern rule has to come before the subsequent %/.configured openembedded pattern rule. .PHONY: setup-unslung-%-beta .PRECIOUS: releases/unslung-%-beta/.configured -setup-unslung-%-beta releases/unslung-%-beta/.configured: master/.git/config +setup-unslung-%-beta releases/unslung-%-beta/.configured: common/.git/config [ -e releases/unslung-$*-beta ] || ( \ mkdir -p releases ; \ svn checkout http://svn.nslu2-linux.org/svnroot/unslung/releases/unslung-$*-beta \ @@ -330,7 +330,7 @@ setup-openwrt-% releases/openwrt-%/.configured: ) [ -e releases/openwrt-$*/dl ] || ln -s ../../downloads releases/openwrt-$*/dl [ -e releases/openwrt-$*/.config ] || \ - ( cp master/conf/openwrt-$*.config releases/openwrt-$*/.config ) + ( cp common/conf/openwrt-$*.config releases/openwrt-$*/.config ) touch releases/openwrt-$*/.configured .PHONY: setup-slugos-%-beta-developer @@ -352,18 +352,18 @@ setup-unslung-%-beta-developer: ${MAKE} setup-unslung-$*-beta .PRECIOUS: %/.configured -%/.configured: master/.git/config +%/.configured: common/.git/config [ -d $* ] || ( mkdir -p $* ) [ -e downloads ] || ( mkdir -p downloads ) - [ -e $*/Makefile ] || ( cd $* ; ln -sf ../master/openembedded.mk Makefile ) - [ -e $*/setup-env ] || ( cd $* ; ln -sf ../master/setup-env . ) + [ -e $*/Makefile ] || ( cd $* ; ln -sf ../common/openembedded.mk Makefile ) + [ -e $*/setup-env ] || ( cd $* ; ln -sf ../common/setup-env . ) [ -e $*/downloads ] || ( cd $* ; ln -sf ../downloads . ) [ -e $*/bitbake ] || ( cd $* ; ln -sf ../bitbake . ) [ -e $*/openembedded ] || ( cd $* ; ln -sf ../openembedded . ) [ -d $*/conf ] || ( mkdir -p $*/conf ) [ -e $*/conf/local.conf.sample ] || \ - ( cd $*/conf ; ln -sf ../../master/conf/local.conf.sample . ) - [ -e $*/conf/site.conf ] || ( cd $*/conf ; ln -sf ../../master/conf/site.conf . ) + ( cd $*/conf ; ln -sf ../../common/conf/local.conf.sample . ) + [ -e $*/conf/site.conf ] || ( cd $*/conf ; ln -sf ../../common/conf/site.conf . ) [ -e $*/conf/auto.conf ] || ( \ if [ "$*" = "angstrom" ] ; then \ echo "DISTRO=\"$*-2008.1\"" > $*/conf/auto.conf ; \ @@ -464,31 +464,28 @@ setup-host-gentoo: .PHONY: setup-host-centos setup-host-centos: - su - -c " \ - yum install \ + sudo yum install \ bzip2 \ cvs \ diffstat \ diffutils \ gawk \ gcc-c++ \ + git \ gzip \ makeinfo \ patch \ + quilt \ rpm-build \ subversion \ tar \ tetex \ texi2html \ - texinfo \ - " - @echo You will have to install quilt separately. See http://centos.karan.org/ - @echo You will have to install git separately. See http://rpmforge.net/ - @echo You will have to install monotone separately. See http://venge.net/monotone/ + texinfo -.PHONY: update-master -update-master: - ( cd master ; git pull ) +.PHONY: update-common +update-common: + ( cd common ; git pull ) .PHONY: update-bitbake update-bitbake: bitbake/.git/config @@ -523,9 +520,9 @@ update-openwrt-%: releases/openwrt-%/.configured check-makefile: ( wget -q -O - http://www.nslu2-linux.org/Makefile | diff -u Makefile - ) -.PHONY: status-master -status-master: master/.git/config - ( cd master ; git diff --stat ) +.PHONY: status-common +status-common: common/.git/config + ( cd common ; git diff --stat ) .PHONY: status-bitbake status-bitbake: bitbake/.git/config @@ -579,9 +576,9 @@ clobber-optware: clobber-optware-nslu2 clobber-optware-wl500g clobber-optware-dd clobber-optware-%: [ ! -e optware/$*/Makefile ] || ( cd optware/$* ; ${MAKE} distclean ) -.PHONY: distclean-master -distclean-master: - rm -rf master +.PHONY: distclean-common +distclean-common: + rm -rf common .PHONY: distclean-kernel distclean-kernel: @@ -620,7 +617,7 @@ distclean-releases: rm -rf releases .PHONY: distclean -distclean: distclean-master distclean-kernel distclean-bitbake distclean-openembedded distclean-openwrt \ +distclean: distclean-common distclean-kernel distclean-bitbake distclean-openembedded distclean-openwrt \ distclean-unslung distclean-slugos distclean-angstrom distclean-optware \ distclean-releases rm -rf downloads @@ -628,11 +625,11 @@ distclean: distclean-master distclean-kernel distclean-bitbake distclean-openemb # Targets for use by those with write access to the repositories .PHONY: push -push: push-master push-optware push-kernel +push: push-common push-optware push-kernel -.PHONY: push-master -push-master: update-master - ( cd master ; git push --all ssh://repo.or.cz/srv/git/nslu2-linux/master.git ) +.PHONY: push-common +push-common: update-common + ( cd common ; git push --all ssh://repo.or.cz/srv/git/nslu2-linux/master.git ) .PHONY: push-optware push-optware: update-optware -- 2.11.4.GIT