From a083122ad9bd6bb504570e67ba1657db735c9ba7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Mon, 1 Nov 2021 11:26:31 +0100
Subject: [PATCH] remove obsolete patches

---
 smc-tools-1.5.0-flags.patch    | 90 ----------------------------------
 smc-tools-1.5.0-makefile.patch | 29 -----------
 2 files changed, 119 deletions(-)
 delete mode 100644 smc-tools-1.5.0-flags.patch
 delete mode 100644 smc-tools-1.5.0-makefile.patch

diff --git a/smc-tools-1.5.0-flags.patch b/smc-tools-1.5.0-flags.patch
deleted file mode 100644
index be26020..0000000
--- a/smc-tools-1.5.0-flags.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 427fc71..b80eaf1 100644
---- a/Makefile
-+++ b/Makefile
-@@ -61,16 +61,16 @@ endif
- all: libsmc-preload.so libsmc-preload32.so smcd smcr smcss smc_pnet
- 
- CFLAGS ?= -Wall -O3 -g
--ALL_CFLAGS = -DSMC_TOOLS_RELEASE=$(SMC_TOOLS_RELEASE) $(CFLAGS)
--
- ifneq ($(shell sh -c 'command -v pkg-config'),)
--SMC_PNET_CFLAGS = $(shell pkg-config --silence-errors --cflags libnl-genl-3.0)
--SMC_PNET_LFLAGS = $(shell pkg-config --silence-errors --libs libnl-genl-3.0)
-+LIBNL_CFLAGS = $(shell pkg-config --silence-errors --cflags libnl-genl-3.0)
-+LIBNL_LFLAGS = $(shell pkg-config --silence-errors --libs libnl-genl-3.0)
- else
--SMC_PNET_CFLAGS = -I /usr/include/libnl3
--SMC_PNET_LFLAGS = -lnl-genl-3 -lnl-3
-+LIBNL_CFLAGS = -I /usr/include/libnl3
-+LIBNL_LFLAGS = -lnl-genl-3 -lnl-3
- endif
--CFLAGS += ${SMC_PNET_CFLAGS}
-+ALL_CFLAGS += ${CFLAGS} -DSMC_TOOLS_RELEASE=$(SMC_TOOLS_RELEASE) \
-+              ${LIBNL_CFLAGS} ${OPTFLAGS}
-+ALL_LDFLAGS += ${LDFLAGS} ${LIBNL_LFLAGS}
- 
- ifeq ($(ARCHTYPE),s390x)
- 	MACHINE_OPT32="-m31"
-@@ -79,23 +79,23 @@ else
- endif
- 
- util.o: util.c  util.h
--	${CCC} ${CFLAGS} -c util.c
-+	${CCC} ${ALL_CFLAGS} -c util.c
- 
- libnetlink.o: libnetlink.c  libnetlink.h
--	${CCC} ${CFLAGS} ${LDFLAGS} -c libnetlink.c
-+	${CCC} ${ALL_CFLAGS} ${ALL_LDFLAGS} -c libnetlink.c
- 
- smc-preload.o: smc-preload.c
--	${CCC} ${CFLAGS} -fPIC -c smc-preload.c
-+	${CCC} ${ALL_CFLAGS} -fPIC -c smc-preload.c
- 
- libsmc-preload.so: smc-preload.o
--	${LINK} ${LDFLAGS} -shared smc-preload.o -ldl -Wl,-z,defs,-soname,$@.$(VER_MAJOR) -o $@
-+	${LINK} ${ALL_LDFLAGS} -shared smc-preload.o -ldl -Wl,-z,defs,-soname,$@.$(VER_MAJOR) -o $@
- 	chmod u+s $@
- 
- libsmc-preload32.so: smc-preload.c
- ifeq ($(ARCH),64)
- ifeq ($(STUFF_32BIT),1)
--	${CCC} ${CFLAGS} -fPIC -c ${MACHINE_OPT32} $< -o smc-preload32.o
--	${LINK} ${LDFLAGS} -shared smc-preload32.o ${MACHINE_OPT32} -ldl -Wl,-soname,$@.$(VER_MAJOR) -o $@
-+	${CCC} ${ALL_CFLAGS} -fPIC -c ${MACHINE_OPT32} $< -o smc-preload32.o
-+	${LINK} ${ALL_LDFLAGS} -shared smc-preload32.o ${MACHINE_OPT32} -ldl -Wl,-soname,$@.$(VER_MAJOR) -o $@
- 	chmod u+s $@
- else
- 	$(warning "Warning: Skipping 31/32-bit library build because 31/32-bit build tools")
-@@ -116,13 +116,13 @@ endif
- 	${CCC} ${ALL_CFLAGS} -c $< -o $@
- 
- smc: smc.o dev.o linkgroup.o libnetlink.o util.o
--	${CCC} ${ALL_CFLAGS} ${LDFLAGS} $^ ${SMC_PNET_LFLAGS} -o $@
-+	${CCC} ${ALL_CFLAGS} ${ALL_LDFLAGS} $^ -o $@
- 
- smcd: smcd.o infod.o devd.o linkgroupd.o libnetlink.o util.o
--	${CCC} ${ALL_CFLAGS} ${LDFLAGS} $^ ${SMC_PNET_LFLAGS} -o $@
-+	${CCC} ${ALL_CFLAGS} $^ ${ALL_LDFLAGS} -o $@
- 
- smcr: smcr.o infor.o devr.o linkgroupr.o libnetlink.o util.o
--	${CCC} ${ALL_CFLAGS} ${LDFLAGS} $^ ${SMC_PNET_LFLAGS} -o $@
-+	${CCC} ${ALL_CFLAGS} $^ ${ALL_LDFLAGS} -o $@
- 
- smc_pnet: smc_pnet.c smctools_common.h
- 	@if [ ! -e /usr/include/libnl3/netlink/netlink.h ]; then \
-@@ -135,12 +135,10 @@ smc_pnet: smc_pnet.c smctools_common.h
- 		printf "**************************************************************\n" >&2; \
- 		exit 1; \
- 	fi
--	${CCC} ${ALL_CFLAGS} ${SMC_PNET_CFLAGS} ${LDFLAGS} -o $@ $< ${SMC_PNET_LFLAGS}
-+	${CCC} ${ALL_CFLAGS} $< ${ALL_LDFLAGS} -o $@
- 
- smcss: smcss.o libnetlink.o
--	${CCC} ${ALL_CFLAGS} ${LDFLAGS} $^ ${SMC_PNET_LFLAGS} -o $@
--#smcss: smcss.c smctools_common.h libnetlink.h
--#	${CCC} ${ALL_CFLAGS} ${LDFLAGS} $< -o $@
-+	${CCC} ${ALL_CFLAGS} $^ ${ALL_LDFLAGS} -o $@
- 
- install: all
- 	echo "  INSTALL"
diff --git a/smc-tools-1.5.0-makefile.patch b/smc-tools-1.5.0-makefile.patch
deleted file mode 100644
index 7d254dd..0000000
--- a/smc-tools-1.5.0-makefile.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From c3d1f45abff2433afefaea9d31cd9cda0a7408d3 Mon Sep 17 00:00:00 2001
-From: Stefan Raspl <raspl@de.ibm.com>
-Date: Mon, 8 Feb 2021 16:43:01 +0100
-Subject: [PATCH] Makefile: Install smc_chk.8 on s390 only
-
-Since smc_chk depends on smc_rnics (which is s390-only), we should not
-install the man-page on non-s390 platforms, too.
-
-Signed-off-by: Stefan Raspl <raspl@linux.ibm.com>
----
- Makefile  | 2 +-
- README.md | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index a9068d0..427fc71 100644
---- a/Makefile
-+++ b/Makefile
-@@ -161,9 +161,9 @@ ifeq ($(shell uname -m | cut -c1-4),s390)
- 	install $(INSTALL_FLAGS_BIN) smc_rnics $(DESTDIR)$(BINDIR)
- 	install $(INSTALL_FLAGS_MAN) smc_rnics.8 $(DESTDIR)$(MANDIR)/man8
- 	install $(INSTALL_FLAGS_BIN) smc_chk $(DESTDIR)$(BINDIR)
-+	install $(INSTALL_FLAGS_MAN) smc_chk.8 $(DESTDIR)$(MANDIR)/man8
- endif
- 	install $(INSTALL_FLAGS_MAN) af_smc.7 $(DESTDIR)$(MANDIR)/man7
--	install $(INSTALL_FLAGS_MAN) smc_chk.8 $(DESTDIR)$(MANDIR)/man8
- 	install $(INSTALL_FLAGS_MAN) smc_run.8 $(DESTDIR)$(MANDIR)/man8
- 	install $(INSTALL_FLAGS_MAN) smc_pnet.8 $(DESTDIR)$(MANDIR)/man8
- 	install $(INSTALL_FLAGS_MAN) smcss.8 $(DESTDIR)$(MANDIR)/man8