From patchwork Fri Mar 8 09:56:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 159964 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp8504950jad; Fri, 8 Mar 2019 01:57:06 -0800 (PST) X-Google-Smtp-Source: APXvYqyysFZBsn9EJoY7ilhj1SRnEdG+S2YHwWAE8KpQwWgbw+yiCDKrVoUm7IEjbDu+UfvfiW3Y X-Received: by 2002:a65:4243:: with SMTP id d3mr15829099pgq.56.1552039026458; Fri, 08 Mar 2019 01:57:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1552039026; cv=none; d=google.com; s=arc-20160816; b=I2WU0rfDVYDEC6yvzdYGBq/GemRqW2SnjByBzUMyB1hEY7AlBz1XBr0emvWa9Y0aNS TY5EJBtZqkNNMlKGT3peOoByZrMc941j7nqv3V9D70LD+41AG81pjUiFZ/9rc9pPd8mi MP63Lf7Z/LvbfshicCxFgDB3qFMYnPvZ1mRcf0AvRoJ2+qjTIEnweBh4WdcqN1v/LDWJ IqFTQE6Av0HjW0sss5gqOu7VDnerXdn7byCPcDwrqNTH+0w/+KmicJuSxhLzHofTCdeq mjXf+WkuZl0vAU8mEoJfLZKx5ekGnA8zArcJqNTnAoK+xi8AkBlPyYKQHMMIyJYyvdr1 IWZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=5cYoMwhwP7MQYAIXIKGJrDLwUHl9mhxyYhEh0rTq03E=; b=W1atdswVtMs8vHffTl+Skh0AM9pty5fu+cL0vP4AGJf2GCSPeeEqNI44o509hkN2qO YPYuc2KkwIJfolWAQL1vgQojqnxMng1RXLWZ9rI6LeO1OFO2dL2NKx3tdyIisWVToKe5 sLNoklR+JEP53RTfoccCo6zVUtsoZIqkv8TJn7Nv1yUb3C1g6Fh+/Not4y1wQYv80KMU 4ZjsBYXkMrDXGbMMabcQagBHkBwGr6h+1FSpGPPDcrIaBBUbmwKca50Rfl4/kDyj4ZgN ZGbP9+YGNIqSy46Cc8SFAQwBNiJ9U79zaQ+zMKgF43Lxiq0GVyCqLQSN821YGbSdDmFL j50A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=QtwSLJx4; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n19si3432047pgk.158.2019.03.08.01.57.06; Fri, 08 Mar 2019 01:57:06 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=QtwSLJx4; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726313AbfCHJ5E (ORCPT + 31 others); Fri, 8 Mar 2019 04:57:04 -0500 Received: from conuserg-12.nifty.com ([210.131.2.79]:58442 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725975AbfCHJ5E (ORCPT ); Fri, 8 Mar 2019 04:57:04 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id x289uSqa003883; Fri, 8 Mar 2019 18:56:28 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com x289uSqa003883 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1552038988; bh=5cYoMwhwP7MQYAIXIKGJrDLwUHl9mhxyYhEh0rTq03E=; h=From:To:Cc:Subject:Date:From; b=QtwSLJx4pij8cDr3SpU0PP5Go2irqNyGZnV4pc+AVkvWfXfBkqx8JuUZgH4hJBnra ilSYT9pXLo39QIEPV85b8ozgvl79zk8ifYpPxAVJ5QBE+6YgCxa2Lc1dh5COrqCyKp pbinu8xM4lxPjGctdz1K/EmWK0mmjLtTdRC1P5q+RMLdaw6A1i3EaUHgL70De5RSJ1 USOF4qzt8BxQVJZczbd8CKXkcOTAW1muRSZngZEuyYKPkX3MBjhwaeZJ6jS9l3e9UT yBeIynAO+gZDawfJ78TaYsbQ5vNA5jyeQnjmwaFv3o06HucGuzQ2Vf53LGE0oWcneI GwJ0TojfST8Fw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Ben Hutchings , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH 1/3] kbuild: deb-pkg: add CONFIG_ prefix to kernel config options Date: Fri, 8 Mar 2019 18:56:23 +0900 Message-Id: <1552038985-10473-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This might be a kind of bike-shed, but I personally prefer grep'able code. I often do 'git grep CONFIG_FOO' instead of 'git grep FOO' when I want to know where that CONFIG option is used. This makes code longer, but I hope this is acceptable level. Signed-off-by: Masahiro Yamada --- scripts/package/mkdebian | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) -- 2.7.4 diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian index f030961..e3726e8 100755 --- a/scripts/package/mkdebian +++ b/scripts/package/mkdebian @@ -7,7 +7,7 @@ set -e is_enabled() { - grep -q "^CONFIG_$1=y" $KCONFIG_CONFIG + grep -q "^$1=y" $KCONFIG_CONFIG } if_enabled_echo() { @@ -31,23 +31,23 @@ set_debarch() { x86_64) debarch=amd64 ;; sparc*) - debarch=sparc$(if_enabled_echo 64BIT 64) ;; + debarch=sparc$(if_enabled_echo CONFIG_64BIT 64) ;; s390*) debarch=s390x ;; ppc*) - if is_enabled 64BIT; then - debarch=ppc64$(if_enabled_echo CPU_LITTLE_ENDIAN el) + if is_enabled CONFIG_64BIT; then + debarch=ppc64$(if_enabled_echo CONFIG_CPU_LITTLE_ENDIAN el) else - debarch=powerpc$(if_enabled_echo SPE spe) + debarch=powerpc$(if_enabled_echo CONFIG_SPE spe) fi ;; parisc*) debarch=hppa ;; mips*) - if is_enabled CPU_LITTLE_ENDIAN; then - debarch=mips$(if_enabled_echo 64BIT 64)$(if_enabled_echo CPU_MIPSR6 r6)el - elif is_enabled CPU_MIPSR6; then - debarch=mips$(if_enabled_echo 64BIT 64)r6 + if is_enabled CONFIG_CPU_LITTLE_ENDIAN; then + debarch=mips$(if_enabled_echo CONFIG_64BIT 64)$(if_enabled_echo CONFIG_CPU_MIPSR6 r6)el + elif is_enabled CONFIG_CPU_MIPSR6; then + debarch=mips$(if_enabled_echo CONFIG_64BIT 64)r6 else debarch=mips fi @@ -55,8 +55,8 @@ set_debarch() { aarch64|arm64) debarch=arm64 ;; arm*) - if is_enabled AEABI; then - debarch=arm$(if_enabled_echo VFP hf el) + if is_enabled CONFIG_AEABI; then + debarch=arm$(if_enabled_echo CONFIG_VFP hf el) else debarch=arm fi @@ -64,10 +64,10 @@ set_debarch() { openrisc) debarch=or1k ;; sh) - if is_enabled CPU_SH3; then - debarch=sh3$(if_enabled_echo CPU_BIG_ENDIAN eb) - elif is_enabled CPU_SH4; then - debarch=sh4$(if_enabled_echo CPU_BIG_ENDIAN eb) + if is_enabled CONFIG_CPU_SH3; then + debarch=sh3$(if_enabled_echo CONFIG_CPU_BIG_ENDIAN eb) + elif is_enabled CONFIG_CPU_SH4; then + debarch=sh4$(if_enabled_echo CONFIG_CPU_BIG_ENDIAN eb) fi ;; esac From patchwork Fri Mar 8 09:56:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 159965 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp8504979jad; Fri, 8 Mar 2019 01:57:08 -0800 (PST) X-Google-Smtp-Source: APXvYqyz7KpFin/jQbVqWhPAayGf1OZEQF23rZyfgFrdphocQnlK+mq47leX4PcbrsS3mfGSEGa0 X-Received: by 2002:a17:902:e5:: with SMTP id a92mr7400951pla.326.1552039028284; Fri, 08 Mar 2019 01:57:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1552039028; cv=none; d=google.com; s=arc-20160816; b=K+QZ4Nh1Ml5dIKsEtqDFZxgjTSGweVYX4r0i/DETFEusoSpxxTubKMz4T5UMDS5evD ASy53/B1g4+8TOMdASc5TShAjR9Z7lt8PCUv/Z4b6XjKjKCuPXqgklNsaiRLkYOXADxI zsEBiZN3eaC1z7cDASttAQoP3l0UJyepSbYpfNeQDVuec7uRn0BZhDmpGxF89KkC5YVK MdrCzvQYcnoJksohwt7Z86x60oPDYilLgqF317GaWHmhQFOdN49k7yj6evfZ9qwO4KdV GIacj3AzAc6GDhUNHHNKCYzkjIWiEjfng2PYDZHq3mC2J+F+NKD4kBF+ouQcn0jqDP/N 91XA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=RgPK6RyeZQS/j5UUx+A+6DjCZHX16Ul3T0bN38trg6A=; b=B5uGhSS+4NMQ+lXD47yZMKFGdJWnqJdkV/jf459NXLffMdj6b6kEloFt3pKEcepz4Q +efuKKle/0yIXRqOQHqsEBCiRJrs9PJXX5dzevXpK3EcY5n0Sl7pa4whsPU3zO4AVCZD Wf7NOHFVLS9Xp9Zwhzuamhz0f0qCOGb8lgxlc2l6QVeZ4tRAXJdS4oxWk6YY3GVzRmyr Piy7r1u+cceZ3oQ+JAJ+2shM8LIWdgNr9ywddG4GhjMla5uSuHRBk4ezEOvOLg58DHRM MNSFNpxd3N7DErou3t9co0/mJsgGVtHhwwt6i0gEInsdXv+l0kUi6GcAmAcewbYZLLeA 12Vw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=U5Mf7vt2; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n19si3432047pgk.158.2019.03.08.01.57.08; Fri, 08 Mar 2019 01:57:08 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=U5Mf7vt2; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726400AbfCHJ5G (ORCPT + 31 others); Fri, 8 Mar 2019 04:57:06 -0500 Received: from conuserg-12.nifty.com ([210.131.2.79]:58422 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725789AbfCHJ5E (ORCPT ); Fri, 8 Mar 2019 04:57:04 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id x289uSqb003883; Fri, 8 Mar 2019 18:56:29 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com x289uSqb003883 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1552038989; bh=RgPK6RyeZQS/j5UUx+A+6DjCZHX16Ul3T0bN38trg6A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U5Mf7vt2Lj55D8v4cq5ylCQruTnP6JnFCKh6LKWQK2HqEBRvbN/FDiOjClhBDTklG x9BMLQElIweMk+QLXy8OTWdcCSurHVgmXR6X0RMXC9hrZWkIi8BNhU6ASmN4JV9d+G 53I3XxLaze+i0kTenvYW0oQYAXM+8d8gLVIeblYuGnyIFX/mrGRb+JnEcVzH4hfJ2J ee2vMtOpsE0J6hK7R/rXaVqSv/VsUcHNPtrbui+NumMxeWPL1QZXIJfNPJxFnjItJ3 JBNupGhbtx7a9LS84ZeLAuYe+TYpNXQCcxlOiBoFqcIYKUJAFXiLHCMNYyc6MPAGII vz2mzdjqsqB/A== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Ben Hutchings , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH 2/3] kbuild: deb-pkg: introduce is_enabled and if_enabled_echo to builddeb Date: Fri, 8 Mar 2019 18:56:24 +0900 Message-Id: <1552038985-10473-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1552038985-10473-1-git-send-email-yamada.masahiro@socionext.com> References: <1552038985-10473-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org I think is_enabled() and if_enable_echo() in scripts/package/mkdebian are useful. builddeb also has many repetitive greps over the kernel config, so I borrowed the idea to clean it up. Signed-off-by: Masahiro Yamada --- scripts/package/builddeb | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) -- 2.7.4 diff --git a/scripts/package/builddeb b/scripts/package/builddeb index 8ac25d1..e2cb438 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -12,6 +12,18 @@ set -e +is_enabled() { + grep -q "^$1=y" $KCONFIG_CONFIG +} + +if_enabled_echo() { + if is_enabled "$1"; then + echo -n "$2" + elif [ $# -ge 3 ]; then + echo -n "$3" + fi +} + create_package() { local pname="$1" pdir="$2" @@ -62,7 +74,7 @@ parisc|mips|powerpc) installed_image_path="boot/vmlinuz-$version" esac -BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)" +BUILD_DEBUG=$(if_enabled_echo CONFIG_DEBUG_INFO Yes) # Setup the directory structure rm -rf "$tmpdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" $objtree/debian/files @@ -83,14 +95,14 @@ else fi cp "$($MAKE -s -f $srctree/Makefile image_name)" "$tmpdir/$installed_image_path" -if grep -q "^CONFIG_OF_EARLY_FLATTREE=y" $KCONFIG_CONFIG ; then +if is_enabled CONFIG_OF_EARLY_FLATTREE; then # Only some architectures with OF support have this target if [ -d "${srctree}/arch/$SRCARCH/boot/dts" ]; then $MAKE -f $srctree/Makefile INSTALL_DTBS_PATH="$tmpdir/usr/lib/$packagename" dtbs_install fi fi -if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then +if is_enabled CONFIG_MODULES; then INSTALL_MOD_PATH="$tmpdir" $MAKE -f $srctree/Makefile modules_install rm -f "$tmpdir/lib/modules/$version/build" rm -f "$tmpdir/lib/modules/$version/source" @@ -111,8 +123,7 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then done # resign stripped modules - MODULE_SIG_ALL="$(grep -s '^CONFIG_MODULE_SIG_ALL=y' $KCONFIG_CONFIG || true)" - if [ -n "$MODULE_SIG_ALL" ]; then + if is_enabled CONFIG_MODULE_SIG_ALL; then INSTALL_MOD_PATH="$tmpdir" $MAKE -f $srctree/Makefile modules_sign fi fi @@ -129,11 +140,6 @@ fi # make-kpkg sets $INITRD to indicate whether an initramfs is wanted, and # so do we; recent versions of dracut and initramfs-tools will obey this. debhookdir=${KDEB_HOOKDIR:-/etc/kernel} -if grep -q '^CONFIG_BLK_DEV_INITRD=y' $KCONFIG_CONFIG; then - want_initrd=Yes -else - want_initrd=No -fi for script in postinst postrm preinst prerm ; do mkdir -p "$tmpdir$debhookdir/$script.d" cat < "$tmpdir/DEBIAN/$script" @@ -145,7 +151,7 @@ set -e export DEB_MAINT_PARAMS="\$*" # Tell initramfs builder whether it's wanted -export INITRD=$want_initrd +export INITRD=$(if_enabled_echo CONFIG_BLK_DEV_INITRD Yes No) test -d $debhookdir/$script.d && run-parts --arg="$version" --arg="/$installed_image_path" $debhookdir/$script.d exit 0 @@ -158,11 +164,11 @@ done (cd $srctree; find arch/*/include include scripts -type f -o -type l) >> "$objtree/debian/hdrsrcfiles" (cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform) >> "$objtree/debian/hdrsrcfiles" (cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f) >> "$objtree/debian/hdrsrcfiles" -if grep -q '^CONFIG_STACK_VALIDATION=y' $KCONFIG_CONFIG ; then +if is_enabled CONFIG_STACK_VALIDATION; then (cd $objtree; find tools/objtool -type f -executable) >> "$objtree/debian/hdrobjfiles" fi (cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f) >> "$objtree/debian/hdrobjfiles" -if grep -q '^CONFIG_GCC_PLUGINS=y' $KCONFIG_CONFIG ; then +if is_enabled CONFIG_GCC_PLUGINS; then (cd $objtree; find scripts/gcc-plugins -name \*.so -o -name gcc-common.h) >> "$objtree/debian/hdrobjfiles" fi destdir=$kernel_headers_dir/usr/src/linux-headers-$version From patchwork Fri Mar 8 09:56:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 159966 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp8505014jad; Fri, 8 Mar 2019 01:57:11 -0800 (PST) X-Google-Smtp-Source: APXvYqw0MEXOdK6/qAuHpoyqM19pixrr58BC2+wkdmcqBlv0m8LeqOKSozxqgIVuQJihc7xiZWYv X-Received: by 2002:a17:902:8b8b:: with SMTP id ay11mr18010948plb.162.1552039031070; Fri, 08 Mar 2019 01:57:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1552039031; cv=none; d=google.com; s=arc-20160816; b=JZBiJk6YkoLKHFddJpwfxhKN18cfqxfznkffJyjFxJbQexq3d7yC2jEbuHoULs2Aor awaKi8wvZtgVDmTioFI4ByfUsvrDr+RaodEwLxD0//bPpxIjpNTIDoneYxGirTTdIhpU XvPeP4r92uKHoDvxNLscMHF98E0EoMxbRBMvgkBnMata4aM+uK/U2EZ+/uBSogOdgt9G lf7oJAqc4FHyZVJwVxk1xcFavgbS0xRa2ZtY9WD6fOWGg9CzU8emjBvIvaq4pxfRS8M3 6Q3ZuMJtm6LUE17CApvOxHMvFueKYzub87HVVvc27mA13q8KYk2I2Uc96ZELvFaqCmUu 0rMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=aGnH/xy3lfI4P4Pf0gopqcxOtRSY0Xj6FuRqiw7m0Ng=; b=VOb6MrQwf3nTlHuJD20m1oHSEEafKLVF9Yc3ygs8HunbKueHdpLujUIz1S+Ns0xLSE fXQxZzm1gJYU2M43pHf2vcIS4+cZUOdAvO4UfZZlH5EFg460KxwELoTFO5iBrroog4LP +2VUyCpQOpfHMPhMF60c6nDcAcMeNzYF+S8NeHSloHCr9ThkEBGO3Luh98+cBtPTgd2C zjJxYgQ/8p+HoFmyNawQOvL44i06JTpNBTkxDi4D7gIbdpdtf9K9xIUKGr18eEuA2kr9 JPd9YnwR2Z39V42+Sbyv7LAc/yGJ3gc+1HDiEcU1jQG8l/qqqOqc/LSlqdrQwEOxLUXb toSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=TSqeBJUJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o24si6139490pgh.114.2019.03.08.01.57.10; Fri, 08 Mar 2019 01:57:11 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=TSqeBJUJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726428AbfCHJ5I (ORCPT + 31 others); Fri, 8 Mar 2019 04:57:08 -0500 Received: from conuserg-12.nifty.com ([210.131.2.79]:58452 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726249AbfCHJ5E (ORCPT ); Fri, 8 Mar 2019 04:57:04 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id x289uSqc003883; Fri, 8 Mar 2019 18:56:29 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com x289uSqc003883 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1552038989; bh=aGnH/xy3lfI4P4Pf0gopqcxOtRSY0Xj6FuRqiw7m0Ng=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TSqeBJUJvdm2Zj9GsK0vq15nu3owCIP1fsZo02DdyjXc3Ae0UHrcQmUQyrpTn5EE4 36/SjarjrJARMCHxC3mgpdinSPqLCa5LOlrLShKQV8n9ba6rmCO1lGMrVPWtghfGBf +zQg3IgTkRjCusyfJZnsEp369ij+P9tb0Ofy4ZMWEwG9O7Et5dMbMErgFPD+yt/XXX olJVZnXWtUTCoP3pyvm2X/wngjkxh/cwKEMk08AG2FiwWYsHoA1eN+eNJVRS91h0X5 HfQaaSXD0SX9HGNMufxMROH4BB1d5Za0PBjhVPxlWN/dUSNvkpmjNJNgynWez2p2Uw 0mFqFESxSbwmQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Ben Hutchings , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH 3/3] kbuild: pkg: grep include/config/auto.conf instead of $KCONFIG_CONFIG Date: Fri, 8 Mar 2019 18:56:25 +0900 Message-Id: <1552038985-10473-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1552038985-10473-1-git-send-email-yamada.masahiro@socionext.com> References: <1552038985-10473-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This will be a little more efficient since unset CONFIG options are stripped away from auto.conf, and we can hard-code the path to auto.conf since it is never overridden. include/config/kernel.release is generated before %pkg is run. So, it is guaranteed auto.conf is up-to-date. Signed-off-by: Masahiro Yamada --- scripts/package/builddeb | 2 +- scripts/package/buildtar | 2 +- scripts/package/mkdebian | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- 2.7.4 diff --git a/scripts/package/builddeb b/scripts/package/builddeb index e2cb438..b03dd56 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -13,7 +13,7 @@ set -e is_enabled() { - grep -q "^$1=y" $KCONFIG_CONFIG + grep -q "^$1=y" include/config/auto.conf } if_enabled_echo() { diff --git a/scripts/package/buildtar b/scripts/package/buildtar index cfd2a4a..2f66c81 100755 --- a/scripts/package/buildtar +++ b/scripts/package/buildtar @@ -56,7 +56,7 @@ dirs=boot # # Try to install modules # -if grep -q '^CONFIG_MODULES=y' "${KCONFIG_CONFIG}"; then +if grep -q '^CONFIG_MODULES=y' include/config/auto.conf; then make ARCH="${ARCH}" -f ${srctree}/Makefile INSTALL_MOD_PATH="${tmpdir}" modules_install dirs="$dirs lib" fi diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian index e3726e8..dd7202f 100755 --- a/scripts/package/mkdebian +++ b/scripts/package/mkdebian @@ -7,7 +7,7 @@ set -e is_enabled() { - grep -q "^$1=y" $KCONFIG_CONFIG + grep -q "^$1=y" include/config/auto.conf } if_enabled_echo() {