From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rob Landley Subject: PATCH [2/3]: Remove perl from make headers_install. Date: Sat, 3 Jan 2009 19:28:13 -0600 Message-ID: <200901031928.13428.rob@landley.net> References: <200901020207.30359.rob@landley.net> <200901031924.15869.rob@landley.net> Mime-Version: 1.0 Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <200901031924.15869.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 bmlmZGVmIHRvIHByb2R1Y2UgdGhlIHRhcmdldCBmaWxlLgoKQ2hhbmdlcyBmcm9tIHByZXZpb3Vz IHZlcnNpb246IEFkZGVkIGhlbHAgdGV4dCBhbmQgYSBjaGVjayBmb3IgdGhlIHJpZ2h0Cm51bWJl ciBvZiBhcmd1bWVudHMuICBSZW1vdmVkIHVudXNlZCBBUkNIIGlucHV0IGZyb20gc2NyaXB0IGFu ZCBtYWtlZmlsZQoodGhlIG1ha2VmaWxlIGluY29ycG9yYXRlcyBBUkNIIGludG8gSU5ESVIsIHNv IHRoZSBzY3JpcHQgZG9lc24ndCBjYXJlKSwKZml4ZWQgYSB3aGl0ZXNwYWNlIG1pc3Rha2UgaW4g dGhlIG1ha2VmaWxlIHBvaW50ZWQgb3V0IGJ5IFNhbSBSYXZuYm9yZywKY2hhbmdlZCB0aGUgc2hl YmFuZyB0byAjIS9iaW4vc2ggYW5kIHRlc3RlZCB1bmRlciBiYXNoIGFuZCBkYXNoLgoKCnB1dF9j aGFuZ2Vsb2dfaGVyZQoKU2lnbmVkLW9mZi1ieTogUm9iIExhbmRsZXkgPHJvYkBsYW5kbGV5Lm5l dD4KLS0tCgogc2NyaXB0cy9NYWtlZmlsZS5oZWFkZXJzaW5zdCB8ICAgIDYgKystLQogc2NyaXB0 cy9oZWFkZXJzX2luc3RhbGwucGwgICB8ICAgNDYgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tCiBzY3JpcHRzL2hlYWRlcnNfaW5zdGFsbC5zaCAgIHwgICAzNiArKysrKysrKysrKysr KysrKysrKysrKysrCiAzIGZpbGVzIGNoYW5nZWQsIDM5IGluc2VydGlvbnMoKyksIDQ5IGRlbGV0 aW9ucygtKQoKZGlmZiAtcnVOIGxpbnV4LTIuNi4yOC9zY3JpcHRzL2hlYWRlcnNfaW5zdGFsbC5z aCBsaW51eC0yLjYuMjgtbmV3L3NjcmlwdHMvaGVhZGVyc19pbnN0YWxsLnNoCi0tLSBsaW51eC0y LjYuMjgvc2NyaXB0cy9oZWFkZXJzX2luc3RhbGwuc2gJMTk2OS0xMi0zMSAxODowMDowMC4wMDAw MDAwMDAgLTA2MDAKKysrIGxpbnV4LTIuNi4yOC1uZXcvc2NyaXB0cy9oZWFkZXJzX2luc3RhbGwu c2gJMjAwOS0wMS0wMiAyMjozNToxNy4wMDAwMDAwMDAgLTA2MDAKQEAgLTAsMCArMSwzNiBAQAor IyEvYmluL3NoCisKK2lmIFsgJCMgLWx0IDIgXQordGhlbgorCWVjaG8gIlVzYWdlOiBoZWFkZXJz X2luc3RhbGwuc2ggSU5ESVIgT1VURElSIFtGSUxFUy4uLl0KKwllY2hvCisJZWNobyAiUHJlcGFy ZXMga2VybmVsIGhlYWRlciBmaWxlcyBmb3IgdXNlIGJ5IHVzZXIgc3BhY2UsIGJ5IHJlbW92aW5n IgorCWVjaG8gImFsbCBjb21waWxlci5oIGRlZmluaXRpb25zIGFuZCAjaW5jbHVkZXMsIGFuZCBy ZW1vdmluZyBhbnkiCisJZWNobyAiI2lmZGVmIF9fS0VSTkVMX18gc2VjdGlvbnMuIgorCWVjaG8K KwllY2hvICJJTkRJUjogIGRpcmVjdG9yeSB0byByZWFkIGVhY2gga2VybmVsIGhlYWRlciBGSUxF IGZyb20uIgorCWVjaG8gIk9VVERJUjogZGlyZWN0b3J5IHRvIHdyaXRlIGVhY2ggdXNlcnNwYWNl IGhlYWRlciBGSUxFIHRvLiIKKwllY2hvICJGSUxFUzogIGxpc3Qgb2YgaGVhZGVyIGZpbGVzIHRv IG9wZXJhdGUgb24uIgorCisJZXhpdCAxCitmaQorCisjIEdyYWIgYXJndW1lbnRzCisKK0lORElS PSIkMSIKK3NoaWZ0CitPVVRESVI9IiQxIgorc2hpZnQKKworIyBJdGVyYXRlIHRocm91Z2ggZmls ZXMgbGlzdGVkIG9uIGNvbW1hbmQgbGluZQorCitmb3IgaSBpbiAiJEAiCitkbworCXNlZCAtciBc CisJCS1lICdzLyhbIFx0KF0pKF9fdXNlcnxfX2ZvcmNlfF9faW9tZW0pWyBcdF0vXDEvZycgXAor CQktZSAncy9fX2F0dHJpYnV0ZV9jb25zdF9fKFsgXHRdfCQpL1wxL2cnIFwKKwkJLWUgJ3NAXiNp bmNsdWRlIDxsaW51eC9jb21waWxlci5oPkBAJyAiJElORElSLyRpIiB8CisJc2NyaXB0cy91bmlm ZGVmIC1VX19LRVJORUxfXyAtID4gIiRPVVRESVIvJGkiCitkb25lCisKK2V4aXQgMApkaWZmIC1y dU4gbGludXgtMi42LjI4L3NjcmlwdHMvTWFrZWZpbGUuaGVhZGVyc2luc3QgbGludXgtMi42LjI4 LW5ldy9zY3JpcHRzL01ha2VmaWxlLmhlYWRlcnNpbnN0Ci0tLSBsaW51eC0yLjYuMjgvc2NyaXB0 cy9NYWtlZmlsZS5oZWFkZXJzaW5zdAkyMDA4LTEyLTI0IDE3OjI2OjM3LjAwMDAwMDAwMCAtMDYw MAorKysgbGludXgtMi42LjI4LW5ldy9zY3JpcHRzL01ha2VmaWxlLmhlYWRlcnNpbnN0CTIwMDkt MDEtMDIgMjI6MzY6NDIuMDAwMDAwMDAwIC0wNjAwCkBAIC00NCw4ICs0NCw4IEBACiBxdWlldF9j bWRfaW5zdGFsbCA9IElOU1RBTEwgJChwcmludGRpcikgKCQod29yZHMgJChhbGwtZmlsZXMpKVwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBmaWxlJChpZiAkKHdvcmQgMiwgJChhbGwtZmls ZXMpKSxzKSkKICAgICAgIGNtZF9pbnN0YWxsID0gXAotICAgICAgICAkKFBFUkwpICQ8ICQoc3Jj dHJlZSkvJChvYmopICQoaW5zdGFsbCkgJChTUkNBUkNIKSAkKGhlYWRlci15KTsgXAotICAgICAg ICAkKFBFUkwpICQ8ICQob2JqdHJlZSkvJChvYmopICQoaW5zdGFsbCkgJChTUkNBUkNIKSAkKG9i amhkci15KTsgXAorICAgICAgJChDT05GSUdfU0hFTEwpICQ8ICQoc3JjdHJlZSkvJChvYmopICQo aW5zdGFsbCkgJChoZWFkZXIteSk7IFwKKyAgICAgICQoQ09ORklHX1NIRUxMKSAkPCAkKG9ianRy ZWUpLyQob2JqKSAkKGluc3RhbGwpICQob2JqaGRyLXkpOyBcCiAgICAgICAgIHRvdWNoICRACiAK IHF1aWV0X2NtZF9yZW1vdmUgPSBSRU1PVkUgICQodW53YW50ZWQpCkBAIC02NCw3ICs2NCw3IEBA CiAJQDoKIAogdGFyZ2V0cyArPSAkKGluc3RhbGwtZmlsZSkKLSQoaW5zdGFsbC1maWxlKTogc2Ny aXB0cy9oZWFkZXJzX2luc3RhbGwucGwgJChpbnB1dC1maWxlcykgRk9SQ0UKKyQoaW5zdGFsbC1m aWxlKTogc2NyaXB0cy9oZWFkZXJzX2luc3RhbGwuc2ggJChpbnB1dC1maWxlcykgRk9SQ0UKIAkk KGlmICQodW53YW50ZWQpLCQoY2FsbCBjbWQscmVtb3ZlKSwpCiAJJChpZiAkKHdpbGRjYXJkICQo ZGlyICRAKSksLCQoc2hlbGwgbWtkaXIgLXAgJChkaXIgJEApKSkKIAkkKGNhbGwgaWZfY2hhbmdl ZCxpbnN0YWxsKQpkaWZmIC1ydU4gbGludXgtMi42LjI4L3NjcmlwdHMvaGVhZGVyc19pbnN0YWxs LnBsIGxpbnV4LTIuNi4yOC1uZXcvc2NyaXB0cy9oZWFkZXJzX2luc3RhbGwucGwKLS0tIGxpbnV4 LTIuNi4yOC9zY3JpcHRzL2hlYWRlcnNfaW5zdGFsbC5wbAkyMDA4LTEyLTI0IDE3OjI2OjM3LjAw MDAwMDAwMCAtMDYwMAorKysgbGludXgtMi42LjI4LW5ldy9zY3JpcHRzL2hlYWRlcnNfaW5zdGFs bC5wbAkxOTY5LTEyLTMxIDE4OjAwOjAwLjAwMDAwMDAwMCAtMDYwMApAQCAtMSw0NiArMCwwIEBA Ci0jIS91c3IvYmluL3BlcmwgLXcKLSMKLSMgaGVhZGVyc19pbnN0YWxsIHByZXBhcmUgdGhlIGxp c3RlZCBoZWFkZXIgZmlsZXMgZm9yIHVzZSBpbgotIyB1c2VyIHNwYWNlIGFuZCBjb3B5IHRoZSBm aWxlcyB0byB0aGVpciBkZXN0aW5hdGlvbi4KLSMKLSMgVXNhZ2U6IGhlYWRlcnNfaW5zdGFsbC5w bCByZWFkZGlyIGluc3RhbGxkaXIgYXJjaCBbZmlsZXMuLi5dCi0jIHJlYWRkaXI6ICAgIGRpciB0 byBvcGVuIGZpbGVzCi0jIGluc3RhbGxkaXI6IGRpciB0byBpbnN0YWxsIHRoZSBmaWxlcwotIyBh cmNoOiAgICAgICBjdXJyZW50IGFyY2hpdGVjdHVyZQotIyAgICAgICAgICAgICBhcmNoIGlzIHVz ZWQgdG8gZm9yY2UgYSByZWluc3RhbGxhdGlvbiB3aGVuIHRoZSBhcmNoCi0jICAgICAgICAgICAg IGNoYW5nZXMgYmVjYXVzZSBrYnVpbGQgdGhlbiBkZXRlY3QgYSBjb21tYW5kIGxpbmUgY2hhbmdl LgotIyBmaWxlczogICAgICBsaXN0IG9mIGZpbGVzIHRvIGNoZWNrCi0jCi0jIFN0ZXAgaW4gcHJl cGFyYXRpb24gZm9yIHVzZXJzIHNwYWNlOgotIyAxKSBEcm9wIGFsbCB1c2Ugb2YgY29tcGlsZXIu aCBkZWZpbml0aW9ucwotIyAyKSBEcm9wIGluY2x1ZGUgb2YgY29tcGlsZXIuaAotIyAzKSBEcm9w IGFsbCBzZWN0aW9ucyBkZWZpbmVkIG91dCBieSBfX0tFUk5FTF9fICh1c2luZyB1bmlmZGVmKQot Ci11c2Ugc3RyaWN0OwotCi1teSAoJHJlYWRkaXIsICRpbnN0YWxsZGlyLCAkYXJjaCwgQGZpbGVz KSA9IEBBUkdWOwotCi1teSAkdW5pZmRlZiA9ICJzY3JpcHRzL3VuaWZkZWYgLVVfX0tFUk5FTF9f IjsKLQotZm9yZWFjaCBteSAkZmlsZSAoQGZpbGVzKSB7Ci0JbG9jYWwgKklORklMRTsKLQlsb2Nh bCAqT1VURklMRTsKLQlteSAkdG1wZmlsZSA9ICIkaW5zdGFsbGRpci8kZmlsZS50bXAiOwotCW9w ZW4oSU5GSUxFLCAiPCRyZWFkZGlyLyRmaWxlIikKLQkJb3IgZGllICIkcmVhZGRpci8kZmlsZTog JCFcbiI7Ci0Jb3BlbihPVVRGSUxFLCAiPiR0bXBmaWxlIikgb3IgZGllICIkdG1wZmlsZTogJCFc biI7Ci0Jd2hpbGUgKG15ICRsaW5lID0gPElORklMRT4pIHsKLQkJJGxpbmUgPX4gcy8oW1xzKF0p X191c2VyXHMvJDEvZzsKLQkJJGxpbmUgPX4gcy8oW1xzKF0pX19mb3JjZVxzLyQxL2c7Ci0JCSRs aW5lID1+IHMvKFtccyhdKV9faW9tZW1ccy8kMS9nOwotCQkkbGluZSA9fiBzL1xzX19hdHRyaWJ1 dGVfY29uc3RfX1xzLyAvZzsKLQkJJGxpbmUgPX4gcy9cc19fYXR0cmlidXRlX2NvbnN0X18kLy9n OwotCQkkbGluZSA9fiBzL14jaW5jbHVkZSA8bGludXhcL2NvbXBpbGVyLmg+Ly87Ci0JCXByaW50 ZiBPVVRGSUxFICIlcyIsICRsaW5lOwotCX0KLQljbG9zZSBPVVRGSUxFOwotCWNsb3NlIElORklM RTsKLQlzeXN0ZW0gJHVuaWZkZWYgLiAiICR0bXBmaWxlID4gJGluc3RhbGxkaXIvJGZpbGUiOwot CXVubGluayAkdG1wZmlsZTsKLX0KLWV4aXQgMDsKAAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755246AbZADB21 (ORCPT ); Sat, 3 Jan 2009 20:28:27 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751072AbZADB2S (ORCPT ); Sat, 3 Jan 2009 20:28:18 -0500 Received: from static-71-162-243-5.phlapa.fios.verizon.net ([71.162.243.5]:35227 "EHLO grelber.thyrsus.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750863AbZADB2R (ORCPT ); Sat, 3 Jan 2009 20:28:17 -0500 From: Rob Landley Organization: Boundaries Unlimited To: Embedded Linux mailing list Subject: PATCH [2/3]: Remove perl from make headers_install. Date: Sat, 3 Jan 2009 19:28:13 -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> <200901031924.15869.rob@landley.net> In-Reply-To: <200901031924.15869.rob@landley.net> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Disposition: inline Message-Id: <200901031928.13428.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 n041SVwM029247 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. Changes from previous version: Added help text and a check for the rightnumber of arguments. Removed unused ARCH input from script and makefile(the makefile incorporates ARCH into INDIR, so the script doesn't care),fixed a whitespace mistake in the makefile pointed out by Sam Ravnborg,changed the shebang to #!/bin/sh and tested under bash and dash. put_changelog_here Signed-off-by: Rob Landley --- scripts/Makefile.headersinst | 6 ++-- scripts/headers_install.pl | 46 --------------------------------- scripts/headers_install.sh | 36 +++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 49 deletions(-) diff -ruN linux-2.6.28/scripts/headers_install.sh linux-2.6.28-new/scripts/headers_install.sh--- linux-2.6.28/scripts/headers_install.sh 1969-12-31 18:00:00.000000000 -0600+++ linux-2.6.28-new/scripts/headers_install.sh 2009-01-02 22:35:17.000000000 -0600@@ -0,0 +1,36 @@+#!/bin/sh++if [ $# -lt 2 ]+then+ echo "Usage: headers_install.sh INDIR OUTDIR [FILES...]+ echo+ echo "Prepares kernel header files for use by user space, by removing"+ echo "all compiler.h definitions and #includes, and removing any"+ echo "#ifdef __KERNEL__ sections."+ echo+ echo "INDIR: directory to read each kernel header FILE from."+ echo "OUTDIR: directory to write each userspace header FILE to."+ echo "FILES: list of header files to operate on."++ exit 1+fi++# Grab arguments++INDIR="$1"+shift+OUTDIR="$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 -ruN linux-2.6.28/scripts/Makefile.headersinst linux-2.6.28-new/scripts/Makefile.headersinst--- linux-2.6.28/scripts/Makefile.headersinst 2008-12-24 17:26:37.000000000 -0600+++ linux-2.6.28-new/scripts/Makefile.headersinst 2009-01-02 22:36:42.000000000 -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) $(header-y); \+ $(CONFIG_SHELL) $< $(objtree)/$(obj) $(install) $(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)diff -ruN linux-2.6.28/scripts/headers_install.pl linux-2.6.28-new/scripts/headers_install.pl--- linux-2.6.28/scripts/headers_install.pl 2008-12-24 17:26:37.000000000 -0600+++ linux-2.6.28-new/scripts/headers_install.pl 1969-12-31 18:00:00.000000000 -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