diff -Nru ceph-14.2.21/debian/changelog ceph-14.2.21/debian/changelog --- ceph-14.2.21/debian/changelog 2021-05-27 10:04:21.000000000 +0000 +++ ceph-14.2.21/debian/changelog 2021-06-04 01:22:25.000000000 +0000 @@ -1,3 +1,16 @@ +ceph (14.2.21-1+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 10.2.5-7.2+rpi1 by Peter Michael Green at Sun, 30 Jul 2017 09:48:17 +0000] + * Add Raspbian to lists of "debian-like" distros. + + Hopefully this will fix site-packages vs dist-packages + build failure in Raspbian. + + [changes introduced in 14.2.5-3+rpi1 by Peter Michael Green] + * Remove problematic gitattributes files. + * Disable neon on armhf too. + + -- Raspbian forward porter Fri, 04 Jun 2021 01:22:25 +0000 + ceph (14.2.21-1) unstable; urgency=high * New upstream release, resolving these: diff -Nru ceph-14.2.21/debian/patches/detect-raspbian.diff ceph-14.2.21/debian/patches/detect-raspbian.diff --- ceph-14.2.21/debian/patches/detect-raspbian.diff 1970-01-01 00:00:00.000000000 +0000 +++ ceph-14.2.21/debian/patches/detect-raspbian.diff 2021-06-04 01:22:25.000000000 +0000 @@ -0,0 +1,44 @@ +Description: Add Raspbian to lists of "debian-like" distros. + Hopefully this will fix site-packages vs dist-packages + build failure in Raspbian. +Author: Peter Michael Green + +diff --git a/install-deps.sh b/install-deps.sh +index 0fccd5b62..95c02c562 100755 +--- a/install-deps.sh ++++ b/install-deps.sh +@@ -276,7 +276,7 @@ else + fi + source /etc/os-release + case "$ID" in +- debian|ubuntu|devuan) ++ debian|ubuntu|devuan|raspbian) + echo "Using apt-get to install dependencies" + $SUDO apt-get install -y devscripts equivs + $SUDO apt-get install -y dpkg-dev +diff --git a/qa/workunits/ceph-helpers-root.sh b/qa/workunits/ceph-helpers-root.sh +index dc81b2b3a..f0d061941 100755 +--- a/qa/workunits/ceph-helpers-root.sh ++++ b/qa/workunits/ceph-helpers-root.sh +@@ -35,7 +35,7 @@ function install() { + + function install_one() { + case $(distro_id) in +- ubuntu|debian|devuan) ++ ubuntu|debian|devuan|raspbian) + sudo env DEBIAN_FRONTEND=noninteractive apt-get install -y "$@" + ;; + centos|fedora|rhel) +diff --git a/qa/workunits/rados/test_envlibrados_for_rocksdb.sh b/qa/workunits/rados/test_envlibrados_for_rocksdb.sh +index 7099dafb3..64b9540f4 100755 +--- a/qa/workunits/rados/test_envlibrados_for_rocksdb.sh ++++ b/qa/workunits/rados/test_envlibrados_for_rocksdb.sh +@@ -19,7 +19,7 @@ CURRENT_PATH=`pwd` + # install prerequisites + # for rocksdb + case $(distro_id) in +- ubuntu|debian|devuan) ++ ubuntu|debian|devuan|raspbian) + install git g++ libsnappy-dev zlib1g-dev libbz2-dev libradospp-dev cmake + ;; + centos|fedora|rhel) diff -Nru ceph-14.2.21/debian/patches/remove-problematic-gitattributes-files.patch ceph-14.2.21/debian/patches/remove-problematic-gitattributes-files.patch --- ceph-14.2.21/debian/patches/remove-problematic-gitattributes-files.patch 1970-01-01 00:00:00.000000000 +0000 +++ ceph-14.2.21/debian/patches/remove-problematic-gitattributes-files.patch 2021-06-04 01:22:25.000000000 +0000 @@ -0,0 +1,92 @@ +From: Raspbian forward porter +Subject: remove gitattributes files that cause problems for dgit. + +--- ceph-14.2.5.orig/src/civetweb/.gitattributes ++++ /dev/null +@@ -1,33 +0,0 @@ +-# Auto detect text files and perform LF normalization +-* -text +- +-# Custom for Visual Studio +-*.cs diff=csharp +-*.sln merge=union +-*.csproj merge=union +-*.vbproj merge=union +-*.fsproj merge=union +-*.dbproj merge=union +- +-# Standard to msysgit +-*.doc diff=astextplain +-*.DOC diff=astextplain +-*.docx diff=astextplain +-*.DOCX diff=astextplain +-*.dot diff=astextplain +-*.DOT diff=astextplain +-*.pdf diff=astextplain +-*.PDF diff=astextplain +-*.rtf diff=astextplain +-*.RTF diff=astextplain +- +-# Preserver Windows specfic lines endings +-*.cmd text eol=crlf +- +- +-# Settings for github syntax highlighting +-# see https://github.com/github/linguist/blob/master/README.md +-docs/* linguist-documentation +-*.inl linguist-language=C +-*.h linguist-language=C +-include/CivetServer.h linguist-language=C++ +--- ceph-14.2.5.orig/src/rapidjson/.gitattributes ++++ /dev/null +@@ -1,22 +0,0 @@ +-# Set the default behavior, in case people don't have core.autocrlf set. +-* text=auto +- +-# Explicitly declare text files you want to always be normalized and converted +-# to native line endings on checkout. +-*.cpp text +-*.h text +-*.txt text +-*.md text +-*.cmake text +-*.svg text +-*.dot text +-*.yml text +-*.in text +-*.sh text +-*.autopkg text +-Dockerfile text +- +-# Denote all files that are truly binary and should not be modified. +-*.png binary +-*.jpg binary +-*.json binary +\ No newline at end of file +--- ceph-14.2.5.orig/src/zstd/.gitattributes ++++ /dev/null +@@ -1,24 +0,0 @@ +-# Set the default behavior +-* text eol=lf +- +-# Explicitly declare source files +-*.c text eol=lf +-*.h text eol=lf +- +-# Denote files that should not be modified. +-*.odt binary +-*.png binary +- +-# Visual Studio +-*.sln text eol=crlf +-*.vcxproj* text eol=crlf +-*.vcproj* text eol=crlf +-*.suo binary +-*.rc text eol=crlf +- +-# Windows +-*.bat text eol=crlf +-*.cmd text eol=crlf +- +-# .travis.yml merging +-.travis.yml merge=ours diff -Nru ceph-14.2.21/debian/patches/series ceph-14.2.21/debian/patches/series --- ceph-14.2.21/debian/patches/series 2021-05-27 10:04:21.000000000 +0000 +++ ceph-14.2.21/debian/patches/series 2021-06-04 01:22:25.000000000 +0000 @@ -20,3 +20,5 @@ another-cmakelists-fix.patch fix-ceph-osd-systemd-target.patch allow-bgp-to-host.patch +detect-raspbian.diff +remove-problematic-gitattributes-files.patch diff -Nru ceph-14.2.21/debian/rules ceph-14.2.21/debian/rules --- ceph-14.2.21/debian/rules 2021-05-27 10:04:21.000000000 +0000 +++ ceph-14.2.21/debian/rules 2021-06-04 01:22:25.000000000 +0000 @@ -25,6 +25,9 @@ ifeq ($(DEB_HOST_ARCH),armel) extraopts += -DHAVE_ARM_NEON=0 endif +ifeq ($(DEB_HOST_ARCH),armhf) + extraopts += -DHAVE_ARM_NEON=0 +endif # disable ceph-dencoder on 32bit except i386 to avoid g++ oom ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf hppa m68k mips mipsel powerpc sh4 x32)) diff -Nru ceph-14.2.21/src/test/debian-jessie/debian/changelog ceph-14.2.21/src/test/debian-jessie/debian/changelog --- ceph-14.2.21/src/test/debian-jessie/debian/changelog 2021-05-27 10:04:21.000000000 +0000 +++ ceph-14.2.21/src/test/debian-jessie/debian/changelog 2021-06-04 01:22:25.000000000 +0000 @@ -1,3 +1,16 @@ +ceph (14.2.21-1+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 10.2.5-7.2+rpi1 by Peter Michael Green at Sun, 30 Jul 2017 09:48:17 +0000] + * Add Raspbian to lists of "debian-like" distros. + + Hopefully this will fix site-packages vs dist-packages + build failure in Raspbian. + + [changes introduced in 14.2.5-3+rpi1 by Peter Michael Green] + * Remove problematic gitattributes files. + * Disable neon on armhf too. + + -- Raspbian forward porter Fri, 04 Jun 2021 01:22:25 +0000 + ceph (14.2.21-1) unstable; urgency=high * New upstream release, resolving these: diff -Nru ceph-14.2.21/src/test/debian-jessie/debian/patches/detect-raspbian.diff ceph-14.2.21/src/test/debian-jessie/debian/patches/detect-raspbian.diff --- ceph-14.2.21/src/test/debian-jessie/debian/patches/detect-raspbian.diff 1970-01-01 00:00:00.000000000 +0000 +++ ceph-14.2.21/src/test/debian-jessie/debian/patches/detect-raspbian.diff 2021-06-04 01:22:25.000000000 +0000 @@ -0,0 +1,44 @@ +Description: Add Raspbian to lists of "debian-like" distros. + Hopefully this will fix site-packages vs dist-packages + build failure in Raspbian. +Author: Peter Michael Green + +diff --git a/install-deps.sh b/install-deps.sh +index 0fccd5b62..95c02c562 100755 +--- a/install-deps.sh ++++ b/install-deps.sh +@@ -276,7 +276,7 @@ else + fi + source /etc/os-release + case "$ID" in +- debian|ubuntu|devuan) ++ debian|ubuntu|devuan|raspbian) + echo "Using apt-get to install dependencies" + $SUDO apt-get install -y devscripts equivs + $SUDO apt-get install -y dpkg-dev +diff --git a/qa/workunits/ceph-helpers-root.sh b/qa/workunits/ceph-helpers-root.sh +index dc81b2b3a..f0d061941 100755 +--- a/qa/workunits/ceph-helpers-root.sh ++++ b/qa/workunits/ceph-helpers-root.sh +@@ -35,7 +35,7 @@ function install() { + + function install_one() { + case $(distro_id) in +- ubuntu|debian|devuan) ++ ubuntu|debian|devuan|raspbian) + sudo env DEBIAN_FRONTEND=noninteractive apt-get install -y "$@" + ;; + centos|fedora|rhel) +diff --git a/qa/workunits/rados/test_envlibrados_for_rocksdb.sh b/qa/workunits/rados/test_envlibrados_for_rocksdb.sh +index 7099dafb3..64b9540f4 100755 +--- a/qa/workunits/rados/test_envlibrados_for_rocksdb.sh ++++ b/qa/workunits/rados/test_envlibrados_for_rocksdb.sh +@@ -19,7 +19,7 @@ CURRENT_PATH=`pwd` + # install prerequisites + # for rocksdb + case $(distro_id) in +- ubuntu|debian|devuan) ++ ubuntu|debian|devuan|raspbian) + install git g++ libsnappy-dev zlib1g-dev libbz2-dev libradospp-dev cmake + ;; + centos|fedora|rhel) diff -Nru ceph-14.2.21/src/test/debian-jessie/debian/patches/remove-problematic-gitattributes-files.patch ceph-14.2.21/src/test/debian-jessie/debian/patches/remove-problematic-gitattributes-files.patch --- ceph-14.2.21/src/test/debian-jessie/debian/patches/remove-problematic-gitattributes-files.patch 1970-01-01 00:00:00.000000000 +0000 +++ ceph-14.2.21/src/test/debian-jessie/debian/patches/remove-problematic-gitattributes-files.patch 2021-06-04 01:22:25.000000000 +0000 @@ -0,0 +1,92 @@ +From: Raspbian forward porter +Subject: remove gitattributes files that cause problems for dgit. + +--- ceph-14.2.5.orig/src/civetweb/.gitattributes ++++ /dev/null +@@ -1,33 +0,0 @@ +-# Auto detect text files and perform LF normalization +-* -text +- +-# Custom for Visual Studio +-*.cs diff=csharp +-*.sln merge=union +-*.csproj merge=union +-*.vbproj merge=union +-*.fsproj merge=union +-*.dbproj merge=union +- +-# Standard to msysgit +-*.doc diff=astextplain +-*.DOC diff=astextplain +-*.docx diff=astextplain +-*.DOCX diff=astextplain +-*.dot diff=astextplain +-*.DOT diff=astextplain +-*.pdf diff=astextplain +-*.PDF diff=astextplain +-*.rtf diff=astextplain +-*.RTF diff=astextplain +- +-# Preserver Windows specfic lines endings +-*.cmd text eol=crlf +- +- +-# Settings for github syntax highlighting +-# see https://github.com/github/linguist/blob/master/README.md +-docs/* linguist-documentation +-*.inl linguist-language=C +-*.h linguist-language=C +-include/CivetServer.h linguist-language=C++ +--- ceph-14.2.5.orig/src/rapidjson/.gitattributes ++++ /dev/null +@@ -1,22 +0,0 @@ +-# Set the default behavior, in case people don't have core.autocrlf set. +-* text=auto +- +-# Explicitly declare text files you want to always be normalized and converted +-# to native line endings on checkout. +-*.cpp text +-*.h text +-*.txt text +-*.md text +-*.cmake text +-*.svg text +-*.dot text +-*.yml text +-*.in text +-*.sh text +-*.autopkg text +-Dockerfile text +- +-# Denote all files that are truly binary and should not be modified. +-*.png binary +-*.jpg binary +-*.json binary +\ No newline at end of file +--- ceph-14.2.5.orig/src/zstd/.gitattributes ++++ /dev/null +@@ -1,24 +0,0 @@ +-# Set the default behavior +-* text eol=lf +- +-# Explicitly declare source files +-*.c text eol=lf +-*.h text eol=lf +- +-# Denote files that should not be modified. +-*.odt binary +-*.png binary +- +-# Visual Studio +-*.sln text eol=crlf +-*.vcxproj* text eol=crlf +-*.vcproj* text eol=crlf +-*.suo binary +-*.rc text eol=crlf +- +-# Windows +-*.bat text eol=crlf +-*.cmd text eol=crlf +- +-# .travis.yml merging +-.travis.yml merge=ours diff -Nru ceph-14.2.21/src/test/debian-jessie/debian/patches/series ceph-14.2.21/src/test/debian-jessie/debian/patches/series --- ceph-14.2.21/src/test/debian-jessie/debian/patches/series 2021-05-27 10:04:21.000000000 +0000 +++ ceph-14.2.21/src/test/debian-jessie/debian/patches/series 2021-06-04 01:22:25.000000000 +0000 @@ -20,3 +20,5 @@ another-cmakelists-fix.patch fix-ceph-osd-systemd-target.patch allow-bgp-to-host.patch +detect-raspbian.diff +remove-problematic-gitattributes-files.patch diff -Nru ceph-14.2.21/src/test/debian-jessie/debian/rules ceph-14.2.21/src/test/debian-jessie/debian/rules --- ceph-14.2.21/src/test/debian-jessie/debian/rules 2021-05-27 10:04:21.000000000 +0000 +++ ceph-14.2.21/src/test/debian-jessie/debian/rules 2021-06-04 01:22:25.000000000 +0000 @@ -25,6 +25,9 @@ ifeq ($(DEB_HOST_ARCH),armel) extraopts += -DHAVE_ARM_NEON=0 endif +ifeq ($(DEB_HOST_ARCH),armhf) + extraopts += -DHAVE_ARM_NEON=0 +endif # disable ceph-dencoder on 32bit except i386 to avoid g++ oom ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf hppa m68k mips mipsel powerpc sh4 x32)) diff -Nru ceph-14.2.21/src/test/ubuntu-16.04/debian/changelog ceph-14.2.21/src/test/ubuntu-16.04/debian/changelog --- ceph-14.2.21/src/test/ubuntu-16.04/debian/changelog 2021-05-27 10:04:21.000000000 +0000 +++ ceph-14.2.21/src/test/ubuntu-16.04/debian/changelog 2021-06-04 01:22:25.000000000 +0000 @@ -1,3 +1,16 @@ +ceph (14.2.21-1+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 10.2.5-7.2+rpi1 by Peter Michael Green at Sun, 30 Jul 2017 09:48:17 +0000] + * Add Raspbian to lists of "debian-like" distros. + + Hopefully this will fix site-packages vs dist-packages + build failure in Raspbian. + + [changes introduced in 14.2.5-3+rpi1 by Peter Michael Green] + * Remove problematic gitattributes files. + * Disable neon on armhf too. + + -- Raspbian forward porter Fri, 04 Jun 2021 01:22:25 +0000 + ceph (14.2.21-1) unstable; urgency=high * New upstream release, resolving these: diff -Nru ceph-14.2.21/src/test/ubuntu-16.04/debian/patches/detect-raspbian.diff ceph-14.2.21/src/test/ubuntu-16.04/debian/patches/detect-raspbian.diff --- ceph-14.2.21/src/test/ubuntu-16.04/debian/patches/detect-raspbian.diff 1970-01-01 00:00:00.000000000 +0000 +++ ceph-14.2.21/src/test/ubuntu-16.04/debian/patches/detect-raspbian.diff 2021-06-04 01:22:25.000000000 +0000 @@ -0,0 +1,44 @@ +Description: Add Raspbian to lists of "debian-like" distros. + Hopefully this will fix site-packages vs dist-packages + build failure in Raspbian. +Author: Peter Michael Green + +diff --git a/install-deps.sh b/install-deps.sh +index 0fccd5b62..95c02c562 100755 +--- a/install-deps.sh ++++ b/install-deps.sh +@@ -276,7 +276,7 @@ else + fi + source /etc/os-release + case "$ID" in +- debian|ubuntu|devuan) ++ debian|ubuntu|devuan|raspbian) + echo "Using apt-get to install dependencies" + $SUDO apt-get install -y devscripts equivs + $SUDO apt-get install -y dpkg-dev +diff --git a/qa/workunits/ceph-helpers-root.sh b/qa/workunits/ceph-helpers-root.sh +index dc81b2b3a..f0d061941 100755 +--- a/qa/workunits/ceph-helpers-root.sh ++++ b/qa/workunits/ceph-helpers-root.sh +@@ -35,7 +35,7 @@ function install() { + + function install_one() { + case $(distro_id) in +- ubuntu|debian|devuan) ++ ubuntu|debian|devuan|raspbian) + sudo env DEBIAN_FRONTEND=noninteractive apt-get install -y "$@" + ;; + centos|fedora|rhel) +diff --git a/qa/workunits/rados/test_envlibrados_for_rocksdb.sh b/qa/workunits/rados/test_envlibrados_for_rocksdb.sh +index 7099dafb3..64b9540f4 100755 +--- a/qa/workunits/rados/test_envlibrados_for_rocksdb.sh ++++ b/qa/workunits/rados/test_envlibrados_for_rocksdb.sh +@@ -19,7 +19,7 @@ CURRENT_PATH=`pwd` + # install prerequisites + # for rocksdb + case $(distro_id) in +- ubuntu|debian|devuan) ++ ubuntu|debian|devuan|raspbian) + install git g++ libsnappy-dev zlib1g-dev libbz2-dev libradospp-dev cmake + ;; + centos|fedora|rhel) diff -Nru ceph-14.2.21/src/test/ubuntu-16.04/debian/patches/remove-problematic-gitattributes-files.patch ceph-14.2.21/src/test/ubuntu-16.04/debian/patches/remove-problematic-gitattributes-files.patch --- ceph-14.2.21/src/test/ubuntu-16.04/debian/patches/remove-problematic-gitattributes-files.patch 1970-01-01 00:00:00.000000000 +0000 +++ ceph-14.2.21/src/test/ubuntu-16.04/debian/patches/remove-problematic-gitattributes-files.patch 2021-06-04 01:22:25.000000000 +0000 @@ -0,0 +1,92 @@ +From: Raspbian forward porter +Subject: remove gitattributes files that cause problems for dgit. + +--- ceph-14.2.5.orig/src/civetweb/.gitattributes ++++ /dev/null +@@ -1,33 +0,0 @@ +-# Auto detect text files and perform LF normalization +-* -text +- +-# Custom for Visual Studio +-*.cs diff=csharp +-*.sln merge=union +-*.csproj merge=union +-*.vbproj merge=union +-*.fsproj merge=union +-*.dbproj merge=union +- +-# Standard to msysgit +-*.doc diff=astextplain +-*.DOC diff=astextplain +-*.docx diff=astextplain +-*.DOCX diff=astextplain +-*.dot diff=astextplain +-*.DOT diff=astextplain +-*.pdf diff=astextplain +-*.PDF diff=astextplain +-*.rtf diff=astextplain +-*.RTF diff=astextplain +- +-# Preserver Windows specfic lines endings +-*.cmd text eol=crlf +- +- +-# Settings for github syntax highlighting +-# see https://github.com/github/linguist/blob/master/README.md +-docs/* linguist-documentation +-*.inl linguist-language=C +-*.h linguist-language=C +-include/CivetServer.h linguist-language=C++ +--- ceph-14.2.5.orig/src/rapidjson/.gitattributes ++++ /dev/null +@@ -1,22 +0,0 @@ +-# Set the default behavior, in case people don't have core.autocrlf set. +-* text=auto +- +-# Explicitly declare text files you want to always be normalized and converted +-# to native line endings on checkout. +-*.cpp text +-*.h text +-*.txt text +-*.md text +-*.cmake text +-*.svg text +-*.dot text +-*.yml text +-*.in text +-*.sh text +-*.autopkg text +-Dockerfile text +- +-# Denote all files that are truly binary and should not be modified. +-*.png binary +-*.jpg binary +-*.json binary +\ No newline at end of file +--- ceph-14.2.5.orig/src/zstd/.gitattributes ++++ /dev/null +@@ -1,24 +0,0 @@ +-# Set the default behavior +-* text eol=lf +- +-# Explicitly declare source files +-*.c text eol=lf +-*.h text eol=lf +- +-# Denote files that should not be modified. +-*.odt binary +-*.png binary +- +-# Visual Studio +-*.sln text eol=crlf +-*.vcxproj* text eol=crlf +-*.vcproj* text eol=crlf +-*.suo binary +-*.rc text eol=crlf +- +-# Windows +-*.bat text eol=crlf +-*.cmd text eol=crlf +- +-# .travis.yml merging +-.travis.yml merge=ours diff -Nru ceph-14.2.21/src/test/ubuntu-16.04/debian/patches/series ceph-14.2.21/src/test/ubuntu-16.04/debian/patches/series --- ceph-14.2.21/src/test/ubuntu-16.04/debian/patches/series 2021-05-27 10:04:21.000000000 +0000 +++ ceph-14.2.21/src/test/ubuntu-16.04/debian/patches/series 2021-06-04 01:22:25.000000000 +0000 @@ -20,3 +20,5 @@ another-cmakelists-fix.patch fix-ceph-osd-systemd-target.patch allow-bgp-to-host.patch +detect-raspbian.diff +remove-problematic-gitattributes-files.patch diff -Nru ceph-14.2.21/src/test/ubuntu-16.04/debian/rules ceph-14.2.21/src/test/ubuntu-16.04/debian/rules --- ceph-14.2.21/src/test/ubuntu-16.04/debian/rules 2021-05-27 10:04:21.000000000 +0000 +++ ceph-14.2.21/src/test/ubuntu-16.04/debian/rules 2021-06-04 01:22:25.000000000 +0000 @@ -25,6 +25,9 @@ ifeq ($(DEB_HOST_ARCH),armel) extraopts += -DHAVE_ARM_NEON=0 endif +ifeq ($(DEB_HOST_ARCH),armhf) + extraopts += -DHAVE_ARM_NEON=0 +endif # disable ceph-dencoder on 32bit except i386 to avoid g++ oom ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf hppa m68k mips mipsel powerpc sh4 x32)) diff -Nru ceph-14.2.21/src/test/ubuntu-18.04/debian/changelog ceph-14.2.21/src/test/ubuntu-18.04/debian/changelog --- ceph-14.2.21/src/test/ubuntu-18.04/debian/changelog 2021-05-27 10:04:21.000000000 +0000 +++ ceph-14.2.21/src/test/ubuntu-18.04/debian/changelog 2021-06-04 01:22:25.000000000 +0000 @@ -1,3 +1,16 @@ +ceph (14.2.21-1+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 10.2.5-7.2+rpi1 by Peter Michael Green at Sun, 30 Jul 2017 09:48:17 +0000] + * Add Raspbian to lists of "debian-like" distros. + + Hopefully this will fix site-packages vs dist-packages + build failure in Raspbian. + + [changes introduced in 14.2.5-3+rpi1 by Peter Michael Green] + * Remove problematic gitattributes files. + * Disable neon on armhf too. + + -- Raspbian forward porter Fri, 04 Jun 2021 01:22:25 +0000 + ceph (14.2.21-1) unstable; urgency=high * New upstream release, resolving these: diff -Nru ceph-14.2.21/src/test/ubuntu-18.04/debian/patches/detect-raspbian.diff ceph-14.2.21/src/test/ubuntu-18.04/debian/patches/detect-raspbian.diff --- ceph-14.2.21/src/test/ubuntu-18.04/debian/patches/detect-raspbian.diff 1970-01-01 00:00:00.000000000 +0000 +++ ceph-14.2.21/src/test/ubuntu-18.04/debian/patches/detect-raspbian.diff 2021-06-04 01:22:25.000000000 +0000 @@ -0,0 +1,44 @@ +Description: Add Raspbian to lists of "debian-like" distros. + Hopefully this will fix site-packages vs dist-packages + build failure in Raspbian. +Author: Peter Michael Green + +diff --git a/install-deps.sh b/install-deps.sh +index 0fccd5b62..95c02c562 100755 +--- a/install-deps.sh ++++ b/install-deps.sh +@@ -276,7 +276,7 @@ else + fi + source /etc/os-release + case "$ID" in +- debian|ubuntu|devuan) ++ debian|ubuntu|devuan|raspbian) + echo "Using apt-get to install dependencies" + $SUDO apt-get install -y devscripts equivs + $SUDO apt-get install -y dpkg-dev +diff --git a/qa/workunits/ceph-helpers-root.sh b/qa/workunits/ceph-helpers-root.sh +index dc81b2b3a..f0d061941 100755 +--- a/qa/workunits/ceph-helpers-root.sh ++++ b/qa/workunits/ceph-helpers-root.sh +@@ -35,7 +35,7 @@ function install() { + + function install_one() { + case $(distro_id) in +- ubuntu|debian|devuan) ++ ubuntu|debian|devuan|raspbian) + sudo env DEBIAN_FRONTEND=noninteractive apt-get install -y "$@" + ;; + centos|fedora|rhel) +diff --git a/qa/workunits/rados/test_envlibrados_for_rocksdb.sh b/qa/workunits/rados/test_envlibrados_for_rocksdb.sh +index 7099dafb3..64b9540f4 100755 +--- a/qa/workunits/rados/test_envlibrados_for_rocksdb.sh ++++ b/qa/workunits/rados/test_envlibrados_for_rocksdb.sh +@@ -19,7 +19,7 @@ CURRENT_PATH=`pwd` + # install prerequisites + # for rocksdb + case $(distro_id) in +- ubuntu|debian|devuan) ++ ubuntu|debian|devuan|raspbian) + install git g++ libsnappy-dev zlib1g-dev libbz2-dev libradospp-dev cmake + ;; + centos|fedora|rhel) diff -Nru ceph-14.2.21/src/test/ubuntu-18.04/debian/patches/remove-problematic-gitattributes-files.patch ceph-14.2.21/src/test/ubuntu-18.04/debian/patches/remove-problematic-gitattributes-files.patch --- ceph-14.2.21/src/test/ubuntu-18.04/debian/patches/remove-problematic-gitattributes-files.patch 1970-01-01 00:00:00.000000000 +0000 +++ ceph-14.2.21/src/test/ubuntu-18.04/debian/patches/remove-problematic-gitattributes-files.patch 2021-06-04 01:22:25.000000000 +0000 @@ -0,0 +1,92 @@ +From: Raspbian forward porter +Subject: remove gitattributes files that cause problems for dgit. + +--- ceph-14.2.5.orig/src/civetweb/.gitattributes ++++ /dev/null +@@ -1,33 +0,0 @@ +-# Auto detect text files and perform LF normalization +-* -text +- +-# Custom for Visual Studio +-*.cs diff=csharp +-*.sln merge=union +-*.csproj merge=union +-*.vbproj merge=union +-*.fsproj merge=union +-*.dbproj merge=union +- +-# Standard to msysgit +-*.doc diff=astextplain +-*.DOC diff=astextplain +-*.docx diff=astextplain +-*.DOCX diff=astextplain +-*.dot diff=astextplain +-*.DOT diff=astextplain +-*.pdf diff=astextplain +-*.PDF diff=astextplain +-*.rtf diff=astextplain +-*.RTF diff=astextplain +- +-# Preserver Windows specfic lines endings +-*.cmd text eol=crlf +- +- +-# Settings for github syntax highlighting +-# see https://github.com/github/linguist/blob/master/README.md +-docs/* linguist-documentation +-*.inl linguist-language=C +-*.h linguist-language=C +-include/CivetServer.h linguist-language=C++ +--- ceph-14.2.5.orig/src/rapidjson/.gitattributes ++++ /dev/null +@@ -1,22 +0,0 @@ +-# Set the default behavior, in case people don't have core.autocrlf set. +-* text=auto +- +-# Explicitly declare text files you want to always be normalized and converted +-# to native line endings on checkout. +-*.cpp text +-*.h text +-*.txt text +-*.md text +-*.cmake text +-*.svg text +-*.dot text +-*.yml text +-*.in text +-*.sh text +-*.autopkg text +-Dockerfile text +- +-# Denote all files that are truly binary and should not be modified. +-*.png binary +-*.jpg binary +-*.json binary +\ No newline at end of file +--- ceph-14.2.5.orig/src/zstd/.gitattributes ++++ /dev/null +@@ -1,24 +0,0 @@ +-# Set the default behavior +-* text eol=lf +- +-# Explicitly declare source files +-*.c text eol=lf +-*.h text eol=lf +- +-# Denote files that should not be modified. +-*.odt binary +-*.png binary +- +-# Visual Studio +-*.sln text eol=crlf +-*.vcxproj* text eol=crlf +-*.vcproj* text eol=crlf +-*.suo binary +-*.rc text eol=crlf +- +-# Windows +-*.bat text eol=crlf +-*.cmd text eol=crlf +- +-# .travis.yml merging +-.travis.yml merge=ours diff -Nru ceph-14.2.21/src/test/ubuntu-18.04/debian/patches/series ceph-14.2.21/src/test/ubuntu-18.04/debian/patches/series --- ceph-14.2.21/src/test/ubuntu-18.04/debian/patches/series 2021-05-27 10:04:21.000000000 +0000 +++ ceph-14.2.21/src/test/ubuntu-18.04/debian/patches/series 2021-06-04 01:22:25.000000000 +0000 @@ -20,3 +20,5 @@ another-cmakelists-fix.patch fix-ceph-osd-systemd-target.patch allow-bgp-to-host.patch +detect-raspbian.diff +remove-problematic-gitattributes-files.patch diff -Nru ceph-14.2.21/src/test/ubuntu-18.04/debian/rules ceph-14.2.21/src/test/ubuntu-18.04/debian/rules --- ceph-14.2.21/src/test/ubuntu-18.04/debian/rules 2021-05-27 10:04:21.000000000 +0000 +++ ceph-14.2.21/src/test/ubuntu-18.04/debian/rules 2021-06-04 01:22:25.000000000 +0000 @@ -25,6 +25,9 @@ ifeq ($(DEB_HOST_ARCH),armel) extraopts += -DHAVE_ARM_NEON=0 endif +ifeq ($(DEB_HOST_ARCH),armhf) + extraopts += -DHAVE_ARM_NEON=0 +endif # disable ceph-dencoder on 32bit except i386 to avoid g++ oom ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf hppa m68k mips mipsel powerpc sh4 x32))