Pull request for branch for-2011.11/misc-cleanups

deleted file mode 100755
index 4ee02df..0000000
@@ -1,120 +0,0 @@
-#!/bin/sh
-
-echo "**** Autotools Add New Package Wizard ****"
-echo " This script will generate files to add a"
-echo " new package to buildroot."
-echo
-
-echo "What is the name of the package?"
-read PACKAGE_NAME
-
-echo "What is the version number?"
-read VERSION_NUM
-
-echo "What is the web address of the tarball?"
-read DOWNLOAD_LOC
-
-echo "Enter any known dependencies, separated"
-echo "by spaces, or just press enter."
-read EXTRA_DEPS
-
-echo "Enter a description of the package."
-read DESCRIPTION
-
-echo "Does autoreconf need to be run first? (y/n)"
-read ANSWER
-
-if [ "$ANSWER" = "y" ]; then
-	RECONF="YES"
-else
-	RECONF="NO"
-fi
-
-echo "Does it need to be installed to the staging dir?"
-echo "Say yes, if other packages depend on it."
-echo "(If not sure, just say yes. It will only use more"
-echo "space on your hard drive.)"
-read ANSWER
-
-if [ "$ANSWER" = "y" ]; then
-	STAGING="YES"
-else
-	STAGING="NO"
-fi
-
-echo "Enter an additional subdirectory below package/"
-echo "as category, or just press enter."
-read SUB_DIR
-
-if [ -z "$SUB_DIR" ]; then
-	CATEGORY_DIR=package
-else
-	CATEGORY_DIR=package/${SUB_DIR}
-fi
-
-echo "Enter any configure script options."
-read CONFIG_OPTIONS
-
-URL=${DOWNLOAD_LOC%/*}
-TARBALL=${DOWNLOAD_LOC##*/}
-EXTENSION=${TARBALL##*.tar.}
-NAME_UPPER=`echo ${PACKAGE_NAME} | tr a-z- A-Z_`
-PACKAGE_DIR=`dirname $0`/../${CATEGORY_DIR}/${PACKAGE_NAME}
-
-mkdir -p ${PACKAGE_DIR}
-
-sed -e 's/ *$//g' > ${PACKAGE_DIR}/${PACKAGE_NAME}.mk <<EOF
-#############################################################
-#
-# ${PACKAGE_NAME}
-#
-#############################################################
-${NAME_UPPER}_VERSION = ${VERSION_NUM}
-${NAME_UPPER}_SOURCE = ${PACKAGE_NAME}-\$(${NAME_UPPER}_VERSION).tar.${EXTENSION}
-${NAME_UPPER}_SITE = ${URL}
-${NAME_UPPER}_AUTORECONF = ${RECONF}
-${NAME_UPPER}_INSTALL_STAGING = ${STAGING}
-${NAME_UPPER}_INSTALL_TARGET = YES
-
-${NAME_UPPER}_CONF_OPT = ${CONFIG_OPTIONS}
-
-${NAME_UPPER}_DEPENDENCIES = uclibc ${EXTRA_DEPS}
-
-\$(eval \$(call AUTOTARGETS,${CATEGORY_DIR},${PACKAGE_NAME}))
-EOF
-
-cat > ${PACKAGE_DIR}/Config.in <<EOF
-config BR2_PACKAGE_${NAME_UPPER}
-	bool "${PACKAGE_NAME}"
-	help
-	  ${DESCRIPTION}
-
-	  ${URL}
-EOF
-
-echo
-echo "**** Manual steps to integrate your new package ****"
-echo
-
-echo "Add the following line to ${CATEGORY_DIR}/Config.in"
-echo "in an appropriate location:"
-echo "source \"${CATEGORY_DIR}/${PACKAGE_NAME}/Config.in\""
-
-if [ -n "$SUB_DIR" ]; then
-	echo
-	echo "Additionally add the following line to package/Config.in"
-	echo "in an appropriate location:"
-	echo "source \"${CATEGORY_DIR}/Config.in\""
-fi
-
-if [ -n "$EXTRA_DEPS" ]; then
-	echo
-	echo "You need to add \"depends on\" and/or \"select\" lines"
-	echo "to ${CATEGORY_DIR}/${PACKAGE_NAME}/Config.in"
-	echo "corresponding to the \"${NAME_UPPER}_DEPENDENCIES\" line"
-	echo "in ${CATEGORY_DIR}/${PACKAGE_NAME}/${PACKAGE_NAME}.mk"
-fi
-
-echo
-echo "After that run \"make menuconfig\", select your new package"
-echo "and run \"make\" to build \"${PACKAGE_NAME}\"."

82 lines not on this page · raw message

77 lines not on this page · raw message

index 38d8268..cef2ec7 100755
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Generates a small Makefile used in the root of the output
 # directory, to allow make to be started from there.
-# The Makefile also allow for more convinient build of external modules
+# The Makefile also allow for more convenient build of external modules
 
 # Usage
 # $1 - Kernel src directory

index 9ed46fc..f29295f 100644
@@ -37,7 +37,7 @@ DATE:=$(shell date +%Y%m%d)
 
 # Compute the full local version string so packages can use it as-is
 # Need to export it, so it can be got from environment in children (eg. mconf)
-export BR2_VERSION_FULL:=$(BR2_VERSION)$(shell $(TOPDIR)/scripts/setlocalversion)
+export BR2_VERSION_FULL:=$(BR2_VERSION)$(shell $(TOPDIR)/support/scripts/setlocalversion)
 
 noconfig_targets:=menuconfig nconfig gconfig xconfig config oldconfig randconfig \
 	defconfig %_defconfig savedefconfig allyesconfig allnoconfig silentoldconfig release \

@@ -425,7 +425,7 @@ erase-fakeroots:
 
 target-finalize:
 ifeq ($(BR2_HAVE_DEVFILES),y)
-	( scripts/copy.sh $(STAGING_DIR) $(TARGET_DIR) )
+	( support/scripts/copy.sh $(STAGING_DIR) $(TARGET_DIR) )
 else
 	rm -rf $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/lib/pkgconfig $(TARGET_DIR)/usr/share/aclocal
 	find $(TARGET_DIR)/lib \( -name '*.a' -o -name '*.la' \) -print0 | xargs -0 rm -f

@@ -607,7 +607,7 @@ endif # ifeq ($(BR2_HAVE_DOT_CONFIG),y)
 # output directory.
 outputmakefile:
 ifeq ($(NEED_WRAPPER),y)
-	$(Q)$(TOPDIR)/scripts/mkmakefile $(TOPDIR) $(O)
+	$(Q)$(TOPDIR)/support/scripts/mkmakefile $(TOPDIR) $(O)
 endif
 
 clean:

similarity index 100%
rename from scripts/build-ext3-img
rename to support/scripts/build-ext3-img

similarity index 100%
rename from scripts/copy.sh
rename to support/scripts/copy.sh

similarity index 100%
rename from scripts/graph-depends
rename to support/scripts/graph-depends

similarity index 100%
rename from scripts/mkmakefile
rename to support/scripts/mkmakefile

similarity index 100%
rename from scripts/pkg-stats
rename to support/scripts/pkg-stats

similarity index 100%
rename from scripts/setlocalversion
rename to support/scripts/setlocalversion

index 46ab861..d502d21 100644
@@ -151,11 +151,11 @@ define LIBTOOL_PATCH_HOOK
 			ltmain_version=`sed -n '/^[ 	]*VERSION=/{s/^[ 	]*VERSION=//;p;q;}' $$$$i | \
 			sed -e 's/\([0-9].[0-9]*\).*/\1/' -e 's/\"//'`; \
 			if test $$$${ltmain_version} = '1.5'; then \
-				toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v1.5.patch; \
+				toolchain/patch-kernel.sh $$$${i%/*} support/libtool buildroot-libtool-v1.5.patch; \
 			elif test $$$${ltmain_version} = "2.2"; then\
-				toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v2.2.patch; \
+				toolchain/patch-kernel.sh $$$${i%/*} support/libtool buildroot-libtool-v2.2.patch; \
 			elif test $$$${ltmain_version} = "2.4"; then\
-				toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v2.4.patch; \
+				toolchain/patch-kernel.sh $$$${i%/*} support/libtool buildroot-libtool-v2.4.patch; \
 			fi \
 		done \
 	fi

similarity index 100%
rename from package/buildroot-libtool-v1.5.patch
rename to support/libtool/buildroot-libtool-v1.5.patch

similarity index 100%
rename from package/buildroot-libtool-v2.2.patch
rename to support/libtool/buildroot-libtool-v2.2.patch

similarity index 100%
rename from package/buildroot-libtool-v2.4.patch
rename to support/libtool/buildroot-libtool-v2.4.patch

index 776bdef..202995a 100644
@@ -52,7 +52,7 @@ endef
 
 ifneq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR)),)
 define UBOOT_APPLY_CUSTOM_PATCHES
-	toolchain/patch-kernel.sh $(@D) $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) \
+	support/scripts/apply-patches.sh $(@D) $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) \
 		uboot-$(UBOOT_VERSION)-\*.patch
 endef
 

index 6662f7b..d289b28 100644
@@ -100,11 +100,11 @@ LINUX_POST_DOWNLOAD_HOOKS += LINUX_DOWNLOAD_PATCHES
 define LINUX_APPLY_PATCHES
 	for p in $(LINUX_PATCHES) ; do \
 		if echo $$p | grep -q -E "^ftp://|^http://" ; then \
-			toolchain/patch-kernel.sh $(@D) $(DL_DIR) `basename $$p` ; \
+			support/scripts/apply-patches.sh $(@D) $(DL_DIR) `basename $$p` ; \
 		elif test -d $$p ; then \
-			toolchain/patch-kernel.sh $(@D) $$p linux-\*.patch ; \
+			support/scripts/apply-patches.sh $(@D) $$p linux-\*.patch ; \
 		else \
-			toolchain/patch-kernel.sh $(@D) `dirname $$p` `basename $$p` ; \
+			support/scripts/apply-patches.sh $(@D) `dirname $$p` `basename $$p` ; \
 		fi \
 	done
 endef

index d502d21..95e38ef 100644
@@ -151,11 +151,11 @@ define LIBTOOL_PATCH_HOOK
 			ltmain_version=`sed -n '/^[ 	]*VERSION=/{s/^[ 	]*VERSION=//;p;q;}' $$$$i | \
 			sed -e 's/\([0-9].[0-9]*\).*/\1/' -e 's/\"//'`; \
 			if test $$$${ltmain_version} = '1.5'; then \
-				toolchain/patch-kernel.sh $$$${i%/*} support/libtool buildroot-libtool-v1.5.patch; \
+				support/scripts/apply-patches.sh $$$${i%/*} support/libtool buildroot-libtool-v1.5.patch; \
 			elif test $$$${ltmain_version} = "2.2"; then\
-				toolchain/patch-kernel.sh $$$${i%/*} support/libtool buildroot-libtool-v2.2.patch; \
+				support/scripts/apply-patches.sh $$$${i%/*} support/libtool buildroot-libtool-v2.2.patch; \
 			elif test $$$${ltmain_version} = "2.4"; then\
-				toolchain/patch-kernel.sh $$$${i%/*} support/libtool buildroot-libtool-v2.4.patch; \
+				support/scripts/apply-patches.sh $$$${i%/*} support/libtool buildroot-libtool-v2.4.patch; \
 			fi \
 		done \
 	fi

@@ -176,11 +176,11 @@ define AUTORECONF_HOOK
 		for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \
 			ltmain_version=`sed -n '/^[ 	]*VERSION=/{s/^[ 	]*VERSION=//;p;q;}' $$$$i | sed 's/\([0-9].[0-9]*\).*/\1/'`; \
 			if test $$$${ltmain_version} = "1.5"; then \
-				toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v1.5.patch; \
+				support/scripts/apply-patches.sh $$$${i%/*} package buildroot-libtool-v1.5.patch; \
 			elif test $$$${ltmain_version} = "2.2"; then\
-				toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v2.2.patch; \
+				support/scripts/apply-patches.sh $$$${i%/*} package buildroot-libtool-v2.2.patch; \
 			elif test $$$${ltmain_version} = "2.4"; then\
-				toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v2.4.patch; \
+				support/scripts/apply-patches.sh $$$${i%/*} package buildroot-libtool-v2.4.patch; \
 			fi \
 		done \
 	fi

index 868bf28..0751144 100644
@@ -259,15 +259,15 @@ $(BUILD_DIR)/%/.stamp_extracted:
 $(BUILD_DIR)/%/.stamp_patched: NAMEVER = $(RAWNAME)-$($(PKG)_VERSION)
 $(BUILD_DIR)/%/.stamp_patched:
 	@$(call MESSAGE,"Patching $($(PKG)_DIR_PREFIX)/$(RAWNAME)")
-	$(if $($(PKG)_PATCH),toolchain/patch-kernel.sh $(@D) $(DL_DIR) $($(PKG)_PATCH))
+	$(if $($(PKG)_PATCH),support/scripts/apply-patches.sh $(@D) $(DL_DIR) $($(PKG)_PATCH))
 	$(Q)( \
 	if test -d $($(PKG)_DIR_PREFIX)/$(RAWNAME); then \
 	  if test "$(wildcard $($(PKG)_DIR_PREFIX)/$(RAWNAME)/$(NAMEVER)*.patch*)"; then \
-	    toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME) $(NAMEVER)\*.patch $(NAMEVER)\*.patch.$(ARCH) || exit 1; \
+	    support/scripts/apply-patches.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME) $(NAMEVER)\*.patch $(NAMEVER)\*.patch.$(ARCH) || exit 1; \
 	  else \
-	    toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME) $(RAWNAME)\*.patch $(RAWNAME)\*.patch.$(ARCH) || exit 1; \
+	    support/scripts/apply-patches.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME) $(RAWNAME)\*.patch $(RAWNAME)\*.patch.$(ARCH) || exit 1; \
 	    if test -d $($(PKG)_DIR_PREFIX)/$(RAWNAME)/$(NAMEVER); then \
-	      toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME)/$(NAMEVER) \*.patch \*.patch.$(ARCH) || exit 1; \
+	      support/scripts/apply-patches.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME)/$(NAMEVER) \*.patch \*.patch.$(ARCH) || exit 1; \
 	    fi; \
 	  fi; \
 	fi; \

index 2705bac..1a90b10 100644
@@ -11,7 +11,7 @@ ARGUS_DEPENDENCIES=libpcap
 
 define ARGUS_DEBIAN_PATCH_APPLY
 	if [ -d $(@D)/debian/patches ]; then \
-		toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*.patch; \
+		support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*.patch; \
 	fi
 endef
 

index 169cdb3..3b9f2e0 100644
@@ -69,7 +69,7 @@ $(DL_DIR)/$(CUPS_SOURCE):
 
 $(CUPS_DIR)/.unpacked: $(DL_DIR)/$(CUPS_SOURCE)
 	$(CUPS_CAT) $(DL_DIR)/$(CUPS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(CUPS_DIR) package/cups/ \*.patch
+	support/scripts/apply-patches.sh $(CUPS_DIR) package/cups/ \*.patch
 	$(CONFIG_UPDATE) $(CUPS_DIR)
 	touch $@
 

index 023e93b..8d56a21 100644
@@ -37,7 +37,7 @@ define CVS_DEBIAN_PATCHES
 		 do $(SED) 's,^\+\+\+ .*cvs-$(CVS_VERSION)/,+++ cvs-$(CVS_VERSION)/,' $$i; \
 		 done; \
 		); \
-		toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*; \
+		support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*; \
 	fi
 endef
 endif

index e532aff..2942449 100644
@@ -18,7 +18,7 @@ fis-source: $(DL_DIR)/$(FIS_SOURCE)
 $(FIS_DIR)/.unpacked: $(DL_DIR)/$(FIS_SOURCE)
 	mkdir -p $(FIS_DIR)
 	cp -f $(DL_DIR)/$(FIS_SOURCE) $(FIS_DIR)
-	toolchain/patch-kernel.sh $(FIS_DIR) package/fis \*.patch
+	support/scripts/apply-patches.sh $(FIS_DIR) package/fis \*.patch
 	touch $@
 
 $(FIS_DIR)/$(FIS_BINARY): $(FIS_DIR)/.unpacked

index 2b308c8..332a2ca 100644
@@ -24,7 +24,7 @@ gettext-source: $(DL_DIR)/$(GETTEXT_SOURCE)
 
 $(GETTEXT_DIR)/.unpacked: $(DL_DIR)/$(GETTEXT_SOURCE)
 	$(GETTEXT_CAT) $(DL_DIR)/$(GETTEXT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(GETTEXT_DIR) package/gettext/ gettext\*.patch
+	support/scripts/apply-patches.sh $(GETTEXT_DIR) package/gettext/ gettext\*.patch
 	$(CONFIG_UPDATE) $(@D)
 	$(CONFIG_UPDATE) $(GETTEXT_DIR)/build-aux
 	touch $@

index daf0755..0c5b523 100644
@@ -15,7 +15,7 @@ INPUT_TOOLS_TARGETS_$(BR2_PACKAGE_INPUT_TOOLS_JSTEST)      += jstest
 
 define INPUT_TOOLS_DEBIAN_PATCHES
 	if [ -d $(@D)/debian/patches ]; then \
-		toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*.patch; \
+		support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*.patch; \
 	fi
 endef
 

index 415745b..565a259 100644
@@ -18,7 +18,7 @@ define LIBEXOSIP2_DEBIAN_PATCHES
 		 do $(SED) 's,^\+\+\+ .*cvs-$(LIBEXOSIP2_VERSION)/,+++ cvs-$(LIBEXOSIP2_VERSION)/,' $$i; \
 		 done; \
 		); \
-		toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*; \
+		support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*; \
 	fi
 endef
 endif

index be4531e..f9872b6 100644
@@ -139,7 +139,7 @@ HOST_LIBGTK2_CONF_OPT = \
 		--disable-debug
 
 define HOST_LIBGTK2_PATCH_REDUCE_DEPENDENCIES_HOOK
- toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME) host-*.patch
+ support/scripts/apply-patches.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME) host-*.patch
 endef
 
 HOST_LIBGTK2_POST_PATCH_HOOKS += HOST_LIBGTK2_PATCH_REDUCE_DEPENDENCIES_HOOK

index aa15332..da3f9a2 100644
@@ -16,7 +16,7 @@ define LIBOSIP2_DEBIAN_PATCHES
 		 do $(SED) 's,^\+\+\+ .*cvs-$(LIBOSIP2_VERSION)/,+++ cvs-$(LIBOSIP2_VERSION)/,' $$i; \
 		 done; \
 		); \
-		toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*; \
+		support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*; \
 	fi
 endef
 endif

index 01a8b5f..6d3743a 100644
@@ -10,7 +10,7 @@ MII_DIAG_SITE    = $(BR2_DEBIAN_MIRROR)/debian/pool/main/m/mii-diag
 
 define MII_DIAG_DEBIAN_PATCHES
 	if [ -d $(@D)/debian/patches ]; then \
-		toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*.patch; \
+		support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*.patch; \
 	fi
 endef
 

index d021aef..886768c 100644
@@ -16,7 +16,7 @@ MUTT_AUTORECONF=YES
 
 define MUTT_APPLY_DEBIAN_PATCHES
         if [ -d $(@D)/debian/patches ]; then \
-                toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*.patch; \
+                support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*.patch; \
         fi
 endef
 

index 311c8b2..dde8f9f 100644
@@ -22,7 +22,7 @@ $(NETKITBASE_DIR)/.unpacked: $(DL_DIR)/$(NETKITBASE_SOURCE)
 	$(SED) "s/main()/main(void)/;" $(NETKITBASE_DIR)/configure
 	# don't try to run cross compiled binaries while configuring things
 	$(SED) "s~./__conftest~#./__conftest~;" $(NETKITBASE_DIR)/configure
-	toolchain/patch-kernel.sh $(NETKITBASE_DIR) package/netkitbase/ netkitbase\*.patch
+	support/scripts/apply-patches.sh $(NETKITBASE_DIR) package/netkitbase/ netkitbase\*.patch
 	touch $(NETKITBASE_DIR)/.unpacked
 
 $(NETKITBASE_DIR)/.configured: $(NETKITBASE_DIR)/.unpacked

index afa3bc4..e9f40ca 100644
@@ -23,7 +23,7 @@ $(NETKITTELNET_DIR)/.unpacked: $(DL_DIR)/$(NETKITTELNET_SOURCE)
 	# Disable termcap support
 	$(SED) "s~\(.*termcap\.h.*\)~/* \1 */~;" $(NETKITTELNET_DIR)/telnetd/telnetd.c
 	# don't try to run cross compiled binaries while configuring things
-	toolchain/patch-kernel.sh $(NETKITTELNET_DIR) package/netkittelnet/ netkittelnet\*.patch
+	support/scripts/apply-patches.sh $(NETKITTELNET_DIR) package/netkittelnet/ netkittelnet\*.patch
 	touch $(NETKITTELNET_DIR)/.unpacked
 
 $(NETKITTELNET_DIR)/.configured: $(NETKITTELNET_DIR)/.unpacked

index f24af73..33c8478 100644
@@ -13,7 +13,7 @@ define SETSERIAL_APPLY_DEBIAN_PATCHES
 	if [ -d $(@D)/debian/patches ]; then \
 		touch $(@D)/gorhack.h; \
 		rm $(@D)/debian/patches/01_makefile.dpatch; \
-		toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches *.dpatch; \
+		support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches *.dpatch; \
 	fi
 endef
 

index 81c4943..22ebeaa 100644
@@ -14,7 +14,7 @@ $(DL_DIR)/$(SFDISK_SOURCE):
 
 $(SFDISK_DIR)/.patched: $(DL_DIR)/$(SFDISK_SOURCE)
 	$(SFDISK_CAT) $(DL_DIR)/$(SFDISK_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(SFDISK_DIR) package/sfdisk/ sfdisk.\*.patch
+	support/scripts/apply-patches.sh $(SFDISK_DIR) package/sfdisk/ sfdisk.\*.patch
 	touch $@
 
 

index 11aee2a..e08f048 100644
@@ -15,7 +15,7 @@ endif
 
 define SYSKLOGD_DEBIAN_PATCHES
 	if [ -d $(@D)/debian/patches ]; then \
-		toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*.patch; \
+		support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*.patch; \
 	fi
 endef
 

index adcc1ad..af5ec42 100644
@@ -15,7 +15,7 @@ endif
 
 define SYSVINIT_DEBIAN_PATCHES
 	if [ -d $(@D)/debian/patches ]; then \
-		toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*.patch; \
+		support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*.patch; \
 	fi
 endef
 

index c67aa49..46c87a1 100644
@@ -11,7 +11,7 @@ THTTPD_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/t/thttpd/
 ifneq ($(THTTPD_PATCH),)
 define THTTPD_DEBIAN_PATCHES
 	if [ -d $(@D)/debian/patches ]; then \
-		toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*.patch; \
+		support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*.patch; \
 	fi
 endef
 endif

index eac416b..739849f 100644
@@ -23,7 +23,7 @@ tinyhttpd-source: $(DL_DIR)/$(TINYHTTPD_SOURCE)
 #############################################################
 $(TINYHTTPD_DIR)/.unpacked: $(DL_DIR)/$(TINYHTTPD_SOURCE)
 	$(TINYHTTPD_CAT) $(DL_DIR)/$(TINYHTTPD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(TINYHTTPD_DIR) package/tinyhttpd/ tinyhttpd\*.patch
+	support/scripts/apply-patches.sh $(TINYHTTPD_DIR) package/tinyhttpd/ tinyhttpd\*.patch
 	touch $(TINYHTTPD_DIR)/.unpacked
 
 $(TINYHTTPD_DIR)/$(TINYHTTPD_BINARY): $(TINYHTTPD_DIR)/.unpacked

index 1c4fe6f..006b74c 100644
@@ -15,7 +15,7 @@ $(DL_DIR)/$(TTCP_SOURCE):
 $(TTCP_DIR)/.unpacked: $(DL_DIR)/$(TTCP_SOURCE)
 	-mkdir $(TTCP_DIR)
 	cp -af $(DL_DIR)/$(TTCP_SOURCE) $(TTCP_DIR)
-	toolchain/patch-kernel.sh $(TTCP_DIR) package/ttcp/ ttcp-\*.patch
+	support/scripts/apply-patches.sh $(TTCP_DIR) package/ttcp/ ttcp-\*.patch
 	touch $(TTCP_DIR)/.unpacked
 
 $(TTCP_DIR)/.configured: $(TTCP_DIR)/.unpacked

index 539ad51..8355a7f 100644
@@ -18,7 +18,7 @@ uemacs-source: $(DL_DIR)/$(UEMACS_SOURCE)
 
 $(UEMACS_DIR)/.unpacked: $(DL_DIR)/$(UEMACS_SOURCE)
 	$(UEMACS_CAT) $(DL_DIR)/$(UEMACS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(UEMACS_DIR) package/uemacs/ uemacs\*.patch
+	support/scripts/apply-patches.sh $(UEMACS_DIR) package/uemacs/ uemacs\*.patch
 	touch $(UEMACS_DIR)/.unpacked
 
 $(UEMACS_DIR)/$(UEMACS_BINARY): $(UEMACS_DIR)/.unpacked

index c4f23fa..5a8c700 100644
@@ -19,7 +19,7 @@ $(DL_DIR)/$(VPNC_SOURCE):
 
 $(VPNC_DIR)/.unpacked: $(DL_DIR)/$(VPNC_SOURCE)
 	$(VPNC_CAT) $(DL_DIR)/$(VPNC_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(VPNC_DIR) package/vpnc vpnc-$(VPNC_VERSION)\*.patch
+	support/scripts/apply-patches.sh $(VPNC_DIR) package/vpnc vpnc-$(VPNC_VERSION)\*.patch
 	touch $@
 
 $(VPNC_BINARY): $(VPNC_DIR)/.unpacked

index 204b3cb..68db2f7 100644
@@ -24,7 +24,7 @@ xfsprogs-source: $(DL_DIR)/$(XFSPROGS_SOURCE)
 
 $(XFSPROGS_DIR)/.unpacked: $(DL_DIR)/$(XFSPROGS_SOURCE)
 	$(XFSPROGS_CAT) $(DL_DIR)/$(XFSPROGS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(XFSPROGS_DIR) package/xfsprogs/ xfsprogs\*.patch
+	support/scripts/apply-patches.sh $(XFSPROGS_DIR) package/xfsprogs/ xfsprogs\*.patch
 	touch $(XFSPROGS_DIR)/.unpacked
 
 #XFSPROGS_CONFIG_SHARED:=--disable-shared

similarity index 100%
rename from toolchain/patch-kernel.sh
rename to support/scripts/apply-patches.sh

index 94613fa..9232290 100644
@@ -207,12 +207,12 @@ gcc-patched: $(GCC_DIR)/.patched
 $(GCC_DIR)/.patched: $(GCC_DIR)/.unpacked
 	# Apply any files named gcc-*.patch from the source directory to gcc
 ifneq ($(wildcard $(GCC_PATCH_DIR)),)
-	toolchain/patch-kernel.sh $(GCC_DIR) $(GCC_PATCH_DIR) \*.patch $(GCC_PATCH_EXTRA)
+	support/scripts/apply-patches.sh $(GCC_DIR) $(GCC_PATCH_DIR) \*.patch $(GCC_PATCH_EXTRA)
 endif
 
 ifeq ($(ARCH)-$(BR2_GCC_SHARED_LIBGCC),powerpc-y)
 ifneq ($(BR2_SOFT_FLOAT),)
-	toolchain/patch-kernel.sh $(GCC_DIR) toolchain/gcc/$(GCC_VERSION) powerpc-link-with-math-lib.patch.conditional
+	support/scripts/apply-patches.sh $(GCC_DIR) toolchain/gcc/$(GCC_VERSION) powerpc-link-with-math-lib.patch.conditional
 endif
 endif
 	touch $@

index caf3e36..db46b12 100644
@@ -36,7 +36,7 @@ ifeq ($(GDB_VERSION),snapshot)
 	ln -sf $(TOOLCHAIN_DIR)/$(shell tar jtf $(DL_DIR)/$(GDB_SOURCE) | head -1 | cut -d"/" -f1) $(GDB_DIR)
 endif
 ifneq ($(wildcard $(GDB_PATCH_DIR)),)
-	toolchain/patch-kernel.sh $(GDB_DIR) $(GDB_PATCH_DIR) \*.patch $(GDB_PATCH_EXTRA)
+	support/scripts/apply-patches.sh $(GDB_DIR) $(GDB_PATCH_DIR) \*.patch $(GDB_PATCH_EXTRA)
 endif
 	$(CONFIG_UPDATE) $(@D)
 	touch $@

index ce70cab..044fcf9 100644
@@ -55,10 +55,10 @@ $(LINUX_HEADERS_UNPACK_DIR)/.unpacked: $(DL_DIR)/$(LINUX_HEADERS_SOURCE)
 	touch $@
 
 $(LINUX_HEADERS_UNPACK_DIR)/.patched: $(LINUX_HEADERS_UNPACK_DIR)/.unpacked $(LINUX_HEADERS_DEPENDS)
-	toolchain/patch-kernel.sh $(LINUX_HEADERS_UNPACK_DIR) toolchain/kernel-headers \
+	support/scripts/apply-patches.sh $(LINUX_HEADERS_UNPACK_DIR) toolchain/kernel-headers \
 		linux-$(LINUX_HEADERS_VERSION)-\*.patch{,.gz,.bz2}
 ifneq ($(KERNEL_HEADERS_PATCH_DIR),)
-	toolchain/patch-kernel.sh $(LINUX_HEADERS_UNPACK_DIR) $(KERNEL_HEADERS_PATCH_DIR) \
+	support/scripts/apply-patches.sh $(LINUX_HEADERS_UNPACK_DIR) $(KERNEL_HEADERS_PATCH_DIR) \
 		linux-$(LINUX_HEADERS_VERSION)-\*.patch{,.gz,.bz2}
 endif
 	touch $@

index e74012f..0fc5a81 100644
@@ -79,11 +79,11 @@ $(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE)
 uclibc-patched: $(UCLIBC_DIR)/.patched
 $(UCLIBC_DIR)/.patched: $(UCLIBC_DIR)/.unpacked
 ifneq ($(BR2_UCLIBC_VERSION_SNAPSHOT),y)
-	toolchain/patch-kernel.sh $(UCLIBC_DIR) $(UCLIBC_PATCH_DIR) \
+	support/scripts/apply-patches.sh $(UCLIBC_DIR) $(UCLIBC_PATCH_DIR) \
 		uClibc-$(UCLIBC_VERSION)-\*.patch \
 		uClibc-$(UCLIBC_VERSION)-\*.patch.$(ARCH)
 else
-	toolchain/patch-kernel.sh $(UCLIBC_DIR) $(UCLIBC_PATCH_DIR) \
+	support/scripts/apply-patches.sh $(UCLIBC_DIR) $(UCLIBC_PATCH_DIR) \
 		uClibc.\*.patch uClibc.\*.patch.$(ARCH)
 endif
 	touch $@

index f29295f..8dbee7c 100644
@@ -32,7 +32,7 @@ export BR2_VERSION:=2011.08
 # absolute path
 TOPDIR:=$(shell pwd)
 CONFIG_CONFIG_IN=Config.in
-CONFIG=package/config
+CONFIG=support/kconfig
 DATE:=$(shell date +%Y%m%d)
 
 # Compute the full local version string so packages can use it as-is

similarity index 100%
rename from package/config/.gitignore
rename to support/kconfig/.gitignore

similarity index 100%
rename from package/config/Makefile
rename to support/kconfig/Makefile

similarity index 100%
rename from package/config/Makefile.br
rename to support/kconfig/Makefile.br

similarity index 100%
rename from package/config/POTFILES.in
rename to support/kconfig/POTFILES.in

similarity index 58%
rename from package/config/README.buildroot2
rename to support/kconfig/README.buildroot2
index 8ff0d09..b92ec14 100644
@@ -1,15 +1,15 @@
-This is a copy of the kconfig code in the kernel (currently 2.6.36-rc1) tweaked
+This is a copy of the kconfig code in the kernel (currently 2.6.37-rc1) tweaked
 to suit Buildroot.
 
 To update:
-	cp -r /usr/src/linux/scripts/kconfig package/config.new
-	cd package/config.new
-	cp -a ../config/patches ../config/README.buildroot2 .
+	cp -r /usr/src/linux/scripts/kconfig support/kconfig.new
+	cd support/config.new
+	cp -a ../kconfig/patches ../kconfig/README.buildroot2 .
 	quilt push -a
 	# Fix any conflict
 	cd ..
 	rm -rf config
-	mv config.new config
+	mv kconfig.new kconfig
 
 Then verify the toplevel targets work:
 	config

similarity index 100%
rename from package/config/check.sh
rename to support/kconfig/check.sh

similarity index 100%
rename from package/config/gconf.glade
rename to support/kconfig/gconf.glade

similarity index 100%
rename from package/config/lex.zconf.c_shipped
rename to support/kconfig/lex.zconf.c_shipped

similarity index 100%
rename from package/config/lxdialog/.gitignore
rename to support/kconfig/lxdialog/.gitignore

similarity index 100%
rename from package/config/lxdialog/BIG.FAT.WARNING
rename to support/kconfig/lxdialog/BIG.FAT.WARNING

similarity index 100%
rename from package/config/lxdialog/check-lxdialog.sh
rename to support/kconfig/lxdialog/check-lxdialog.sh

similarity index 100%
rename from package/config/patches/01-kconfig-kernel-to-buildroot.patch
rename to support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch

similarity index 100%
rename from package/config/patches/02-cpp-comments-to-c-comments.patch
rename to support/kconfig/patches/02-cpp-comments-to-c-comments.patch

similarity index 100%
rename from package/config/patches/03-change-config-option-prefix.patch
rename to support/kconfig/patches/03-change-config-option-prefix.patch

similarity index 100%
rename from package/config/patches/05-really-clean-everything.patch
rename to support/kconfig/patches/05-really-clean-everything.patch

similarity index 100%
rename from package/config/patches/06-br-build-system-integration.patch
rename to support/kconfig/patches/06-br-build-system-integration.patch

similarity index 96%
rename from package/config/patches/08-make-write-deps.patch
rename to support/kconfig/patches/08-make-write-deps.patch
index b69daad..e5a21c3 100644
@@ -2,10 +2,10 @@
  util.c |  117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 116 insertions(+), 1 deletion(-)
 
-Index: config/util.c
+Index: kconfig/util.c
 ===================================================================
---- config.orig/util.c
-+++ config/util.c
+--- kconfig.orig/util.c
++++ kconfig/util.c
 @@ -29,6 +29,121 @@
  	return file;
  }

@@ -60,7 +60,7 @@ Index: config/util.c
 +	if (!out)
 +		return 1;
 +	fprintf(out, "# ATTENTION! This does not handle 'depends', just 'select'! \n"
-+		"# See package/config/util.c write_make_deps()\n#\n");
++		"# See support/kconfig/util.c write_make_deps()\n#\n");
 +	menu = &rootmenu;//rootmenu.list;
 +	while (menu) {
 +		sym = menu->sym;

similarity index 100%
rename from package/config/patches/09-implement-kconfig-probability.patch
rename to support/kconfig/patches/09-implement-kconfig-probability.patch

similarity index 100%
rename from package/config/patches/10-br-build-system.patch
rename to support/kconfig/patches/10-br-build-system.patch

similarity index 100%
rename from package/config/patches/11-use-mktemp-for-lxdialog.patch
rename to support/kconfig/patches/11-use-mktemp-for-lxdialog.patch

similarity index 73%
rename from package/config/patches/12-fix-glade-file-path.patch
rename to support/kconfig/patches/12-fix-glade-file-path.patch
index 5b080c9..681dce1 100644
@@ -2,16 +2,16 @@
  gconf.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: config/gconf.c
+Index: kconfig/gconf.c
 ===================================================================
---- config.orig/gconf.c
-+++ config/gconf.c
+--- kconfig.orig/gconf.c
++++ kconfig/gconf.c
 @@ -1521,7 +1521,7 @@
  	/* Determine GUI path */
  	env = getenv(SRCTREE);
  	if (env)
 -		glade_file = g_strconcat(env, "/scripts/kconfig/gconf.glade", NULL);
-+		glade_file = g_strconcat(env, "/package/config/gconf.glade", NULL);
++		glade_file = g_strconcat(env, "/support/kconfig/gconf.glade", NULL);
  	else if (av[0][0] == '/')
  		glade_file = g_strconcat(av[0], ".glade", NULL);
  	else

similarity index 100%
rename from package/config/patches/14-support-out-of-tree-config.patch
rename to support/kconfig/patches/14-support-out-of-tree-config.patch

similarity index 100%
rename from package/config/patches/series
rename to support/kconfig/patches/series

similarity index 100%
rename from package/config/qconf.cc
rename to support/kconfig/qconf.cc

similarity index 100%
rename from package/config/streamline_config.pl
rename to support/kconfig/streamline_config.pl

similarity index 100%
rename from package/config/zconf.gperf
rename to support/kconfig/zconf.gperf

similarity index 100%
rename from package/config/zconf.hash.c_shipped
rename to support/kconfig/zconf.hash.c_shipped

similarity index 100%
rename from package/config/zconf.l
rename to support/kconfig/zconf.l

similarity index 100%
rename from package/config/zconf.tab.c_shipped
rename to support/kconfig/zconf.tab.c_shipped

similarity index 100%
rename from package/config/zconf.y
rename to support/kconfig/zconf.y

index 8dbee7c..b3e1986 100644
@@ -193,7 +193,7 @@ unexport CFLAGS
 unexport CXXFLAGS
 unexport GREP_OPTIONS
 
-GNU_HOST_NAME:=$(shell package/gnuconfig/config.guess)
+GNU_HOST_NAME:=$(shell support/gnuconfig/config.guess)
 
 #############################################################
 #

index 95e38ef..8efc129 100644
@@ -22,6 +22,23 @@
 #
 ################################################################################
 
+
+#
+# Utility function to upgrade config.sub and config.guess files
+#
+# argument 1 : directory into which config.guess and config.sub need
+# to be updated. Note that config.sub and config.guess are searched
+# recursively in this directory.
+#
+define CONFIG_UPDATE
+       echo $(1)
+	for file in config.guess config.sub; do \
+		for i in $$(find $(1) -name $$file); do \
+			cp support/gnuconfig/$$file $$i; \
+		done; \
+	done
+endef
+
 ################################################################################
 # AUTOTARGETS_INNER -- defines how the configuration, compilation and
 # installation of an autotools package should be done, implements a

@@ -131,11 +148,8 @@ endif
 # Hook to update config.sub and config.guess if needed
 #
 define UPDATE_CONFIG_HOOK
-	for file in config.guess config.sub; do \
-		for i in $$$$(find $$(@D) -name $$$$file); do \
-			cp package/gnuconfig/$$$$file $$$$i; \
-		done; \
-	done
+       @$$(call MESSAGE, "Updating config.sub and config.guess")
+       $$(call CONFIG_UPDATE,$$(@D))
 endef
 
 $(2)_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK

index 3b9f2e0..4e8db71 100644
@@ -70,7 +70,7 @@ $(DL_DIR)/$(CUPS_SOURCE):
 $(CUPS_DIR)/.unpacked: $(DL_DIR)/$(CUPS_SOURCE)
 	$(CUPS_CAT) $(DL_DIR)/$(CUPS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 	support/scripts/apply-patches.sh $(CUPS_DIR) package/cups/ \*.patch
-	$(CONFIG_UPDATE) $(CUPS_DIR)
+	$(call CONFIG_UPDATE,$(CUPS_DIR))
 	touch $@
 
 $(CUPS_DIR)/.configured: $(CUPS_DIR)/.unpacked

index 332a2ca..f4c8c76 100644
@@ -25,8 +25,7 @@ gettext-source: $(DL_DIR)/$(GETTEXT_SOURCE)
 $(GETTEXT_DIR)/.unpacked: $(DL_DIR)/$(GETTEXT_SOURCE)
 	$(GETTEXT_CAT) $(DL_DIR)/$(GETTEXT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 	support/scripts/apply-patches.sh $(GETTEXT_DIR) package/gettext/ gettext\*.patch
-	$(CONFIG_UPDATE) $(@D)
-	$(CONFIG_UPDATE) $(GETTEXT_DIR)/build-aux
+	$(call CONFIG_UPDATE,$(@D))
 	touch $@
 
 ifneq ($(BR2_TOOLCHAIN_BUILDROOT),y)

deleted file mode 100644
index fd43a68..0000000
@@ -1,20 +0,0 @@
---- ABOUT ---
-This isnt a real package, it just exists to easily update the
-config.sub / config.guess files in packages to the latest version
-(since many bundled ones don't support the latest possible targets)
-
---- HOWTO ---
-To use, just add this to your unpack rule in the package.mk:
-$(CONFIG_UPDATE) $(PACKAGE_DIR)/
-
---- UPDATE ---
-GNU config is now managed in git, so to update:
-
-# git clone git://git.savannah.gnu.org/config.git
-# cp config/config.* .
-# for p in $(ls patches/*.patch); do patch -p0 < $p; done
-# rm -rf config
-
-A few local customizations are used to support uClibc so you may
-have to make sure they're still needed.  The patches are broken 
-out in the patches/ dir to keep things simple.

deleted file mode 100644
index b6aa5fc..0000000
@@ -1,3 +0,0 @@
-# See README.buildroot
-gnuconfig-source:
-CONFIG_UPDATE = cp -f package/gnuconfig/config.sub package/gnuconfig/config.guess

index fefb34f..535fc8c 100644
@@ -8,7 +8,7 @@ LMBENCH_SOURCE:=lmbench-$(LMBENCH_VERSION).tgz
 LMBENCH_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/lmbench/development/lmbench-3.0-a9/
 
 define LMBENCH_CONFIGURE_CMDS
-	$(CONFIG_UPDATE) $(@D)
+	$(call CONFIG_UPDATE,$(@D))
 	sed -i 's/CFLAGS=/CFLAGS+=/g' $(@D)/src/Makefile
 	sed -i '/cd .*doc/d' $(@D)/src/Makefile
 	sed -i '/include/d' $(@D)/src/Makefile

similarity index 100%
rename from package/gnuconfig/.cvsignore
rename to support/gnuconfig/.cvsignore

new file mode 100644
index 0000000..fe54354
@@ -0,0 +1,25 @@
+--- HOWTO ---
+If your package uses config.guess and/or config.sub, then it probably
+relies on the autotools as its build system. In this case, you should
+use the AUTOTARGETS infrastructure, which will take care of updating
+the config.guess and/or config.sub files appropriately. See the
+Buildroot documentation for details about the AUTOTARGETS
+infrastructure.
+
+If for some reason your package does not use the AUTOTARGETS
+infrastructure, you can request the config.guess and/or config.sub
+files of your package to be updated by using:
+
+      $(call CONFIG_UPDATE,directory-of-your-package-sources)
+
+--- UPDATE ---
+GNU config is now managed in git, so to update:
+
+# git clone git://git.savannah.gnu.org/config.git
+# cp config/config.* .
+# for p in $(ls patches/*.patch); do patch -p0 < $p; done
+# rm -rf config
+
+A few local customizations are used to support uClibc so you may
+have to make sure they're still needed.  The patches are broken 
+out in the patches/ dir to keep things simple.

similarity index 100%
rename from package/gnuconfig/config.guess
rename to support/gnuconfig/config.guess

similarity index 100%
rename from package/gnuconfig/config.sub
rename to support/gnuconfig/config.sub

similarity index 100%
rename from package/gnuconfig/patches/config.guess.uclibc.patch
rename to support/gnuconfig/patches/config.guess.uclibc.patch

similarity index 100%
rename from package/gnuconfig/patches/config.sub.ps2.patch
rename to support/gnuconfig/patches/config.sub.ps2.patch

index 7bb2928..bb1c27d 100755
@@ -81,7 +81,6 @@ for i in $(find package/ -name '*.mk') ; do
 	$i = "package/games/games.mk" -o \
 	$i = "package/multimedia/multimedia.mk" -o \
 	$i = "package/customize/customize.mk" -o \
-	$i = "package/gnuconfig/gnuconfig.mk" -o \
 	$i = "package/matchbox/matchbox.mk" -o \
 	$i = "package/x11r7/x11r7.mk" ; then
 	echo "skipping $i" 1>&2

index 7fecf3e..e74a655 100644
@@ -14,7 +14,7 @@ $(ELF2FLT_DIR)/.unpacked:
 	touch $@
 
 $(ELF2FLT_DIR)/.patched: $(ELF2FLT_DIR)/.unpacked
-	$(CONFIG_UPDATE) $(@D)
+	$(call CONFIG_UPDATE,$(@D))
 	touch $@
 
 $(ELF2FLT_DIR)/.configured: $(ELF2FLT_DIR)/.patched

index 9232290..a2253c9 100644
@@ -200,7 +200,7 @@ $(GCC_DIR)/.unpacked: $(DL_DIR)/$(GCC_SOURCE)
 	mkdir -p $(TOOLCHAIN_DIR)
 	rm -rf $(GCC_DIR)
 	$(GCC_CAT) $(DL_DIR)/$(GCC_SOURCE) | tar -C $(TOOLCHAIN_DIR) $(TAR_OPTIONS) -
-	$(CONFIG_UPDATE) $(@D)
+	$(call CONFIG_UPDATE,$(@D))
 	touch $@
 
 gcc-patched: $(GCC_DIR)/.patched

index db46b12..4622616 100644
@@ -38,7 +38,7 @@ endif
 ifneq ($(wildcard $(GDB_PATCH_DIR)),)
 	support/scripts/apply-patches.sh $(GDB_DIR) $(GDB_PATCH_DIR) \*.patch $(GDB_PATCH_EXTRA)
 endif
-	$(CONFIG_UPDATE) $(@D)
+	$(call CONFIG_UPDATE,$(@D))
 	touch $@
 
 gdb-patched: $(GDB_DIR)/.unpacked