From patchwork Tue Dec 18 01:12:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Landley X-Patchwork-Id: 1889661 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 69E58DF266 for ; Tue, 18 Dec 2012 01:18:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753625Ab2LRBSE (ORCPT ); Mon, 17 Dec 2012 20:18:04 -0500 Received: from mail-oa0-f41.google.com ([209.85.219.41]:44599 "EHLO mail-oa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753458Ab2LRBSE (ORCPT ); Mon, 17 Dec 2012 20:18:04 -0500 X-Greylist: delayed 311 seconds by postgrey-1.27 at vger.kernel.org; Mon, 17 Dec 2012 20:18:04 EST Received: by mail-oa0-f41.google.com with SMTP id k14so52611oag.0 for ; Mon, 17 Dec 2012 17:18:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:message-id:date:from:subject:to:cc:x-gm-message-state; bh=Nd9a8/uuxoqQyejPjVBhgi8yCjtogC2ykhCqLZK1yNA=; b=QkDEbD3G6fd3O3p9zJlVugP4jNA8cvrto6dLF04bUkO8LioyMOVlocTyk5+AukGgV9 5RyV9oLvTm+KZ5iJ5Ah7bwlkBAWpx9tGhFYr+7RNBMvDpBztr2Y1SsEDzikddZMqDI1p Dz6iu8UO7cxNuBhIkO8Hooc7Wp2EYnCcZNGwdIsN/+j3pKfj0WWXjzk0rZKgA3kuaStq uJY1gSdzDYYZVSs2ij74c/8AR0IjZNUxQhAGymEBm3ZkVJ1aeqGOzoK10/mYAKL2ZWfZ 3oXZ1GUKzBs6gpJCGpmW2naCrLAW6MiR67RCaycF4w1rY/VWOF8VDK3l8HfA7ppEb+fD huCQ== X-Received: by 10.60.23.232 with SMTP id p8mr215045oef.53.1355793171862; Mon, 17 Dec 2012 17:12:51 -0800 (PST) Received: from [127.0.1.1] (cpe-72-177-21-136.austin.res.rr.com. [72.177.21.136]) by mx.google.com with ESMTPS id t8sm116742obn.15.2012.12.17.17.12.50 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 17 Dec 2012 17:12:51 -0800 (PST) Message-ID: <50cfc313.6831b60a.0bc4.0604@mx.google.com> Date: Mon, 17 Dec 2012 17:12:51 -0800 (PST) From: rob@landley.net Subject: [PATCH 3/3] convert headers_install.pl->headers_install.sh To: Michal Marek Cc: linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org X-Gm-Message-State: ALoCoQkcYaadHAI35Anm6vkaoh/bzq5cs3ByqQQDTO4xXccTBFW5EsZTrkkP/0ASw+h+d8YjpGYd Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org From: Rob Landley Remove perl from make headers_install by replacing a perl script (doing a simple regex search and replace) with a smaller, faster, simpler, POSIX-2008 shell script implementation. The new shell script is a single for loop calling sed and piping its output through unifdef to produce the target file. Signed-off-by: Rob Landley Acked-by: Sam Ravnborg --- scripts/Makefile.headersinst | 4 +- scripts/headers_install.pl | 63 --------------------------------- scripts/headers_install.sh | 43 ++++++++++++++++++++++ 3 files changed, 45 insertions(+), 65 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff -ruN linux-3.1/scripts/headers_install.sh linux-2.6.30/scripts/headers_install.sh --- linux-3.1/scripts/headers_install.sh +++ linux/scripts/headers_install.sh @@ -0,0 +1,43 @@ +#!/bin/sh + +if [ $# -lt 1 ] +then + echo "Usage: headers_install.sh OUTDIR [FILES...] + echo + echo "Prepares kernel header files for use by user space, by removing" + echo "all compiler.h definitions and #includes, removing any" + echo "#ifdef __KERNEL__ sections, and putting __underscores__ around" + echo "asm/inline/volatile keywords." + echo + echo "OUTDIR: directory to write each userspace header FILE to." + echo "FILES: list of header files to operate on." + + exit 1 +fi + +# Grab arguments + +OUTDIR="$1" +shift + +# Iterate through files listed on command line + +FILE= +trap 'rm -f "$OUTDIR/$FILE" "$OUTDIR/$FILE.sed"' EXIT +for i in "$@" +do + FILE="$(basename "$i")" + sed -r \ + -e 's/([ \t(])(__user|__force|__iomem)[ \t]/\1/g' \ + -e 's/__attribute_const__([ \t]|$)/\1/g' \ + -e 's@^#include @@' \ + -e 's/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g' \ + -e 's/(^|[ \t])(inline|asm|volatile)([ \t(]|$)/\1__\2__\3/g' \ + -e 's@#(ifndef|define|endif /[*]) _UAPI@#\1 @' \ + "$i" > "$OUTDIR/$FILE.sed" || exit 1 + scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__ "$OUTDIR/$FILE.sed" \ + > "$OUTDIR/$FILE" + [ $? -gt 1 ] && exit 1 + rm -f "$OUTDIR/$FILE.sed" +done +trap - EXIT diff -ruN linux-3.1/scripts/Makefile.headersinst --- linux-3.1/scripts/Makefile.headersinst +++ linux/scripts/Makefile.headersinst @@ -55,7 +55,7 @@ quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(PERL) $< $(installdir) $(SRCARCH) $(input-files); \ + $(CONFIG_SHELL) $< $(installdir) $(input-files); \ for F in $(wrapper-files); do \ echo "\#include " > $(installdir)/$$F; \ done; \ @@ -83,7 +83,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) --- a/scripts/headers_install.pl +++ /dev/null @@ -1,63 +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...] -# installdir: dir to install the files to -# 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 ($installdir, $arch, @files) = @ARGV; - -my $unifdef = "scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__"; - -foreach my $filename (@files) { - my $file = $filename; - $file =~ s!^.*/!!; - - my $tmpfile = "$installdir/$file.tmp"; - - open(my $in, '<', $filename) - or die "$filename: $!\n"; - open(my $out, '>', $tmpfile) - or die "$tmpfile: $!\n"; - while (my $line = <$in>) { - $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/\b__packed\b/__attribute__((packed))/g; - $line =~ s/^#include //; - $line =~ s/(^|\s)(inline)\b/$1__$2__/g; - $line =~ s/(^|\s)(asm)\b(\s|[(]|$)/$1__$2__$3/g; - $line =~ s/(^|\s|[(])(volatile)\b(\s|[(]|$)/$1__$2__$3/g; - $line =~ s/#ifndef _UAPI/#ifndef /; - $line =~ s/#define _UAPI/#define /; - $line =~ s!#endif /[*] _UAPI!#endif /* !; - printf {$out} "%s", $line; - } - close $out; - close $in; - - system $unifdef . " $tmpfile > $installdir/$file"; - # unifdef will exit 0 on success, and will exit 1 when the - # file was processed successfully but no changes were made, - # so abort only when it's higher than that. - my $e = $? >> 8; - if ($e > 1) { - die "$tmpfile: $!\n"; - } - unlink $tmpfile; -} -exit 0;