From 11963c2338af892e7de6e76f25eadc7f3d1e6e78 Mon Sep 17 00:00:00 2001 From: Alwin Antreich Date: Wed, 6 Feb 2019 10:12:11 +0100 Subject: [PATCH] build: pull changelog out of patches to simplify rebasing on new upstream releases. Signed-off-by: Alwin Antreich --- Makefile | 2 + ceph/{debian/changelog => changelog.upstream} | 0 changelog.Debian | 1001 +++++++++++++++++ ...0001-cmake-disable-version-from-git.patch} | 0 patches/0001-update-changelog.patch | 324 ------ ...2-enable-systemd-targets-by-default.patch} | 0 ...rt.patch => 0003-enable-LZ4-support.patch} | 0 ...ync-rdma-uninitialized-variable-fix.patch} | 0 ...trol-adjust-ceph-osdomap-kvstore-mo.patch} | 0 ...ontrol-add-break-libpvestorage-perl.patch} | 0 ...p-Ceph-changelog-as-upstream-changel.patch | 23 + patches/series | 14 +- 12 files changed, 1033 insertions(+), 331 deletions(-) rename ceph/{debian/changelog => changelog.upstream} (100%) create mode 100644 changelog.Debian rename patches/{0002-cmake-disable-version-from-git.patch => 0001-cmake-disable-version-from-git.patch} (100%) delete mode 100644 patches/0001-update-changelog.patch rename patches/{0003-enable-systemd-targets-by-default.patch => 0002-enable-systemd-targets-by-default.patch} (100%) rename patches/{0004-enable-LZ4-support.patch => 0003-enable-LZ4-support.patch} (100%) rename patches/{0005-msg-async-rdma-uninitialized-variable-fix.patch => 0004-msg-async-rdma-uninitialized-variable-fix.patch} (100%) rename patches/{0006-Revert-debian-control-adjust-ceph-osdomap-kvstore-mo.patch => 0005-Revert-debian-control-adjust-ceph-osdomap-kvstore-mo.patch} (100%) rename patches/{0007-debian-control-add-break-libpvestorage-perl.patch => 0006-debian-control-add-break-libpvestorage-perl.patch} (100%) create mode 100644 patches/0007-debian-rules-ship-Ceph-changelog-as-upstream-changel.patch diff --git a/Makefile b/Makefile index 505198c63..582d27904 100644 --- a/Makefile +++ b/Makefile @@ -82,6 +82,7 @@ ${BUILDSRC}: ${SRCDIR} patches echo "git clone git://git.proxmox.com/git/ceph.git\\ngit checkout ${GITVERSION}" > $@.tmp/debian/SOURCE echo "debian/SOURCE" >> $@.tmp/debian/docs echo "${GITVERSION}\\nv${VER}" > $@.tmp/src/.git_version + cp changelog.Debian $@.tmp/debian/changelog mv $@.tmp $@ .PHONY: deb @@ -107,6 +108,7 @@ download: tar -C ${SRCDIR} --strip-components=1 -xf ${SRCDIR}.tmp/ceph-*.tar.bz2 # needed because boost and zstd builds fail otherwise find ${SRCDIR} -type f -name ".gitignore" -delete + mv ${SRCDIR}/debian/changelog ${SRCDIR}/changelog.upstream rm -rf ${SRCDIR}.tmp .PHONY: upload diff --git a/ceph/debian/changelog b/ceph/changelog.upstream similarity index 100% rename from ceph/debian/changelog rename to ceph/changelog.upstream diff --git a/changelog.Debian b/changelog.Debian new file mode 100644 index 000000000..8b7d99fd7 --- /dev/null +++ b/changelog.Debian @@ -0,0 +1,1001 @@ +ceph (12.2.11-1) stable; urgency=medium + + * New upstream release + + -- Ceph Release Team Wed, 30 Jan 2019 15:51:24 +0000 + +ceph (12.2.10-pve1) stable; urgency=medium + + * New upstream release + + * The bluestore_cache_* options are no longer needed. They are replaced by + osd_memory_target, defaulting to 4GB. BlueStore will expand and contract + its cache to attempt to stay within this limit. Users upgrading should + note this is a higher default than the previous bluestore_cache_size of + 1GB, so OSDs using BlueStore will use more memory by default. + + * cherry-pick os/bluestore: handle spurious read errors, workaround for + http://tracker.ceph.com/issues/22464 + + -- Proxmox Support Team Thu, 06 Dec 2018 16:34:57 +0100 + +ceph (12.2.10-1) stable; urgency=medium + + * New upstream release + + -- Ceph Release Team Mon, 26 Nov 2018 19:35:56 +0000 + +ceph (12.2.9-1) stable; urgency=medium + + * New upstream release + + -- Ceph Release Team Wed, 24 Oct 2018 21:04:18 +0000 + +ceph (12.2.8-pve1) stable; urgency=medium + + * rebase on latest upstream release + + -- Proxmox Support Team Wed, 05 Sep 2018 10:18:59 +0200 + +ceph (12.2.8-1) stable; urgency=medium + + * New upstream release + + -- Ceph Release Team Thu, 30 Aug 2018 17:24:37 +0000 + +ceph (12.2.7-pve1) stable; urgency=medium + + * rebase on latest upstream release + + * add ceph-common.preinst for upgrade warning + --- + If you used ceph v12.2.5 in combination with erasure coded pools, there is + a small risk of corruption under certain workloads. See the link below for + further upgrade instructions. + http://docs.ceph.com/docs/master/releases/luminous/#upgrading-from-v12-2-5-or-v12-2-6 + + -- Proxmox Support Team Wed, 18 Jul 2018 18:18:02 +0200 + +ceph (12.2.7-1) stable; urgency=medium + + * New upstream release + + -- Ceph Release Team Mon, 16 Jul 2018 16:00:29 +0000 + +ceph (12.2.6-1) stable; urgency=medium + + * New upstream release + + -- Ceph Release Team Mon, 09 Jul 2018 16:18:46 +0000 + +ceph (12.2.5-pve1) stable; urgency=medium + + * rebase on latest upstream release + + -- Proxmox Support Team Wed, 25 Apr 2018 09:54:53 +0200 + +ceph (12.2.5-1) stable; urgency=medium + + * New upstream release + + -- Ceph Release Team Mon, 23 Apr 2018 16:18:32 +0000 + +ceph (12.2.4-pve1) stable; urgency=medium + + * rebase on latest upstream release + + -- Proxmox Support Team Wed, 28 Feb 2018 14:43:22 +0100 + +ceph (12.2.4-1) stable; urgency=medium + + * New upstream release + + -- Ceph Release Team Mon, 26 Feb 2018 21:47:17 +0000 + +ceph (12.2.3-pve1) stable; urgency=medium + + * rebase on latest upstream release + + -- Proxmox Support Team Wed, 21 Feb 2018 12:11:36 +0100 + +ceph (12.2.3-1) stable; urgency=medium + + * New upstream release + + -- Ceph Release Team Mon, 19 Feb 2018 23:14:45 +0000 + +ceph (12.2.2-pve1) stable; urgency=medium + + * rebase on latest upstream release + + * add LZ4 support + + * remove ceph-disk deprecation warning + + -- Proxmox Support Team Mon, 4 Dec 2017 10:22:17 +0100 + +ceph (12.2.2-1) stable; urgency=medium + + * New upstream release + + -- Ceph Release Team Thu, 30 Nov 2017 14:59:26 +0000 + +ceph (12.2.1-pve3) stable; urgency=medium + + * cherry-pick monitor obsolete command fix + + * cherry-pick ceph-disk OSD activation fix + + -- Proxmox Support Team Tue, 10 Oct 2017 10:31:44 +0200 + +ceph (12.2.1-pve2) stable; urgency=medium + + * cherry-pick RDMA fix + + -- Proxmox Support Team Fri, 6 Oct 2017 08:40:57 +0200 + +ceph (12.2.1-pve1) stable; urgency=medium + + * rebase on latest upstream release + + -- Proxmox Support Team Fri, 29 Sep 2017 09:58:17 +0200 + +ceph (12.2.1-1) stable; urgency=medium + + * New upstream release + + -- Ceph Release Team Tue, 26 Sep 2017 16:27:06 +0000 + +ceph (12.2.0-pve1) stable; urgency=medium + + * rebase on latest upstream release + + -- Proxmox Support Team Wed, 30 Aug 2017 08:26:23 +0200 + +ceph (12.2.0-1) stable; urgency=medium + + * New upstream release + + -- Ceph Release Team Mon, 28 Aug 2017 16:30:16 +0000 + +ceph (12.1.4-pve1) unstable; urgency=medium + + * rebase on latest upstream Release Candidate + + -- Proxmox Support Team Wed, 16 Aug 2017 08:02:47 +0200 + +ceph (12.1.4-1) stable; urgency=medium + + * New upstream release + + -- Ceph Release Team Tue, 15 Aug 2017 13:45:08 +0000 + +ceph (12.1.3-pve1) unstable; urgency=medium + + * rebase on latest upstream Release Candidate + + -- Proxmox Support Team Mon, 14 Aug 2017 08:44:52 +0200 + +ceph (12.1.3-1) stable; urgency=medium + + * New upstream release + + -- Ceph Release Team Thu, 10 Aug 2017 19:22:38 +0000 + +ceph (12.1.2-pve1) unstable; urgency=medium + + * rebase on latest upstream Release Candidate + + -- Proxmox Support Team Thu, 3 Aug 2017 11:57:13 +0200 + +ceph (12.1.2-1) stable; urgency=medium + + * New upstream release + + -- Ceph Release Team Tue, 01 Aug 2017 17:55:37 +0000 + +ceph (12.1.1-pve1) unstable; urgency=medium + + * rebase on latest upstream Release Candidate + + -- Proxmox Support Team Wed, 19 Jul 2017 11:22:27 +0200 + +ceph (12.1.1-1) stable; urgency=medium + + * New upstream release + + -- Ceph Release Team Mon, 17 Jul 2017 16:55:59 +0000 + +ceph (12.1.0-pve2) unstable; urgency=medium + + * fix https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=582819 + + * add 0004-debian-workaround-the-bug-in-dpkg-maintscript-helper.patch + + -- Proxmox Support Team Mon, 03 Jul 2017 14:03:31 +0200 + +ceph (12.1.0-pve1) stable; urgency=medium + + * rebase on latest upstream Release Candidate + + * enable new restful mgr module by default + + -- Proxmox Support Team Tue, 27 Jun 2017 09:44:46 +0200 + +ceph (12.1.0-1) stable; urgency=medium + + * New upstream release + + -- Ceph Release Team Thu, 22 Jun 2017 15:43:47 +0000 + +ceph (12.0.3-pve3) stable; urgency=medium + + * update logrotate fix to final version + + -- Proxmox Support Team Tue, 20 Jun 2017 09:27:53 +0200 + +ceph (12.0.3-pve2) stable; urgency=medium + + * fix Ceph #19938: two logrotate scripts when upgrading from Debian packages + + -- Proxmox Support Team Wed, 7 Jun 2017 10:20:06 +0200 + +ceph (12.0.3-pve1) stable; urgency=medium + + * rebase on top of v12.0.3 + + * don't enable (broken) ceph-mgr module by default + + * use bundled boost + + -- Proxmox Support Team Tue, 6 Jun 2017 12:22:39 +0200 + +ceph (12.0.3-1) stable; urgency=medium + + * New upstream release + + -- Ceph Release Team Tue, 16 May 2017 12:42:53 +0000 + +ceph (12.0.2-pve1) stable; urgency=medium + + * rebase on top of v12.0.2 + + * cherry-pick monitor upgrade fix for upgrades from <= v12.0.2 + + -- Proxmox Support Team Wed, 26 Apr 2017 10:20:20 +0200 + +ceph (12.0.2-1) stable; urgency=medium + + * New upstream release + + -- Ceph Release Team Thu, 20 Apr 2017 19:59:57 +0000 + +ceph (12.0.1-pve1) stable; urgency=medium + + * revert dropping of boost build dependencies + + * revert including our package release in ceph version output + + -- Proxmox Support Team Wed, 29 Mar 2017 09:43:26 +0200 + +ceph (12.0.1-1) stable; urgency=medium + + * New upstream release + + -- Ceph Release Team Fri, 24 Mar 2017 15:47:57 +0000 + +ceph (12.0.0-pve3) stable; urgency=medium + + * make ceph version output even more explicit + + * enable systemd targets by default + + * fix IPv6 monitor creation bug + + -- Proxmox Support Team Wed, 22 Mar 2017 09:02:37 +0100 + +ceph (12.0.0-pve2) stable; urgency=medium + + * support Debian Stretch in ceph-detect-init + + * fix "ceph version" output + + -- Proxmox Support Team Tue, 21 Mar 2017 09:58:27 +0100 + +ceph (12.0.0-pve1) stable; urgency=medium + + * Rebuild for PVE 5.0 / Debian Stretch + + -- Proxmox Support Team Mon, 20 Mar 2017 09:12:32 +0100 + +ceph (12.0.0-1) stable; urgency=medium + + * New upstream release + + -- Ceph Release Team Wed, 08 Feb 2017 13:57:30 +0000 + +ceph (11.1.0-1) stable; urgency=medium + + * New upstream release + + -- Alfredo Deza Mon, 12 Dec 2016 18:27:51 +0000 + +ceph (11.0.2-1) stable; urgency=medium + + * New upstream release + + -- Alfredo Deza Mon, 17 Oct 2016 11:16:49 +0000 + +ceph (11.0.1-1) stable; urgency=medium + + * New upstream release + + -- Alfredo Deza Tue, 11 Oct 2016 16:27:56 +0000 + +ceph (11.0.0-1) stable; urgency=low + + * New upstream release + + -- Sage Weil Tue, 28 Jun 2016 11:41:16 -0400 + +ceph (10.2.0-1) stable; urgency=medium + + * New upstream release + + -- Alfredo Deza Wed, 20 Apr 2016 11:29:47 +0000 + +ceph (10.1.2-1) stable; urgency=medium + + * New upstream release + + -- Alfredo Deza Tue, 12 Apr 2016 17:42:55 +0000 + +ceph (10.1.1-1) stable; urgency=medium + + * New upstream release + + -- Alfredo Deza Wed, 06 Apr 2016 00:45:18 +0000 + +ceph (10.1.0-1) stable; urgency=medium + + * New upstream release + + -- Alfredo Deza Thu, 24 Mar 2016 10:53:47 +0000 + +ceph (10.0.5) stable; urgency=low + + * New upstream release (just fixing changelog) + + -- Sage Weil Fri, 11 Mar 2016 12:04:26 -0500 + +ceph (10.0.4) stable; urgency=low + + * New upstream release + + -- Sage Weil Thu, 03 Mar 2016 13:34:18 -0500 + +ceph (10.0.3) stable; urgency=low + + * New upstream release + + -- Sage Weil Mon, 08 Feb 2016 17:10:25 -0500 + +ceph (10.0.2-1) stable; urgency=low + + * New upstream release + + -- Alfredo Deza Wed, 13 Jan 2016 16:22:26 +0000 + +ceph (10.0.1-1) stable; urgency=low + + * New upstream release + + -- Alfredo Deza Mon, 14 Dec 2015 23:48:54 +0000 + +ceph (10.0.0-1) stable; urgency=low + + * New upstream release + + -- Alfredo Deza Mon, 16 Nov 2015 21:41:53 +0000 + +ceph (9.2.0-1) stable; urgency=low + + * New upstream release + + -- Jenkins Build Slave User Tue, 03 Nov 2015 16:58:32 +0000 + +ceph (9.1.0-1) stable; urgency=low + + * New upstream release + + -- Alfredo Deza Tue, 13 Oct 2015 05:56:36 -0700 + +ceph (9.0.3-1) stable; urgency=low + + * New upstream release + + -- Alfredo Deza Fri, 21 Aug 2015 12:46:31 -0700 + +ceph (9.0.2-1) stable; urgency=low + + * New upstream release + + -- Alfredo Deza Tue, 14 Jul 2015 13:10:31 -0700 + +ceph (9.0.1-1) stable; urgency=low + + * New upstream release + + -- Alfredo Deza Fri, 05 Jun 2015 10:59:02 -0700 + +ceph (9.0.0-1) stable; urgency=low + + * New upstream release + + -- Alfredo Deza Mon, 04 May 2015 12:32:58 -0700 + +ceph (0.94-1) stable; urgency=low + + * New upstream release + + -- Alfredo Deza Tue, 07 Apr 2015 10:05:40 -0700 + +ceph (0.93-1) stable; urgency=low + + * New upstream release + + -- Alfredo Deza Fri, 27 Feb 2015 09:52:53 -0800 + +ceph (0.92-1) stable; urgency=low + + * New upstream release + + -- Alfredo Deza Mon, 02 Feb 2015 10:35:27 -0800 + +ceph (0.91-1) stable; urgency=low + + * New upstream release + + -- Alfredo Deza Tue, 13 Jan 2015 12:10:22 -0800 + +ceph (0.90-1) stable; urgency=low + + * New upstream release + + -- Alfredo Deza Fri, 19 Dec 2014 06:56:22 -0800 + +ceph (0.89-1) stable; urgency=low + + * New upstream release + + -- Alfredo Deza Wed, 03 Dec 2014 08:18:33 -0800 + +ceph (0.88-1) stable; urgency=low + + * New upstream release + + -- Alfredo Deza Tue, 11 Nov 2014 09:33:12 -0800 + +ceph (0.87-1) stable; urgency=low + + * New upstream release + + -- Alfredo Deza Wed, 29 Oct 2014 11:03:55 -0700 + +ceph (0.86-1) stable; urgency=low + + * New upstream release + + -- Alfredo Deza Tue, 07 Oct 2014 06:20:21 -0700 + +ceph (0.85-1) stable; urgency=low + + * Development release + + -- Alfredo Deza Mon, 08 Sep 2014 06:31:31 -0700 + +ceph (0.84-1) stable; urgency=low + + * Development release + + -- Alfredo Deza Mon, 18 Aug 2014 09:02:20 -0700 + +ceph (0.83-1) stable; urgency=low + + * Development release + + -- Alfredo Deza Tue, 29 Jul 2014 13:42:53 -0700 + +ceph (0.82-1) stable; urgency=low + + * Development release + + -- Alfredo Deza Wed, 25 Jun 2014 16:47:51 +0000 + +ceph (0.81-1) stable; urgency=low + + * Development release + + -- Alfredo Deza Mon, 02 Jun 2014 18:37:27 +0000 + +ceph (0.80-1) stable; urgency=low + + * New upsream release + + -- Alfredo Deza Tue, 06 May 2014 14:03:27 +0000 + +ceph (0.80-rc1-1) stable; urgency=low + + * New upsream release + + -- Alfredo Deza Tue, 22 Apr 2014 21:21:44 +0000 + +ceph (0.79-1) stable; urgency=low + + * New upsream release + + -- Alfredo Deza Mon, 07 Apr 2014 16:48:36 +0000 + +ceph (0.78-1) stable; urgency=low + + * New upsream release + + -- Alfredo Deza Fri, 21 Mar 2014 22:05:12 +0000 + +ceph (0.77-1) stable; urgency=low + + * New upstream release + + -- Ken Dreyer Wed, 19 Feb 2014 22:54:06 +0000 + +ceph (0.76-1) stable; urgency=low + + * New upstream release + + -- Ken Dreyer Mon, 03 Feb 2014 18:14:59 +0000 + +ceph (0.75-1) stable; urgency=low + + * New upstream release + + -- Ken Dreyer Mon, 13 Jan 2014 21:05:07 +0000 + +ceph (0.74-1) stable; urgency=low + + * New upstream release + + -- Gary Lowell Mon, 30 Dec 2013 21:02:35 +0000 + +ceph (0.73-1) precise; urgency=low + + * New upstream release + + -- Gary Lowell Tue, 10 Dec 2013 04:55:06 +0000 + +ceph (0.72-1) stable; urgency=low + + * New upstream release + + -- Gary Lowell Thu, 07 Nov 2013 20:25:18 +0000 + +ceph (0.72-rc1-1) stable; urgency=low + + * New upstream release + + -- Gary Lowell Wed, 30 Oct 2013 00:44:25 +0000 + +ceph (0.71-1) stable; urgency=low + + * New upstream release + + -- Gary Lowell Thu, 17 Oct 2013 09:19:02 +0000 + +ceph (0.70-1) stable; urgency=low + + * New upstream release + + -- Gary Lowell Fri, 04 Oct 2013 20:11:51 +0000 + +ceph (0.69-1) precise; urgency=low + + * New upstream release + + -- Gary Lowell Wed, 18 Sep 2013 01:39:47 +0000 + +ceph (0.68-1) precise; urgency=low + + * New upstream release + + -- Gary Lowell Tue, 03 Sep 2013 16:10:11 -0700 + +ceph (0.67-1) precise; urgency=low + + * New upstream release + + -- Gary Lowell Tue, 13 Aug 2013 10:44:30 -0700 + +ceph (0.67-rc3-1) precise; urgency=low + + * New upstream release + + -- Gary Lowell Tue, 30 Jul 2013 14:37:40 -0700 + +ceph (0.67-rc2-1) precise; urgency=low + + * New upstream release + + -- Gary Lowell Wed, 24 Jul 2013 16:18:33 -0700 + +ceph (0.67-rc1-1) precise; urgency=low + + * New upstream release + + -- Gary Lowell Mon, 22 Jul 2013 11:57:01 -0700 + +ceph (0.66-1) precise; urgency=low + + * New upstream release + + -- Gary Lowell Mon, 08 Jul 2013 15:44:45 -0700 + +ceph (0.65-1) precise; urgency=low + + * New upstream release + + -- Gary Lowell Tue, 25 Jun 2013 09:19:14 -0700 + +ceph (0.64-1) precise; urgency=low + + * New upstream release + + -- Gary Lowell Wed, 12 Jun 2013 09:53:54 -0700 + +ceph (0.63-1) precise; urgency=low + + * New upstream release + + -- Gary Lowell Tue, 28 May 2013 13:57:53 -0700 + +ceph (0.62) precise; urgency=low + + * New upstream release + + -- Gary Lowell Tue, 14 May 2013 09:08:21 -0700 + +ceph (0.61-1) precise; urgency=low + + * New upstream release + + -- Gary Lowell Mon, 06 May 2013 13:18:43 -0700 + +ceph (0.60-1) precise; urgency=low + + * New upstream release + + -- Gary Lowell Mon, 01 Apr 2013 12:22:30 -0700 + +ceph (0.59-1) precise; urgency=low + + * New upstream release + + -- Gary Lowell Tue, 19 Mar 2013 22:26:37 -0700 + +ceph (0.58-1) precise; urgency=low + + * New upstream release + + -- Gary Lowell Mon, 04 Mar 2013 15:17:58 -0800 + +ceph (0.57-1) quantal; urgency=low + + * New upstream release + + -- Gary Lowell Tue, 19 Feb 2013 10:06:39 -0800 + +ceph (0.56-1) quantal; urgency=low + + * New upstream release + + -- Gary Lowell Mon, 31 Dec 2012 17:08:45 -0800 + +ceph (0.55.1-1) precise; urgency=low + + * New upstream release + + -- Gary Lowell Wed, 12 Dec 2012 16:24:13 -0800 + +ceph (0.55-1) precise; urgency=low + + * New upstream release + + -- Gary Lowell Mon, 03 Dec 2012 19:08:14 -0800 + +ceph (0.54-1) precise; urgency=low + + * New upstream release + + -- Gary Lowell Tue, 13 Nov 2012 13:17:19 -0800 + +ceph (0.53-1) precise; urgency=low + + * New upstream release + + -- Gary Lowell Tue, 16 Oct 2012 17:40:46 +0000 + +ceph (0.52-1) precise; urgency=low + + * New upstream release + + -- Ubuntu Thu, 27 Sep 2012 16:16:52 +0000 + +ceph (0.51-1) experimental; urgency=low + + * New upstream release + + -- Sage Weil Sat, 25 Aug 2012 15:58:23 -0700 + +ceph (0.50-1) experimental; urgency=low + + * New upstream release + + -- Sage Weil Mon, 13 Aug 2012 09:44:40 -0700 + +ceph (0.49-1) experimental; urgency=low + + * New upstream release + + -- Sage Weil Fri, 20 Jul 2012 23:26:43 -0700 + +ceph (0.48argonaut-1) experimental; urgency=low + + * New upstream release + + -- Sage Weil Sat, 30 Jun 2012 14:49:30 -0700 + +ceph (0.47.3-1) experimental; urgency=low + + * New upstream release + + -- Sage Weil Wed, 20 Jun 2012 10:57:03 -0700 + +ceph (0.47.2-1) experimental; urgency=low + + * New upstream release + + -- Sage Weil Wed, 23 May 2012 09:00:43 -0700 + +ceph (0.47.1-1) experimental; urgency=low + + * New upstream release + + -- Sage Weil Mon, 21 May 2012 14:28:30 -0700 + +ceph (0.47-1) experimental; urgency=low + + * New upstream release + + -- Sage Weil Sun, 20 May 2012 15:16:03 -0700 + +ceph (0.46-1) experimental; urgency=low + + * New upstream release + + -- Sage Weil Sun, 29 Apr 2012 21:21:01 -0700 + +ceph (0.45-1) experimental; urgency=low + + * New upstream release + + -- Sage Weil Tue, 10 Apr 2012 10:41:57 -0700 + +ceph (0.44.2-1) experimental; urgency=low + + * New upstream release + + -- Sage Weil Thu, 05 Apr 2012 14:54:17 -0700 + +ceph (0.44.1-1) experimental; urgency=low + + * New upstream release + + -- Sage Weil Tue, 27 Mar 2012 13:02:00 -0700 + +ceph (0.44-1) experimental; urgency=low + + * New upstream release + + -- Sage Weil Sun, 18 Mar 2012 12:03:38 -0700 + +ceph (0.43-1) experimental; urgency=low + + * New upstream release + + -- Sage Weil Fri, 02 Mar 2012 08:53:10 -0800 + +ceph (0.42.2-1) experimental; urgency=low + + * New upstream release + + -- Sage Weil Fri, 24 Feb 2012 12:59:38 -0800 + +ceph (0.42.1-1) experimental; urgency=low + + * New upstream release + + -- Sage Weil Thu, 23 Feb 2012 18:46:23 -0800 + +ceph (0.42-1) experimental; urgency=low + + * New upstream relese + + -- Sage Weil Sun, 19 Feb 2012 15:30:20 -0800 + +ceph (0.41-1) experimental; urgency=low + + * New upstream release + + -- Sage Weil Fri, 27 Jan 2012 10:42:11 -0800 + +ceph (0.40-1) experimental; urgency=low + + * New upstream release + + -- Sage Weil Fri, 13 Jan 2012 08:36:02 -0800 + +ceph (0.39-1) experimental; urgency=low + + * New upstream release + + -- Sage Weil Fri, 02 Dec 2011 09:01:20 -0800 + +ceph (0.38-1) experimental; urgency=low + + * New upstream release + + -- Sage Weil Thu, 10 Nov 2011 15:06:44 -0800 + +ceph (0.37-1) experimental; urgency=low + + * New upstream release + + -- Sage Weil Mon, 17 Oct 2011 08:35:42 -0700 + +ceph (0.36-1) experimental; urgency=low + + * New upstream release + + -- Sage Weil Fri, 30 Sep 2011 09:29:29 -0700 + +ceph (0.35-1) experimental; urgency=low + + * New upstream release + + -- Sage Weil Wed, 21 Sep 2011 09:36:03 -0700 + +ceph (0.34-1) experimental; urgency=low + + * New upstream release + + -- Sage Weil Fri, 26 Aug 2011 21:48:35 -0700 + +ceph (0.33-1) experimental; urgency=low + + * New upstream release. + + -- Sage Weil Mon, 15 Aug 2011 16:42:07 -0700 + +ceph (0.32-1) experimental; urgency=low + + * New upstream release + + -- Sage Weil Fri, 29 Jul 2011 21:42:08 -0700 + +ceph (0.30-1) experimental; urgency=low + + * New upstream release + + -- Sage Weil Mon, 27 Jun 2011 20:06:06 -0700 + +ceph (0.29.1-1) experimental; urgency=low + + * New upstream release + + -- Sage Weil Thu, 16 Jun 2011 13:10:47 -0700 + +ceph (0.29-1) experimental; urgency=low + + * New upstream release + + -- Sage Weil Mon, 06 Jun 2011 09:59:25 -0700 + +ceph (0.28.2-1) experimental; urgency=low + + * New upstream release. + + -- Sage Weil Sat, 28 May 2011 09:14:17 -0700 + +ceph (0.28.1-1) experimental; urgency=low + + * New upstream release. + + -- Sage Weil Mon, 23 May 2011 21:11:30 -0700 + +ceph (0.28-1) experimental; urgency=low + + * New upstream release. + + -- Sage Weil Tue, 17 May 2011 18:03:11 -0700 + +ceph (0.27.1-1) experimental; urgency=low + + * New upstream release. + + -- Sage Weil Thu, 05 May 2011 13:42:06 -0700 + +ceph (0.27-1) experimental; urgency=low + + * New upstream release. + + -- Sage Weil Fri, 22 Apr 2011 16:51:49 -0700 + +ceph (0.26-1) experimental; urgency=low + + * New upstream release. + * Make Ceph Linux only and build on all Linux archs (closes: #614890), + but only build-depend google-perftools on x86 and x64 archs only. + * Correct section of libcrush1, librados1, librbd1 and libceph1 to libs. + * Make Ceph cross buildable (closes: #618939), thanks to Hector Oron. + * Disable libatomic-ops on ARMv4t (armel) archs to prevent FTBFS + (closes: #615235), thanks go to Hector Oron again. + * Rename librados1{,-dbg,-dev} packages to librados2{,-dbg,-dev} ones; + conflict with and replace the former ones. + + -- Laszlo Boszormenyi (GCS) Fri, 01 Apr 2011 16:28:11 +0100 + +ceph (0.25.2-1) experimental; urgency=low + + * New upstream release + + -- Sage Weil Sun, 20 Mar 2011 21:07:38 -0700 + +ceph (0.25.1-1) experimental; urgency=low + + * New upstream release + + -- Sage Weil Mon, 14 Mar 2011 14:43:47 -0700 + +ceph (0.25-1) experimental; urgency=low + + * New upstream release + + -- Sage Weil Fri, 04 Mar 2011 14:39:54 -0800 + +ceph (0.24.3-1) experimental; urgency=low + + * New upstream release + + -- Sage Weil Thu, 10 Feb 2011 09:14:00 -0800 + +ceph (0.24.2-1) experimental; urgency=low + + * New upstream release. + + -- Sage Weil Mon, 24 Jan 2011 11:02:24 -0800 + +ceph (0.24.1-1) experimental; urgency=low + + * New upstream release. + + -- Sage Weil Fri, 07 Jan 2011 16:49:48 -0800 + +ceph (0.24-1) experimental; urgency=low + + * New upstream release. + + -- Laszlo Boszormenyi (GCS) Wed, 01 Dec 2010 09:26:25 -0800 + +ceph (0.23.1-1) experimental; urgency=low + + * Initial release (Closes: #506040) + + -- Sage Weil Sun, 21 Nov 2010 15:22:21 -0800 diff --git a/patches/0002-cmake-disable-version-from-git.patch b/patches/0001-cmake-disable-version-from-git.patch similarity index 100% rename from patches/0002-cmake-disable-version-from-git.patch rename to patches/0001-cmake-disable-version-from-git.patch diff --git a/patches/0001-update-changelog.patch b/patches/0001-update-changelog.patch deleted file mode 100644 index 41b2c59d4..000000000 --- a/patches/0001-update-changelog.patch +++ /dev/null @@ -1,324 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Alwin Antreich -Date: Thu, 6 Dec 2018 12:43:02 +0100 -Subject: [PATCH] update changelog - -Signed-off-by: Alwin Antreich ---- - debian/changelog | 196 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 196 insertions(+) - -diff --git a/debian/changelog b/debian/changelog -index eaed6bfbb4..4425cd75f7 100644 ---- a/debian/changelog -+++ b/debian/changelog -@@ -1,9 +1,30 @@ -+ceph (12.2.11-pve1) stable; urgency=medium -+ -+ * New upstream release -+ -+ -- Proxmox Support Team Wed, 06 Feb 2019 09:35:13 +0100 -+ - ceph (12.2.11-1) stable; urgency=medium - - * New upstream release - - -- Ceph Release Team Wed, 30 Jan 2019 15:51:24 +0000 - -+ceph (12.2.10-pve1) stable; urgency=medium -+ -+ * New upstream release -+ -+ * The bluestore_cache_* options are no longer needed. They are replaced by -+ osd_memory_target, defaulting to 4GB. BlueStore will expand and contract -+ its cache to attempt to stay within this limit. Users upgrading should -+ note this is a higher default than the previous bluestore_cache_size of -+ 1GB, so OSDs using BlueStore will use more memory by default. -+ -+ * cherry-pick os/bluestore: handle spurious read errors, workaround for -+ http://tracker.ceph.com/issues/22464 -+ -+ -- Proxmox Support Team Thu, 06 Dec 2018 16:34:57 +0100 -+ - ceph (12.2.10-1) stable; urgency=medium - - * New upstream release -@@ -16,12 +37,31 @@ ceph (12.2.9-1) stable; urgency=medium - - -- Ceph Release Team Wed, 24 Oct 2018 21:04:18 +0000 - -+ceph (12.2.8-pve1) stable; urgency=medium -+ -+ * rebase on latest upstream release -+ -+ -- Proxmox Support Team Wed, 05 Sep 2018 10:18:59 +0200 -+ - ceph (12.2.8-1) stable; urgency=medium - - * New upstream release - - -- Ceph Release Team Thu, 30 Aug 2018 17:24:37 +0000 - -+ceph (12.2.7-pve1) stable; urgency=medium -+ -+ * rebase on latest upstream release -+ -+ * add ceph-common.preinst for upgrade warning -+ --- -+ If you used ceph v12.2.5 in combination with erasure coded pools, there is -+ a small risk of corruption under certain workloads. See the link below for -+ further upgrade instructions. -+ http://docs.ceph.com/docs/master/releases/luminous/#upgrading-from-v12-2-5-or-v12-2-6 -+ -+ -- Proxmox Support Team Wed, 18 Jul 2018 18:18:02 +0200 -+ - ceph (12.2.7-1) stable; urgency=medium - - * New upstream release -@@ -34,90 +74,246 @@ ceph (12.2.6-1) stable; urgency=medium - - -- Ceph Release Team Mon, 09 Jul 2018 16:18:46 +0000 - -+ceph (12.2.5-pve1) stable; urgency=medium -+ -+ * rebase on latest upstream release -+ -+ -- Proxmox Support Team Wed, 25 Apr 2018 09:54:53 +0200 -+ - ceph (12.2.5-1) stable; urgency=medium - - * New upstream release - - -- Ceph Release Team Mon, 23 Apr 2018 16:18:32 +0000 - -+ceph (12.2.4-pve1) stable; urgency=medium -+ -+ * rebase on latest upstream release -+ -+ -- Proxmox Support Team Wed, 28 Feb 2018 14:43:22 +0100 -+ - ceph (12.2.4-1) stable; urgency=medium - - * New upstream release - - -- Ceph Release Team Mon, 26 Feb 2018 21:47:17 +0000 - -+ceph (12.2.3-pve1) stable; urgency=medium -+ -+ * rebase on latest upstream release -+ -+ -- Proxmox Support Team Wed, 21 Feb 2018 12:11:36 +0100 -+ - ceph (12.2.3-1) stable; urgency=medium - - * New upstream release - - -- Ceph Release Team Mon, 19 Feb 2018 23:14:45 +0000 - -+ceph (12.2.2-pve1) stable; urgency=medium -+ -+ * rebase on latest upstream release -+ -+ * add LZ4 support -+ -+ * remove ceph-disk deprecation warning -+ -+ -- Proxmox Support Team Mon, 4 Dec 2017 10:22:17 +0100 -+ - ceph (12.2.2-1) stable; urgency=medium - - * New upstream release - - -- Ceph Release Team Thu, 30 Nov 2017 14:59:26 +0000 - -+ceph (12.2.1-pve3) stable; urgency=medium -+ -+ * cherry-pick monitor obsolete command fix -+ -+ * cherry-pick ceph-disk OSD activation fix -+ -+ -- Proxmox Support Team Tue, 10 Oct 2017 10:31:44 +0200 -+ -+ceph (12.2.1-pve2) stable; urgency=medium -+ -+ * cherry-pick RDMA fix -+ -+ -- Proxmox Support Team Fri, 6 Oct 2017 08:40:57 +0200 -+ -+ceph (12.2.1-pve1) stable; urgency=medium -+ -+ * rebase on latest upstream release -+ -+ -- Proxmox Support Team Fri, 29 Sep 2017 09:58:17 +0200 -+ - ceph (12.2.1-1) stable; urgency=medium - - * New upstream release - - -- Ceph Release Team Tue, 26 Sep 2017 16:27:06 +0000 - -+ceph (12.2.0-pve1) stable; urgency=medium -+ -+ * rebase on latest upstream release -+ -+ -- Proxmox Support Team Wed, 30 Aug 2017 08:26:23 +0200 -+ - ceph (12.2.0-1) stable; urgency=medium - - * New upstream release - - -- Ceph Release Team Mon, 28 Aug 2017 16:30:16 +0000 - -+ceph (12.1.4-pve1) unstable; urgency=medium -+ -+ * rebase on latest upstream Release Candidate -+ -+ -- Proxmox Support Team Wed, 16 Aug 2017 08:02:47 +0200 -+ - ceph (12.1.4-1) stable; urgency=medium - - * New upstream release - - -- Ceph Release Team Tue, 15 Aug 2017 13:45:08 +0000 - -+ceph (12.1.3-pve1) unstable; urgency=medium -+ -+ * rebase on latest upstream Release Candidate -+ -+ -- Proxmox Support Team Mon, 14 Aug 2017 08:44:52 +0200 -+ - ceph (12.1.3-1) stable; urgency=medium - - * New upstream release - - -- Ceph Release Team Thu, 10 Aug 2017 19:22:38 +0000 - -+ceph (12.1.2-pve1) unstable; urgency=medium -+ -+ * rebase on latest upstream Release Candidate -+ -+ -- Proxmox Support Team Thu, 3 Aug 2017 11:57:13 +0200 -+ - ceph (12.1.2-1) stable; urgency=medium - - * New upstream release - - -- Ceph Release Team Tue, 01 Aug 2017 17:55:37 +0000 - -+ceph (12.1.1-pve1) unstable; urgency=medium -+ -+ * rebase on latest upstream Release Candidate -+ -+ -- Proxmox Support Team Wed, 19 Jul 2017 11:22:27 +0200 -+ - ceph (12.1.1-1) stable; urgency=medium - - * New upstream release - - -- Ceph Release Team Mon, 17 Jul 2017 16:55:59 +0000 - -+ceph (12.1.0-pve2) unstable; urgency=medium -+ -+ * fix https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=582819 -+ -+ * add 0004-debian-workaround-the-bug-in-dpkg-maintscript-helper.patch -+ -+ -- Proxmox Support Team Mon, 03 Jul 2017 14:03:31 +0200 -+ -+ceph (12.1.0-pve1) stable; urgency=medium -+ -+ * rebase on latest upstream Release Candidate -+ -+ * enable new restful mgr module by default -+ -+ -- Proxmox Support Team Tue, 27 Jun 2017 09:44:46 +0200 -+ - ceph (12.1.0-1) stable; urgency=medium - - * New upstream release - - -- Ceph Release Team Thu, 22 Jun 2017 15:43:47 +0000 - -+ceph (12.0.3-pve3) stable; urgency=medium -+ -+ * update logrotate fix to final version -+ -+ -- Proxmox Support Team Tue, 20 Jun 2017 09:27:53 +0200 -+ -+ceph (12.0.3-pve2) stable; urgency=medium -+ -+ * fix Ceph #19938: two logrotate scripts when upgrading from Debian packages -+ -+ -- Proxmox Support Team Wed, 7 Jun 2017 10:20:06 +0200 -+ -+ceph (12.0.3-pve1) stable; urgency=medium -+ -+ * rebase on top of v12.0.3 -+ -+ * don't enable (broken) ceph-mgr module by default -+ -+ * use bundled boost -+ -+ -- Proxmox Support Team Tue, 6 Jun 2017 12:22:39 +0200 -+ - ceph (12.0.3-1) stable; urgency=medium - - * New upstream release - - -- Ceph Release Team Tue, 16 May 2017 12:42:53 +0000 - -+ceph (12.0.2-pve1) stable; urgency=medium -+ -+ * rebase on top of v12.0.2 -+ -+ * cherry-pick monitor upgrade fix for upgrades from <= v12.0.2 -+ -+ -- Proxmox Support Team Wed, 26 Apr 2017 10:20:20 +0200 -+ - ceph (12.0.2-1) stable; urgency=medium - - * New upstream release - - -- Ceph Release Team Thu, 20 Apr 2017 19:59:57 +0000 - -+ceph (12.0.1-pve1) stable; urgency=medium -+ -+ * revert dropping of boost build dependencies -+ -+ * revert including our package release in ceph version output -+ -+ -- Proxmox Support Team Wed, 29 Mar 2017 09:43:26 +0200 -+ - ceph (12.0.1-1) stable; urgency=medium - - * New upstream release - - -- Ceph Release Team Fri, 24 Mar 2017 15:47:57 +0000 - -+ceph (12.0.0-pve3) stable; urgency=medium -+ -+ * make ceph version output even more explicit -+ -+ * enable systemd targets by default -+ -+ * fix IPv6 monitor creation bug -+ -+ -- Proxmox Support Team Wed, 22 Mar 2017 09:02:37 +0100 -+ -+ceph (12.0.0-pve2) stable; urgency=medium -+ -+ * support Debian Stretch in ceph-detect-init -+ -+ * fix "ceph version" output -+ -+ -- Proxmox Support Team Tue, 21 Mar 2017 09:58:27 +0100 -+ -+ceph (12.0.0-pve1) stable; urgency=medium -+ -+ * Rebuild for PVE 5.0 / Debian Stretch -+ -+ -- Proxmox Support Team Mon, 20 Mar 2017 09:12:32 +0100 -+ - ceph (12.0.0-1) stable; urgency=medium - - * New upstream release diff --git a/patches/0003-enable-systemd-targets-by-default.patch b/patches/0002-enable-systemd-targets-by-default.patch similarity index 100% rename from patches/0003-enable-systemd-targets-by-default.patch rename to patches/0002-enable-systemd-targets-by-default.patch diff --git a/patches/0004-enable-LZ4-support.patch b/patches/0003-enable-LZ4-support.patch similarity index 100% rename from patches/0004-enable-LZ4-support.patch rename to patches/0003-enable-LZ4-support.patch diff --git a/patches/0005-msg-async-rdma-uninitialized-variable-fix.patch b/patches/0004-msg-async-rdma-uninitialized-variable-fix.patch similarity index 100% rename from patches/0005-msg-async-rdma-uninitialized-variable-fix.patch rename to patches/0004-msg-async-rdma-uninitialized-variable-fix.patch diff --git a/patches/0006-Revert-debian-control-adjust-ceph-osdomap-kvstore-mo.patch b/patches/0005-Revert-debian-control-adjust-ceph-osdomap-kvstore-mo.patch similarity index 100% rename from patches/0006-Revert-debian-control-adjust-ceph-osdomap-kvstore-mo.patch rename to patches/0005-Revert-debian-control-adjust-ceph-osdomap-kvstore-mo.patch diff --git a/patches/0007-debian-control-add-break-libpvestorage-perl.patch b/patches/0006-debian-control-add-break-libpvestorage-perl.patch similarity index 100% rename from patches/0007-debian-control-add-break-libpvestorage-perl.patch rename to patches/0006-debian-control-add-break-libpvestorage-perl.patch diff --git a/patches/0007-debian-rules-ship-Ceph-changelog-as-upstream-changel.patch b/patches/0007-debian-rules-ship-Ceph-changelog-as-upstream-changel.patch new file mode 100644 index 000000000..97b7c3b6f --- /dev/null +++ b/patches/0007-debian-rules-ship-Ceph-changelog-as-upstream-changel.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Alwin Antreich +Date: Wed, 6 Feb 2019 10:16:22 +0100 +Subject: [PATCH] debian/rules: ship Ceph changelog as upstream changelog + +since we replace it with our own. +--- + debian/rules | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/debian/rules b/debian/rules +index 3ac923f71a..d9927b3e0d 100755 +--- a/debian/rules ++++ b/debian/rules +@@ -55,7 +55,7 @@ override_dh_auto_install: + + # doc/changelog is a directory, which confuses dh_installchangelogs + override_dh_installchangelogs: +- dh_installchangelogs --exclude doc/changelog ++ dh_installchangelogs --exclude doc/changelog changelog.upstream + + override_dh_installdocs: + dh_installdocs -a --all ChangeLog diff --git a/patches/series b/patches/series index 58a65f9f1..0b1b9c794 100644 --- a/patches/series +++ b/patches/series @@ -1,7 +1,7 @@ -0001-update-changelog.patch -0002-cmake-disable-version-from-git.patch -0003-enable-systemd-targets-by-default.patch -0004-enable-LZ4-support.patch -0005-msg-async-rdma-uninitialized-variable-fix.patch -0006-Revert-debian-control-adjust-ceph-osdomap-kvstore-mo.patch -0007-debian-control-add-break-libpvestorage-perl.patch +0001-cmake-disable-version-from-git.patch +0002-enable-systemd-targets-by-default.patch +0003-enable-LZ4-support.patch +0004-msg-async-rdma-uninitialized-variable-fix.patch +0005-Revert-debian-control-adjust-ceph-osdomap-kvstore-mo.patch +0006-debian-control-add-break-libpvestorage-perl.patch +0007-debian-rules-ship-Ceph-changelog-as-upstream-changel.patch -- 2.39.2