From cb1063a43f3cfee988f801fb791ca4b3a9a1bb76 Mon Sep 17 00:00:00 2001 From: James Simmons Date: Mon, 23 Mar 2015 11:33:43 -0400 Subject: [PATCH] LU-6387 build: add support for power8 Expand lustre to natively support the little endian Power8 platform. The architecture is reported as powerpc64le so add that support to lustre-build-linux.m4. For the Ubuntu packaging the platform is reported as ppc64el so include that to the debian build configuration. Change-Id: I506fd7228579fe1bd6e5c9e9d39db6ca06e4768d Signed-off-by: James Simmons Reviewed-on: http://review.whamcloud.com/14115 Tested-by: Maloo Tested-by: Jenkins Reviewed-by: Jian Yu Reviewed-by: Dmitry Eremin Reviewed-by: Brian J. Murrell Reviewed-by: Oleg Drokin --- config/lustre-build-linux.m4 | 2 +- debian/changelog | 6 ++++++ debian/control | 16 ++++++++-------- debian/control.main | 16 ++++++++-------- debian/control.modules.in | 4 ++-- debian/copyright | 14 +++++++------- 6 files changed, 32 insertions(+), 26 deletions(-) diff --git a/config/lustre-build-linux.m4 b/config/lustre-build-linux.m4 index 3ba2e9c..5eb844b 100644 --- a/config/lustre-build-linux.m4 +++ b/config/lustre-build-linux.m4 @@ -545,7 +545,7 @@ $2 AC_DEFUN([LB_LINUX_COMPILE_IFELSE], [m4_ifvaln([$1], [AC_LANG_CONFTEST([AC_LANG_SOURCE([$1])])])dnl rm -f build/conftest.o build/conftest.mod.c build/conftest.ko -SUBARCH=$(echo $target_cpu | sed -e 's/powerpc64/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/' -e 's/k1om/x86/') +SUBARCH=$(echo $target_cpu | sed -e 's/powerpc64le/powerpc/' -e 's/powerpc64/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/' -e 's/k1om/x86/') AS_IF([AC_TRY_COMMAND(cp conftest.c build && make -d [$2] ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_OFED_INCLUDE -I$LINUX/arch/$SUBARCH/include -Iinclude -Iarch/$SUBARCH/include/generated -I$LINUX/include -Iinclude2 -I$LINUX/include/uapi -Iinclude/generated -I$LINUX/arch/$SUBARCH/include/uapi -Iarch/$SUBARCH/include/generated/uapi -I$LINUX/include/uapi -Iinclude/generated/uapi ${SPL_OBJ:+-include $SPL_OBJ/spl_config.h} ${ZFS_OBJ:+-include $ZFS_OBJ/zfs_config.h} ${SPL:+-I$SPL -I$SPL/include } ${ZFS:+-I$ZFS -I$ZFS/include} -include $CONFIG_INCLUDE" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $CROSS_VARS $MODULE_TARGET=$PWD/build) >/dev/null && AC_TRY_COMMAND([$3])], [$4], [_AC_MSG_LOG_CONFTEST diff --git a/debian/changelog b/debian/changelog index 7fe79d5..4747a05 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lustre (2.7.50-1) unstable; urgency=low + + * Automated changelog entry update + + -- Brian J. Murrell Tue, 17 Mar 2015 23:39:07 -0400 + lustre (1.8.1.50-1) unstable; urgency=low * Update for an on-the-road-to-1.8.2 release diff --git a/debian/control b/debian/control index 8c974d0..08f8578a 100644 --- a/debian/control +++ b/debian/control @@ -1,8 +1,8 @@ Source: lustre Section: admin Priority: optional -Maintainer: Brian J. Murrell -Uploaders: Brian J. Murrell +Maintainer: Brian J. Murrell +Uploaders: Brian J. Murrell Standards-Version: 3.8.3 Build-Depends: module-assistant, libreadline-dev, debhelper (>=7.0.0), dpatch, automake (>=1.7) | automake1.7 | automake1.8 | automake1.9, libsnmp-dev, bzip2, quilt, linux-headers-generic | linux-headers, rsync Homepage: http://www.lustre.org/ @@ -39,12 +39,12 @@ Description: source for Lustre filesystem client kernel modules https://wiki.hpdd.intel.com/ . This package contains the module source. The client kernel modules - can be built for kernels from 2.6.18 - 2.6.26 from it using - module-assistant or make-kpkg. + can be built for kernels 2.6.32+ with the use of module-assistant + or make-kpkg. Package: lustre-utils Section: utils -Architecture: i386 powerpc amd64 ia64 +Architecture: i386 powerpc ppc64el amd64 ia64 Priority: optional Depends: ${shlibs:Depends}, ${misc:Depends} Description: Userspace utilities for the Lustre filesystem @@ -57,12 +57,12 @@ Description: Userspace utilities for the Lustre filesystem Package: lustre-tests Section: utils -Architecture: i386 powerpc amd64 ia64 +Architecture: i386 powerpc ppc64el amd64 ia64 Priority: optional Depends: ${shlibs:Depends}, ${misc:Depends} Description: Test suite for the Lustre filesystem Lustre is a scalable, secure, robust, highly-available cluster file system. - This release is maintained by Intel Corporation and available from + This release is maintained by Intel Corporation and available from https://wiki.hpdd.intel.com/ . This package provides a number of test utilities for the Lustre filesystem. @@ -70,7 +70,7 @@ Description: Test suite for the Lustre filesystem Package: lustre-dev Section: libdevel Priority: optional -Architecture: i386 powerpc amd64 ia64 +Architecture: i386 powerpc ppc64el amd64 ia64 Depends: lustre-utils (= ${binary:Version}) Description: Development files for the Lustre filesystem Lustre is a scalable, secure, robust, highly-available cluster file system. diff --git a/debian/control.main b/debian/control.main index 8c974d0..08f8578a 100644 --- a/debian/control.main +++ b/debian/control.main @@ -1,8 +1,8 @@ Source: lustre Section: admin Priority: optional -Maintainer: Brian J. Murrell -Uploaders: Brian J. Murrell +Maintainer: Brian J. Murrell +Uploaders: Brian J. Murrell Standards-Version: 3.8.3 Build-Depends: module-assistant, libreadline-dev, debhelper (>=7.0.0), dpatch, automake (>=1.7) | automake1.7 | automake1.8 | automake1.9, libsnmp-dev, bzip2, quilt, linux-headers-generic | linux-headers, rsync Homepage: http://www.lustre.org/ @@ -39,12 +39,12 @@ Description: source for Lustre filesystem client kernel modules https://wiki.hpdd.intel.com/ . This package contains the module source. The client kernel modules - can be built for kernels from 2.6.18 - 2.6.26 from it using - module-assistant or make-kpkg. + can be built for kernels 2.6.32+ with the use of module-assistant + or make-kpkg. Package: lustre-utils Section: utils -Architecture: i386 powerpc amd64 ia64 +Architecture: i386 powerpc ppc64el amd64 ia64 Priority: optional Depends: ${shlibs:Depends}, ${misc:Depends} Description: Userspace utilities for the Lustre filesystem @@ -57,12 +57,12 @@ Description: Userspace utilities for the Lustre filesystem Package: lustre-tests Section: utils -Architecture: i386 powerpc amd64 ia64 +Architecture: i386 powerpc ppc64el amd64 ia64 Priority: optional Depends: ${shlibs:Depends}, ${misc:Depends} Description: Test suite for the Lustre filesystem Lustre is a scalable, secure, robust, highly-available cluster file system. - This release is maintained by Intel Corporation and available from + This release is maintained by Intel Corporation and available from https://wiki.hpdd.intel.com/ . This package provides a number of test utilities for the Lustre filesystem. @@ -70,7 +70,7 @@ Description: Test suite for the Lustre filesystem Package: lustre-dev Section: libdevel Priority: optional -Architecture: i386 powerpc amd64 ia64 +Architecture: i386 powerpc ppc64el amd64 ia64 Depends: lustre-utils (= ${binary:Version}) Description: Development files for the Lustre filesystem Lustre is a scalable, secure, robust, highly-available cluster file system. diff --git a/debian/control.modules.in b/debian/control.modules.in index 2a57ac8..84a7012 100644 --- a/debian/control.modules.in +++ b/debian/control.modules.in @@ -1,8 +1,8 @@ Source: lustre Section: admin Priority: optional -Maintainer: Brian J. Murrell -Uploaders: Brian J. Murrell +Maintainer: Brian J. Murrell +Uploaders: Brian J. Murrell Standards-Version: 3.7.2 Build-Depends: debhelper (>= 5.0.0), bzip2 diff --git a/debian/copyright b/debian/copyright index 9b7a2cd..0b9dbe7 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,18 +1,18 @@ -This package was debianized by Brian J. Murrell , +This package was debianized by Brian J. Murrell , Aug. 2009. It is heavily based on the work of Alastair McKinstry , October 2006. and more recently the Debian Lustre Packaging team, , which is based on work by Goswin von Brederlow and Patrick Winnertz. -It is currently maintained by Brian J. Murrell, +It is currently maintained by Brian J. Murrell, -Lustre is Copyright (C) 2002-2009 Sun Microsystems, Inc. and is licensed -under the GNU Public License Version 2; +Lustre is Copyright (C) 2002-2009 Sun Microsystems, Inc. and is licensed +under the GNU Public License Version 2; it was downloaded from http://www.lustre.org/ . -The documentation (included in lustre-utils) is covered by -the GNU Free Documentation License; there are no invariant-clauses included -in this documentation, and hence it is considered to be free under +The documentation (included in lustre-utils) is covered by +the GNU Free Documentation License; there are no invariant-clauses included +in this documentation, and hence it is considered to be free under the Debian Free Software Guidelines (DFSG). A copy of the GPL may be found at /usr/share/common-licenses/GPL-2. -- 1.8.3.1