diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2005-07-26 06:42:22 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-07-26 06:42:22 +0000 |
| commit | 6d6928a588c05b9a01002505ebc5cfb134c9694d (patch) | |
| tree | 79ef5a3bfd74aa7381be703d5fa548d7725d4644 /openslug | |
| parent | 693809b03d2e7367cafa7660af147d839f752fe3 (diff) | |
Better fix for PKGDIR
Diffstat (limited to 'openslug')
| -rw-r--r-- | openslug/Makefile | 12 | ||||
| -rw-r--r-- | openslug/conf/local.conf.template | 10 |
2 files changed, 12 insertions, 10 deletions
diff --git a/openslug/Makefile b/openslug/Makefile index 6a8caf8c92..d6fc3dd8dd 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 - ( . 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 @@ -14,13 +14,13 @@ openslug-firmware-safe: setup-env conf/local.conf sh -c '. setup-env; bitbake openslug-packages' setup-env: - [ -e bitbake ] || ( ln -s ../bitbake . ) - [ -e downloads ] || ( ln -s ../downloads . ) - [ -e openembedded ] || ( ln -s ../openembedded . ) + [ -e bitbake ] || ln -s ../bitbake . + [ -e downloads ] || ln -s ../downloads . + [ -e openembedded ] || ln -s ../openembedded . echo 'OEROOT='`pwd` > setup-env echo 'OESYS=$$OEROOT/bitbake/' >> setup-env - echo 'export PKGDIR=$$OEROOT/openembedded/' >> setup-env echo 'OEBUILD=$$OEROOT' >> setup-env + echo 'PKGDIR=$$OEROOT/openembedded/' >> 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 @@ -41,7 +41,7 @@ clobber: rm -rf tmp openslug-source: - tar zcvf openslug-source.tar.gz --exclude=MT Makefile bitbake conf openembedded + tar zcf openslug-source.tar.gz --exclude=MT Makefile bitbake conf openembedded distclean: clobber rm -rf setup-env conf/local.conf bitbake downloads openembedded diff --git a/openslug/conf/local.conf.template b/openslug/conf/local.conf.template index f5095c54c5..9139503e6d 100644 --- a/openslug/conf/local.conf.template +++ b/openslug/conf/local.conf.template @@ -3,10 +3,12 @@ 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" +# BBFILES defines the list of .bb files to consider when looking for a +# way to build a package. This gets overridden in the openslug and +# unslung .conf files. PKGDIR defines where to find the 'packages' +# directory containing the package sub-directories. +PKGDIR := "${OEROOT}/openembedded" +BBFILES := "${PKGDIR}/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. |