mirror of
https://git.proxmox.com/git/ceph.git
synced 2025-04-28 18:24:24 +00:00
build: pull changelog out of patches
to simplify rebasing on new upstream releases. Signed-off-by: Alwin Antreich <a.antreich@proxmox.com>
This commit is contained in:
Alwin Antreich
parent
67cd334a04
commit
11963c2338
2
Makefile
2
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
|
||||
|
||||
1001
changelog.Debian
Normal file
1001
changelog.Debian
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,324 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Alwin Antreich <a.antreich@proxmox.com>
|
||||
Date: Thu, 6 Dec 2018 12:43:02 +0100
|
||||
Subject: [PATCH] update changelog
|
||||
|
||||
Signed-off-by: Alwin Antreich <a.antreich@proxmox.com>
|
||||
---
|
||||
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 <support@proxmox.com> Wed, 06 Feb 2019 09:35:13 +0100
|
||||
+
|
||||
ceph (12.2.11-1) stable; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
|
||||
-- Ceph Release Team <ceph-maintainers@ceph.com> 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 <support@proxmox.com> 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 <ceph-maintainers@ceph.com> Wed, 24 Oct 2018 21:04:18 +0000
|
||||
|
||||
+ceph (12.2.8-pve1) stable; urgency=medium
|
||||
+
|
||||
+ * rebase on latest upstream release
|
||||
+
|
||||
+ -- Proxmox Support Team <support@proxmox.com> Wed, 05 Sep 2018 10:18:59 +0200
|
||||
+
|
||||
ceph (12.2.8-1) stable; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
|
||||
-- Ceph Release Team <ceph-maintainers@ceph.com> 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 <support@proxmox.com> 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 <ceph-maintainers@ceph.com> Mon, 09 Jul 2018 16:18:46 +0000
|
||||
|
||||
+ceph (12.2.5-pve1) stable; urgency=medium
|
||||
+
|
||||
+ * rebase on latest upstream release
|
||||
+
|
||||
+ -- Proxmox Support Team <support@proxmox.com> Wed, 25 Apr 2018 09:54:53 +0200
|
||||
+
|
||||
ceph (12.2.5-1) stable; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
|
||||
-- Ceph Release Team <ceph-maintainers@ceph.com> Mon, 23 Apr 2018 16:18:32 +0000
|
||||
|
||||
+ceph (12.2.4-pve1) stable; urgency=medium
|
||||
+
|
||||
+ * rebase on latest upstream release
|
||||
+
|
||||
+ -- Proxmox Support Team <support@proxmox.com> Wed, 28 Feb 2018 14:43:22 +0100
|
||||
+
|
||||
ceph (12.2.4-1) stable; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
|
||||
-- Ceph Release Team <ceph-maintainers@ceph.com> Mon, 26 Feb 2018 21:47:17 +0000
|
||||
|
||||
+ceph (12.2.3-pve1) stable; urgency=medium
|
||||
+
|
||||
+ * rebase on latest upstream release
|
||||
+
|
||||
+ -- Proxmox Support Team <support@proxmox.com> Wed, 21 Feb 2018 12:11:36 +0100
|
||||
+
|
||||
ceph (12.2.3-1) stable; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
|
||||
-- Ceph Release Team <ceph-maintainers@ceph.com> 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 <support@proxmox.com> Mon, 4 Dec 2017 10:22:17 +0100
|
||||
+
|
||||
ceph (12.2.2-1) stable; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
|
||||
-- Ceph Release Team <ceph-maintainers@ceph.com> 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 <support@proxmox.com> Tue, 10 Oct 2017 10:31:44 +0200
|
||||
+
|
||||
+ceph (12.2.1-pve2) stable; urgency=medium
|
||||
+
|
||||
+ * cherry-pick RDMA fix
|
||||
+
|
||||
+ -- Proxmox Support Team <support@proxmox.com> Fri, 6 Oct 2017 08:40:57 +0200
|
||||
+
|
||||
+ceph (12.2.1-pve1) stable; urgency=medium
|
||||
+
|
||||
+ * rebase on latest upstream release
|
||||
+
|
||||
+ -- Proxmox Support Team <support@proxmox.com> Fri, 29 Sep 2017 09:58:17 +0200
|
||||
+
|
||||
ceph (12.2.1-1) stable; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
|
||||
-- Ceph Release Team <ceph-maintainers@ceph.com> Tue, 26 Sep 2017 16:27:06 +0000
|
||||
|
||||
+ceph (12.2.0-pve1) stable; urgency=medium
|
||||
+
|
||||
+ * rebase on latest upstream release
|
||||
+
|
||||
+ -- Proxmox Support Team <support@proxmox.com> Wed, 30 Aug 2017 08:26:23 +0200
|
||||
+
|
||||
ceph (12.2.0-1) stable; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
|
||||
-- Ceph Release Team <ceph-maintainers@ceph.com> 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 <support@proxmox.com> Wed, 16 Aug 2017 08:02:47 +0200
|
||||
+
|
||||
ceph (12.1.4-1) stable; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
|
||||
-- Ceph Release Team <ceph-maintainers@ceph.com> 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 <support@proxmox.com> Mon, 14 Aug 2017 08:44:52 +0200
|
||||
+
|
||||
ceph (12.1.3-1) stable; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
|
||||
-- Ceph Release Team <ceph-maintainers@ceph.com> 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 <support@proxmox.com> Thu, 3 Aug 2017 11:57:13 +0200
|
||||
+
|
||||
ceph (12.1.2-1) stable; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
|
||||
-- Ceph Release Team <ceph-maintainers@ceph.com> 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 <support@proxmox.com> Wed, 19 Jul 2017 11:22:27 +0200
|
||||
+
|
||||
ceph (12.1.1-1) stable; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
|
||||
-- Ceph Release Team <ceph-maintainers@ceph.com> 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 <support@proxmox.com> 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 <support@proxmox.com> Tue, 27 Jun 2017 09:44:46 +0200
|
||||
+
|
||||
ceph (12.1.0-1) stable; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
|
||||
-- Ceph Release Team <ceph-maintainers@ceph.com> 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 <support@proxmox.com> 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 <support@proxmox.com> 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 <support@proxmox.com> Tue, 6 Jun 2017 12:22:39 +0200
|
||||
+
|
||||
ceph (12.0.3-1) stable; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
|
||||
-- Ceph Release Team <ceph-maintainers@ceph.com> 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 <support@proxmox.com> Wed, 26 Apr 2017 10:20:20 +0200
|
||||
+
|
||||
ceph (12.0.2-1) stable; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
|
||||
-- Ceph Release Team <ceph-maintainers@ceph.com> 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 <support@proxmox.com> Wed, 29 Mar 2017 09:43:26 +0200
|
||||
+
|
||||
ceph (12.0.1-1) stable; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
|
||||
-- Ceph Release Team <ceph-maintainers@ceph.com> 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 <support@proxmox.com> 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 <support@proxmox.com> 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 <support@proxmox.com> Mon, 20 Mar 2017 09:12:32 +0100
|
||||
+
|
||||
ceph (12.0.0-1) stable; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
@ -0,0 +1,23 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Alwin Antreich <a.antreich@proxmox.com>
|
||||
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
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user