From fc4027a2b4f5a9384e8552b8dd515e53aae9444c Mon Sep 17 00:00:00 2001 From: waldemar brodkorb Date: Tue, 19 Jan 2010 21:13:44 +0100 Subject: fix allmodconfig for foxboard --- mk/build.mk | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'mk/build.mk') diff --git a/mk/build.mk b/mk/build.mk index ec501922e..0b5bd0b20 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -38,10 +38,15 @@ DEFCONFIG= ADK_DEVELSYSTEM=n \ BUSYBOX_FLASH_UNLOCK=n \ BUSYBOX_FLASH_ERASEALL=n \ BUSYBOX_PIE=n \ + BUSYBOX_TASKSET=n \ BUSYBOX_DEBUG=n \ BUSYBOX_NOMMU=n \ BUSYBOX_WERROR=n \ BUSYBOX_STATIC=n \ + BUSYBOX_FEATURE_AIX_LABEL=n \ + BUSYBOX_FEATURE_SUN_LABEL=n \ + BUSYBOX_FEATURE_OSF_LABEL=n \ + BUSYBOX_FEATURE_SGI_LABEL=n \ ADK_KERNEL_RT2X00_DEBUG=n \ ADK_KERNEL_ATH5K_DEBUG=n -- cgit v1.2.3 From ab4199af7fd87bd5ba2a39f561294fd625fbf3dc Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 22 Jan 2010 16:50:55 +0100 Subject: fix newpackage target, translate - to _ --- mk/build.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mk/build.mk') diff --git a/mk/build.mk b/mk/build.mk index 66f49089b..1fa253b11 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -188,7 +188,7 @@ kernelconfig: newpackage: @echo "Creating new package $(PKG)" $(CP) $(TOPDIR)/package/.template $(TOPDIR)/package/$(PKG) - pkg=$$(echo $(PKG)|tr '[:lower:]' '[:upper:]'); \ + pkg=$$(echo $(PKG)|tr '[:lower:]' '[:upper:]'|sed -e "s/-/_/g"); \ $(SED) "s#@UPKG@#$$pkg#" $(TOPDIR)/package/$(PKG)/Makefile $(SED) 's#@PKG@#$(PKG)#' $(TOPDIR)/package/$(PKG)/Makefile $(SED) 's#@VER@#$(VER)#' $(TOPDIR)/package/$(PKG)/Makefile -- cgit v1.2.3 From 5cb78c4c3bcbc05c3f9464b21c52f872ad041cf1 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Fri, 22 Jan 2010 22:36:38 +0100 Subject: improve package name conversion to makefile variable No need to call sed here, as tr already does exactly what we want to, just by extending the expression passed to it. --- mk/build.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mk/build.mk') diff --git a/mk/build.mk b/mk/build.mk index 1fa253b11..20c08b15a 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -188,7 +188,7 @@ kernelconfig: newpackage: @echo "Creating new package $(PKG)" $(CP) $(TOPDIR)/package/.template $(TOPDIR)/package/$(PKG) - pkg=$$(echo $(PKG)|tr '[:lower:]' '[:upper:]'|sed -e "s/-/_/g"); \ + pkg=$$(echo $(PKG)|tr '[:lower:]-' '[:upper:]_'); \ $(SED) "s#@UPKG@#$$pkg#" $(TOPDIR)/package/$(PKG)/Makefile $(SED) 's#@PKG@#$(PKG)#' $(TOPDIR)/package/$(PKG)/Makefile $(SED) 's#@VER@#$(VER)#' $(TOPDIR)/package/$(PKG)/Makefile -- cgit v1.2.3 From 39e9af48da3ef01a9eca53d54ace7545eec39da8 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 28 Jan 2010 19:54:19 +0100 Subject: disable KGDB for bulk builds --- mk/build.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mk/build.mk') diff --git a/mk/build.mk b/mk/build.mk index 20c08b15a..e7d1f0ae0 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -48,7 +48,8 @@ DEFCONFIG= ADK_DEVELSYSTEM=n \ BUSYBOX_FEATURE_OSF_LABEL=n \ BUSYBOX_FEATURE_SGI_LABEL=n \ ADK_KERNEL_RT2X00_DEBUG=n \ - ADK_KERNEL_ATH5K_DEBUG=n + ADK_KERNEL_ATH5K_DEBUG=n \ + ADK_KERNEL_DEBUG_WITH_KGDB=n noconfig_targets:= menuconfig \ _config \ -- cgit v1.2.3 From 5df306b0c9d713021edd9d81ff8f37b5d7f01db5 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 30 Jan 2010 18:35:58 +0100 Subject: use target-libc combination for all builddirs IMPORTANT: do a make distclean before compiling after this commit. The directories for all build and bin directories changed, so that toolchains for different target-libc combinations can coexist. This might be usefule in the future for continous compiling after git commit, without rebuilding the toolchain. Rework busybox rebuild, when config changes. Not optimal, but at least working after this change to the directory structure. --- mk/build.mk | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'mk/build.mk') diff --git a/mk/build.mk b/mk/build.mk index e7d1f0ae0..5c26ea4c9 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -57,10 +57,7 @@ noconfig_targets:= menuconfig \ distclean \ tags -MAKECLEANDIR_SYMBOLS= ADK_TARGET_LIB_UCLIBC \ - ADK_TARGET_LIB_GLIBC \ - ADK_TARGET_LIB_ECLIBC \ - ADK_DEBUG +MAKECLEANDIR_SYMBOLS= ADK_DEBUG MAKECLEAN_SYMBOLS= ADK_TARGET_PACKAGE_IPKG \ ADK_TARGET_PACKAGE_RPM \ @@ -89,11 +86,7 @@ POSTCONFIG= -@ \ "$$what' might be required!"; \ break; \ done; \ - fi; \ - if [ "$$(grep ^BUSYBOX .config|md5sum)" != "$$(grep ^BUSYBOX .config.old|md5sum)" ];then \ - if [ -f build_*/w-busybox*/busybox*/.configure_done ];then \ - rm build_*/w-busybox*/busybox*/.configure_done; \ - fi; \ + if [ -f .busyboxcfg ];then rm .busyboxcfg;fi; \ fi; \ fi @@ -238,14 +231,15 @@ cleandir: rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_PARENT_PFX) \ $(TOOLS_BUILD_DIR) rm -f .menu .tmpconfig.h ${TOPDIR}/package/*/info.mk \ - ${TOPDIR}/package/Depends.mk ${TOPDIR}/prereq.mk + ${TOPDIR}/package/Depends.mk ${TOPDIR}/prereq.mk \ + .busyboxcfg cleantarget: @$(TRACE) cleantarget @$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE) rm -rf $(BUILD_DIR) $(BIN_DIR) $(TARGET_DIR) ${TOPDIR}/.cfg rm -rf $(TOOLCHAIN_BUILD_DIR) $(STAGING_PARENT) all.config .defconfig - rm -f .tmpconfig.h ${TOPDIR}/package/*/info.mk + rm -f .tmpconfig.h ${TOPDIR}/package/*/info.mk .busyboxcfg distclean: @$(TRACE) distclean @@ -254,7 +248,8 @@ distclean: ${TOPDIR}/.cfg* ${TOPDIR}/package/pkglist.d $(TOPDIR)/bulkdir @rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_PARENT_PFX) $(TOOLS_BUILD_DIR) @rm -f .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \ - .menu ${TOPDIR}/package/*/info.mk ${TOPDIR}/package/Depends.mk + .menu ${TOPDIR}/package/*/info.mk ${TOPDIR}/package/Depends.mk \ + .busyboxcfg else # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) -- cgit v1.2.3