kata-containers/s390-tools
1
0
Fork 0
mirror of https://github.com/ibm-s390-linux/s390-tools.git synced 2026-08-05 02:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Makefile: use common Make definition for DRACUTDIR

Browse Source 
The dracut installation directory is referenced from `chreipl-fcp-mpath`,
`zdev`, and `zipl`; in each with its own individual definition and
variable name. This makes it unnecessarily hard to change it when
installing from the top level directory of s390-tools and passing
variable overwrites via the command line.

Fix this by defining a common `DRACUTDIR` variable in the shared
`common.mak` file, and referencing this in each tool as base directory.
With this a user can simply pass `DRACUTDIR=/foo/bar/baz` on the
commandline and change the installation for all three tools.

Further, also derive common `DRACUTCONFDIR` and `DRACUTMODDIR` variables
from `DRACUTDIR` in `common.mak`, so that `zdev` and `zipl` don't use
different variable names for the same directory anymore, and all these
are defined together in a common place.

Semantically nothing changes for a default build/installation.

Signed-off-by: Benjamin Block <bblock@linux.ibm.com>
Reviewed-by: Peter Oberparleiter <oberpar@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
Benjamin Block
2022-06-29 19:33:20 +02:00
committed by Jan Höppner
parent 9eac2788d7
commit 71461d80bf
4 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
chreipl-fcp-mpath/chreipl-fcp-mpath.mak
View File

@@ -28,8 +28,6 @@ ENABLE_DOC = 0
# https://www.gnu.org/software/make/manual/make.html#Directory-Variables
CHREIPLZFCPMPDIR = $(USRLIBDIR)/chreipl-fcp-mpath
UDEVRUNDIR = /run/udev
DRACUTDIR = $(USRLIBDIR)/dracut
DRACUTCONFDIR = $(DRACUTDIR)/dracut.conf.d
DEBUGOUTDIR = $(UDEVRUNDIR)
INSTALL_EXEC = $(INSTALL) -g $(GROUP) -o $(OWNER) --preserve-timestamps

3
common.mak
View File

@@ -195,6 +195,9 @@ USRINCLUDEDIR = $(INSTALLDIR)/usr/include
ZKEYKMSPLUGINDIR = $(USRLIB64DIR)/zkey
UDEVDIR = $(USRLIBDIR)/udev
UDEVRULESDIR = $(UDEVDIR)/rules.d
DRACUTDIR = $(USRLIBDIR)/dracut
DRACUTCONFDIR = $(DRACUTDIR)/dracut.conf.d
DRACUTMODDIR = $(DRACUTDIR)/modules.d
ifeq ($(LIBDIR),$(INSTALLDIR)/lib)
SOINSTALLDIR = $(USRLIB64DIR)

7
zdev/dracut/Makefile
View File

@@ -1,7 +1,6 @@
# Common definitions
include ../../common.mak
MODDIR := /usr/lib/dracut/modules.d/
ZDEVDIR := 95zdev
# HAVE_DRACUT
@@ -16,9 +15,9 @@ ZDEVDIR := 95zdev
#
ifeq ($(HAVE_DRACUT),1)
install:
$(INSTALL) -m 755 -d $(DESTDIR)$(MODDIR)
$(INSTALL) -m 755 -d $(DESTDIR)$(MODDIR)/$(ZDEVDIR)
$(INSTALL) -m 755 -d $(DESTDIR)$(DRACUTMODDIR)/
$(INSTALL) -m 755 -d $(DESTDIR)$(DRACUTMODDIR)/$(ZDEVDIR)
$(INSTALL) -m 755 $(ZDEVDIR)/module-setup.sh \
$(ZDEVDIR)/parse-zdev.sh \
$(DESTDIR)$(MODDIR)/$(ZDEVDIR)/
$(DESTDIR)$(DRACUTMODDIR)/$(ZDEVDIR)/
endif

13
zipl/dracut/Makefile
View File

@@ -1,7 +1,6 @@
include ../../common.mak
MODULESDIR := /usr/lib/dracut/modules.d/
NGDUMPDIR := 99ngdump
# HAVE_DRACUT
@@ -17,14 +16,14 @@ ifeq ($(HAVE_DRACUT),1)
install:
$(INSTALL) -m 755 zipl_helper.prepare-ngdump \
$(DESTDIR)$(TOOLS_LIBDIR)
$(INSTALL) -m 755 -d $(DESTDIR)$(MODULESDIR)
$(INSTALL) -m 755 -d $(DESTDIR)$(MODULESDIR)/$(NGDUMPDIR)
$(INSTALL) -m 755 -d $(DESTDIR)$(DRACUTMODDIR)/
$(INSTALL) -m 755 -d $(DESTDIR)$(DRACUTMODDIR)/$(NGDUMPDIR)
$(INSTALL) -m 755 $(NGDUMPDIR)/module-setup.sh \
$(DESTDIR)$(MODULESDIR)/$(NGDUMPDIR)/
$(DESTDIR)$(DRACUTMODDIR)/$(NGDUMPDIR)/
$(INSTALL) -m 644 $(NGDUMPDIR)/ngdump.service \
$(DESTDIR)$(MODULESDIR)/$(NGDUMPDIR)/
$(DESTDIR)$(DRACUTMODDIR)/$(NGDUMPDIR)/
$(INSTALL) -m 755 $(NGDUMPDIR)/ngdump.sh \
$(DESTDIR)$(MODULESDIR)/$(NGDUMPDIR)/
$(DESTDIR)$(DRACUTMODDIR)/$(NGDUMPDIR)/
$(INSTALL) -m 755 $(NGDUMPDIR)/ngdump-reipl.sh \
$(DESTDIR)$(MODULESDIR)/$(NGDUMPDIR)/
$(DESTDIR)$(DRACUTMODDIR)/$(NGDUMPDIR)/
endif