From patchwork Tue May 7 15:46:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anisse Astier X-Patchwork-Id: 242377 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id A86962C0161 for ; Wed, 8 May 2013 01:47:59 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UZk7N-0007XA-IA; Tue, 07 May 2013 15:47:53 +0000 Received: from mail-wi0-f169.google.com ([209.85.212.169]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UZk7E-0007UT-5o for kernel-team@lists.ubuntu.com; Tue, 07 May 2013 15:47:44 +0000 Received: by mail-wi0-f169.google.com with SMTP id h11so4146282wiv.4 for ; Tue, 07 May 2013 08:47:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=glIAWPXrkOEX4KzzGk7/2hFwD8Vn8rfShCR37nbXfaE=; b=AYFKmhi/1pGA/0moTeZCBpq4+fnuAq2AWF0etSJZ3WowjvmB9/Cz4f1+tuY38+NZal iiY8Wn9T7g25a8vplVn1PInGQrujwXe3U/gOUkMnZ0oUgDCOj+2U9B3CaIa9mWrQ8C7S Zlrep/8vAT17eAkZk9bzAK7dyjCo4pp1Zb3pe3ZmJ47waAKhP3pigOCagnFVYOp4pAfS yVqteiMbjxYBxP8yAQRLHYSVJVwmQ7tVlPO0e8T/U5A0TfJacX7H9QbvcVjJTIqx3uh8 UrUdXdeg45zIuo39TbhRkmyv/9VAicOb7y2R295CsTMVMR/deUC4mBgcN/vjBGy8dByZ 9kdw== X-Received: by 10.180.86.38 with SMTP id m6mr15796326wiz.25.1367941661299; Tue, 07 May 2013 08:47:41 -0700 (PDT) Received: from serenity.substantiel.local (mar92-17-78-228-214-160.fbx.proxad.net. [78.228.214.160]) by mx.google.com with ESMTPSA id q13sm3842742wie.8.2013.05.07.08.47.39 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 07 May 2013 08:47:40 -0700 (PDT) From: Anisse Astier To: linux-kbuild@vger.kernel.org Subject: [PATCH v4 1/4] deb-pkg: use KCONFIG_CONFIG instead of .config file directly Date: Tue, 7 May 2013 17:46:48 +0200 Message-Id: <1367941611-12223-2-git-send-email-anisse@astier.eu> X-Mailer: git-send-email 1.8.3.rc1 In-Reply-To: <1367941611-12223-1-git-send-email-anisse@astier.eu> References: <1367941611-12223-1-git-send-email-anisse@astier.eu> X-Gm-Message-State: ALoCoQm9N3g1QiT14Z60SWpLt9pMK889mhRZlRYPfFhZYhb9Qgxbl1b0W17tC8ITIr+/dlNY1eA1 Cc: Michal Marek , maximilian attems , kernel-team@lists.ubuntu.com, Ben Hutchings , debian-kernel@lists.debian.org X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com Signed-off-by: Anisse Astier --- scripts/package/builddeb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/package/builddeb b/scripts/package/builddeb index acb8650..2d84671 100644 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -41,9 +41,9 @@ create_package() { parisc*) debarch=hppa ;; mips*) - debarch=mips$(grep -q CPU_LITTLE_ENDIAN=y .config && echo el) ;; + debarch=mips$(grep -q CPU_LITTLE_ENDIAN=y $objtree/$KCONFIG_CONFIG && echo el) ;; arm*) - debarch=arm$(grep -q CONFIG_AEABI=y .config && echo el) ;; + debarch=arm$(grep -q CONFIG_AEABI=y $objtree/$KCONFIG_CONFIG && echo el) ;; *) echo "" >&2 echo "** ** ** WARNING ** ** **" >&2 @@ -106,12 +106,12 @@ fi if [ "$ARCH" = "um" ] ; then $MAKE linux cp System.map "$tmpdir/usr/lib/uml/modules/$version/System.map" - cp .config "$tmpdir/usr/share/doc/$packagename/config" + cp $KCONFIG_CONFIG "$tmpdir/usr/share/doc/$packagename/config" gzip "$tmpdir/usr/share/doc/$packagename/config" cp $KBUILD_IMAGE "$tmpdir/usr/bin/linux-$version" else cp System.map "$tmpdir/boot/System.map-$version" - cp .config "$tmpdir/boot/config-$version" + cp $KCONFIG_CONFIG "$tmpdir/boot/config-$version" # Not all arches include the boot path in KBUILD_IMAGE if [ -e $KBUILD_IMAGE ]; then cp $KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version" @@ -120,7 +120,7 @@ else fi fi -if grep -q '^CONFIG_MODULES=y' .config ; then +if grep -q '^CONFIG_MODULES=y' $objtree/$KCONFIG_CONFIG ; then INSTALL_MOD_PATH="$tmpdir" $MAKE KBUILD_SRC= modules_install rm -f "$tmpdir/lib/modules/$version/build" rm -f "$tmpdir/lib/modules/$version/source" @@ -245,7 +245,7 @@ fi # Build header package (cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles") (cd $srctree; find arch/$SRCARCH/include include scripts -type f >> "$objtree/debian/hdrsrcfiles") -(cd $objtree; find arch/$SRCARCH/include .config Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles") +(cd $objtree; find arch/$SRCARCH/include $KCONFIG_CONFIG Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles") destdir=$kernel_headers_dir/usr/src/linux-headers-$version mkdir -p "$destdir" (cd $srctree; tar -c -f - -T "$objtree/debian/hdrsrcfiles") | (cd $destdir; tar -xf -)