From 7f3977ccd45fce0d150196e515286603135e7f3d Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Wed, 26 Dec 2018 02:03:55 -0700 Subject: [PATCH] LU-11880 build: allow Debian build on Raspbian Allow the Debian build to work on Raspbian and other Debian and Ubuntu variants that use the same build machinery. Add armhf to the list of allowed CPU architectures. Test-Parameters: trivial clientdistro=ubuntu1804 Signed-off-by: Andreas Dilger Change-Id: Iedc90ad32754f81a3d387a66409f07aaa305a5b1 Reviewed-on: https://review.whamcloud.com/34085 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Thomas Stibor Reviewed-by: Minh Diep Reviewed-by: James Simmons Reviewed-by: Oleg Drokin --- autoMakefile.am | 2 +- config/lustre-build-linux.m4 | 3 +-- debian/changelog | 6 ++++++ debian/control | 14 +++++++------- debian/control.main | 14 +++++++------- 5 files changed, 22 insertions(+), 17 deletions(-) diff --git a/autoMakefile.am b/autoMakefile.am index 92a3c4c..aeda751 100644 --- a/autoMakefile.am +++ b/autoMakefile.am @@ -235,7 +235,7 @@ debs: undef.h lversion=$$(echo @VERSION@ | tr '_' '-'); \ cversion=$$(sed -ne '1s/^lustre (\(.*\)-[0-9][0-9]*).*$$/\1/p' debian/changelog); \ if [ "$$lversion" != "$$cversion" ]; then \ - echo -e "1i\nlustre ($$lversion-1) unstable; urgency=low\n\n * Automated changelog entry update\n\n -- Brian J. Murrell $$(date -R)\n\n.\nwq" | ed debian/changelog; \ + echo -e "1i\nlustre ($$lversion-1) unstable; urgency=low\n\n * Automated changelog entry update\n\n -- Andreas Dilger $$(date -R)\n\n.\nwq" | ed debian/changelog; \ fi; \ rm -rf debs; \ if test "x@ENABLE_SERVER@" = "xyes"; then \ diff --git a/config/lustre-build-linux.m4 b/config/lustre-build-linux.m4 index ba250e3..9941045 100644 --- a/config/lustre-build-linux.m4 +++ b/config/lustre-build-linux.m4 @@ -419,8 +419,7 @@ LC_MODULE_LOADING AC_DEFUN([LB_USES_DPKG], [ AC_CACHE_CHECK([if this distro uses dpkg], lb_cv_uses_dpkg, [ lb_cv_uses_dpkg="no" -AS_CASE([$(lsb_release -i -s 2>/dev/null)], - [Ubuntu | Debian], [lb_cv_uses_dpkg="yes"]) +AS_CASE([$(which dpkg 2>/dev/null)],[*/dpkg], [lb_cv_uses_dpkg="yes"]) ]) uses_dpkg=$lb_cv_uses_dpkg ]) diff --git a/debian/changelog b/debian/changelog index 31b2584..6068b35 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lustre (2.12.0-dirty-1) unstable; urgency=low + + * Automated changelog entry update + + -- Andreas Dilger Sat, 22 Dec 2018 17:20:13 -0700 + lustre (2.11.55-dirty-1) unstable; urgency=low * Automated changelog entry update diff --git a/debian/control b/debian/control index 0e2ebd6..133acd8 100644 --- a/debian/control +++ b/debian/control @@ -24,7 +24,7 @@ Description: source for Lustre filesystem client kernel modules Package: lustre-client-utils Section: utils -Architecture: i386 powerpc ppc64el amd64 ia64 arm64 +Architecture: i386 armhf powerpc ppc64el amd64 ia64 arm64 Priority: optional Depends: ${shlibs:Depends}, ${misc:Depends}, libyaml-0-2, libselinux1, libsnmp30, zlib1g, perl Description: Userspace utilities for the Lustre filesystem (client) @@ -38,7 +38,7 @@ Description: Userspace utilities for the Lustre filesystem (client) Package: lustre-server-utils Section: utils -Architecture: i386 powerpc ppc64el amd64 ia64 arm64 +Architecture: i386 armhf powerpc ppc64el amd64 ia64 arm64 Priority: optional Depends: ${shlibs:Depends}, ${misc:Depends}, libyaml-0-2, libselinux1, libsnmp30, zlib1g, perl Provides: lustre-server-utils, lustre-client-utils (= ${binary:Version}) @@ -56,7 +56,7 @@ Description: Userspace utilities for the Lustre filesystem (server) Package: lustre-resource-agents Section: ha -Architecture: i386 powerpc ppc64el amd64 ia64 arm64 +Architecture: i386 armhf powerpc ppc64el amd64 ia64 arm64 Priority: optional Depends: lustre-server-utils (= ${binary:Version}), resource-agents Description: HA Resuable Cluster Resource Scripts for Lustre @@ -70,7 +70,7 @@ Description: HA Resuable Cluster Resource Scripts for Lustre Package: lustre-iokit Section: utils -Architecture: i386 powerpc ppc64el amd64 ia64 arm64 +Architecture: i386 armhf powerpc ppc64el amd64 ia64 arm64 Priority: optional Depends: lustre-client-utils (= ${binary:Version}), python, perl, sg3-utils Description: Collection of benchmark tools for the Lustre filesystem @@ -82,7 +82,7 @@ Description: Collection of benchmark tools for the Lustre filesystem Package: lustre-tests Section: utils -Architecture: i386 powerpc ppc64el amd64 ia64 arm64 +Architecture: i386 armhf powerpc ppc64el amd64 ia64 arm64 Priority: optional Depends: lustre-iokit (= ${binary:Version}), attr, rsync, perl, lsof, mpi-default-bin Description: Test suite for the Lustre filesystem @@ -95,7 +95,7 @@ Description: Test suite for the Lustre filesystem Package: lustre-dev Section: libdevel Priority: optional -Architecture: i386 powerpc ppc64el amd64 ia64 arm64 +Architecture: i386 armhf powerpc ppc64el amd64 ia64 arm64 Depends: lustre-client-utils (= ${binary:Version}) Description: Development files for the Lustre filesystem Lustre is a scalable, secure, robust, highly-available cluster file system. @@ -106,7 +106,7 @@ Description: Development files for the Lustre filesystem Package: lustre-client-modules-dkms Section: admin -Architecture: i386 powerpc ppc64el amd64 ia64 +Architecture: i386 armhf powerpc ppc64el amd64 ia64 Priority: optional Depends: dkms, automake, libtool, linux-headers-generic | linux-headers | linux-headers-amd64 Recommends: linux-image, lustre-utils diff --git a/debian/control.main b/debian/control.main index 0e2ebd6..133acd8 100644 --- a/debian/control.main +++ b/debian/control.main @@ -24,7 +24,7 @@ Description: source for Lustre filesystem client kernel modules Package: lustre-client-utils Section: utils -Architecture: i386 powerpc ppc64el amd64 ia64 arm64 +Architecture: i386 armhf powerpc ppc64el amd64 ia64 arm64 Priority: optional Depends: ${shlibs:Depends}, ${misc:Depends}, libyaml-0-2, libselinux1, libsnmp30, zlib1g, perl Description: Userspace utilities for the Lustre filesystem (client) @@ -38,7 +38,7 @@ Description: Userspace utilities for the Lustre filesystem (client) Package: lustre-server-utils Section: utils -Architecture: i386 powerpc ppc64el amd64 ia64 arm64 +Architecture: i386 armhf powerpc ppc64el amd64 ia64 arm64 Priority: optional Depends: ${shlibs:Depends}, ${misc:Depends}, libyaml-0-2, libselinux1, libsnmp30, zlib1g, perl Provides: lustre-server-utils, lustre-client-utils (= ${binary:Version}) @@ -56,7 +56,7 @@ Description: Userspace utilities for the Lustre filesystem (server) Package: lustre-resource-agents Section: ha -Architecture: i386 powerpc ppc64el amd64 ia64 arm64 +Architecture: i386 armhf powerpc ppc64el amd64 ia64 arm64 Priority: optional Depends: lustre-server-utils (= ${binary:Version}), resource-agents Description: HA Resuable Cluster Resource Scripts for Lustre @@ -70,7 +70,7 @@ Description: HA Resuable Cluster Resource Scripts for Lustre Package: lustre-iokit Section: utils -Architecture: i386 powerpc ppc64el amd64 ia64 arm64 +Architecture: i386 armhf powerpc ppc64el amd64 ia64 arm64 Priority: optional Depends: lustre-client-utils (= ${binary:Version}), python, perl, sg3-utils Description: Collection of benchmark tools for the Lustre filesystem @@ -82,7 +82,7 @@ Description: Collection of benchmark tools for the Lustre filesystem Package: lustre-tests Section: utils -Architecture: i386 powerpc ppc64el amd64 ia64 arm64 +Architecture: i386 armhf powerpc ppc64el amd64 ia64 arm64 Priority: optional Depends: lustre-iokit (= ${binary:Version}), attr, rsync, perl, lsof, mpi-default-bin Description: Test suite for the Lustre filesystem @@ -95,7 +95,7 @@ Description: Test suite for the Lustre filesystem Package: lustre-dev Section: libdevel Priority: optional -Architecture: i386 powerpc ppc64el amd64 ia64 arm64 +Architecture: i386 armhf powerpc ppc64el amd64 ia64 arm64 Depends: lustre-client-utils (= ${binary:Version}) Description: Development files for the Lustre filesystem Lustre is a scalable, secure, robust, highly-available cluster file system. @@ -106,7 +106,7 @@ Description: Development files for the Lustre filesystem Package: lustre-client-modules-dkms Section: admin -Architecture: i386 powerpc ppc64el amd64 ia64 +Architecture: i386 armhf powerpc ppc64el amd64 ia64 Priority: optional Depends: dkms, automake, libtool, linux-headers-generic | linux-headers | linux-headers-amd64 Recommends: linux-image, lustre-utils -- 1.8.3.1