* [Buildroot] [pull request] Pull request for branch for-2011.11/misc-cleanups
@ 2011-08-31 21:34 Thomas Petazzoni
2011-08-31 21:35 ` [Buildroot] [PATCH 1/7] scripts: remove old, unmaintained, unused scripts Thomas Petazzoni
` (7 more replies)
0 siblings, 8 replies; 12+ messages in thread
From: Thomas Petazzoni @ 2011-08-31 21:34 UTC (permalink / raw)
To: buildroot
Hello,
This set of patches basically creates a new support/ directory, which
is used to group various files needed for the operation of Buildroot
which didn't fit properly in other directories :
* The various scripts in the scripts/ directory (after removing the
unused, unmaintained ones)
* The libtool related patches
* The patch-kernel.sh script, after renaming it to a more sensible
name.
* The kconfig stuff
* The gnuconfig stuff (config.guess and config.sub)
Best regards,
Thomas
The following changes since commit d1dd9588ae76d8c9b79a39af182a45e54ac356dd:
news.html: fix 2011.08 release date (2011-08-31 14:23:26 +0200)
are available in the git repository at:
http://free-electrons.com/~thomas/buildroot.git for-2011.11/misc-cleanups
Thomas Petazzoni (7):
scripts: remove old, unmaintained, unused scripts
scripts/mkmakefile: fix typo
support: move scripts/ to a new support/ directory
support: move libtool patches in support/libtool
support: move patch-kernel.sh and rename it
support: move kconfig stuff from package/config to support/kconfig
support: move package/gnuconfig to support/gnuconfig
Makefile | 10 +-
boot/uboot/uboot.mk | 2 +-
linux/linux.mk | 6 +-
package/Makefile.autotools.in | 36 ++++--
package/Makefile.package.in | 8 +-
package/argus/argus.mk | 2 +-
package/cups/cups.mk | 4 +-
package/cvs/cvs.mk | 2 +-
package/fis/fis.mk | 2 +-
package/gettext/gettext.mk | 5 +-
package/gnuconfig/README.buildroot | 20 ----
package/gnuconfig/gnuconfig.mk | 3 -
package/input-tools/input-tools.mk | 2 +-
package/libeXosip2/libeXosip2.mk | 2 +-
package/libgtk2/libgtk2.mk | 2 +-
package/libosip2/libosip2.mk | 2 +-
package/lmbench/lmbench.mk | 2 +-
package/mii-diag/mii-diag.mk | 2 +-
package/mutt/mutt.mk | 2 +-
package/netkitbase/netkitbase.mk | 2 +-
package/netkittelnet/netkittelnet.mk | 2 +-
package/setserial/setserial.mk | 2 +-
package/sfdisk/sfdisk.mk | 2 +-
package/sysklogd/sysklogd.mk | 2 +-
package/sysvinit/sysvinit.mk | 2 +-
package/thttpd/thttpd.mk | 2 +-
package/tinyhttpd/tinyhttpd.mk | 2 +-
package/ttcp/ttcp.mk | 2 +-
package/uemacs/uemacs.mk | 2 +-
package/vpnc/vpnc.mk | 2 +-
package/xfsprogs/xfsprogs.mk | 2 +-
scripts/add_new_package.wizard | 120 --------------------
scripts/create_ipkgs | 82 -------------
scripts/get_linux_config.sh | 77 -------------
{package => support}/gnuconfig/.cvsignore | 0
support/gnuconfig/README.buildroot | 25 ++++
{package => support}/gnuconfig/config.guess | 0
{package => support}/gnuconfig/config.sub | 0
.../gnuconfig/patches/config.guess.uclibc.patch | 0
.../gnuconfig/patches/config.sub.ps2.patch | 0
{package/config => support/kconfig}/.gitignore | 0
{package/config => support/kconfig}/Makefile | 0
{package/config => support/kconfig}/Makefile.br | 0
{package/config => support/kconfig}/POTFILES.in | 0
.../config => support/kconfig}/README.buildroot2 | 10 +-
{package/config => support/kconfig}/check.sh | 0
{package/config => support/kconfig}/conf.c | 0
{package/config => support/kconfig}/confdata.c | 0
{package/config => support/kconfig}/expr.c | 0
{package/config => support/kconfig}/expr.h | 0
{package/config => support/kconfig}/foo.h | 0
{package/config => support/kconfig}/gconf.c | 2 +-
{package/config => support/kconfig}/gconf.glade | 0
{package/config => support/kconfig}/images.c | 0
{package/config => support/kconfig}/kconfig_load.c | 0
{package/config => support/kconfig}/kxgettext.c | 0
.../config => support/kconfig}/lex.zconf.c_shipped | 0
{package/config => support/kconfig}/lkc.h | 0
{package/config => support/kconfig}/lkc_proto.h | 0
.../config => support/kconfig}/lxdialog/.gitignore | 0
.../kconfig}/lxdialog/BIG.FAT.WARNING | 0
.../kconfig}/lxdialog/check-lxdialog.sh | 0
.../kconfig}/lxdialog/checklist.c | 0
.../config => support/kconfig}/lxdialog/dialog.h | 0
.../config => support/kconfig}/lxdialog/inputbox.c | 0
.../config => support/kconfig}/lxdialog/menubox.c | 0
.../config => support/kconfig}/lxdialog/textbox.c | 0
.../config => support/kconfig}/lxdialog/util.c | 0
.../config => support/kconfig}/lxdialog/yesno.c | 0
{package/config => support/kconfig}/mconf.c | 0
{package/config => support/kconfig}/menu.c | 0
{package/config => support/kconfig}/nconf.c | 0
{package/config => support/kconfig}/nconf.gui.c | 0
{package/config => support/kconfig}/nconf.h | 0
.../patches/01-kconfig-kernel-to-buildroot.patch | 0
.../patches/02-cpp-comments-to-c-comments.patch | 0
.../patches/03-change-config-option-prefix.patch | 0
.../patches/05-really-clean-everything.patch | 0
.../patches/06-br-build-system-integration.patch | 0
.../kconfig}/patches/08-make-write-deps.patch | 8 +-
.../patches/09-implement-kconfig-probability.patch | 0
.../kconfig}/patches/10-br-build-system.patch | 0
.../patches/11-use-mktemp-for-lxdialog.patch | 0
.../kconfig}/patches/12-fix-glade-file-path.patch | 8 +-
.../patches/14-support-out-of-tree-config.patch | 0
{package/config => support/kconfig}/patches/series | 0
{package/config => support/kconfig}/qconf.cc | 0
{package/config => support/kconfig}/qconf.h | 0
.../kconfig}/streamline_config.pl | 0
{package/config => support/kconfig}/symbol.c | 0
{package/config => support/kconfig}/util.c | 2 +-
{package/config => support/kconfig}/zconf.gperf | 0
.../kconfig}/zconf.hash.c_shipped | 0
{package/config => support/kconfig}/zconf.l | 0
.../config => support/kconfig}/zconf.tab.c_shipped | 0
{package/config => support/kconfig}/zconf.y | 0
.../libtool}/buildroot-libtool-v1.5.patch | 0
.../libtool}/buildroot-libtool-v2.2.patch | 0
.../libtool}/buildroot-libtool-v2.4.patch | 0
.../scripts/apply-patches.sh | 0
{scripts => support/scripts}/build-ext3-img | 0
{scripts => support/scripts}/copy.sh | 0
{scripts => support/scripts}/graph-depends | 0
{scripts => support/scripts}/mkmakefile | 2 +-
{scripts => support/scripts}/pkg-stats | 1 -
{scripts => support/scripts}/setlocalversion | 0
toolchain/elf2flt/elf2flt.mk | 2 +-
toolchain/gcc/gcc-uclibc-4.x.mk | 6 +-
toolchain/gdb/gdb.mk | 4 +-
toolchain/kernel-headers/kernel-headers.mk | 4 +-
toolchain/uClibc/uclibc.mk | 4 +-
111 files changed, 115 insertions(+), 380 deletions(-)
delete mode 100644 package/gnuconfig/README.buildroot
delete mode 100644 package/gnuconfig/gnuconfig.mk
delete mode 100755 scripts/add_new_package.wizard
delete mode 100755 scripts/create_ipkgs
delete mode 100755 scripts/get_linux_config.sh
rename {package => support}/gnuconfig/.cvsignore (100%)
create mode 100644 support/gnuconfig/README.buildroot
rename {package => support}/gnuconfig/config.guess (100%)
rename {package => support}/gnuconfig/config.sub (100%)
rename {package => support}/gnuconfig/patches/config.guess.uclibc.patch (100%)
rename {package => support}/gnuconfig/patches/config.sub.ps2.patch (100%)
rename {package/config => support/kconfig}/.gitignore (100%)
rename {package/config => support/kconfig}/Makefile (100%)
rename {package/config => support/kconfig}/Makefile.br (100%)
rename {package/config => support/kconfig}/POTFILES.in (100%)
rename {package/config => support/kconfig}/README.buildroot2 (58%)
rename {package/config => support/kconfig}/check.sh (100%)
rename {package/config => support/kconfig}/conf.c (100%)
rename {package/config => support/kconfig}/confdata.c (100%)
rename {package/config => support/kconfig}/expr.c (100%)
rename {package/config => support/kconfig}/expr.h (100%)
rename {package/config => support/kconfig}/foo.h (100%)
rename {package/config => support/kconfig}/gconf.c (99%)
rename {package/config => support/kconfig}/gconf.glade (100%)
rename {package/config => support/kconfig}/images.c (100%)
rename {package/config => support/kconfig}/kconfig_load.c (100%)
rename {package/config => support/kconfig}/kxgettext.c (100%)
rename {package/config => support/kconfig}/lex.zconf.c_shipped (100%)
rename {package/config => support/kconfig}/lkc.h (100%)
rename {package/config => support/kconfig}/lkc_proto.h (100%)
rename {package/config => support/kconfig}/lxdialog/.gitignore (100%)
rename {package/config => support/kconfig}/lxdialog/BIG.FAT.WARNING (100%)
rename {package/config => support/kconfig}/lxdialog/check-lxdialog.sh (100%)
rename {package/config => support/kconfig}/lxdialog/checklist.c (100%)
rename {package/config => support/kconfig}/lxdialog/dialog.h (100%)
rename {package/config => support/kconfig}/lxdialog/inputbox.c (100%)
rename {package/config => support/kconfig}/lxdialog/menubox.c (100%)
rename {package/config => support/kconfig}/lxdialog/textbox.c (100%)
rename {package/config => support/kconfig}/lxdialog/util.c (100%)
rename {package/config => support/kconfig}/lxdialog/yesno.c (100%)
rename {package/config => support/kconfig}/mconf.c (100%)
rename {package/config => support/kconfig}/menu.c (100%)
rename {package/config => support/kconfig}/nconf.c (100%)
rename {package/config => support/kconfig}/nconf.gui.c (100%)
rename {package/config => support/kconfig}/nconf.h (100%)
rename {package/config => support/kconfig}/patches/01-kconfig-kernel-to-buildroot.patch (100%)
rename {package/config => support/kconfig}/patches/02-cpp-comments-to-c-comments.patch (100%)
rename {package/config => support/kconfig}/patches/03-change-config-option-prefix.patch (100%)
rename {package/config => support/kconfig}/patches/05-really-clean-everything.patch (100%)
rename {package/config => support/kconfig}/patches/06-br-build-system-integration.patch (100%)
rename {package/config => support/kconfig}/patches/08-make-write-deps.patch (96%)
rename {package/config => support/kconfig}/patches/09-implement-kconfig-probability.patch (100%)
rename {package/config => support/kconfig}/patches/10-br-build-system.patch (100%)
rename {package/config => support/kconfig}/patches/11-use-mktemp-for-lxdialog.patch (100%)
rename {package/config => support/kconfig}/patches/12-fix-glade-file-path.patch (73%)
rename {package/config => support/kconfig}/patches/14-support-out-of-tree-config.patch (100%)
rename {package/config => support/kconfig}/patches/series (100%)
rename {package/config => support/kconfig}/qconf.cc (100%)
rename {package/config => support/kconfig}/qconf.h (100%)
rename {package/config => support/kconfig}/streamline_config.pl (100%)
rename {package/config => support/kconfig}/symbol.c (100%)
rename {package/config => support/kconfig}/util.c (99%)
rename {package/config => support/kconfig}/zconf.gperf (100%)
rename {package/config => support/kconfig}/zconf.hash.c_shipped (100%)
rename {package/config => support/kconfig}/zconf.l (100%)
rename {package/config => support/kconfig}/zconf.tab.c_shipped (100%)
rename {package/config => support/kconfig}/zconf.y (100%)
rename {package => support/libtool}/buildroot-libtool-v1.5.patch (100%)
rename {package => support/libtool}/buildroot-libtool-v2.2.patch (100%)
rename {package => support/libtool}/buildroot-libtool-v2.4.patch (100%)
rename toolchain/patch-kernel.sh => support/scripts/apply-patches.sh (100%)
rename {scripts => support/scripts}/build-ext3-img (100%)
rename {scripts => support/scripts}/copy.sh (100%)
rename {scripts => support/scripts}/graph-depends (100%)
rename {scripts => support/scripts}/mkmakefile (93%)
rename {scripts => support/scripts}/pkg-stats (99%)
rename {scripts => support/scripts}/setlocalversion (100%)
Thanks,
--
Thomas Petazzoni
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 1/7] scripts: remove old, unmaintained, unused scripts
2011-08-31 21:34 [Buildroot] [pull request] Pull request for branch for-2011.11/misc-cleanups Thomas Petazzoni
@ 2011-08-31 21:35 ` Thomas Petazzoni
2011-08-31 21:35 ` [Buildroot] [PATCH 2/7] scripts/mkmakefile: fix typo Thomas Petazzoni
` (6 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Thomas Petazzoni @ 2011-08-31 21:35 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
scripts/add_new_package.wizard | 120 ----------------------------------------
scripts/create_ipkgs | 82 ---------------------------
scripts/get_linux_config.sh | 77 -------------------------
3 files changed, 0 insertions(+), 279 deletions(-)
delete mode 100755 scripts/add_new_package.wizard
delete mode 100755 scripts/create_ipkgs
delete mode 100755 scripts/get_linux_config.sh
diff --git a/scripts/add_new_package.wizard b/scripts/add_new_package.wizard
deleted file mode 100755
index 4ee02df..0000000
--- a/scripts/add_new_package.wizard
+++ /dev/null
@@ -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}\"."
diff --git a/scripts/create_ipkgs b/scripts/create_ipkgs
deleted file mode 100755
index 3b9b8af..0000000
--- a/scripts/create_ipkgs
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/sh
-
-# this script is very *alpha* so be gentle...
-
-# change these lines to your arch and maintainer name
-ARCH="avr32"
-PACK_MAINTAINER="John Voltz <john.voltz@gmail.com>"
-
-BUILDROOT_DIR=`pwd`
-
-echo "Creating ipkgs from your build directory..."
-echo "Please be patient, as this can take a long time.
- "
-
-# create the ipkg directories
-mkdir -p ${BUILDROOT_DIR}/ipkg-temp
-mkdir -p ${BUILDROOT_DIR}/ipkg-out
-
-for PACKAGE in `ls -d ./build_*/*`; do
-
- # extract some info
- NAME_WITHOUT_VER=${PACKAGE%-*}
- VERSION=${PACKAGE#${NAME_WITHOUT_VER}-}
- NAME_WITHOUT_DIR=${NAME_WITHOUT_VER#*/*/}
- CLEAN_NAME=${NAME_WITHOUT_DIR//_/-}
-
- # clean out the temp directory
- rm -rf ${BUILDROOT_DIR}/ipkg-temp/*
-
- # install the package to temp directory
- cd ${PACKAGE}
- echo "Installing ${NAME_WITHOUT_DIR} to ./ipkg-temp"
- make DESTDIR=${BUILDROOT_DIR}/ipkg-temp DSTROOT=${BUILDROOT_DIR}/ipkg-temp install &> /dev/null
-
- # create the control file
- cd ${BUILDROOT_DIR}
- mkdir ${BUILDROOT_DIR}/ipkg-temp/CONTROL
-
- # find it's corresponding buildroot package directory
- PACK_NAME=`find ./package -path './package/config' -prune -o -name ${NAME_WITHOUT_DIR}`
- PACK_NAME=${PACK_NAME%./package/config}
- PACK_NAME=${PACK_NAME#./package/config}
- PACK_NAME=`echo -n ${PACK_NAME}`
-
- # there must be an better way to extract the description and
- # dependencies from the Config.in and *.mk file.
- # Haven't figured it out just yet.
- CONF_FILE=`cat ${PACK_NAME}/Config.in`
- #MAKE_FILE=`cat ${PACK_NAME}/*.mk`
- HELP_STR=${CONF_FILE#*help}
- HELP_STR=${HELP_STR%%comment*}
- HELP_STR=${HELP_STR%%choice*}
- HELP_STR=${HELP_STR%%depends*}
- HELP_STR=${HELP_STR%%http*}
- HELP_STR=`echo -n ${HELP_STR}`
-
- echo ${HELP_STR}
-
- if [ "${PACK_NAME}" != "" ]; then
- echo "Creating ipkg of: ${PACKAGE}"
-
-cat > ${BUILDROOT_DIR}/ipkg-temp/CONTROL/control <<EOF
-Package: ${CLEAN_NAME}
-Priority: optional
-Version: ${VERSION}
-Architecture: ${ARCH}
-Maintainer: ${PACK_MAINTAINER}
-Depends: uclibc
-Description: ${HELP_STR}
-EOF
-
- # build the package
- package/ipkg/ipkg-build ${BUILDROOT_DIR}/ipkg-temp ${BUILDROOT_DIR}/ipkg-out
-
- fi
-
- echo "Complete.
- "
-
-done
-
-echo "ipkg builds are finished."
diff --git a/scripts/get_linux_config.sh b/scripts/get_linux_config.sh
deleted file mode 100755
index 6c00036..0000000
--- a/scripts/get_linux_config.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-#######################################################################
-#
-# Copy successively all configs from the BSP directory (par #1)
-# to the Linux directory (par #2)
-# Do not copy config files for later linux versions than the current
-# A well-behaved filename is
-# "<name>-linux-2.6.<major>.<minor>.config" or
-# "<name>-linux-2.6.<major>.config"
-#
-#######################################################################
-
-TOPDIR=`pwd`
-DEBUG=0
-# parameter #1 BOARD_PATH
-# parameter #2 LINUX26_DIR
-
-CONFIGS=`ls -X $1/*linux-2.6.*.config | sed s/[.]config// - | sort`
-LINUX26_DIR=`basename $2`
-LINUX26_CONFIG=${2}/.config
-LINUX_MAJOR_VERSION=${LINUX26_DIR:10:2}
-LINUX_MINOR_VERSION=${LINUX26_DIR:13}
-
-function DBG_PRINT
-{
- if [ ${DEBUG} = 1 ] ; then
- echo $1
- fi
-}
-
-function linux_version()
-{
- local KCONFIG
- KCONFIG=`basename $1`
- KERNEL=`echo ${KCONFIG} | sed s/.*linux-2.6./linux-2.6./g -`
- THIS_MAJOR=${KERNEL:10:2}
- THIS_MINOR=${KERNEL:13}
- THIS_MINOR=${THIS_MINOR:=0}
-}
-
-# Try to be careful...
-DBG_PRINT MAJOR=\"${LINUX_MAJOR_VERSION}\"
-DBG_PRINT MINOR=\"${LINUX_MINOR_VERSION}\"
-
-for i in ${CONFIGS} ; do
- DBG_PRINT FILE=$i
- linux_version $i
- DBG_PRINT KERNEL=${KERNEL}
- if [ ${THIS_MAJOR} -lt ${LINUX_MAJOR_VERSION} ] ; then
- echo Copying `basename $i`.config ...
- cp $i.config ${LINUX26_CONFIG}
- elif [ ${THIS_MAJOR} -eq ${LINUX_MAJOR_VERSION} ] ; then
- if [ "${LINUX_MINOR_VERSION}X" = "X" ] ; then
- if [ "${THIS_MINOR}X" = "X" ] ; then
- echo Copying `basename $i`.config ...
- cp $i.config ${LINUX26_CONFIG}
- else
- return
- fi
- elif [ ${THIS_MINOR} -le ${LINUX_MINOR_VERSION} ] ; then
- echo Copying `basename $i`.config ...
- cp $i.config ${LINUX26_CONFIG}
- fi
- else
- return
- fi
-done
-
-# Did not work... - be promisceous
-
-if [ ! -f "${LINUX26_CONFIG}" ] ; then \
- for i in `ls $1/*linux*.config` ; do
- echo Copying `basename $i` ...
- cp $i ${LINUX26_CONFIG}
- done
-fi
-
--
1.7.4.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 2/7] scripts/mkmakefile: fix typo
2011-08-31 21:34 [Buildroot] [pull request] Pull request for branch for-2011.11/misc-cleanups Thomas Petazzoni
2011-08-31 21:35 ` [Buildroot] [PATCH 1/7] scripts: remove old, unmaintained, unused scripts Thomas Petazzoni
@ 2011-08-31 21:35 ` Thomas Petazzoni
2011-08-31 21:35 ` [Buildroot] [PATCH 3/7] support: move scripts/ to a new support/ directory Thomas Petazzoni
` (5 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Thomas Petazzoni @ 2011-08-31 21:35 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
scripts/mkmakefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/scripts/mkmakefile b/scripts/mkmakefile
index 38d8268..cef2ec7 100755
--- a/scripts/mkmakefile
+++ b/scripts/mkmakefile
@@ -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
--
1.7.4.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 3/7] support: move scripts/ to a new support/ directory
2011-08-31 21:34 [Buildroot] [pull request] Pull request for branch for-2011.11/misc-cleanups Thomas Petazzoni
2011-08-31 21:35 ` [Buildroot] [PATCH 1/7] scripts: remove old, unmaintained, unused scripts Thomas Petazzoni
2011-08-31 21:35 ` [Buildroot] [PATCH 2/7] scripts/mkmakefile: fix typo Thomas Petazzoni
@ 2011-08-31 21:35 ` Thomas Petazzoni
2011-08-31 21:35 ` [Buildroot] [PATCH 4/7] support: move libtool patches in support/libtool Thomas Petazzoni
` (4 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Thomas Petazzoni @ 2011-08-31 21:35 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
Makefile | 6 +++---
{scripts => support/scripts}/build-ext3-img | 0
{scripts => support/scripts}/copy.sh | 0
{scripts => support/scripts}/graph-depends | 0
{scripts => support/scripts}/mkmakefile | 0
{scripts => support/scripts}/pkg-stats | 0
{scripts => support/scripts}/setlocalversion | 0
7 files changed, 3 insertions(+), 3 deletions(-)
rename {scripts => support/scripts}/build-ext3-img (100%)
rename {scripts => support/scripts}/copy.sh (100%)
rename {scripts => support/scripts}/graph-depends (100%)
rename {scripts => support/scripts}/mkmakefile (100%)
rename {scripts => support/scripts}/pkg-stats (100%)
rename {scripts => support/scripts}/setlocalversion (100%)
diff --git a/Makefile b/Makefile
index 9ed46fc..f29295f 100644
--- a/Makefile
+++ b/Makefile
@@ -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:
diff --git a/scripts/build-ext3-img b/support/scripts/build-ext3-img
similarity index 100%
rename from scripts/build-ext3-img
rename to support/scripts/build-ext3-img
diff --git a/scripts/copy.sh b/support/scripts/copy.sh
similarity index 100%
rename from scripts/copy.sh
rename to support/scripts/copy.sh
diff --git a/scripts/graph-depends b/support/scripts/graph-depends
similarity index 100%
rename from scripts/graph-depends
rename to support/scripts/graph-depends
diff --git a/scripts/mkmakefile b/support/scripts/mkmakefile
similarity index 100%
rename from scripts/mkmakefile
rename to support/scripts/mkmakefile
diff --git a/scripts/pkg-stats b/support/scripts/pkg-stats
similarity index 100%
rename from scripts/pkg-stats
rename to support/scripts/pkg-stats
diff --git a/scripts/setlocalversion b/support/scripts/setlocalversion
similarity index 100%
rename from scripts/setlocalversion
rename to support/scripts/setlocalversion
--
1.7.4.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 4/7] support: move libtool patches in support/libtool
2011-08-31 21:34 [Buildroot] [pull request] Pull request for branch for-2011.11/misc-cleanups Thomas Petazzoni
` (2 preceding siblings ...)
2011-08-31 21:35 ` [Buildroot] [PATCH 3/7] support: move scripts/ to a new support/ directory Thomas Petazzoni
@ 2011-08-31 21:35 ` Thomas Petazzoni
2011-08-31 21:35 ` [Buildroot] [PATCH 5/7] support: move patch-kernel.sh and rename it Thomas Petazzoni
` (3 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Thomas Petazzoni @ 2011-08-31 21:35 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/Makefile.autotools.in | 6 +++---
.../libtool}/buildroot-libtool-v1.5.patch | 0
.../libtool}/buildroot-libtool-v2.2.patch | 0
.../libtool}/buildroot-libtool-v2.4.patch | 0
4 files changed, 3 insertions(+), 3 deletions(-)
rename {package => support/libtool}/buildroot-libtool-v1.5.patch (100%)
rename {package => support/libtool}/buildroot-libtool-v2.2.patch (100%)
rename {package => support/libtool}/buildroot-libtool-v2.4.patch (100%)
diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in
index 46ab861..d502d21 100644
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -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
diff --git a/package/buildroot-libtool-v1.5.patch b/support/libtool/buildroot-libtool-v1.5.patch
similarity index 100%
rename from package/buildroot-libtool-v1.5.patch
rename to support/libtool/buildroot-libtool-v1.5.patch
diff --git a/package/buildroot-libtool-v2.2.patch b/support/libtool/buildroot-libtool-v2.2.patch
similarity index 100%
rename from package/buildroot-libtool-v2.2.patch
rename to support/libtool/buildroot-libtool-v2.2.patch
diff --git a/package/buildroot-libtool-v2.4.patch b/support/libtool/buildroot-libtool-v2.4.patch
similarity index 100%
rename from package/buildroot-libtool-v2.4.patch
rename to support/libtool/buildroot-libtool-v2.4.patch
--
1.7.4.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 5/7] support: move patch-kernel.sh and rename it
2011-08-31 21:34 [Buildroot] [pull request] Pull request for branch for-2011.11/misc-cleanups Thomas Petazzoni
` (3 preceding siblings ...)
2011-08-31 21:35 ` [Buildroot] [PATCH 4/7] support: move libtool patches in support/libtool Thomas Petazzoni
@ 2011-08-31 21:35 ` Thomas Petazzoni
2011-08-31 21:35 ` [Buildroot] [PATCH 6/7] support: move kconfig stuff from package/config to support/kconfig Thomas Petazzoni
` (2 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Thomas Petazzoni @ 2011-08-31 21:35 UTC (permalink / raw)
To: buildroot
The name "patch-kernel.sh" is a bit stupid, since this script is used
to patch everything in Buildroot, not only kernel trees.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
boot/uboot/uboot.mk | 2 +-
linux/linux.mk | 6 +++---
package/Makefile.autotools.in | 12 ++++++------
package/Makefile.package.in | 8 ++++----
package/argus/argus.mk | 2 +-
package/cups/cups.mk | 2 +-
package/cvs/cvs.mk | 2 +-
package/fis/fis.mk | 2 +-
package/gettext/gettext.mk | 2 +-
package/input-tools/input-tools.mk | 2 +-
package/libeXosip2/libeXosip2.mk | 2 +-
package/libgtk2/libgtk2.mk | 2 +-
package/libosip2/libosip2.mk | 2 +-
package/mii-diag/mii-diag.mk | 2 +-
package/mutt/mutt.mk | 2 +-
package/netkitbase/netkitbase.mk | 2 +-
package/netkittelnet/netkittelnet.mk | 2 +-
package/setserial/setserial.mk | 2 +-
package/sfdisk/sfdisk.mk | 2 +-
package/sysklogd/sysklogd.mk | 2 +-
package/sysvinit/sysvinit.mk | 2 +-
package/thttpd/thttpd.mk | 2 +-
package/tinyhttpd/tinyhttpd.mk | 2 +-
package/ttcp/ttcp.mk | 2 +-
package/uemacs/uemacs.mk | 2 +-
package/vpnc/vpnc.mk | 2 +-
package/xfsprogs/xfsprogs.mk | 2 +-
.../scripts/apply-patches.sh | 0
toolchain/gcc/gcc-uclibc-4.x.mk | 4 ++--
toolchain/gdb/gdb.mk | 2 +-
| 4 ++--
toolchain/uClibc/uclibc.mk | 4 ++--
32 files changed, 44 insertions(+), 44 deletions(-)
rename toolchain/patch-kernel.sh => support/scripts/apply-patches.sh (100%)
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 776bdef..202995a 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -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
diff --git a/linux/linux.mk b/linux/linux.mk
index 6662f7b..d289b28 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -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
diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in
index d502d21..95e38ef 100644
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -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
diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index 868bf28..0751144 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -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; \
diff --git a/package/argus/argus.mk b/package/argus/argus.mk
index 2705bac..1a90b10 100644
--- a/package/argus/argus.mk
+++ b/package/argus/argus.mk
@@ -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
diff --git a/package/cups/cups.mk b/package/cups/cups.mk
index 169cdb3..3b9f2e0 100644
--- a/package/cups/cups.mk
+++ b/package/cups/cups.mk
@@ -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 $@
diff --git a/package/cvs/cvs.mk b/package/cvs/cvs.mk
index 023e93b..8d56a21 100644
--- a/package/cvs/cvs.mk
+++ b/package/cvs/cvs.mk
@@ -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
diff --git a/package/fis/fis.mk b/package/fis/fis.mk
index e532aff..2942449 100644
--- a/package/fis/fis.mk
+++ b/package/fis/fis.mk
@@ -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
diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index 2b308c8..332a2ca 100644
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -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 $@
diff --git a/package/input-tools/input-tools.mk b/package/input-tools/input-tools.mk
index daf0755..0c5b523 100644
--- a/package/input-tools/input-tools.mk
+++ b/package/input-tools/input-tools.mk
@@ -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
diff --git a/package/libeXosip2/libeXosip2.mk b/package/libeXosip2/libeXosip2.mk
index 415745b..565a259 100644
--- a/package/libeXosip2/libeXosip2.mk
+++ b/package/libeXosip2/libeXosip2.mk
@@ -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
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index be4531e..f9872b6 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -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
diff --git a/package/libosip2/libosip2.mk b/package/libosip2/libosip2.mk
index aa15332..da3f9a2 100644
--- a/package/libosip2/libosip2.mk
+++ b/package/libosip2/libosip2.mk
@@ -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
diff --git a/package/mii-diag/mii-diag.mk b/package/mii-diag/mii-diag.mk
index 01a8b5f..6d3743a 100644
--- a/package/mii-diag/mii-diag.mk
+++ b/package/mii-diag/mii-diag.mk
@@ -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
diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk
index d021aef..886768c 100644
--- a/package/mutt/mutt.mk
+++ b/package/mutt/mutt.mk
@@ -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
diff --git a/package/netkitbase/netkitbase.mk b/package/netkitbase/netkitbase.mk
index 311c8b2..dde8f9f 100644
--- a/package/netkitbase/netkitbase.mk
+++ b/package/netkitbase/netkitbase.mk
@@ -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
diff --git a/package/netkittelnet/netkittelnet.mk b/package/netkittelnet/netkittelnet.mk
index afa3bc4..e9f40ca 100644
--- a/package/netkittelnet/netkittelnet.mk
+++ b/package/netkittelnet/netkittelnet.mk
@@ -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
diff --git a/package/setserial/setserial.mk b/package/setserial/setserial.mk
index f24af73..33c8478 100644
--- a/package/setserial/setserial.mk
+++ b/package/setserial/setserial.mk
@@ -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
diff --git a/package/sfdisk/sfdisk.mk b/package/sfdisk/sfdisk.mk
index 81c4943..22ebeaa 100644
--- a/package/sfdisk/sfdisk.mk
+++ b/package/sfdisk/sfdisk.mk
@@ -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 $@
diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk
index 11aee2a..e08f048 100644
--- a/package/sysklogd/sysklogd.mk
+++ b/package/sysklogd/sysklogd.mk
@@ -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
diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk
index adcc1ad..af5ec42 100644
--- a/package/sysvinit/sysvinit.mk
+++ b/package/sysvinit/sysvinit.mk
@@ -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
diff --git a/package/thttpd/thttpd.mk b/package/thttpd/thttpd.mk
index c67aa49..46c87a1 100644
--- a/package/thttpd/thttpd.mk
+++ b/package/thttpd/thttpd.mk
@@ -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
diff --git a/package/tinyhttpd/tinyhttpd.mk b/package/tinyhttpd/tinyhttpd.mk
index eac416b..739849f 100644
--- a/package/tinyhttpd/tinyhttpd.mk
+++ b/package/tinyhttpd/tinyhttpd.mk
@@ -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
diff --git a/package/ttcp/ttcp.mk b/package/ttcp/ttcp.mk
index 1c4fe6f..006b74c 100644
--- a/package/ttcp/ttcp.mk
+++ b/package/ttcp/ttcp.mk
@@ -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
diff --git a/package/uemacs/uemacs.mk b/package/uemacs/uemacs.mk
index 539ad51..8355a7f 100644
--- a/package/uemacs/uemacs.mk
+++ b/package/uemacs/uemacs.mk
@@ -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
diff --git a/package/vpnc/vpnc.mk b/package/vpnc/vpnc.mk
index c4f23fa..5a8c700 100644
--- a/package/vpnc/vpnc.mk
+++ b/package/vpnc/vpnc.mk
@@ -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
diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk
index 204b3cb..68db2f7 100644
--- a/package/xfsprogs/xfsprogs.mk
+++ b/package/xfsprogs/xfsprogs.mk
@@ -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
diff --git a/toolchain/patch-kernel.sh b/support/scripts/apply-patches.sh
similarity index 100%
rename from toolchain/patch-kernel.sh
rename to support/scripts/apply-patches.sh
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 94613fa..9232290 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -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 $@
diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk
index caf3e36..db46b12 100644
--- a/toolchain/gdb/gdb.mk
+++ b/toolchain/gdb/gdb.mk
@@ -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 $@
--git a/toolchain/kernel-headers/kernel-headers.mk b/toolchain/kernel-headers/kernel-headers.mk
index ce70cab..044fcf9 100644
--- a/toolchain/kernel-headers/kernel-headers.mk
+++ b/toolchain/kernel-headers/kernel-headers.mk
@@ -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 $@
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index e74012f..0fc5a81 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -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 $@
--
1.7.4.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 6/7] support: move kconfig stuff from package/config to support/kconfig
2011-08-31 21:34 [Buildroot] [pull request] Pull request for branch for-2011.11/misc-cleanups Thomas Petazzoni
` (4 preceding siblings ...)
2011-08-31 21:35 ` [Buildroot] [PATCH 5/7] support: move patch-kernel.sh and rename it Thomas Petazzoni
@ 2011-08-31 21:35 ` Thomas Petazzoni
2011-08-31 21:35 ` [Buildroot] [PATCH 7/7] support: move package/gnuconfig to support/gnuconfig Thomas Petazzoni
2011-09-17 6:23 ` [Buildroot] [pull request] Pull request for branch for-2011.11/misc-cleanups Peter Korsgaard
7 siblings, 0 replies; 12+ messages in thread
From: Thomas Petazzoni @ 2011-08-31 21:35 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
Makefile | 2 +-
{package/config => support/kconfig}/.gitignore | 0
{package/config => support/kconfig}/Makefile | 0
{package/config => support/kconfig}/Makefile.br | 0
{package/config => support/kconfig}/POTFILES.in | 0
.../config => support/kconfig}/README.buildroot2 | 10 +++++-----
{package/config => support/kconfig}/check.sh | 0
{package/config => support/kconfig}/conf.c | 0
{package/config => support/kconfig}/confdata.c | 0
{package/config => support/kconfig}/expr.c | 0
{package/config => support/kconfig}/expr.h | 0
{package/config => support/kconfig}/foo.h | 0
{package/config => support/kconfig}/gconf.c | 2 +-
{package/config => support/kconfig}/gconf.glade | 0
{package/config => support/kconfig}/images.c | 0
{package/config => support/kconfig}/kconfig_load.c | 0
{package/config => support/kconfig}/kxgettext.c | 0
.../config => support/kconfig}/lex.zconf.c_shipped | 0
{package/config => support/kconfig}/lkc.h | 0
{package/config => support/kconfig}/lkc_proto.h | 0
.../config => support/kconfig}/lxdialog/.gitignore | 0
.../kconfig}/lxdialog/BIG.FAT.WARNING | 0
.../kconfig}/lxdialog/check-lxdialog.sh | 0
.../kconfig}/lxdialog/checklist.c | 0
.../config => support/kconfig}/lxdialog/dialog.h | 0
.../config => support/kconfig}/lxdialog/inputbox.c | 0
| 0
.../config => support/kconfig}/lxdialog/textbox.c | 0
.../config => support/kconfig}/lxdialog/util.c | 0
.../config => support/kconfig}/lxdialog/yesno.c | 0
{package/config => support/kconfig}/mconf.c | 0
| 0
{package/config => support/kconfig}/nconf.c | 0
{package/config => support/kconfig}/nconf.gui.c | 0
{package/config => support/kconfig}/nconf.h | 0
.../patches/01-kconfig-kernel-to-buildroot.patch | 0
| 0
.../patches/03-change-config-option-prefix.patch | 0
.../patches/05-really-clean-everything.patch | 0
.../patches/06-br-build-system-integration.patch | 0
.../kconfig}/patches/08-make-write-deps.patch | 8 ++++----
.../patches/09-implement-kconfig-probability.patch | 0
.../kconfig}/patches/10-br-build-system.patch | 0
.../patches/11-use-mktemp-for-lxdialog.patch | 0
.../kconfig}/patches/12-fix-glade-file-path.patch | 8 ++++----
.../patches/14-support-out-of-tree-config.patch | 0
{package/config => support/kconfig}/patches/series | 0
{package/config => support/kconfig}/qconf.cc | 0
{package/config => support/kconfig}/qconf.h | 0
.../kconfig}/streamline_config.pl | 0
{package/config => support/kconfig}/symbol.c | 0
{package/config => support/kconfig}/util.c | 2 +-
{package/config => support/kconfig}/zconf.gperf | 0
.../kconfig}/zconf.hash.c_shipped | 0
{package/config => support/kconfig}/zconf.l | 0
.../config => support/kconfig}/zconf.tab.c_shipped | 0
{package/config => support/kconfig}/zconf.y | 0
57 files changed, 16 insertions(+), 16 deletions(-)
rename {package/config => support/kconfig}/.gitignore (100%)
rename {package/config => support/kconfig}/Makefile (100%)
rename {package/config => support/kconfig}/Makefile.br (100%)
rename {package/config => support/kconfig}/POTFILES.in (100%)
rename {package/config => support/kconfig}/README.buildroot2 (58%)
rename {package/config => support/kconfig}/check.sh (100%)
rename {package/config => support/kconfig}/conf.c (100%)
rename {package/config => support/kconfig}/confdata.c (100%)
rename {package/config => support/kconfig}/expr.c (100%)
rename {package/config => support/kconfig}/expr.h (100%)
rename {package/config => support/kconfig}/foo.h (100%)
rename {package/config => support/kconfig}/gconf.c (99%)
rename {package/config => support/kconfig}/gconf.glade (100%)
rename {package/config => support/kconfig}/images.c (100%)
rename {package/config => support/kconfig}/kconfig_load.c (100%)
rename {package/config => support/kconfig}/kxgettext.c (100%)
rename {package/config => support/kconfig}/lex.zconf.c_shipped (100%)
rename {package/config => support/kconfig}/lkc.h (100%)
rename {package/config => support/kconfig}/lkc_proto.h (100%)
rename {package/config => support/kconfig}/lxdialog/.gitignore (100%)
rename {package/config => support/kconfig}/lxdialog/BIG.FAT.WARNING (100%)
rename {package/config => support/kconfig}/lxdialog/check-lxdialog.sh (100%)
rename {package/config => support/kconfig}/lxdialog/checklist.c (100%)
rename {package/config => support/kconfig}/lxdialog/dialog.h (100%)
rename {package/config => support/kconfig}/lxdialog/inputbox.c (100%)
rename {package/config => support/kconfig}/lxdialog/menubox.c (100%)
rename {package/config => support/kconfig}/lxdialog/textbox.c (100%)
rename {package/config => support/kconfig}/lxdialog/util.c (100%)
rename {package/config => support/kconfig}/lxdialog/yesno.c (100%)
rename {package/config => support/kconfig}/mconf.c (100%)
rename {package/config => support/kconfig}/menu.c (100%)
rename {package/config => support/kconfig}/nconf.c (100%)
rename {package/config => support/kconfig}/nconf.gui.c (100%)
rename {package/config => support/kconfig}/nconf.h (100%)
rename {package/config => support/kconfig}/patches/01-kconfig-kernel-to-buildroot.patch (100%)
rename {package/config => support/kconfig}/patches/02-cpp-comments-to-c-comments.patch (100%)
rename {package/config => support/kconfig}/patches/03-change-config-option-prefix.patch (100%)
rename {package/config => support/kconfig}/patches/05-really-clean-everything.patch (100%)
rename {package/config => support/kconfig}/patches/06-br-build-system-integration.patch (100%)
rename {package/config => support/kconfig}/patches/08-make-write-deps.patch (96%)
rename {package/config => support/kconfig}/patches/09-implement-kconfig-probability.patch (100%)
rename {package/config => support/kconfig}/patches/10-br-build-system.patch (100%)
rename {package/config => support/kconfig}/patches/11-use-mktemp-for-lxdialog.patch (100%)
rename {package/config => support/kconfig}/patches/12-fix-glade-file-path.patch (73%)
rename {package/config => support/kconfig}/patches/14-support-out-of-tree-config.patch (100%)
rename {package/config => support/kconfig}/patches/series (100%)
rename {package/config => support/kconfig}/qconf.cc (100%)
rename {package/config => support/kconfig}/qconf.h (100%)
rename {package/config => support/kconfig}/streamline_config.pl (100%)
rename {package/config => support/kconfig}/symbol.c (100%)
rename {package/config => support/kconfig}/util.c (99%)
rename {package/config => support/kconfig}/zconf.gperf (100%)
rename {package/config => support/kconfig}/zconf.hash.c_shipped (100%)
rename {package/config => support/kconfig}/zconf.l (100%)
rename {package/config => support/kconfig}/zconf.tab.c_shipped (100%)
rename {package/config => support/kconfig}/zconf.y (100%)
diff --git a/Makefile b/Makefile
index f29295f..8dbee7c 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/package/config/.gitignore b/support/kconfig/.gitignore
similarity index 100%
rename from package/config/.gitignore
rename to support/kconfig/.gitignore
diff --git a/package/config/Makefile b/support/kconfig/Makefile
similarity index 100%
rename from package/config/Makefile
rename to support/kconfig/Makefile
diff --git a/package/config/Makefile.br b/support/kconfig/Makefile.br
similarity index 100%
rename from package/config/Makefile.br
rename to support/kconfig/Makefile.br
diff --git a/package/config/POTFILES.in b/support/kconfig/POTFILES.in
similarity index 100%
rename from package/config/POTFILES.in
rename to support/kconfig/POTFILES.in
diff --git a/package/config/README.buildroot2 b/support/kconfig/README.buildroot2
similarity index 58%
rename from package/config/README.buildroot2
rename to support/kconfig/README.buildroot2
index 8ff0d09..b92ec14 100644
--- a/package/config/README.buildroot2
+++ b/support/kconfig/README.buildroot2
@@ -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
diff --git a/package/config/check.sh b/support/kconfig/check.sh
similarity index 100%
rename from package/config/check.sh
rename to support/kconfig/check.sh
diff --git a/package/config/conf.c b/support/kconfig/conf.c
similarity index 100%
rename from package/config/conf.c
rename to support/kconfig/conf.c
diff --git a/package/config/confdata.c b/support/kconfig/confdata.c
similarity index 100%
rename from package/config/confdata.c
rename to support/kconfig/confdata.c
diff --git a/package/config/expr.c b/support/kconfig/expr.c
similarity index 100%
rename from package/config/expr.c
rename to support/kconfig/expr.c
diff --git a/package/config/expr.h b/support/kconfig/expr.h
similarity index 100%
rename from package/config/expr.h
rename to support/kconfig/expr.h
diff --git a/package/config/foo.h b/support/kconfig/foo.h
similarity index 100%
rename from package/config/foo.h
rename to support/kconfig/foo.h
diff --git a/package/config/gconf.c b/support/kconfig/gconf.c
similarity index 99%
rename from package/config/gconf.c
rename to support/kconfig/gconf.c
index 21185a0..f9daf98 100644
--- a/package/config/gconf.c
+++ b/support/kconfig/gconf.c
@@ -1521,7 +1521,7 @@ int main(int ac, char *av[])
/* Determine GUI path */
env = getenv(SRCTREE);
if (env)
- 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
diff --git a/package/config/gconf.glade b/support/kconfig/gconf.glade
similarity index 100%
rename from package/config/gconf.glade
rename to support/kconfig/gconf.glade
diff --git a/package/config/images.c b/support/kconfig/images.c
similarity index 100%
rename from package/config/images.c
rename to support/kconfig/images.c
diff --git a/package/config/kconfig_load.c b/support/kconfig/kconfig_load.c
similarity index 100%
rename from package/config/kconfig_load.c
rename to support/kconfig/kconfig_load.c
diff --git a/package/config/kxgettext.c b/support/kconfig/kxgettext.c
similarity index 100%
rename from package/config/kxgettext.c
rename to support/kconfig/kxgettext.c
diff --git a/package/config/lex.zconf.c_shipped b/support/kconfig/lex.zconf.c_shipped
similarity index 100%
rename from package/config/lex.zconf.c_shipped
rename to support/kconfig/lex.zconf.c_shipped
diff --git a/package/config/lkc.h b/support/kconfig/lkc.h
similarity index 100%
rename from package/config/lkc.h
rename to support/kconfig/lkc.h
diff --git a/package/config/lkc_proto.h b/support/kconfig/lkc_proto.h
similarity index 100%
rename from package/config/lkc_proto.h
rename to support/kconfig/lkc_proto.h
diff --git a/package/config/lxdialog/.gitignore b/support/kconfig/lxdialog/.gitignore
similarity index 100%
rename from package/config/lxdialog/.gitignore
rename to support/kconfig/lxdialog/.gitignore
diff --git a/package/config/lxdialog/BIG.FAT.WARNING b/support/kconfig/lxdialog/BIG.FAT.WARNING
similarity index 100%
rename from package/config/lxdialog/BIG.FAT.WARNING
rename to support/kconfig/lxdialog/BIG.FAT.WARNING
diff --git a/package/config/lxdialog/check-lxdialog.sh b/support/kconfig/lxdialog/check-lxdialog.sh
similarity index 100%
rename from package/config/lxdialog/check-lxdialog.sh
rename to support/kconfig/lxdialog/check-lxdialog.sh
diff --git a/package/config/lxdialog/checklist.c b/support/kconfig/lxdialog/checklist.c
similarity index 100%
rename from package/config/lxdialog/checklist.c
rename to support/kconfig/lxdialog/checklist.c
diff --git a/package/config/lxdialog/dialog.h b/support/kconfig/lxdialog/dialog.h
similarity index 100%
rename from package/config/lxdialog/dialog.h
rename to support/kconfig/lxdialog/dialog.h
diff --git a/package/config/lxdialog/inputbox.c b/support/kconfig/lxdialog/inputbox.c
similarity index 100%
rename from package/config/lxdialog/inputbox.c
rename to support/kconfig/lxdialog/inputbox.c
diff --git a/package/config/lxdialog/menubox.c b/support/kconfig/lxdialog/menubox.c
similarity index 100%
rename from package/config/lxdialog/menubox.c
rename to support/kconfig/lxdialog/menubox.c
diff --git a/package/config/lxdialog/textbox.c b/support/kconfig/lxdialog/textbox.c
similarity index 100%
rename from package/config/lxdialog/textbox.c
rename to support/kconfig/lxdialog/textbox.c
diff --git a/package/config/lxdialog/util.c b/support/kconfig/lxdialog/util.c
similarity index 100%
rename from package/config/lxdialog/util.c
rename to support/kconfig/lxdialog/util.c
diff --git a/package/config/lxdialog/yesno.c b/support/kconfig/lxdialog/yesno.c
similarity index 100%
rename from package/config/lxdialog/yesno.c
rename to support/kconfig/lxdialog/yesno.c
diff --git a/package/config/mconf.c b/support/kconfig/mconf.c
similarity index 100%
rename from package/config/mconf.c
rename to support/kconfig/mconf.c
diff --git a/package/config/menu.c b/support/kconfig/menu.c
similarity index 100%
rename from package/config/menu.c
rename to support/kconfig/menu.c
diff --git a/package/config/nconf.c b/support/kconfig/nconf.c
similarity index 100%
rename from package/config/nconf.c
rename to support/kconfig/nconf.c
diff --git a/package/config/nconf.gui.c b/support/kconfig/nconf.gui.c
similarity index 100%
rename from package/config/nconf.gui.c
rename to support/kconfig/nconf.gui.c
diff --git a/package/config/nconf.h b/support/kconfig/nconf.h
similarity index 100%
rename from package/config/nconf.h
rename to support/kconfig/nconf.h
diff --git a/package/config/patches/01-kconfig-kernel-to-buildroot.patch b/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch
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
diff --git a/package/config/patches/02-cpp-comments-to-c-comments.patch b/support/kconfig/patches/02-cpp-comments-to-c-comments.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
diff --git a/package/config/patches/03-change-config-option-prefix.patch b/support/kconfig/patches/03-change-config-option-prefix.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
diff --git a/package/config/patches/05-really-clean-everything.patch b/support/kconfig/patches/05-really-clean-everything.patch
similarity index 100%
rename from package/config/patches/05-really-clean-everything.patch
rename to support/kconfig/patches/05-really-clean-everything.patch
diff --git a/package/config/patches/06-br-build-system-integration.patch b/support/kconfig/patches/06-br-build-system-integration.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
diff --git a/package/config/patches/08-make-write-deps.patch b/support/kconfig/patches/08-make-write-deps.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
--- a/package/config/patches/08-make-write-deps.patch
+++ b/support/kconfig/patches/08-make-write-deps.patch
@@ -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;
diff --git a/package/config/patches/09-implement-kconfig-probability.patch b/support/kconfig/patches/09-implement-kconfig-probability.patch
similarity index 100%
rename from package/config/patches/09-implement-kconfig-probability.patch
rename to support/kconfig/patches/09-implement-kconfig-probability.patch
diff --git a/package/config/patches/10-br-build-system.patch b/support/kconfig/patches/10-br-build-system.patch
similarity index 100%
rename from package/config/patches/10-br-build-system.patch
rename to support/kconfig/patches/10-br-build-system.patch
diff --git a/package/config/patches/11-use-mktemp-for-lxdialog.patch b/support/kconfig/patches/11-use-mktemp-for-lxdialog.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
diff --git a/package/config/patches/12-fix-glade-file-path.patch b/support/kconfig/patches/12-fix-glade-file-path.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
--- a/package/config/patches/12-fix-glade-file-path.patch
+++ b/support/kconfig/patches/12-fix-glade-file-path.patch
@@ -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
diff --git a/package/config/patches/14-support-out-of-tree-config.patch b/support/kconfig/patches/14-support-out-of-tree-config.patch
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
diff --git a/package/config/patches/series b/support/kconfig/patches/series
similarity index 100%
rename from package/config/patches/series
rename to support/kconfig/patches/series
diff --git a/package/config/qconf.cc b/support/kconfig/qconf.cc
similarity index 100%
rename from package/config/qconf.cc
rename to support/kconfig/qconf.cc
diff --git a/package/config/qconf.h b/support/kconfig/qconf.h
similarity index 100%
rename from package/config/qconf.h
rename to support/kconfig/qconf.h
diff --git a/package/config/streamline_config.pl b/support/kconfig/streamline_config.pl
similarity index 100%
rename from package/config/streamline_config.pl
rename to support/kconfig/streamline_config.pl
diff --git a/package/config/symbol.c b/support/kconfig/symbol.c
similarity index 100%
rename from package/config/symbol.c
rename to support/kconfig/symbol.c
diff --git a/package/config/util.c b/support/kconfig/util.c
similarity index 99%
rename from package/config/util.c
rename to support/kconfig/util.c
index f962cef..8a5efaa 100644
--- a/package/config/util.c
+++ b/support/kconfig/util.c
@@ -79,7 +79,7 @@ static int write_make_deps(const char *name)
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;
diff --git a/package/config/zconf.gperf b/support/kconfig/zconf.gperf
similarity index 100%
rename from package/config/zconf.gperf
rename to support/kconfig/zconf.gperf
diff --git a/package/config/zconf.hash.c_shipped b/support/kconfig/zconf.hash.c_shipped
similarity index 100%
rename from package/config/zconf.hash.c_shipped
rename to support/kconfig/zconf.hash.c_shipped
diff --git a/package/config/zconf.l b/support/kconfig/zconf.l
similarity index 100%
rename from package/config/zconf.l
rename to support/kconfig/zconf.l
diff --git a/package/config/zconf.tab.c_shipped b/support/kconfig/zconf.tab.c_shipped
similarity index 100%
rename from package/config/zconf.tab.c_shipped
rename to support/kconfig/zconf.tab.c_shipped
diff --git a/package/config/zconf.y b/support/kconfig/zconf.y
similarity index 100%
rename from package/config/zconf.y
rename to support/kconfig/zconf.y
--
1.7.4.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 7/7] support: move package/gnuconfig to support/gnuconfig
2011-08-31 21:34 [Buildroot] [pull request] Pull request for branch for-2011.11/misc-cleanups Thomas Petazzoni
` (5 preceding siblings ...)
2011-08-31 21:35 ` [Buildroot] [PATCH 6/7] support: move kconfig stuff from package/config to support/kconfig Thomas Petazzoni
@ 2011-08-31 21:35 ` Thomas Petazzoni
2011-09-17 6:23 ` Peter Korsgaard
2011-09-17 6:23 ` [Buildroot] [pull request] Pull request for branch for-2011.11/misc-cleanups Peter Korsgaard
7 siblings, 1 reply; 12+ messages in thread
From: Thomas Petazzoni @ 2011-08-31 21:35 UTC (permalink / raw)
To: buildroot
The CONFIG_UPDATE macro is no longer defined in
package/gnuconfig/gnuconfig.mk, but instead in
package/Makefile.autotools.in. It it also changed a little bit to take
the directory of the package sources as argument, and the AUTOTARGETS
infrastructure is updated to use this macro.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
Makefile | 2 +-
package/Makefile.autotools.in | 24 +++++++++++++++----
package/cups/cups.mk | 2 +-
package/gettext/gettext.mk | 3 +-
package/gnuconfig/README.buildroot | 20 ----------------
package/gnuconfig/gnuconfig.mk | 3 --
package/lmbench/lmbench.mk | 2 +-
{package => support}/gnuconfig/.cvsignore | 0
support/gnuconfig/README.buildroot | 25 ++++++++++++++++++++
{package => support}/gnuconfig/config.guess | 0
{package => support}/gnuconfig/config.sub | 0
.../gnuconfig/patches/config.guess.uclibc.patch | 0
.../gnuconfig/patches/config.sub.ps2.patch | 0
support/scripts/pkg-stats | 1 -
toolchain/elf2flt/elf2flt.mk | 2 +-
toolchain/gcc/gcc-uclibc-4.x.mk | 2 +-
toolchain/gdb/gdb.mk | 2 +-
17 files changed, 51 insertions(+), 37 deletions(-)
delete mode 100644 package/gnuconfig/README.buildroot
delete mode 100644 package/gnuconfig/gnuconfig.mk
rename {package => support}/gnuconfig/.cvsignore (100%)
create mode 100644 support/gnuconfig/README.buildroot
rename {package => support}/gnuconfig/config.guess (100%)
rename {package => support}/gnuconfig/config.sub (100%)
rename {package => support}/gnuconfig/patches/config.guess.uclibc.patch (100%)
rename {package => support}/gnuconfig/patches/config.sub.ps2.patch (100%)
diff --git a/Makefile b/Makefile
index 8dbee7c..b3e1986 100644
--- a/Makefile
+++ b/Makefile
@@ -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)
#############################################################
#
diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in
index 95e38ef..8efc129 100644
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -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
diff --git a/package/cups/cups.mk b/package/cups/cups.mk
index 3b9f2e0..4e8db71 100644
--- a/package/cups/cups.mk
+++ b/package/cups/cups.mk
@@ -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
diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index 332a2ca..f4c8c76 100644
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -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)
diff --git a/package/gnuconfig/README.buildroot b/package/gnuconfig/README.buildroot
deleted file mode 100644
index fd43a68..0000000
--- a/package/gnuconfig/README.buildroot
+++ /dev/null
@@ -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.
diff --git a/package/gnuconfig/gnuconfig.mk b/package/gnuconfig/gnuconfig.mk
deleted file mode 100644
index b6aa5fc..0000000
--- a/package/gnuconfig/gnuconfig.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# See README.buildroot
-gnuconfig-source:
-CONFIG_UPDATE = cp -f package/gnuconfig/config.sub package/gnuconfig/config.guess
diff --git a/package/lmbench/lmbench.mk b/package/lmbench/lmbench.mk
index fefb34f..535fc8c 100644
--- a/package/lmbench/lmbench.mk
+++ b/package/lmbench/lmbench.mk
@@ -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
diff --git a/package/gnuconfig/.cvsignore b/support/gnuconfig/.cvsignore
similarity index 100%
rename from package/gnuconfig/.cvsignore
rename to support/gnuconfig/.cvsignore
diff --git a/support/gnuconfig/README.buildroot b/support/gnuconfig/README.buildroot
new file mode 100644
index 0000000..fe54354
--- /dev/null
+++ b/support/gnuconfig/README.buildroot
@@ -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.
diff --git a/package/gnuconfig/config.guess b/support/gnuconfig/config.guess
similarity index 100%
rename from package/gnuconfig/config.guess
rename to support/gnuconfig/config.guess
diff --git a/package/gnuconfig/config.sub b/support/gnuconfig/config.sub
similarity index 100%
rename from package/gnuconfig/config.sub
rename to support/gnuconfig/config.sub
diff --git a/package/gnuconfig/patches/config.guess.uclibc.patch b/support/gnuconfig/patches/config.guess.uclibc.patch
similarity index 100%
rename from package/gnuconfig/patches/config.guess.uclibc.patch
rename to support/gnuconfig/patches/config.guess.uclibc.patch
diff --git a/package/gnuconfig/patches/config.sub.ps2.patch b/support/gnuconfig/patches/config.sub.ps2.patch
similarity index 100%
rename from package/gnuconfig/patches/config.sub.ps2.patch
rename to support/gnuconfig/patches/config.sub.ps2.patch
diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats
index 7bb2928..bb1c27d 100755
--- a/support/scripts/pkg-stats
+++ b/support/scripts/pkg-stats
@@ -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
diff --git a/toolchain/elf2flt/elf2flt.mk b/toolchain/elf2flt/elf2flt.mk
index 7fecf3e..e74a655 100644
--- a/toolchain/elf2flt/elf2flt.mk
+++ b/toolchain/elf2flt/elf2flt.mk
@@ -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
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 9232290..a2253c9 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -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
diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk
index db46b12..4622616 100644
--- a/toolchain/gdb/gdb.mk
+++ b/toolchain/gdb/gdb.mk
@@ -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
--
1.7.4.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 7/7] support: move package/gnuconfig to support/gnuconfig
2011-08-31 21:35 ` [Buildroot] [PATCH 7/7] support: move package/gnuconfig to support/gnuconfig Thomas Petazzoni
@ 2011-09-17 6:23 ` Peter Korsgaard
2011-09-17 7:02 ` Thomas Petazzoni
0 siblings, 1 reply; 12+ messages in thread
From: Peter Korsgaard @ 2011-09-17 6:23 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> The CONFIG_UPDATE macro is no longer defined in
Thomas> package/gnuconfig/gnuconfig.mk, but instead in
Thomas> package/Makefile.autotools.in. It it also changed a little bit to take
Thomas> the directory of the package sources as argument, and the AUTOTARGETS
Thomas> infrastructure is updated to use this macro.
Thomas> +
Thomas> +#
Thomas> +# Utility function to upgrade config.sub and config.guess files
Thomas> +#
Thomas> +# argument 1 : directory into which config.guess and config.sub need
Thomas> +# to be updated. Note that config.sub and config.guess are searched
Thomas> +# recursively in this directory.
Thomas> +#
Thomas> +define CONFIG_UPDATE
Thomas> + echo $(1)
Thomas> + for file in config.guess config.sub; do \
I've dropped the echo with wrong indentation, otherwise it looks good -
Thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [pull request] Pull request for branch for-2011.11/misc-cleanups
2011-08-31 21:34 [Buildroot] [pull request] Pull request for branch for-2011.11/misc-cleanups Thomas Petazzoni
` (6 preceding siblings ...)
2011-08-31 21:35 ` [Buildroot] [PATCH 7/7] support: move package/gnuconfig to support/gnuconfig Thomas Petazzoni
@ 2011-09-17 6:23 ` Peter Korsgaard
2011-09-17 7:16 ` Thomas Petazzoni
7 siblings, 1 reply; 12+ messages in thread
From: Peter Korsgaard @ 2011-09-17 6:23 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> Hello,
Thomas> This set of patches basically creates a new support/ directory, which
Thomas> is used to group various files needed for the operation of Buildroot
Thomas> which didn't fit properly in other directories :
Thomas> * The various scripts in the scripts/ directory (after removing the
Thomas> unused, unmaintained ones)
Thomas> * The libtool related patches
Thomas> * The patch-kernel.sh script, after renaming it to a more sensible
Thomas> name.
Thomas> * The kconfig stuff
Thomas> * The gnuconfig stuff (config.guess and config.sub)
Thomas> Best regards,
Committed entire series, thanks!
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 7/7] support: move package/gnuconfig to support/gnuconfig
2011-09-17 6:23 ` Peter Korsgaard
@ 2011-09-17 7:02 ` Thomas Petazzoni
0 siblings, 0 replies; 12+ messages in thread
From: Thomas Petazzoni @ 2011-09-17 7:02 UTC (permalink / raw)
To: buildroot
Le Sat, 17 Sep 2011 08:23:15 +0200,
Peter Korsgaard <jacmet@uclibc.org> a ?crit :
> I've dropped the echo with wrong indentation, otherwise it looks good
Indeed, it was a leftover from the debugging session. Sorry for this
and thanks for fixing it.
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [pull request] Pull request for branch for-2011.11/misc-cleanups
2011-09-17 6:23 ` [Buildroot] [pull request] Pull request for branch for-2011.11/misc-cleanups Peter Korsgaard
@ 2011-09-17 7:16 ` Thomas Petazzoni
0 siblings, 0 replies; 12+ messages in thread
From: Thomas Petazzoni @ 2011-09-17 7:16 UTC (permalink / raw)
To: buildroot
Le Sat, 17 Sep 2011 08:23:43 +0200,
Peter Korsgaard <jacmet@uclibc.org> a ?crit :
> Committed entire series, thanks!
Thanks a lot for taking the time to review.
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2011-09-17 7:16 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-31 21:34 [Buildroot] [pull request] Pull request for branch for-2011.11/misc-cleanups Thomas Petazzoni
2011-08-31 21:35 ` [Buildroot] [PATCH 1/7] scripts: remove old, unmaintained, unused scripts Thomas Petazzoni
2011-08-31 21:35 ` [Buildroot] [PATCH 2/7] scripts/mkmakefile: fix typo Thomas Petazzoni
2011-08-31 21:35 ` [Buildroot] [PATCH 3/7] support: move scripts/ to a new support/ directory Thomas Petazzoni
2011-08-31 21:35 ` [Buildroot] [PATCH 4/7] support: move libtool patches in support/libtool Thomas Petazzoni
2011-08-31 21:35 ` [Buildroot] [PATCH 5/7] support: move patch-kernel.sh and rename it Thomas Petazzoni
2011-08-31 21:35 ` [Buildroot] [PATCH 6/7] support: move kconfig stuff from package/config to support/kconfig Thomas Petazzoni
2011-08-31 21:35 ` [Buildroot] [PATCH 7/7] support: move package/gnuconfig to support/gnuconfig Thomas Petazzoni
2011-09-17 6:23 ` Peter Korsgaard
2011-09-17 7:02 ` Thomas Petazzoni
2011-09-17 6:23 ` [Buildroot] [pull request] Pull request for branch for-2011.11/misc-cleanups Peter Korsgaard
2011-09-17 7:16 ` Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox