From 12bf48dcf9d3b9ac955ecf1165441ae08c2b9213 Mon Sep 17 00:00:00 2001 From: Liu Xuezhao Date: Tue, 24 Jul 2012 10:29:05 +0800 Subject: [PATCH] LU-812 build: fix "make rpms" failure In FC15 (2.6.40-4) the generated kernel headers have moved from "include/linux" to "include/generated". Update lustre.spec.in to fix the break of "make rpms". Signed-off-by: Liu Xuezhao Change-Id: I5059b5f9bb4f77aa3fc05ced9612b0a46e5f2386 Reviewed-on: http://review.whamcloud.com/3444 Tested-by: Hudson Reviewed-by: Yang Sheng Tested-by: Maloo Reviewed-by: Andreas Dilger --- lustre.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lustre.spec.in b/lustre.spec.in index a2e52fd..f3568bf 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -6,7 +6,7 @@ %{!?kobjdir: %define kobjdir %(dir=$(echo "%configure_args" | sed -ne 's/.*--with-linux-obj=\\([^ ][^ ]*\\).*$/\\1/p'); if [ -n "$dir" ]; then echo "$dir"; else if [ -n "%kver" ]; then kversion="%kver"; else kversion="$(uname -r)"; fi; if [ "%kdir" = "/lib/modules/$kversion/source" ]; then echo "/lib/modules/$kversion/build"; else echo "%kdir"; fi; fi)} # as an alternative to this implementation we could simply "make -C $kdir kernelversion" -%{!?kversion: %define kversion %(if test -s %kobjdir/include/linux/utsrelease.h ; then LINUXRELEASEHEADER=utsrelease.h; else LINUXRELEASEHEADER=version.h; fi; sed -ne '/^#define UTS_RELEASE/s/.*"\\(.*\\)"$/\\1/p' %kobjdir/include/linux/$LINUXRELEASEHEADER)} +%{!?kversion: %define kversion %(if test -s %kobjdir/include/generated/utsrelease.h ; then LINUXRELEASEHEADER=%kobjdir/include/generated/utsrelease.h ; elif test -s %kobjdir/include/linux/utsrelease.h ; then LINUXRELEASEHEADER=%kobjdir/include/linux/utsrelease.h ; else LINUXRELEASEHEADER=%kobjdir/include/linux/version.h; fi; sed -ne '/^#define UTS_RELEASE/s/.*"\\(.*\\)"$/\\1/p' $LINUXRELEASEHEADER)} %{!?downstream_release: %define downstream_release "@DOWNSTREAM_RELEASE@"} -- 1.8.3.1