diff options
| -rw-r--r-- | openslug/Makefile | 12 | ||||
| -rw-r--r-- | openslug/conf/local.conf.template | 10 | ||||
| -rw-r--r-- | unslung/Makefile | 21 | ||||
| -rw-r--r-- | unslung/conf/local.conf.template | 10 |
4 files changed, 28 insertions, 25 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. diff --git a/unslung/Makefile b/unslung/Makefile index aecf3abe7c..c46569bee8 100644 --- a/unslung/Makefile +++ b/unslung/Makefile @@ -2,7 +2,7 @@ # Licensed under the GPL v2 or later unslung-firmware: setup-env conf/local.conf - (source setup-env ; bitbake unslung-packages) + . setup-env ; bitbake unslung-packages # This does the same thing but with a clean environment # The HOME setting prevents user environment settings @@ -11,20 +11,19 @@ unslung-firmware: setup-env conf/local.conf # .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' + sh -c '. setup-env; bitbake unslung-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 '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 'PKGDIR=$$OEROOT/openembedded/' >> 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 @@ -41,7 +40,7 @@ clobber: rm -rf tmp unslung-source: - tar zcvf unslung-source.tar.gz --exclude=MT Makefile bitbake conf openembedded + tar zcf unslung-source.tar.gz --exclude=MT Makefile bitbake conf openembedded distclean: clobber rm -f setup-env conf/local.conf bitbake downloads openembedded diff --git a/unslung/conf/local.conf.template b/unslung/conf/local.conf.template index a13923f749..3ec09752f1 100644 --- a/unslung/conf/local.conf.template +++ b/unslung/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. |