[kernel] r11762 - people/waldi/s390/s390-tools/debian/patches

Bastian Blank waldi at alioth.debian.org
Fri Jul 4 10:03:59 UTC 2008


Author: waldi
Date: Fri Jul  4 10:03:54 2008
New Revision: 11762

Log:
* debian/patches/error.patch: Don't ignore submake errors.
* debian/patches/install.patch: Don't strip, don't define owner and group.
* debian/patches/install-qetharp.patch: Only install 2.6 version of qetharp.
* debian/patches/series: Add new patches.


Added:
   people/waldi/s390/s390-tools/debian/patches/error.patch
   people/waldi/s390/s390-tools/debian/patches/install-qetharp.patch
   people/waldi/s390/s390-tools/debian/patches/install.patch
Modified:
   people/waldi/s390/s390-tools/debian/patches/series

Added: people/waldi/s390/s390-tools/debian/patches/error.patch
==============================================================================
--- (empty file)
+++ people/waldi/s390/s390-tools/debian/patches/error.patch	Fri Jul  4 10:03:54 2008
@@ -0,0 +1,24 @@
+--- s390-tools.orig/Makefile
++++ s390-tools/Makefile
+@@ -9,19 +9,8 @@
+ 	SUB_DIRS+=libu2s
+ endif
+ 
+-all: subdirs_make
+-
+-subdirs_make:
+-	set -e ; for dir in $(SUB_DIRS) ; do \
+-		( cd $$dir ; make TOPDIR=$(TOPDIR) ARCH=$(ARCH); cd .. ); \
+-	done
+-
+-clean:
++all clean install:
+ 	set -e ; for dir in $(SUB_DIRS) ; do \
+-		( cd $$dir ; make TOPDIR=$(TOPDIR) ARCH=$(ARCH) clean; cd .. ); \
++		make -C $$dir $@ TOPDIR=$(TOPDIR) ARCH=$(ARCH) || exit 1; \
+ 	done
+ 
+-install: all
+-	set -e ; for dir in $(SUB_DIRS) ; do \
+-		( cd $$dir ; make TOPDIR=$(TOPDIR) ARCH=$(ARCH) install; cd .. ); \
+-	done

Added: people/waldi/s390/s390-tools/debian/patches/install-qetharp.patch
==============================================================================
--- (empty file)
+++ people/waldi/s390/s390-tools/debian/patches/install-qetharp.patch	Fri Jul  4 10:03:54 2008
@@ -0,0 +1,29 @@
+--- s390-tools.orig/qetharp/Makefile
++++ s390-tools/qetharp/Makefile
+@@ -3,22 +3,17 @@
+ 
+ CFLAGS        += -I../include
+ 
+-all: qetharp-2.4 qetharp-2.6
++all: qetharp
+ 
+-qetharp-2.4: qetharp24.c
+-	$(CC) $(CFLAGS) -o qetharp-2.4 qetharp24.c
+-
+-qetharp-2.6: qetharp26.c
+-	$(CC) $(CFLAGS) -o qetharp-2.6 qetharp26.c
++qetharp: qetharp26.c
++	$(CC) $(CFLAGS) -o $@ qetharp26.c
+ 
+ install: all
+ 	$(INSTALL) -d -m 755 $(MANDIR)/man8 $(BINDIR)
+ 	$(INSTALL) -m 755 qetharp $(BINDIR)
+-	$(INSTALL) -m 755 qetharp-2.4 $(BINDIR)
+-	$(INSTALL) -m 755 qetharp-2.6 $(BINDIR)
+ 	$(INSTALL) -m 644 qetharp.8 $(MANDIR)/man8 
+ 
+ clean:
+-	rm -f qetharp-2.4 qetharp-2.6 *.o *~ core
++	rm -f qetharp *.o *~ core
+ 
+ .PHONY: all install clean

