From f9631e2252fd2c6954683ecb23f3156964e59188 Mon Sep 17 00:00:00 2001 From: Aurelien Larcher <aurelien.larcher@gmail.com> Date: Sat, 16 Jul 2022 01:10:06 +0200 Subject: [PATCH] libqb: fix build, drop 32-bit --- components/cluster/libqb/libqb.p5m | 21 +++++++-------------- 1 files changed, 7 insertions(+), 14 deletions(-) diff --git a/components/cluster/libqb/libqb.p5m b/components/cluster/libqb/libqb.p5m index aa0d0a4..41ad16f 100644 --- a/components/cluster/libqb/libqb.p5m +++ b/components/cluster/libqb/libqb.p5m @@ -1,10 +1,11 @@ # # This file and its contents are supplied under the terms of the -# Common Development and Distribution License ("CDDL)". You may -# only use this file in accordance with the terms of the CDDL. +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. # # A full copy of the text of the CDDL should have accompanied this -# source. A copy of the CDDL is also available via the Internet at +# source. A copy of the CDDL is also available via the Internet at # http://www.illumos.org/license/CDDL. # @@ -13,13 +14,12 @@ # Copyright 2019 Andreas Grueninger, Grueninger GmbH, (grueni) # -<transform file path=usr/share/man/man1m/(.+).1m$ -> set action.hash usr/share/man/man8/%<1>.8 > - set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.human-version value=$(HUMAN_VERSION) set name=pkg.summary value="$(COMPONENT_SUMMARY)" set name=info.classification value="$(COMPONENT_CLASSIFICATION)" -set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) +set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) set name=org.opensolaris.consolidation value=$(CONSOLIDATION) license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)' @@ -39,16 +39,10 @@ file path=usr/include/qb/qbrb.h file path=usr/include/qb/qbutil.h -link path=usr/lib/libqb.so target=libqb.so.0.19.2 -link path=usr/lib/libqb.so.0 target=libqb.so.0.19.2 -file path=usr/lib/libqb.so.0.19.2 -file path=usr/lib/pkgconfig/libqb.pc link path=usr/lib/$(MACH64)/libqb.so target=libqb.so.0.19.2 link path=usr/lib/$(MACH64)/libqb.so.0 target=libqb.so.0.19.2 file path=usr/lib/$(MACH64)/libqb.so.0.19.2 file path=usr/lib/$(MACH64)/pkgconfig/libqb.pc - -file usr/sbin/$(MACH64)/qb-blackbox path=usr/sbin/qb-blackbox file path=usr/share/doc/libqb/COPYING file path=usr/share/doc/libqb/INSTALL @@ -66,5 +60,4 @@ file path=usr/share/man/man3/qbmap.h.3 file path=usr/share/man/man3/qbrb.h.3 file path=usr/share/man/man3/qbutil.h.3 -file path=usr/share/man/man1m/qb-blackbox.1m - +file path=usr/share/man/man8/qb-blackbox.8 -- Gitblit v1.9.3