Skip to contentSkip to conversation

convert headers_install.pl->headers_install.sh

PATCH In review [email protected] 3 participants 4 messages Dec 18, 2012 – Feb 26, 2013 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 3/3 convert headers_install.pl->headers_install.sh

From: Rob Landley <[email protected]>

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.

---

 scripts/Makefile.headersinst |    4 +-
 scripts/headers_install.pl   |   63 ---------------------------------
 scripts/headers_install.sh   |   43 ++++++++++++++++++++++
 3 files changed, 45 insertions(+), 65 deletions(-)
scripts/headers_install.sh +43 -0
diff -ruN linux-3.1/scripts/headers_install.sh linux-2.6.30/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 <linux/compiler.h>@@' \
+		-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
scripts/Makefile.headersinst +2 -2
diff -ruN linux-3.1/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 <asm-generic/$$F>" > $(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)
scripts/headers_install.pl deleted +0 -63

63 lines not on this page · raw message

Acked-by on v1 3/3
#1 lore raw
Quoted 9 lines · On Mon, Dec 17, 2012 at 05:12:51PM -0800, [email protected] wrote:

From: Rob Landley <[email protected]>

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.

The shell based variant is smaller and faster which is good. As 99.999% of people buildign the kernel has perl installed that is not a reason to apply this patch.
But as it bring benefits on their own then it has my:

Sam

#2 lore raw
In reply to [email protected]
Quoted 8 lines · On Mon, Dec 17, 2012 at 05:12:51PM -0800, [email protected] wrote:

From: Rob Landley <[email protected]>

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.

Quoted 7 lines

---

 scripts/Makefile.headersinst |    4 +-
 scripts/headers_install.pl   |   63 ---------------------------------
 scripts/headers_install.sh   |   43 ++++++++++++++++++++++
 3 files changed, 45 insertions(+), 65 deletions(-)

Hi Rob,

sorry for the long delay. In general, the patch looks OK, I only have two remarks:

scripts/headers_install.sh line 35

Quoted 1 line
scripts/headers_install.sh +1 -0
+		-e 's/(^|[ \t])(inline|asm|volatile)([ \t(]|$)/\1__\2__\3/g' \

This regexp does not match the 'volatile' in

#define XVMCLOCKPTR(saPriv,lockNo)					\
	((volatile struct drm_hw_lock *)(((((unsigned long) (saPriv)->XvMCLockArea) + \
				      (VIA_MAX_CACHELINE_SIZE - 1)) &	\
				     ~(VIA_MAX_CACHELINE_SIZE - 1)) +	\
				    VIA_MAX_CACHELINE_SIZE*(lockNo)))

in include/uapi/drm/via_drm.h.

scripts/headers_install.pl line 10

Quoted 13 lines
scripts/headers_install.pl deleted +0 -10
@@ -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.

You are not passing $(SRCARCH) to the shell script. This seems OK, as the list of files changes if needed, but the change should be mentioned in the changelog.

Thanks,
Michal

#3 lore raw
Quoted 17 lines · Michal Marek
Quoted 3 lines · On Mon, Dec 17, 2012 at 05:12:51PM -0800, [email protected] wrote:

From: Rob Landley <[email protected]>

Remove perl from make headers_install by replacing a perl script

(doing

Quoted 2 lines

a simple regex search and replace) with a smaller, faster, simpler, POSIX-2008 shell script implementation. The new shell script is a

single

Quoted 1 line

for loop calling sed and piping its output through unifdef to

produce the

Quoted 7 lines

target file.

---

 scripts/Makefile.headersinst |    4 +-
 scripts/headers_install.pl   |   63  
Quoted 8 lines

---------------------------------

Quoted 2 lines
 scripts/headers_install.sh   |   43 ++++++++++++++++++++++
 3 files changed, 45 insertions(+), 65 deletions(-)

Hi Rob,

sorry for the long delay. In general, the patch looks OK, I only have two remarks:

Thanks for the review.

Quoted 7 lines

Review

Quoted 1 line
(quoted diff) +1 -0
+		-e 's/(^|[ \t])(inline|asm|volatile)([  

\t(]|$)/\1__\2__\3/g' \

This regexp does not match the 'volatile' in

#define XVMCLOCKPTR(saPriv,lockNo) \
((volatile struct drm_hw_lock *)(((((unsigned long)

Quoted 8 lines
(saPriv)->XvMCLockArea) + \
				      (VIA_MAX_CACHELINE_SIZE - 1)) &	 
\
				     ~(VIA_MAX_CACHELINE_SIZE - 1)) +	 

\
VIA_MAX_CACHELINE_SIZE*(lockNo)))

in include/uapi/drm/via_drm.h.

Looks like the first range needs to be [ \t(], same as the second one. I'll redo the patches with that. (And rediff for offset noise.)

Quoted 15 lines

scripts/headers_install.pl line 10

Quoted 13 lines
scripts/headers_install.pl deleted +0 -10
@@ -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.

Quoted 3 lines

You are not passing $(SRCARCH) to the shell script. This seems OK, as the list of files changes if needed, but the change should be mentioned in the changelog.

Yup. The script wasn't using it, and to invoke it to do different things the remaining command line arguments already had to change.

I'll be sure to mention it in the respin, which should be sometime after lunch.

Quoted 3 lines

Thanks,
Michal

Thanks,

Rob