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: 2817111 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A58A69F3C3 for ; Wed, 3 Jul 2013 14:02:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 69B882016C for ; Wed, 3 Jul 2013 14:02:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D58242015D for ; Wed, 3 Jul 2013 14:02:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756399Ab3GCOCR (ORCPT ); Wed, 3 Jul 2013 10:02:17 -0400 Received: from mail-wg0-f51.google.com ([74.125.82.51]:33837 "EHLO mail-wg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932369Ab3GCOCP (ORCPT ); Wed, 3 Jul 2013 10:02:15 -0400 Received: by mail-wg0-f51.google.com with SMTP id e11so156409wgh.6 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=pMPJnu7ks8xbigHgV3ncxrlMEdyoR0YSQp1Jdu5CcMvInH6f+8TdAXMMK6LvJ9hH9L ONm4/ujl8Hyln5zuLX+ibAsv7uNig3BBG36DQ4EoDLmnUCt/CFxJbQYtwkRutELbY36z 9gLltO7sLlQhGTd4AnRNwwhG/uGaxH++03korFTSw08OneYNiVT4LRQE1Q+WsI1yKXSC WuyHtbNTbNcNG1nEbNSSOhEZKI8v9fWNb68OJnnX4U6Tt0W8FWRfDnDAjIbfeSehPpPY 0SVG/kOhPogSEby/ajKWVgoUaWos66ma2k3182WGualSSjxBvGOiV1eMeVnuphIY5QBz Uy2A== 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 Cc: debian-kernel@lists.debian.org, kernel-team@lists.ubuntu.com, Ben Hutchings , Michal Marek , maximilian attems , Anisse Astier 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: ALoCoQkU8AJzNY4z0+hqd8WKKM7QwZiMetRQSwDbcFCVWI4wPMGvV9l4ilyE1MzeZ0Mreac9IStc Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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)