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

zipl: move responsibility for the stage3.bin installation to boot/Makefile

Browse Source 
Move the code responsible for installing stage3.bin to the
boot/Makefile. In addition, remove the stage3.bin from the Makefile
`all` target prerequisites in src/Makefile, as zipl can be built without
it. While at it, use $(INSTALL) instead of $(CP) for the bootloader
installation.

Reviewed-by: Steffen Eiden <seiden@linux.ibm.com>
Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
Marc Hartmayer
2023-09-21 16:45:45 +02:00
committed by Jan Höppner
parent b68ea5fc7d
commit 093da2a5a7
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
zipl/Makefile
View File

@@ -6,6 +6,7 @@ all:
$(MAKE) -C src
install: all
$(MAKE) -C boot install
$(MAKE) -C src install
$(MAKE) -C man install
$(MAKE) -C dracut install

4
zipl/boot/Makefile
View File

@@ -26,6 +26,10 @@ all: .loaders $(FILES) $(DEBUG_FILES)
.loaders: $(INC_FILES)
touch .loaders
install: stage3.bin
$(INSTALL) -d -m 755 "$(DESTDIR)$(TOOLS_LIBDIR)"
$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 stage3.bin "$(DESTDIR)$(TOOLS_LIBDIR)"
# Prevent make from using some default rules...
%: %.S

7
zipl/src/Makefile
View File

@@ -14,9 +14,8 @@ objects = misc.o error.o scan.o job.o boot.o bootmap.o fs-map.o disk.o \
zipl_helpers = $(basename $(wildcard zipl_helper.*.c))
chreipl_helpers = $(subst zipl_,chreipl_, $(zipl_helpers))
zipl_stage3 = ../boot/stage3.bin
all: zipl zipl-editenv $(chreipl_helpers) $(zipl_stage3)
all: zipl zipl-editenv $(chreipl_helpers)
boot.o: ../boot/.loaders
zipl: $(objects) $(libs)
@@ -38,7 +37,6 @@ install: all
$(INSTALL) -m 755 $(zipl_helpers) $(chreipl_helpers) \
$(DESTDIR)$(TOOLS_LIBDIR)
$(CP) --no-dereference $(chreipl_helpers) $(DESTDIR)$(TOOLS_LIBDIR)
$(CP) --no-dereference $(zipl_stage3) $(DESTDIR)$(TOOLS_LIBDIR)
clean:
rm -f *.o $(zipl_helpers) $(chreipl_helpers) zipl zipl-editenv
@@ -49,6 +47,3 @@ clean:
../boot/.loaders:
$(MAKE) -C ../boot .loaders
../boot/stage3.bin:
$(MAKE) -C ../boot stage3.bin