From patchwork Wed Jun 26 23:19:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gabriel de Perthuis X-Patchwork-Id: 2789191 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 04550C0AB1 for ; Wed, 26 Jun 2013 23:19:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 001FE20243 for ; Wed, 26 Jun 2013 23:19:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F387920200 for ; Wed, 26 Jun 2013 23:19:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753146Ab3FZXTx (ORCPT ); Wed, 26 Jun 2013 19:19:53 -0400 Received: from mail-wi0-f171.google.com ([209.85.212.171]:33145 "EHLO mail-wi0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753102Ab3FZXTw (ORCPT ); Wed, 26 Jun 2013 19:19:52 -0400 Received: by mail-wi0-f171.google.com with SMTP id hj3so2531843wib.10 for ; Wed, 26 Jun 2013 16:19:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; bh=fGVzsEEFHG80lb34lfNLlH7iiYh6wBCwR9d/x35uUqs=; b=YrGBHk3OqBmggsmEcS/1mg1EAQwjqzGSk0HjLJpmt7Ng/dRza3bwVRGHlGAkK2sEk9 QpCSP2Nzbeyt67ClaIYNqhOWlw+8sMjcoASJGy5n1MheOA7FGbrdKQ6UIMBbGQEEoCc9 skfkYq/rrLY+DNT+ZxEZhif4VtLnJr5Ju/wyg0oxccgtpoyDqmCTsibFIlImyl+6z55b Jq0KjVtVSIu7KxtWI+uGGhGGh3xL4pVDAo5eMCeonizqArnkItOZZHYE8BWejeJieptN OVi25t4Z9D1PPgmdpgNi8KY9dTmGrSiAwbhJfdxssZsqG5VDdp7x/qLm03u5DmlPBBlC Gl4g== X-Received: by 10.180.96.133 with SMTP id ds5mr11434669wib.24.1372288791234; Wed, 26 Jun 2013 16:19:51 -0700 (PDT) Received: from ?IPv6:2a01:e35:8a2c:b230:252c:94df:b75a:adc4? ([2a01:e35:8a2c:b230:252c:94df:b75a:adc4]) by mx.google.com with ESMTPSA id fs8sm13985071wib.0.2013.06.26.16.19.49 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 26 Jun 2013 16:19:50 -0700 (PDT) Message-ID: <51CB7713.7020901@gmail.com> Date: Thu, 27 Jun 2013 01:19:47 +0200 From: Gabriel de Perthuis User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130510 Thunderbird/17.0.6 MIME-Version: 1.0 To: Michal Marek CC: linux-kbuild@vger.kernel.org Subject: [PATCH 1/2] scripts: Use RCS_FIND_IGNORE in more places Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-8.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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: Gabriel de Perthuis --- Makefile | 4 ++-- scripts/checkkconfigsymbols.sh | 4 ++-- scripts/package/builddeb | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 9040016..9981504 100644 --- a/Makefile +++ b/Makefile @@ -403,12 +403,12 @@ export KBUILD_ARFLAGS # even be read-only. export MODVERDIR := $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/).tmp_versions # Files to ignore in find ... statements -RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS \ - -o -name .pc -o -name .hg -o -name .git \) -prune -o +export RCS_FIND_IGNORE := ( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS \ + -o -name .pc -o -name .hg -o -name .git ) -prune -o export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \ --exclude CVS --exclude .pc --exclude .hg --exclude .git # =========================================================================== # Rules shared between *config targets and build targets diff --git a/scripts/checkkconfigsymbols.sh b/scripts/checkkconfigsymbols.sh index 2ca49bb..dbfd125 100755 --- a/scripts/checkkconfigsymbols.sh +++ b/scripts/checkkconfigsymbols.sh @@ -5,14 +5,14 @@ # Tested with dash. paths="$@" [ -z "$paths" ] && paths=. # Doing this once at the beginning saves a lot of time, on a cache-hot tree. -Kconfigs="`find . -name 'Kconfig' -o -name 'Kconfig*[^~]'`" +Kconfigs="`find . $RCS_FIND_IGNORE \( -name 'Kconfig' -o -name 'Kconfig*[^~]' \) -print`" /bin/echo -e "File list \tundefined symbol used" -find $paths -name '*.[chS]' -o -name 'Makefile' -o -name 'Makefile*[^~]'| while read i +find $paths $RCS_FIND_IGNORE \( -name '*.[chS]' -o -name 'Makefile' -o -name 'Makefile*[^~]' \)| while read i do # Output the bare Kconfig variable and the filename; the _MODULE part at # the end is not removed here (would need perl an not-hungry regexp for that). sed -ne 's!^.*\<\(UML_\)\?CONFIG_\([0-9A-Za-z_]\+\).*!\2 '$i'!p' < $i done | \ diff --git a/scripts/package/builddeb b/scripts/package/builddeb index acb8650..86fcb70 100644 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -16,11 +16,11 @@ create_package() { local pname="$1" pdir="$2" cp debian/copyright "$pdir/usr/share/doc/$pname/" cp debian/changelog "$pdir/usr/share/doc/$pname/changelog.Debian" gzip -9 "$pdir/usr/share/doc/$pname/changelog.Debian" - sh -c "cd '$pdir'; find . -type f ! -path './DEBIAN/*' -printf '%P\0' \ + sh -c "cd '$pdir'; find . \$RCS_FIND_IGNORE -type f ! -path './DEBIAN/*' -printf '%P\0' \ | xargs -r0 md5sum > DEBIAN/md5sums" # Fix ownership and permissions chown -R root:root "$pdir" chmod -R go-w "$pdir" @@ -241,13 +241,13 @@ Description: Linux kernel, version $version EOF 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 $srctree; find . $RCS_FIND_IGNORE \( -name Makefile\* -o -name Kconfig\* -o -name \*.pl \) -print > "$objtree/debian/hdrsrcfiles") +(cd $srctree; find arch/$SRCARCH/include include scripts $RCS_FIND_IGNORE -type f -print >> "$objtree/debian/hdrsrcfiles") +(cd $objtree; find arch/$SRCARCH/include .config Module.symvers include scripts $RCS_FIND_IGNORE -type f -print >> "$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 -) ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build"