From patchwork Thu Jan 10 09:35:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Dawson X-Patchwork-Id: 210965 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id B07FA2C031E for ; Thu, 10 Jan 2013 20:35:35 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 64544311F0; Thu, 10 Jan 2013 09:35:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Rk6g94mG-6Oa; Thu, 10 Jan 2013 09:35:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 28AFB311E6; Thu, 10 Jan 2013 09:35:32 +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 177898F79A for ; Thu, 10 Jan 2013 09:35:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id CC47E8CAF1 for ; Thu, 10 Jan 2013 09:35:30 +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 U-7iSiIezzwg for ; Thu, 10 Jan 2013 09:35:25 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ee0-f50.google.com (mail-ee0-f50.google.com [74.125.83.50]) by whitealder.osuosl.org (Postfix) with ESMTPS id 6F77D8CA8B for ; Thu, 10 Jan 2013 09:35:25 +0000 (UTC) Received: by mail-ee0-f50.google.com with SMTP id b45so159917eek.9 for ; Thu, 10 Jan 2013 01:35:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:subject:date:message-id:x-mailer; bh=/t9IE19b1tOjvrgr1h5DQUWstiSLkeCpzGaHnYlatgw=; b=Qfkjr8YmQMnBOz2XSf8rdxAhSJ4LVz5XWO3Ngn15z/E9U28hq8wgYezFFQ9ITZb5Jl rslXi0uqO5ztOWGCFea0eYYclp8cgCaNzjfcpHtbUAPNDlGlrwO4MUYElyA48nbQW/bZ Br3gLABySbJFdmUXwVfkUOR3XNf7N9YiGcBioJ3M/FRikCMhiNqMAfWqbMjwzxU49S9u 7cvMB/MGIWgUT0UGlbbKkGCH/DDMpdBzkRXNS/BORTXWjLbxRj7g2ZYumNqdAyvk3XDo lnFu7kSLiRV6iJKBxCff2YGl5p8rgkrRZGUjtmHn8YsxKDOyMGTJ7OZdlP4KVE9cS4Vy girw== X-Received: by 10.14.194.199 with SMTP id m47mr191078851een.11.1357810523294; Thu, 10 Jan 2013 01:35:23 -0800 (PST) Received: from localhost.localdomain (host86-151-161-85.range86-151.btcentralplus.com. [86.151.161.85]) by mx.google.com with ESMTPS id z8sm2056478eeo.11.2013.01.10.01.35.21 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 10 Jan 2013 01:35:22 -0800 (PST) From: spdawson@gmail.com To: buildroot@busybox.net Date: Thu, 10 Jan 2013 09:35:19 +0000 Message-Id: <1357810519-13630-1-git-send-email-spdawson@gmail.com> X-Mailer: git-send-email 1.7.10.4 Subject: [Buildroot] [PATCH] Add support for extra uClibc patches 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: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: Simon Dawson This patch adds a very simple mechanism for applying a set of "extra" patches to uClibc, on top of the patch set provided by Buildroot. Signed-off-by: Simon Dawson --- toolchain/uClibc/Config.in | 6 ++++++ toolchain/uClibc/uclibc.mk | 11 +++++++++++ 2 files changed, 17 insertions(+) diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in index e47bc9b..12e6da0 100644 --- a/toolchain/uClibc/Config.in +++ b/toolchain/uClibc/Config.in @@ -53,6 +53,12 @@ config BR2_UCLIBC_CONFIG See also docs/README in this package. If unsure, use the default. +config BR2_UCLIBC_EXTRA_PATCH_DIR + string "extra uClibc patch directory" + help + You may specify a directory containing extra patches for uClibc. + Note that extra patches will be applied AFTER the Buildroot patch set. + config BR2_PTHREAD_DEBUG bool "Thread library debugging" depends on BR2_PTHREADS || BR2_PTHREADS_OLD || BR2_PTHREADS_NATIVE diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk index 055267c..d83dcdb 100644 --- a/toolchain/uClibc/uclibc.mk +++ b/toolchain/uClibc/uclibc.mk @@ -77,9 +77,20 @@ ifneq ($(BR2_UCLIBC_VERSION_SNAPSHOT),y) support/scripts/apply-patches.sh $(UCLIBC_DIR) $(UCLIBC_PATCH_DIR) \ uClibc-$(UCLIBC_VERSION)-\*.patch \ uClibc-$(UCLIBC_VERSION)-\*.patch.$(ARCH) +ifneq ($(BR2_UCLIBC_EXTRA_PATCH_DIR),"") + support/scripts/apply-patches.sh $(UCLIBC_DIR) \ + $(call qstrip,$(BR2_UCLIBC_EXTRA_PATCH_DIR)) \ + uClibc-$(UCLIBC_VERSION)-\*.patch \ + uClibc-$(UCLIBC_VERSION)-\*.patch.$(ARCH) +endif else support/scripts/apply-patches.sh $(UCLIBC_DIR) $(UCLIBC_PATCH_DIR) \ uClibc.\*.patch uClibc.\*.patch.$(ARCH) +ifneq ($(BR2_UCLIBC_EXTRA_PATCH_DIR),"") + support/scripts/apply-patches.sh $(UCLIBC_DIR) \ + $(call qstrip,$(BR2_UCLIBC_EXTRA_PATCH_DIR)) \ + uClibc.\*.patch uClibc.\*.patch.$(ARCH) +endif endif touch $@