From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1343 invoked by alias); 11 Oct 2012 04:53:46 -0000 Received: (qmail 1266 invoked by uid 22791); 11 Oct 2012 04:53:44 -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 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:53:36 +0000 Received: by mail-da0-f41.google.com with SMTP id i14so603704dad.0 for ; Wed, 10 Oct 2012 21:53:35 -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=Pg7Klc/Zr4JIxXDoxKnbItzoN0HXsGkYtSQ/1B2dKkA=; b=MeLnnTBBl177VoTmhRBFKZTbf4E+7jQkLhIuMJX1sPUjHSv2tK8na/fOdXXrdMk/sY pRZwHAvnKFVeFCyMrKtK8sEtx/3/2d5JXXz9KQadWh0/RZ7ot4DExrKD7xxsvQRW+9M7 BhmqpwS4SmCCa4PnLGN5ENr9A+5RIYaadcH8LzVbH5Ix12aaaQtn5dP7gMkzOEqPTLyX EXkqsSP0vwhkRat2+6Fh+aG3mtrOjSqGd+LBnpMNd2KlETMjJXJdHso1zQ0aVToRFB0n UIswBfVpYa2Pd+FBTb1ReXTzuAb8HuIyj/L9NoqdqhRQsPZx6QzQzwtxt+liMJrxtd4O 1MxQ== Received: by 10.68.226.195 with SMTP id ru3mr79760672pbc.149.1349931214983; Wed, 10 Oct 2012 21:53:34 -0700 (PDT) Received: from localhost ([124.148.20.9]) by mx.google.com with ESMTPS id nu8sm2117359pbc.45.2012.10.10.21.53.32 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 10 Oct 2012 21:53:34 -0700 (PDT) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [PATCH 04 of 13] kernel/linux: use generic custom infrastructure X-Mercurial-Node: 50674fe47431174aab80d6c01460aa2d6c901306 Message-Id: <50674fe47431174aab80.1349931193@localhost.localdomain> In-Reply-To: References: User-Agent: Mercurial-patchbomb/2.3.1 Date: Thu, 11 Oct 2012 04:53:00 -0000 From: David Holsgrove To: yann.morin.1998@free.fr Cc: crossgcc@sourceware.org X-Gm-Message-State: ALoCoQnm8SNDwDNqoVASHzBmK2XTeRH2QIEpPO8lxurTBussiXWbNfzl7MOOEmXvKF6adR00glYC X-IsSubscribed: yes Mailing-List: contact crossgcc-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: crossgcc-owner@sourceware.org X-SW-Source: 2012-10/txt/msg00064.txt.bz2 # HG changeset patch # User David Holsgrove # Date 1349930380 -36000 # Node ID 50674fe47431174aab80d6c01460aa2d6c901306 # Parent 0bbaba9190a76ba97f723e9f90b708f7cf040b03 kernel/linux: use generic custom infrastructure Config options remain the same as before, just generalised to be used by other components also. Signed-off-by: "David Holsgrove" diff -r 0bbaba9190a7 -r 50674fe47431 scripts/build/kernel/linux.sh --- a/scripts/build/kernel/linux.sh Thu Oct 11 14:39:21 2012 +1000 +++ b/scripts/build/kernel/linux.sh Thu Oct 11 14:39:40 2012 +1000 @@ -29,23 +29,8 @@ fi if [ "${CT_KERNEL_LINUX_CUSTOM}" = "y" ]; then - if [ ! -d "${CT_KERNEL_LINUX_CUSTOM_LOCATION}" ]; then - # Wee need to know the custom tarball extension, - # so we can create a properly-named symlink, which - # we use later on in 'extract' - case "${CT_KERNEL_LINUX_CUSTOM_LOCATION}" in - *.tar.bz2) custom_name="linux-custom.tar.bz2";; - *.tar.gz|*.tgz) custom_name="linux-custom.tar.gz";; - *.tar) custom_name="linux-custom.tar";; - *) CT_Abort "Unknown extension for custom linux tarball '${CT_KERNEL_LINUX_CUSTOM_LOCATION}'";; - esac - CT_DoExecLog DEBUG ln -sf "${CT_KERNEL_LINUX_CUSTOM_LOCATION}" \ - "${CT_TARBALLS_DIR}/${custom_name}" - else - custom_name="linux-custom" - CT_DoExecLog DEBUG ln -sf "${CT_KERNEL_LINUX_CUSTOM_LOCATION}" \ - "${CT_SRC_DIR}/${custom_name}" - fi + CT_GetCustom "linux" "${CT_KERNEL_VERSION}" \ + "${CT_KERNEL_LINUX_CUSTOM_LOCATION}" else # Not a custom tarball case "${CT_KERNEL_VERSION}" in 2.6.*.*|3.*.*) @@ -75,7 +60,7 @@ # Extract kernel do_kernel_extract() { if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" = "y" \ - -o -d "${CT_KERNEL_LINUX_CUSTOM_LOCATION}" ]; then + -o -d "${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}" ]; then return 0 fi -- For unsubscribe information see http://sourceware.org/lists.html#faq