diff options
| author | Tom King <ka6sox@nslu2-linux.org> | 2005-08-21 00:57:04 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-21 00:57:04 +0000 |
| commit | e56f2097187d89bb84abfda58de9585a5bec4073 (patch) | |
| tree | 5650ed4b45a046c5b4b7dbe0f85ff06262800c2c | |
| parent | 9f1e67ff0e167b03bbb4ef154ad48d2bd477b953 (diff) | |
Added back in -image targets for Master makes for unslung, openembedded, and ucslugc
| -rw-r--r-- | Makefile | 26 | ||||
| -rw-r--r-- | common/openembedded.mk | 12 |
2 files changed, 32 insertions, 6 deletions
@@ -163,8 +163,30 @@ else ucslugc build-ucslugc: endif -.PHONY: optware build-optware -optware build-optware: build-optware-nslu2 build-optware-wl500g + +.PHONY: unslung-image build-unslung-image +ifneq ($(HOST_MACHINE),armeb) +unslung-image build-unslung-image: unslung/.configured bitbake/.configured openembedded/.configured + ( cd unslung ; ${MAKE} image) +else +unslung-image build-unslung-image: +endif + +.PHONY: openslug-image build-openslug-image +ifneq ($(HOST_MACHINE),armeb) +openslug-image build-openslug-image: openslug/.configured bitbake/.configured openembedded/.configured + ( cd openslug ; ${MAKE} image ) +else +openslug build-openslug: +endif + +.PHONY: ucslugc build-ucslugc +ifneq ($(HOST_MACHINE),armeb) +ucslugc-image build-ucslugc-image: ucslugc/.configured bitbake/.configured openembedded/.configured + ( cd ucslugc ; ${MAKE} image) +else +ucslugc build-ucslugc: +endif .PHONY: optware-nslu2 build-optware-nslu2 ifneq ($(HOST_MACHINE),armeb) diff --git a/common/openembedded.mk b/common/openembedded.mk index c4b5d564fe..bf691ce069 100644 --- a/common/openembedded.mk +++ b/common/openembedded.mk @@ -17,14 +17,18 @@ REQUIRED_DIRS = bitbake openembedded FIRMWARE_DEPS = create-topdir $(BUILD_DIRS) $(REQUIRED_DIRS) BITBAKE = bitbake -# The default rule is to build the firmware in an unprotected environment. -firmware: $(FIRMWARE_DEPS) +# The default rule is to build everything in an unprotected environment. +distro: $(FIRMWARE_DEPS) . ./setup-env; exec ${BITBAKE} $(DISTRO)-packages +# The default rule is to build the firmware in an unprotected environment. +image: $(FIRMWARE_DEPS) + . ./setup-env; exec ${BITBAKE} $(DISTRO)-image + # This rule clobbers the environment (note that ccache uses '$HOME' by # default, so the cache will end up there). -firmware-safe: - env -i HOME="$${HOME}" PATH="$${PATH}" $(MAKE) firmware +distro-safe: + env -i HOME="$${HOME}" PATH="$${PATH}" $(MAKE) distro # The default rule is to build the firmware in an unprotected environment. prefetch: $(FIRMWARE_DEPS) |