From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rob Landley Subject: [PATCH 2/3]: Remove perl from make headers_install Date: Fri, 2 Jan 2009 02:14:32 -0600 Message-ID: <200901020214.33123.rob@landley.net> References: <200901020207.30359.rob@landley.net> Mime-Version: 1.0 Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <200901020207.30359.rob@landley.net> Content-Disposition: inline Sender: linux-embedded-owner@vger.kernel.org List-ID: Content-Type: text/plain; charset="us-ascii" To: Embedded Linux mailing list Cc: linux-kernel@vger.kernel.org, Andrew Morton , "H. Peter Anvin" , Sam Ravnborg RnJvbTogUm9iIExhbmRsZXkgPHJvYkBsYW5kbGV5Lm5ldD4KClJlbW92ZSBwZXJsIGZyb20gbWFr ZSBoZWFkZXJzX2luc3RhbGwgYnkgcmVwbGFjaW5nIGEgcGVybCBzY3JpcHQgKGRvaW5nCmEgc2lt cGxlIHJlZ2V4IHNlYXJjaCBhbmQgcmVwbGFjZSkgd2l0aCBhIHNtYWxsZXIgYW5kIGZhc3RlciBz aGVsbCBzY3JpcHQKaW1wbGVtZW50YXRpb24uICBUaGUgbmV3IHNoZWxsIHNjcmlwdCBpcyBhIHNp bmdsZSBmb3IgbG9vcCBjYWxsaW5nIHNlZCBhbmQKcGlwaW5nIGl0cyBvdXRwdXQgdGhyb3VnaCB1 bmlmZGVmIHRvIHByb2R1Y2UgdGhlIHRhcmdldCBmaWxlLgoKU2FtIFJhdm5ib3JnIGFkZGVkIHRo aXMgcGVybCB0byAyLjYuMjcuCgpTaWduZWQtb2ZmLWJ5OiBSb2IgTGFuZGxleSA8cm9iQGxhbmRs ZXkubmV0PgotLS0KCiBzY3JpcHRzL01ha2VmaWxlLmhlYWRlcnNpbnN0IHwgICAgNiArKy0tCiBz Y3JpcHRzL2hlYWRlcnNfaW5zdGFsbC5wbCAgIHwgICA0NiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0KIHNjcmlwdHMvaGVhZGVyc19pbnN0YWxsLnNoICAgfCAgIDIzICsrKysrKysr KysrKysrKysKIDMgZmlsZXMgY2hhbmdlZCwgMjYgaW5zZXJ0aW9ucygrKSwgNDkgZGVsZXRpb25z KC0pCgotLS0gL2Rldi9udWxsCTIwMDgtMTEtMjEgMDQ6NDY6NDEuMDAwMDAwMDAwIC0wNjAwCisr KyBiL3NjcmlwdHMvaGVhZGVyc19pbnN0YWxsLnNoCTIwMDgtMTItMTUgMjI6MDk6NDUuMDAwMDAw MDAwIC0wNjAwCkBAIC0wLDAgKzEsMjMgQEAKKyMhL2Jpbi9iYXNoCisKKyMgR3JhYiBhcmd1bWVu dHMKKworSU5ESVI9IiQxIgorc2hpZnQKK09VVERJUj0iJDEiCitzaGlmdAorQVJDSD0iJDEiCitz aGlmdAorCisjIEl0ZXJhdGUgdGhyb3VnaCBmaWxlcyBsaXN0ZWQgb24gY29tbWFuZCBsaW5lCisK K2ZvciBpIGluICIkQCIKK2RvCisJc2VkIC1yIFwKKwkJLWUgJ3MvKFsgXHQoXSkoX191c2VyfF9f Zm9yY2V8X19pb21lbSlbIFx0XS9cMS9nJyBcCisJCS1lICdzL19fYXR0cmlidXRlX2NvbnN0X18o WyBcdF18JCkvXDEvZycgXAorCQktZSAnc0BeI2luY2x1ZGUgPGxpbnV4L2NvbXBpbGVyLmg+QEAn ICIkSU5ESVIvJGkiIHwKKwlzY3JpcHRzL3VuaWZkZWYgLVVfX0tFUk5FTF9fIC0gPiAiJE9VVERJ Ui8kaSIKK2RvbmUKKworZXhpdCAwCmRpZmYgLXIgZDliNTAxYzkxNDQyIHNjcmlwdHMvTWFrZWZp bGUuaGVhZGVyc2luc3QKLS0tIGEvc2NyaXB0cy9NYWtlZmlsZS5oZWFkZXJzaW5zdAlTdW4gRGVj IDE0IDE2OjI1OjE5IDIwMDggLTA4MDAKKysrIGIvc2NyaXB0cy9NYWtlZmlsZS5oZWFkZXJzaW5z dAlNb24gRGVjIDE1IDIzOjMwOjE1IDIwMDggLTA2MDAKQEAgLTQ0LDggKzQ0LDggQEAKIHF1aWV0 X2NtZF9pbnN0YWxsID0gSU5TVEFMTCAkKHByaW50ZGlyKSAoJCh3b3JkcyAkKGFsbC1maWxlcykp XAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZpbGUkKGlmICQod29yZCAyLCAkKGFsbC1m aWxlcykpLHMpKQogICAgICAgY21kX2luc3RhbGwgPSBcCi0gICAgICAgICQoUEVSTCkgJDwgJChz cmN0cmVlKS8kKG9iaikgJChpbnN0YWxsKSAkKFNSQ0FSQ0gpICQoaGVhZGVyLXkpOyBcCi0gICAg ICAgICQoUEVSTCkgJDwgJChvYmp0cmVlKS8kKG9iaikgJChpbnN0YWxsKSAkKFNSQ0FSQ0gpICQo b2JqaGRyLXkpOyBcCisJCSQoQ09ORklHX1NIRUxMKSAkPCAkKHNyY3RyZWUpLyQob2JqKSAkKGlu c3RhbGwpICQoU1JDQVJDSCkgJChoZWFkZXIteSk7IFwKKwkJJChDT05GSUdfU0hFTEwpICQ8ICQo b2JqdHJlZSkvJChvYmopICQoaW5zdGFsbCkgJChTUkNBUkNIKSAkKG9iamhkci15KTsgXAogICAg ICAgICB0b3VjaCAkQAogCiBxdWlldF9jbWRfcmVtb3ZlID0gUkVNT1ZFICAkKHVud2FudGVkKQpA QCAtNjQsNyArNjQsNyBAQAogCUA6CiAKIHRhcmdldHMgKz0gJChpbnN0YWxsLWZpbGUpCi0kKGlu c3RhbGwtZmlsZSk6IHNjcmlwdHMvaGVhZGVyc19pbnN0YWxsLnBsICQoaW5wdXQtZmlsZXMpIEZP UkNFCiskKGluc3RhbGwtZmlsZSk6IHNjcmlwdHMvaGVhZGVyc19pbnN0YWxsLnNoICQoaW5wdXQt ZmlsZXMpIEZPUkNFCiAJJChpZiAkKHVud2FudGVkKSwkKGNhbGwgY21kLHJlbW92ZSksKQogCSQo aWYgJCh3aWxkY2FyZCAkKGRpciAkQCkpLCwkKHNoZWxsIG1rZGlyIC1wICQoZGlyICRAKSkpCiAJ JChjYWxsIGlmX2NoYW5nZWQsaW5zdGFsbCkKLS0tIGhnL3NjcmlwdHMvaGVhZGVyc19pbnN0YWxs LnBsCTIwMDgtMTEtMjIgMTk6MDk6MjEuMDAwMDAwMDAwIC0wNjAwCisrKyAvZGV2L251bGwJMTk3 MC0wMS0wMSAwMDowMDowMCAtMDYwMApAQCAtMSw0NiArMCwwIEBACi0jIS91c3IvYmluL3Blcmwg LXcKLSMKLSMgaGVhZGVyc19pbnN0YWxsIHByZXBhcmUgdGhlIGxpc3RlZCBoZWFkZXIgZmlsZXMg Zm9yIHVzZSBpbgotIyB1c2VyIHNwYWNlIGFuZCBjb3B5IHRoZSBmaWxlcyB0byB0aGVpciBkZXN0 aW5hdGlvbi4KLSMKLSMgVXNhZ2U6IGhlYWRlcnNfaW5zdGFsbC5wbCByZWFkZGlyIGluc3RhbGxk aXIgYXJjaCBbZmlsZXMuLi5dCi0jIHJlYWRkaXI6ICAgIGRpciB0byBvcGVuIGZpbGVzCi0jIGlu c3RhbGxkaXI6IGRpciB0byBpbnN0YWxsIHRoZSBmaWxlcwotIyBhcmNoOiAgICAgICBjdXJyZW50 IGFyY2hpdGVjdHVyZQotIyAgICAgICAgICAgICBhcmNoIGlzIHVzZWQgdG8gZm9yY2UgYSByZWlu c3RhbGxhdGlvbiB3aGVuIHRoZSBhcmNoCi0jICAgICAgICAgICAgIGNoYW5nZXMgYmVjYXVzZSBr YnVpbGQgdGhlbiBkZXRlY3QgYSBjb21tYW5kIGxpbmUgY2hhbmdlLgotIyBmaWxlczogICAgICBs aXN0IG9mIGZpbGVzIHRvIGNoZWNrCi0jCi0jIFN0ZXAgaW4gcHJlcGFyYXRpb24gZm9yIHVzZXJz IHNwYWNlOgotIyAxKSBEcm9wIGFsbCB1c2Ugb2YgY29tcGlsZXIuaCBkZWZpbml0aW9ucwotIyAy KSBEcm9wIGluY2x1ZGUgb2YgY29tcGlsZXIuaAotIyAzKSBEcm9wIGFsbCBzZWN0aW9ucyBkZWZp bmVkIG91dCBieSBfX0tFUk5FTF9fICh1c2luZyB1bmlmZGVmKQotCi11c2Ugc3RyaWN0OwotCi1t eSAoJHJlYWRkaXIsICRpbnN0YWxsZGlyLCAkYXJjaCwgQGZpbGVzKSA9IEBBUkdWOwotCi1teSAk dW5pZmRlZiA9ICJzY3JpcHRzL3VuaWZkZWYgLVVfX0tFUk5FTF9fIjsKLQotZm9yZWFjaCBteSAk ZmlsZSAoQGZpbGVzKSB7Ci0JbG9jYWwgKklORklMRTsKLQlsb2NhbCAqT1VURklMRTsKLQlteSAk dG1wZmlsZSA9ICIkaW5zdGFsbGRpci8kZmlsZS50bXAiOwotCW9wZW4oSU5GSUxFLCAiPCRyZWFk ZGlyLyRmaWxlIikKLQkJb3IgZGllICIkcmVhZGRpci8kZmlsZTogJCFcbiI7Ci0Jb3BlbihPVVRG SUxFLCAiPiR0bXBmaWxlIikgb3IgZGllICIkdG1wZmlsZTogJCFcbiI7Ci0Jd2hpbGUgKG15ICRs aW5lID0gPElORklMRT4pIHsKLQkJJGxpbmUgPX4gcy8oW1xzKF0pX191c2VyXHMvJDEvZzsKLQkJ JGxpbmUgPX4gcy8oW1xzKF0pX19mb3JjZVxzLyQxL2c7Ci0JCSRsaW5lID1+IHMvKFtccyhdKV9f aW9tZW1ccy8kMS9nOwotCQkkbGluZSA9fiBzL1xzX19hdHRyaWJ1dGVfY29uc3RfX1xzLyAvZzsK LQkJJGxpbmUgPX4gcy9cc19fYXR0cmlidXRlX2NvbnN0X18kLy9nOwotCQkkbGluZSA9fiBzL14j aW5jbHVkZSA8bGludXhcL2NvbXBpbGVyLmg+Ly87Ci0JCXByaW50ZiBPVVRGSUxFICIlcyIsICRs aW5lOwotCX0KLQljbG9zZSBPVVRGSUxFOwotCWNsb3NlIElORklMRTsKLQlzeXN0ZW0gJHVuaWZk ZWYgLiAiICR0bXBmaWxlID4gJGluc3RhbGxkaXIvJGZpbGUiOwotCXVubGluayAkdG1wZmlsZTsK LX0KLWV4aXQgMDsKAAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757379AbZABIOq (ORCPT ); Fri, 2 Jan 2009 03:14:46 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752397AbZABIOh (ORCPT ); Fri, 2 Jan 2009 03:14:37 -0500 Received: from static-71-162-243-5.phlapa.fios.verizon.net ([71.162.243.5]:41923 "EHLO grelber.thyrsus.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750988AbZABIOg (ORCPT ); Fri, 2 Jan 2009 03:14:36 -0500 From: Rob Landley Organization: Boundaries Unlimited To: Embedded Linux mailing list Subject: [PATCH 2/3]: Remove perl from make headers_install Date: Fri, 2 Jan 2009 02:14:32 -0600 User-Agent: KMail/1.10.1 (Linux/2.6.27-7-generic; KDE/4.1.2; x86_64; ; ) Cc: linux-kernel@vger.kernel.org, Andrew Morton , "H. Peter Anvin" , Sam Ravnborg References: <200901020207.30359.rob@landley.net> In-Reply-To: <200901020207.30359.rob@landley.net> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Disposition: inline Message-Id: <200901020214.33123.rob@landley.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by alpha id n028FcwM012170 From: Rob Landley Remove perl from make headers_install by replacing a perl script (doinga simple regex search and replace) with a smaller and faster shell scriptimplementation. The new shell script is a single for loop calling sed andpiping its output through unifdef to produce the target file. Sam Ravnborg added this perl to 2.6.27. Signed-off-by: Rob Landley --- scripts/Makefile.headersinst | 6 ++-- scripts/headers_install.pl | 46 --------------------------------- scripts/headers_install.sh | 23 ++++++++++++++++ 3 files changed, 26 insertions(+), 49 deletions(-) --- /dev/null 2008-11-21 04:46:41.000000000 -0600+++ b/scripts/headers_install.sh 2008-12-15 22:09:45.000000000 -0600@@ -0,0 +1,23 @@+#!/bin/bash++# Grab arguments++INDIR="$1"+shift+OUTDIR="$1"+shift+ARCH="$1"+shift++# Iterate through files listed on command line++for i in "$@"+do+ sed -r \+ -e 's/([ \t(])(__user|__force|__iomem)[ \t]/\1/g' \+ -e 's/__attribute_const__([ \t]|$)/\1/g' \+ -e 's@^#include @@' "$INDIR/$i" |+ scripts/unifdef -U__KERNEL__ - > "$OUTDIR/$i"+done++exit 0diff -r d9b501c91442 scripts/Makefile.headersinst--- a/scripts/Makefile.headersinst Sun Dec 14 16:25:19 2008 -0800+++ b/scripts/Makefile.headersinst Mon Dec 15 23:30:15 2008 -0600@@ -44,8 +44,8 @@ quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \- $(PERL) $< $(srctree)/$(obj) $(install) $(SRCARCH) $(header-y); \- $(PERL) $< $(objtree)/$(obj) $(install) $(SRCARCH) $(objhdr-y); \+ $(CONFIG_SHELL) $< $(srctree)/$(obj) $(install) $(SRCARCH) $(header-y); \+ $(CONFIG_SHELL) $< $(objtree)/$(obj) $(install) $(SRCARCH) $(objhdr-y); \ touch $@ quiet_cmd_remove = REMOVE $(unwanted)@@ -64,7 +64,7 @@ @: targets += $(install-file)-$(install-file): scripts/headers_install.pl $(input-files) FORCE+$(install-file): scripts/headers_install.sh $(input-files) FORCE $(if $(unwanted),$(call cmd,remove),) $(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@))) $(call if_changed,install)--- hg/scripts/headers_install.pl 2008-11-22 19:09:21.000000000 -0600+++ /dev/null 1970-01-01 00:00:00 -0600@@ -1,46 +0,0 @@-#!/usr/bin/perl -w-#-# headers_install prepare the listed header files for use in-# user space and copy the files to their destination.-#-# Usage: headers_install.pl readdir installdir arch [files...]-# readdir: dir to open files-# installdir: dir to install the files-# arch: current architecture-# arch is used to force a reinstallation when the arch-# changes because kbuild then detect a command line change.-# files: list of files to check-#-# Step in preparation for users space:-# 1) Drop all use of compiler.h definitions-# 2) Drop include of compiler.h-# 3) Drop all sections defined out by __KERNEL__ (using unifdef)--use strict;--my ($readdir, $installdir, $arch, @files) = @ARGV;--my $unifdef = "scripts/unifdef -U__KERNEL__";--foreach my $file (@files) {- local *INFILE;- local *OUTFILE;- my $tmpfile = "$installdir/$file.tmp";- open(INFILE, "<$readdir/$file")- or die "$readdir/$file: $!\n";- open(OUTFILE, ">$tmpfile") or die "$tmpfile: $!\n";- while (my $line = ) {- $line =~ s/([\s(])__user\s/$1/g;- $line =~ s/([\s(])__force\s/$1/g;- $line =~ s/([\s(])__iomem\s/$1/g;- $line =~ s/\s__attribute_const__\s/ /g;- $line =~ s/\s__attribute_const__$//g;- $line =~ s/^#include //;- printf OUTFILE "%s", $line;- }- close OUTFILE;- close INFILE;- system $unifdef . " $tmpfile > $installdir/$file";- unlink $tmpfile;-}-exit 0;{.n++%ݶw{.n+{G{ayʇڙ,jfhz_(階ݢj"mG?&~iOzv^m ?I