From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 31972 invoked by alias); 25 Sep 2011 20:44:43 -0000 Received: (qmail 31954 invoked by uid 22791); 25 Sep 2011 20:44:42 -0000 X-SWARE-Spam-Status: No, hits=-0.6 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-ww0-f43.google.com (HELO mail-ww0-f43.google.com) (74.125.82.43) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sun, 25 Sep 2011 20:44:26 +0000 Received: by wwf27 with SMTP id 27so4881722wwf.12 for ; Sun, 25 Sep 2011 13:44:25 -0700 (PDT) Received: by 10.227.24.9 with SMTP id t9mr1163163wbb.82.1316983465375; Sun, 25 Sep 2011 13:44:25 -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.24 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 25 Sep 2011 13:44:24 -0700 (PDT) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [PATCH 1 of 2] use a custom kernel directory (not prepared) X-Mercurial-Node: 7e4e1c6f74e1064fda7020b2b75fb54d57183f81 Message-Id: <7e4e1c6f74e1064fda70.1316983384@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/msg00034.txt.bz2 # HG changeset patch # User Sinseman44 # Date 1316724578 -7200 # Node ID 7e4e1c6f74e1064fda7020b2b75fb54d57183f81 # Parent 7df89370f80537d1b36b2fda70e3a1c6bc237a65 use a custom kernel directory (not prepared) diff -r 7df89370f805 -r 7e4e1c6f74e1 config/kernel/linux.in --- a/config/kernel/linux.in Wed Sep 21 22:42:35 2011 +0200 +++ b/config/kernel/linux.in Thu Sep 22 22:49:38 2011 +0200 @@ -140,16 +140,17 @@ config KERNEL_LINUX_CUSTOM bool - prompt "custom tarball" + prompt "custom tarball or directory" help - Use a local tarball of a complete kernel source tree. + Use a local tarball or local kernel directory of a complete kernel source tree. config KERNEL_LINUX_CUSTOM_TARBALL string - prompt "Path to custom tarball" + prompt "Path to custom tarball or directory" depends on KERNEL_LINUX_CUSTOM help - Enter here the path to the tarball of your full kernel tree. + Enter here the path to the tarball of your full kernel tree or + kernel directory endchoice diff -r 7df89370f805 -r 7e4e1c6f74e1 scripts/build/kernel/linux.sh --- a/scripts/build/kernel/linux.sh Wed Sep 21 22:42:35 2011 +0200 +++ b/scripts/build/kernel/linux.sh Thu Sep 22 22:49:38 2011 +0200 @@ -28,14 +28,21 @@ # Wee need to know the custom tarball extension, # so we can cerate a properly-named symlink, which # we use later on in 'extract' - case "${CT_KERNEL_LINUX_CUSTOM_TARBALL}" 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}'";; - esac - CT_DoExecLog DEBUG ln -sf "${CT_KERNEL_LINUX_CUSTOM_TARBALL}" \ - "${CT_TARBALLS_DIR}/${custom_name}" + if [ ! -d "${CT_KERNEL_LINUX_CUSTOM_TARBALL}" ]; then + case "${CT_KERNEL_LINUX_CUSTOM_TARBALL}" 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}'";; + esac + CT_DoExecLog DEBUG ln -sf "${CT_KERNEL_LINUX_CUSTOM_TARBALL}" \ + "${CT_TARBALLS_DIR}/${custom_name}" + else + custom_name="linux-custom" + CT_DoExecLog DEBUG ln -s "${CT_KERNEL_LINUX_CUSTOM_TARBALL}" \ + "${CT_SRC_DIR}/${custom_name}" + fi + else # Not a custom tarball case "${CT_KERNEL_VERSION}" in 2.6.*.*|3.*.*) @@ -64,9 +71,11 @@ # Extract kernel do_kernel_extract() { - if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" = "y" ]; then + if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" = "y" \ + -o -d "${CT_KERNEL_LINUX_CUSTOM_TARBALL}" ]; then return 0 fi + # This also handles the custom tarball CT_Extract "linux-${CT_KERNEL_VERSION}" CT_Patch "linux" "${CT_KERNEL_VERSION}" -- For unsubscribe information see http://sourceware.org/lists.html#faq