* [PATCH 1/2] UAPI: Remove empty Kbuild files
@ 2013-01-02 15:12 David Howells
2013-01-02 15:13 ` [PATCH 2/2] UAPI: Strip _UAPI prefix on header install no matter the whitespace David Howells
0 siblings, 1 reply; 3+ messages in thread
From: David Howells @ 2013-01-02 15:12 UTC (permalink / raw)
To: torvalds; +Cc: linux-kernel
Empty files can get deleted by the patch program, so remove empty Kbuild files
and their links from the parent Kbuilds.
Signed-off-by: David Howells <dhowells@redhat.com>
---
include/Kbuild | 3 ---
include/linux/Kbuild | 5 -----
include/linux/hdlc/Kbuild | 0
include/linux/hsi/Kbuild | 0
include/linux/raid/Kbuild | 0
include/linux/usb/Kbuild | 0
include/rdma/Kbuild | 0
include/sound/Kbuild | 0
8 files changed, 8 deletions(-)
delete mode 100644 include/linux/Kbuild
delete mode 100644 include/linux/hdlc/Kbuild
delete mode 100644 include/linux/hsi/Kbuild
delete mode 100644 include/linux/raid/Kbuild
delete mode 100644 include/linux/usb/Kbuild
delete mode 100644 include/rdma/Kbuild
delete mode 100644 include/sound/Kbuild
diff --git a/include/Kbuild b/include/Kbuild
index 83256b6..1dfd33e 100644
--- a/include/Kbuild
+++ b/include/Kbuild
@@ -1,8 +1,5 @@
# Top-level Makefile calls into asm-$(ARCH)
# List only non-arch directories below
-header-y += linux/
-header-y += sound/
-header-y += rdma/
header-y += video/
header-y += scsi/
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
deleted file mode 100644
index 7fe2dae..0000000
--- a/include/linux/Kbuild
+++ /dev/null
@@ -1,5 +0,0 @@
-header-y += dvb/
-header-y += hdlc/
-header-y += hsi/
-header-y += raid/
-header-y += usb/
diff --git a/include/linux/hdlc/Kbuild b/include/linux/hdlc/Kbuild
deleted file mode 100644
index e69de29..0000000
diff --git a/include/linux/hsi/Kbuild b/include/linux/hsi/Kbuild
deleted file mode 100644
index e69de29..0000000
diff --git a/include/linux/raid/Kbuild b/include/linux/raid/Kbuild
deleted file mode 100644
index e69de29..0000000
diff --git a/include/linux/usb/Kbuild b/include/linux/usb/Kbuild
deleted file mode 100644
index e69de29..0000000
diff --git a/include/rdma/Kbuild b/include/rdma/Kbuild
deleted file mode 100644
index e69de29..0000000
diff --git a/include/sound/Kbuild b/include/sound/Kbuild
deleted file mode 100644
index e69de29..0000000
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 2/2] UAPI: Strip _UAPI prefix on header install no matter the whitespace
2013-01-02 15:12 [PATCH 1/2] UAPI: Remove empty Kbuild files David Howells
@ 2013-01-02 15:13 ` David Howells
0 siblings, 0 replies; 3+ messages in thread
From: David Howells @ 2013-01-02 15:13 UTC (permalink / raw)
To: torvalds; +Cc: linux-kernel
The following commit:
commit 56c176c9cac9a77249fa1736bfd792f379d61942
Author: David Howells <dhowells@redhat.com>
Date: Mon Nov 26 16:29:39 2012 -0800
Subject: UAPI: strip the _UAPI prefix from header guards during header installation
strips the _UAPI prefix from header guards, but only if there's a single space
between the cpp directive and the label. Make it more flexible and able to
handle tabs and multiple white space characters.
Signed-off-by: David Howells <dhowell@redhat.com>
---
| 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--git a/scripts/headers_install.pl b/scripts/headers_install.pl
index 6c353ae..581ca99 100644
--- a/scripts/headers_install.pl
+++ b/scripts/headers_install.pl
@@ -42,9 +42,9 @@ foreach my $filename (@files) {
$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 /* !;
+ $line =~ s/#ifndef\s+_UAPI/#ifndef /;
+ $line =~ s/#define\s+_UAPI/#define /;
+ $line =~ s!#endif\s+/[*]\s*_UAPI!#endif /* !;
printf {$out} "%s", $line;
}
close $out;
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/2] UAPI: Remove empty Kbuild files
@ 2012-12-21 12:48 David Howells
2012-12-21 12:48 ` [PATCH 2/2] UAPI: Strip _UAPI prefix on header install no matter the whitespace David Howells
0 siblings, 1 reply; 3+ messages in thread
From: David Howells @ 2012-12-21 12:48 UTC (permalink / raw)
To: torvalds; +Cc: akpm, linux-kernel
Empty files can get deleted by the patch program, so remove empty Kbuild files
and their links from the parent Kbuilds.
Signed-off-by: David Howells <dhowells@redhat.com>
---
include/Kbuild | 3 ---
include/linux/Kbuild | 5 -----
include/linux/hdlc/Kbuild | 0
include/linux/hsi/Kbuild | 0
include/linux/raid/Kbuild | 0
include/linux/usb/Kbuild | 0
include/rdma/Kbuild | 0
include/sound/Kbuild | 0
8 files changed, 8 deletions(-)
delete mode 100644 include/linux/Kbuild
delete mode 100644 include/linux/hdlc/Kbuild
delete mode 100644 include/linux/hsi/Kbuild
delete mode 100644 include/linux/raid/Kbuild
delete mode 100644 include/linux/usb/Kbuild
delete mode 100644 include/rdma/Kbuild
delete mode 100644 include/sound/Kbuild
diff --git a/include/Kbuild b/include/Kbuild
index 83256b6..1dfd33e 100644
--- a/include/Kbuild
+++ b/include/Kbuild
@@ -1,8 +1,5 @@
# Top-level Makefile calls into asm-$(ARCH)
# List only non-arch directories below
-header-y += linux/
-header-y += sound/
-header-y += rdma/
header-y += video/
header-y += scsi/
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
deleted file mode 100644
index 7fe2dae..0000000
--- a/include/linux/Kbuild
+++ /dev/null
@@ -1,5 +0,0 @@
-header-y += dvb/
-header-y += hdlc/
-header-y += hsi/
-header-y += raid/
-header-y += usb/
diff --git a/include/linux/hdlc/Kbuild b/include/linux/hdlc/Kbuild
deleted file mode 100644
index e69de29..0000000
diff --git a/include/linux/hsi/Kbuild b/include/linux/hsi/Kbuild
deleted file mode 100644
index e69de29..0000000
diff --git a/include/linux/raid/Kbuild b/include/linux/raid/Kbuild
deleted file mode 100644
index e69de29..0000000
diff --git a/include/linux/usb/Kbuild b/include/linux/usb/Kbuild
deleted file mode 100644
index e69de29..0000000
diff --git a/include/rdma/Kbuild b/include/rdma/Kbuild
deleted file mode 100644
index e69de29..0000000
diff --git a/include/sound/Kbuild b/include/sound/Kbuild
deleted file mode 100644
index e69de29..0000000
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 2/2] UAPI: Strip _UAPI prefix on header install no matter the whitespace
2012-12-21 12:48 [PATCH 1/2] UAPI: Remove empty Kbuild files David Howells
@ 2012-12-21 12:48 ` David Howells
0 siblings, 0 replies; 3+ messages in thread
From: David Howells @ 2012-12-21 12:48 UTC (permalink / raw)
To: torvalds; +Cc: akpm, linux-kernel
The following commit:
commit 56c176c9cac9a77249fa1736bfd792f379d61942
Author: David Howells <dhowells@redhat.com>
Date: Mon Nov 26 16:29:39 2012 -0800
Subject: UAPI: strip the _UAPI prefix from header guards during header installation
strips the _UAPI prefix from header guards, but only if there's a single space
between the cpp directive and the label. Make it more flexible and able to
handle tabs and multiple white space characters.
Signed-off-by: David Howells <dhowell@redhat.com>
---
| 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--git a/scripts/headers_install.pl b/scripts/headers_install.pl
index 6c353ae..581ca99 100644
--- a/scripts/headers_install.pl
+++ b/scripts/headers_install.pl
@@ -42,9 +42,9 @@ foreach my $filename (@files) {
$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 /* !;
+ $line =~ s/#ifndef\s+_UAPI/#ifndef /;
+ $line =~ s/#define\s+_UAPI/#define /;
+ $line =~ s!#endif\s+/[*]\s*_UAPI!#endif /* !;
printf {$out} "%s", $line;
}
close $out;
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-01-02 15:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-01-02 15:12 [PATCH 1/2] UAPI: Remove empty Kbuild files David Howells
2013-01-02 15:13 ` [PATCH 2/2] UAPI: Strip _UAPI prefix on header install no matter the whitespace David Howells
-- strict thread matches above, loose matches on Subject: below --
2012-12-21 12:48 [PATCH 1/2] UAPI: Remove empty Kbuild files David Howells
2012-12-21 12:48 ` [PATCH 2/2] UAPI: Strip _UAPI prefix on header install no matter the whitespace David Howells
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®