From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 31977 invoked by alias); 25 Sep 2011 20:44:44 -0000 Received: (qmail 31955 invoked by uid 22791); 25 Sep 2011 20:44:42 -0000 X-SWARE-Spam-Status: No, hits=0.4 required=5.0 tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,T_TO_NO_BRKTS_FREEMAIL,URIBL_BLACK X-Spam-Check-By: sourceware.org Received: from mail-wy0-f169.google.com (HELO mail-wy0-f169.google.com) (74.125.82.169) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sun, 25 Sep 2011 20:44:28 +0000 Received: by wyf22 with SMTP id 22so5433759wyf.0 for ; Sun, 25 Sep 2011 13:44:26 -0700 (PDT) Received: by 10.216.189.82 with SMTP id b60mr4570726wen.23.1316983466778; Sun, 25 Sep 2011 13:44:26 -0700 (PDT) Received: from BENSERV.MSHOME (AToulouse-556-1-279-120.w90-45.abo.wanadoo.fr. [90.45.191.120]) by mx.google.com with ESMTPS id p13sm27677437wbh.13.2011.09.25.13.44.25 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 25 Sep 2011 13:44:26 -0700 (PDT) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [PATCH 2 of 2] correction of previous patch : use a custom kernel directory (not prepared) X-Mercurial-Node: 106357704d6aee847860584cba15dc10ab8f99d5 Message-Id: <106357704d6aee847860.1316983385@BENSERV.MSHOME> In-Reply-To: References: User-Agent: Mercurial-patchbomb/1.6.3 Date: Sun, 25 Sep 2011 20:44:00 -0000 From: sinseman44@gmail.com To: crossgcc@sourceware.org Cc: sinseman44@gmail.com 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: 2011-09/txt/msg00035.txt.bz2 # HG changeset patch # User Sinseman44 # Date 1316983092 -7200 # Node ID 106357704d6aee847860584cba15dc10ab8f99d5 # Parent 7e4e1c6f74e1064fda7020b2b75fb54d57183f81 correction of previous patch : use a custom kernel directory (not prepared) Signed-off-by: Vincent BENOIT diff -r 7e4e1c6f74e1 -r 106357704d6a config/kernel/linux.in --- a/config/kernel/linux.in Thu Sep 22 22:49:38 2011 +0200 +++ b/config/kernel/linux.in Sun Sep 25 22:38:12 2011 +0200 @@ -144,9 +144,9 @@ help Use a local tarball or local kernel directory of a complete kernel source tree. -config KERNEL_LINUX_CUSTOM_TARBALL +config KERNEL_LINUX_CUSTOM_LOCATION string - prompt "Path to custom tarball or directory" + prompt "Path to custom source, tarball or directory" depends on KERNEL_LINUX_CUSTOM help Enter here the path to the tarball of your full kernel tree or diff -r 7e4e1c6f74e1 -r 106357704d6a scripts/build/kernel/linux.sh --- a/scripts/build/kernel/linux.sh Thu Sep 22 22:49:38 2011 +0200 +++ b/scripts/build/kernel/linux.sh Sun Sep 25 22:38:12 2011 +0200 @@ -25,21 +25,21 @@ fi if [ "${CT_KERNEL_LINUX_CUSTOM}" = "y" ]; then - # Wee need to know the custom tarball extension, - # so we can cerate a properly-named symlink, which - # we use later on in 'extract' - if [ ! -d "${CT_KERNEL_LINUX_CUSTOM_TARBALL}" ]; then - case "${CT_KERNEL_LINUX_CUSTOM_TARBALL}" in + 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_TARBALL}'";; + *) CT_Abort "Unknown extension for custom linux tarball '${CT_KERNEL_LINUX_CUSTOM_LOCATION}'";; esac - CT_DoExecLog DEBUG ln -sf "${CT_KERNEL_LINUX_CUSTOM_TARBALL}" \ + CT_DoExecLog DEBUG ln -sf "${CT_KERNEL_LINUX_CUSTOM_LOCATION}" \ "${CT_TARBALLS_DIR}/${custom_name}" else custom_name="linux-custom" - CT_DoExecLog DEBUG ln -s "${CT_KERNEL_LINUX_CUSTOM_TARBALL}" \ + CT_DoExecLog DEBUG ln -s "${CT_KERNEL_LINUX_CUSTOM_LOCATION}" \ "${CT_SRC_DIR}/${custom_name}" fi @@ -72,7 +72,7 @@ # Extract kernel do_kernel_extract() { if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" = "y" \ - -o -d "${CT_KERNEL_LINUX_CUSTOM_TARBALL}" ]; then + -o -d "${CT_KERNEL_LINUX_CUSTOM_LOCATION}" ]; then return 0 fi -- For unsubscribe information see http://sourceware.org/lists.html#faq