diff -Nru ceph-16.2.10+ds/debian/changelog ceph-16.2.10+ds/debian/changelog --- ceph-16.2.10+ds/debian/changelog 2022-07-31 19:59:55.000000000 +0000 +++ ceph-16.2.10+ds/debian/changelog 2022-08-05 17:43:48.000000000 +0000 @@ -1,3 +1,16 @@ +ceph (16.2.10+ds-2+rpi1) bookworm-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, 05 Aug 2022 17:43:48 +0000 + ceph (16.2.10+ds-2) unstable; urgency=medium * Replace Fix-build-with-fmt-8.1.1.patch by Fix-build-with-fmt-8-9.patch diff -Nru ceph-16.2.10+ds/debian/patches/detect-raspbian.diff ceph-16.2.10+ds/debian/patches/detect-raspbian.diff --- ceph-16.2.10+ds/debian/patches/detect-raspbian.diff 1970-01-01 00:00:00.000000000 +0000 +++ ceph-16.2.10+ds/debian/patches/detect-raspbian.diff 2022-08-05 17:43:48.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 3ba5e47ff..ad7f338e2 100755 +--- a/install-deps.sh ++++ b/install-deps.sh +@@ -301,7 +301,7 @@ else + [ $WITH_ZBD ] && with_zbd=true || with_zbd=false + source /etc/os-release + case "$ID" in +- debian|ubuntu|devuan|elementary) ++ debian|ubuntu|devuan|raspbian|elementary) + 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 e0ea4f07d..0f30b0a40 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 ca9b8d2ea..54a80b13b 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-16.2.10+ds/debian/patches/remove-problematic-gitattributes-files.patch ceph-16.2.10+ds/debian/patches/remove-problematic-gitattributes-files.patch --- ceph-16.2.10+ds/debian/patches/remove-problematic-gitattributes-files.patch 1970-01-01 00:00:00.000000000 +0000 +++ ceph-16.2.10+ds/debian/patches/remove-problematic-gitattributes-files.patch 2022-08-05 17:43:48.000000000 +0000 @@ -0,0 +1,98 @@ +From: Raspbian forward porter +Subject: remove gitattributes files that cause problems for dgit. + +diff --git a/src/civetweb/.gitattributes b/src/civetweb/.gitattributes +deleted file mode 100644 +index 5c528676b..000000000 +--- a/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++ +diff --git a/src/rapidjson/.gitattributes b/src/rapidjson/.gitattributes +deleted file mode 100644 +index 6f598bb7f..000000000 +--- a/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 +diff --git a/src/zstd/.gitattributes b/src/zstd/.gitattributes +deleted file mode 100644 +index 6212bd405..000000000 +--- a/src/zstd/.gitattributes ++++ /dev/null +@@ -1,21 +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 diff -Nru ceph-16.2.10+ds/debian/patches/series ceph-16.2.10+ds/debian/patches/series --- ceph-16.2.10+ds/debian/patches/series 2022-07-31 19:59:55.000000000 +0000 +++ ceph-16.2.10+ds/debian/patches/series 2022-08-05 17:43:48.000000000 +0000 @@ -20,3 +20,5 @@ only-yied-under-armv7-and-above.patch Fix-build-with-fmt-8-9.patch fix-FTBFS-include-memory.h.patch +detect-raspbian.diff +remove-problematic-gitattributes-files.patch diff -Nru ceph-16.2.10+ds/debian/rules ceph-16.2.10+ds/debian/rules --- ceph-16.2.10+ds/debian/rules 2022-07-31 19:59:55.000000000 +0000 +++ ceph-16.2.10+ds/debian/rules 2022-08-05 17:43:48.000000000 +0000 @@ -26,6 +26,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-16.2.10+ds/src/test/debian-jessie/debian/changelog ceph-16.2.10+ds/src/test/debian-jessie/debian/changelog --- ceph-16.2.10+ds/src/test/debian-jessie/debian/changelog 2022-07-31 19:59:55.000000000 +0000 +++ ceph-16.2.10+ds/src/test/debian-jessie/debian/changelog 2022-08-05 17:43:48.000000000 +0000 @@ -1,3 +1,16 @@ +ceph (16.2.10+ds-2+rpi1) bookworm-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, 05 Aug 2022 17:43:48 +0000 + ceph (16.2.10+ds-2) unstable; urgency=medium * Replace Fix-build-with-fmt-8.1.1.patch by Fix-build-with-fmt-8-9.patch diff -Nru ceph-16.2.10+ds/src/test/debian-jessie/debian/patches/detect-raspbian.diff ceph-16.2.10+ds/src/test/debian-jessie/debian/patches/detect-raspbian.diff --- ceph-16.2.10+ds/src/test/debian-jessie/debian/patches/detect-raspbian.diff 1970-01-01 00:00:00.000000000 +0000 +++ ceph-16.2.10+ds/src/test/debian-jessie/debian/patches/detect-raspbian.diff 2022-08-05 17:43:48.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 3ba5e47ff..ad7f338e2 100755 +--- a/install-deps.sh ++++ b/install-deps.sh +@@ -301,7 +301,7 @@ else + [ $WITH_ZBD ] && with_zbd=true || with_zbd=false + source /etc/os-release + case "$ID" in +- debian|ubuntu|devuan|elementary) ++ debian|ubuntu|devuan|raspbian|elementary) + 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 e0ea4f07d..0f30b0a40 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 ca9b8d2ea..54a80b13b 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-16.2.10+ds/src/test/debian-jessie/debian/patches/remove-problematic-gitattributes-files.patch ceph-16.2.10+ds/src/test/debian-jessie/debian/patches/remove-problematic-gitattributes-files.patch --- ceph-16.2.10+ds/src/test/debian-jessie/debian/patches/remove-problematic-gitattributes-files.patch 1970-01-01 00:00:00.000000000 +0000 +++ ceph-16.2.10+ds/src/test/debian-jessie/debian/patches/remove-problematic-gitattributes-files.patch 2022-08-05 17:43:48.000000000 +0000 @@ -0,0 +1,98 @@ +From: Raspbian forward porter +Subject: remove gitattributes files that cause problems for dgit. + +diff --git a/src/civetweb/.gitattributes b/src/civetweb/.gitattributes +deleted file mode 100644 +index 5c528676b..000000000 +--- a/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++ +diff --git a/src/rapidjson/.gitattributes b/src/rapidjson/.gitattributes +deleted file mode 100644 +index 6f598bb7f..000000000 +--- a/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 +diff --git a/src/zstd/.gitattributes b/src/zstd/.gitattributes +deleted file mode 100644 +index 6212bd405..000000000 +--- a/src/zstd/.gitattributes ++++ /dev/null +@@ -1,21 +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 diff -Nru ceph-16.2.10+ds/src/test/debian-jessie/debian/patches/series ceph-16.2.10+ds/src/test/debian-jessie/debian/patches/series --- ceph-16.2.10+ds/src/test/debian-jessie/debian/patches/series 2022-07-31 19:59:55.000000000 +0000 +++ ceph-16.2.10+ds/src/test/debian-jessie/debian/patches/series 2022-08-05 17:43:48.000000000 +0000 @@ -20,3 +20,5 @@ only-yied-under-armv7-and-above.patch Fix-build-with-fmt-8-9.patch fix-FTBFS-include-memory.h.patch +detect-raspbian.diff +remove-problematic-gitattributes-files.patch diff -Nru ceph-16.2.10+ds/src/test/debian-jessie/debian/rules ceph-16.2.10+ds/src/test/debian-jessie/debian/rules --- ceph-16.2.10+ds/src/test/debian-jessie/debian/rules 2022-07-31 19:59:55.000000000 +0000 +++ ceph-16.2.10+ds/src/test/debian-jessie/debian/rules 2022-08-05 17:43:48.000000000 +0000 @@ -26,6 +26,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-16.2.10+ds/src/test/ubuntu-16.04/debian/changelog ceph-16.2.10+ds/src/test/ubuntu-16.04/debian/changelog --- ceph-16.2.10+ds/src/test/ubuntu-16.04/debian/changelog 2022-07-31 19:59:55.000000000 +0000 +++ ceph-16.2.10+ds/src/test/ubuntu-16.04/debian/changelog 2022-08-05 17:43:48.000000000 +0000 @@ -1,3 +1,16 @@ +ceph (16.2.10+ds-2+rpi1) bookworm-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, 05 Aug 2022 17:43:48 +0000 + ceph (16.2.10+ds-2) unstable; urgency=medium * Replace Fix-build-with-fmt-8.1.1.patch by Fix-build-with-fmt-8-9.patch diff -Nru ceph-16.2.10+ds/src/test/ubuntu-16.04/debian/patches/detect-raspbian.diff ceph-16.2.10+ds/src/test/ubuntu-16.04/debian/patches/detect-raspbian.diff --- ceph-16.2.10+ds/src/test/ubuntu-16.04/debian/patches/detect-raspbian.diff 1970-01-01 00:00:00.000000000 +0000 +++ ceph-16.2.10+ds/src/test/ubuntu-16.04/debian/patches/detect-raspbian.diff 2022-08-05 17:43:48.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 3ba5e47ff..ad7f338e2 100755 +--- a/install-deps.sh ++++ b/install-deps.sh +@@ -301,7 +301,7 @@ else + [ $WITH_ZBD ] && with_zbd=true || with_zbd=false + source /etc/os-release + case "$ID" in +- debian|ubuntu|devuan|elementary) ++ debian|ubuntu|devuan|raspbian|elementary) + 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 e0ea4f07d..0f30b0a40 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 ca9b8d2ea..54a80b13b 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-16.2.10+ds/src/test/ubuntu-16.04/debian/patches/remove-problematic-gitattributes-files.patch ceph-16.2.10+ds/src/test/ubuntu-16.04/debian/patches/remove-problematic-gitattributes-files.patch --- ceph-16.2.10+ds/src/test/ubuntu-16.04/debian/patches/remove-problematic-gitattributes-files.patch 1970-01-01 00:00:00.000000000 +0000 +++ ceph-16.2.10+ds/src/test/ubuntu-16.04/debian/patches/remove-problematic-gitattributes-files.patch 2022-08-05 17:43:48.000000000 +0000 @@ -0,0 +1,98 @@ +From: Raspbian forward porter +Subject: remove gitattributes files that cause problems for dgit. + +diff --git a/src/civetweb/.gitattributes b/src/civetweb/.gitattributes +deleted file mode 100644 +index 5c528676b..000000000 +--- a/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++ +diff --git a/src/rapidjson/.gitattributes b/src/rapidjson/.gitattributes +deleted file mode 100644 +index 6f598bb7f..000000000 +--- a/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 +diff --git a/src/zstd/.gitattributes b/src/zstd/.gitattributes +deleted file mode 100644 +index 6212bd405..000000000 +--- a/src/zstd/.gitattributes ++++ /dev/null +@@ -1,21 +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 diff -Nru ceph-16.2.10+ds/src/test/ubuntu-16.04/debian/patches/series ceph-16.2.10+ds/src/test/ubuntu-16.04/debian/patches/series --- ceph-16.2.10+ds/src/test/ubuntu-16.04/debian/patches/series 2022-07-31 19:59:55.000000000 +0000 +++ ceph-16.2.10+ds/src/test/ubuntu-16.04/debian/patches/series 2022-08-05 17:43:48.000000000 +0000 @@ -20,3 +20,5 @@ only-yied-under-armv7-and-above.patch Fix-build-with-fmt-8-9.patch fix-FTBFS-include-memory.h.patch +detect-raspbian.diff +remove-problematic-gitattributes-files.patch diff -Nru ceph-16.2.10+ds/src/test/ubuntu-16.04/debian/rules ceph-16.2.10+ds/src/test/ubuntu-16.04/debian/rules --- ceph-16.2.10+ds/src/test/ubuntu-16.04/debian/rules 2022-07-31 19:59:55.000000000 +0000 +++ ceph-16.2.10+ds/src/test/ubuntu-16.04/debian/rules 2022-08-05 17:43:48.000000000 +0000 @@ -26,6 +26,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-16.2.10+ds/src/test/ubuntu-18.04/debian/changelog ceph-16.2.10+ds/src/test/ubuntu-18.04/debian/changelog --- ceph-16.2.10+ds/src/test/ubuntu-18.04/debian/changelog 2022-07-31 19:59:55.000000000 +0000 +++ ceph-16.2.10+ds/src/test/ubuntu-18.04/debian/changelog 2022-08-05 17:43:48.000000000 +0000 @@ -1,3 +1,16 @@ +ceph (16.2.10+ds-2+rpi1) bookworm-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, 05 Aug 2022 17:43:48 +0000 + ceph (16.2.10+ds-2) unstable; urgency=medium * Replace Fix-build-with-fmt-8.1.1.patch by Fix-build-with-fmt-8-9.patch diff -Nru ceph-16.2.10+ds/src/test/ubuntu-18.04/debian/patches/detect-raspbian.diff ceph-16.2.10+ds/src/test/ubuntu-18.04/debian/patches/detect-raspbian.diff --- ceph-16.2.10+ds/src/test/ubuntu-18.04/debian/patches/detect-raspbian.diff 1970-01-01 00:00:00.000000000 +0000 +++ ceph-16.2.10+ds/src/test/ubuntu-18.04/debian/patches/detect-raspbian.diff 2022-08-05 17:43:48.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 3ba5e47ff..ad7f338e2 100755 +--- a/install-deps.sh ++++ b/install-deps.sh +@@ -301,7 +301,7 @@ else + [ $WITH_ZBD ] && with_zbd=true || with_zbd=false + source /etc/os-release + case "$ID" in +- debian|ubuntu|devuan|elementary) ++ debian|ubuntu|devuan|raspbian|elementary) + 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 e0ea4f07d..0f30b0a40 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 ca9b8d2ea..54a80b13b 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-16.2.10+ds/src/test/ubuntu-18.04/debian/patches/remove-problematic-gitattributes-files.patch ceph-16.2.10+ds/src/test/ubuntu-18.04/debian/patches/remove-problematic-gitattributes-files.patch --- ceph-16.2.10+ds/src/test/ubuntu-18.04/debian/patches/remove-problematic-gitattributes-files.patch 1970-01-01 00:00:00.000000000 +0000 +++ ceph-16.2.10+ds/src/test/ubuntu-18.04/debian/patches/remove-problematic-gitattributes-files.patch 2022-08-05 17:43:48.000000000 +0000 @@ -0,0 +1,98 @@ +From: Raspbian forward porter +Subject: remove gitattributes files that cause problems for dgit. + +diff --git a/src/civetweb/.gitattributes b/src/civetweb/.gitattributes +deleted file mode 100644 +index 5c528676b..000000000 +--- a/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++ +diff --git a/src/rapidjson/.gitattributes b/src/rapidjson/.gitattributes +deleted file mode 100644 +index 6f598bb7f..000000000 +--- a/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 +diff --git a/src/zstd/.gitattributes b/src/zstd/.gitattributes +deleted file mode 100644 +index 6212bd405..000000000 +--- a/src/zstd/.gitattributes ++++ /dev/null +@@ -1,21 +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 diff -Nru ceph-16.2.10+ds/src/test/ubuntu-18.04/debian/patches/series ceph-16.2.10+ds/src/test/ubuntu-18.04/debian/patches/series --- ceph-16.2.10+ds/src/test/ubuntu-18.04/debian/patches/series 2022-07-31 19:59:55.000000000 +0000 +++ ceph-16.2.10+ds/src/test/ubuntu-18.04/debian/patches/series 2022-08-05 17:43:48.000000000 +0000 @@ -20,3 +20,5 @@ only-yied-under-armv7-and-above.patch Fix-build-with-fmt-8-9.patch fix-FTBFS-include-memory.h.patch +detect-raspbian.diff +remove-problematic-gitattributes-files.patch diff -Nru ceph-16.2.10+ds/src/test/ubuntu-18.04/debian/rules ceph-16.2.10+ds/src/test/ubuntu-18.04/debian/rules --- ceph-16.2.10+ds/src/test/ubuntu-18.04/debian/rules 2022-07-31 19:59:55.000000000 +0000 +++ ceph-16.2.10+ds/src/test/ubuntu-18.04/debian/rules 2022-08-05 17:43:48.000000000 +0000 @@ -26,6 +26,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-16.2.10+ds/src/test/ubuntu-20.04/debian/changelog ceph-16.2.10+ds/src/test/ubuntu-20.04/debian/changelog --- ceph-16.2.10+ds/src/test/ubuntu-20.04/debian/changelog 2022-07-31 19:59:55.000000000 +0000 +++ ceph-16.2.10+ds/src/test/ubuntu-20.04/debian/changelog 2022-08-05 17:43:48.000000000 +0000 @@ -1,3 +1,16 @@ +ceph (16.2.10+ds-2+rpi1) bookworm-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, 05 Aug 2022 17:43:48 +0000 + ceph (16.2.10+ds-2) unstable; urgency=medium * Replace Fix-build-with-fmt-8.1.1.patch by Fix-build-with-fmt-8-9.patch diff -Nru ceph-16.2.10+ds/src/test/ubuntu-20.04/debian/patches/detect-raspbian.diff ceph-16.2.10+ds/src/test/ubuntu-20.04/debian/patches/detect-raspbian.diff --- ceph-16.2.10+ds/src/test/ubuntu-20.04/debian/patches/detect-raspbian.diff 1970-01-01 00:00:00.000000000 +0000 +++ ceph-16.2.10+ds/src/test/ubuntu-20.04/debian/patches/detect-raspbian.diff 2022-08-05 17:43:48.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 3ba5e47ff..ad7f338e2 100755 +--- a/install-deps.sh ++++ b/install-deps.sh +@@ -301,7 +301,7 @@ else + [ $WITH_ZBD ] && with_zbd=true || with_zbd=false + source /etc/os-release + case "$ID" in +- debian|ubuntu|devuan|elementary) ++ debian|ubuntu|devuan|raspbian|elementary) + 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 e0ea4f07d..0f30b0a40 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 ca9b8d2ea..54a80b13b 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-16.2.10+ds/src/test/ubuntu-20.04/debian/patches/remove-problematic-gitattributes-files.patch ceph-16.2.10+ds/src/test/ubuntu-20.04/debian/patches/remove-problematic-gitattributes-files.patch --- ceph-16.2.10+ds/src/test/ubuntu-20.04/debian/patches/remove-problematic-gitattributes-files.patch 1970-01-01 00:00:00.000000000 +0000 +++ ceph-16.2.10+ds/src/test/ubuntu-20.04/debian/patches/remove-problematic-gitattributes-files.patch 2022-08-05 17:43:48.000000000 +0000 @@ -0,0 +1,98 @@ +From: Raspbian forward porter +Subject: remove gitattributes files that cause problems for dgit. + +diff --git a/src/civetweb/.gitattributes b/src/civetweb/.gitattributes +deleted file mode 100644 +index 5c528676b..000000000 +--- a/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++ +diff --git a/src/rapidjson/.gitattributes b/src/rapidjson/.gitattributes +deleted file mode 100644 +index 6f598bb7f..000000000 +--- a/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 +diff --git a/src/zstd/.gitattributes b/src/zstd/.gitattributes +deleted file mode 100644 +index 6212bd405..000000000 +--- a/src/zstd/.gitattributes ++++ /dev/null +@@ -1,21 +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 diff -Nru ceph-16.2.10+ds/src/test/ubuntu-20.04/debian/patches/series ceph-16.2.10+ds/src/test/ubuntu-20.04/debian/patches/series --- ceph-16.2.10+ds/src/test/ubuntu-20.04/debian/patches/series 2022-07-31 19:59:55.000000000 +0000 +++ ceph-16.2.10+ds/src/test/ubuntu-20.04/debian/patches/series 2022-08-05 17:43:48.000000000 +0000 @@ -20,3 +20,5 @@ only-yied-under-armv7-and-above.patch Fix-build-with-fmt-8-9.patch fix-FTBFS-include-memory.h.patch +detect-raspbian.diff +remove-problematic-gitattributes-files.patch diff -Nru ceph-16.2.10+ds/src/test/ubuntu-20.04/debian/rules ceph-16.2.10+ds/src/test/ubuntu-20.04/debian/rules --- ceph-16.2.10+ds/src/test/ubuntu-20.04/debian/rules 2022-07-31 19:59:55.000000000 +0000 +++ ceph-16.2.10+ds/src/test/ubuntu-20.04/debian/rules 2022-08-05 17:43:48.000000000 +0000 @@ -26,6 +26,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))