mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2025-04-06 17:49:11 +03:00
Replace libexecdir with datadir
According to the FHS. Testing scripts and examples which are all architecture independent should be installed in a subdirectory under /usr/share. http://www.pathname.com/fhs/2.2/fhs-4.11.html Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
This commit is contained in:
parent
0b4d1b5853
commit
48c028f5a5
@ -14,7 +14,6 @@ build() {
|
|||||||
./configure --with-config=user \
|
./configure --with-config=user \
|
||||||
--prefix=/ \
|
--prefix=/ \
|
||||||
--sysconfdir=/etc \
|
--sysconfdir=/etc \
|
||||||
--libexecdir=/usr/libexec \
|
|
||||||
--datadir=/usr/share \
|
--datadir=/usr/share \
|
||||||
--includedir=/usr/include \
|
--includedir=/usr/include \
|
||||||
--with-udevdir=/lib/udev
|
--with-udevdir=/lib/udev
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
SUBDIRS = zpool-config zpios-test zpios-profile
|
SUBDIRS = zpool-config zpios-test zpios-profile
|
||||||
|
|
||||||
pkglibexecdir = $(libexecdir)/@PACKAGE@
|
dist_pkgdata_SCRIPTS = \
|
||||||
dist_pkglibexec_SCRIPTS = \
|
|
||||||
$(top_builddir)/scripts/common.sh \
|
$(top_builddir)/scripts/common.sh \
|
||||||
$(top_srcdir)/scripts/zconfig.sh \
|
$(top_srcdir)/scripts/zconfig.sh \
|
||||||
$(top_srcdir)/scripts/zfault.sh \
|
$(top_srcdir)/scripts/zfault.sh \
|
||||||
@ -18,24 +17,6 @@ ZFAULT=$(top_builddir)/scripts/zfault.sh
|
|||||||
ZTEST=$(top_builddir)/cmd/ztest/ztest
|
ZTEST=$(top_builddir)/cmd/ztest/ztest
|
||||||
ZPIOS_SANITY=$(top_builddir)/scripts/zpios-sanity.sh
|
ZPIOS_SANITY=$(top_builddir)/scripts/zpios-sanity.sh
|
||||||
|
|
||||||
all:
|
|
||||||
@list='$(dist_pkglibexec_SCRIPTS)'; \
|
|
||||||
for file in $$list; do \
|
|
||||||
link=$$(basename $$file); \
|
|
||||||
if [ ! -e $$link ]; then \
|
|
||||||
$(LN_S) $$file $$link; \
|
|
||||||
fi \
|
|
||||||
done
|
|
||||||
|
|
||||||
clean:
|
|
||||||
@list='$(dist_pkglibexec_SCRIPTS)'; \
|
|
||||||
for file in $$list; do \
|
|
||||||
link=$$(basename $$file); \
|
|
||||||
if [ -L $$link ]; then \
|
|
||||||
$(RM) $$link; \
|
|
||||||
fi \
|
|
||||||
done
|
|
||||||
|
|
||||||
check:
|
check:
|
||||||
@$(ZFS) -u
|
@$(ZFS) -u
|
||||||
@echo
|
@echo
|
||||||
|
@ -32,8 +32,7 @@ TESTS_SKIP=${TESTS_SKIP:-}
|
|||||||
|
|
||||||
prefix=@prefix@
|
prefix=@prefix@
|
||||||
exec_prefix=@exec_prefix@
|
exec_prefix=@exec_prefix@
|
||||||
libexecdir=@libexecdir@
|
pkgdatadir=@datarootdir@/@PACKAGE@
|
||||||
pkglibexecdir=${libexecdir}/@PACKAGE@
|
|
||||||
bindir=@bindir@
|
bindir=@bindir@
|
||||||
sbindir=@sbindir@
|
sbindir=@sbindir@
|
||||||
udevdir=@udevdir@
|
udevdir=@udevdir@
|
||||||
@ -42,9 +41,9 @@ sysconfdir=@sysconfdir@
|
|||||||
|
|
||||||
ETCDIR=${ETCDIR:-/etc}
|
ETCDIR=${ETCDIR:-/etc}
|
||||||
DEVDIR=${DEVDIR:-/dev/disk/by-vdev}
|
DEVDIR=${DEVDIR:-/dev/disk/by-vdev}
|
||||||
ZPOOLDIR=${ZPOOLDIR:-${pkglibexecdir}/zpool-config}
|
ZPOOLDIR=${ZPOOLDIR:-${pkgdatadir}/zpool-config}
|
||||||
ZPIOSDIR=${ZPIOSDIR:-${pkglibexecdir}/zpios-test}
|
ZPIOSDIR=${ZPIOSDIR:-${pkgdatadir}/zpios-test}
|
||||||
ZPIOSPROFILEDIR=${ZPIOSPROFILEDIR:-${pkglibexecdir}/zpios-profile}
|
ZPIOSPROFILEDIR=${ZPIOSPROFILEDIR:-${pkgdatadir}/zpios-profile}
|
||||||
|
|
||||||
ZDB=${ZDB:-${sbindir}/zdb}
|
ZDB=${ZDB:-${sbindir}/zdb}
|
||||||
ZFS=${ZFS:-${sbindir}/zfs}
|
ZFS=${ZFS:-${sbindir}/zfs}
|
||||||
@ -53,11 +52,11 @@ ZPOOL=${ZPOOL:-${sbindir}/zpool}
|
|||||||
ZTEST=${ZTEST:-${sbindir}/ztest}
|
ZTEST=${ZTEST:-${sbindir}/ztest}
|
||||||
ZPIOS=${ZPIOS:-${sbindir}/zpios}
|
ZPIOS=${ZPIOS:-${sbindir}/zpios}
|
||||||
|
|
||||||
COMMON_SH=${COMMON_SH:-${pkglibexecdir}/common.sh}
|
COMMON_SH=${COMMON_SH:-${pkgdatadir}/common.sh}
|
||||||
ZFS_SH=${ZFS_SH:-${pkglibexecdir}/zfs.sh}
|
ZFS_SH=${ZFS_SH:-${pkgdatadir}/zfs.sh}
|
||||||
ZPOOL_CREATE_SH=${ZPOOL_CREATE_SH:-${pkglibexecdir}/zpool-create.sh}
|
ZPOOL_CREATE_SH=${ZPOOL_CREATE_SH:-${pkgdatadir}/zpool-create.sh}
|
||||||
ZPIOS_SH=${ZPIOS_SH:-${pkglibexecdir}/zpios.sh}
|
ZPIOS_SH=${ZPIOS_SH:-${pkgdatadir}/zpios.sh}
|
||||||
ZPIOS_SURVEY_SH=${ZPIOS_SURVEY_SH:-${pkglibexecdir}/zpios-survey.sh}
|
ZPIOS_SURVEY_SH=${ZPIOS_SURVEY_SH:-${pkgdatadir}/zpios-survey.sh}
|
||||||
|
|
||||||
LDMOD=${LDMOD:-/sbin/modprobe}
|
LDMOD=${LDMOD:-/sbin/modprobe}
|
||||||
LSMOD=${LSMOD:-/sbin/lsmod}
|
LSMOD=${LSMOD:-/sbin/lsmod}
|
||||||
|
@ -1,25 +1,7 @@
|
|||||||
pkglibexecdir = $(libexecdir)/@PACKAGE@/zpios-profile
|
pkgdataprofiledir = $(pkgdatadir)/zpios-profile
|
||||||
dist_pkglibexec_SCRIPTS = \
|
dist_pkgdataprofile_SCRIPTS = \
|
||||||
$(top_srcdir)/scripts/zpios-profile/zpios-profile-disk.sh \
|
$(top_srcdir)/scripts/zpios-profile/zpios-profile-disk.sh \
|
||||||
$(top_srcdir)/scripts/zpios-profile/zpios-profile-pids.sh \
|
$(top_srcdir)/scripts/zpios-profile/zpios-profile-pids.sh \
|
||||||
$(top_srcdir)/scripts/zpios-profile/zpios-profile-post.sh \
|
$(top_srcdir)/scripts/zpios-profile/zpios-profile-post.sh \
|
||||||
$(top_srcdir)/scripts/zpios-profile/zpios-profile-pre.sh \
|
$(top_srcdir)/scripts/zpios-profile/zpios-profile-pre.sh \
|
||||||
$(top_srcdir)/scripts/zpios-profile/zpios-profile.sh
|
$(top_srcdir)/scripts/zpios-profile/zpios-profile.sh
|
||||||
|
|
||||||
all:
|
|
||||||
@list='$(dist_pkglibexec_SCRIPTS)'; \
|
|
||||||
for file in $$list; do \
|
|
||||||
link=$$(basename $$file); \
|
|
||||||
if [ ! -e $$link ]; then \
|
|
||||||
$(LN_S) $$file $$link; \
|
|
||||||
fi \
|
|
||||||
done
|
|
||||||
|
|
||||||
clean:
|
|
||||||
@list='$(dist_pkglibexec_SCRIPTS)'; \
|
|
||||||
for file in $$list; do \
|
|
||||||
link=$$(basename $$file); \
|
|
||||||
if [ -L $$link ]; then \
|
|
||||||
$(RM) $$link; \
|
|
||||||
fi \
|
|
||||||
done
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
pkglibexecdir = $(libexecdir)/@PACKAGE@/zpios-test
|
pkgdatatestdir = $(pkgdatadir)/zpios-test
|
||||||
dist_pkglibexec_SCRIPTS = \
|
dist_pkgdatatest_SCRIPTS = \
|
||||||
$(top_srcdir)/scripts/zpios-test/16th-8192rc-4rs-1cs-4off.sh \
|
$(top_srcdir)/scripts/zpios-test/16th-8192rc-4rs-1cs-4off.sh \
|
||||||
$(top_srcdir)/scripts/zpios-test/1th-16rc-4rs-1cs-4off.sh \
|
$(top_srcdir)/scripts/zpios-test/1th-16rc-4rs-1cs-4off.sh \
|
||||||
$(top_srcdir)/scripts/zpios-test/1x256th-65536rc-4rs-1cs-4off.sh \
|
$(top_srcdir)/scripts/zpios-test/1x256th-65536rc-4rs-1cs-4off.sh \
|
||||||
@ -11,21 +11,3 @@ dist_pkglibexec_SCRIPTS = \
|
|||||||
$(top_srcdir)/scripts/zpios-test/small.sh \
|
$(top_srcdir)/scripts/zpios-test/small.sh \
|
||||||
$(top_srcdir)/scripts/zpios-test/tiny.sh \
|
$(top_srcdir)/scripts/zpios-test/tiny.sh \
|
||||||
$(top_srcdir)/scripts/zpios-test/lustre.sh
|
$(top_srcdir)/scripts/zpios-test/lustre.sh
|
||||||
|
|
||||||
all:
|
|
||||||
@list='$(dist_pkglibexec_SCRIPTS)'; \
|
|
||||||
for file in $$list; do \
|
|
||||||
link=$$(basename $$file); \
|
|
||||||
if [ ! -e $$link ]; then \
|
|
||||||
$(LN_S) $$file $$link; \
|
|
||||||
fi \
|
|
||||||
done
|
|
||||||
|
|
||||||
clean:
|
|
||||||
@list='$(dist_pkglibexec_SCRIPTS)'; \
|
|
||||||
for file in $$list; do \
|
|
||||||
link=$$(basename $$file); \
|
|
||||||
if [ -L $$link ]; then \
|
|
||||||
$(RM) $$link; \
|
|
||||||
fi \
|
|
||||||
done
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
pkglibexecdir = $(libexecdir)/@PACKAGE@/zpool-config
|
pkgdataconfigdir = $(pkgdatadir)/zpool-config
|
||||||
dist_pkglibexec_SCRIPTS = \
|
dist_pkgdataconfig_SCRIPTS = \
|
||||||
$(top_srcdir)/scripts/zpool-config/dm0-raid0.sh \
|
$(top_srcdir)/scripts/zpool-config/dm0-raid0.sh \
|
||||||
$(top_srcdir)/scripts/zpool-config/file-raid0.sh \
|
$(top_srcdir)/scripts/zpool-config/file-raid0.sh \
|
||||||
$(top_srcdir)/scripts/zpool-config/file-raid10.sh \
|
$(top_srcdir)/scripts/zpool-config/file-raid10.sh \
|
||||||
@ -28,21 +28,3 @@ dist_pkglibexec_SCRIPTS = \
|
|||||||
$(top_srcdir)/scripts/zpool-config/zpool-raid0.sh \
|
$(top_srcdir)/scripts/zpool-config/zpool-raid0.sh \
|
||||||
$(top_srcdir)/scripts/zpool-config/zpool-raid10.sh \
|
$(top_srcdir)/scripts/zpool-config/zpool-raid10.sh \
|
||||||
$(top_srcdir)/scripts/zpool-config/zpool-raidz.sh
|
$(top_srcdir)/scripts/zpool-config/zpool-raidz.sh
|
||||||
|
|
||||||
all:
|
|
||||||
@list='$(dist_pkglibexec_SCRIPTS)'; \
|
|
||||||
for file in $$list; do \
|
|
||||||
link=$$(basename $$file); \
|
|
||||||
if [ ! -e $$link ]; then \
|
|
||||||
$(LN_S) $$file $$link; \
|
|
||||||
fi \
|
|
||||||
done
|
|
||||||
|
|
||||||
clean:
|
|
||||||
@list='$(dist_pkglibexec_SCRIPTS)'; \
|
|
||||||
for file in $$list; do \
|
|
||||||
link=$$(basename $$file); \
|
|
||||||
if [ -L $$link ]; then \
|
|
||||||
$(RM) $$link; \
|
|
||||||
fi \
|
|
||||||
done
|
|
||||||
|
@ -90,7 +90,7 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
%files test
|
%files test
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%{_libexecdir}/@PACKAGE@/*
|
%{_datadir}/@PACKAGE@/*
|
||||||
|
|
||||||
%files dracut
|
%files dracut
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
|
Loading…
Reference in New Issue
Block a user