Added: people/waldi/s390/s390-tools/debian/patches/install.patch
==============================================================================
--- (empty file)
+++ people/waldi/s390/s390-tools/debian/patches/install.patch	Fri Jul  4 10:03:54 2008
@@ -0,0 +1,303 @@
+--- s390-tools.orig/dasdfmt/Makefile
++++ s390-tools/dasdfmt/Makefile
+@@ -11,8 +11,8 @@
+ 
+ install: all
+ 	$(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man8
+-	$(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 dasdfmt $(BINDIR)
+-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 dasdfmt.8  $(MANDIR)/man8 
++	$(INSTALL) -m 755 dasdfmt $(BINDIR)
++	$(INSTALL) -m 644 dasdfmt.8  $(MANDIR)/man8 
+ 
+ clean:
+ 	rm -f *.o *~ dasdfmt core
+--- s390-tools.orig/dasdinfo/Makefile
++++ s390-tools/dasdinfo/Makefile
+@@ -17,8 +17,8 @@
+ 
+ install: all
+ 	$(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man8
+-	$(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 dasdinfo $(BINDIR)
+-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 dasdinfo.8  $(MANDIR)/man8
++	$(INSTALL) -m 755 dasdinfo $(BINDIR)
++	$(INSTALL) -m 644 dasdinfo.8  $(MANDIR)/man8
+ 
+ clean:
+ 	rm -f *.o *~ dasdinfo core
+--- s390-tools.orig/dasdview/Makefile
++++ s390-tools/dasdview/Makefile
+@@ -17,8 +17,8 @@
+ 
+ install: all
+ 	$(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man8
+-	$(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 dasdview $(BINDIR)
+-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 dasdview.8  $(MANDIR)/man8 
++	$(INSTALL) -m 755 dasdview $(BINDIR)
++	$(INSTALL) -m 644 dasdview.8  $(MANDIR)/man8 
+ 
+ clean:
+ 	rm -f *.o *~ dasdview core
+--- s390-tools.orig/fdasd/Makefile
++++ s390-tools/fdasd/Makefile
+@@ -11,8 +11,8 @@
+ 
+ install: all
+ 	$(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man8
+-	$(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 fdasd $(BINDIR)
+-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 fdasd.8  $(MANDIR)/man8 
++	$(INSTALL) -m 755 fdasd $(BINDIR)
++	$(INSTALL) -m 644 fdasd.8  $(MANDIR)/man8 
+ 
+ clean:
+ 	rm -f *.o *~ fdasd core
+--- s390-tools.orig/ip_watcher/Makefile
++++ s390-tools/ip_watcher/Makefile
+@@ -10,10 +10,9 @@
+ 	@cat start_hsnc.sh | \
+ 	sed -e 's+%S390_TOOLS_VERSION%+$(S390_TOOLS_RELEASE)+' \
+ 	>$(USRSBINDIR)/start_hsnc.sh; \
+-	chown $(OWNER).$(GROUP) $(USRSBINDIR)/start_hsnc.sh; \
+ 	chmod 755 $(USRSBINDIR)/start_hsnc.sh; \
+-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 ip_watcher.pl $(USRSBINDIR)
+-	$(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 xcec-bridge $(USRSBINDIR)
++	$(INSTALL) -m 755 ip_watcher.pl $(USRSBINDIR)
++	$(INSTALL) -m 755 xcec-bridge $(USRSBINDIR)
+ 
+ xcec-bridge: xcec-bridge.c
+ 	$(CC) $(CFLAGS) -o xcec-bridge xcec-bridge.c
+--- s390-tools.orig/mon_tools/Makefile
++++ s390-tools/mon_tools/Makefile
+@@ -12,10 +12,10 @@
+ 	$(CC) $(CFLAGS) -o mon_procd mon_procd.c
+ 
+ install: all
+-	$(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 mon_fsstatd $(USRSBINDIR)
+-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 mon_fsstatd.8  $(MANDIR)/man8
+-	$(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 mon_procd $(USRSBINDIR)
+-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 mon_procd.8 $(MANDIR)/man8
++	$(INSTALL) -m 755 mon_fsstatd $(USRSBINDIR)
++	$(INSTALL) -m 644 mon_fsstatd.8  $(MANDIR)/man8
++	$(INSTALL) -m 755 mon_procd $(USRSBINDIR)
++	$(INSTALL) -m 644 mon_procd.8 $(MANDIR)/man8
+ 
+ clean:
+ 	rm -f *.o *~ mon_fsstatd mon_procd core
+--- s390-tools.orig/osasnmpd/osasnmpd-2.4/Makefile
++++ s390-tools/osasnmpd/osasnmpd-2.4/Makefile
+@@ -8,7 +8,7 @@
+ 	$(CC) -o osasnmpd-2.4 $(OBJS) $(LIBS) 
+ 
+ install: osasnmpd-2.4
+-	$(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 osasnmpd-2.4 $(USRSBINDIR)
++	$(INSTALL) -m 755 osasnmpd-2.4 $(USRSBINDIR)
+ 
+ clean:
+ 	rm -f $(OBJS) osasnmpd-2.4 core
+--- s390-tools.orig/osasnmpd/osasnmpd-2.6/Makefile
++++ s390-tools/osasnmpd/osasnmpd-2.6/Makefile
+@@ -8,7 +8,7 @@
+ 	$(CC) $(CFLAGS) -o osasnmpd-2.6 $(OBJS) $(LIBS) 
+ 
+ install: osasnmpd-2.6
+-	$(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 osasnmpd-2.6 $(USRSBINDIR)
++	$(INSTALL) -m 755 osasnmpd-2.6 $(USRSBINDIR)
+ 
+ clean:
+ 	rm -f $(OBJS) osasnmpd-2.6 core
+--- s390-tools.orig/qetharp/Makefile
++++ s390-tools/qetharp/Makefile
+@@ -14,8 +14,8 @@
+ install: all
+ 	$(INSTALL) -d -m 755 $(MANDIR)/man8 $(BINDIR)
+ 	$(INSTALL) -m 755 qetharp $(BINDIR)
+-	$(INSTALL) -s -m 755 qetharp-2.4 $(BINDIR)
+-	$(INSTALL) -s -m 755 qetharp-2.6 $(BINDIR)
++	$(INSTALL) -m 755 qetharp-2.4 $(BINDIR)
++	$(INSTALL) -m 755 qetharp-2.6 $(BINDIR)
+ 	$(INSTALL) -m 644 qetharp.8 $(MANDIR)/man8 
+ 
+ clean:
+--- s390-tools.orig/tape390/Makefile
++++ s390-tools/tape390/Makefile
+@@ -13,12 +13,10 @@
+ 
+ install: all
+ 	$(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man8
+-	$(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 tape390_display $(BINDIR)
+-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 tape390_display.8 \
+-		$(MANDIR)/man8
+-	$(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 tape390_crypt $(BINDIR)
+-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 tape390_crypt.8 \
+-		$(MANDIR)/man8
++	$(INSTALL) -m 755 tape390_display $(BINDIR)
++	$(INSTALL) -m 644 tape390_display.8 $(MANDIR)/man8
++	$(INSTALL) -m 755 tape390_crypt $(BINDIR)
++	$(INSTALL) -m 644 tape390_crypt.8 $(MANDIR)/man8
+ 
+ clean:
+ 	rm -f *.o *~ tape390_display tape390_crypt core
+--- s390-tools.orig/vmconvert/Makefile
++++ s390-tools/vmconvert/Makefile
+@@ -16,8 +16,8 @@
+ 
+ install: all
+ 	$(INSTALL) -d -m 755 $(USRBINDIR) $(MANDIR)/man8
+-	$(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 vmconvert $(USRBINDIR)
+-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 vmconvert.8  $(MANDIR)/man8
++	$(INSTALL) -m 755 vmconvert $(USRBINDIR)
++	$(INSTALL) -m 644 vmconvert.8  $(MANDIR)/man8
+ 
+ clean:
+ 	rm -f *.o *~ vmconvert core
+--- s390-tools.orig/vmcp/Makefile
++++ s390-tools/vmcp/Makefile
+@@ -11,8 +11,8 @@
+ 
+ install: all
+ 	$(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man8
+-	$(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 vmcp $(BINDIR)
+-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 vmcp.8 $(MANDIR)/man8 
++	$(INSTALL) -m 755 vmcp $(BINDIR)
++	$(INSTALL) -m 644 vmcp.8 $(MANDIR)/man8 
+ 
+ clean:
+ 	rm -f *.o *~ vmcp core
+--- s390-tools.orig/vmur/Makefile
++++ s390-tools/vmur/Makefile
+@@ -10,9 +10,8 @@
+ 
+ install: all
+ 	$(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man8
+-	$(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 vmur $(BINDIR)
+-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 vmur.8 \
+-		$(MANDIR)/man8
++	$(INSTALL) -m 755 vmur $(BINDIR)
++	$(INSTALL) -m 644 vmur.8 $(MANDIR)/man8
+ 
+ clean:
+ 	rm -f *.o *~ vmur
+--- s390-tools.orig/zipl/src/Makefile
++++ s390-tools/zipl/src/Makefile
+@@ -20,7 +20,7 @@
+ install: all
+ 	@echo $(INSTALL)
+ 	$(INSTALL) -d -m 755 $(BINDIR)
+-	$(INSTALL) -s -c zipl $(BINDIR)
++	$(INSTALL) zipl $(BINDIR)
+ 
+ clean:
+ 	rm -f *.o zipl
+--- s390-tools.orig/common.mak
++++ s390-tools/common.mak
+@@ -32,9 +32,7 @@
+ BINDIR          = $(INSTROOT)/sbin
+ LIBDIR          = $(INSTROOT)/lib
+ MANDIR          = $(INSTROOT)/usr/share/man
+-OWNER           = $(shell id -un)
+-GROUP		= $(shell id -gn)
+-export INSTROOT BINDIR LIBDIR MANDIR OWNER GROUP
++export INSTROOT BINDIR LIBDIR MANDIR
+ 
+ # Special defines for zfcpdump
+ ZFCPDUMP_DIR    = /usr/local/share/zfcpdump
+--- s390-tools.orig/man/Makefile
++++ s390-tools/man/Makefile
+@@ -6,8 +6,8 @@
+ 
+ install:
+ 	$(INSTALL) -d -m 755 $(MANDIR)/man8
+-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 dumpconf.8 $(MANDIR)/man8
++	$(INSTALL) -m 644 dumpconf.8 $(MANDIR)/man8
+ 	$(INSTALL) -d -m 755 $(MANDIR)/man4
+-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 prandom.4 $(MANDIR)/man4
++	$(INSTALL) -m 644 prandom.4 $(MANDIR)/man4
+ 
+ .PHONY: all install clean
+--- s390-tools.orig/osasnmpd/Makefile
++++ s390-tools/osasnmpd/Makefile
+@@ -13,7 +13,7 @@
+ install: all
+ 	$(INSTALL) -d -m 755 $(USRSBINDIR) $(MANDIR)/man8
+ 	for i in $(DIRS); do make install -C $$i; done
+-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 osasnmpd $(USRSBINDIR)
+-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 osasnmpd.8  $(MANDIR)/man8
++	$(INSTALL) -m 755 osasnmpd $(USRSBINDIR)
++	$(INSTALL) -m 644 osasnmpd.8  $(MANDIR)/man8
+ 
+ .PHONY: all install clean
+--- s390-tools.orig/qethconf/Makefile
++++ s390-tools/qethconf/Makefile
+@@ -8,10 +8,9 @@
+ 	cat qethconf | \
+ 	sed -e 's+%S390_TOOLS_VERSION%+$(S390_TOOLS_RELEASE)+' \
+ 	>$(BINDIR)/qethconf; \
+-	chown $(OWNER).$(GROUP) $(BINDIR)/qethconf; \
+ 	chmod 755 $(BINDIR)/qethconf; \
+ 	$(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man8
+-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 qethconf.8  $(MANDIR)/man8
++	$(INSTALL) -m 644 qethconf.8  $(MANDIR)/man8
+ 
+ clean:
+ 
+--- s390-tools.orig/scripts/Makefile
++++ s390-tools/scripts/Makefile
+@@ -12,10 +12,9 @@
+ 		cat $$i | \
+ 		sed -e 's+%S390_TOOLS_VERSION%+$(S390_TOOLS_RELEASE)+' \
+ 		>$(BINDIR)/$$i; \
+-		chown $(OWNER):$(GROUP) $(BINDIR)/$$i; \
+ 		chmod 755 $(BINDIR)/$$i; \
+ 	done
+-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 zfcpdbf.1 $(MANDIR)/man1;
++	$(INSTALL) -m 644 zfcpdbf.1 $(MANDIR)/man1;
+ 
+ clean:
+ 
+--- s390-tools.orig/zconf/Makefile
++++ s390-tools/zconf/Makefile
+@@ -19,21 +19,18 @@
+ 		cat $$i | \
+ 		sed -e 's+%S390_TOOLS_VERSION%+$(S390_TOOLS_RELEASE)+' \
+ 		>$(BINDIR)/$$i; \
+-		chown $(OWNER).$(GROUP) $(BINDIR)/$$i; \
+ 		chmod 755 $(BINDIR)/$$i; \
+ 	done
+ 
+ install-manpages:	$(MANPAGES)
+ 	@if [ ! -d $(MANDIR) ]; then \
+ 		mkdir -p $(MANDIR)/man8; \
+-		chown $(OWNER).$(GROUP) $(MANDIR); \
+-		chown $(OWNER).$(GROUP) $(MANDIR)/man8; \
+ 		chmod 755 $(MANDIR); \
+ 		chmod 755 $(MANDIR)/man8; \
+ 	fi; \
+ 	for i in $^; do \
+ 		echo "Installing $$i to $(MANDIR)/man8"; \
+-		install -o $(OWNER) -g $(GROUP) -m 644 $$i $(MANDIR)/man8; \
++		install -m 644 $$i $(MANDIR)/man8; \
+ 	done
+ 
+ .PHONY: all install clean install-scripts install-manpages
+--- s390-tools.orig/zfcpdump_v2/Makefile
++++ s390-tools/zfcpdump_v2/Makefile
+@@ -30,8 +30,7 @@
+ 
+ install: all
+ 	$(INSTALL) -d $(INSTROOT)/$(ZFCPDUMP_DIR) -m 775
+-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 zfcpdump.image \
+-		$(INSTROOT)/$(ZFCPDUMP_DIR)
++	$(INSTALL) -m 644 zfcpdump.image $(INSTROOT)/$(ZFCPDUMP_DIR)
+ 
+ clean:
+ 	rm -f *.o *~ zfcpdump zfcpdump.image e2fsck
+--- s390-tools.orig/tunedasd/src/Makefile
++++ s390-tools/tunedasd/src/Makefile
+@@ -15,7 +15,7 @@
+ 
+ install: all
+ 	$(INSTALL) -d -m 755 $(BINDIR)
+-	$(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 tunedasd $(BINDIR)
++	$(INSTALL) -m 755 tunedasd $(BINDIR)
+ 
+ clean:
+ 	rm -f *.o tunedasd

Modified: people/waldi/s390/s390-tools/debian/patches/series
==============================================================================
--- people/waldi/s390/s390-tools/debian/patches/series	(original)
+++ people/waldi/s390/s390-tools/debian/patches/series	Fri Jul  4 10:03:54 2008
@@ -1 +1,4 @@
 common-cflags.patch
+error.patch
+install.patch
+install-qetharp.patch



More information about the Kernel-svn-changes mailing list