detect-raspbian
authorCeph Maintainers <ceph-maintainers@lists.ceph.com>
Sun, 30 Jul 2017 09:48:17 +0000 (10:48 +0100)
committerPeter Michael Green <plugwash@raspbian.org>
Sun, 30 Jul 2017 09:48:17 +0000 (10:48 +0100)
Gbp-Pq: Name detect-raspbian.diff

15 files changed:
install-deps.sh
qa/workunits/ceph-helpers-root.sh
src/Makefile.in
src/ceph-detect-init/Makefile.am
src/ceph-disk/Makefile.am
src/pybind/cephfs/Makefile.am
src/pybind/rados/Makefile.am
src/pybind/rbd/Makefile.am
src/test/centos-6/install-deps.sh
src/test/centos-7/install-deps.sh
src/test/debian-jessie/install-deps.sh
src/test/fedora-21/install-deps.sh
src/test/opensuse-13.2/install-deps.sh
src/test/ubuntu-12.04/install-deps.sh
src/test/ubuntu-14.04/install-deps.sh

index 129178fd0be612142f5a2dba941968b7c18b316e..2c3be51706eae142b02c040f77d02ed1ee287777 100755 (executable)
@@ -32,7 +32,7 @@ if type zypper > /dev/null 2>&1 ; then
 fi
 
 case $(lsb_release -si) in
-Ubuntu|Debian|Devuan)
+Ubuntu|Debian|Devuan|Raspbian)
         $SUDO apt-get install -y dpkg-dev
         if ! test -r debian/control ; then
             echo debian/control is not a readable file
index a622bd5ab96e26ffc63c9f4c1d401c6a7d91f0b8..742067063f4eb4168a79d5f51379100e3d312411 100755 (executable)
@@ -26,7 +26,7 @@ function install() {
 
 function install_one() {
     case $(lsb_release -si) in
-        Ubuntu|Debian|Devuan)
+        Ubuntu|Debian|Devuan|Raspbian)
             sudo apt-get install -y "$@"
             ;;
         CentOS|Fedora|RedHatEnterpriseServer)
index 055214befb49cad01e9cd1cd0d4012ec6b61941b..10251a22d521ae872cd9d6aad9ab6a717ec4c9cb 100644 (file)
@@ -32721,7 +32721,7 @@ ceph-detect-init-clean:
 ceph-detect-init-install-data:
        cd $(srcdir)/ceph-detect-init ; \
        if test "$(DESTDIR)" ; then \
-               if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
+               if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan\|Raspbian' ; then \
                        options=--install-layout=deb ; \
                else \
                        options=--prefix=/usr ; \
@@ -32743,7 +32743,7 @@ ceph-disk-clean:
 ceph-disk-install-data:
        cd $(srcdir)/ceph-disk ; \
        if test "$(DESTDIR)" ; then \
-               if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
+               if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan\|Raspbian' ; then \
                        options=--install-layout=deb ; \
                else \
                        options=--prefix=/usr ; \
@@ -32835,7 +32835,7 @@ unittests:: $(check_PROGRAMS)
 
 @ENABLE_CLIENT_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@rados-pybind-install-exec: ${srcdir}/ceph_ver.h
 @ENABLE_CLIENT_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@        if test "$(DESTDIR)" ; then \
-@ENABLE_CLIENT_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@                if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
+@ENABLE_CLIENT_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@                if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan\|Raspbian' ; then \
 @ENABLE_CLIENT_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@                        options=--install-layout=deb ; \
 @ENABLE_CLIENT_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@                else \
 @ENABLE_CLIENT_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@                        options=--prefix=/usr ; \
@@ -32864,7 +32864,7 @@ unittests:: $(check_PROGRAMS)
 
 @ENABLE_CLIENT_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@@WITH_RBD_TRUE@rbd-pybind-install-exec: ${srcdir}/ceph_ver.h
 @ENABLE_CLIENT_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@@WITH_RBD_TRUE@ if test "$(DESTDIR)" ; then \
