spec, Makefile: add /etc/nvme files to package files
Sagi Grimberg
maintainerPATCH 1/2 spec, Makefile: add /etc/nvme files to package files
This way it can automatically be removed upon uninstallation and we don't need %preun target. Also, this will also allow to get these files on manual installation from sources.
Also, don't settle on the "file exists" check, use the '-s' to check that it is not empty as well.
Lastly, in order to have hostnqn and hostid updated upon pkg install, we have install-spec target that would omit hostnqn and hostid files, and let the rpm %post do it (otherwise we use the normal install target).
--- Makefile | 16 +++++++++++++++- nvme.spec.in | 25 +++++++++---------------- 2 files changed, 24 insertions(+), 17 deletions(-)
Makefile +15 -1
@@ -90,7 +90,21 @@ install-zsh-completion: $(INSTALL) -d $(DESTDIR)$(PREFIX)/share/zsh/site-functions $(INSTALL) -m 644 -T ./completions/_nvme $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_nvme -install: install-bin install-man install-bash-completion install-zsh-completion +install-hostparams: + if [ ! -s $(DESTDIR)$(SYSCONFDIR)/nvme/hostnqn ]; then \ + echo `$(DESTDIR)$(SBINDIR)/nvme gen-hostnqn` > $(DESTDIR)$(SYSCONFDIR)/nvme/hostnqn; \ + fi + if [ ! -s $(DESTDIR)$(SYSCONFDIR)/nvme/hostid ]; then \ + uuidgen > $(DESTDIR)$(SYSCONFDIR)/nvme/hostid; \ + fi + +install-etc: + $(INSTALL) -d $(DESTDIR)$(SYSCONFDIR)/nvme + touch $(DESTDIR)$(SYSCONFDIR)/nvme/hostnqn + touch $(DESTDIR)$(SYSCONFDIR)/nvme/hostid + +install-spec: install-bin install-man install-bash-completion install-zsh-completion install-etc +install: install-spec install-hostparams nvme.spec: nvme.spec.in NVME-VERSION-FILE sed -e 's/@@VERSION@@/$(NVME_VERSION)/g' < $< > $@+
nvme.spec.in +9 -16
@@ -22,7 +22,7 @@ make %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=%{buildroot} PREFIX=/usr +make install-spec DESTDIR=%{buildroot} PREFIX=/usr %files %defattr(-,root,root)
@@ -31,30 +31,23 @@ make install DESTDIR=%{buildroot} PREFIX=/usr %{_mandir}/man1/nvme*.1* %{_datadir}/bash-completion/completions/nvme %{_datadir}/zsh/site-functions/_nvme +%dir %{_sysconfdir}/nvme +%{_sysconfdir}/nvme/hostnqn +%{_sysconfdir}/nvme/hostid %clean rm -rf $RPM_BUILD_ROOT %post -if [ $1 = 1 ]; then # 1 : This package is being installed for the first time - if [ ! -f /etc/nvme/hostnqn ]; then - install -D /dev/null /etc/nvme/hostnqn - echo $(nvme gen-hostnqn) > /etc/nvme/hostnqn +if [ $1 -eq 1 ]; then # 1 : This package is being installed for the first time + if [ ! -s %{_sysconfdir}/nvme/hostnqn ]; then + echo $(nvme gen-hostnqn) > %{_sysconfdir}/nvme/hostnqn fi - if [ ! -f /etc/nvme/hostid ]; then - uuidgen > /etc/nvme/hostid + if [ ! -s %{_sysconfdir}/nvme/hostid ]; then + uuidgen > %{_sysconfdir}/nvme/hostid fi fi -%preun -if [ "$1" = "remove" ]; then - if [ -d /etc/nvme ]; then - rm -f /etc/nvme/hostnqn - if [ ! -n "`ls -A /etc/nvme`" ]; then - rm -rf /etc/nvme - fi - fi -fi %changelog * Mon Oct 15 2018 Eyal Ben-David <eyalbe at il.ibm.com> - 1.6.81.g899a-2 - bash-completion check
Signature · 1 line
2.17.1
Sagi Grimberg
maintainerPATCH 2/2 spec, make: Add discovery.conf to the package files list
Lets add it as part of the package with a little documentation.
--- Makefile | 3 +++ etc/discovery.conf.in | 4 ++++ nvme.spec.in | 1 + 3 files changed, 8 insertions(+) create mode 100644 etc/discovery.conf.in
Makefile +3 -0
@@ -102,6 +102,9 @@ install-etc: $(INSTALL) -d $(DESTDIR)$(SYSCONFDIR)/nvme touch $(DESTDIR)$(SYSCONFDIR)/nvme/hostnqn touch $(DESTDIR)$(SYSCONFDIR)/nvme/hostid + if [ ! -f $(DESTDIR)$(SBINDIR)/nvme/discovery.conf ]; then \ + $(INSTALL) -m 644 -T ./etc/discovery.conf.in $(DESTDIR)$(SYSCONFDIR)/nvme/discovery.conf; \ + fi install-spec: install-bin install-man install-bash-completion install-zsh-completion install-etc install: install-spec install-hostparams
etc/discovery.conf.in new file +4 -0
@@ -0,0 +1,4 @@ +# Used for extracting default parameters for discovery +# +# Example: +# --transport=<trtype> --traddr=<traddr> --trsvcid=<trsvcid> --host-traddr=<host-traddr>
nvme.spec.in +1 -0
@@ -34,6 +34,7 @@ make install-spec DESTDIR=%{buildroot} PREFIX=/usr %dir %{_sysconfdir}/nvme %{_sysconfdir}/nvme/hostnqn %{_sysconfdir}/nvme/hostid +%{_sysconfdir}/nvme/discovery.conf %clean rm -rf $RPM_BUILD_ROOT
Signature · 1 line
2.17.1
PATCH 2/2 spec, make: Add discovery.conf to the package files list
Looks good to me.
PATCH 1/2 spec, Makefile: add /etc/nvme files to package files
In reply to Sagi GrimbergQuoted 11 lines · Sagi Grimberg
This way it can automatically be removed upon uninstallation and we don't need %preun target. Also, this will also allow to get these files on manual installation from sources.
Also, don't settle on the "file exists" check, use the '-s' to check that it is not empty as well.
Lastly, in order to have hostnqn and hostid updated upon pkg install, we have install-spec target that would omit hostnqn and hostid files, and let the rpm %post do it (otherwise we use the normal install target).
Sounds good, applied both patches.