From cae83cc099abfdb9424cb9e93c31b5c8d45c8b01 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 15 Oct 2012 15:57:08 -0500 Subject: [PATCH] Add irqnr patch to make things compile --- irqnr-build.patch | 43 +++++++++++++++++++++++++++++++++++++++++++ kernel.spec | 6 ++++++ 2 files changed, 49 insertions(+) create mode 100644 irqnr-build.patch diff --git a/irqnr-build.patch b/irqnr-build.patch new file mode 100644 index 000000000..b6797b4e3 --- /dev/null +++ b/irqnr-build.patch @@ -0,0 +1,43 @@ +uapi/linux/irqnr.h was emitted by the UAPI disintegration script as an empty +file because the parent linux/irqnr.h had no UAPI stuff in it, despite being +marked with "header-y". + +Unfortunately, it patch deletes the empty file when applying a kernel patch. + +It's not clear why this file is part of the UAPI at all. Looking in: + + /usr/include/linux/irqnr.h + +there's nothing there but a header reinclusion guard and a comment. + +So just stick a comment in there as a placeholder. + +Without this, if the kernel is fabricated from, say, a tarball and a patch, you +can get this error when building x86_64 or usermode Linux (and probably +others): + +include/linux/irqnr.h:4:30: fatal error: uapi/linux/irqnr.h: No such file or directory + +Signed-off-by: David Howells +cc: Randy Dunlap +cc: Alessandro Suardi +--- + + include/uapi/linux/irqnr.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/include/uapi/linux/irqnr.h b/include/uapi/linux/irqnr.h +index e69de29..ae5704f 100644 +--- a/include/uapi/linux/irqnr.h ++++ b/include/uapi/linux/irqnr.h +@@ -0,0 +1,4 @@ ++/* ++ * There isn't anything here anymore, but the file must not be empty or patch ++ * will delete it. ++ */ + +-- +To unsubscribe from this list: send the line "unsubscribe linux-kernel" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html +Please read the FAQ at http://www.tux.org/lkml/ diff --git a/kernel.spec b/kernel.spec index cb52e4588..02506b39f 100644 --- a/kernel.spec +++ b/kernel.spec @@ -750,6 +750,9 @@ Patch22001: selinux-apply-different-permission-to-ptrace-child.patch #rhbz 846037 Patch22067: selinux-Fix-sel_netnode_insert-suspicious-rcu-dereference.patch +# Build patch, should go away +Patch22070: irqnr-build.patch + # END OF PATCH DEFINITIONS %endif @@ -1448,6 +1451,9 @@ ApplyPatch selinux-apply-different-permission-to-ptrace-child.patch #rhbz 846037 ApplyPatch selinux-Fix-sel_netnode_insert-suspicious-rcu-dereference.patch +#Build patch, should go away +ApplyPatch irqnr-build.patch + # END OF PATCH APPLICATIONS %endif