LU-1199 build: Increase ldiskfs version to 4.1.0

The ldiskfs version number has not changed in quite some time.

This brings the versioning in line with what LLNL has been using
externally, and allows us to realign on the same code.

Add an explicit requirement for "lustre-ldiskfs >= 4.1.0"
to the lustre spec file at the same time.

Signed-off-by: Christopher J. Morrone <morrone2@llnl.gov>
Change-Id: I72c9f52093942d881ee02dad8f65c2f04dbef35e
Reviewed-on: http://review.whamcloud.com/5938
Tested-by: Hudson
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: James Simmons <uja.ornl@gmail.com>

diff --git a/ldiskfs/configure.ac b/ldiskfs/configure.ac
index 8a3c805..4dd5f67 100644 (file)
--- a/ldiskfs/configure.ac
+++ b/ldiskfs/configure.ac
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.57])
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.57])

-AC_INIT([Lustre ldiskfs], 3.3.0, [http://bugs.whamcloud.com/])
+AC_INIT([Lustre ldiskfs], 4.1.0, [http://bugs.whamcloud.com/])

 AC_CONFIG_SRCDIR([lustre-ldiskfs.spec.in])
 
 # Don't look for install-sh, etc. in ..
 AC_CONFIG_SRCDIR([lustre-ldiskfs.spec.in])
 
 # Don't look for install-sh, etc. in ..

diff --git a/lustre.spec.in b/lustre.spec.in
index edd02f5..afb5016 100644 (file)
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -100,7 +100,7 @@ Lustre file system, server and network drivers for Linux %{kversion}.
 %if %{build_lustre_osd_ldiskfs}
 %package osd-ldiskfs
 Summary: osd-ldiskfs is the mandatory glue for LDISKFS support in Lustre.
 %if %{build_lustre_osd_ldiskfs}
 %package osd-ldiskfs
 Summary: osd-ldiskfs is the mandatory glue for LDISKFS support in Lustre.

-Requires: lustre-modules = %{version}, lustre-ldiskfs
+Requires: lustre-modules = %{version}, lustre-ldiskfs >= 4.1.0

 Provides: lustre-osd
 Group: Development/Kernel
 
 Provides: lustre-osd
 Group: Development/Kernel