bab9bb6b69
Create new directories:
ceph
config
config-files
filesystem
kernel
kernel/kernel-modules
ldap
logging
strorage-drivers
tools
utilities
virt
Retire directories:
connectivity
core
devtools
support
extended
Delete two packages:
tgt
irqbalance
Relocated packages:
base/
dhcp
initscripts
libevent
lighttpd
linuxptp
memcached
net-snmp
novnc
ntp
openssh
pam
procps
sanlock
shadow
sudo
systemd
util-linux
vim
watchdog
ceph/
python-cephclient
config/
facter
puppet-4.8.2
puppet-modules
filesystem/
e2fsprogs
nfs-utils
nfscheck
kernel/
kernel-std
kernel-rt
kernel/kernel-modules/
mlnx-ofa_kernel
ldap/
nss-pam-ldapd
openldap
logging/
syslog-ng
logrotate
networking/
lldpd
iproute
mellanox
python-ryu
mlx4-config
python/
python-2.7.5
python-django
python-gunicorn
python-setuptools
python-smartpm
python-voluptuous
security/
shim-signed
shim-unsigned
tboot
strorage-drivers/
python-3parclient
python-lefthandclient
virt/
cloud-init
libvirt
libvirt-python
qemu
tools/
storage-topology
vm-topology
utilities/
tis-extensions
namespace-utils
nova-utils
update-motd
Change-Id: I37ade764d873c701b35eac5881eb40412ba64a86
Story: 2002801
Task: 22687
Signed-off-by: Scott Little <scott.little@windriver.com>
97 lines
3.1 KiB
Diff
97 lines
3.1 KiB
Diff
From b7c902072f15c14507ab837f769b6adcf299f2ed Mon Sep 17 00:00:00 2001
|
|
From: Scott Little <scott.little@windriver.com>
|
|
Date: Mon, 2 Oct 2017 15:19:43 -0400
|
|
Subject: [PATCH 1/4] WRS: 0001-TiS-nfs-utils-spec-add-scripts.patch
|
|
|
|
Conflicts:
|
|
SPECS/nfs-utils.spec
|
|
---
|
|
SPECS/nfs-utils.spec | 29 +++++++++++++++++++++++++++++
|
|
1 file changed, 29 insertions(+)
|
|
|
|
diff --git a/SPECS/nfs-utils.spec b/SPECS/nfs-utils.spec
|
|
index a8d651a..583990d 100644
|
|
--- a/SPECS/nfs-utils.spec
|
|
+++ b/SPECS/nfs-utils.spec
|
|
@@ -15,6 +15,10 @@ Source2: nfs.sysconfig
|
|
Source3: nfs-utils_env.sh
|
|
Source4: lockd.conf
|
|
Source5: 24-nfs-server.conf
|
|
+Source10: nfscommon
|
|
+Source11: nfsserver
|
|
+Source12: nfscommon.service
|
|
+Source13: nfsserver.service
|
|
|
|
#
|
|
# RHEL7.1
|
|
@@ -131,6 +135,10 @@ Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
|
|
Patch102: nfs-utils-1.2.3-sm-notify-res_init.patch
|
|
Patch103: nfs-utils-1.2.5-idmap-errmsg.patch
|
|
|
|
+# Titanium Cloud Patches
|
|
+Patch200: nfs-utils-support-mountprog-and-nfsprog-options.patch
|
|
+Patch201: nfs-utils-do-not-pass-CFLAGS-to-native.patch
|
|
+
|
|
Group: System Environment/Daemons
|
|
Provides: exportfs = %{epoch}:%{version}-%{release}
|
|
Provides: nfsstat = %{epoch}:%{version}-%{release}
|
|
@@ -382,6 +390,11 @@ This package also contains the mount.nfs and umount.nfs program.
|
|
%patch102 -p1
|
|
%patch103 -p1
|
|
|
|
+%patch200 -p1
|
|
+# Titanium Cloud support mountprog and nfsprog options
|
|
+%patch201 -p1
|
|
+# Titanium Cloud do not pass CFLAGS to native
|
|
+
|
|
# Remove .orig files
|
|
find . -name "*.orig" | xargs rm -f
|
|
|
|
@@ -443,6 +456,13 @@ install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/usr/lib/systemd/scripts/nfs-utils_env.
|
|
install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/lockd.conf
|
|
install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/gssproxy
|
|
|
|
+mkdir -p $RPM_BUILD_ROOT/etc/init.d
|
|
+install -m 755 %{SOURCE10} $RPM_BUILD_ROOT/etc/init.d/nfscommon
|
|
+install -m 755 %{SOURCE11} $RPM_BUILD_ROOT/etc/init.d/nfsserver
|
|
+
|
|
+install -m 644 %{SOURCE12} $RPM_BUILD_ROOT/%{_unitdir}/nfscommon.service
|
|
+install -m 644 %{SOURCE13} $RPM_BUILD_ROOT/%{_unitdir}/nfsserver.service
|
|
+
|
|
#
|
|
# For backwards compatablity
|
|
#
|
|
@@ -521,6 +541,9 @@ if [ $1 -eq 1 ] ; then
|
|
# Initial installation
|
|
/bin/systemctl enable nfs-client.target >/dev/null 2>&1 || :
|
|
/bin/systemctl restart nfs-config >/dev/null 2>&1 || :
|
|
+
|
|
+ /bin/systemctl enable nfscommon.service >/dev/null 2>&1 || :
|
|
+ /bin/systemctl enable nfsserver.service >/dev/null 2>&1 || :
|
|
fi
|
|
%systemd_post nfs-config
|
|
%systemd_post nfs-server
|
|
@@ -532,6 +555,9 @@ chown -R rpcuser:rpcuser /var/lib/nfs/statd
|
|
if [ $1 -eq 0 ]; then
|
|
%systemd_preun nfs-client.target
|
|
%systemd_preun nfs-server.server
|
|
+
|
|
+ /bin/systemctl disable nfscommon.service >/dev/null 2>&1 || :
|
|
+ /bin/systemctl disable nfsserver.service >/dev/null 2>&1 || :
|
|
|
|
/usr/sbin/userdel rpcuser 2>/dev/null || :
|
|
/usr/sbin/groupdel rpcuser 2>/dev/null || :
|
|
@@ -618,6 +644,9 @@ fi
|
|
%{_sbindir}/nfsdcltrack
|
|
%{_mandir}/*/*
|
|
%{_unitdir}/*
|
|
+%attr(755,root,root) /etc/init.d/nfscommon
|
|
+%attr(755,root,root) /etc/init.d/nfsserver
|
|
+
|
|
%attr(755,root,root) /usr/lib/systemd/scripts/nfs-utils_env.sh
|
|
%{_prefix}/lib/systemd/system-generators/nfs-server-generator
|
|
|
|
--
|
|
1.9.1
|
|
|