-@ENABLE_CLIENT_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@@WITH_RBD_TRUE@         if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
+@ENABLE_CLIENT_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@@WITH_RBD_TRUE@         if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan\|Raspbian' ; then \
 @ENABLE_CLIENT_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@@WITH_RBD_TRUE@                 options=--install-layout=deb ; \
 @ENABLE_CLIENT_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@@WITH_RBD_TRUE@         else \
 @ENABLE_CLIENT_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@@WITH_RBD_TRUE@                 options=--prefix=/usr ; \
@@ -32893,7 +32893,7 @@ unittests:: $(check_PROGRAMS)
 
 @ENABLE_CLIENT_TRUE@@WITH_CEPHFS_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@cephfs-pybind-install-exec: ${srcdir}/ceph_ver.h
 @ENABLE_CLIENT_TRUE@@WITH_CEPHFS_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@      if test "$(DESTDIR)" ; then \
-@ENABLE_CLIENT_TRUE@@WITH_CEPHFS_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@              if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
+@ENABLE_CLIENT_TRUE@@WITH_CEPHFS_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@              if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan\|Raspbian' ; then \
 @ENABLE_CLIENT_TRUE@@WITH_CEPHFS_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@                      options=--install-layout=deb ; \
 @ENABLE_CLIENT_TRUE@@WITH_CEPHFS_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@              else \
 @ENABLE_CLIENT_TRUE@@WITH_CEPHFS_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@                      options=--prefix=/usr ; \
index 3926ac4bec2953c5b03aed069af104f513c96a89..e36ebdd4203fec9ee2349d75c8f11305329bba4e 100644 (file)
@@ -67,7 +67,7 @@ ceph-detect-init-clean:
 ceph-detect-init-install-data:
        cd $(srcdir)/ceph-detect-init ; \
        if test "$(DESTDIR)" ; then \
-               if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
+               if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan\|Raspbian' ; then \
                        options=--install-layout=deb ; \
                else \
                        options=--prefix=/usr ; \
index a8532878c84e74ebe14367dcf77b14e3d3c4468c..d09d5ac6dd225fc7215faec0fda76feb61320894 100644 (file)
@@ -43,7 +43,7 @@ ceph-disk-clean:
 ceph-disk-install-data:
        cd $(srcdir)/ceph-disk ; \
        if test "$(DESTDIR)" ; then \
-               if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
+               if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan\|Raspbian' ; then \
                        options=--install-layout=deb ; \
                else \
                        options=--prefix=/usr ; \
index 698522daa41d5cf94078010c854a8d9f09ad5af0..baac765291218db77847e95f0e56d80f78e8a4c4 100644 (file)
@@ -15,7 +15,7 @@ cephfs-pybind-clean: ${srcdir}/ceph_ver.h
 
 cephfs-pybind-install-exec: ${srcdir}/ceph_ver.h
        if test "$(DESTDIR)" ; then \
-               if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
+               if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan\|Raspbian' ; then \
                        options=--install-layout=deb ; \
                else \
                        options=--prefix=/usr ; \
index a4145bf0f4ab2a62cc1e4c37fb4294f3c5ebb17d..4e649acfd69d9f42c2a854cb887c99cf8f9f694c 100644 (file)
@@ -15,7 +15,7 @@ rados-pybind-clean: ${srcdir}/ceph_ver.h
 
 rados-pybind-install-exec: ${srcdir}/ceph_ver.h
        if test "$(DESTDIR)" ; then \
-               if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
+               if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan\|Raspbian' ; then \
                        options=--install-layout=deb ; \
                else \
                        options=--prefix=/usr ; \
index 7dd49333fa4bd6c29962352f9830960a9d1106ce..9f442c2a736e0454b4a422e82b75bac0835a8272 100644 (file)
@@ -15,7 +15,7 @@ rbd-pybind-clean: ${srcdir}/ceph_ver.h
 
 rbd-pybind-install-exec: ${srcdir}/ceph_ver.h
        if test "$(DESTDIR)" ; then \
