linux/ioctlent: unify them all

Mike Frysinger vapier at gentoo.org
Tue Mar 1 01:21:17 UTC 2011


This unifies all the ioctlent.h's in the linux subdir while still
allowing each arch to maintain its own minor list.

The basic method is:
 - each arch has linux/<arch>/ioctlent.h.in which defines only the
   arch-specific ioctls
 - linux/ioctlent.h.in which defines only the common ioctls
 - at build time, these two headers are combined & sorted to produce
   the linux/ioctlent.h file

This also requires a little tweaking of the include files since the
common ioctlent.h is a built file.

Signed-off-by: Mike Frysinger <vapier at gentoo.org>
---
i guess the mailing list limit is 40KiB ... a bit low imo.  perhaps it could 
be bumped up to 100KiB ...

ive deleted all the delete hunks from this patch.  to reproduce:
		git rm linux/*/ioctlent.h
	The ioctlent.h.in files were created by:
		grep asm ioctlent.h > ioctlent.h.in

	you could also find it in my vapier branch:
		git://sources.blackfin.uclinux.org/git/sf.net/strace/strace.git

 .gitignore                          |    2 +
 Makefile.am                         |   68 +-
 linux/alpha/ioctlent.h              |  852 --------------
 linux/alpha/ioctlent.h.in           |   73 ++
 linux/arm/ioctlent.h.in             |    1 +
 linux/arm/ioctlent1.h               |    2 +-
 linux/avr32/ioctlent.h.in           |    1 +
 linux/bfin/ioctlent.h               | 2080 
-----------------------------------
 linux/bfin/ioctlent.h.in            |   86 ++
 linux/hppa/ioctlent.h               |  779 -------------
 linux/i386/ioctlent.h.in            |   99 ++
 linux/ia64/ioctlent.h               | 1080 ------------------
 linux/ia64/ioctlent.h.in            |   66 ++
 linux/{ioctlent.h => ioctlent.h.in} |   99 --
 linux/m68k/ioctlent.h.in            |    1 +
 linux/microblaze/ioctlent.h.in      |    1 +
 linux/mips/ioctlent.h               |  838 --------------
 linux/mips/ioctlent.h.in            |   59 +
 linux/powerpc/ioctlent.h            | 1667 ----------------------------
 linux/powerpc/ioctlent.h.in         |  114 ++
 linux/powerpc/ioctlent1.h           |    2 +-
 linux/s390/ioctlent.h               | 1651 ---------------------------
 linux/s390/ioctlent.h.in            |  125 +++
 linux/s390x/ioctlent.h              |    1 -
 linux/sh/ioctlent.h                 |  836 --------------
 linux/sh/ioctlent.h.in              |   65 ++
 linux/sh64/ioctlent.h.in            |    1 +
 linux/sparc/ioctlent.h              | 1643 ---------------------------
 linux/sparc/ioctlent.h.in           |  173 +++
 linux/sparc/ioctlent1.h             |    2 +-
 linux/sparc64/ioctlent.h            |    1 -
 linux/sparc64/ioctlent1.h           |    2 +-
 linux/tile/ioctlent.h.in            |    1 +
 linux/x86_64/ioctlent.h.in          |    1 +
 linux/x86_64/ioctlent1.h            |    2 +-
 35 files changed, 914 insertions(+), 11560 deletions(-)
 delete mode 100644 linux/alpha/ioctlent.h
 create mode 100644 linux/alpha/ioctlent.h.in
 create mode 100644 linux/arm/ioctlent.h.in
 create mode 100644 linux/avr32/ioctlent.h.in
 delete mode 100644 linux/bfin/ioctlent.h
 create mode 100644 linux/bfin/ioctlent.h.in
 delete mode 100644 linux/hppa/ioctlent.h
 create mode 100644 linux/hppa/ioctlent.h.in
 create mode 100644 linux/i386/ioctlent.h.in
 delete mode 100644 linux/ia64/ioctlent.h
 create mode 100644 linux/ia64/ioctlent.h.in
 rename linux/{ioctlent.h => ioctlent.h.in} (95%)
 create mode 100644 linux/m68k/ioctlent.h.in
 create mode 100644 linux/microblaze/ioctlent.h.in
 delete mode 100644 linux/mips/ioctlent.h
 create mode 100644 linux/mips/ioctlent.h.in
 delete mode 100644 linux/powerpc/ioctlent.h
 create mode 100644 linux/powerpc/ioctlent.h.in
 delete mode 100644 linux/s390/ioctlent.h
 create mode 100644 linux/s390/ioctlent.h.in
 delete mode 100644 linux/s390x/ioctlent.h
 create mode 100644 linux/s390x/ioctlent.h.in
 delete mode 100644 linux/sh/ioctlent.h
 create mode 100644 linux/sh/ioctlent.h.in
 create mode 100644 linux/sh64/ioctlent.h.in
 delete mode 100644 linux/sparc/ioctlent.h
 create mode 100644 linux/sparc/ioctlent.h.in
 delete mode 100644 linux/sparc64/ioctlent.h
 create mode 100644 linux/sparc64/ioctlent.h.in
 create mode 100644 linux/tile/ioctlent.h.in
 create mode 100644 linux/x86_64/ioctlent.h.in
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-linux-ioctlent-unify-them-all.patch.bz2
Type: application/x-bzip
Size: 7029 bytes
Desc: not available
URL: <http://lists.strace.io/pipermail/strace-devel/attachments/20110228/98fef957/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.strace.io/pipermail/strace-devel/attachments/20110228/98fef957/attachment-0001.bin>


More information about the Strace-devel mailing list