From patchwork Fri Jun 14 09:46:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anisse Astier X-Patchwork-Id: 2721001 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 E80FC9F967 for ; Fri, 14 Jun 2013 09:47:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BBD5920243 for ; Fri, 14 Jun 2013 09:47:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C8ED12023A for ; Fri, 14 Jun 2013 09:47:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751399Ab3FNJrO (ORCPT ); Fri, 14 Jun 2013 05:47:14 -0400 Received: from mail-wg0-f44.google.com ([74.125.82.44]:47317 "EHLO mail-wg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751268Ab3FNJrN (ORCPT ); Fri, 14 Jun 2013 05:47:13 -0400 Received: by mail-wg0-f44.google.com with SMTP id m15so295870wgh.11 for ; Fri, 14 Jun 2013 02:47:12 -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=FFu26Zc4pji+RxiiPu4ISQBAKCt88ODWjbhX7uEoqWQ=; b=LSloPjr2fYrJtHGFO+bi2nYQLCIg4k9EYM+3MV9/cZ8CkytzQazzTKo4+xTWk9yhE+ a15NuVz9IZU+CbTI3/qwcRrfqk8FAaUQF8MAYDMB/2sSHEnS+hwoQ4lTwVcV4FvdQ1+6 +vi/GmD3wnagShUQUebV8deMWCGpEsAG4rgsTaYQ5Pj3I0ZELzneCXRj18OERlI+y4XF JcUbrcmO8W3vg/EF+KYejmayiTx3x6gRfO1POFytCm+1lEKwoj67TN2qAoNbZgjgBA2e S7htAe29Z78qiRNhDAHAuELuxmvu7wElbeKIflQUsCf+uY4fU6tV56SjQlhoIl28kecB h8Cw== X-Received: by 10.194.6.37 with SMTP id x5mr894048wjx.35.1371203232281; Fri, 14 Jun 2013 02:47:12 -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 b19sm1906568wik.10.2013.06.14.02.47.10 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 14 Jun 2013 02:47:11 -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 v5 1/4] deb-pkg: use KCONFIG_CONFIG instead of .config file directly Date: Fri, 14 Jun 2013 11:46:54 +0200 Message-Id: <1371203217-19572-2-git-send-email-anisse@astier.eu> X-Mailer: git-send-email 1.8.3.rc1 In-Reply-To: <1371203217-19572-1-git-send-email-anisse@astier.eu> References: <1371203217-19572-1-git-send-email-anisse@astier.eu> X-Gm-Message-State: ALoCoQmvRNPbIJ3e7MToIKBoWHJHkn8OAMyfjJTfpHELLwDNLFXLl3BwBxDLn3Qbu55A/y159ySm Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-7.2 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 Cc: Ben Hutchings Acked-by: maximilian attems --- scripts/package/builddeb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/package/builddeb b/scripts/package/builddeb index acb8650..6f21ad8 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,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 -)