From patchwork Sun Jan 13 23:15:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sagaert Johan X-Patchwork-Id: 211665 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id E75D72C00A9 for ; Mon, 14 Jan 2013 10:15:30 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1E3F789FAD; Sun, 13 Jan 2013 23:15:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FtRxIOcEaTYt; Sun, 13 Jan 2013 23:15:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id E142A814CA; Sun, 13 Jan 2013 23:15:18 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id BC6B28F7A0 for ; Sun, 13 Jan 2013 23:15:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4D2F1814CA for ; Sun, 13 Jan 2013 23:15:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TX25+Vj427Eb for ; Sun, 13 Jan 2013 23:15:11 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailrelay011.isp.belgacom.be (mailrelay011.isp.belgacom.be [195.238.6.178]) by whitealder.osuosl.org (Postfix) with ESMTP id 431CD814B9 for ; Sun, 13 Jan 2013 23:15:08 +0000 (UTC) X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AgEFAL0+81BR8dwC/2dsb2JhbABEuXyECBdzgh8BAQQBAQEFVhALDQMCBgMhHgcZDgELBg0RAQEEEwgDh3wDBg0Iq2MMh1eQTWEDjX2BCoEigzSDSogxhnyCdg Received: from 2.220-241-81.adsl-dyn.isp.belgacom.be (HELO JohanW7) ([81.241.220.2]) by relay.skynet.be with ESMTP; 14 Jan 2013 00:15:06 +0100 From: "Sagaert Johan" To: "'Yann E. MORIN'" References: <20130113221602.6AFBD99C29@busybox.osuosl.org> In-Reply-To: <20130113221602.6AFBD99C29@busybox.osuosl.org> Date: Mon, 14 Jan 2013 00:15:06 +0100 Message-ID: <9C8E62D5EF05422F9C541B3F67D72768@JohanW7> MIME-Version: 1.0 X-Mailer: Microsoft Office Outlook 11 Thread-Index: Ac3x28IW+55SkTD5Qh2Ry0rE3oseEAAB7+lA X-MimeOLE: Produced By Microsoft MimeOLE V6.1.7601.17609 Cc: buildroot@busybox.net Subject: Re: [Buildroot] [git commit] Makefile: use newly-introducedBUILDROOT_CONFIG breaks build X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Hi This changes seem to break the build. Snip ... rm -rf /home/buildroot12git/output/toolchain/uClibc-0.9.33.2 bzcat /home/johan/dl/uClibc-0.9.33.2.tar.bz2 | tar -C /home/buildroot12git/output/toolchain -xf - touch /home/buildroot12git/output/toolchain/uClibc-0.9.33.2/.unpacked support/scripts/apply-patches.sh /home/buildroot12git/output/toolchain/uClibc-0.9.33.2 toolchain/uClibc/ \ uClibc-0.9.33.2-\*.patch \ uClibc-0.9.33.2-\*.patch.arm Applying uClibc-0.9.33.2-define-MSG_CMSG_CLOEXEC.patch using patch: patching file libc/sysdeps/linux/common/bits/socket.h Applying uClibc-0.9.33.2-dup3.patch using patch: patching file include/unistd.h patching file libc/sysdeps/linux/common/dup3.c touch /home/buildroot12git/output/toolchain/uClibc-0.9.33.2/.patched cp -f /home/buildroot12git/board/karo/uClibc-0.9.33.config /home/buildroot12git/output/toolchain/uClibc-0.9.33.2/.oldconfig /bin/sed -i -e 's,^CROSS_COMPILER_PREFIX=.*,CROSS_COMPILER_PREFIX="/home/buildroot12git/output/host/usr/bin/arm-buildroot-linux-uclibcgnueabi-",g' \ -e 's,# TARGET_arm is not set,TARGET_arm=y,g' \ -e 's,^TARGET_ARCH=".*",TARGET_ARCH=\"arm\",g' \ -e 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE=\"/home/buildroot12git/output/toolchain/linux\",g' \ -e 's,^KERNEL_HEADERS=.*,KERNEL_HEADERS=\"/home/buildroot12git/output/toolchain/linux/include\",g' \ -e 's,^RUNTIME_PREFIX=.*,RUNTIME_PREFIX=\"/\",g' \ -e 's,^DEVEL_PREFIX=.*,DEVEL_PREFIX=\"/usr/\",g' \ -e 's,^SHARED_LIB_LOADER_PREFIX=.*,SHARED_LIB_LOADER_PREFIX=\"/lib\",g' \ /home/buildroot12git/output/toolchain/uClibc-0.9.33.2/.oldconfig (/bin/echo "# CONFIG_GENERIC_ARM is not set"; \ /bin/echo "# CONFIG_ARM610 is not set"; \ /bin/echo "# CONFIG_ARM710 is not set"; \ /bin/echo "# CONFIG_ARM7TDMI is not set"; \ /bin/echo "# CONFIG_ARM720T is not set"; \ /bin/echo "# CONFIG_ARM920T is not set"; \ /bin/echo "# CONFIG_ARM922T is not set"; \ /bin/echo "# CONFIG_ARM926T is not set"; \ /bin/echo "# CONFIG_ARM10T is not set"; \ /bin/echo "# CONFIG_ARM1136JF_S is not set"; \ /bin/echo "# CONFIG_ARM1176JZ_S is not set"; \ /bin/echo "# CONFIG_ARM1176JZF_S is not set"; \ /bin/echo "# CONFIG_ARM_SA110 is not set"; \ /bin/echo "# CONFIG_ARM_SA1100 is not set"; \ /bin/echo "# CONFIG_ARM_XSCALE is not set"; \ /bin/echo "# CONFIG_ARM_IWMMXT is not set"; \ ) >> /home/buildroot12git/output/toolchain/uClibc-0.9.33.2/.oldconfig /bin/sed -i -e 's/^\(CONFIG_[^_]*[_]*ARM[^=]*\)=.*/# \1 is not set/g' \ /home/buildroot12git/output/toolchain/uClibc-0.9.33.2/.oldconfig /bin/sed -i -e 's/^.*CONFIG_ARM_CORTEXA8.*/CONFIG_ARM_CORTEXA8=y/g' /home/buildroot12git/output/toolchain/uClibc-0.9.33.2/.oldconfig /bin/sed -i -e '/CONFIG_ARM_.ABI/d' /home/buildroot12git/output/toolchain/uClibc-0.9.33.2/.oldconfig /bin/echo "# CONFIG_ARM_OABI is not set" >> /home/buildroot12git/output/toolchain/uClibc-0.9.33.2/.oldconfig /bin/echo "CONFIG_ARM_EABI=y" >> /home/buildroot12git/output/toolchain/uClibc-0.9.33.2/.oldconfig # The above doesn't work for me, so redo /bin/sed -i -e 's/.*\(ARCH_BIG_ENDIAN\).*/# \1 is not set/g' \ -e 's/.*\(ARCH_WANTS_BIG_ENDIAN\).*/# \1 is not set/g' \ -e 's/.*\(ARCH_LITTLE_ENDIAN\).*/\1=y/g' \ -e 's/.*\(ARCH_WANTS_LITTLE_ENDIAN\).*/\1=y/g' \ /home/buildroot12git/output/toolchain/uClibc-0.9.33.2/.oldconfig /bin/sed -i -e 's,.*UCLIBC_HAS_LFS.*,UCLIBC_HAS_LFS=y,g' /home/buildroot12git/output/toolchain/uClibc-0.9.33.2/.oldconfig /bin/sed -i -e 's,^.*UCLIBC_HAS_IPV6.*,UCLIBC_HAS_IPV6=y,g' /home/buildroot12git/output/toolchain/uClibc-0.9.33.2/.oldconfig /bin/sed -i -e 's,^.*UCLIBC_HAS_RPC.*,UCLIBC_HAS_RPC=y,g' \ -e 's,^.*UCLIBC_HAS_FULL_RPC.*,UCLIBC_HAS_FULL_RPC=y,g' \ -e 's,^.*UCLIBC_HAS_REENTRANT_RPC.*,UCLIBC_HAS_REENTRANT_RPC=y,g' \ /home/buildroot12git/output/toolchain/uClibc-0.9.33.2/.oldconfig /bin/sed -i -e '/UCLIBC_HAS_FLOATS/d' \ -e 's,.*UCLIBC_HAS_FPU.*,UCLIBC_HAS_FPU=y\nHAS_FPU=y\nUCLIBC_HAS_FLOATS=y\n,g' \ /home/buildroot12git/output/toolchain/uClibc-0.9.33.2/.oldconfig /bin/sed -i -e 's,^.*UCLIBC_HAS_SSP[^_].*,UCLIBC_HAS_SSP=n,g' /home/buildroot12git/output/toolchain/uClibc-0.9.33.2/.oldconfig /bin/sed -i -e '/UCLIBC_HAS_THREADS/d' /home/buildroot12git/output/toolchain/uClibc-0.9.33.2/.oldconfig /bin/sed -i -e '/LINUXTHREADS/d' /home/buildroot12git/output/toolchain/uClibc-0.9.33.2/.oldconfig /bin/sed -i -e '/LINUXTHREADS_OLD/d' /home/buildroot12git/output/toolchain/uClibc-0.9.33.2/.oldconfig /bin/sed -i -e '/PTHREADS_DEBUG_SUPPORT/d' /home/buildroot12git/output/toolchain/uClibc-0.9.33.2/.oldconfig /bin/sed -i -e '/UCLIBC_HAS_THREADS_NATIVE/d' /home/buildroot12git/output/toolchain/uClibc-0.9.33.2/.oldconfig echo "UCLIBC_HAS_THREADS=y" >> /home/buildroot12git/output/toolchain/uClibc-0.9.33.2/.oldconfig echo "# LINUXTHREADS is not set" >> /home/buildroot12git/output/toolchain/uClibc-0.9.33.2/.oldconfig echo "# LINUXTHREADS_NEW is not set" >> /home/buildroot12git/output/toolchain/uClibc-0.9.33.2/.oldconfig echo "# LINUXTHREADS_OLD is not set" >> /home/buildroot12git/output/toolchain/uClibc-0.9.33.2/.oldconfig echo "UCLIBC_HAS_THREADS_NATIVE=y" >> /home/buildroot12git/output/toolchain/uClibc-0.9.33.2/.oldconfig echo "PTHREADS_DEBUG_SUPPORT=y" >> /home/buildroot12git/output/toolchain/uClibc-0.9.33.2/.oldconfig /bin/sed -i -e 's,^.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=y\n# UCLIBC_BUILD_ALL_LOCALE is not set\nUCLIBC_BUILD_MINIMAL_LOCALE=y\nUCLIBC_BUILD_MINIMAL_LOCALES="en_US"\nUCLIBC_PREGENERATED_LOCALE_DATA=n\nUCLIBC_DOWNLOAD_PREGENE RATED_LOCALE_DATA=n\nUCLIBC_HAS_XLOCALE=y\nUCLIBC_HAS_GLIBC_DIGIT_GROUPING=n\n,g' /home/buildroot12git/output/toolchain/uClibc-0.9.33.2/.oldconfig /bin/sed -i -e 's,^.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g' /home/buildroot12git/output/toolchain/uClibc-0.9.33.2/.oldconfig cp -f /home/buildroot12git/output/toolchain/uClibc-0.9.33.2/.oldconfig /home/buildroot12git/output/toolchain/uClibc-0.9.33.2/.config mkdir -p /home/buildroot12git/output/toolchain/uClibc_dev/usr/include mkdir -p /home/buildroot12git/output/toolchain/uClibc_dev/usr/lib mkdir -p /home/buildroot12git/output/toolchain/uClibc_dev/lib /usr/bin/make -j1 -C /home/buildroot12git/output/toolchain/uClibc-0.9.33.2 \ ARCH="arm" \ PREFIX=/home/buildroot12git/output/toolchain/uClibc_dev/ \ DEVEL_PREFIX=/usr/ \ RUNTIME_PREFIX=/home/buildroot12git/output/toolchain/uClibc_dev/ \ CROSS_COMPILE="/home/buildroot12git/output/host/usr/bin/arm-buildroot-linux-uclibcgnueabi-" \ UCLIBC_EXTRA_CFLAGS="" \ HOSTCC="/usr/bin/gcc" \ oldconfig make[1]: Entering directory `/home/buildroot12git/output/toolchain/uClibc-0.9.33.2' Makefile.in:425: target `output/libm' given more than once in the same rule. Makefile.in:425: target `output/libubacktrace' given more than once in the same rule. MKDIR include/config MKDIR extra/config/lxdialog /bin/sh: line 0: cd: output/extra/config: No such file or directory HOSTCC-o extra/config/conf.o Assembler messages: Fatal error: can't create output/extra/config/conf.o: No such file or directory make[2]: *** [output/extra/config/conf.o] Error 1 make[1]: *** [output/extra/config/conf] Error 2 make[1]: Leaving directory `/home/buildroot12git/output/toolchain/uClibc-0.9.33.2' make: *** [/home/buildroot12git/output/toolchain/uClibc-0.9.33.2/.config] Error 2 Snip... I attached my configuratiuon file. Regards johan -----Oorspronkelijk bericht----- Van: buildroot-bounces@busybox.net [mailto:buildroot-bounces@busybox.net] Namens Peter Korsgaard Verzonden: zondag 13 januari 2013 23:14 Aan: buildroot@busybox.net Onderwerp: [Buildroot] [git commit] Makefile: use newly-introducedBUILDROOT_CONFIG commit: http://git.buildroot.net/buildroot/commit/?id=dcb79995aaaa6f1aa9a7d782df8bbccbda1ff409 branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- Makefile | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) $(BASE_TARGETS): dirs $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake -$(BUILD_DIR)/buildroot-config/auto.conf: $(CONFIG_DIR)/.config +$(BUILD_DIR)/buildroot-config/auto.conf: $(BUILDROOT_CONFIG) $(MAKE) $(EXTRAMAKEARGS) HOSTCC="$(HOSTCC_NOCCACHE)" HOSTCXX="$(HOSTCXX_NOCCACHE)" silentoldconfig prepare: $(BUILD_DIR)/buildroot-config/auto.conf @@ -557,7 +557,7 @@ legal-info-prepare: $(LEGAL_INFO_DIR) @$(call legal-manifest,buildroot,$(BR2_VERSION_FULL),GPLv2+,COPYING,not saved) @$(call legal-warning,the Buildroot source code has not been saved) @$(call legal-warning,the toolchain has not been saved) - @cp $(CONFIG_DIR)/.config $(LEGAL_INFO_DIR)/buildroot.config + @cp $(BUILDROOT_CONFIG) $(LEGAL_INFO_DIR)/buildroot.config legal-info: dirs legal-info-clean legal-info-prepare $(REDIST_SOURCES_DIR) \ $(TARGETS_LEGAL_INFO) @@ -590,7 +590,7 @@ COMMON_CONFIG_ENV = \ KCONFIG_AUTOCONFIG=$(BUILD_DIR)/buildroot-config/auto.conf \ KCONFIG_AUTOHEADER=$(BUILD_DIR)/buildroot-config/autoconf.h \ KCONFIG_TRISTATE=$(BUILD_DIR)/buildroot-config/tristate.config \ - BUILDROOT_CONFIG=$(CONFIG_DIR)/.config + BUILDROOT_CONFIG=$(BUILDROOT_CONFIG) xconfig: $(BUILD_DIR)/buildroot-config/qconf outputmakefile @mkdir -p $(BUILD_DIR)/buildroot-config @@ -630,7 +630,7 @@ allnoconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile randpackageconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile @mkdir -p $(BUILD_DIR)/buildroot-config - @grep -v BR2_PACKAGE_ $(CONFIG_DIR)/.config > $(CONFIG_DIR)/.config.nopkg + @grep -v BR2_PACKAGE_ $(BUILDROOT_CONFIG) > +$(CONFIG_DIR)/.config.nopkg @grep '^config BR2_PACKAGE_' Config.in.legacy | \ while read config pkg; do \ echo "# $$pkg is not set" >> $(CONFIG_DIR)/.config.nopkg; done @@ -641,7 +641,7 @@ randpackageconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile allyespackageconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile @mkdir -p $(BUILD_DIR)/buildroot-config - @grep -v BR2_PACKAGE_ $(CONFIG_DIR)/.config > $(CONFIG_DIR)/.config.nopkg + @grep -v BR2_PACKAGE_ $(BUILDROOT_CONFIG) > +$(CONFIG_DIR)/.config.nopkg @grep '^config BR2_PACKAGE_' Config.in.legacy | \ while read config pkg; do \ echo "# $$pkg is not set" >> $(CONFIG_DIR)/.config.nopkg; done @@ -652,7 +652,7 @@ allyespackageconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile allnopackageconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile @mkdir -p $(BUILD_DIR)/buildroot-config - @grep -v BR2_PACKAGE_ $(CONFIG_DIR)/.config > $(CONFIG_DIR)/.config.nopkg + @grep -v BR2_PACKAGE_ $(BUILDROOT_CONFIG) > +$(CONFIG_DIR)/.config.nopkg @$(COMMON_CONFIG_ENV) \ KCONFIG_ALLCONFIG=$(CONFIG_DIR)/.config.nopkg \ $< --allnoconfig $(CONFIG_CONFIG_IN) @@ -706,7 +706,7 @@ endif ifeq ($(O),output) rm -rf $(O) endif - rm -rf $(CONFIG_DIR)/.config $(CONFIG_DIR)/.config.old $(CONFIG_DIR)/.auto.deps + rm -rf $(BUILDROOT_CONFIG) $(CONFIG_DIR)/.config.old +$(CONFIG_DIR)/.auto.deps cross: $(BASE_TARGETS) diff --git a/Makefile b/Makefile index 5a83251..16b5ef4 100644 --- a/Makefile +++ b/Makefile @@ -95,7 +95,7 @@ BUILDROOT_CONFIG=$(CONFIG_DIR)/.config # Pull in the user's configuration file ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) --include $(CONFIG_DIR)/.config +-include $(BUILDROOT_CONFIG) endif # To put more focus on warnings, be less verbose as default @@ -383,7 +383,7 @@ dirs: $(TOOLCHAIN_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \