kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Minor fixes

Browse Source 
Signed-off-by: jcsiadal <jeremy.c.siadal@intel.com>
This commit is contained in:
jcsiadal
2022-01-12 03:10:50 +00:00
parent 8afe4b1342
commit 3f68bc86db
2 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Makefile
View File

@@ -105,23 +105,14 @@ files: all
test -f $(DESTDIR)/etc/warewulf/nodes.conf || install -m 644 etc/nodes.conf $(DESTDIR)/etc/warewulf/ test -f $(DESTDIR)/etc/warewulf/nodes.conf || install -m 644 etc/nodes.conf $(DESTDIR)/etc/warewulf/
cp -r etc/dhcp $(DESTDIR)/etc/warewulf/ cp -r etc/dhcp $(DESTDIR)/etc/warewulf/
cp -r etc/ipxe $(DESTDIR)/etc/warewulf/ cp -r etc/ipxe $(DESTDIR)/etc/warewulf/
cp -r overlays $(DESTDIR)/var/warewulf/ mkdir -p $(DESTDIR)$(OVERLAYDIR)
mkdir -p $(DESTDIR)$(OVERLAYIR)/wwinit/bin/ cp -r overlays/* $(DESTDIR)$(OVERLAYDIR)/
mkdir -p $(DESTDIR)$(OVERLAYIR)/wwinit/warewulf/bin/ mkdir -p $(DESTDIR)$(OVERLAYDIR)/wwinit/bin/
chmod +x $(DESTDIR)$(OVERLAYIR)/wwinit/init mkdir -p $(DESTDIR)$(OVERLAYDIR)/wwinit/warewulf/bin/
chmod 600 $(DESTDIR)$(OVERLAYIR)/wwinit/etc/ssh/ssh* chmod +x $(DESTDIR)$(OVERLAYDIR)/wwinit/init
chmod 644 $(DESTDIR)$(OVERLAYIR)/wwinit/etc/ssh/ssh*.pub.ww chmod 600 $(DESTDIR)$(OVERLAYDIR)/wwinit/etc/ssh/ssh*
mkdir -p $(DESTDIR)$(OVERLAYIR)/wwinit/warewulf/bin/ chmod 644 $(DESTDIR)$(OVERLAYDIR)/wwinit/etc/ssh/ssh*.pub.ww
install -m 0755 wwctl $(DESTDIR)/usr/bin/ mkdir -p $(DESTDIR)$(OVERLAYDIR)/wwinit/warewulf/bin/
mkdir -p $(DESTDIR)/usr/lib/firewalld/services
install -c -m 0644 include/firewalld/warewulf.xml $(DESTDIR)/usr/lib/firewalld/services
cp -r overlays $(DESTDIR)$(WWROOT)/warewulf/
mkdir -p $(DESTDIR)$(OVERLAYIR)/wwinit/bin/
mkdir -p $(DESTDIR)$(OVERLAYIR)/wwinit/warewulf/bin/
chmod +x $(DESTDIR)$(OVERLAYIR)/wwinit/init
chmod 600 $(DESTDIR)$(OVERLAYIR)/wwinit/etc/ssh/ssh*
chmod 644 $(DESTDIR)$(OVERLAYIR)/wwinit/etc/ssh/ssh*.pub.ww
mkdir -p $(DESTDIR)$(OVERLAYIR)/wwinit/warewulf/bin/
install -m 0755 wwctl $(DESTDIR)/usr/bin/ install -m 0755 wwctl $(DESTDIR)/usr/bin/
mkdir -p $(DESTDIR)$(FIREWALLDIR) mkdir -p $(DESTDIR)$(FIREWALLDIR)
install -c -m 0644 include/firewalld/warewulf.xml $(DESTDIR)$(FIREWALLDIR) install -c -m 0644 include/firewalld/warewulf.xml $(DESTDIR)$(FIREWALLDIR)
@@ -152,7 +143,7 @@ wwclient:
cd cmd/wwclient; CGO_ENABLED=0 GOOS=linux go build -mod vendor -a -ldflags '-extldflags -static' -o ../../wwclient cd cmd/wwclient; CGO_ENABLED=0 GOOS=linux go build -mod vendor -a -ldflags '-extldflags -static' -o ../../wwclient
install_wwclient: wwclient install_wwclient: wwclient
install -m 0755 wwclient $(DESSTDIR)/var/warewulf/overlays/wwinit/bin/wwclient install -m 0755 wwclient $(DESTDIR)$(WWROOT)/warewulf/overlays/wwinit/bin/wwclient
bash_completion: bash_completion:
cd cmd/bash_completion && go build -ldflags="-X 'github.com/hpcng/warewulf/internal/pkg/warewulfconf.ConfigFile=$(CONFIG)/etc/warewulf.conf'\ cd cmd/bash_completion && go build -ldflags="-X 'github.com/hpcng/warewulf/internal/pkg/warewulfconf.ConfigFile=$(CONFIG)/etc/warewulf.conf'\
@@ -176,7 +167,7 @@ man_pages: man_page
config_defaults: config_defaults:
cd cmd/config_defaults && go build -ldflags="-X 'github.com/hpcng/warewulf/internal/pkg/warewulfconf.ConfigFile=$(CONFIG)/etc/warewulf.conf' \ cd cmd/config_defaults && go build -ldflags="-X 'github.com/hpcng/warewulf/internal/pkg/warewulfconf.ConfigFile=$(CONFIG)/etc/warewulf.conf' \
-X 'github.com/hpcng/warewulf/internal/pkg/node.ConfigFile=$(CONFIG)/etc/nodes.conf' \ -X 'github.com/hpcng/warewulf/internal/pkg/node.ConfigFile=$(CONFIG)/etc/nodes.conf' \
-X 'github.com/hpcng/warewulf/internal/pkg/warewulfconf.defaultDataStore=/srv/warewulf'" \ -X 'github.com/hpcng/warewulf/internal/pkg/warewulfconf.defaultDataStore=$(WWROOT)/warewulf'" \
-mod vendor -tags "$(WW_BUILD_GO_BUILD_TAGS)" -o ../../config_defaults -mod vendor -tags "$(WW_BUILD_GO_BUILD_TAGS)" -o ../../config_defaults
dist: vendor dist: vendor

6
warewulf.spec.in
View File

@@ -87,8 +87,7 @@ getent group %{wwgroup} >/dev/null || groupadd -r %{wwgroup}
%{_sysconfdir}/bash_completion.d/warewulf %{_sysconfdir}/bash_completion.d/warewulf
%dir %{wwshared}/%{name} %dir %{wwshared}/%{name}
%{wwshared}/%{name}/overlays/runtime/* %{wwshared}/%{name}/overlays/*
%{wwshared}/%{name}/overlays/system/*
%attr(-, root, root) %{_bindir}/wwctl %attr(-, root, root) %{_bindir}/wwctl
%attr(-, root, root) %{_prefix}/lib/firewalld/services/warewulf.xml %attr(-, root, root) %{_prefix}/lib/firewalld/services/warewulf.xml
@@ -96,7 +95,8 @@ getent group %{wwgroup} >/dev/null || groupadd -r %{wwgroup}
%attr(-, root, root) %{_mandir}/man1/wwctl* %attr(-, root, root) %{_mandir}/man1/wwctl*
%changelog %changelog
* Wed Dec 22 2021 Jeremy Siadal <jeremy.c.siadal@intel.com> - 4.2.0-1 * Tue Jan 11 2022 Jeremy Siadal <jeremy.c.siadal@intel.com> - 4.2.0-1
- Merge overlay subdirectories
- Add configuration options to make - Add configuration options to make
- Relocate tftpboot for OpenSUSE - Relocate tftpboot for OpenSUSE
- Remove libexecdir macro; changing in OpenSUSE 15.4 - Remove libexecdir macro; changing in OpenSUSE 15.4