From patchwork Wed Jul 3 14:02:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anisse Astier X-Patchwork-Id: 256641 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 04B242C0097 for ; Thu, 4 Jul 2013 00:02:41 +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 1UuNdV-00009g-76; Wed, 03 Jul 2013 14:02:21 +0000 Received: from mail-wg0-f44.google.com ([74.125.82.44]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UuNdO-00008B-6S for kernel-team@lists.ubuntu.com; Wed, 03 Jul 2013 14:02:14 +0000 Received: by mail-wg0-f44.google.com with SMTP id m15so155868wgh.11 for ; Wed, 03 Jul 2013 07:02:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=qDxWftFbUxVknqrCLeN2mCbCvvhBKBWMTUwcLH6kRXc=; b=WZAdjAjWSaZN+iWpSYamQsh366RG6r90mNit6a+fgpI4ojdpcFkKyVbnKaGD8WKZON Sob87HQBjk5zoctV4qch7V07xci7q+DxL0ayRHYYUxrp/r1NUH62k7yYMmT8BvK6cMt3 OQ4uUa4n53I6Nf4INak8gZo4CEjee+FEGfiRG9FD6XuIb0VQd0aA8RSuLeIt6030jHpi OolpOmszqPYiR6KS3VrjatvrHUIqIYgLDkLbbTf1cH4gX7K6WM6ecWdBYaAFs+AWlPKA 18tjtKVlkHQ20VA4Yw1F/iX1yU3qGd+8GhCvD4M+XE/dX4LIwVnhSoSuuoFcEJ6MTDxL H9xQ== X-Received: by 10.180.98.231 with SMTP id el7mr18176516wib.33.1372860134050; Wed, 03 Jul 2013 07:02:14 -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 nb12sm28995189wic.7.2013.07.03.07.02.12 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 03 Jul 2013 07:02:13 -0700 (PDT) From: Anisse Astier To: linux-kbuild@vger.kernel.org Subject: [PATCH v6 1/4] deb-pkg: use KCONFIG_CONFIG instead of .config file directly Date: Wed, 3 Jul 2013 16:02:03 +0200 Message-Id: <1372860126-8909-2-git-send-email-anisse@astier.eu> X-Mailer: git-send-email 1.8.3.rc1 In-Reply-To: <1372860126-8909-1-git-send-email-anisse@astier.eu> References: <1372860126-8909-1-git-send-email-anisse@astier.eu> X-Gm-Message-State: ALoCoQlhetMckkY/x4KsZ+sdkCKAL/P6htIPpC2hYh9C2D+8cNxN3JejJTLvXrJYDrQt2NTiM3H/ Cc: Michal Marek , maximilian attems , kernel-team@lists.ubuntu.com, 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 Reviewed-by: Ben Hutchings --- scripts/package/builddeb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/scripts/package/builddeb b/scripts/package/builddeb index acb8650..a8662ef 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 $KCONFIG_CONFIG && echo el) ;; arm*) - debarch=arm$(grep -q CONFIG_AEABI=y .config && echo el) ;; + debarch=arm$(grep -q CONFIG_AEABI=y $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' $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,11 +245,12 @@ 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 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 -) (cd $objtree; tar -c -f - -T "$objtree/debian/hdrobjfiles") | (cd $destdir; tar -xf -) +(cd $objtree; cp $KCONFIG_CONFIG $destdir/.config) # copy .config manually to be where it's expected to be ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build" rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles" arch=$(dpkg --print-architecture)