From patchwork Wed Dec 21 22:08:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarod Wilson X-Patchwork-Id: 9483843 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 08066601D4 for ; Wed, 21 Dec 2016 22:08:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EF4EB28497 for ; Wed, 21 Dec 2016 22:08:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E44012849B; Wed, 21 Dec 2016 22:08:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9D38D28497 for ; Wed, 21 Dec 2016 22:08:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750745AbcLUWIw (ORCPT ); Wed, 21 Dec 2016 17:08:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57458 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754288AbcLUWIt (ORCPT ); Wed, 21 Dec 2016 17:08:49 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 42D6EC010956 for ; Wed, 21 Dec 2016 22:08:49 +0000 (UTC) Received: from hp-dl360pgen8-07.khw.lab.eng.bos.redhat.com (hp-dl360pgen8-07.khw.lab.eng.bos.redhat.com [10.16.184.47]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uBLM8kqp029937; Wed, 21 Dec 2016 17:08:48 -0500 From: Jarod Wilson To: linux-rdma@vger.kernel.org Cc: Jarod Wilson Subject: [PATCH rdma-core 4/6] redhat/spec: fix up %post scriptlets Date: Wed, 21 Dec 2016 17:08:38 -0500 Message-Id: <20161221220840.36268-5-jarod@redhat.com> In-Reply-To: <20161221220840.36268-1-jarod@redhat.com> References: <20161221220840.36268-1-jarod@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 21 Dec 2016 22:08:49 +0000 (UTC) Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The split packaging spec is missing systemd restart bits for ibacm and iwpmd, and has incorrect ldconfig calls. The base package has no libs in it, that should have been on the libibverbs sub-package, and the other lib sub-packages need one as well. Signed-off-by: Jarod Wilson --- redhat/rdma-core.spec | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/redhat/rdma-core.spec b/redhat/rdma-core.spec index 42d624b..1f51720 100644 --- a/redhat/rdma-core.spec +++ b/redhat/rdma-core.spec @@ -267,20 +267,45 @@ install -D -m0644 redhat/srp_daemon.service %{buildroot}%{_unitdir}/ # Delete the package's init.d scripts rm -rf %{buildroot}/%{_initrddir}/ -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +# libibverbs +%post -n libibverbs -p /sbin/ldconfig +%postun -n libibverbs -p /sbin/ldconfig +# libibcm +%post -n libibcm -p /sbin/ldconfig +%postun -n libibcm -p /sbin/ldconfig + +# libibumad +%post -n libibumad -p /sbin/ldconfig +%postun -n libibumad -p /sbin/ldconfig + +# librdmacm +%post -n librdmacm -p /sbin/ldconfig +%postun -n librdmacm -p /sbin/ldconfig + +# ibacm %post -n ibacm %systemd_post ibacm.service - %preun -n ibacm %systemd_preun ibacm.service - %postun -n ibacm %systemd_postun_with_restart ibacm.service -%post -n libibcm -p /sbin/ldconfig -%postun -n libibcm -p /sbin/ldconfig +# srp_daemon +%post -n srp_daemon +%systemd_post srp_daemon.service +%preun -n srp_daemon +%systemd_preun srp_daemon.service +%postun -n srp_daemon +%systemd_postun_with_restart srp_daemon.service + +# iwpmd +%post -n iwpmd +%systemd_post iwpmd.service +%preun -n iwpmd +%systemd_preun iwpmd.service +%postun -n iwpmd +%systemd_postun_with_restart iwpmd.service %files %dir %{_sysconfdir}/rdma