summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-09-06 17:26:02 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2014-09-07 14:30:42 +0200
commit9d017ddecbd394036f738c1571598c9df9b95dcf (patch)
tree3bf7c45b554b999c449d99f3eba5dfd0835d4a23
parent87df966fc0ad299a9102077c1cebe29d68e663a8 (diff)
backports: fix build with Ubuntu mainline kernelsv3.16.2-1linux-3.16.y
We only want the UTS_UBUNTU_RELEASE_ABI var when we are on a normal Ubuntu distribution kernel and not when we are on a Ubuntu mainline kernel. Some of the Ubuntu mainline kernel do have an invalid octal number in this field like 031418 and we do not want to evaluate this at all on the Ubuntu mainline kernels. All Ubuntu distribution kernel have CONFIG_VERSION_SIGNATURE set so this way we can detect the which type of kernel we are on. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--backport/backport-include/generated/utsrelease.h16
1 files changed, 16 insertions, 0 deletions
diff --git a/backport/backport-include/generated/utsrelease.h b/backport/backport-include/generated/utsrelease.h
index c1cf8afe..a149b7ab 100644
--- a/backport/backport-include/generated/utsrelease.h
+++ b/backport/backport-include/generated/utsrelease.h
@@ -1,5 +1,21 @@
+#ifndef __BACKPORT_GENERATED_UTS_RELEASE_H
+#define __BACKPORT_GENERATED_UTS_RELEASE_H
#include_next <generated/utsrelease.h>
+/*
+ * We only want the UTS_UBUNTU_RELEASE_ABI var when we are on a normal
+ * Ubuntu distribution kernel and not when we are on a Ubuntu mainline
+ * kernel. Some of the Ubuntu mainline kernel do have an invalid octal
+ * number in this field like 031418 and we do not want to evaluate this
+ * at all on the Ubuntu mainline kernels. All Ubuntu distribution
+ * kernel have CONFIG_VERSION_SIGNATURE set so this way we can detect
+ * the which type of kernel we are on.
+ */
#ifndef UTS_UBUNTU_RELEASE_ABI
#define UTS_UBUNTU_RELEASE_ABI 0
+#elif !defined(CONFIG_VERSION_SIGNATURE)
+#undef UTS_UBUNTU_RELEASE_ABI
+#define UTS_UBUNTU_RELEASE_ABI 0
#endif
+
+#endif /* __BACKPORT_GENERATED_UTS_RELEASE_H */