From patchwork Wed Feb 12 12:47:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Oliva X-Patchwork-Id: 3637931 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6C665BF13A for ; Wed, 12 Feb 2014 12:48:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6C1B02018E for ; Wed, 12 Feb 2014 12:48:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0203920165 for ; Wed, 12 Feb 2014 12:48:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751838AbaBLMsM (ORCPT ); Wed, 12 Feb 2014 07:48:12 -0500 Received: from linux-libre.fsfla.org ([208.118.235.54]:48139 "EHLO linux-libre.fsfla.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751557AbaBLMsL (ORCPT ); Wed, 12 Feb 2014 07:48:11 -0500 Received: from freie (home.lxoliva.fsfla.org [172.31.160.22]) by linux-libre.fsfla.org (8.14.4/8.14.4/Debian-2ubuntu2) with ESMTP id s1CCm62d010316 for ; Wed, 12 Feb 2014 12:48:07 GMT Received: from livre.home (livre.home [172.31.160.2]) by freie (8.14.7/8.14.7) with ESMTP id s1CClpTK023804; Wed, 12 Feb 2014 10:47:51 -0200 From: Alexandre Oliva To: ceph-devel@vger.kernel.org Subject: Fixes for missing and doubly-packaged files in ceph.spec Organization: Free thinker, not speaking for the GNU Project Date: Wed, 12 Feb 2014 10:47:51 -0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) MIME-Version: 1.0 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In order to upgrade my servers to the Fedora-based Hatrack 20, I had to roll out my own rpms, because there aren't Fedora 20 builds at ceph.com. This revealed some errors in the ceph spec file, that caused errors because some ceph_test files were not packaged at all, and warnings because some fileswithin libdir/ceph were packaged twice. I added the ceph_test binaries and avoided the double packaging of libdir/ceph/erasure stuff by marking libdir/ceph with %dir. This in turn left ceph_common.sh out, because it had only been covered by the recursive packaging of libdir/ceph, so I put it in explicitly. Signed-off-by: Alexandre Oliva --- ceph.spec.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ceph.spec.in b/ceph.spec.in index fb599fa..82eb102 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -416,7 +416,8 @@ fi %{_sbindir}/rcceph /sbin/mkcephfs /sbin/mount.ceph -%{_libdir}/ceph +%dir %{_libdir}/ceph +%{_libdir}/ceph/ceph_common.sh %dir %{_libdir}/rados-classes %{_libdir}/rados-classes/libcls_rbd.so* %{_libdir}/rados-classes/libcls_hello.so* @@ -630,6 +631,7 @@ fi %{_bindir}/ceph_filestore_dump %{_bindir}/ceph_filestore_tool %{_bindir}/ceph_streamtest +%{_bindir}/ceph_test_c_headers %{_bindir}/ceph_test_cfuse_cache_invalidate %{_bindir}/ceph_test_cls_hello %{_bindir}/ceph_test_cls_lock @@ -649,6 +651,7 @@ fi %{_bindir}/ceph_test_filestore_idempotent %{_bindir}/ceph_test_filestore_idempotent_sequence %{_bindir}/ceph_test_filestore_workloadgen +%{_bindir}/ceph_test_get_blkdev_size %{_bindir}/ceph_test_ioctls %{_bindir}/ceph_test_keyvaluedb_atomicity %{_bindir}/ceph_test_keyvaluedb_iterators