Date: Wed, 3 May 2017 09:25:30 +0000 (UTC) From: Mahdi Mokhtari <mmokhi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r440007 - in head/net/ceph-devel: . files Message-ID: <201705030925.v439PUOG072932@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mmokhi Date: Wed May 3 09:25:30 2017 New Revision: 440007 URL: https://svnweb.freebsd.org/changeset/ports/440007 Log: net/ceph-devel: update to latest release v2017-05-01 Delete a no-longer-needed patch. PR: 218974 Reported by: Willem Jan Withagen <wjw@digiware.nl> Reviewed by: feld (mentor) Approved by: feld (mentor) Differential Revision: https://reviews.freebsd.org/D10547 Deleted: head/net/ceph-devel/files/patch-src_rocksdb_CMakeLists.txt Modified: head/net/ceph-devel/Makefile head/net/ceph-devel/distinfo head/net/ceph-devel/files/ceph.in head/net/ceph-devel/pkg-plist Modified: head/net/ceph-devel/Makefile ============================================================================== --- head/net/ceph-devel/Makefile Wed May 3 09:02:24 2017 (r440006) +++ head/net/ceph-devel/Makefile Wed May 3 09:25:30 2017 (r440007) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= ceph -DISTVERSION= wip.v2017-2-14 -PORTREVISION= 2 +DISTVERSION= wip.v2017-05-01 CATEGORIES= net PKGNAMESUFFIX= -devel @@ -44,28 +43,30 @@ RUN_DEPENDS= \ USE_GITHUB= yes GH_ACCOUNT= wjwithagen:DEFAULT -GH_TUPLE+= facebook:rocksdb:a0deec9:rocksdb/src/rocksdb -GH_TUPLE+= ceph:ceph-erasure-code-corpus:b5c8634:cepherasurecodecorpus/ceph-erasure-code-corpus +GH_TUPLE+= facebook:rocksdb:2.7.fb-4991-g9f2cc5:rocksdb/src/rocksdb +GH_TUPLE+= ceph:ceph-erasure-code-corpus:master:cepherasurecodecorpus/ceph-erasure-code-corpus GH_TUPLE+= ceph:ceph-object-corpus:master:cephobjectcorpus/ceph-object-corpus GH_TUPLE+= ceph:civetweb:v1.5-1809-g7f9f5d1:civetweb/src/civetweb GH_TUPLE+= ceph:jerasure:v2-ceph:jerasure/src/erasure-code/jerasure/jerasure GH_TUPLE+= ceph:gf-complete:v3-ceph:gfcomplete/src/erasure-code/jerasure/gf-complete GH_TUPLE+= ceph:googletest:ceph-release-1.7.x:googletest/src/googletest -GH_TUPLE+= ceph:spdk:v1.2.0-39-g9322c25:spdk/src/spdk +GH_TUPLE+= ceph:spdk:v17.03-34-g5742e9b9:spdk/src/spdk GH_TUPLE+= ceph:xxHash:v0.5.1-2-g1f40c65:xxHash/src/xxHash GH_TUPLE+= ceph:isa-l:v2.16.0:isal/src/isa-l -GH_TUPLE+= ceph:lua:lua-5.3-ceph:lua/src/lua +GH_TUPLE+= ceph:lua:5.3.2-2-g1fce39c:lua/src/lua GH_TUPLE+= ceph:Beast:999e2fa:Beast/src/Beast GH_TUPLE+= boostorg:boost:boost-1.61.0-275-g1790aff:boost/src/boost -GH_TUPLE+= ceph:dpdk:a38e5ec:dpd/src/dpd +GH_TUPLE+= ceph:dpdk:v16.11:dpd/src/dpd GH_TUPLE+= facebook:zstd:v1.1.2:zstd/src/zstd +GH_TUPLE+= 01org:isa-l_crypto:603529a:isalcrypto/src/crypto/isa-l/isa-l_crypto CMAKE_BUILD_TYPE= Release CMAKE_ARGS= \ -D ENABLE_GIT_VERSION:BOOL=OFF \ -D WITH_SYSTEM_BOOST:BOOL=ON \ + -D CEPH_MAN_DIR:STRING=man \ -D WITH_LTTNG:BOOL=OFF \ - -D WITH_FUSE:BOOL=OFF \ + -D WITH_FUSE:BOOL=ON \ -D WITH_KRBD:BOOL=OFF \ -D WITH_XFS:BOOL=OFF \ -D WITH_KVS:BOOL=OFF \ @@ -73,11 +74,11 @@ CMAKE_ARGS= \ -D WITH_CEPHFS:BOOL=OFF \ -D WITH_EMBEDDED:BOOL=OFF -USES= gmake gettext-runtime cmake:outsource python:2.7 shebangfix -SHEBANG_FILES= src/rbdmap src/ceph-post-file.in src/rbd-replay-many \ - src/ceph-rest-api src/ceph-create-keys \ - src/brag/client/ceph-brag \ - src/tools/ceph-monstore-update-crush.sh +USES= gmake cmake:outsource python:2.7 fuse gettext-runtime shebangfix +SHEBANG_FILES=src/rbdmap src/ceph-post-file.in src/rbd-replay-many \ + src/brag/client/ceph-brag src/ceph-rest-api \ + src/tools/ceph-monstore-update-crush.sh src/mount.fuse.ceph \ + src/ceph-create-keys # even though i386 will build, it is not really advised. ONLY_FOR_ARCHS= amd64 @@ -96,11 +97,22 @@ post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/ceph ${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-mds ${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-osd + ${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-rgw + ${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-mgr ${MKDIR} ${STAGEDIR}/var/lib/ceph/mds ${MKDIR} ${STAGEDIR}/var/lib/ceph/mon ${MKDIR} ${STAGEDIR}/var/lib/ceph/osd + ${MKDIR} ${STAGEDIR}/var/lib/ceph/mgr ${MKDIR} ${STAGEDIR}/var/lib/ceph/tmp + ${MKDIR} ${STAGEDIR}/var/lib/ceph/radosgw ${MKDIR} ${STAGEDIR}/var/log/ceph + ${MKDIR} ${STAGEDIR}/var/run/ceph + ${CHOWN} -R 167:167 ${STAGEDIR}/var/lib/ceph + ${CHOWN} 167:167 ${STAGEDIR}/var/log/ceph + ${CHOWN} 167:167 ${STAGEDIR}/var/run/ceph + ${CHMOD} -R 750 ${STAGEDIR}/var/lib/ceph + ${CHOWN} 750 ${STAGEDIR}/var/log/ceph + ${CHOWN} 750 ${STAGEDIR}/var/run/ceph # Use the Ceph init.d script as the interface to regular # starting and stopping deamons. rc.d work is done thru # a separate rc.d/ceph script calling init-ceph again. Modified: head/net/ceph-devel/distinfo ============================================================================== --- head/net/ceph-devel/distinfo Wed May 3 09:02:24 2017 (r440006) +++ head/net/ceph-devel/distinfo Wed May 3 09:25:30 2017 (r440007) @@ -1,33 +1,35 @@ -TIMESTAMP = 1489750630 -SHA256 (wjwithagen-ceph-wip.v2017-2-14_GH0.tar.gz) = 5216c970e7c7f38595f3dc61bb4fdf9a999a5926c7e3b8760ce97bcca1155a0e -SIZE (wjwithagen-ceph-wip.v2017-2-14_GH0.tar.gz) = 9473554 -SHA256 (facebook-rocksdb-a0deec9_GH0.tar.gz) = bd3803c476c088b68815d6627a9b81da5e2b6447f3590885434c73534b1df62e -SIZE (facebook-rocksdb-a0deec9_GH0.tar.gz) = 2911761 -SHA256 (ceph-ceph-erasure-code-corpus-b5c8634_GH0.tar.gz) = 2b72364ebfd6ba53b187a4503cf416c7182d83e757bf24a1aa14c642bb9ca9ed -SIZE (ceph-ceph-erasure-code-corpus-b5c8634_GH0.tar.gz) = 3577946 -SHA256 (ceph-ceph-object-corpus-master_GH0.tar.gz) = a10b7e6fae4e91341cffe5565c2ea8e0e960255a5a22050964ef83aa479af234 -SIZE (ceph-ceph-object-corpus-master_GH0.tar.gz) = 1328378 +TIMESTAMP = 1493758988 +SHA256 (wjwithagen-ceph-wip.v2017-05-01_GH0.tar.gz) = 124f21e9b696d65e178107f1fbebd5f91a0136db0c38a13ca6d6d4329c53a45e +SIZE (wjwithagen-ceph-wip.v2017-05-01_GH0.tar.gz) = 10046369 +SHA256 (facebook-rocksdb-2.7.fb-4991-g9f2cc5_GH0.tar.gz) = de92acb5f01d157331c9c978152016c8855049cd361d65e366fc379834265f37 +SIZE (facebook-rocksdb-2.7.fb-4991-g9f2cc5_GH0.tar.gz) = 3270485 +SHA256 (ceph-ceph-erasure-code-corpus-master_GH0.tar.gz) = 0a0129c92c3c1b717c39810833a476e16086b73736f2d2a77af93e3070b79356 +SIZE (ceph-ceph-erasure-code-corpus-master_GH0.tar.gz) = 3515705 +SHA256 (ceph-ceph-object-corpus-master_GH0.tar.gz) = 0f3efedf4a8e05d53fba6cd10ef0961562879cd455abb8dfa38c7196f93a3191 +SIZE (ceph-ceph-object-corpus-master_GH0.tar.gz) = 1328809 SHA256 (ceph-civetweb-v1.5-1809-g7f9f5d1_GH0.tar.gz) = 5d08d3c7b8d09cb055e8e67df4c956e7292efb7ae556e03b6c1f0d9f4fa7fd82 SIZE (ceph-civetweb-v1.5-1809-g7f9f5d1_GH0.tar.gz) = 6850432 -SHA256 (ceph-jerasure-v2-ceph_GH0.tar.gz) = 94421f7249fca91af9076fa4ca38f16829c00a1fd05846cc0e09188ab9421f91 -SIZE (ceph-jerasure-v2-ceph_GH0.tar.gz) = 806304 -SHA256 (ceph-gf-complete-v3-ceph_GH0.tar.gz) = 4ce344235ed0fcb2776dc0fbef55f8753638f1fabd65c9d2f22c8f071fe2e4ac -SIZE (ceph-gf-complete-v3-ceph_GH0.tar.gz) = 342277 +SHA256 (ceph-jerasure-v2-ceph_GH0.tar.gz) = 62c69cf8e2215f1f3b242bc153c2fbb5f3edaf2d0a92b2943310a8c3a6f8030b +SIZE (ceph-jerasure-v2-ceph_GH0.tar.gz) = 806324 +SHA256 (ceph-gf-complete-v3-ceph_GH0.tar.gz) = 064e1ed16d01f21203feaaa0e58697caa667c51de48adddd02b0a95a28369050 +SIZE (ceph-gf-complete-v3-ceph_GH0.tar.gz) = 342297 SHA256 (ceph-googletest-ceph-release-1.7.x_GH0.tar.gz) = 4a70b3a6b1a92ba0f623a560c9d1cdc84b925bd90458e080ebc2c4100225d54e SIZE (ceph-googletest-ceph-release-1.7.x_GH0.tar.gz) = 1281303 -SHA256 (ceph-spdk-v1.2.0-39-g9322c25_GH0.tar.gz) = 0730eb63fbc7d61e213aeb95f4def48525c7ec01fcf36aee1b3cce044e77447d -SIZE (ceph-spdk-v1.2.0-39-g9322c25_GH0.tar.gz) = 162759 +SHA256 (ceph-spdk-v17.03-34-g5742e9b9_GH0.tar.gz) = c7d507c6f92655b872ae67f581c96d660131f3878d586cce800d012229cdc037 +SIZE (ceph-spdk-v17.03-34-g5742e9b9_GH0.tar.gz) = 672123 SHA256 (ceph-xxHash-v0.5.1-2-g1f40c65_GH0.tar.gz) = bd0de02be53b8019f5844776a534439bee0b1f982cb1e8af4fae79f78cfb0924 SIZE (ceph-xxHash-v0.5.1-2-g1f40c65_GH0.tar.gz) = 25494 SHA256 (ceph-isa-l-v2.16.0_GH0.tar.gz) = 6fab1d920db76dc58f43df09020b0e8a1e08e455962dfb4dde111ea697ab8845 SIZE (ceph-isa-l-v2.16.0_GH0.tar.gz) = 364853 -SHA256 (ceph-lua-lua-5.3-ceph_GH0.tar.gz) = 33ce7f79ea3dd1389b48cdcd6d8750fc9977994ea423f4a56f184affad1707be -SIZE (ceph-lua-lua-5.3-ceph_GH0.tar.gz) = 366804 +SHA256 (ceph-lua-5.3.2-2-g1fce39c_GH0.tar.gz) = 1c9701430df18509002b5af05e78d09ac6decb86a974814556a0505991035e2d +SIZE (ceph-lua-5.3.2-2-g1fce39c_GH0.tar.gz) = 366840 SHA256 (ceph-Beast-999e2fa_GH0.tar.gz) = f3ac9a1c891b138e68137c0a1a2b37befa09b53f7e551f6ebb67fa8ed9b792f4 SIZE (ceph-Beast-999e2fa_GH0.tar.gz) = 521462 SHA256 (boostorg-boost-boost-1.61.0-275-g1790aff_GH0.tar.gz) = 22d2d0fcb83044a185ee0c1d009dd9eb43bf340c0d25432df4e889bdd67f2445 SIZE (boostorg-boost-boost-1.61.0-275-g1790aff_GH0.tar.gz) = 1096867 -SHA256 (ceph-dpdk-a38e5ec_GH0.tar.gz) = 2f88c1e6361c99b4525dbc524c0c56cb5a45273028045d966190e73c416a0b24 -SIZE (ceph-dpdk-a38e5ec_GH0.tar.gz) = 16158917 +SHA256 (ceph-dpdk-v16.11_GH0.tar.gz) = cf2ef6faf8cd056abbbebba779b7850eb3f79edd0d91767bcdbc216a2cde4fd1 +SIZE (ceph-dpdk-v16.11_GH0.tar.gz) = 10864287 SHA256 (facebook-zstd-v1.1.2_GH0.tar.gz) = 980b8febb0118e22f6ed70d23b5b3e600995dbf7489c1f6d6122c1411cdda8d8 SIZE (facebook-zstd-v1.1.2_GH0.tar.gz) = 769017 +SHA256 (01org-isa-l_crypto-603529a_GH0.tar.gz) = 52708b98c832bb7e6db60c949ece261d9609c822ae55239b0f2133cec2b3d155 +SIZE (01org-isa-l_crypto-603529a_GH0.tar.gz) = 439149 Modified: head/net/ceph-devel/files/ceph.in ============================================================================== --- head/net/ceph-devel/files/ceph.in Wed May 3 09:02:24 2017 (r440006) +++ head/net/ceph-devel/files/ceph.in Wed May 3 09:25:30 2017 (r440007) @@ -18,37 +18,19 @@ PATH=$PATH:%%PREFIX%%/bin:%%PREFIX%%/sbin name="ceph" -rcvar=ceph_enable +rcvar=${name}_enable extra_commands="condrestart" +load_rc_config ${name} + # read configuration and set defaults : ${ceph_enable="NO"} : ${ceph_configfile:=%%PREFIX%%/etc/ceph/ceph.conf} -start_cmd="cephstart_cmd" -stop_cmd="cephstop_cmd" -restart_cmd="cephrestart_cmd" -condrestart_cmd="cephcondrestart_cmd" - -cephstart_cmd() -{ - %%PREFIX%%/bin/init-ceph start $* -} - -cephstop_cmd() -{ - %%PREFIX%%/bin/init-ceph stop $* -} - -cephrestart_cmd() -{ - %%PREFIX%%/bin/init-ceph restart $* -} - -cephcondrestart_cmd() -{ - %%PREFIX%%/bin/init-ceph condrestart $* -} +start_cmd="%%PREFIX%%/bin/init-ceph $*" +stop_cmd="%%PREFIX%%/bin/init-ceph $*" +restart_cmd="%%PREFIX%%/bin/init-ceph $*" +condrestart_cmd="%%PREFIX%%/bin/init-ceph $*" -run_rc_command "$1" +run_rc_command "$1" "$*" Modified: head/net/ceph-devel/pkg-plist ============================================================================== --- head/net/ceph-devel/pkg-plist Wed May 3 09:02:24 2017 (r440006) +++ head/net/ceph-devel/pkg-plist Wed May 3 09:25:30 2017 (r440007) @@ -8,6 +8,7 @@ bin/ceph-crush-location bin/ceph-debugpack bin/ceph-dencoder bin/ceph-detect-init +bin/ceph-fuse bin/ceph-kvstore-tool bin/ceph-mds bin/ceph-mgr @@ -39,6 +40,7 @@ bin/radosgw-admin bin/radosgw-object-expirer bin/radosgw-token bin/rbd +bin/rbd-fuse bin/rbd-mirror bin/rbd-replay bin/rbd-replay-many @@ -75,6 +77,9 @@ lib/ceph/compressor/libceph_zlib.so.2.0. lib/ceph/compressor/libceph_zstd.so lib/ceph/compressor/libceph_zstd.so.2 lib/ceph/compressor/libceph_zstd.so.2.0.0 +lib/ceph/crypto/libceph_crypto_isal.so +lib/ceph/crypto/libceph_crypto_isal.so.1 +lib/ceph/crypto/libceph_crypto_isal.so.1.0.0 lib/ceph/erasure-code/libec_isa.so lib/ceph/erasure-code/libec_isa.so.2 lib/ceph/erasure-code/libec_isa.so.2.14.0 @@ -88,6 +93,7 @@ lib/ceph/erasure-code/libec_shec_generic lib/ceph/erasure-code/libec_shec_sse3.so lib/ceph/erasure-code/libec_shec_sse4.so lib/ceph/libceph-common.so +lib/ceph/libceph-common.so.0 lib/ceph/mgr/.gitignore lib/ceph/mgr/fsstatus/__init__.py lib/ceph/mgr/fsstatus/module.py @@ -127,7 +133,7 @@ lib/libradosstriper.so.1 lib/libradosstriper.so.1.0.0 lib/librbd.so lib/librbd.so.1 -lib/librbd.so.1.0.0 +lib/librbd.so.1.12.0 lib/librgw.so lib/librgw.so.2 lib/librgw.so.2.0.0 @@ -149,6 +155,8 @@ lib/librgw.so.2.0.0 %%PYTHON_SITELIBDIR%%/ceph_detect_init/centos/__init__.pyc %%PYTHON_SITELIBDIR%%/ceph_detect_init/debian/__init__.py %%PYTHON_SITELIBDIR%%/ceph_detect_init/debian/__init__.pyc +%%PYTHON_SITELIBDIR%%/ceph_detect_init/docker/__init__.py +%%PYTHON_SITELIBDIR%%/ceph_detect_init/docker/__init__.pyc %%PYTHON_SITELIBDIR%%/ceph_detect_init/exc.py %%PYTHON_SITELIBDIR%%/ceph_detect_init/exc.pyc %%PYTHON_SITELIBDIR%%/ceph_detect_init/fedora/__init__.py @@ -159,6 +167,8 @@ lib/librgw.so.2.0.0 %%PYTHON_SITELIBDIR%%/ceph_detect_init/gentoo/__init__.pyc %%PYTHON_SITELIBDIR%%/ceph_detect_init/main.py %%PYTHON_SITELIBDIR%%/ceph_detect_init/main.pyc +%%PYTHON_SITELIBDIR%%/ceph_detect_init/oraclevms/__init__.py +%%PYTHON_SITELIBDIR%%/ceph_detect_init/oraclevms/__init__.pyc %%PYTHON_SITELIBDIR%%/ceph_detect_init/rhel/__init__.py %%PYTHON_SITELIBDIR%%/ceph_detect_init/rhel/__init__.pyc %%PYTHON_SITELIBDIR%%/ceph_detect_init/suse/__init__.py @@ -243,6 +253,7 @@ man/man8/ceph-dencoder.8.gz man/man8/ceph-deploy.8.gz man/man8/ceph-detect-init.8.gz man/man8/ceph-disk.8.gz +man/man8/ceph-fuse.8.gz man/man8/ceph-mds.8.gz man/man8/ceph-mon.8.gz man/man8/ceph-osd.8.gz @@ -260,6 +271,7 @@ man/man8/osdmaptool.8.gz man/man8/rados.8.gz man/man8/radosgw-admin.8.gz man/man8/radosgw.8.gz +man/man8/rbd-fuse.8.gz man/man8/rbd-mirror.8.gz man/man8/rbd-nbd.8.gz man/man8/rbd-replay-many.8.gz @@ -269,15 +281,21 @@ man/man8/rbd.8.gz man/man8/rbdmap.8.gz sbin/ceph-create-keys sbin/ceph-disk +sbin/mount.fuse.ceph %%DATADIR%%/id_rsa_drop.ceph.com %%DATADIR%%/id_rsa_drop.ceph.com.pub %%DATADIR%%/known_hosts_drop.ceph.com @dir /var/lib/ceph/bootstrap-mds @dir /var/lib/ceph/bootstrap-osd +@dir /var/lib/ceph/bootstrap-rgw +@dir /var/lib/ceph/bootstrap-mgr @dir /var/lib/ceph/mds @dir /var/lib/ceph/mon @dir /var/lib/ceph/osd +@dir /var/lib/ceph/mgr @dir /var/lib/ceph/tmp +@dir /var/lib/ceph/radosgw @dir /var/lib/ceph @dir /var/lib @dir /var/log/ceph +@dir /var/run/ceph
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705030925.v439PUOG072932>