LU-647 Adding libcfs include path

- liblustreapi.h includes libcfs/posix/posix-types.h now, the
  libcfs include path should be added.
- use e2fsprogs-RHEL-6.spec.in for CentOS-6.

Signed-off-by: Niu Yawei <niu@whamcloud.com>
Change-Id: I4694c2957842918341f0736232ce6aa4ac85c2e0

diff --git a/patches/e2fsprogs-add-trusted-fid.patch b/patches/e2fsprogs-add-trusted-fid.patch
index f9c4cf5..5e4ab50 100644 (file)
--- a/patches/e2fsprogs-add-trusted-fid.patch
+++ b/patches/e2fsprogs-add-trusted-fid.patch
@@ -86,7 +86,7 @@ Index: e2fsprogs/debugfs/Makefile.in
        $(srcdir)/dump.c $(srcdir)/set_fields.c ${srcdir}/logdump.c \
        $(srcdir)/htree.c $(srcdir)/unused.c
  
-+@LFSCK_CMT@LUSTRE_INC=-I @LUSTRE@/lustre/include -I @LUSTRE@/include -Wall
++@LFSCK_CMT@LUSTRE_INC=-I @LUSTRE@/lustre/include -I @LUSTRE@/include -I @LUSTRE@/libcfs/include -Wall
  LIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(LIBCOM_ERR) $(LIBBLKID) \
        $(LIBUUID)
  DEPLIBS= $(LIBEXT2FS) $(LIBE2P) $(DEPLIBSS) $(DEPLIBCOM_ERR) \

diff --git a/patches/e2fsprogs-lfsck.patch b/patches/e2fsprogs-lfsck.patch
index 60c1849..afd478e 100644 (file)
--- a/patches/e2fsprogs-lfsck.patch
+++ b/patches/e2fsprogs-lfsck.patch
@@ -148,7 +148,7 @@ Index: e2fsprogs/e2fsck/Makefile.in
  
 -LIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(LIBUUID) $(LIBINTL) $(LIBE2P)
 +@LFSCK_CMT@LFSCK_LIBS=-ldb-@DB4VERSION@
-+@LFSCK_CMT@LUSTRE_INC=-I @LUSTRE@/lustre/include -I @LUSTRE@/include -Wall
++@LFSCK_CMT@LUSTRE_INC=-I @LUSTRE@/lustre/include -I @LUSTRE@/include -I @LUSTRE@/libcfs/include -Wall
 +@LFSCK_CMT@LUSTRE_LIB=-L @LUSTRE@/lustre/utils -L @LUSTRE@/lib64 -L @LUSTRE@/lib
 +LIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(LIBUUID) $(LIBINTL) $(LIBE2P) $(LFSCK_LIBS)
  DEPLIBS= $(LIBEXT2FS) $(DEPLIBCOM_ERR) $(DEPLIBBLKID) $(DEPLIBUUID) \

diff --git a/patches/e2fsprogs-rpm_RHEL-6.patch b/patches/e2fsprogs-rpm_RHEL-6.patch
index ca71933..b736dfd 100644 (file)
--- a/patches/e2fsprogs-rpm_RHEL-6.patch
+++ b/patches/e2fsprogs-rpm_RHEL-6.patch
@@ -794,7 +794,7 @@ Index: e2fsprogs/configure.in
 ===================================================================
 --- e2fsprogs.orig/configure.in
 +++ e2fsprogs/configure.in
-@@ -1234,6 +1234,7 @@ test -d include || mkdir include
+@@ -1242,6 +1242,7 @@ test -d include || mkdir include
  test -d include/linux || mkdir include/linux
  test -d include/asm || mkdir include/asm
  for i in MCONFIG Makefile e2fsprogs.spec \
@@ -806,7 +806,7 @@ Index: e2fsprogs/contrib/build-rpm
 ===================================================================
 --- e2fsprogs.orig/contrib/build-rpm
 +++ e2fsprogs/contrib/build-rpm
-@@ -34,11 +34,46 @@ EXCLUDE="--exclude .hg* --exclude .pc*
+@@ -34,11 +34,47 @@ EXCLUDE="--exclude .hg* --exclude .pc* -
  
  [ "`rpmbuild --version 2> /dev/null`" ] && RPM=rpmbuild || RPM=rpm
  
@@ -838,6 +838,7 @@ Index: e2fsprogs/contrib/build-rpm
 +fi
 +case "$DISTRO-$RELEASE" in
 +    RedHatEnterpriseServer-6*) DISTRO=RHEL; RELEASE=6;;
++    CentOS-6*) DISTRO=RHEL; RELEASE=6;;
 +    Fedora-1[234]) DISTRO=RHEL; RELEASE=6;;   # use the same .spec for now
 +esac
 +