From: Peter Michael Green Date: Thu, 27 Dec 2018 00:47:01 +0000 (+0000) Subject: Manual merge of version 10.2.5-7.2+rpi1 and 12.2.8+dfsg1-5 to produce 12.2.8+dfsg1... X-Git-Tag: archive/raspbian/12.2.8+dfsg1-5+rpi1~2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=68b68389b3dbf907586e80c0418a0e19c3d1a913;p=ceph.git Manual merge of version 10.2.5-7.2+rpi1 and 12.2.8+dfsg1-5 to produce 12.2.8+dfsg1-5+rpi1 --- 68b68389b3dbf907586e80c0418a0e19c3d1a913 diff --cc debian/changelog index 4c0a7dd0a,c1606a505..dbd6b9d9c --- a/debian/changelog +++ b/debian/changelog @@@ -1,10 -1,125 +1,134 @@@ - ceph (10.2.5-7.2+rpi1) buster-staging; urgency=medium ++ceph (12.2.8+dfsg1-5+rpi1) buster-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. + - -- Peter Michael Green Sun, 30 Jul 2017 09:48:17 +0000 ++ -- Peter Michael Green Wed, 26 Dec 2018 00:55:56 +0000 ++ + ceph (12.2.8+dfsg1-5) unstable; urgency=medium + + * [66e03b] Fix linking on archs which require libatomic + * [5236f3] Fix Python 3 autopkgtest + + -- Gaudenz Steinlin Fri, 30 Nov 2018 16:49:02 +0100 + + ceph (12.2.8+dfsg1-4) unstable; urgency=medium + + * [97dfb6] Fix detection of armel for NEON instructions (Closes: #913599) + + -- Gaudenz Steinlin Thu, 22 Nov 2018 22:33:21 +0100 + + ceph (12.2.8+dfsg1-3) unstable; urgency=medium + + * [168bb9] Build depend on pythonX-dev instead of pythonX-all-dev + (Closes: #912905) + * [38d140] Patch to check for atomic support during build (Closes: #913601) + * [9cc0a5] Disable libboost-context on unsupported archs (Closes: #913600) + * [238143] Fix building with -g1 on 32 bit architectures + * [3b48d5] Use -mfloat-abi=softfp on armel for NEON instructions + (Closes: #913599) + + -- Gaudenz Steinlin Thu, 22 Nov 2018 09:38:09 +0100 + + ceph (12.2.8+dfsg1-2) unstable; urgency=medium + + * [5c4b36] Add architecture specific symbols for librados2 + * [38bc1b] Build depend on libatomic1 on armel, m68k, mips, mipsel, powerpc, + powerpcspe and sh4 + + -- Gaudenz Steinlin Wed, 31 Oct 2018 23:38:05 +0100 + + ceph (12.2.8+dfsg1-1) unstable; urgency=medium + + [ James Page ] + * [9c55f6] Ensure that systemd targets are enabled and started + * [17ca38] Support optional runtime loading of openssl in radosgw + * [8927f6] Fix build on i386 + * [774281] Ensure all ceph modules are included in the binary package. + * [00ca38] Cherry pick upstream fix to resolve FTBFS on armhf + * [5d118c] Add ceph-volume tools to ceph-osd package + + [ Gaudenz Steinlin ] + * [ba768b] New upstream version 12.2.8+dfsg1 + (Closes: #852999, #864535, #893149) + * [96eba0] Exclude jsonchecker from upstream source + * [7dd73b] Exclude Windows help file from orig tarball + * [9d1740] Move ceph initscript and systemd target to ceph-base + * [8ae049] Drop obsolete patches (either upstreamed or because of switch to + cmake) + * [cfd095] Create directory for Ceph Manager bootstrap keys + * [858194] Shell scripts moved out of architecture specific directory + * [f3f387] Merge ceph-fs-common package into ceph-common + * [1789fe] Move radosgw-admin to ceph-common + * [6f51fc] Add compressor plugins to ceph-common + * [5bd0d1] Add crypto plugins to ceph-common on amd64 + * [7724f7] New binary package ceph-mgr + * [804be6] Remove librgw_file* from ceph-test. These are unit tests for rgw. + * [fef87a] Upstream changed the build system to cmake + * [134e34] Build Python 3 versions of Python modules (Closes: #883148) + * [52a969] Package RADOS gateway Python bindings (python-rgw) + * [a48700] Add rados-objclass-dev binary package + * [30306f] Update dependencies for new upstream release + * [4d07af] libcephfs1 -> libcephfs2 soname bumped upstream + * [c4022d] Remove ceph-disk-udev no longer shipped upstream + * [9aad82] Remove sample.fetch_config no longer shipped upstream + * [fc163d] Update copyright for new upstream release + * [21c408] Add /usr/bin/radosgw-es to radosgw package + * [f63b2a] ceph-osd: sysctl config to increase the maximum number of AIO + requests + * [5f1f30] Remove static libraries from -dev packages (removed upstream) + * [1db168] Install ceph-detect-init into /usr/bin instead of /usr/sbin + * [1fb625] Move ceph-*-tool from ceph-test into daemon packages + * [6a5628] Remove obsolete X-Python-Version + * [c6fc4d] Update to Debian Policy version 4.2.1 + * [5821f2] Set multiarch triplet in debian/rules + * [9bdce0] Remove override of dh_auto_install + * [b71c87] Add libceph-common to librados2 and librados-dev pkgs + * [c746ce] Override JSON license lintian warning (false positive, code + removed) + * [17d65c] Use dh_missing instead of dh_install --list-missing + * [cba40a] Remove obsolete ceph-create-keys@.service from ceph-base + * [252d62] Update watch file for https and repacking + * [ef84cf] Install ceph SysV init script with dh_install + * [0c2c84] Add missing source for jquery.flot.js (actually + jquery.colorhelpers.js) + * [0f1e2e] Add missing sources for JQuery in civetweb + * [8010cc] Add missing sources from AdminLTE + * [7c425a] Add lintian overrides for source-is-missing false positives + * [75f7d2] Update symbols files + * [aa7295] Patch to fix build failures with Boost 1.67 + * [872887] Build with Debian packaged Boost 1.67 instead of bundled Boost 1.66 + * [abf215] Use google-perftools on all supported architectures + * [44dd74] Add missing sources for the mgr dashboard plugin + * [39f9d6] Depend on ceph-common for pythonX-cephfs (Closes: #896400) + * [7a10f0] Improve autopkgtests + * [7515ca] Add Python dependency for ceph-fuse + * [d91a92] Make the ceph binary package a pure metapackage + * [df1dc8] Add Lintian overrides for systemd targets + * [bc7cd4] Install upstream rbdmap systemd service file + * [dd44ea] Remove RUNPATH from JNI libraries + * [7e9bce] Add dependency on junit4 and libcephfs-java for ceph-test + * [dfbe7c] Remove unnecessary ceph-base postrm script (Closes: #867465) + * [bad29d] Fix permissions on /var/run/ceph in SysV init script + (Closes: #869142) + * [6edc7a] Mark libraries as Multi-Arch compatible (Closes: #822740) + + [ Thomas Goirand ] + * [46be6f] Change VCS links to point to Salsa + + [ Shengjing Zhu ] + * [bfcf95] Don't treat rados-classes and ceph/compressor as shared libraries + * [0ef4f9] Add missing interpreter in ceph-{osd,mon}.postinst + (Closes: #862684, #862685) + * [f75bfc] Change section of libcephfs-jni from libs to java + * [f4b5d4] Add patch to fix various spelling errors + * [f60d21] Patch to remove link to ceph.com for dashboard favicon + * [116028] Backport test build fix from upstream + * [b83166] Change architecture of ceph-fuse to linux-any (from amd64) + + -- Gaudenz Steinlin Sun, 28 Oct 2018 23:43:10 +0100 ceph (10.2.5-7.2) unstable; urgency=medium diff --cc debian/patches/series index 4d4452bbc,a62499a6e..30c204b0b --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,27 -1,17 +1,18 @@@ ## Backported / Upstream - sleep-recover.patch - - ## Security - cve-2016-9579_short_cors_request.patch + 0010-fix-various-spelling-errors.patch + 0013-remove-ceph.com-ref-to-favicon.patch + 0013-fix-unittest_mclock_priority_queue-not-build-when-ma.patch ## Debian - #rbdmap3-lazyumount.patch - arch.patch - sample.ceph.conf.patch - # Disabled until adopted upstream - # use_system_jerasure.patch virtualenv-never-download.patch - # Testing patches - tests-disable.patch - # Use correct compiler flags on armel + libatomic.patch + rocksdb-fallthrough-i386.patch + 0001-CoreLocalArray-class.patch + 0002-core-local-array-type-conversions.patch + 0003-Core-local-statistics.patch + fix-var-run-perms-sysvinit.patch + # Ubuntu: FTBFS on armhf + armhf-ftbfs.patch + boost-1.67-fixes.patch softfp-armel.patch - mips_mipsel_libatomic.patch - fix-init-system-detection.patch - - ## From Ubuntu - fix-cycles-arch.patch - skip-setup.py-makefiles.patch - disable-openssl-linking.patch - osd-limit-omap-data-in-push-op.patch - rgw_rados-creation_time.patch +detect-raspbian.diff diff --cc install-deps.sh index 2c3be5170,9ead1056d..293319634 --- a/install-deps.sh +++ b/install-deps.sh @@@ -19,21 -19,113 +19,113 @@@ if test $(id -u) != 0 ; the fi export LC_ALL=C # the following is vulnerable to i18n - if test -f /etc/redhat-release ; then - $SUDO yum install -y redhat-lsb-core - fi + function munge_ceph_spec_in { + local OUTFILE=$1 + sed -e 's/@//g' -e 's/%bcond_with make_check/%bcond_without make_check/g' < ceph.spec.in > $OUTFILE + } - if type apt-get > /dev/null 2>&1 ; then - $SUDO apt-get install -y lsb-release devscripts equivs - fi + function ensure_decent_gcc_on_deb { + # point gcc to the one offered by distro if the used one is different + local old=$(gcc -dumpversion) + local new=$1 + if dpkg --compare-versions $old eq $new; then + return + fi - if type zypper > /dev/null 2>&1 ; then - $SUDO zypper --gpg-auto-import-keys --non-interactive install lsb-release systemd-rpm-macros - fi + case $old in + 4*) + old=4.8;; + 5*) + old=5;; + 7*) + old=7;; + esac + + cat <