Makefile: Rename ZFCPDUMP_PART_* macros

PATCH New Philipp Rudo 1 participant 1 message Aug 7, 2018 s390

Share & tools

Philipp Rudo

author

2018-08-07 13:33 UTC #0 lore raw

PATCH v2 3/5 Makefile: Rename ZFCPDUMP_PART_* macros

The file system dumper no longer exists. So there is no need in keeping 'PART' to distinguish between the file system and the partition dumper. Adjust the macro name to the usage in zipl by removing 'PART'.

While at it also adjust the file names the macros stand for.

Signed-off-by Philipp Rudo <[email protected]>

Reviewed-by Hendrik Brueckner <[email protected]>

Reviewed-by Javier Martinez Canillas <[email protected]>

---
 .gitignore        |  2 +-
 common.mak        |  6 +++---
 zfcpdump/Makefile | 10 +++++-----
 zipl/src/Makefile |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

.gitignore +1 -1

index 41feaf6b..6741256b 100644
@@ -76,7 +76,7 @@ zdsfs/zdsfs
 zdump/zgetdump
 zfcpdump/cpioinit
 zfcpdump/zfcpdump_part
-zfcpdump/zfcpdump_part.rd
+zfcpdump/zfcpdump-initrd
 ziomon/ziomon_mgr
 ziomon/ziomon_util
 ziomon/ziomon_zfcpdd

common.mak +3 -3

index 9bd613fb..986ff303 100644
@@ -182,9 +182,9 @@ GROUP		= $(shell id -gn)
 export INSTALLDIR BINDIR LIBDIR MANDIR OWNER GROUP
 
 # Special defines for zfcpdump
-ZFCPDUMP_PART_IMAGE	= zfcpdump_part.image
-ZFCPDUMP_PART_RD	= zfcpdump_part.rd
-export ZFCPDUMP_DIR ZFCPDUMP_PART_IMAGE ZFCPDUMP_PART_RD
+ZFCPDUMP_IMAGE	= zfcpdump-image
+ZFCPDUMP_INITRD	= zfcpdump-initrd
+export ZFCPDUMP_DIR ZFCPDUMP_IMAGE ZFCPDUMP_INITRD
 
 CFLAGS		?= $(DEFAULT_CFLAGS) $(OPT_FLAGS)
 HOSTCFLAGS	?= $(DEFAULT_CFLAGS) $(OPT_FLAGS)

zfcpdump/Makefile +5 -5

index 5fcb0739..1d9cce53 100644
@@ -20,7 +20,7 @@ check_dep:
 		"HAVE_LIBC_STATIC=0", \
 		"-static")
 
-all: check_dep $(ZFCPDUMP_PART_RD)
+all: check_dep $(ZFCPDUMP_INITRD)
 
 cpioinit: cpioinit.c
 	$(HOSTCC) $(HOSTCFLAGS) -o $@ $^

@@ -29,17 +29,17 @@ zfcpdump_part: zfcpdump.o zfcpdump_part.o
 	$(LINK) $(ALL_LDFLAGS) $^ -static -o $@
 	$(STRIP) -s $@
 
-$(ZFCPDUMP_PART_RD): cpioinit zfcpdump_part
+$(ZFCPDUMP_INITRD): cpioinit zfcpdump_part
 	$(CPIOINIT) zfcpdump_part > [email protected]
 	$(GZIP) -f [email protected]
-	$(MV) [email protected] $(ZFCPDUMP_PART_RD)
+	$(MV) [email protected] $(ZFCPDUMP_INITRD)
 
 install: all
-	$(INSTALL) -m 611 $(ZFCPDUMP_PART_RD) $(DESTDIR)$(ZFCPDUMP_DIR)
+	$(INSTALL) -m 611 $(ZFCPDUMP_INITRD) $(DESTDIR)$(ZFCPDUMP_DIR)
 
 endif
 
 clean:
-	rm -f *.o *.gz *.tmp *~ zfcpdump_part cpioinit $(ZFCPDUMP_PART_RD)
+	rm -f *.o *.gz *.tmp *~ zfcpdump_part cpioinit $(ZFCPDUMP_INITRD)
 
 .PHONY: all clean install check_dep

zipl/src/Makefile +2 -2

index f8c36dc2..b9018b4b 100644
@@ -3,8 +3,8 @@ include ../../common.mak
 
 ALL_CPPFLAGS += -I../include -I../boot \
 	    -DZFCPDUMP_DIR=$(ZFCPDUMP_DIR) \
-	    -DZFCPDUMP_PART_IMAGE=$(ZFCPDUMP_PART_IMAGE) \
-	    -DZFCPDUMP_PART_RD=$(ZFCPDUMP_PART_RD) \
+	    -DZFCPDUMP_PART_IMAGE=$(ZFCPDUMP_IMAGE) \
+	    -DZFCPDUMP_PART_RD=$(ZFCPDUMP_INITRD) \
 	    -D_FILE_OFFSET_BITS=64 $(NO_PIE_CFLAGS)
 ALL_LDFLAGS += -Wl,-z,noexecstack $(NO_PIE_LDFLAGS)

Signature · 1 line

2.16.4