From e99c48577cbef70bd7d65d96e6772dc98fda0702 Mon Sep 17 00:00:00 2001 From: jcsiadal Date: Wed, 9 Mar 2022 05:55:59 +0000 Subject: [PATCH 1/3] Update build variables Signed-off-by: jcsiadal --- Defaults.mk.in | 14 ---- Makefile | 189 +++++++++++++++++++++++++---------------------- warewulf.spec.in | 78 +++++++++++-------- 3 files changed, 147 insertions(+), 134 deletions(-) delete mode 100644 Defaults.mk.in diff --git a/Defaults.mk.in b/Defaults.mk.in deleted file mode 100644 index a16e4e53..00000000 --- a/Defaults.mk.in +++ /dev/null @@ -1,14 +0,0 @@ -VERSION ?= @VERSION@ -RELEASE ?= @RELEASE@ -PREFIX ?= @PREFIX@ -BINDIR ?= @BINDIR@ -SYSCONFDIR ?= @SYSCONFDIR@ -SRVDIR ?= @SRVDIR@ -DATADIR ?= @DATADIR@ -MANDIR ?= @MANDIR@ -LOCALSTATEDIR ?= @LOCALSTATEDIR@ -TFTPDIR ?= @TFTPDIR@ -FIREWALLDDIR ?= @FIREWALLDDIR@ -SYSTEMDDIR ?= @SYSTEMDDIR@ -BASH_COMPLETION ?= @BASH_COMPLETION@ -WWCLIENTLOC ?= @WWCLIENTLOC@ diff --git a/Makefile b/Makefile index 72b98588..d940eb0e 100644 --- a/Makefile +++ b/Makefile @@ -2,38 +2,81 @@ -include Defaults.mk +# Linux distro (try and set to /etc/os-release ID) +OS ?= $(sed -n "s/^ID\s*=\s*['"\""]\(.*\)['"\""]/\1/p" /etc/os-release) + +# List of variables to save and replace in files +VARLIST := OS + +# Project Information +VARLIST += WAREWULF VERSION RELEASE +WAREWULF ?= warewulf VERSION ?= 4.2.0 -GIT_TAG := $(shell test -e .git && git describe --tags --long --first-parent --always | tr '-' '_') +GIT_TAG := $(shell test -e .git && git describe --tags --long --first-parent --always) ifndef $(GIT_TAG) - RELEASE ?= 1.git_$(GIT_TAG) + ifdef $(filter $(OS),ubuntu debian) + RELEASE ?= 1.git_$(subst -,+,$(GIT_TAG)) + else + RELEASE ?= 1.git_$(subst -,_,$(GIT_TAG)) + endif else - RELEASE ?= 1 + RELEASE ?= 1 endif -# System locations +# Use LSB-compliant paths if OS is known +ifneq ($(OS),) + USE_LSB_PATHS := true +endif + +# Always default to GNU autotools default paths if PREFIX has been redefined +ifndef $(PREFIX) + USE_LSB_PATHS := false +endif + +# System directory paths +VARLIST += PREFIX BINDIR SYSCONFDIR SRVDIR DATADIR MANDIR DOCDIR LOCALSTATEDIR SHAREDSTATEDIR PREFIX ?= /usr/local BINDIR ?= $(PREFIX)/bin SYSCONFDIR ?= $(PREFIX)/etc -SRVDIR ?= $(PREFIX)/srv DATADIR ?= $(PREFIX)/share MANDIR ?= $(DATADIR)/man -LOCALSTATEDIR ?= $(PREFIX)/var -WWCLIENTLOC ?= /warewulf/bin +DOCDIR ?= $(DATADIR)/doc -TFTPDIR ?= /var/lib/tftpboot -FIREWALLDDIR ?= /usr/lib/firewalld/services +ifeq ($(USE_LSB_PATHS),true) + SRVDIR ?= /srv + LOCALSTATEDIR ?= /var/local + SHAREDSTATEDIR ?= /var/lib +else + SRVDIR ?= $(PREFIX)/srv + LOCALSTATEDIR ?= $(PREFIX)/var + SHAREDSTATEDIR ?= $(PREFIX)/com +endif + +# OS-Specific Service Locations +VARLIST += TFTPDIR FIREWALLDDIR SYSTEMDDIR SYSTEMDDIR ?= /usr/lib/systemd/system -BASH_COMPLETION ?= /etc/bash_completion.d/ +BASHCOMPDIR ?= /etc/bash_completion.d +FIREWALLDDIR ?= /usr/lib/firewalld/services +ifeq ($(OS),suse) + TFTPDIR ?= /srv/tftpboot +endif +ifeq ($(OS),ubuntu) + TFTPDIR ?= /srv/tftp +endif +# Default to Red Hat / Rocky Linux +TFTPDIR ?= /var/lib/tftpboot -# Warewulf locations -WWPROVISIONDIR = $(SRVDIR)/warewulf -WWOVERLAYDIR = $(LOCALSTATEDIR)/warewulf/overlays -WWCHROOTDIR = $(LOCALSTATEDIR)/warewulf/chroots - -# SuSE -#TFTPDIR ?= /srv/tftpboot -#FIREWALLDIR ?= /srv/tftp +# Warewulf directory paths +VARLIST += WWCLIENTLOC WWCONFIGDIR WWPROVISIONDIR WWOVERLAYDIR WWCHROOTDIR WWTFTPDIR WWDOCDIR WWDATADIR +WWCONFIGDIR := $(SYSCONFDIR)/$(WAREWULF) +WWPROVISIONDIR := $(LOCALSTATEDIR)$(WAREWULF) +WWOVERLAYDIR := $(LOCALSTATEDIR)$(WAREWULF)/overlays +WWCHROOTDIR := $(LOCALSTATEDIR)$(WAREWULF)/chroots +WWTFTPDIR := $(TFTPDIR)/$(WAREWULF) +WWDOCDIR := $(DOCDIR)/$(WAREWULF) +WWDATADIR := $(DATADIR)/$(WAREWULF) +WWCLIENTDIR ?= /warewulf # auto installed tooling TOOLS_DIR := .tools @@ -51,7 +94,7 @@ GOPROXY ?= https://proxy.golang.org export GOPROXY # built tags needed for wwbuild binary -WW_BUILD_GO_BUILD_TAGS := containers_image_openpgp containers_image_ostree +WW_GO_BUILD_TAGS := containers_image_openpgp containers_image_ostree all: config vendor wwctl wwclient bash_completion.d man_pages @@ -68,10 +111,8 @@ $(GO_TOOLS_BIN): $(GOLANGCI_LINT): @curl -qq -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(TOOLS_BIN) $(GOLANGCI_LINT_VERSION) - setup: vendor $(TOOLS_DIR) setup_tools -# vendor vendor: go mod tidy -v go mod vendor @@ -81,27 +122,11 @@ $(TOOLS_DIR): # Pre-build steps for source, such as "go generate" config: - set -x ;\ - for i in `find . -type f -name "*.in" -not -path "./vendor/*"`; do \ - NAME=`echo $$i | sed -e 's,\.in,,'`; \ - sed -e 's,@BINDIR@,$(BINDIR),g' \ - -e 's,@SYSCONFDIR@,$(SYSCONFDIR),g' \ - -e 's,@LOCALSTATEDIR@,$(LOCALSTATEDIR),g' \ - -e 's,@PREFIX@,$(PREFIX),g' \ - -e 's,@DATADIR@,$(DATADIR),g' \ - -e 's,@MANDIR@,$(MANDIR),g' \ - -e 's,@SRVDIR@,$(SRVDIR),g' \ - -e 's,@TFTPDIR@,$(TFTPDIR),g' \ - -e 's,@FIREWALLDDIR@,$(FIREWALLDDIR),g' \ - -e 's,@SYSTEMDDIR@,$(SYSTEMDDIR),g' \ - -e 's,@BASH_COMPLETION@,$(BASH_COMPLETION),g' \ - -e 's,@WWOVERLAYDIR@,$(WWOVERLAYDIR),g' \ - -e 's,@WWCHROOTDIR@,$(WWCHROOTDIR),g' \ - -e 's,@WWPROVISIONDIR@,$(WWPROVISIONDIR),g' \ - -e 's,@VERSION@,$(VERSION),g' \ - -e 's,@WWCLIENTLOC@,$(WWCLIENTLOC),g' \ - -e 's,@RELEASE@,$(RELEASE),g' $$i > $$NAME; \ - done + # Store configuration for subsequent runs + printf " $(foreach V,$(VARLIST),$V := $(strip $($V))\n)" > Defaults.mk + # Global variable search and replace for all *.in files + find . -type f -name "*.in" -not -path "./vendor/*" \ + -exec sh -c 'sed -ne "$(foreach V,$(VARLIST),s,@$V@,$(strip $($V)),g;)p" $${0} > $${0%.in}' {} \; touch config rm_config: @@ -109,11 +134,10 @@ rm_config: genconfig: rm_config config - # Lint lint: setup_tools @echo Running golangci-lint... - @$(GOLANGCI_LINT) run --build-tags "$(WW_BUILD_GO_BUILD_TAGS)" --skip-dirs internal/pkg/staticfiles ./... + @$(GOLANGCI_LINT) run --build-tags "$(WW_GO_BUILD_TAGS)" --skip-dirs internal/pkg/staticfiles ./... vet: go vet ./... @@ -137,96 +161,81 @@ files: all install -d -m 0755 $(DESTDIR)$(BINDIR) install -d -m 0755 $(DESTDIR)$(WWCHROOTDIR) install -d -m 0755 $(DESTDIR)$(WWPROVISIONDIR) - install -d -m 0755 $(DESTDIR)$(WWOVERLAYDIR) - install -d -m 0755 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/warewulf/bin/ - install -d -m 0755 $(DESTDIR)$(SYSCONFDIR)/warewulf/ - install -d -m 0755 $(DESTDIR)$(SYSCONFDIR)/warewulf/ipxe - install -d -m 0755 $(DESTDIR)$(TFTPDIR)/warewulf/ipxe/ - install -d -m 0755 $(DESTDIR)$(DATADIR)/warewulf/ipxe/ - install -d -m 0755 $(DESTDIR)$(BASH_COMPLETION) + install -d -m 0755 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/$(WWCLIENTDIR) + install -d -m 0755 $(DESTDIR)$(WWCONFIGDIR)/ipxe + install -d -m 0755 $(DESTDIR)$(WWTFTPDIR)/ipxe/ + install -d -m 0755 $(DESTDIR)$(BASHCOMPDIR) install -d -m 0755 $(DESTDIR)$(MANDIR)/man1 + install -d -m 0755 $(DESTDIR)$(WWDOCDIR) install -d -m 0755 $(DESTDIR)$(FIREWALLDDIR) install -d -m 0755 $(DESTDIR)$(SYSTEMDDIR) - test -f $(DESTDIR)$(SYSCONFDIR)/warewulf/warewulf.conf || install -m 644 etc/warewulf.conf $(DESTDIR)$(SYSCONFDIR)/warewulf/ - test -f $(DESTDIR)$(SYSCONFDIR)/warewulf/nodes.conf || install -m 644 etc/nodes.conf $(DESTDIR)$(SYSCONFDIR)/warewulf/ - cp -r etc/examples $(DESTDIR)$(SYSCONFDIR)/warewulf/ - cp -r etc/ipxe $(DESTDIR)$(SYSCONFDIR)/warewulf/ + test -f $(DESTDIR)$(WWCONFIGDIR)/warewulf.conf || install -m 644 etc/warewulf.conf $(DESTDIR)$(WWCONFIGDIR) + test -f $(DESTDIR)$(WWCONFIGDIR)/nodes.conf || install -m 644 etc/nodes.conf $(DESTDIR)$(WWCONFIGDIR) + cp -r etc/examples $(DESTDIR)$(WWCONFIGDIR)/ + cp -r etc/ipxe $(DESTDIR)$(WWCONFIGDIR)/ cp -r overlays/* $(DESTDIR)$(WWOVERLAYDIR)/ chmod 755 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/init - chmod 755 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/warewulf/wwinit + find $(DESTDIR)$(WWOVERLAYDIR) -type f -name "*.in" -exec rm -f {} \; + chmod 755 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/$(WWCLIENTDIR)/wwinit chmod 600 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/etc/ssh/ssh* chmod 644 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/etc/ssh/ssh*.pub.ww install -m 0755 wwctl $(DESTDIR)$(BINDIR) - install -c -m 0644 include/firewalld/warewulf.xml $(DESTDIR)$(FIREWALLDDIR) - install -c -m 0644 include/systemd/warewulfd.service $(DESTDIR)$(SYSTEMDDIR) - cp bash_completion.d/warewulf $(DESTDIR)$(BASH_COMPLETION) + install -m 0644 include/firewalld/warewulf.xml $(DESTDIR)$(FIREWALLDDIR) + install -m 0644 include/systemd/warewulfd.service $(DESTDIR)$(SYSTEMDDIR) + install -m 0644 LICENSE.md $(DESTDIR)$(WWDOCDIR) + cp bash_completion.d/warewulf $(DESTDIR)$(BASHCOMPDIR) cp man_pages/* $(DESTDIR)$(MANDIR)/man1/ - install -c -m 0644 staticfiles/arm64.efi $(DESTDIR)$(DATADIR)/warewulf/ipxe - install -c -m 0644 staticfiles/i386.efi $(DESTDIR)$(DATADIR)/warewulf/ipxe - install -c -m 0644 staticfiles/i386.kpxe $(DESTDIR)$(DATADIR)/warewulf/ipxe - install -c -m 0644 staticfiles/x86.efi $(DESTDIR)$(DATADIR)/warewulf/ipxe + install -c -m 0644 staticfiles/arm64.efi $(DESTDIR)$(WWDATADIR)/ipxe + install -c -m 0644 staticfiles/i386.efi $(DESTDIR)$(WWDATADIR)/ipxe + install -c -m 0644 staticfiles/i386.kpxe $(DESTDIR)$(WWDATADIR)/ipxe + install -c -m 0644 staticfiles/x86.efi $(DESTDIR)$(WWDATADIR)/ipxe init: systemctl daemon-reload - cp -r tftpboot/* $(TFTPDIR)/warewulf/ipxe/ - restorecon -r $(TFTPDIR)/warewulf - -# Overlay file system has changed -#debfiles: debian -# chmod +x $(DESTDIR)$(WWROOT)/warewulf/overlays/system/debian/init -# chmod 600 $(DESTDIR)$(WWROOT)/warewulf/overlays/system/debian/etc/ssh/ssh* -# chmod 644 $(DESTDIR)$(WWROOT)/warewulf/overlays/system/debian/etc/ssh/ssh*.pub.ww -# mkdir -p $(DESTDIR)$(WWROOT)/warewulf/overlays/system/debian/warewulf/bin/ -# cp wwclient $(DESTDIR)$(WWROOT)/warewulf/overlays/system/debian/warewulf/bin/ + cp -r tftpboot/* $(WWTFTPDIR)/ipxe/ + restorecon -r $(WWTFTPDIR) wwctl: - cd cmd/wwctl; GOOS=linux go build -mod vendor -tags "$(WW_BUILD_GO_BUILD_TAGS)" -o ../../wwctl + cd cmd/wwctl; GOOS=linux go build -mod vendor -tags "$(WW_GO_BUILD_TAGS)" -o ../../wwctl wwclient: cd cmd/wwclient; CGO_ENABLED=0 GOOS=linux go build -mod vendor -a -ldflags "-extldflags -static \ -X 'github.com/hpcng/warewulf/internal/pkg/warewulfconf.ConfigFile=/etc/warewulf/warewulf.conf'" -o ../../wwclient install_wwclient: wwclient - install -m 0755 wwclient $(DESTDIR)$(WWOVERLAYDIR)/wwinit/$(WWCLIENTLOC)/wwclient - + install -m 0755 wwclient $(DESTDIR)$(WWOVERLAYDIR)/wwinit/$(WWCLIENTDIR)/wwclient bash_completion: cd cmd/bash_completion && go build -ldflags="-X 'github.com/hpcng/warewulf/internal/pkg/warewulfconf.ConfigFile=./etc/warewulf.conf'\ -X 'github.com/hpcng/warewulf/internal/pkg/node.ConfigFile=./etc/nodes.conf'"\ - -mod vendor -tags "$(WW_BUILD_GO_BUILD_TAGS)" -o ../../bash_completion + -mod vendor -tags "$(WW_GO_BUILD_TAGS)" -o ../../bash_completion bash_completion.d: bash_completion install -d -m 0755 bash_completion.d - ./bash_completion bash_completion.d/warewulf + ./bash_completion bash_completion.d/warewulf man_page: cd cmd/man_page && go build -ldflags="-X 'github.com/hpcng/warewulf/internal/pkg/warewulfconf.ConfigFile=./etc/warewulf.conf'\ -X 'github.com/hpcng/warewulf/internal/pkg/node.ConfigFile=./etc/nodes.conf'"\ - -mod vendor -tags "$(WW_BUILD_GO_BUILD_TAGS)" -o ../../man_page + -mod vendor -tags "$(WW_GO_BUILD_TAGS)" -o ../../man_page man_pages: man_page install -d man_pages ./man_page ./man_pages cd man_pages; for i in wwctl*1; do echo "Compressing manpage: $$i"; gzip --force $$i; done -#config_defaults: -# cd cmd/config_defaults && go build -ldflags="-X 'github.com/hpcng/warewulf/internal/pkg/warewulfconf.ConfigFile=./etc/warewulf.conf' \ -# -X 'github.com/hpcng/warewulf/internal/pkg/node.ConfigFile=./etc/nodes.conf' \ -# -X 'github.com/hpcng/warewulf/internal/pkg/warewulfconf.defaultDataStore=$(WWROOT)/warewulf'" \ -# -mod vendor -tags "$(WW_BUILD_GO_BUILD_TAGS)" -o ../../config_defaults - dist: vendor config - rm -rf .dist/warewulf-$(VERSION) - mkdir -p .dist/warewulf-$(VERSION) - cp -rap * .dist/warewulf-$(VERSION)/ - cd .dist; tar -czf ../warewulf-$(VERSION).tar.gz warewulf-$(VERSION) + rm -rf .dist/$(WAREWULF)-$(VERSION) + mkdir -p .dist/$(WAREWULF)-$(VERSION) + cp -rap * .dist/$(WAREWULF)-$(VERSION)/ + cd .dist; tar -czf ../$(WAREWULF)-$(VERSION).tar.gz $(WAREWULF)-$(VERSION) rm -rf .dist clean: rm -f wwclient rm -f wwctl rm -rf .dist - rm -f warewulf-$(VERSION).tar.gz + rm -f $(WAREWULF)-$(VERSION).tar.gz rm -f bash_completion rm -rf bash_completion.d rm -f man_page diff --git a/warewulf.spec.in b/warewulf.spec.in index e80b03c5..2bb82d81 100644 --- a/warewulf.spec.in +++ b/warewulf.spec.in @@ -1,13 +1,16 @@ -%global wwgroup warewulf -%if 0%{?sle_version} -%global tftpdir "/srv/tftpboot" -%global srvdir "/srv" -%else -%global tftpdir "/var/lib/tftpboot" -%global srvdir "%{_localstatedir}/warewulf/srv" -%endif %define debug_package %{nil} +%if 0%{?sle_version} +%global tftpdir /srv/tftpboot +%global srvdir /srv +%else +# Assume Fedora-based OS if not SUSE-based +%global tftpdir /var/lib/tftpboot +%global srvdir %{_sharedstatedir} +%endif + +%global wwgroup warewulf + Name: warewulf Summary: A provisioning system for large clusters of bare metal and/or virtual systems Version: @VERSION@ @@ -27,17 +30,18 @@ Conflicts: warewulf-ipmi BuildRequires: make -%if 0%{?rhel} -BuildRequires: systemd -BuildRequires: golang -Requires: tftp-server -Requires: nfs-utils -%else -# sle_version +%if 0%{?sle_version} BuildRequires: systemd-rpm-macros BuildRequires: go +BuildRequires: firewall-macros Requires: tftp Requires: nfs-kernel-server +%else +BuildRequires: systemd +BuildRequires: golang +BuildRequires: firewalld-filesystem +Requires: tftp-server +Requires: nfs-utils %endif %if 0%{?rhel} >= 8 || 0%{?sle_version} @@ -57,30 +61,36 @@ system for large clusters of bare metal and/or virtual systems. %build -make genconfig PREFIX=/usr \ - SRVDIR=%{srvdir} \ - LOCALSTATEDIR=%{_localstatedir} \ +make genconfig \ + PREFIX=%{_prefix} \ + BINDIR=%{_bindir} \ SYSCONFDIR=%{_sysconfdir} \ DATADIR=%{_datadir} \ + LOCALSTATEDIR=%{_localstatedir} \ + SHAREDSTATEDIR=%{_sharedstatedir} \ MANDIR=%{_mandir} \ - BINDIR=%{_bindir} \ + INFODIR=%{_infodir} \ + DOCDIR=%{_docdir} \ + SRVDIR=%{srvdir} \ TFTPDIR=%{tftpdir} \ SYSTEMDDIR=%{_unitdir} \ - MANDIR=%{_mandir} \ - BASH_COMPLETION=/etc/bash_completion.d/ \ - FIREWALLDDIR=/usr/lib/firewalld/services - + BASHCOMPDIR=/etc/bash_completion.d/ \ + FIREWALLDDIR=/usr/lib/firewalld/services \ + WWCLIENTDIR=%{_libexecdir}/warewulf make + %install make install DESTDIR=%{buildroot} + %pre getent group %{wwgroup} >/dev/null || groupadd -r %{wwgroup} %post %systemd_post warewulfd.service +%firewalld_reload %preun @@ -89,19 +99,20 @@ getent group %{wwgroup} >/dev/null || groupadd -r %{wwgroup} %postun %systemd_postun_with_restart warewulfd.service +%firewalld_reload %files %defattr(-, root, %{wwgroup}) -%dir %{_sysconfdir}/%{name} -%config(noreplace) %{_sysconfdir}/%{name}/* -%config(noreplace) %attr(0640,-,-) %{_sysconfdir}/%{name}/nodes.conf +%dir %{_sysconfdir}/warewulf +%config(noreplace) %{_sysconfdir}/warewulf/* +%config(noreplace) %attr(0640,-,-) %{_sysconfdir}/warewulf/nodes.conf %{_sysconfdir}/bash_completion.d/warewulf -%dir %{_localstatedir}/warewulf -%{_localstatedir}/warewulf/chroots -%{_localstatedir}/warewulf/overlays -%{srvdir} +%dir %{_sharedstatedir}/warewulf +%{_sharedstatedir}/warewulf/chroots +%{_sharedstatedir}/warewulf/overlays +%{srvdir}/warewulf %attr(-, root, root) %{_bindir}/wwctl %attr(-, root, root) %{_prefix}/lib/firewalld/services/warewulf.xml @@ -109,7 +120,14 @@ getent group %{wwgroup} >/dev/null || groupadd -r %{wwgroup} %attr(-, root, root) %{_mandir}/man1/wwctl* %attr(-, root, root) %{_datadir}/warewulf +%license %{_docdir}/warewulf/LICENSE.md + + %changelog +* Wed Jan 26 2022 Jeremy Siadal - 4.2.0-1 +- Add license install +- Updates for RH and SUSE RPM guidelines + * Sat Jan 15 2022 Gregory Kurtzer - 4.2.0-1 - Integrated genconfig Make options - Cleaned up SPEC to use default RPM macros From 3ad6c49a3ed41069a713d70f081d654954d8da58 Mon Sep 17 00:00:00 2001 From: jcsiadal Date: Fri, 25 Feb 2022 00:56:06 +0000 Subject: [PATCH 2/3] Update standard paths Signed-off-by: jcsiadal --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d940eb0e..fe3fb52f 100644 --- a/Makefile +++ b/Makefile @@ -68,7 +68,7 @@ endif TFTPDIR ?= /var/lib/tftpboot # Warewulf directory paths -VARLIST += WWCLIENTLOC WWCONFIGDIR WWPROVISIONDIR WWOVERLAYDIR WWCHROOTDIR WWTFTPDIR WWDOCDIR WWDATADIR +VARLIST += WWCLIENTDIR WWCONFIGDIR WWPROVISIONDIR WWOVERLAYDIR WWCHROOTDIR WWTFTPDIR WWDOCDIR WWDATADIR WWCONFIGDIR := $(SYSCONFDIR)/$(WAREWULF) WWPROVISIONDIR := $(LOCALSTATEDIR)$(WAREWULF) WWOVERLAYDIR := $(LOCALSTATEDIR)$(WAREWULF)/overlays From 8827937a9d4d767592fe7eb80b55913f5dcd7ae0 Mon Sep 17 00:00:00 2001 From: jcsiadal Date: Wed, 9 Mar 2022 07:32:02 +0000 Subject: [PATCH 3/3] Update for LSB compliance Signed-off-by: jcsiadal --- Makefile | 18 +++++++++--------- internal/app/wwclient/root.go | 4 ++-- internal/pkg/buildconfig/defaults.go | 8 ++++---- internal/pkg/buildconfig/setconfigs.go.in | 2 +- warewulf.spec.in | 5 +++-- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index fe3fb52f..7bf11b7f 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,8 @@ -include Defaults.mk # Linux distro (try and set to /etc/os-release ID) -OS ?= $(sed -n "s/^ID\s*=\s*['"\""]\(.*\)['"\""]/\1/p" /etc/os-release) +OS_REL := $(shell sed -n "s/^ID\s*=\s*['"\""]\(.*\)['"\""]/\1/p" /etc/os-release) +OS ?= $(OS_REL) # List of variables to save and replace in files VARLIST := OS @@ -14,7 +15,7 @@ WAREWULF ?= warewulf VERSION ?= 4.2.0 GIT_TAG := $(shell test -e .git && git describe --tags --long --first-parent --always) -ifndef $(GIT_TAG) +ifndef GIT_TAG ifdef $(filter $(OS),ubuntu debian) RELEASE ?= 1.git_$(subst -,+,$(GIT_TAG)) else @@ -30,12 +31,12 @@ ifneq ($(OS),) endif # Always default to GNU autotools default paths if PREFIX has been redefined -ifndef $(PREFIX) +ifdef PREFIX USE_LSB_PATHS := false endif # System directory paths -VARLIST += PREFIX BINDIR SYSCONFDIR SRVDIR DATADIR MANDIR DOCDIR LOCALSTATEDIR SHAREDSTATEDIR +VARLIST += PREFIX BINDIR SYSCONFDIR SRVDIR DATADIR MANDIR DOCDIR LOCALSTATEDIR PREFIX ?= /usr/local BINDIR ?= $(PREFIX)/bin SYSCONFDIR ?= $(PREFIX)/etc @@ -46,11 +47,9 @@ DOCDIR ?= $(DATADIR)/doc ifeq ($(USE_LSB_PATHS),true) SRVDIR ?= /srv LOCALSTATEDIR ?= /var/local - SHAREDSTATEDIR ?= /var/lib else SRVDIR ?= $(PREFIX)/srv LOCALSTATEDIR ?= $(PREFIX)/var - SHAREDSTATEDIR ?= $(PREFIX)/com endif # OS-Specific Service Locations @@ -70,9 +69,9 @@ TFTPDIR ?= /var/lib/tftpboot # Warewulf directory paths VARLIST += WWCLIENTDIR WWCONFIGDIR WWPROVISIONDIR WWOVERLAYDIR WWCHROOTDIR WWTFTPDIR WWDOCDIR WWDATADIR WWCONFIGDIR := $(SYSCONFDIR)/$(WAREWULF) -WWPROVISIONDIR := $(LOCALSTATEDIR)$(WAREWULF) -WWOVERLAYDIR := $(LOCALSTATEDIR)$(WAREWULF)/overlays -WWCHROOTDIR := $(LOCALSTATEDIR)$(WAREWULF)/chroots +WWPROVISIONDIR := $(LOCALSTATEDIR)/$(WAREWULF) +WWOVERLAYDIR := $(LOCALSTATEDIR)/$(WAREWULF)/overlays +WWCHROOTDIR := $(LOCALSTATEDIR)/$(WAREWULF)/chroots WWTFTPDIR := $(TFTPDIR)/$(WAREWULF) WWDOCDIR := $(DOCDIR)/$(WAREWULF) WWDATADIR := $(DATADIR)/$(WAREWULF) @@ -169,6 +168,7 @@ files: all install -d -m 0755 $(DESTDIR)$(WWDOCDIR) install -d -m 0755 $(DESTDIR)$(FIREWALLDDIR) install -d -m 0755 $(DESTDIR)$(SYSTEMDDIR) + install -d -m 0755 $(DESTDIR)$(WWDATADIR) test -f $(DESTDIR)$(WWCONFIGDIR)/warewulf.conf || install -m 644 etc/warewulf.conf $(DESTDIR)$(WWCONFIGDIR) test -f $(DESTDIR)$(WWCONFIGDIR)/nodes.conf || install -m 644 etc/nodes.conf $(DESTDIR)$(WWCONFIGDIR) cp -r etc/examples $(DESTDIR)$(WWCONFIGDIR)/ diff --git a/internal/app/wwclient/root.go b/internal/app/wwclient/root.go index e61534fd..8b6c590c 100644 --- a/internal/app/wwclient/root.go +++ b/internal/app/wwclient/root.go @@ -63,7 +63,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error { return errors.New("found pidfile " + PIDFile + " not starting") } - if os.Args[0] == path.Join(buildconfig.WWCLIENTLOC(), "wwclient") { + if os.Args[0] == path.Join(buildconfig.WWCLIENTDIR(), "wwclient") { err := os.Chdir("/") if err != nil { wwlog.Printf(wwlog.ERROR, "failed to change dir: %s", err) @@ -75,7 +75,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error { } else { fmt.Printf("Called via: %s\n", os.Args[0]) fmt.Printf("Runtime overlay is being put in '/warewulf/wwclient-test' rather than '/'\n") - fmt.Printf("For full functionality call with: %s\n", path.Join(buildconfig.WWCLIENTLOC(), "wwclient")) + fmt.Printf("For full functionality call with: %s\n", path.Join(buildconfig.WWCLIENTDIR(), "wwclient")) err := os.MkdirAll("/warewulf/wwclient-test", 0755) if err != nil { wwlog.Printf(wwlog.ERROR, "failed to create dir: %s", err) diff --git a/internal/pkg/buildconfig/defaults.go b/internal/pkg/buildconfig/defaults.go index a648346b..fc714a3d 100644 --- a/internal/pkg/buildconfig/defaults.go +++ b/internal/pkg/buildconfig/defaults.go @@ -15,7 +15,7 @@ var ( wwprovisiondir string = "UNDEF" version string = "UNDEF" release string = "UNDEF" - wwclientloc string = "UNDEF" + wwclientdir string = "UNDEF" datadir string = "UNDEF" ) @@ -84,7 +84,7 @@ func RELEASE() string { return release } -func WWCLIENTLOC() string { - wwlog.Printf(wwlog.DEBUG, "WWCLIENTLOC = '%s'\n", wwclientloc) - return wwclientloc +func WWCLIENTDIR() string { + wwlog.Printf(wwlog.DEBUG, "WWCLIENTDIR = '%s'\n", wwclientdir) + return wwclientdir } diff --git a/internal/pkg/buildconfig/setconfigs.go.in b/internal/pkg/buildconfig/setconfigs.go.in index 43c9f87c..e10303e3 100644 --- a/internal/pkg/buildconfig/setconfigs.go.in +++ b/internal/pkg/buildconfig/setconfigs.go.in @@ -14,5 +14,5 @@ func init() { wwprovisiondir = "@WWPROVISIONDIR@" version = "@VERSION@" release = "@RELEASE@" - wwclientloc = "@WWCLIENTLOC@" + wwclientdir = "@WWCLIENTDIR@" } diff --git a/warewulf.spec.in b/warewulf.spec.in index 2bb82d81..a4b2dbac 100644 --- a/warewulf.spec.in +++ b/warewulf.spec.in @@ -61,12 +61,13 @@ system for large clusters of bare metal and/or virtual systems. %build +# Install to sharedstatedir by redirecting LOCALSTATEDIR make genconfig \ PREFIX=%{_prefix} \ BINDIR=%{_bindir} \ SYSCONFDIR=%{_sysconfdir} \ DATADIR=%{_datadir} \ - LOCALSTATEDIR=%{_localstatedir} \ + LOCALSTATEDIR=%{_sharedstatedir} \ SHAREDSTATEDIR=%{_sharedstatedir} \ MANDIR=%{_mandir} \ INFODIR=%{_infodir} \ @@ -76,7 +77,7 @@ make genconfig \ SYSTEMDDIR=%{_unitdir} \ BASHCOMPDIR=/etc/bash_completion.d/ \ FIREWALLDDIR=/usr/lib/firewalld/services \ - WWCLIENTDIR=%{_libexecdir}/warewulf + WWCLIENTDIR=/warewulf make