From 860cbec815d61db2d82870290652a3bc7471b8e3 Mon Sep 17 00:00:00 2001 From: Michael Meffie Date: Tue, 1 Oct 2019 16:16:16 -0400 Subject: [PATCH] RedHat: package rxstat_* programs Install libadmin rxstat_* sample programs with 'make install'/'make dest'. Include these programs in the openafs rpm package. Change-Id: I81b965cf440c869072cce0065a3c74c4c699b8b8 Reviewed-on: https://gerrit.openafs.org/13883 Tested-by: BuildBot Reviewed-by: Benjamin Kaduk --- src/libadmin/samples/Makefile.in | 30 +++++++++++++++++++++++++++--- src/packaging/RedHat/openafs.spec.in | 11 +++++++++++ 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/src/libadmin/samples/Makefile.in b/src/libadmin/samples/Makefile.in index 94444e8..765d55c 100644 --- a/src/libadmin/samples/Makefile.in +++ b/src/libadmin/samples/Makefile.in @@ -141,9 +141,33 @@ CFLAGS_rxstat_query_peer.o = @CFLAGS_NOERROR@ CFLAGS_rxstat_query_process.o = @CFLAGS_NOERROR@ ####################################################################### -install: - -dest: +install: all + ${INSTALL} -d ${DESTDIR}${sbindir} + ${INSTALL_PROGRAM} rxstat_clear_peer ${DESTDIR}${sbindir}/rxstat_clear_peer + ${INSTALL_PROGRAM} rxstat_clear_process ${DESTDIR}${sbindir}/rxstat_clear_process + ${INSTALL_PROGRAM} rxstat_disable_peer ${DESTDIR}${sbindir}/rxstat_disable_peer + ${INSTALL_PROGRAM} rxstat_disable_process ${DESTDIR}${sbindir}/rxstat_disable_process + ${INSTALL_PROGRAM} rxstat_enable_peer ${DESTDIR}${sbindir}/rxstat_enable_peer + ${INSTALL_PROGRAM} rxstat_enable_process ${DESTDIR}${sbindir}/rxstat_enable_process + ${INSTALL_PROGRAM} rxstat_get_peer ${DESTDIR}${sbindir}/rxstat_get_peer + ${INSTALL_PROGRAM} rxstat_get_process ${DESTDIR}${sbindir}/rxstat_get_process + ${INSTALL_PROGRAM} rxstat_get_version ${DESTDIR}${sbindir}/rxstat_get_version + ${INSTALL_PROGRAM} rxstat_query_peer ${DESTDIR}${sbindir}/rxstat_query_peer + ${INSTALL_PROGRAM} rxstat_query_process ${DESTDIR}${sbindir}/rxstat_query_process + +dest: all + ${INSTALL} -d ${DEST}/etc + ${INSTALL_PROGRAM} rxstat_clear_peer ${DEST}/etc/rxstat_clear_peer + ${INSTALL_PROGRAM} rxstat_clear_process ${DEST}/etc/rxstat_clear_process + ${INSTALL_PROGRAM} rxstat_disable_peer ${DEST}/etc/rxstat_disable_peer + ${INSTALL_PROGRAM} rxstat_disable_process ${DEST}/etc/rxstat_disable_process + ${INSTALL_PROGRAM} rxstat_enable_peer ${DEST}/etc/rxstat_enable_peer + ${INSTALL_PROGRAM} rxstat_enable_process ${DEST}/etc/rxstat_enable_process + ${INSTALL_PROGRAM} rxstat_get_peer ${DEST}/etc/rxstat_get_peer + ${INSTALL_PROGRAM} rxstat_get_process ${DEST}/etc/rxstat_get_process + ${INSTALL_PROGRAM} rxstat_get_version ${DEST}/etc/rxstat_get_version + ${INSTALL_PROGRAM} rxstat_query_peer ${DEST}/etc/rxstat_query_peer + ${INSTALL_PROGRAM} rxstat_query_process ${DEST}/etc/rxstat_query_process clean: $(LT_CLEAN) diff --git a/src/packaging/RedHat/openafs.spec.in b/src/packaging/RedHat/openafs.spec.in index d0298d0..ab42418 100644 --- a/src/packaging/RedHat/openafs.spec.in +++ b/src/packaging/RedHat/openafs.spec.in @@ -1132,6 +1132,17 @@ dkms remove -m %{name} -v %{dkms_version} --rpm_safe_upgrade --all ||: %{_sbindir}/fstrace %{_sbindir}/read_tape %{_sbindir}/rxdebug +%{_sbindir}/rxstat_clear_peer +%{_sbindir}/rxstat_clear_process +%{_sbindir}/rxstat_disable_peer +%{_sbindir}/rxstat_disable_process +%{_sbindir}/rxstat_enable_peer +%{_sbindir}/rxstat_enable_process +%{_sbindir}/rxstat_get_peer +%{_sbindir}/rxstat_get_process +%{_sbindir}/rxstat_get_version +%{_sbindir}/rxstat_query_peer +%{_sbindir}/rxstat_query_process %{_sbindir}/uss %{_sbindir}/vos %{_sbindir}/vsys -- 1.9.4