From 0b3e852a58dbf10d1d342b8414a9f35ebe36b930 Mon Sep 17 00:00:00 2001 From: James Simmons Date: Thu, 14 Feb 2013 08:07:28 -0500 Subject: [PATCH] LU-1812 ldiskfs: detect generated utsrelease.h Fix lustre-ldiskfs.spec.in to use SLES11's generated header files. Signed-off-by: James Simmons Signed-off-by: chas williams - CONTRACTOR Change-Id: I0eb198274015bfd38c48e9f68ceb15fe9e601d17 Reviewed-on: http://review.whamcloud.com/5188 Reviewed-by: Bob Glossman Reviewed-by: Andreas Dilger Tested-by: Hudson Tested-by: Maloo --- ldiskfs/lustre-ldiskfs.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ldiskfs/lustre-ldiskfs.spec.in b/ldiskfs/lustre-ldiskfs.spec.in index d8ea8a1..e9e0c73 100644 --- a/ldiskfs/lustre-ldiskfs.spec.in +++ b/ldiskfs/lustre-ldiskfs.spec.in @@ -5,7 +5,7 @@ %{!?kobjdir: %define kobjdir %(dir=$(echo "%configure_args" | sed -ne 's/.*--with-linux-obj=\\([^ ][^ ]*\\).*$/\\1/p'); if [ -n "$dir" ]; then echo "$dir"; else echo "%kdir"; 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: %global 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