diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/conf/site.conf | 2 | ||||
| -rw-r--r-- | common/openembedded.mk (renamed from common/Make.rules) | 30 | ||||
| -rw-r--r-- | common/setup-openembedded (renamed from common/env) | 9 |
3 files changed, 23 insertions, 18 deletions
diff --git a/common/conf/site.conf b/common/conf/site.conf index 45451253e7..f40ae58e3d 100644 --- a/common/conf/site.conf +++ b/common/conf/site.conf @@ -6,7 +6,7 @@ # # Each DISTRO must create a appropriate topdir file containing # (just) the definition of TOPDIR -include topdir.conf +include conf/topdir.conf # These definitions should be the same for every DISTRO - if # a change is necessary make it in the DISTRO auto.conf. The diff --git a/common/Make.rules b/common/openembedded.mk index 1a32b364ba..e826f6e305 100644 --- a/common/Make.rules +++ b/common/openembedded.mk @@ -1,28 +1,27 @@ # Makefile for UcSlugC # Licensed under the GPL v2 or later # -# Define DISTRO and TARGET before including this in Makefile -BUILD_DIRS = downloads home -REQUIRED_DIRS = bitbake openembedded common +BUILD_DIRS = downloads +REQUIRED_DIRS = bitbake openembedded FIRMWARE_DEPS = create-topdir $(BUILD_DIRS) $(REQUIRED_DIRS) # The default rule is to build the firmware in an unprotected environment. -$(DISTRO)-firmware: $(FIRMWARE_DEPS) - . common/env; exec bitbake $(TARGET) +firmware: $(FIRMWARE_DEPS) + . ./setup-openembedded; exec bitbake $${MAKE_TARGET} # This rule clobbers the environment (note that ccache uses '$HOME' by # default, so the cache will end up there). -$(DISTRO)-safe: - env -i HOME="`pwd`/home" PATH="$${PATH}" $(MAKE) $(DISTRO)-firmware +firmware-safe: + env -i HOME="$${HOME}" PATH="$${PATH}" $(MAKE) firmware # topdir.conf is re-created automatically if the directory is # moved - this will cause a full bitbake reparse .PHONY: create-topdir -create-topdir: topdir.conf - . topdir.conf && test "`pwd`" = "$$TOPDIR" || echo "TOPDIR='`pwd`'" >topdir.conf +create-topdir: conf/topdir.conf + . conf/topdir.conf && test "`pwd`" = "$$TOPDIR" || echo "TOPDIR='`pwd`'" > conf/topdir.conf -topdir.conf: +conf/topdir.conf: echo "TOPDIR='`pwd`'" >$@ # rules for directories - if a symlink exists and the target does not @@ -39,19 +38,20 @@ $(REQUIRED_DIRS): clobber: rm -rf tmp -.PHONY: $(DISTRO)-source -$(DISTRO)-source: $(REQUIRED_DIRS) - tar zcf $@.tar.gz --exclude=MT Makefile conf/auto.conf conf/local.conf.sample $(REQUIRED_DIRS:=/.) +.PHONY: source +source: $(REQUIRED_DIRS) + tar zcf $${DISTRO}.tar.gz --exclude=MT Makefile setup-openembedded conf/site.conf conf/auto.conf \ + conf/local.conf.sample $(REQUIRED_DIRS:=/.) # This target probably isn't important any longer, because the -source # target above does the right thing .PHONY: distclean: clobber - rm -rf topdir.conf conf/local.conf common/conf/local.conf $(BUILD_DIRS) + rm -rf conf/topdir.conf conf/local.conf $(BUILD_DIRS) # This target is mainly for testing - it is intended to put the disto directory # back to its original state, it will destroy a source-tarball system (because # it removes directories from the tarball). .PHONY: really-clean: distclean - rm -rf $(REQUIRED_DIRS) $(DISTRO)-source.tar.gz + rm -rf $(REQUIRED_DIRS) $${DISTRO}-source.tar.gz diff --git a/common/env b/common/setup-openembedded index 9cf757aa30..46151e5774 100644 --- a/common/env +++ b/common/setup-openembedded @@ -6,15 +6,20 @@ # # topdir must exist in the directory and define TOPDIR to # the full path name of the working directory -. ./topdir.conf +. ./conf/topdir.conf test -n "$TOPDIR" -a -d "$TOPDIR" || { echo "environment: TOPDIR not defined" >&2 exit 1 } + +. ./conf/auto.conf +export DISTRO +export MAKE_TARGET + # # the following must match the definitions in common/conf/site.conf export PYTHONPATH="${TOPDIR}/bitbake/lib" -export BBPATH="${TOPDIR}:${TOPDIR}/common:${TOPDIR}/openembedded:${TOPDIR}/bitbake" +export BBPATH="${TOPDIR}:${TOPDIR}/openembedded:${TOPDIR}/bitbake" export PATH="${TOPDIR}/bitbake/bin:${PATH}" export LD_LIBRARY_PATH= export LANG=C |