Accepting request 890939 from home:gary_lin:branches:Base:System
set the rpm macro directory at build time (boo#1185663) OBS-URL: https://build.opensuse.org/request/show/890939 OBS-URL: https://build.opensuse.org/package/show/Base:System/pesign?expand=0&rev=58
This commit is contained in:
parent
a6fc646b97
commit
a886b9fdba
27
pesign-boo1185663-set-rpmmacrodir.patch
Normal file
27
pesign-boo1185663-set-rpmmacrodir.patch
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
diff --git a/Make.defaults b/Make.defaults
|
||||||
|
index 2d18005..7ecba00 100644
|
||||||
|
--- a/Make.defaults
|
||||||
|
+++ b/Make.defaults
|
||||||
|
@@ -11,6 +11,7 @@ includedir ?= $(prefix)include/
|
||||||
|
bindir ?= $(prefix)bin/
|
||||||
|
pcdir ?= $(libdir)pkgconfig/
|
||||||
|
docdir ?= $(prefix)share/doc/
|
||||||
|
+rpmmacrodir ?= /etc/rpm/
|
||||||
|
DESTDIR ?=
|
||||||
|
INSTALLROOT = $(DESTDIR)
|
||||||
|
|
||||||
|
diff --git a/src/Makefile b/src/Makefile
|
||||||
|
index 5fb2841..ca546a3 100644
|
||||||
|
--- a/src/Makefile
|
||||||
|
+++ b/src/Makefile
|
||||||
|
@@ -90,8 +90,8 @@ install :
|
||||||
|
$(INSTALL) -m 644 pesigcheck.1 $(INSTALLROOT)$(mandir)man1/
|
||||||
|
$(INSTALL) -m 644 authvar.1 $(INSTALLROOT)$(mandir)man1/
|
||||||
|
$(INSTALL) -m 644 efisiglist.1 $(INSTALLROOT)$(mandir)man1/
|
||||||
|
- $(INSTALL) -d -m 755 $(INSTALLROOT)/etc/rpm/
|
||||||
|
- $(INSTALL) -m 644 macros.pesign $(INSTALLROOT)/etc/rpm/
|
||||||
|
+ $(INSTALL) -d -m 755 $(INSTALLROOT)$(rpmmacrodir)
|
||||||
|
+ $(INSTALL) -m 644 macros.pesign $(INSTALLROOT)$(rpmmacrodir)
|
||||||
|
$(INSTALL) -d -m 755 $(INSTALLROOT)$(libexecdir)/pesign/
|
||||||
|
$(INSTALL) -m 750 pesign-authorize $(INSTALLROOT)$(libexecdir)/pesign/
|
||||||
|
$(INSTALL) -d -m 700 $(INSTALLROOT)/etc/pesign
|
@ -1,3 +1,12 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu May 6 09:22:38 UTC 2021 - Gary Ching-Pang Lin <glin@suse.com>
|
||||||
|
|
||||||
|
- Add pesign-boo1185663-set-rpmmacrodir.patch to set the rpm macro
|
||||||
|
directory at build time (boo#1185663)
|
||||||
|
+ Also set rpmmacrodir when installing files
|
||||||
|
- Remove "make install" since "make install_systemd" invokes
|
||||||
|
"make install" automatically
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue May 5 12:42:15 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
|
Tue May 5 12:42:15 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||||
|
|
||||||
|
15
pesign.spec
15
pesign.spec
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package pesign
|
# spec file for package pesign
|
||||||
#
|
#
|
||||||
# Copyright (c) 2020 SUSE LLC
|
# Copyright (c) 2021 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -38,6 +38,8 @@ Patch5: pesign-efikeygen-Fix-the-build-with-nss-3.44.patch
|
|||||||
Patch6: pesign-boo1143063-remove-var-tracking.patch
|
Patch6: pesign-boo1143063-remove-var-tracking.patch
|
||||||
# PATCH-FIX-UPSTREAM pesign-boo1158197-fix-pesigncheck-gcc10.patch glin@suse.com -- boo#1158197 Fix the gcc10 errors
|
# PATCH-FIX-UPSTREAM pesign-boo1158197-fix-pesigncheck-gcc10.patch glin@suse.com -- boo#1158197 Fix the gcc10 errors
|
||||||
Patch7: pesign-boo1158197-fix-pesigncheck-gcc10.patch
|
Patch7: pesign-boo1158197-fix-pesigncheck-gcc10.patch
|
||||||
|
# PATCH-FIX-UPSTREAM pesign-boo1185663-set-rpmmacrodir.patch boo#1185663 glin@suse.com -- Set the rpm macro directory at build time
|
||||||
|
Patch8: pesign-boo1185663-set-rpmmacrodir.patch
|
||||||
BuildRequires: efivar-devel
|
BuildRequires: efivar-devel
|
||||||
BuildRequires: libuuid-devel
|
BuildRequires: libuuid-devel
|
||||||
BuildRequires: mozilla-nss-devel
|
BuildRequires: mozilla-nss-devel
|
||||||
@ -61,16 +63,19 @@ with the PE and Authenticode specifications.
|
|||||||
%patch5 -p1
|
%patch5 -p1
|
||||||
%patch6 -p1
|
%patch6 -p1
|
||||||
%patch7 -p1
|
%patch7 -p1
|
||||||
|
%patch8 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
make %{?_smp_mflags} CFLAGS="%{optflags}"
|
make %{?_smp_mflags} CFLAGS="%{optflags}"
|
||||||
|
|
||||||
%install
|
%install
|
||||||
make INSTALLROOT=%{buildroot} libexecdir=%{_libexecdir} install
|
|
||||||
mkdir -p %{buildroot}%{_localstatedir}/lib/pesign
|
mkdir -p %{buildroot}%{_localstatedir}/lib/pesign
|
||||||
|
|
||||||
mkdir -p %{buildroot}%{_sbindir}
|
mkdir -p %{buildroot}%{_sbindir}
|
||||||
make INSTALLROOT=%{buildroot} UNITDIR=%{_unitdir} libexecdir=%{_libexecdir} install_systemd
|
make INSTALLROOT=%{buildroot} \
|
||||||
|
UNITDIR=%{_unitdir} \
|
||||||
|
libexecdir=%{_libexecdir} \
|
||||||
|
rpmmacrodir=%{_rpmmacrodir} \
|
||||||
|
install_systemd
|
||||||
|
|
||||||
# create rcsymlink
|
# create rcsymlink
|
||||||
ln -sv %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
|
ln -sv %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
|
||||||
@ -109,7 +114,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/pesign.conf || :
|
|||||||
%dir %{_sysconfdir}/popt.d
|
%dir %{_sysconfdir}/popt.d
|
||||||
%config %{_sysconfdir}/popt.d/pesign.popt
|
%config %{_sysconfdir}/popt.d/pesign.popt
|
||||||
%{_sysconfdir}/pki/
|
%{_sysconfdir}/pki/
|
||||||
%config %{_sysconfdir}/rpm/macros.pesign
|
%config %{_rpmmacrodir}/macros.pesign
|
||||||
%{_mandir}/man?/*
|
%{_mandir}/man?/*
|
||||||
%{_localstatedir}/lib/pesign
|
%{_localstatedir}/lib/pesign
|
||||||
%{_unitdir}/pesign.service
|
%{_unitdir}/pesign.service
|
||||||
|
Loading…
Reference in New Issue
Block a user