From: Hauke Mehrtens Date: Sat, 6 Sep 2014 15:26:02 +0000 (+0200) Subject: backports: fix build with Ubuntu mainline kernels X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=692a4c870830f15e4e52965fe19f11ce7730f15c;p=openwrt%2Fstaging%2Fblogic.git backports: fix build with Ubuntu mainline kernels 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 --- diff --git a/backport/backport-include/generated/utsrelease.h b/backport/backport-include/generated/utsrelease.h index c1cf8afefac4..a149b7ab084c 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 +/* + * 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 */