-               if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
+               if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan\|Raspbian' ; then \
                        options=--install-layout=deb ; \
                else \
                        options=--prefix=/usr ; \
index 129178fd0be612142f5a2dba941968b7c18b316e..2c3be51706eae142b02c040f77d02ed1ee287777 100755 (executable)
@@ -32,7 +32,7 @@ if type zypper > /dev/null 2>&1 ; then
 fi
 
 case $(lsb_release -si) in
-Ubuntu|Debian|Devuan)
+Ubuntu|Debian|Devuan|Raspbian)
         $SUDO apt-get install -y dpkg-dev
         if ! test -r debian/control ; then
             echo debian/control is not a readable file
index 129178fd0be612142f5a2dba941968b7c18b316e..2c3be51706eae142b02c040f77d02ed1ee287777 100755 (executable)
@@ -32,7 +32,7 @@ if type zypper > /dev/null 2>&1 ; then
 fi
 
 case $(lsb_release -si) in
-Ubuntu|Debian|Devuan)
+Ubuntu|Debian|Devuan|Raspbian)
         $SUDO apt-get install -y dpkg-dev
         if ! test -r debian/control ; then
             echo debian/control is not a readable file
index 129178fd0be612142f5a2dba941968b7c18b316e..2c3be51706eae142b02c040f77d02ed1ee287777 100755 (executable)
@@ -32,7 +32,7 @@ if type zypper > /dev/null 2>&1 ; then
 fi
 
 case $(lsb_release -si) in
-Ubuntu|Debian|Devuan)
+Ubuntu|Debian|Devuan|Raspbian)
         $SUDO apt-get install -y dpkg-dev
         if ! test -r debian/control ; then
             echo debian/control is not a readable file
index 129178fd0be612142f5a2dba941968b7c18b316e..2c3be51706eae142b02c040f77d02ed1ee287777 100755 (executable)
@@ -32,7 +32,7 @@ if type zypper > /dev/null 2>&1 ; then
 fi
 
 case $(lsb_release -si) in
-Ubuntu|Debian|Devuan)
+Ubuntu|Debian|Devuan|Raspbian)
         $SUDO apt-get install -y dpkg-dev
         if ! test -r debian/control ; then
             echo debian/control is not a readable file
index 129178fd0be612142f5a2dba941968b7c18b316e..2c3be51706eae142b02c040f77d02ed1ee287777 100755 (executable)
@@ -32,7 +32,7 @@ if type zypper > /dev/null 2>&1 ; then
 fi
 
 case $(lsb_release -si) in
-Ubuntu|Debian|Devuan)
+Ubuntu|Debian|Devuan|Raspbian)
         $SUDO apt-get install -y dpkg-dev
         if ! test -r debian/control ; then
             echo debian/control is not a readable file
index 129178fd0be612142f5a2dba941968b7c18b316e..2c3be51706eae142b02c040f77d02ed1ee287777 100755 (executable)
@@ -32,7 +32,7 @@ if type zypper > /dev/null 2>&1 ; then
 fi
 
 case $(lsb_release -si) in
-Ubuntu|Debian|Devuan)
+Ubuntu|Debian|Devuan|Raspbian)
         $SUDO apt-get install -y dpkg-dev
         if ! test -r debian/control ; then
             echo debian/control is not a readable file
index 129178fd0be612142f5a2dba941968b7c18b316e..2c3be51706eae142b02c040f77d02ed1ee287777 100755 (executable)
@@ -32,7 +32,7 @@ if type zypper > /dev/null 2>&1 ; then
 fi
 
 case $(lsb_release -si) in
-Ubuntu|Debian|Devuan)
+Ubuntu|Debian|Devuan|Raspbian)
         $SUDO apt-get install -y dpkg-dev
         if ! test -r debian/control ; then
             echo debian/control is not a readable file