From 7ba05735b3c0b79e98d3a9168c73857ec48b430f Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Thu, 30 Jun 2005 09:48:23 +0000 Subject: initial nslu2-linux infrastructure checkin --- .mtn-ignore | 7 +++ .mtn2git_empty | 0 Makefile | 74 ++++++++++++++++++++++++++++++ openslug/.mt-ignore | 4 ++ openslug/.mtn2git_empty | 0 openslug/Makefile | 48 ++++++++++++++++++++ openslug/conf/.mt-ignore | 1 + openslug/conf/.mtn2git_empty | 0 openslug/conf/local.conf.template | 96 +++++++++++++++++++++++++++++++++++++++ unslung/.mt-ignore | 4 ++ unslung/.mtn2git_empty | 0 unslung/Makefile | 48 ++++++++++++++++++++ unslung/conf/.mt-ignore | 1 + unslung/conf/.mtn2git_empty | 0 unslung/conf/local.conf.template | 59 ++++++++++++++++++++++++ 15 files changed, 342 insertions(+) create mode 100644 .mtn-ignore create mode 100644 .mtn2git_empty create mode 100644 Makefile create mode 100644 openslug/.mt-ignore create mode 100644 openslug/.mtn2git_empty create mode 100644 openslug/Makefile create mode 100644 openslug/conf/.mt-ignore create mode 100644 openslug/conf/.mtn2git_empty create mode 100644 openslug/conf/local.conf.template create mode 100644 unslung/.mt-ignore create mode 100644 unslung/.mtn2git_empty create mode 100644 unslung/Makefile create mode 100644 unslung/conf/.mt-ignore create mode 100644 unslung/conf/.mtn2git_empty create mode 100644 unslung/conf/local.conf.template diff --git a/.mtn-ignore b/.mtn-ignore new file mode 100644 index 0000000000..170b9c14e8 --- /dev/null +++ b/.mtn-ignore @@ -0,0 +1,7 @@ +bitbake +downloads +monotone +oe-symlinks +openembedded +optware + diff --git a/.mtn2git_empty b/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000000..c56fcbc417 --- /dev/null +++ b/Makefile @@ -0,0 +1,74 @@ +# Makefile for the NSLU2 Linux development system +# Licensed under the GPL v2 or later + +all: update build + +build: unslung-build openslug-build optware-build + +setup: monotone-setup bitbake-setup openembedded-setup oe-symlinks-setup optware-setup + +update: monotone-update bitbake-update openembedded-update oe-symlinks-update optware-update + +clobber: optware-clobber oe-symlinks-clobber openembedded-clobber bitbake-clobber + +unslung-build: + ( cd unslung ; make ) + +openslug-build: + ( cd openslug ; make ) + +optware-build: + ( cd optware ; make ) + +monotone-setup monotone/nslu2-linux.db unslung/Makefile openslug/Makefile: + [ -e monotone/nslu2-linux.db ] || ( mkdir -p monotone && monotone -d monotone/nslu2-linux.db db init ) + ( monotone -d monotone/nslu2-linux.db pull ewi546.ewi.utwente.nl org.openembedded ) + ( monotone -d monotone/nslu2-linux.db unset database default-server ) + ( monotone -d monotone/nslu2-linux.db unset database default-collection ) + ( monotone -d monotone/nslu2-linux.db pull mtn.nslu2-linux.org org ) + [ -e MT ] || ( monotone -d monotone/nslu2-linux.db co -b org.nslu2-linux.dev . ) + [ -e downloads ] || mkdir -p downloads + [ -e unslung/downloads ] || ( cd unslung ; ln -s ../downloads . ) + [ -e openslug/downloads ] || ( cd openslug ; ln -s ../downloads . ) + +monotone-update: monotone/nslu2-linux.db + monotone pull && monotone update + +bitbake-setup bitbake/bin/bitbake: + [ -e bitbake/bin/bitbake ] || ( svn co svn://svn.berlios.de/bitbake/trunk/bitbake ) + +bitbake-update: bitbake/bin/bitbake + ( cd bitbake ; svn update ) + +bitbake-clobber: + rm -rf bitbake + +openembedded-setup openembedded/conf/machine/nslu2.conf: + [ -e openembedded/conf/machine/nslu2.conf ] || monotone co -b org.openembedded.nslu2-linux openembedded + +openembedded-update: openembedded/conf/machine/nslu2.conf + ( cd openembedded ; monotone update ) + +openembedded-clobber: + rm -rf openembedded + +oe-symlinks-setup oe-symlinks/packages: + [ -e oe-symlinks/packages ] || ( svn co svn://svn.berlios.de/openslug/trunk/openslug/nslu2-linux oe-symlinks ) + +oe-symlinks-update: oe-symlinks/packages + ( cd oe-symlinks ; svn update ) + +oe-symlinks-clobber: + rm -rf oe-symlinks + +optware-setup optware/Makefile: + [ -e optware/Makefile ] || ( cvs -d :pserver:anonymous@cvs.sf.net:/cvsroot/nslu co -d optware unslung ) + [ -e optware/downloads ] || ( cd optware ; ln -s ../downloads . ) + +optware-update: optware/Makefile + ( cd optware ; cvs update -d -P ) + +optware-clobber: + rm -rf optware + +# End of Makefile diff --git a/openslug/.mt-ignore b/openslug/.mt-ignore new file mode 100644 index 0000000000..dd5df82133 --- /dev/null +++ b/openslug/.mt-ignore @@ -0,0 +1,4 @@ +downloads +openslug-source.tar.gz +setup-env +tmp diff --git a/openslug/.mtn2git_empty b/openslug/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/openslug/Makefile b/openslug/Makefile new file mode 100644 index 0000000000..a0c0ec1e72 --- /dev/null +++ b/openslug/Makefile @@ -0,0 +1,48 @@ +# Makefile for OpenSlug +# Licensed under the GPL v2 or later + +openslug-firmware: setup-env conf/local.conf + ( source setup-env ; bitbake openslug-packages ) + +# This does the same thing but with a clean environment +# The HOME setting prevents user environment settings +# from changing the build. CCACHE_DIR is necessary to +# prevent ccache (if installed) attempting to use a +# .cache in the home directory. +openslug-firmware-safe: setup-env conf/local.conf + env -i CCACHE_DISABLE=1 CCACHE_DIR="`pwd`/tmp/ccache" HOME=/dev/null \ + sh -c 'source setup-env; bitbake openslug-packages' + +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 'OEBUILD=$$OEROOT' >> setup-env + echo 'export PYTHONPATH=$$OESYS/lib' >>setup-env + echo 'export BBPATH=$$OEBUILD:$$PKGDIR:$$OESYS' >> setup-env + echo 'export PATH=$$OESYS/bin/:$$PATH' >> setup-env + echo 'export LD_LIBRARY_PATH=' >> setup-env + echo 'export LANG=C' >> setup-env + echo 'unset LC_CTYPE' >> setup-env + echo 'unset CC' >> setup-env + echo 'unset CXX' >> setup-env + echo 'alias bb=bitbake' >> setup-env + echo 'echo Environment set up for OpenSlug development.' >> setup-env + +conf/local.conf: + sed -e "s|%%%OEROOT%%%|`pwd`|" conf/local.conf.template > conf/local.conf + +clobber: + rm -rf tmp + +openslug-source: + tar zcvf openslug-source.tar.gz --exclude=MT Makefile bitbake conf openembedded oe-symlinks + +distclean: clobber + rm -rf setup-env conf/local.conf bitbake downloads openembedded oe-symlinks + +# End of Makefile diff --git a/openslug/conf/.mt-ignore b/openslug/conf/.mt-ignore new file mode 100644 index 0000000000..f21e1b217b --- /dev/null +++ b/openslug/conf/.mt-ignore @@ -0,0 +1 @@ +local.conf diff --git a/openslug/conf/.mtn2git_empty b/openslug/conf/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/openslug/conf/local.conf.template b/openslug/conf/local.conf.template new file mode 100644 index 0000000000..f5095c54c5 --- /dev/null +++ b/openslug/conf/local.conf.template @@ -0,0 +1,96 @@ +OEROOT = "%%%OEROOT%%%" + +# Use this to specify where OE should place the downloaded sources into +DL_DIR = "${OEROOT}/downloads" + +# Delete the line below. Then specify which .oe files to consider for +# your build. Typically this will be something like OEFILES = "/path/to/packages/*/*.oe" +# BBFILES := "/home/slug/openembedded/packages/*/*.bb" +BBFILES := "${OEROOT}/oe-symlinks/packages/*/*.bb" + +# Use the OEMASK below to instruct OE to _NOT_ consider some .oe files +# This is a regulary expression, so be sure to get your parenthesis balanced. +OEMASK = "" + +# Uncomment this if you want to use a prebuilt toolchain. You will need to +# provide packages for toolchain and additional libraries yourself. You also +# have to set PATH in your environment to make sure OE finds additional binaries. +# Note: You will definitely need to say: +# ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95" +# to build any of two Linux 2.4 Embedix kernels, +# i.e. openzaurus-sa-2.4.18 and openzaurus-pxa-2.4.18 - and don't forget +# to rename the binaries as instructed in the Wiki. +# ASSUME_PROVIDED = "virtual/${TARGET_PREFIX}gcc virtual/libc" + +# Select between multiple alternative providers, if more than one is eligible. +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" + +# Uncomment this to specify where OE should create its temporary files. +# Note that a full build of everything in OE will take GigaBytes of hard +# disk space, so make sure to free enough space. The default TMPDIR is +# /tmp +TMPDIR = ${OEROOT}/tmp + +# Uncomment this to specify a machine to build for. See the conf directory +# for machines currently known to OpenEmbedded. +MACHINE = "nslu2" + +# Uncomment this to select a distribution policy. See the conf directory +# for distributions currently known to OpenEmbedded. +DISTRO = "openslug" + +# Add to this any extra projects (packages) to be built with the image +# (look in openembedded/packages/openslug-packages.bb for a list of +# packages known to build with openslug.) +OPENSLUG_EXTRA_DEPENDS = "" + +# Add to this specific built .ipk package names to add to the image. +# These will be included in the root flash file system stored on the +# NSLU2. Be careful not to fill the file system, OpenSlug will not +# boot if the file system is close to full. +OPENSLUG_EXTRA_RDEPENDS = "" + +# Support for a variety of file systems is built in to the openslug +# image, programs to format disks with these file systems may be +# added or removed. By default ext2. ext3 and reiserfs supported +# is included by the following lines. +# +# These lines add support for formatting ext2 and ext3 file systems +# on a hard disk attached to the NSLU2. ext3 is the standard Linux +# file system. (OPENSLUG_EXT2_PROGS is defined in +# openembedded/conf/distro/openslug.conf) +OPENSLUG_EXTRA_DEPENDS += "e2fsprogs" +OPENSLUG_EXTRA_RDEPENDS += "${OPENSLUG_EXT2_PROGS}" + +# These lines add support for formatting reiserfs file systems on +# a hard disk. +OPENSLUG_EXTRA_DEPENDS += "reiserfsprogs" +OPENSLUG_EXTRA_RDEPENDS += "reiserfsprogs" + +# These lines add a build of the 'upslug' program which may be +# used to download the final image to an NSLU2. The program can +# be found within the tmp/work/upslug-native* directory. +OPENSLUG_EXTRA_DEPENDS += "upslug-native" + +# These lines add support for an X/Y/ZModem package called lrzsz +# (this is of use for people with modified NSLU2 hardware which +# supports a serial port.) +OPENSLUG_EXTRA_DEPENDS += "lrzsz" +OPENSLUG_EXTRA_RDEPENDS += "lrzsz" + + +# Uncomment this to disable the parse cache (not recommended). +CACHE = "${OEROOT}/tmp/cache" + +# Uncomment this if you want OE to emit the log if a build fails. +OEINCLUDELOGS = "yes" + +# Specifies a location to search for pre-generated tarballs when fetching +# a cvs:// URI. Uncomment this, if you not want to pull directly from CVS. +CVS_TARBALL_STASH = "http://www.oesources.org/source/current/" + +# INHERIT += "src_distribute_local pkg_distribute" + +# EDIT THIS FILE and then remove the line below before using! diff --git a/unslung/.mt-ignore b/unslung/.mt-ignore new file mode 100644 index 0000000000..2cf465fead --- /dev/null +++ b/unslung/.mt-ignore @@ -0,0 +1,4 @@ +downloads +unslung-source.tar.gz +setup-env +tmp diff --git a/unslung/.mtn2git_empty b/unslung/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/unslung/Makefile b/unslung/Makefile new file mode 100644 index 0000000000..b64453007b --- /dev/null +++ b/unslung/Makefile @@ -0,0 +1,48 @@ +# Makefile for Unslung +# Licensed under the GPL v2 or later + +unslung-firmware: setup-env conf/local.conf + (source setup-env ; bitbake unslung-packages) + +# This does the same thing but with a clean environment +# The HOME setting prevents user environment settings +# from changing the build. CCACHE_DIR is necessary to +# prevent ccache (if installed) attempting to use a +# .cache in the home directory. +unslung-firmware-safe: setup-env conf/local.conf + env -i CCACHE_DISABLE=1 CCACHE_DIR="`pwd`/tmp/ccache" HOME=/dev/null \ + sh -c 'source setup-env; bitbake unslung-packages' + +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 'OEBUILD=$$OEROOT' >> setup-env + echo 'BBPATH=$$OEBUILD:$$PKGDIR:$$OESYS' >> setup-env + echo 'PATH=$$OESYS/bin/:$$PATH' >> setup-env + echo 'LD_LIBRARY_PATH=' >> setup-env + echo 'export PATH LD_LIBRARY_PATH BBPATH' >> setup-env + echo 'export LANG=C' >> setup-env + echo 'unset LC_CTYPE' >> setup-env + echo 'unset CC' >> setup-env + echo 'unset CXX' >> setup-env + echo 'alias bb=bitbake' >> setup-env + echo 'echo Environment set up for Unslung development.' >> setup-env + +conf/local.conf: + sed -e "s|%%%OEROOT%%%|`pwd`|" conf/local.conf.template > conf/local.conf + +clobber: + rm -rf tmp + +unslung-source: + tar zcvf unslung-source.tar.gz --exclude=MT Makefile bitbake conf openembedded oe-symlinks + +distclean: clobber + rm -f setup-env conf/local.conf bitbake downloads openembedded oe-symlinks + +# End of Makefile diff --git a/unslung/conf/.mt-ignore b/unslung/conf/.mt-ignore new file mode 100644 index 0000000000..f21e1b217b --- /dev/null +++ b/unslung/conf/.mt-ignore @@ -0,0 +1 @@ +local.conf diff --git a/unslung/conf/.mtn2git_empty b/unslung/conf/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/unslung/conf/local.conf.template b/unslung/conf/local.conf.template new file mode 100644 index 0000000000..a13923f749 --- /dev/null +++ b/unslung/conf/local.conf.template @@ -0,0 +1,59 @@ +OEROOT = "%%%OEROOT%%%" + +# Use this to specify where OE should place the downloaded sources into +DL_DIR = "${OEROOT}/downloads" + +# Delete the line below. Then specify which .oe files to consider for +# your build. Typically this will be something like OEFILES = "/path/to/packages/*/*.oe" +# BBFILES := "/home/slug/openembedded/packages/*/*.bb" +BBFILES := "${OEROOT}/oe-symlinks/packages/*/*.bb" + +# Use the OEMASK below to instruct OE to _NOT_ consider some .oe files +# This is a regulary expression, so be sure to get your parenthesis balanced. +OEMASK = "" + +# Uncomment this if you want to use a prebuilt toolchain. You will need to +# provide packages for toolchain and additional libraries yourself. You also +# have to set PATH in your environment to make sure OE finds additional binaries. +# Note: You will definitely need to say: +# ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95" +# to build any of two Linux 2.4 Embedix kernels, +# i.e. openzaurus-sa-2.4.18 and openzaurus-pxa-2.4.18 - and don't forget +# to rename the binaries as instructed in the Wiki. +# ASSUME_PROVIDED = "virtual/${TARGET_PREFIX}gcc virtual/libc" + +# Select between multiple alternative providers, if more than one is eligible. +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" + +# Uncomment this to specify where OE should create its temporary files. +# Note that a full build of everything in OE will take GigaBytes of hard +# disk space, so make sure to free enough space. The default TMPDIR is +# /tmp +TMPDIR = ${OEROOT}/tmp + +# Uncomment this to specify a machine to build for. See the conf directory +# for machines currently known to OpenEmbedded. +MACHINE = "nslu2" + +# Uncomment this to select a distribution policy. See the conf directory +# for distributions currently known to OpenEmbedded. +DISTRO = "unslung" + +OPENSLUG_EXTRA_DEPENDS = "" +OPENSLUG_EXTRA_RDEPENDS = "" + +# Uncomment this to disable the parse cache (not recommended). +CACHE = "${OEROOT}/tmp/cache" + +# Uncomment this if you want OE to emit the log if a build fails. +OEINCLUDELOGS = "yes" + +# Specifies a location to search for pre-generated tarballs when fetching +# a cvs:// URI. Uncomment this, if you not want to pull directly from CVS. +CVS_TARBALL_STASH = "http://www.oesources.org/source/current/" + +# INHERIT += "src_distribute_local pkg_distribute" + +# EDIT THIS FILE and then remove the line below before using! -- cgit v1.2.3 From fbf9d621ed0b800a47c2eacb01414ce50dec37b9 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Thu, 30 Jun 2005 09:56:22 +0000 Subject: Updated Makefile for new repository location --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c56fcbc417..2cb86072b8 100644 --- a/Makefile +++ b/Makefile @@ -22,10 +22,10 @@ optware-build: monotone-setup monotone/nslu2-linux.db unslung/Makefile openslug/Makefile: [ -e monotone/nslu2-linux.db ] || ( mkdir -p monotone && monotone -d monotone/nslu2-linux.db db init ) - ( monotone -d monotone/nslu2-linux.db pull ewi546.ewi.utwente.nl org.openembedded ) + ( monotone -d monotone/nslu2-linux.db pull monotone.vanille.de org.openembedded ) ( monotone -d monotone/nslu2-linux.db unset database default-server ) ( monotone -d monotone/nslu2-linux.db unset database default-collection ) - ( monotone -d monotone/nslu2-linux.db pull mtn.nslu2-linux.org org ) + ( monotone -d monotone/nslu2-linux.db pull monotone.nslu2-linux.org org ) [ -e MT ] || ( monotone -d monotone/nslu2-linux.db co -b org.nslu2-linux.dev . ) [ -e downloads ] || mkdir -p downloads [ -e unslung/downloads ] || ( cd unslung ; ln -s ../downloads . ) -- cgit v1.2.3 From 68e56dca371c4f1cc0ad409e2759c68ea7961774 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 2 Jul 2005 07:43:52 +0000 Subject: Renamed most targets to be active voice, and added PHONY declarations. --- Makefile | 94 +++++++++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 61 insertions(+), 33 deletions(-) diff --git a/Makefile b/Makefile index 2cb86072b8..b602b15fff 100644 --- a/Makefile +++ b/Makefile @@ -1,26 +1,35 @@ # Makefile for the NSLU2 Linux development system # Licensed under the GPL v2 or later +.PHONY: all all: update build -build: unslung-build openslug-build optware-build +.PHONY: build +build: build-unslung build-openslug build-optware -setup: monotone-setup bitbake-setup openembedded-setup oe-symlinks-setup optware-setup +.PHONY: setup +setup: setup-master setup-bitbake setup-openembedded setup-oe-symlinks setup-optware -update: monotone-update bitbake-update openembedded-update oe-symlinks-update optware-update +.PHONY: update +update: update-master update-bitbake update-openembedded update-oe-symlinks update-optware -clobber: optware-clobber oe-symlinks-clobber openembedded-clobber bitbake-clobber +.PHONY: clobber +clobber: clobber-optware clobber-oe-symlinks clobber-openembedded clobber-bitbake -unslung-build: +.PHONY: unslung build-unslung +unslung build-unslung: unslung/Makefile bitbake/bin/bitbake openembedded/conf/machine/nslu2.conf oe-symlinks/packages ( cd unslung ; make ) -openslug-build: +.PHONY: openslug build-openslug +openslug build-openslug: openslug/Makefile bitbake/bin/bitbake openembedded/conf/machine/nslu2.conf oe-symlinks/packages ( cd openslug ; make ) -optware-build: +.PHONY: optware build-optware +optware build-optware: optware/Makefile ( cd optware ; make ) -monotone-setup monotone/nslu2-linux.db unslung/Makefile openslug/Makefile: +.PHONY: setup-master +setup-master monotone/nslu2-linux.db unslung/Makefile openslug/Makefile: [ -e monotone/nslu2-linux.db ] || ( mkdir -p monotone && monotone -d monotone/nslu2-linux.db db init ) ( monotone -d monotone/nslu2-linux.db pull monotone.vanille.de org.openembedded ) ( monotone -d monotone/nslu2-linux.db unset database default-server ) @@ -31,44 +40,63 @@ monotone-setup monotone/nslu2-linux.db unslung/Makefile openslug/Makefile: [ -e unslung/downloads ] || ( cd unslung ; ln -s ../downloads . ) [ -e openslug/downloads ] || ( cd openslug ; ln -s ../downloads . ) -monotone-update: monotone/nslu2-linux.db - monotone pull && monotone update - -bitbake-setup bitbake/bin/bitbake: +.PHONY: setup-bitbake +setup-bitbake bitbake/bin/bitbake: [ -e bitbake/bin/bitbake ] || ( svn co svn://svn.berlios.de/bitbake/trunk/bitbake ) -bitbake-update: bitbake/bin/bitbake - ( cd bitbake ; svn update ) +.PHONY: setup-openembedded +setup-openembedded openembedded/conf/machine/nslu2.conf: monotone/nslu2-linux.db + [ -e openembedded/conf/machine/nslu2.conf ] || monotone co -b org.openembedded.nslu2-linux openembedded -bitbake-clobber: - rm -rf bitbake +.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 ) -openembedded-setup openembedded/conf/machine/nslu2.conf: - [ -e openembedded/conf/machine/nslu2.conf ] || monotone co -b org.openembedded.nslu2-linux openembedded +.PHONY: setup-optware +setup-optware optware/Makefile: + [ -e optware/Makefile ] || ( cvs -d :pserver:anonymous@cvs.sf.net:/cvsroot/nslu co -d optware unslung ) + [ -e optware/downloads ] || ( cd optware ; ln -s ../downloads . ) -openembedded-update: openembedded/conf/machine/nslu2.conf - ( cd openembedded ; monotone update ) +.PHONY: update-master +update-master: monotone/nslu2-linux.db + monotone pull && monotone update -openembedded-clobber: - rm -rf openembedded +.PHONY: update-bitbake +update-bitbake: bitbake/bin/bitbake + ( cd bitbake ; svn update ) -oe-symlinks-setup oe-symlinks/packages: - [ -e oe-symlinks/packages ] || ( svn co svn://svn.berlios.de/openslug/trunk/openslug/nslu2-linux oe-symlinks ) +.PHONY: update-openembedded +update-openembedded: openembedded/conf/machine/nslu2.conf + ( cd openembedded ; monotone pull && monotone update ) -oe-symlinks-update: oe-symlinks/packages +.PHONY: update-oe-symlinks +update-oe-symlinks: oe-symlinks/packages ( cd oe-symlinks ; svn update ) -oe-symlinks-clobber: - rm -rf oe-symlinks +.PHONY: update-optware +update-optware: optware/Makefile + ( cd optware ; cvs update -d -P ) -optware-setup optware/Makefile: - [ -e optware/Makefile ] || ( cvs -d :pserver:anonymous@cvs.sf.net:/cvsroot/nslu co -d optware unslung ) - [ -e optware/downloads ] || ( cd optware ; ln -s ../downloads . ) +.PHONY: clobber-bitbake +clobber-bitbake: + rm -rf bitbake -optware-update: optware/Makefile - ( cd optware ; cvs update -d -P ) +.PHONY: clobber-openembedded +clobber-openembedded: + rm -rf openembedded + +.PHONY: clobber-oe-symlinks +clobber-oe-symlinks: + rm -rf oe-symlinks -optware-clobber: +.PHONY: clobber-optware +clobber-optware: rm -rf optware +# Deprecated targets + +unslung-build : build-unslung +openslug-build : build-openslug +optware-build : build-optware + # End of Makefile -- cgit v1.2.3 From 454bea1b24e121d12495506a163b44d440077a8a Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 2 Jul 2005 07:46:58 +0000 Subject: Added the push-master and upload-master targets. --- Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Makefile b/Makefile index b602b15fff..2602b22e21 100644 --- a/Makefile +++ b/Makefile @@ -77,6 +77,14 @@ update-oe-symlinks: oe-symlinks/packages update-optware: optware/Makefile ( cd optware ; cvs update -d -P ) +.PHONY: push-master +push-master: monotone/nslu2-linux.db + monotone merge && monotone push + +.PHONY: upload-master +upload-master: monotone/nslu2-linux.db + scp Makefile www.nslu2-linux.org:/home/nslu2/public_html/Makefile + .PHONY: clobber-bitbake clobber-bitbake: rm -rf bitbake -- cgit v1.2.3 From 2757d7a41136a94c14b5f0ee1c2003ad10e9e482 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 2 Jul 2005 07:49:56 +0000 Subject: Fixed the upload-master target. --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 2602b22e21..f36e168f2e 100644 --- a/Makefile +++ b/Makefile @@ -79,11 +79,11 @@ update-optware: optware/Makefile .PHONY: push-master push-master: monotone/nslu2-linux.db - monotone merge && monotone push + monotone push .PHONY: upload-master -upload-master: monotone/nslu2-linux.db - scp Makefile www.nslu2-linux.org:/home/nslu2/public_html/Makefile +upload-master: push-master + scp Makefile www.nslu2-linux.org:/home/nslu/public_html/Makefile .PHONY: clobber-bitbake clobber-bitbake: -- cgit v1.2.3 From f52bde10a6e08665afdae9d371a4fffc0ba05a38 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 2 Jul 2005 09:01:55 +0000 Subject: Added a number of administrative targets --- Makefile | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 55 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index f36e168f2e..4b410fd0e2 100644 --- a/Makefile +++ b/Makefile @@ -28,14 +28,19 @@ openslug build-openslug: openslug/Makefile bitbake/bin/bitbake openembedded/conf optware build-optware: optware/Makefile ( cd optware ; make ) -.PHONY: setup-master -setup-master monotone/nslu2-linux.db unslung/Makefile openslug/Makefile: +.PHONY: setup-monotone +setup-monotone monotone/nslu2-linux.db: [ -e monotone/nslu2-linux.db ] || ( mkdir -p monotone && monotone -d monotone/nslu2-linux.db db init ) ( monotone -d monotone/nslu2-linux.db pull monotone.vanille.de org.openembedded ) ( monotone -d monotone/nslu2-linux.db unset database default-server ) ( monotone -d monotone/nslu2-linux.db unset database default-collection ) ( monotone -d monotone/nslu2-linux.db pull monotone.nslu2-linux.org org ) + +unslung/Makefile openslug/Makefile: monotone/nslu2-linux.db [ -e MT ] || ( monotone -d monotone/nslu2-linux.db co -b org.nslu2-linux.dev . ) + +.PHONY: setup-master +setup-master: setup-monotone unslung/Makefile openslug/Makefile [ -e downloads ] || mkdir -p downloads [ -e unslung/downloads ] || ( cd unslung ; ln -s ../downloads . ) [ -e openslug/downloads ] || ( cd openslug ; ln -s ../downloads . ) @@ -59,7 +64,11 @@ setup-optware optware/Makefile: .PHONY: update-master update-master: monotone/nslu2-linux.db - monotone pull && monotone update + monotone pull + monotone update + if [ `monotone automate heads org.nslu2-linux.dev | wc -l` != "1" ] ; then \ + monotone merge -b org.nslu2-linux.dev ; \ + fi .PHONY: update-bitbake update-bitbake: bitbake/bin/bitbake @@ -67,7 +76,11 @@ update-bitbake: bitbake/bin/bitbake .PHONY: update-openembedded update-openembedded: openembedded/conf/machine/nslu2.conf - ( cd openembedded ; monotone pull && monotone update ) + monotone pull + ( cd openembedded ; monotone update ) + if [ `monotone automate heads org.openembedded.nslu2-linux | wc -l` != "1" ] ; then \ + monotone merge -b org.openembedded.nslu2-linux ; \ + fi .PHONY: update-oe-symlinks update-oe-symlinks: oe-symlinks/packages @@ -81,9 +94,9 @@ update-optware: optware/Makefile push-master: monotone/nslu2-linux.db monotone push -.PHONY: upload-master -upload-master: push-master - scp Makefile www.nslu2-linux.org:/home/nslu/public_html/Makefile +.PHONY: push-openembedded +push-openembedded: openembedded/conf/machine/nslu2.conf + ( cd openembedded ; monotone push ) .PHONY: clobber-bitbake clobber-bitbake: @@ -107,4 +120,39 @@ unslung-build : build-unslung openslug-build : build-openslug optware-build : build-optware +# Core team use only targets + +.PHONY: publish-master +publish-master: push-master + scp Makefile www.nslu2-linux.org:/home/nslu/public_html/Makefile + +.PHONY: import-openembedded +import-openembedded: openembedded/conf/machine/nslu2.conf + monotone pull monotone.vanille.de org.openembedded + if [ `monotone automate heads org.openembedded.dev | wc -l` != "1" ] ; then \ + monotone merge -b org.openembedded.dev ; \ + fi + +.PHONY: propagate-from-oe +propagate-from-oe: + monotone propagate org.openembedded.dev org.openembedded.nslu2-linux + if [ `monotone automate heads org.openembedded.nslu2-linux | wc -l` != "1" ] ; then \ + monotone merge -b org.openembedded.nslu2-linux ; \ + fi + +.PHONY: propagate-to-oe +propagate-to-oe: + monotone propagate org.openembedded.nslu2-linux org.openembedded.dev + if [ `monotone automate heads org.openembedded.dev | wc -l` != "1" ] ; then \ + monotone merge -b org.openembedded.dev ; \ + fi + +.PHONY: export-openembedded +export-openembedded: openembedded/conf/machine/nslu2.conf + monotone push monotone.vanille.de org.openembedded + +.PHONY: publish-openembedded +publish-openembedded: import-openembedded propagate-from-oe update-openembedded \ + propagate-to-oe push-openembedded export-openembedded + # End of Makefile -- cgit v1.2.3 From bf2b82d94119212d670f69be3a985bdb01cca984 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Sat, 2 Jul 2005 21:15:14 +0000 Subject: Fix first build so that 'make' (no args) works. --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 4b410fd0e2..71bff95691 100644 --- a/Makefile +++ b/Makefile @@ -36,8 +36,8 @@ setup-monotone monotone/nslu2-linux.db: ( monotone -d monotone/nslu2-linux.db unset database default-collection ) ( monotone -d monotone/nslu2-linux.db pull monotone.nslu2-linux.org org ) -unslung/Makefile openslug/Makefile: monotone/nslu2-linux.db - [ -e MT ] || ( monotone -d monotone/nslu2-linux.db co -b org.nslu2-linux.dev . ) +unslung/Makefile openslug/Makefile MT/revision: monotone/nslu2-linux.db + [ -e MT/revision ] || ( monotone -d monotone/nslu2-linux.db co -b org.nslu2-linux.dev . ) .PHONY: setup-master setup-master: setup-monotone unslung/Makefile openslug/Makefile @@ -50,7 +50,7 @@ setup-bitbake bitbake/bin/bitbake: [ -e bitbake/bin/bitbake ] || ( svn co svn://svn.berlios.de/bitbake/trunk/bitbake ) .PHONY: setup-openembedded -setup-openembedded openembedded/conf/machine/nslu2.conf: monotone/nslu2-linux.db +setup-openembedded openembedded/conf/machine/nslu2.conf: MT/revision [ -e openembedded/conf/machine/nslu2.conf ] || monotone co -b org.openembedded.nslu2-linux openembedded .PHONY: setup-oe-symlinks @@ -63,7 +63,7 @@ setup-optware optware/Makefile: [ -e optware/downloads ] || ( cd optware ; ln -s ../downloads . ) .PHONY: update-master -update-master: monotone/nslu2-linux.db +update-master: MT/revision monotone pull monotone update if [ `monotone automate heads org.nslu2-linux.dev | wc -l` != "1" ] ; then \ -- cgit v1.2.3 From 9bb59f9294687dfda51dd8832166de5d303b036f Mon Sep 17 00:00:00 2001 From: John Bowler Date: Sun, 3 Jul 2005 16:54:15 +0000 Subject: Fix creation of downloads directory in absence of make setup --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 71bff95691..14968fe97a 100644 --- a/Makefile +++ b/Makefile @@ -17,11 +17,11 @@ update: update-master update-bitbake update-openembedded update-oe-symlinks upda clobber: clobber-optware clobber-oe-symlinks 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 downloads bitbake/bin/bitbake openembedded/conf/machine/nslu2.conf oe-symlinks/packages ( 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 downloads bitbake/bin/bitbake openembedded/conf/machine/nslu2.conf oe-symlinks/packages ( cd openslug ; make ) .PHONY: optware build-optware @@ -40,7 +40,7 @@ unslung/Makefile openslug/Makefile MT/revision: monotone/nslu2-linux.db [ -e MT/revision ] || ( monotone -d monotone/nslu2-linux.db co -b org.nslu2-linux.dev . ) .PHONY: setup-master -setup-master: setup-monotone unslung/Makefile openslug/Makefile +setup-master downloads: setup-monotone unslung/Makefile openslug/Makefile [ -e downloads ] || mkdir -p downloads [ -e unslung/downloads ] || ( cd unslung ; ln -s ../downloads . ) [ -e openslug/downloads ] || ( cd openslug ; ln -s ../downloads . ) @@ -87,7 +87,7 @@ update-oe-symlinks: oe-symlinks/packages ( cd oe-symlinks ; svn update ) .PHONY: update-optware -update-optware: optware/Makefile +update-optware: optware/Makefile downloads ( cd optware ; cvs update -d -P ) .PHONY: push-master -- cgit v1.2.3 From ee3c72cd0baa112c221a3e9175c190f58fdde1e2 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 3 Jul 2005 20:46:05 +0000 Subject: Added upload-openslug-cross admin target --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 4b410fd0e2..22858e6abe 100644 --- a/Makefile +++ b/Makefile @@ -126,6 +126,10 @@ optware-build : build-optware publish-master: push-master scp Makefile www.nslu2-linux.org:/home/nslu/public_html/Makefile +.PHONY: upload-openembedded-cross +upload-openslug-cross: openslug/Makefile + rsync -avr openslug/tmp/deploy/ipk/ unslung@nslu.sf.net:nslu/feeds/openslug/unstable/ + .PHONY: import-openembedded import-openembedded: openembedded/conf/machine/nslu2.conf monotone pull monotone.vanille.de org.openembedded -- cgit v1.2.3 From 8aee402b8b06dda6a228cb48de7c9f111c614baf Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 9 Jul 2005 08:38:40 +0000 Subject: Fixed the update-openembedded target so that it could handle multiple heads --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7d0b05ca15..302d404aec 100644 --- a/Makefile +++ b/Makefile @@ -77,10 +77,10 @@ update-bitbake: bitbake/bin/bitbake .PHONY: update-openembedded update-openembedded: openembedded/conf/machine/nslu2.conf monotone pull - ( cd openembedded ; monotone update ) if [ `monotone automate heads org.openembedded.nslu2-linux | wc -l` != "1" ] ; then \ monotone merge -b org.openembedded.nslu2-linux ; \ fi + ( cd openembedded ; monotone update ) .PHONY: update-oe-symlinks update-oe-symlinks: oe-symlinks/packages -- cgit v1.2.3 From 2332977c51f23f37d3bb9b80f2ba4ba4cbbbec70 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 9 Jul 2005 18:40:02 +0000 Subject: Added new targets for non-core write access --- Makefile | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 302d404aec..7aaf2e43e6 100644 --- a/Makefile +++ b/Makefile @@ -90,14 +90,6 @@ update-oe-symlinks: oe-symlinks/packages update-optware: optware/Makefile downloads ( cd optware ; cvs update -d -P ) -.PHONY: push-master -push-master: monotone/nslu2-linux.db - monotone push - -.PHONY: push-openembedded -push-openembedded: openembedded/conf/machine/nslu2.conf - ( cd openembedded ; monotone push ) - .PHONY: clobber-bitbake clobber-bitbake: rm -rf bitbake @@ -114,13 +106,17 @@ clobber-oe-symlinks: clobber-optware: rm -rf optware -# Deprecated targets +# Targets for use by those with write access to the repositories -unslung-build : build-unslung -openslug-build : build-openslug -optware-build : build-optware +.PHONY: push-master +push-master: monotone/nslu2-linux.db + monotone push + +.PHONY: push-openembedded +push-openembedded: openembedded/conf/machine/nslu2.conf + ( cd openembedded ; monotone push ) -# Core team use only targets +# Targets for use by core team members only .PHONY: publish-master publish-master: push-master -- cgit v1.2.3 From b8f86a084abbe3356eab61744906291feb5c37d3 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sun, 10 Jul 2005 00:36:16 +0000 Subject: lock Bitbake to 269 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7d0b05ca15..a022147238 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ setup-master downloads: setup-monotone unslung/Makefile openslug/Makefile .PHONY: setup-bitbake setup-bitbake bitbake/bin/bitbake: - [ -e bitbake/bin/bitbake ] || ( svn co svn://svn.berlios.de/bitbake/trunk/bitbake ) + [ -e bitbake/bin/bitbake ] || ( svn co -r 269 svn://svn.berlios.de/bitbake/trunk/bitbake ) .PHONY: setup-openembedded setup-openembedded openembedded/conf/machine/nslu2.conf: MT/revision -- cgit v1.2.3 From 80fba26bf889f60e9460773f88e2e9354159811a Mon Sep 17 00:00:00 2001 From: Derek Young Date: Sun, 10 Jul 2005 02:35:32 +0000 Subject: Add developer targets --- Makefile | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Makefile b/Makefile index 2c02e6ee37..8370dd86bb 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,9 @@ build: build-unslung build-openslug build-optware .PHONY: setup setup: setup-master setup-bitbake setup-openembedded setup-oe-symlinks setup-optware +.PHONY: setup-developer +setup: setup-master setup-bitbake setup-openembedded setup-oe-symlinks-developer setup-optware-developer + .PHONY: update update: update-master update-bitbake update-openembedded update-oe-symlinks update-optware @@ -62,6 +65,15 @@ setup-optware optware/Makefile: [ -e optware/Makefile ] || ( cvs -d :pserver:anonymous@cvs.sf.net:/cvsroot/nslu co -d optware unslung ) [ -e optware/downloads ] || ( cd optware ; ln -s ../downloads . ) +.PHONY: setup-oe-symlinks-developer +setup-oe-symlinks-developer oe-symlinks/packages: + [ -e oe-symlinks/packages ] || ( svn co svn+ssh://${SVN_USER}@svn.berlios.de/svnroot/repos/openslug/trunk/openslug/nslu2-linux oe-symlinks ) + +.PHONY: setup-optware-developer +setup-optware-developer optware/Makefile: + [ -e optware/Makefile ] || ( cvs -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co -d optware unslung ) + [ -e optware/downloads ] || ( cd optware ; ln -s ../downloads . ) + .PHONY: update-master update-master: MT/revision monotone pull -- cgit v1.2.3 From 3d46b5f67b46567411c9e2b1cf442b0a5df31db7 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sun, 10 Jul 2005 23:41:34 +0000 Subject: lock update-bitbake to rev. 269 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2c02e6ee37..c93e5371b2 100644 --- a/Makefile +++ b/Makefile @@ -72,7 +72,7 @@ update-master: MT/revision .PHONY: update-bitbake update-bitbake: bitbake/bin/bitbake - ( cd bitbake ; svn update ) + ( cd bitbake ; svn -r 269 update ) .PHONY: update-openembedded update-openembedded: openembedded/conf/machine/nslu2.conf -- cgit v1.2.3 From 9902dcdddb760757cb3aaba80432f7ef2aa8d0c1 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sun, 10 Jul 2005 23:45:47 +0000 Subject: Make BITBAKE_REVISION change --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8206c0fe2e..82b69856d9 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,8 @@ # Makefile for the NSLU2 Linux development system # Licensed under the GPL v2 or later +BITBAKE_REVISION="-r 269" # Fetch this revision of BitBake. Unset this to fetch bleeding edge. + .PHONY: all all: update build @@ -50,7 +52,7 @@ setup-master downloads: setup-monotone unslung/Makefile openslug/Makefile .PHONY: setup-bitbake setup-bitbake bitbake/bin/bitbake: - [ -e bitbake/bin/bitbake ] || ( svn co -r 269 svn://svn.berlios.de/bitbake/trunk/bitbake ) + [ -e bitbake/bin/bitbake ] || ( svn co ${BITBAKE_REVISION} svn://svn.berlios.de/bitbake/trunk/bitbake ) .PHONY: setup-openembedded setup-openembedded openembedded/conf/machine/nslu2.conf: MT/revision @@ -84,7 +86,7 @@ update-master: MT/revision .PHONY: update-bitbake update-bitbake: bitbake/bin/bitbake - ( cd bitbake ; svn -r 269 update ) + ( cd bitbake ; svn ${BITBAKE_REVISION} update ) .PHONY: update-openembedded update-openembedded: openembedded/conf/machine/nslu2.conf -- cgit v1.2.3 From ba81c9cff919b82fa35e8856907cb8d03a884068 Mon Sep 17 00:00:00 2001 From: Derek Young Date: Mon, 11 Jul 2005 08:30:27 +0000 Subject: Fix the bitbake fixing line --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 82b69856d9..aeb50a51b3 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,8 @@ # Makefile for the NSLU2 Linux development system # Licensed under the GPL v2 or later -BITBAKE_REVISION="-r 269" # Fetch this revision of BitBake. Unset this to fetch bleeding edge. +# Fetch this revision of BitBake. Unset this to fetch bleeding edge. +BITBAKE_REVISION=-r 269 .PHONY: all all: update build -- cgit v1.2.3 From d7a7f84a93a6d1e2383a008858d9e9e078028836 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 11 Jul 2005 08:35:03 +0000 Subject: Fixed the setup-developer targets --- Makefile | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index aeb50a51b3..7490209719 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,12 @@ # Makefile for the NSLU2 Linux development system # Licensed under the GPL v2 or later +# Change these if you are unfortunate enough to have a split net personality. +SVN_USER ?= ${USER} +CVS_USER ?= ${USER} + # Fetch this revision of BitBake. Unset this to fetch bleeding edge. -BITBAKE_REVISION=-r 269 +BITBAKE_REVISION = -r 269 .PHONY: all all: update build @@ -14,7 +18,7 @@ build: build-unslung build-openslug build-optware setup: setup-master setup-bitbake setup-openembedded setup-oe-symlinks setup-optware .PHONY: setup-developer -setup: setup-master setup-bitbake setup-openembedded setup-oe-symlinks-developer setup-optware-developer +setup-developer: setup-master setup-bitbake setup-openembedded setup-oe-symlinks-developer setup-optware-developer .PHONY: update update: update-master update-bitbake update-openembedded update-oe-symlinks update-optware @@ -63,18 +67,20 @@ setup-openembedded openembedded/conf/machine/nslu2.conf: MT/revision 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: [ -e optware/Makefile ] || ( cvs -d :pserver:anonymous@cvs.sf.net:/cvsroot/nslu co -d optware unslung ) [ -e optware/downloads ] || ( cd optware ; ln -s ../downloads . ) -.PHONY: setup-oe-symlinks-developer -setup-oe-symlinks-developer oe-symlinks/packages: - [ -e oe-symlinks/packages ] || ( svn co svn+ssh://${SVN_USER}@svn.berlios.de/svnroot/repos/openslug/trunk/openslug/nslu2-linux oe-symlinks ) - .PHONY: setup-optware-developer -setup-optware-developer optware/Makefile: - [ -e optware/Makefile ] || ( cvs -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co -d optware unslung ) +setup-optware-developer: + [ -e optware ] && ( mv optware optware-user ) + cvs -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co -d optware unslung [ -e optware/downloads ] || ( cd optware ; ln -s ../downloads . ) .PHONY: update-master -- cgit v1.2.3 From 28267edfc5685c5b433df0b7392178702a900185 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 11 Jul 2005 09:32:19 +0000 Subject: Broke some superfluous dependencies --- Makefile | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 7490209719..f4b3139e3f 100644 --- a/Makefile +++ b/Makefile @@ -27,11 +27,11 @@ update: update-master update-bitbake update-openembedded update-oe-symlinks upda clobber: clobber-optware clobber-oe-symlinks clobber-openembedded clobber-bitbake .PHONY: unslung build-unslung -unslung build-unslung: unslung/Makefile downloads bitbake/bin/bitbake openembedded/conf/machine/nslu2.conf oe-symlinks/packages +unslung build-unslung: unslung/Makefile bitbake/bin/bitbake openembedded/conf/machine/nslu2.conf oe-symlinks/packages ( cd unslung ; make ) .PHONY: openslug build-openslug -openslug build-openslug: openslug/Makefile downloads bitbake/bin/bitbake openembedded/conf/machine/nslu2.conf oe-symlinks/packages +openslug build-openslug: openslug/Makefile bitbake/bin/bitbake openembedded/conf/machine/nslu2.conf oe-symlinks/packages ( cd openslug ; make ) .PHONY: optware build-optware @@ -46,12 +46,16 @@ setup-monotone monotone/nslu2-linux.db: ( monotone -d monotone/nslu2-linux.db unset database default-collection ) ( monotone -d monotone/nslu2-linux.db pull monotone.nslu2-linux.org org ) -unslung/Makefile openslug/Makefile MT/revision: monotone/nslu2-linux.db +downloads: + [ -e downloads ] || mkdir -p downloads + +unslung/Makefile openslug/Makefile 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 . ) .PHONY: setup-master -setup-master downloads: setup-monotone unslung/Makefile openslug/Makefile - [ -e downloads ] || mkdir -p downloads +setup-master: setup-monotone unslung/Makefile openslug/Makefile [ -e unslung/downloads ] || ( cd unslung ; ln -s ../downloads . ) [ -e openslug/downloads ] || ( cd openslug ; ln -s ../downloads . ) @@ -60,7 +64,8 @@ setup-bitbake bitbake/bin/bitbake: [ -e bitbake/bin/bitbake ] || ( svn co ${BITBAKE_REVISION} svn://svn.berlios.de/bitbake/trunk/bitbake ) .PHONY: setup-openembedded -setup-openembedded openembedded/conf/machine/nslu2.conf: MT/revision +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 @@ -74,11 +79,13 @@ setup-oe-symlinks-developer: .PHONY: setup-optware setup-optware optware/Makefile: + ${MAKE} downloads [ -e optware/Makefile ] || ( cvs -d :pserver:anonymous@cvs.sf.net:/cvsroot/nslu co -d optware unslung ) [ -e optware/downloads ] || ( cd optware ; ln -s ../downloads . ) .PHONY: setup-optware-developer setup-optware-developer: + ${MAKE} downloads [ -e optware ] && ( mv optware optware-user ) cvs -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co -d optware unslung [ -e optware/downloads ] || ( cd optware ; ln -s ../downloads . ) @@ -108,7 +115,7 @@ update-oe-symlinks: oe-symlinks/packages ( cd oe-symlinks ; svn update ) .PHONY: update-optware -update-optware: optware/Makefile downloads +update-optware: optware/Makefile ( cd optware ; cvs update -d -P ) .PHONY: clobber-bitbake @@ -130,7 +137,7 @@ clobber-optware: # Targets for use by those with write access to the repositories .PHONY: push-master -push-master: monotone/nslu2-linux.db +push-master: MT/revision monotone push .PHONY: push-openembedded -- cgit v1.2.3 From bb37e057dd1f4ccde852d619a179d7e7014938f6 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 11 Jul 2005 19:12:50 +0000 Subject: Made the push targets do an update (and required merge) first --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f4b3139e3f..464ed3f904 100644 --- a/Makefile +++ b/Makefile @@ -137,11 +137,11 @@ clobber-optware: # Targets for use by those with write access to the repositories .PHONY: push-master -push-master: MT/revision +push-master: update-master monotone push .PHONY: push-openembedded -push-openembedded: openembedded/conf/machine/nslu2.conf +push-openembedded: update-openembedded ( cd openembedded ; monotone push ) # Targets for use by core team members only -- cgit v1.2.3 From aa65bc56715198981fbae3d85b6498da95c79301 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 11 Jul 2005 19:54:07 +0000 Subject: Added the developer push target --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 464ed3f904..5798604670 100644 --- a/Makefile +++ b/Makefile @@ -136,6 +136,9 @@ clobber-optware: # Targets for use by those with write access to the repositories +.PHONY: push +push: push-master push-openembedded + .PHONY: push-master push-master: update-master monotone push -- cgit v1.2.3 From 2a45b8e3189c9d18afeffb7c09a7e58645a8b942 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Thu, 14 Jul 2005 16:31:17 +0000 Subject: Added unset MFLAGS and unset MAKEFLAGS to the generation of setup-env in openslug/Makefile --- openslug/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openslug/Makefile b/openslug/Makefile index a0c0ec1e72..e037ddf63c 100644 --- a/openslug/Makefile +++ b/openslug/Makefile @@ -30,6 +30,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 OpenSlug development.' >> setup-env -- cgit v1.2.3 From 69742294e28c27ddc29052c591fe6272284e4065 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 15 Jul 2005 07:46:59 +0000 Subject: Updated for monotone 0.20 --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 5798604670..293c44dc8d 100644 --- a/Makefile +++ b/Makefile @@ -41,10 +41,10 @@ optware build-optware: optware/Makefile .PHONY: setup-monotone setup-monotone monotone/nslu2-linux.db: [ -e monotone/nslu2-linux.db ] || ( mkdir -p monotone && monotone -d monotone/nslu2-linux.db db init ) - ( monotone -d monotone/nslu2-linux.db pull monotone.vanille.de org.openembedded ) + ( monotone -d monotone/nslu2-linux.db pull monotone.vanille.de org.openembedded.* ) ( monotone -d monotone/nslu2-linux.db unset database default-server ) - ( monotone -d monotone/nslu2-linux.db unset database default-collection ) - ( monotone -d monotone/nslu2-linux.db pull monotone.nslu2-linux.org org ) + ( monotone -d monotone/nslu2-linux.db unset database default-include-pattern ) + ( monotone -d monotone/nslu2-linux.db pull monotone.nslu2-linux.org org.openembedded.* org.nslu2-linux.* ) downloads: [ -e downloads ] || mkdir -p downloads @@ -159,7 +159,7 @@ upload-openslug-cross: openslug/Makefile .PHONY: import-openembedded import-openembedded: openembedded/conf/machine/nslu2.conf - monotone pull monotone.vanille.de org.openembedded + monotone pull monotone.vanille.de org.openembedded.* if [ `monotone automate heads org.openembedded.dev | wc -l` != "1" ] ; then \ monotone merge -b org.openembedded.dev ; \ fi @@ -180,7 +180,7 @@ propagate-to-oe: .PHONY: export-openembedded export-openembedded: openembedded/conf/machine/nslu2.conf - monotone push monotone.vanille.de org.openembedded + monotone push monotone.vanille.de org.openembedded.* .PHONY: publish-openembedded publish-openembedded: import-openembedded propagate-from-oe update-openembedded \ -- cgit v1.2.3 From 8cce149673e503259d9bf0b505ed10c65849fa92 Mon Sep 17 00:00:00 2001 From: Derek Young Date: Mon, 18 Jul 2005 10:01:25 +0000 Subject: Add misc other developer related targets --- Makefile | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Makefile b/Makefile index 293c44dc8d..a952875bc6 100644 --- a/Makefile +++ b/Makefile @@ -90,6 +90,18 @@ setup-optware-developer: cvs -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co -d optware unslung [ -e optware/downloads ] || ( cd optware ; ln -s ../downloads . ) +.PHONY: setup-slugimage-developer +setup-slugimage-developer: + cvs -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co slugimage + +.PHONY: setup-upslug-developer +setup-upslug-developer: + cvs -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co upslug + +.PHONY: setup-sluggo-developer +setup-sluggo-developer: + cvs -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co sluggo + .PHONY: update-master update-master: MT/revision monotone pull -- cgit v1.2.3 From 553637753b10aceac657087f04ce79db7a0b57b0 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 19 Jul 2005 18:35:27 +0000 Subject: Added the setup-apex-developer target --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index a952875bc6..be1786f0be 100644 --- a/Makefile +++ b/Makefile @@ -102,6 +102,10 @@ setup-upslug-developer: setup-sluggo-developer: cvs -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co sluggo +.PHONY: setup-apex-developer +setup-apex-developer: + cvs -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co apex + .PHONY: update-master update-master: MT/revision monotone pull -- cgit v1.2.3 From 1c4141b07e17a72af33f82c3ca99c59de8894b33 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 19 Jul 2005 18:43:09 +0000 Subject: Added the build-apex target --- Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Makefile b/Makefile index be1786f0be..bee271d0d7 100644 --- a/Makefile +++ b/Makefile @@ -38,6 +38,10 @@ openslug build-openslug: openslug/Makefile bitbake/bin/bitbake openembedded/conf optware build-optware: optware/Makefile ( cd optware ; make ) +.PHONY: apex build-apex +apex build-apex: apex/Makefile + ( cd apex ; make nslu2_config ; make oldconfig ; make CROSS_COMPILE=../openslug/tmp/cross/bin/armeb-linux- ) + .PHONY: setup-monotone setup-monotone monotone/nslu2-linux.db: [ -e monotone/nslu2-linux.db ] || ( mkdir -p monotone && monotone -d monotone/nslu2-linux.db db init ) @@ -102,6 +106,10 @@ setup-upslug-developer: setup-sluggo-developer: cvs -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co sluggo +.PHONY: setup-apex +setup-apex apex/Makefile: + cvs -d :pserver:anonymous@cvs.sf.net:/cvsroot/nslu co apex + .PHONY: setup-apex-developer setup-apex-developer: cvs -d :ext:${CVS_USER}@cvs.sf.net:/cvsroot/nslu co apex -- cgit v1.2.3 From eb61b33bf6fffddf7972e99ac51df1dff3cbd4f7 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 19 Jul 2005 23:30:26 +0000 Subject: Removed build-apex target, as it is now in OpenEmbedded instead. --- Makefile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Makefile b/Makefile index bee271d0d7..f9d7946f0f 100644 --- a/Makefile +++ b/Makefile @@ -38,10 +38,6 @@ openslug build-openslug: openslug/Makefile bitbake/bin/bitbake openembedded/conf optware build-optware: optware/Makefile ( cd optware ; make ) -.PHONY: apex build-apex -apex build-apex: apex/Makefile - ( cd apex ; make nslu2_config ; make oldconfig ; make CROSS_COMPILE=../openslug/tmp/cross/bin/armeb-linux- ) - .PHONY: setup-monotone setup-monotone monotone/nslu2-linux.db: [ -e monotone/nslu2-linux.db ] || ( mkdir -p monotone && monotone -d monotone/nslu2-linux.db db init ) -- cgit v1.2.3 From 1aaf58e549fa73565afd4f9fc86b1a288d0139c4 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 22 Jul 2005 05:25:03 +0000 Subject: Migrated bitbake from the unstable and three-day-downtime berlios.de SVN to our well-maintained nslu2-linux.org monotone repository --- Makefile | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index f9d7946f0f..13c1fb5e38 100644 --- a/Makefile +++ b/Makefile @@ -5,9 +5,6 @@ SVN_USER ?= ${USER} CVS_USER ?= ${USER} -# Fetch this revision of BitBake. Unset this to fetch bleeding edge. -BITBAKE_REVISION = -r 269 - .PHONY: all all: update build @@ -61,7 +58,8 @@ setup-master: setup-monotone unslung/Makefile openslug/Makefile .PHONY: setup-bitbake setup-bitbake bitbake/bin/bitbake: - [ -e bitbake/bin/bitbake ] || ( svn co ${BITBAKE_REVISION} svn://svn.berlios.de/bitbake/trunk/bitbake ) + ${MAKE} MT/revision + [ -e bitbake/bin/bitbake ] || monotone co -b org.nslu2-linux.bitbake bitbake .PHONY: setup-openembedded setup-openembedded openembedded/conf/machine/nslu2.conf: @@ -113,6 +111,9 @@ setup-apex-developer: .PHONY: update-master update-master: MT/revision monotone pull + if [ `monotone automate heads org.nslu2-linux.dev | wc -l` != "1" ] ; then \ + monotone merge -b org.nslu2-linux.dev ; \ + fi monotone update if [ `monotone automate heads org.nslu2-linux.dev | wc -l` != "1" ] ; then \ monotone merge -b org.nslu2-linux.dev ; \ @@ -120,7 +121,14 @@ update-master: MT/revision .PHONY: update-bitbake update-bitbake: bitbake/bin/bitbake - ( cd bitbake ; svn ${BITBAKE_REVISION} update ) + monotone pull + if [ `monotone automate heads org.nslu2-linux.bitbake | wc -l` != "1" ] ; then \ + monotone merge -b org.nslu2-linux.bitbake ; \ + fi + ( cd bitbake ; monotone update ) + if [ `monotone automate heads org.nslu2-linux.bitbake | wc -l` != "1" ] ; then \ + monotone merge -b org.nslu2-linux.bitbake ; \ + fi .PHONY: update-openembedded update-openembedded: openembedded/conf/machine/nslu2.conf @@ -129,6 +137,9 @@ update-openembedded: openembedded/conf/machine/nslu2.conf monotone merge -b org.openembedded.nslu2-linux ; \ fi ( cd openembedded ; monotone update ) + if [ `monotone automate heads org.openembedded.nslu2-linux | wc -l` != "1" ] ; then \ + monotone merge -b org.openembedded.nslu2-linux ; \ + fi .PHONY: update-oe-symlinks update-oe-symlinks: oe-symlinks/packages -- cgit v1.2.3 From cb97f2a5f236414f4a6257171cd2f09aa4472ac5 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 25 Jul 2005 22:23:45 +0000 Subject: Changed 'source' to '.' in the OpenSlug makefile --- openslug/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openslug/Makefile b/openslug/Makefile index e037ddf63c..2d8bf76463 100644 --- a/openslug/Makefile +++ b/openslug/Makefile @@ -2,7 +2,7 @@ # Licensed under the GPL v2 or later openslug-firmware: setup-env conf/local.conf - ( source setup-env ; bitbake openslug-packages ) + ( . setup-env ; bitbake openslug-packages ) # This does the same thing but with a clean environment # The HOME setting prevents user environment settings @@ -11,7 +11,7 @@ openslug-firmware: setup-env conf/local.conf # .cache in the home directory. openslug-firmware-safe: setup-env conf/local.conf env -i CCACHE_DISABLE=1 CCACHE_DIR="`pwd`/tmp/ccache" HOME=/dev/null \ - sh -c 'source setup-env; bitbake openslug-packages' + sh -c '. setup-env; bitbake openslug-packages' setup-env: [ -e bitbake ] || ( ln -s ../bitbake . ) -- cgit v1.2.3 From c889b78359d96c4a0c770f653c1e49c964190376 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Tue, 26 Jul 2005 01:59:25 +0000 Subject: Remove the update of oe-symlinks from the update target so that it will run again (this is an intermediate step in the removal of oe-symlinks). --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 13c1fb5e38..f9586cd2af 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ setup: setup-master setup-bitbake setup-openembedded setup-oe-symlinks setup-opt setup-developer: setup-master setup-bitbake setup-openembedded setup-oe-symlinks-developer setup-optware-developer .PHONY: update -update: update-master update-bitbake update-openembedded update-oe-symlinks update-optware +update: update-master update-bitbake update-openembedded update-optware .PHONY: clobber clobber: clobber-optware clobber-oe-symlinks clobber-openembedded clobber-bitbake -- cgit v1.2.3 From 693809b03d2e7367cafa7660af147d839f752fe3 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 26 Jul 2005 06:18:21 +0000 Subject: Removed all traces of oe-symlinks from the master makefiles --- Makefile | 27 +++++---------------------- openslug/Makefile | 7 +++---- unslung/Makefile | 9 +++++---- 3 files changed, 13 insertions(+), 30 deletions(-) diff --git a/Makefile b/Makefile index f9586cd2af..4774d8e1d5 100644 --- 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 2d8bf76463..6a8caf8c92 100644 --- 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 b64453007b..aecf3abe7c 100644 --- 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 'OE