Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/320342/?format=api
{ "id": 320342, "url": "http://patchwork.ozlabs.org/api/patches/320342/?format=api", "web_url": "http://patchwork.ozlabs.org/project/buildroot/patch/1392371709-26662-3-git-send-email-fabio.porcedda@gmail.com/", "project": { "id": 27, "url": "http://patchwork.ozlabs.org/api/projects/27/?format=api", "name": "Buildroot development", "link_name": "buildroot", "list_id": "buildroot.buildroot.org", "list_email": "buildroot@buildroot.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1392371709-26662-3-git-send-email-fabio.porcedda@gmail.com>", "list_archive_url": null, "date": "2014-02-14T09:55:04", "name": "[v13,2/7] package: add toolchain dependency to every target package", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "310972c20f78a4e242e10fe5dad03a5d31dd092c", "submitter": { "id": 13215, "url": "http://patchwork.ozlabs.org/api/people/13215/?format=api", "name": "Fabio Porcedda", "email": "fabio.porcedda@gmail.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/buildroot/patch/1392371709-26662-3-git-send-email-fabio.porcedda@gmail.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/320342/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/320342/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<buildroot-bounces@busybox.net>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "buildroot@lists.busybox.net" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "buildroot@osuosl.org" ], "Received": [ "from silver.osuosl.org (silver.osuosl.org [140.211.166.136])\n\tby ozlabs.org (Postfix) with ESMTP id 1C8B52C0098\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 14 Feb 2014 20:55:27 +1100 (EST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 4C97731CA7;\n\tFri, 14 Feb 2014 09:55:26 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id oBns2HrKCFyx; Fri, 14 Feb 2014 09:55:24 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 5DC8A32F36;\n\tFri, 14 Feb 2014 09:55:24 +0000 (UTC)", "from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 7B5241C2358\n\tfor <buildroot@lists.busybox.net>;\n\tFri, 14 Feb 2014 09:55:23 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 76A548BEDB\n\tfor <buildroot@lists.busybox.net>;\n\tFri, 14 Feb 2014 09:55:23 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id pAWmtn53DyeC for <buildroot@lists.busybox.net>;\n\tFri, 14 Feb 2014 09:55:21 +0000 (UTC)", "from mail-pa0-f49.google.com (mail-pa0-f49.google.com\n\t[209.85.220.49])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id A0B7A8BEB9\n\tfor <buildroot@uclibc.org>; Fri, 14 Feb 2014 09:55:21 +0000 (UTC)", "by mail-pa0-f49.google.com with SMTP id hz1so12022723pad.22\n\tfor <buildroot@uclibc.org>; Fri, 14 Feb 2014 01:55:21 -0800 (PST)", "from ld2077.tmt.telital.com ([213.205.6.118])\n\tby mx.google.com with ESMTPSA id\n\tos1sm36815176pac.20.2014.02.14.01.55.18 for <multiple recipients>\n\t(version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128);\n\tFri, 14 Feb 2014 01:55:20 -0800 (PST)" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=C075P0TNVTJ9RA6PguNyfm7ACUC0YqOdROzwSOO5Q3k=;\n\tb=OthooMVfD+0EYpAQEJNug9RE1eS3nCQY0DlxFJ9LDvEp4/ZmzqM1GXIifSHuikrRyN\n\t8kxD24ybwlEx+KpkKwQZ2NEdknf4vUSU/7L6xmbl/NGaB9QGTidH4o3+HhFdtvkwUIhd\n\t6sLduS3ePe8etx6N8HsciAucZ8s+WFfTgX/Hrwp1aEe4LXoXu06NbkYFusRZSzg+dPRc\n\tVQFjYWHwjlala3bM+upbb854XuZAU+jz6Ba8T1iSNvMoZCZcsE8w2hrJJxE3u8itGt1a\n\tpCP3jBYfIgHCZlOjuokE59ED5lCBgA/R24+wXVq7UsT+XaifK5xv8xvoBxUeGanXaAJh\n\tLHbA==", "X-Received": "by 10.68.0.99 with SMTP id 3mr7982395pbd.68.1392371721299;\n\tFri, 14 Feb 2014 01:55:21 -0800 (PST)", "From": "Fabio Porcedda <fabio.porcedda@gmail.com>", "To": "buildroot@uclibc.org", "Date": "Fri, 14 Feb 2014 10:55:04 +0100", "Message-Id": "<1392371709-26662-3-git-send-email-fabio.porcedda@gmail.com>", "X-Mailer": "git-send-email 1.8.5.2", "In-Reply-To": "<1392371709-26662-1-git-send-email-fabio.porcedda@gmail.com>", "References": "<1392371709-26662-1-git-send-email-fabio.porcedda@gmail.com>", "Cc": "Thomas Petazzoni <thomas.petazzoni@free-electrons.com>,\n\tDallas Clement <dallas.a.clement@gmail.com>", "Subject": "[Buildroot] [PATCH v13 2/7] package: add toolchain dependency to\n\tevery target package", "X-BeenThere": "buildroot@busybox.net", "X-Mailman-Version": "2.1.14", "Precedence": "list", "List-Id": "Discussion and development of buildroot <buildroot.busybox.net>", "List-Unsubscribe": "<http://lists.busybox.net/mailman/options/buildroot>,\n\t<mailto:buildroot-request@busybox.net?subject=unsubscribe>", "List-Archive": "<http://lists.busybox.net/pipermail/buildroot>", "List-Post": "<mailto:buildroot@busybox.net>", "List-Help": "<mailto:buildroot-request@busybox.net?subject=help>", "List-Subscribe": "<http://lists.busybox.net/mailman/listinfo/buildroot>,\n\t<mailto:buildroot-request@busybox.net?subject=subscribe>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "buildroot-bounces@busybox.net", "Sender": "buildroot-bounces@busybox.net" }, "content": "This commit makes the dependency from the target toolchain explicit.\nThis way we can buid from command line a package that use\ninner-generic-package right after the configuration phase, example:\n\n\tmake clean <package-name>\n\nAlso remove TARGETS_ALL because the only purpose was to add toolchain\ndependency so it's superseded by this commit.\n\nTo prevent circular dependency add the new variable\n<pkgname>_ADD_TOOLCHAIN_DEPENDENCY to avoid adding the toolchain\ndependency for toolchain packages.\n\nThis is also a step forward supporting top-level parallel make.\n\nSigned-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>\nAcked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>\n---\n Makefile | 8 ++------\n package/glibc/glibc.mk | 3 +++\n package/linux-headers/linux-headers.mk | 3 +++\n package/pkg-autotools.mk | 3 ++-\n package/pkg-cmake.mk | 2 +-\n package/pkg-generic.mk | 14 ++++++++++++--\n package/pkg-python.mk | 2 +-\n package/uclibc/uclibc.mk | 3 +++\n toolchain/toolchain-buildroot/toolchain-buildroot.mk | 2 ++\n toolchain/toolchain-external/toolchain-external.mk | 2 ++\n toolchain/toolchain/toolchain.mk | 2 ++\n 11 files changed, 33 insertions(+), 11 deletions(-)", "diff": "diff --git a/Makefile b/Makefile\nindex 74022a5..8e65bc7 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -399,7 +399,6 @@ TARGETS+=target-post-image\n \n TARGETS_SOURCE:=$(patsubst %,%-source,$(TARGETS) $(BASE_TARGETS))\n TARGETS_DIRCLEAN:=$(patsubst %,%-dirclean,$(TARGETS))\n-TARGETS_ALL:=$(patsubst %,__real_tgt_%,$(TARGETS))\n \n # host-* dependencies have to be handled specially, as those aren't\n # visible in Kconfig and hence not added to a variable like TARGETS.\n@@ -422,9 +421,6 @@ HOST_SOURCE += $(addsuffix -source,$(sort $(TARGETS_HOST_DEPS) $(HOST_DEPS)))\n TARGETS_LEGAL_INFO:=$(patsubst %,%-legal-info,\\\n \t\t$(TARGETS) $(BASE_TARGETS) $(TARGETS_HOST_DEPS) $(HOST_DEPS))))\n \n-# all targets depend on the crosscompiler and it's prerequisites\n-$(TARGETS_ALL): __real_tgt_%: $(BASE_TARGETS) %\n-\n dirs: $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \\\n \t$(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR)\n \n@@ -433,11 +429,11 @@ $(BUILD_DIR)/buildroot-config/auto.conf: $(BR2_CONFIG)\n \n prepare: $(BUILD_DIR)/buildroot-config/auto.conf\n \n-world: $(BASE_TARGETS) $(TARGETS_ALL)\n+world: $(TARGETS)\n \n .PHONY: all world toolchain dirs clean distclean source outputmakefile \\\n \tlegal-info legal-info-prepare legal-info-clean printvars \\\n-\t$(BASE_TARGETS) $(TARGETS) $(TARGETS_ALL) \\\n+\t$(BASE_TARGETS) $(TARGETS) \\\n \t$(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) $(TARGETS_LEGAL_INFO) \\\n \t$(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \\\n \t$(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR)\ndiff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk\nindex 89eaaf6..f50b459 100644\n--- a/package/glibc/glibc.mk\n+++ b/package/glibc/glibc.mk\n@@ -31,6 +31,9 @@ endif\n GLIBC_LICENSE = GPLv2+ (programs), LGPLv2.1+, BSD-3c, MIT (library)\n GLIBC_LICENSE_FILES = $(addprefix $(GLIBC_SRC_SUBDIR)/,COPYING COPYING.LIB LICENSES)\n \n+# glibc is part of the toolchain so disable the toolchain dependency\n+GLIBC_ADD_TOOLCHAIN_DEPENDENCY = NO\n+\n # Before (e)glibc is configured, we must have the first stage\n # cross-compiler and the kernel headers\n GLIBC_DEPENDENCIES = host-gcc-initial linux-headers host-gawk\ndiff --git a/package/linux-headers/linux-headers.mk b/package/linux-headers/linux-headers.mk\nindex 30d3076..6dac9e3 100644\n--- a/package/linux-headers/linux-headers.mk\n+++ b/package/linux-headers/linux-headers.mk\n@@ -17,6 +17,9 @@ LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.xz\n \n LINUX_HEADERS_INSTALL_STAGING = YES\n \n+# linux-headers is part of the toolchain so disable the toolchain dependency\n+LINUX_HEADERS_ADD_TOOLCHAIN_DEPENDENCY = NO\n+\n define LINUX_HEADERS_INSTALL_STAGING_CMDS\n \t(cd $(@D); \\\n \t\t$(TARGET_MAKE_ENV) $(MAKE) \\\ndiff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk\nindex 5f6c31d..32ceef2 100644\n--- a/package/pkg-autotools.mk\n+++ b/package/pkg-autotools.mk\n@@ -210,7 +210,8 @@ endef\n # This must be repeated from inner-generic-package, otherwise we get an empty\n # _DEPENDENCIES if _AUTORECONF is YES. Also filter the result of _AUTORECONF\n # away from the non-host rule\n-$(2)_DEPENDENCIES ?= $(filter-out host-automake host-autoconf host-libtool $(1),\\\n+$(2)_DEPENDENCIES ?= $(filter-out host-automake host-autoconf host-libtool \\\n+\t\t\t\thost-toolchain $(1),\\\n $(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES))))\n \n \ndiff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk\nindex dbe0d97..f7e454b 100644\n--- a/package/pkg-cmake.mk\n+++ b/package/pkg-cmake.mk\n@@ -89,7 +89,7 @@ endif\n \n # This must be repeated from inner-generic-package, otherwise we only get\n # host-cmake in _DEPENDENCIES because of the following line\n-$(2)_DEPENDENCIES ?= $(filter-out $(1),$(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES))))\n+$(2)_DEPENDENCIES ?= $(filter-out host-toolchain $(1),$(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES))))\n \n $(2)_DEPENDENCIES += host-cmake\n \ndiff --git a/package/pkg-generic.mk b/package/pkg-generic.mk\nindex e5b04ff..b135b14 100644\n--- a/package/pkg-generic.mk\n+++ b/package/pkg-generic.mk\n@@ -351,8 +351,18 @@ endif\n \n $(2)_REDISTRIBUTE\t\t?= YES\n \n-\n-$(2)_DEPENDENCIES ?= $(filter-out $(1),$(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES))))\n+# When a target package is a toolchain dependency set this variable to\n+# 'NO' so the 'toolchain' dependency is not added to prevent a circular\n+# dependency\n+$(2)_ADD_TOOLCHAIN_DEPENDENCY\t?= YES\n+\n+$(2)_DEPENDENCIES ?= $(filter-out host-toolchain $(1),\\\n+\t$(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES))))\n+ifeq ($(4),target)\n+ifeq ($$($(2)_ADD_TOOLCHAIN_DEPENDENCY),YES)\n+$(2)_DEPENDENCIES += toolchain\n+endif\n+endif\n \n $(2)_INSTALL_STAGING\t\t?= NO\n $(2)_INSTALL_IMAGES\t\t?= NO\ndiff --git a/package/pkg-python.mk b/package/pkg-python.mk\nindex 9b3c97a..f33980a 100644\n--- a/package/pkg-python.mk\n+++ b/package/pkg-python.mk\n@@ -142,7 +142,7 @@ endif\n # be derived automatically from the dependencies of the corresponding\n # target package. For example, target packages need\n # host-python-distutilscross, but not host packages.\n-$(2)_DEPENDENCIES ?= $(filter-out host-python host-python-setuptools host-python-distutilscross $(1),$(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES))))\n+$(2)_DEPENDENCIES ?= $(filter-out host-python host-python-setuptools host-python-distutilscross host-toolchain $(1),$(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES))))\n \n # Target packages need both the python interpreter on the target (for\n # runtime) and the python interpreter on the host (for\ndiff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk\nindex 7df9721..ea1c694 100644\n--- a/package/uclibc/uclibc.mk\n+++ b/package/uclibc/uclibc.mk\n@@ -22,6 +22,9 @@ endif\n \n UCLIBC_INSTALL_STAGING = YES\n \n+# uclibc is part of the toolchain so disable the toolchain dependency\n+UCLIBC_ADD_TOOLCHAIN_DEPENDENCY = NO\n+\n # Before uClibc is configured, we must have the first stage\n # cross-compiler and the kernel headers\n UCLIBC_DEPENDENCIES = host-gcc-initial linux-headers\ndiff --git a/toolchain/toolchain-buildroot/toolchain-buildroot.mk b/toolchain/toolchain-buildroot/toolchain-buildroot.mk\nindex 2b5028c..853baf8 100644\n--- a/toolchain/toolchain-buildroot/toolchain-buildroot.mk\n+++ b/toolchain/toolchain-buildroot/toolchain-buildroot.mk\n@@ -14,4 +14,6 @@ BR_LIBC = $(call qstrip,$(BR2_TOOLCHAIN_BUILDROOT_LIBC))\n \n TOOLCHAIN_BUILDROOT_DEPENDENCIES = host-gcc-final\n \n+TOOLCHAIN_BUILDROOT_ADD_TOOLCHAIN_DEPENDENCY = NO\n+\n $(eval $(generic-package))\ndiff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk\nindex a7bfafc..51da480 100644\n--- a/toolchain/toolchain-external/toolchain-external.mk\n+++ b/toolchain/toolchain-external/toolchain-external.mk\n@@ -366,6 +366,8 @@ TOOLCHAIN_EXTERNAL_SITE =\n TOOLCHAIN_EXTERNAL_SOURCE =\n endif\n \n+TOOLCHAIN_EXTERNAL_ADD_TOOLCHAIN_DEPENDENCY = NO\n+\n TOOLCHAIN_EXTERNAL_INSTALL_STAGING = YES\n \n ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2013R1),y)\ndiff --git a/toolchain/toolchain/toolchain.mk b/toolchain/toolchain/toolchain.mk\nindex 8559ac9..7241fe7 100644\n--- a/toolchain/toolchain/toolchain.mk\n+++ b/toolchain/toolchain/toolchain.mk\n@@ -12,6 +12,8 @@ else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)\n TOOLCHAIN_DEPENDENCIES += toolchain-external\n endif\n \n+TOOLCHAIN_ADD_TOOLCHAIN_DEPENDENCY = NO\n+\n $(eval $(generic-package))\n \n toolchain: $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake\n", "prefixes": [ "v13", "2/7" ] }