From: Fabian Grünbichler Date: Mon, 20 Mar 2017 09:51:58 +0000 (+0100) Subject: initial repackaging for PVE 5.0 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=adde06717fd27d46d96af29b3f3ac55a9cded18b;p=ceph.git initial repackaging for PVE 5.0 --- adde06717fd27d46d96af29b3f3ac55a9cded18b diff --git a/Makefile b/Makefile new file mode 100644 index 000000000..0fdbf1672 --- /dev/null +++ b/Makefile @@ -0,0 +1,118 @@ +RELEASE=5.0 + +PACKAGE=ceph +VER=12.0.0 +DEBREL=pve1 + +SRC=ceph.tar.gz +SRCDIR=ceph + +# everything except boost +SUBMODULES=ceph-erasure-code-corpus \ + ceph-object-corpus \ + src/Beast \ + src/civetweb \ + src/dpdk \ + src/erasure-code/jerasure/gf-complete \ + src/erasure-code/jerasure/jerasure \ + src/googletest \ + src/isa-l \ + src/lua \ + src/rocksdb \ + src/spdk \ + src/xxHash \ + src/zstd + +ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH) +GITVERSION:=$(shell cat .git/refs/heads/master) + +DEBS=ceph_${VER}-${DEBREL}_${ARCH}.deb \ +ceph-base_${VER}-${DEBREL}_${ARCH}.deb \ +ceph-common_${VER}-${DEBREL}_${ARCH}.deb \ +ceph-common-dbg_${VER}-${DEBREL}_${ARCH}.deb \ +ceph-fuse_${VER}-${DEBREL}_${ARCH}.deb \ +ceph-fuse-dbg_${VER}-${DEBREL}_${ARCH}.deb \ +ceph-mds_${VER}-${DEBREL}_${ARCH}.deb \ +ceph-mds-dbg_${VER}-${DEBREL}_${ARCH}.deb \ +ceph-mgr_${VER}-${DEBREL}_${ARCH}.deb \ +ceph-mgr-dbg_${VER}-${DEBREL}_${ARCH}.deb \ +ceph-mon_${VER}-${DEBREL}_${ARCH}.deb \ +ceph-mon-dbg_${VER}-${DEBREL}_${ARCH}.deb \ +ceph-osd_${VER}-${DEBREL}_${ARCH}.deb \ +ceph-osd-dbg_${VER}-${DEBREL}_${ARCH}.deb \ +ceph-resource-agents_${VER}-${DEBREL}_${ARCH}.deb \ +ceph-test_${VER}-${DEBREL}_${ARCH}.deb \ +ceph-test-dbg_${VER}-${DEBREL}_${ARCH}.deb \ +libcephfs2_${VER}-${DEBREL}_${ARCH}.deb \ +libcephfs2-dbg_${VER}-${DEBREL}_${ARCH}.deb \ +libcephfs-dev_${VER}-${DEBREL}_${ARCH}.deb \ +libcephfs-java_${VER}-${DEBREL}_all.deb \ +libcephfs-jni_${VER}-${DEBREL}_${ARCH}.deb \ +librados2_${VER}-${DEBREL}_${ARCH}.deb \ +librados2-dbg_${VER}-${DEBREL}_${ARCH}.deb \ +librados-dev_${VER}-${DEBREL}_${ARCH}.deb \ +libradosstriper1_${VER}-${DEBREL}_${ARCH}.deb \ +libradosstriper1-dbg_${VER}-${DEBREL}_${ARCH}.deb \ +libradosstriper-dev_${VER}-${DEBREL}_${ARCH}.deb \ +librbd1_${VER}-${DEBREL}_${ARCH}.deb \ +librbd1-dbg_${VER}-${DEBREL}_${ARCH}.deb \ +librbd-dev_${VER}-${DEBREL}_${ARCH}.deb \ +librgw2_${VER}-${DEBREL}_${ARCH}.deb \ +librgw2-dbg_${VER}-${DEBREL}_${ARCH}.deb \ +librgw-dev_${VER}-${DEBREL}_${ARCH}.deb \ +python3-ceph-argparse_${VER}-${DEBREL}_${ARCH}.deb \ +python3-cephfs_${VER}-${DEBREL}_${ARCH}.deb \ +python3-rados_${VER}-${DEBREL}_${ARCH}.deb \ +python3-rbd_${VER}-${DEBREL}_${ARCH}.deb \ +python3-rgw_${VER}-${DEBREL}_${ARCH}.deb \ +python-ceph_${VER}-${DEBREL}_${ARCH}.deb \ +python-cephfs_${VER}-${DEBREL}_${ARCH}.deb \ +python-rados_${VER}-${DEBREL}_${ARCH}.deb \ +python-rbd_${VER}-${DEBREL}_${ARCH}.deb \ +python-rgw_${VER}-${DEBREL}_${ARCH}.deb \ +radosgw_${VER}-${DEBREL}_${ARCH}.deb \ +radosgw-dbg_${VER}-${DEBREL}_${ARCH}.deb \ +rbd-fuse_${VER}-${DEBREL}_${ARCH}.deb \ +rbd-fuse-dbg_${VER}-${DEBREL}_${ARCH}.deb \ +rbd-mirror_${VER}-${DEBREL}_${ARCH}.deb \ +rbd-mirror-dbg_${VER}-${DEBREL}_${ARCH}.deb \ +rbd-nbd_${VER}-${DEBREL}_${ARCH}.deb \ +rbd-nbd-dbg_${VER}-${DEBREL}_${ARCH}.deb + +all: ${DEBS} + @echo ${DEBS} + +.PHONY: deb +deb: ${DEBS} +${DEBS}: ${SRC} patches + rm -rf ${SRCDIR} + tar xf ${SRC} + cd ${SRCDIR}; ln -s ../patches patches + cd ${SRCDIR}; quilt push -a + cd ${SRCDIR}; rm -rf .pc ./patches + echo "git clone git://git.proxmox.com/git/ceph.git\\ngit checkout ${GITVERSION}" > ${SRCDIR}/debian/SOURCE + echo "debian/SOURCE" >> ${SRCDIR}/debian/docs + cd ${SRCDIR}; dpkg-buildpackage -b -uc -us + @echo ${DEBS} + +.PHONY: download +download ${SRC}: + rm -rf ${SRC} ${SRCDIR} + git clone -b v${VER} https://github.com/ceph/ceph.git ${SRCDIR} + cd ${SRCDIR}; for module in ${SUBMODULES}; do git submodule update --init $${module}; done + tar czf ${SRC} --exclude .git ${SRCDIR} + +.PHONY: upload +upload: ${DEBS} + tar cf - ${DEBS} | ssh repoman@repo.proxmox.com upload --product ceph-luminous --dist stretch --arch ${ARCH} + +distclean: clean + +.PHONY: clean +clean: + rm -rf ceph *_${ARCH}.deb *.changes *.dsc *.buildinfo + find . -name '*~' -exec rm {} ';' + +.PHONY: dinstall +dinstall: ${DEB} + dpkg -i ${DEB} diff --git a/ceph.tar.gz b/ceph.tar.gz new file mode 100644 index 000000000..a0246e254 Binary files /dev/null and b/ceph.tar.gz differ diff --git a/patches/0001-update-changelog.patch b/patches/0001-update-changelog.patch new file mode 100644 index 000000000..64a30bd38 --- /dev/null +++ b/patches/0001-update-changelog.patch @@ -0,0 +1,30 @@ +From eaa617f8559ac5b373e74231471ce56c41f2ccd3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= +Date: Mon, 20 Mar 2017 09:12:50 +0100 +Subject: [PATCH 1/2] update changelog +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Fabian Grünbichler +--- + debian/changelog | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/debian/changelog b/debian/changelog +index a726c2d..a2e42d8 100644 +--- a/debian/changelog ++++ b/debian/changelog +@@ -1,3 +1,9 @@ ++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 +-- +2.1.4 + diff --git a/patches/0002-build-with-system-boost.patch b/patches/0002-build-with-system-boost.patch new file mode 100644 index 000000000..69b9f1ace --- /dev/null +++ b/patches/0002-build-with-system-boost.patch @@ -0,0 +1,28 @@ +From 504f6eeca120650da018d7584737298f55dcbc9b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= +Date: Mon, 20 Mar 2017 09:16:06 +0100 +Subject: [PATCH 2/2] build with system boost +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Fabian Grünbichler +--- + debian/rules | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/debian/rules b/debian/rules +index d529fdc..61efec4 100755 +--- a/debian/rules ++++ b/debian/rules +@@ -11,6 +11,7 @@ extraopts += -DWITH_CEPHFS_JAVA=ON + extraopts += -DCMAKE_INSTALL_LIBDIR=/usr/lib + extraopts += -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib + extraopts += -DCMAKE_INSTALL_SYSCONFDIR=/etc ++extraopts += -DWITH_SYSTEM_BOOST=ON + + ifeq ($(DEB_HOST_ARCH), armel) + # armel supports ARMv4t or above instructions sets. +-- +2.1.4 + diff --git a/patches/series b/patches/series new file mode 100644 index 000000000..e731bbf97 --- /dev/null +++ b/patches/series @@ -0,0 +1,2 @@ +0001-update-changelog.patch +0002-build-with-system-boost.patch