summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <walsimou@walsimou.com>2009-09-26 11:34:52 +0200
committerAbdoulaye Walsimou Gaye <walsimou@walsimou.com>2009-09-26 11:34:52 +0200
commitbf1f7611e22909b47e0df65a3030aa5959686ce3 (patch)
treee2a80d2e7fe630ef548a67d2b6f9a8982c4a5370
parent97d9b22ecdb283dc7bf70b9a53a837a0febf7b7f (diff)
parenta2db5ce0928a1b8faeaba7a382491c7d7f6f3ffd (diff)
downloadembtoolkit-bf1f7611e22909b47e0df65a3030aa5959686ce3.tar.gz
embtoolkit-bf1f7611e22909b47e0df65a3030aa5959686ce3.tar.bz2
embtoolkit-bf1f7611e22909b47e0df65a3030aa5959686ce3.tar.xz
Merge branch 'master' into embtk-uclibc
-rw-r--r--Kconfig18
-rw-r--r--Makefile20
-rw-r--r--mk/initialpath.mk7
3 files changed, 38 insertions, 7 deletions
diff --git a/Kconfig b/Kconfig
index f926924..c9baf27 100644
--- a/Kconfig
+++ b/Kconfig
@@ -88,5 +88,23 @@ menu "Embtoolkit build options"
config EMBTK_NUMBER_BUILD_JOBS
int "Number of parallel build jobs"
default 1
+
+config EMBTK_DOWNLOAD_DIR
+ string "Download directory"
+ default "$(EMBTK_ROOT)/dl"
+ help
+ Directory where downloaded packages are stored.
+
+ You must specify here an absolute directory location, if you choose to
+ use an alternate location.
+
+ Note:
+ If you want to preserve downloaded packages from being removed when
+ you do make distclean, you must specify an alternate location.
+ If you leave this option in the default location under Embtoolkit,
+ $(EMBTK_ROOT)/dl, then make distclean will remove downloaded packages.
+ But keep in mind that only a make distclean command will remove
+ downloaded packages in the default location under EmbToolkit,
+ not make clean.
endmenu
diff --git a/Makefile b/Makefile
index 70c3e24..6eb9965 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
VERSION = 0
PATCHLEVEL = 1
SUBLEVEL = 0
-EXTRAVERSION = -rc2
+EXTRAVERSION = -rc3
KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION
@@ -94,9 +94,21 @@ clean: rmallpath
$(Q)rm -rf .config kbuild.log .fakeroot*
startbuild:
- $(call EMBTK_GENERIC_MESSAGE,"Starting build of selected features ...")
- $(Q)make buildtoolchain host_packages_build symlink_tools \
- rootfs_build successful_build
+ @if [ -e $(GCC3_BUILD_DIR)/.installed ]; then \
+ echo "#################### Embtoolkit Warning ######################"; \
+ echo "# Warning trying to restart all the build while it is already"; \
+ echo "# done. Please use the correct make target !!!"; \
+ echo "##############################################################"; \
+ echo; \
+ make -s help; \
+ else \
+ echo "################## Embtoolkit build start ####################"; \
+ echo "# Starting build of selected features.."; \
+ echo "##############################################################"; \
+ echo; \
+ make buildtoolchain host_packages_build symlink_tools; \
+ make rootfs_build successful_build; \
+ fi
include mk/macros.mk
include mk/target-mcu.mk
diff --git a/mk/initialpath.mk b/mk/initialpath.mk
index bab8c4a..a334044 100644
--- a/mk/initialpath.mk
+++ b/mk/initialpath.mk
@@ -29,8 +29,9 @@ TOOLS_BUILD:=$(EMBTK_ROOT)/build/tools_build-$(GNU_TARGET)-$(EMBTK_MCU_FLAG)
PACKAGES_BUILD:=$(EMBTK_ROOT)/build/packages_build-$(GNU_TARGET)-$(EMBTK_MCU_FLAG)
ROOTFS:=$(EMBTK_ROOT)/rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG)
HOSTTOOLS :=$(EMBTK_ROOT)/host-tools-$(EMBTK_MCU_FLAG)
+DOWNLOAD_DIR := $(subst ",,$(strip $(CONFIG_EMBTK_DOWNLOAD_DIR)))
-export SYSROOT TOOLS TOOLS_BUILD PACKAGES_BUILD ROOTFS HOSTTOOLS
+export SYSROOT TOOLS TOOLS_BUILD PACKAGES_BUILD ROOTFS HOSTTOOLS DOWNLOAD_DIR
mkinitialpath:
@mkdir -p $(SYSROOT)
@@ -65,6 +66,6 @@ ifeq ($(CONFIG_EMBTK_HAVE_ROOTFS),y)
endif
rmallpath:
- @rm -Rf build rootfs-* sysroot-* tools-* $(DOWNLOAD_DIR)/eglibc* \
- initramfs-*
+ @rm -Rf build rootfs-* sysroot-* tools-* initramfs-*
+ @rm -Rf $(EMBTK_ROOT)/dl/*