From: Peter Michael Green Date: Sun, 6 Mar 2022 09:25:19 +0000 (+0000) Subject: Manual merge of version 14.2.21-1.1+rpi1 and 16.2.7+ds-4 to produce 16.2.7+ds-4+rpi1 X-Git-Tag: archive/raspbian/16.2.7+ds-4+rpi1~2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=58b26c8233c6ed48e754ec30086216d63c38c8a9;p=ceph.git Manual merge of version 14.2.21-1.1+rpi1 and 16.2.7+ds-4 to produce 16.2.7+ds-4+rpi1 --- 58b26c8233c6ed48e754ec30086216d63c38c8a9 diff --cc debian/changelog index e0e860831,0ddc79f08..0a5293b98 --- a/debian/changelog +++ b/debian/changelog @@@ -1,15 -1,156 +1,169 @@@ - ceph (14.2.21-1.1+rpi1) bookworm-staging; urgency=medium ++ceph (16.2.7+ds-4+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 Wed, 22 Sep 2021 16:05:51 +0000 ++ -- Peter Michael Green Sun, 06 Mar 2022 09:24:04 +0000 ++ + ceph (16.2.7+ds-4) unstable; urgency=medium + + * Add fix-build-with-fmt-8.1.1.patch (Closes: #1003469). + + -- Thomas Goirand Fri, 14 Jan 2022 10:50:50 +0100 + + ceph (16.2.7+ds-3) unstable; urgency=medium + + * Rebuild source-only. + * Fix cephadm user creation that was failing, and subsequent chown failing as + the package installation as a consequence. + + -- Thomas Goirand Mon, 10 Jan 2022 11:45:19 +0100 + + ceph (16.2.7+ds-2) unstable; urgency=medium + + * Add libgf-complete-dev as build-dependency, since the Ceph repository + contains the exact same code as the Debian packaged version. + * Add libjerasure-dev as build-dependency, as the code of the Debian package + only contains a little bit further input checking and nothing else, so the + Ceph embedded copy is just less good (a simple diff shows this). This also + closes a very long silly debate that could have been solved by simply + reading the diff (Closes: #791445). + * libsqlite3-mod-ceph-dbg: do not depend on libsqlite3-0-dbgsym. + * Add missing python3-ceph-common package (Closes: #1003013). + * Set --max-parallel=8 when 32 GB (this optimizes build on my laptop). + * Kill the ceph-fuse-dbg package that is uninstallable. + * Remove ceph-base depends on essential packages: debianutils, findutils. + + -- Thomas Goirand Mon, 03 Jan 2022 15:24:32 +0100 + + ceph (16.2.7+ds-1) unstable; urgency=medium + + * New upstream release: + - Fix data corruption on upgrades from older releases (Closes: #1002749). + * Remove build-dependency on clang: we use gcc on all arch. + * Move smartmontools and nvme-cli to ceph-base, as per upstream. + * Increase the number of parallel processes when building with a lot of RAM. + * Refreshed a few patches. + + -- Thomas Goirand Wed, 29 Dec 2021 09:29:49 +0100 + + ceph (16.2.6+ds-11) unstable; urgency=medium + + * Revert libcephfs2.symbols "fix". + + -- Thomas Goirand Tue, 28 Dec 2021 08:45:18 +0100 + + ceph (16.2.6+ds-10) unstable; urgency=medium + + * Fix libcephfs2.symbols. + * Build-depends only on python3-dev, not python3-all-dev (Closes: #1002688). + + -- Thomas Goirand Mon, 27 Dec 2021 15:48:02 +0100 + + ceph (16.2.6+ds-9) unstable; urgency=medium + + * Fix ceph-mgr-modules-core,ceph-mgr: both ship /usr/share/ceph/mgr/* + (Closes: #998826). + + -- Thomas Goirand Mon, 27 Dec 2021 10:16:27 +0100 + + ceph (16.2.6+ds-8) unstable; urgency=medium + + * Uploading to unstable. + + -- Thomas Goirand Fri, 24 Dec 2021 23:46:33 +0100 + + ceph (16.2.6+ds-7) experimental; urgency=medium + + [ Adrian Bunk ] + * Use the system libfmt + * Use the system liburing + * Optimize for space on 32bit architectures + * Don't let cmake append CFLAGS/CXXFLAGS is -O/-g settings different from + what we set. + + -- Thomas Goirand Thu, 23 Dec 2021 15:53:49 +0100 + + ceph (16.2.6+ds-6) experimental; urgency=medium + + * Use -DWITH_BOOST_CONTEXT=ON in s390x mips64el and riscv64. + * Fix cmake-test-for-16-bytes-atomic-support-on-mips-also.patch so that it + works also for 32 bits mips. + + -- Thomas Goirand Thu, 09 Dec 2021 13:54:42 +0100 + + ceph (16.2.6+ds-5) experimental; urgency=medium + + * Add cmake-test-for-16-bytes-atomic-support-on-mips-also.patch which fixes + FTBFS on mips64el. + * Add only-yied-under-armv7-and-above.patch which fixes FTBFS on armel. + + -- Thomas Goirand Sat, 20 Nov 2021 15:00:51 +0100 + + ceph (16.2.6+ds-4) experimental; urgency=medium + + * Add libgoogle-perftools-dev build-depends on all available arch. + * Remove a symbol in debian/libcephfs2.symbols that is missing on ppc64el. + * Removed useless libsqlite3-mod-ceph.symbols. + + -- Thomas Goirand Mon, 08 Nov 2021 20:44:04 +0100 + + ceph (16.2.6+ds-3) experimental; urgency=medium + + * Do not maintain debian/librados2.symbols. + + -- Thomas Goirand Mon, 08 Nov 2021 08:36:08 +0100 + + ceph (16.2.6+ds-2) experimental; urgency=medium + + * Build-depends on valgrind for all avialable arch. + * Build-depends on libboost-context-dev and libboost-coroutine-dev on + s390x, mips64el and riscv64. + + -- Thomas Goirand Sun, 07 Nov 2021 15:14:08 +0100 + + ceph (16.2.6+ds-1) experimental; urgency=medium + + * New upstream release. + * Exclude debian folder from upstream orig tarball. + * Commit some of the upstream packaging to be closer to their packaging. + * Refreshed patch: + - disable-crypto.patch + - riscv64-link-pthread.patch + - compile-ppc.c-on-all-powerpc-machines.patch + * Remove patch (now useless / NA): + - 32bit-avoid-overloading.patch + - 32bit-avoid-size_t.patch + - make-ceph-python-3.9-aware.patch + - patches/another-cmakelists-fix.patch + - cmake_add_1.74_to_known_versions.patch + - cmake_define_BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT_for_Boost...sers.patch + - allow-bgp-to-host.patch + * Add patch taken from Ubuntu: + - enable-strsignal.patch + - 32bit-fixes.patch + - disable-log-slow-requests.patch + - bug1914584.patch + - bug1917414.patch + * Removed patch applied upstream: + - bluefs-use-uint64_t-for-len.patch + - debian/patches/mds-purgequeue-use_uint64_t.patch + * Rebased patch: + - add-option-to-disable-ceph-dencoder.patch + * d/rules: import stuff from the Ubuntu packaging. + * Reviewed build-dependency list. + * Switch to debhelper-compat 11. + * Use dh_installsystemd, not dh_systemd_enable which is deprecated. + * Reviewed (and rewrote a lot of) debian/copyright. + * Do not override dh_systemd_enable and dh_systemd_start. + + -- Thomas Goirand Tue, 02 Nov 2021 14:48:40 +0100 ceph (14.2.21-1.1) unstable; urgency=medium diff --cc debian/patches/series index 4b12c794b,74ba40a9b..a98d2c3da --- a/debian/patches/series +++ b/debian/patches/series @@@ -8,18 -7,16 +7,18 @@@ civetweb-755-1.8-somaxconn-configurable civetweb-755-1.8-somaxconn-configurable_test.patch # Upstream: py3 # Upstream: 32bit - bluefs-use-uint64_t-for-len.patch debian-armel-armhf-buildflags.patch fix-bash-completion-location + 32bit-fixes.patch add-option-to-disable-ceph-dencoder.patch riscv64-link-pthread.patch - mds-purgequeue-use_uint64_t.patch - make-ceph-python-3.9-aware.patch - cmake_define_BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT_for_Boost.Asio_users.patch - cmake_add_1.74_to_known_versions.patch - another-cmakelists-fix.patch + disable-log-slow-requests.patch fix-ceph-osd-systemd-target.patch - allow-bgp-to-host.patch compile-ppc.c-on-all-powerpc-machines.patch + bug1914584.patch + bug1917414.patch + cmake-test-for-16-bytes-atomic-support-on-mips-also.patch + only-yied-under-armv7-and-above.patch + fix-build-with-fmt-8.1.1.patch +detect-raspbian.diff +remove-problematic-gitattributes-files.patch diff --cc install-deps.sh index 5c1b847fb,3ba5e47ff..ad7f338e2 --- a/install-deps.sh +++ b/install-deps.sh @@@ -265,18 -296,12 +296,12 @@@ if [ x$(uname)x = xFreeBSDx ]; the exit else - for_make_check=false - if tty -s; then - # interactive - for_make_check=true - elif [ $FOR_MAKE_CHECK ]; then - for_make_check=true - else - for_make_check=false - fi + [ $WITH_SEASTAR ] && with_seastar=true || with_seastar=false + [ $WITH_JAEGER ] && with_jaeger=true || with_jaeger=false + [ $WITH_ZBD ] && with_zbd=true || with_zbd=false source /etc/os-release case "$ID" in - debian|ubuntu|devuan|raspbian) - 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