c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-11-18 02:20:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

install path fixes

Browse Source 
* rpm: correct pkgconfig path

pkconfig files get installed to $datarootdir/pkgconfig but rpm expects
them to be at $datadir. This works when $datarootdir==$datadir which is
the case most of the time but will fail when they differ.

* install: make initramfs-tools path static

Since initramfs-tools' path is nothing we can control as it is an
external package it does not make any sense to install zfs additions
anywhere else. Simply use /usr/share/initramfs-tools as path.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Richard Laager <rlaager@wiktel.com>
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
Closes #9087
This commit is contained in:
Michael Niewöhner 2019-07-30 19:06:09 +02:00 committed by Tony Hutter
parent 66c8b2f65a
commit cc8df1f117
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/initramfs/Makefile.am
View File

@ -1,4 +1,4 @@
initrddir = $(datarootdir)/initramfs-tools initrddir = /usr/share/initramfs-tools
initrd_SCRIPTS = \ initrd_SCRIPTS = \
conf.d/zfs conf-hooks.d/zfs hooks/zfs scripts/zfs scripts/local-top/zfs conf.d/zfs conf-hooks.d/zfs hooks/zfs scripts/zfs scripts/local-top/zfs

2
contrib/initramfs/hooks/Makefile.am
View File

@ -1,4 +1,4 @@
hooksdir = $(datarootdir)/initramfs-tools/hooks hooksdir = /usr/share/initramfs-tools/hooks
hooks_SCRIPTS = \ hooks_SCRIPTS = \
zfs zfs

2
contrib/initramfs/scripts/Makefile.am
View File

@ -1,4 +1,4 @@
scriptsdir = $(datarootdir)/initramfs-tools/scripts scriptsdir = /usr/share/initramfs-tools/scripts
scripts_DATA = \ scripts_DATA = \
zfs zfs

2
contrib/initramfs/scripts/local-top/Makefile.am
View File

@ -1,3 +1,3 @@
localtopdir = $(datarootdir)/initramfs-tools/scripts/local-top localtopdir = /usr/share/initramfs-tools/scripts/local-top
EXTRA_DIST = zfs EXTRA_DIST = zfs

4
rpm/generic/zfs.spec.in
View File

@ -458,8 +458,8 @@ systemctl --system daemon-reload >/dev/null || true
%{_libdir}/libzfs*.so.* %{_libdir}/libzfs*.so.*
%files -n libzfs2-devel %files -n libzfs2-devel
%{_datadir}/pkgconfig/libzfs.pc %{_datarootdir}/pkgconfig/libzfs.pc
%{_datadir}/pkgconfig/libzfs_core.pc %{_datarootdir}/pkgconfig/libzfs_core.pc
%{_libdir}/*.so %{_libdir}/*.so
%{_includedir}/* %{_includedir}/*
%doc AUTHORS COPYRIGHT LICENSE NOTICE README.md %doc AUTHORS COPYRIGHT LICENSE NOTICE README.md