From patchwork Thu Oct 11 04:53:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Holsgrove X-Patchwork-Id: 190794 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 14AE32C008B for ; Thu, 11 Oct 2012 15:55:50 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=sourceware.org; s=default; x=1350536151; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Content-Type:MIME-Version:Content-Transfer-Encoding: Subject:Message-Id:In-Reply-To:References:User-Agent:Date:From: To:Cc:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Subscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=3jJ1Fq7vVjn08yonx4hNe2ZmVTE=; b=aPbojQNk7kHZWPK WZEEP+gdM0SXNsuZs7ai2Yn+um1P4BncTNyiALiAL+X6BWjz4EW6X6imnbTKAWyV Xz7LMl6xoMVsyB75OeqC22qvqsprR2UGJa4mYr8NNr1oQDVJ/B4xedM/7PCifFFT vCkL9tzBAbJmCXWw319GeJsPCLoY= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=sourceware.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:X-Google-DKIM-Signature:Received:Received:Content-Type:MIME-Version:Content-Transfer-Encoding:Subject:X-Mercurial-Node:Message-Id:In-Reply-To:References:User-Agent:Date:From:To:Cc:X-Gm-Message-State:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Subscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=c/UNCFs6ydBF7xRo/P4ogrmWk1DrA7X8TodeU9V2zrcIY7FMlQDICkDSGfNrPF 6+CZD/Qw7Rf/CTlrRICGC9UtiLyJvdVLsbd3Ryuv14zc+Oca7UyhA2Te1CHmHbuP kcbQwjHZvTdtfXdoY7rL8UWj9lseCpJDcjcs/d+m6KnIU=; Received: (qmail 3417 invoked by alias); 11 Oct 2012 04:54:24 -0000 Received: (qmail 3231 invoked by uid 22791); 11 Oct 2012 04:54:22 -0000 X-SWARE-Spam-Status: No, hits=-3.2 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, KHOP_THREADED, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE, TW_SV X-Spam-Check-By: sourceware.org Received: from mail-da0-f41.google.com (HELO mail-da0-f41.google.com) (209.85.210.41) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 11 Oct 2012 04:54:16 +0000 Received: by mail-da0-f41.google.com with SMTP id i14so603704dad.0 for ; Wed, 10 Oct 2012 21:54:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:content-type:mime-version:content-transfer-encoding:subject :x-mercurial-node:message-id:in-reply-to:references:user-agent:date :from:to:cc:x-gm-message-state; bh=dLh+uf2LpvO8+xFOhBKygtzkdHWgxhXs2W5cKK8Lqws=; b=lpgRvkFv5zIjoH1bk26//ff0WYQMC/lisSfpQw1IuP+1Eo9bAOQPV18yMCws3rjRDu cBCUusGBwR8K9uDIs6mBD+5VaQ/Q/4iHXSOD5H6QApmSUrm+zGgyayuvb08NnFycSSB1 nthHwiUi2EM3pbzKU+SREm6frcgp0XwUozThd+WbEAO0KqHMGz9s+5e23/I3xSRreRDb uiGRG9QEgFPHbs+5LYvCIz6/EquIp8cVgYvJUdM0CS5vrbTxUE6VEDN8Av2lNzzVNWUv fO0oTa3K/gvh76Bvl1ImZoZq0lfxBecqH9wkmUvkwHcn88kfEwGrjj58G3ux1pc4sS03 paEg== Received: by 10.68.240.36 with SMTP id vx4mr104332pbc.89.1349931255774; Wed, 10 Oct 2012 21:54:15 -0700 (PDT) Received: from localhost ([124.148.20.9]) by mx.google.com with ESMTPS id nd6sm2113586pbc.68.2012.10.10.21.54.13 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 10 Oct 2012 21:54:15 -0700 (PDT) MIME-Version: 1.0 Subject: [PATCH 12 of 13] libc/uClibc: Add CUSTOM version and CUSTOM_LOCATION config options and GetCustom X-Mercurial-Node: 712995e3e719fbbe24afba8efd370e4213372405 Message-Id: <712995e3e719fbbe24af.1349931201@localhost.localdomain> In-Reply-To: References: User-Agent: Mercurial-patchbomb/2.3.1 Date: Thu, 11 Oct 2012 14:53:21 +1000 From: David Holsgrove To: yann.morin.1998@free.fr Cc: crossgcc@sourceware.org X-Gm-Message-State: ALoCoQny3IxSolO+u2NUXnD16U/0zOE6GPtKK/V/Nn11wAWqn3yKCVaFk0k31qbI3B9Bi4DO7B+x X-IsSubscribed: yes Mailing-List: contact crossgcc-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: crossgcc-owner@sourceware.org Delivered-To: mailing list crossgcc@sourceware.org # HG changeset patch # User David Holsgrove # Date 1349930384 -36000 # Node ID 712995e3e719fbbe24afba8efd370e4213372405 # Parent ad791eab5e898b88dac15629f7b1db9915b3385a libc/uClibc: Add CUSTOM version and CUSTOM_LOCATION config options and GetCustom CUSTOM_LOCATION config options only presented in menuconfig if component CUSTOM version selected. Signed-off-by: "David Holsgrove" --- For unsubscribe information see http://sourceware.org/lists.html#faq diff -r ad791eab5e89 -r 712995e3e719 config/libc/uClibc.in --- a/config/libc/uClibc.in Thu Oct 11 14:39:43 2012 +1000 +++ b/config/libc/uClibc.in Thu Oct 11 14:39:44 2012 +1000 @@ -99,8 +99,27 @@ select LIBC_SUPPORT_NPTL select LIBC_UCLIBC_0_9_30_or_later +config LIBC_UCLIBC_CUSTOM + bool + prompt "Custom uClibc" + depends on EXPERIMENTAL + select LIBC_SUPPORT_NPTL + select LIBC_UCLIBC_0_9_30_or_later + endchoice +if LIBC_UCLIBC_CUSTOM + +config LIBC_UCLIBC_CUSTOM_LOCATION + string + prompt "Full path to custom uClibc source" + default "" + help + Enter the path to the directory (or tarball) of your source for uClibc, + or leave blank to use default CT_CUSTOM_LOCATION_ROOT_DIR/uClibc + +endif # LIBC_UCLIBC_CUSTOM + config LIBC_VERSION string prompt "Enter date (YYYYMMDD)" if LIBC_UCLIBC_V_specific_date @@ -119,6 +138,7 @@ default "0.9.29" if LIBC_UCLIBC_V_0_9_29 default "0.9.28.3" if LIBC_UCLIBC_V_0_9_28_3 default "snapshot" if LIBC_UCLIBC_V_snapshot + default "custom" if LIBC_UCLIBC_CUSTOM config LIBC_UCLIBC_0_9_32_or_later bool diff -r ad791eab5e89 -r 712995e3e719 scripts/build/libc/uClibc.sh --- a/scripts/build/libc/uClibc.sh Thu Oct 11 14:39:43 2012 +1000 +++ b/scripts/build/libc/uClibc.sh Thu Oct 11 14:39:44 2012 +1000 @@ -15,7 +15,12 @@ # For uClibc, we have almost every thing: releases, and snapshots # for the last month or so. We'll have to deal with svn revisions # later... - CT_GetFile "uClibc-${CT_LIBC_VERSION}" ${libc_src} + if [ "${CT_LIBC_UCLIBC_CUSTOM}" = "y" ]; then + CT_GetCustom "uClibc" "${CT_LIBC_VERSION}" \ + "${CT_LIBC_UCLIBC_CUSTOM_LOCATION}" + else + CT_GetFile "uClibc-${CT_LIBC_VERSION}" ${libc_src} + fi # uClibc locales if [ "${CT_LIBC_UCLIBC_LOCALES_PREGEN_DATA}" = "y" ]; then CT_GetFile "${uclibc_local_tarball}" ${libc_src} @@ -26,7 +31,10 @@ # Extract uClibc do_libc_extract() { - CT_Extract "uClibc-${CT_LIBC_VERSION}" + if [ "${CT_LIBC_UCLIBC_CUSTOM}" != "y" \ + -o ! -d "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}" ]; then + CT_Extract "uClibc-${CT_LIBC_VERSION}" + fi # Don't patch snapshots if [ -z "${CT_LIBC_UCLIBC_V_snapshot}" \ -a -z "${CT_LIBC_UCLIBC_V_specific_date}" \