[kernel] r15028 - people/waldi/s390/s390-tools/debian/patches
Bastian Blank
waldi at alioth.debian.org
Wed Jan 27 10:46:52 UTC 2010
Author: waldi
Date: Wed Jan 27 10:46:51 2010
New Revision: 15028
Log:
debian/patches: Adopt to new source.
Modified:
people/waldi/s390/s390-tools/debian/patches/common-cflags.patch
people/waldi/s390/s390-tools/debian/patches/disable.patch
people/waldi/s390/s390-tools/debian/patches/error.patch
people/waldi/s390/s390-tools/debian/patches/install.patch
people/waldi/s390/s390-tools/debian/patches/zipl-optional.patch
Modified: people/waldi/s390/s390-tools/debian/patches/common-cflags.patch
==============================================================================
--- people/waldi/s390/s390-tools/debian/patches/common-cflags.patch Wed Jan 27 10:45:36 2010 (r15027)
+++ people/waldi/s390/s390-tools/debian/patches/common-cflags.patch Wed Jan 27 10:46:51 2010 (r15028)
@@ -1,11 +1,15 @@
---- s390-tools.orig/common.mak
-+++ s390-tools/common.mak
-@@ -22,7 +22,7 @@
- OBJCOPY = $(CROSS_COMPILE)objcopy
- OBJDUMP = $(CROSS_COMPILE)objdump
- INSTALL = install # FIXME: We need s390-install (strip)
--CFLAGS = $(OPT_FLAGS) -Wall -O3 -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE)
-+CFLAGS += $(OPT_FLAGS) -Wall -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE)
+--- a/common.mak
++++ b/common.mak
+@@ -41,10 +41,8 @@
+ else
+ WARNFLAGS = -W -Wall
+ endif
+-CFLAGS = $(WARNFLAGS) -O3 -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \
+- $(OPT_FLAGS)
+-CXXFLAGS = $(WARNFLAGS) -O3 -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \
+- $(OPT_FLAGS)
++CFLAGS += $(WARNFLAGS) -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE)
++CXXFLAGS += $(WARNFLAGS) -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE)
export AS LD CC CPP AR NM STRIP OBJCOPY OBJDUMP INSTALL CFLAGS
# Support alternate install root
Modified: people/waldi/s390/s390-tools/debian/patches/disable.patch
==============================================================================
--- people/waldi/s390/s390-tools/debian/patches/disable.patch Wed Jan 27 10:45:36 2010 (r15027)
+++ people/waldi/s390/s390-tools/debian/patches/disable.patch Wed Jan 27 10:46:51 2010 (r15028)
@@ -1,11 +1,15 @@
---- s390-tools.orig/Makefile
-+++ s390-tools/Makefile
-@@ -3,7 +3,7 @@
- # Include commond definitions
- include common.mak
+--- a/Makefile
++++ b/Makefile
+@@ -5,9 +5,9 @@
--SUB_DIRS = libvtoc zipl zdump zfcpdump fdasd dasdfmt dasdview tunedasd tape390 osasnmpd qetharp ip_watcher qethconf scripts zconf vmconvert vmcp man mon_tools dasdinfo vmur
-+SUB_DIRS = libvtoc zipl zdump fdasd dasdfmt dasdview tunedasd tape390 qetharp qethconf scripts zconf vmconvert vmcp man mon_tools dasdinfo vmur
+ LIB_DIRS = libvtoc libu2s
+ SUB_DIRS = $(LIB_DIRS) zipl zdump fdasd dasdfmt dasdview tunedasd \
+- tape390 osasnmpd qetharp ip_watcher qethconf scripts zconf \
+- vmconvert vmcp man mon_tools dasdinfo vmur cpuplugd ipl_tools \
+- ziomon iucvterm
++ tape390 qetharp qethconf scripts zconf \
++ vmconvert vmcp man mon_tools dasdinfo ipl_tools \
++ iucvterm
- ifeq ($(strip $(SYSFS)),true)
- SUB_DIRS+=libu2s
+ all clean install:
+ set -e ; for dir in $(SUB_DIRS) ; do \
Modified: people/waldi/s390/s390-tools/debian/patches/error.patch
==============================================================================
--- people/waldi/s390/s390-tools/debian/patches/error.patch Wed Jan 27 10:45:36 2010 (r15027)
+++ people/waldi/s390/s390-tools/debian/patches/error.patch Wed Jan 27 10:46:51 2010 (r15028)
@@ -1,24 +1,24 @@
---- s390-tools.orig/Makefile
-+++ s390-tools/Makefile
-@@ -9,19 +9,8 @@
- SUB_DIRS+=libu2s
- endif
+--- a/Makefile
++++ b/Makefile
+@@ -9,19 +9,7 @@
+ vmconvert vmcp man mon_tools dasdinfo vmur cpuplugd ipl_tools \
+ ziomon iucvterm
-all: subdirs_make
-
-subdirs_make:
- set -e ; for dir in $(SUB_DIRS) ; do \
-- ( cd $$dir ; make TOPDIR=$(TOPDIR) ARCH=$(ARCH); cd .. ); \
+- ( cd $$dir ; $(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH); cd .. ); \
- done
-
-clean:
+- set -e ; for dir in $(SUB_DIRS) ; do \
+- ( cd $$dir ; $(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH) clean; cd .. ); \
+- done
+-
+-install:
+all clean install:
set -e ; for dir in $(SUB_DIRS) ; do \
-- ( cd $$dir ; make TOPDIR=$(TOPDIR) ARCH=$(ARCH) clean; cd .. ); \
+- ( cd $$dir ; $(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH) install; 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
Modified: people/waldi/s390/s390-tools/debian/patches/install.patch
==============================================================================
--- people/waldi/s390/s390-tools/debian/patches/install.patch Wed Jan 27 10:45:36 2010 (r15027)
+++ people/waldi/s390/s390-tools/debian/patches/install.patch Wed Jan 27 10:46:51 2010 (r15028)
@@ -1,198 +1,204 @@
---- s390-tools.orig/dasdfmt/Makefile
-+++ s390-tools/dasdfmt/Makefile
-@@ -11,8 +11,8 @@
+--- a/dasdfmt/Makefile
++++ b/dasdfmt/Makefile
+@@ -9,9 +9,9 @@
+ dasdfmt: dasdfmt.o ../libvtoc/vtoc.o
install: all
- $(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man8
-- $(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 dasdfmt $(BINDIR)
+- $(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man8
+- $(INSTALL) -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
++ $(INSTALL) -d $(BINDIR) $(MANDIR)/man8
++ $(INSTALL) dasdfmt $(BINDIR)
++ $(INSTALL_DATA) dasdfmt.8 $(MANDIR)/man8
clean:
rm -f *.o *~ dasdfmt core
---- s390-tools.orig/dasdinfo/Makefile
-+++ s390-tools/dasdinfo/Makefile
-@@ -17,8 +17,8 @@
+--- a/dasdinfo/Makefile
++++ b/dasdinfo/Makefile
+@@ -7,9 +7,9 @@
+ dasdinfo: dasdinfo.o ../libu2s/u2s.o
install: all
- $(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man8
-- $(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 dasdinfo $(BINDIR)
+- $(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man8
+- $(INSTALL) -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
++ $(INSTALL) -d $(BINDIR) $(MANDIR)/man8
++ $(INSTALL) dasdinfo $(BINDIR)
++ $(INSTALL_DATA) dasdinfo.8 $(MANDIR)/man8
clean:
rm -f *.o *~ dasdinfo core
---- s390-tools.orig/dasdview/Makefile
-+++ s390-tools/dasdview/Makefile
-@@ -17,8 +17,8 @@
+--- a/dasdview/Makefile
++++ b/dasdview/Makefile
+@@ -9,9 +9,9 @@
+ dasdview: dasdview.o ../libvtoc/vtoc.o ../libu2s/u2s.o
install: all
- $(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man8
-- $(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 dasdview $(BINDIR)
+- $(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man8
+- $(INSTALL) -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
++ $(INSTALL) -d $(BINDIR) $(MANDIR)/man8
++ $(INSTALL) dasdview $(BINDIR)
++ $(INSTALL_DATA) dasdview.8 $(MANDIR)/man8
clean:
rm -f *.o *~ dasdview core
---- s390-tools.orig/fdasd/Makefile
-+++ s390-tools/fdasd/Makefile
-@@ -11,8 +11,8 @@
+--- a/fdasd/Makefile
++++ b/fdasd/Makefile
+@@ -9,9 +9,9 @@
+ fdasd: fdasd.o ../libvtoc/vtoc.o
install: all
- $(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man8
-- $(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 fdasd $(BINDIR)
+- $(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man8
+- $(INSTALL) -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
++ $(INSTALL) -d $(BINDIR) $(MANDIR)/man8
++ $(INSTALL) fdasd $(BINDIR)
++ $(INSTALL_DATA) 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 @@
+--- a/ip_watcher/Makefile
++++ b/ip_watcher/Makefile
+@@ -12,9 +12,8 @@
@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; \
+- 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) -g $(GROUP) -o $(OWNER) -m 755 xcec-bridge $(USRSBINDIR)
++ chmod 755 $(USRSBINDIR)/start_hsnc.sh
++ $(INSTALL) ip_watcher.pl $(USRSBINDIR)
++ $(INSTALL) xcec-bridge $(USRSBINDIR)
+
+ .PHONY: all install clean
+--- a/mon_tools/Makefile
++++ b/mon_tools/Makefile
+@@ -11,10 +11,10 @@
+ mon_procd: mon_procd.o
install: all
-- $(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 mon_fsstatd $(USRSBINDIR)
+- $(INSTALL) -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 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
++ $(INSTALL) mon_fsstatd $(USRSBINDIR)
++ $(INSTALL_DATA) mon_fsstatd.8 $(MANDIR)/man8
++ $(INSTALL) mon_procd $(USRSBINDIR)
++ $(INSTALL_DATA) 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)
+--- a/qetharp/Makefile
++++ b/qetharp/Makefile
+@@ -9,9 +9,9 @@
+ qetharp: qetharp.o
- 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
+- $(INSTALL) -d -m 755 $(MANDIR)/man8 $(BINDIR)
+- $(INSTALL) -m 755 qetharp $(BINDIR)
+- $(INSTALL) -m 644 qetharp.8 $(MANDIR)/man8
++ $(INSTALL) -d $(MANDIR)/man8 $(BINDIR)
++ $(INSTALL) qetharp $(BINDIR)
++ $(INSTALL_DATA) qetharp.8 $(MANDIR)/man8
clean:
---- s390-tools.orig/tape390/Makefile
-+++ s390-tools/tape390/Makefile
-@@ -13,12 +13,10 @@
+ rm -f qetharp *.o *~ core
+--- a/tape390/Makefile
++++ b/tape390/Makefile
+@@ -13,13 +13,11 @@
+ tape390_crypt: tape390_crypt.o tape390_common.o
install: all
- $(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man8
-- $(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 tape390_display $(BINDIR)
+- $(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man8
+- $(INSTALL) -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 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
++ $(INSTALL) -d $(BINDIR) $(MANDIR)/man8
++ $(INSTALL) tape390_display $(BINDIR)
++ $(INSTALL_DATA) tape390_display.8 $(MANDIR)/man8
++ $(INSTALL) tape390_crypt $(BINDIR)
++ $(INSTALL_DATA) 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 @@
+--- a/vmconvert/Makefile
++++ b/vmconvert/Makefile
+@@ -14,9 +14,9 @@
+ $(LINKXX) $^ -o $@ -lz
install: all
- $(INSTALL) -d -m 755 $(USRBINDIR) $(MANDIR)/man8
-- $(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 vmconvert $(USRBINDIR)
+- $(INSTALL) -d -m 755 $(USRBINDIR) $(MANDIR)/man8
+- $(INSTALL) -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
++ $(INSTALL) -d $(USRBINDIR) $(MANDIR)/man8
++ $(INSTALL) vmconvert $(USRBINDIR)
++ $(INSTALL_DATA) vmconvert.8 $(MANDIR)/man8
clean:
rm -f *.o *~ vmconvert core
---- s390-tools.orig/vmcp/Makefile
-+++ s390-tools/vmcp/Makefile
-@@ -11,8 +11,8 @@
+--- a/vmcp/Makefile
++++ b/vmcp/Makefile
+@@ -9,9 +9,9 @@
+ vmcp: vmcp.o
install: all
- $(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man8
-- $(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 vmcp $(BINDIR)
+- $(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man8
+- $(INSTALL) -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
++ $(INSTALL) -d $(BINDIR) $(MANDIR)/man8
++ $(INSTALL) vmcp $(BINDIR)
++ $(INSTALL_DATA) vmcp.8 $(MANDIR)/man8
clean:
rm -f *.o *~ vmcp core
---- s390-tools.orig/vmur/Makefile
-+++ s390-tools/vmur/Makefile
-@@ -10,9 +10,8 @@
+--- a/vmur/Makefile
++++ b/vmur/Makefile
+@@ -21,10 +21,9 @@
+ $(LINKXX) $^ -o $@ -lz
install: all
- $(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man8
-- $(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 vmur $(BINDIR)
+- $(INSTALL) -d -m 755 $(USRSBINDIR) $(MANDIR)/man8
+- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 vmur $(USRSBINDIR)
- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 vmur.8 \
- $(MANDIR)/man8
-+ $(INSTALL) -m 755 vmur $(BINDIR)
-+ $(INSTALL) -m 644 vmur.8 $(MANDIR)/man8
++ $(INSTALL) -d $(USRSBINDIR) $(MANDIR)/man8
++ $(INSTALL) vmur $(USRSBINDIR)
++ $(INSTALL_DATA) 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)
+--- a/zipl/src/Makefile
++++ b/zipl/src/Makefile
+@@ -15,8 +15,8 @@
+ $(LINK) -Wl,-z,noexecstack $^ ../boot/data.o -o $@
+
+ install: all
+- $(INSTALL) -d -m 755 $(BINDIR)
+- $(INSTALL) -c zipl $(BINDIR)
++ $(INSTALL) -d $(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
+--- a/common.mak
++++ b/common.mak
+@@ -30,6 +30,7 @@
+ OBJDUMP = $(call echocmd," OBJDUMP ",/$@)$(CROSS_COMPILE)objdump
+
+ INSTALL = install
++INSTALL_DATA = ${INSTALL} -m 644
+ ifneq ("${V}","1")
+ MAKEFLAGS += --quiet
+ echocmd=echo $1$(call reldir)$2;
+@@ -56,9 +57,7 @@
+ TOOLS_LIBDIR = $(INSTROOT)/lib/s390-tools
+ INSTDIRS = $(USRSBINDIR) $(USRBINDIR) $(BINDIR) $(LIBDIR) $(MANDIR) \
+ $(SYSCONFDIR) $(TOOLS_LIBDIR)
-OWNER = $(shell id -un)
-GROUP = $(shell id -gn)
-export INSTROOT BINDIR LIBDIR MANDIR OWNER GROUP
@@ -200,48 +206,75 @@
# Special defines for zfcpdump
ZFCPDUMP_DIR = /usr/local/share/zfcpdump
---- s390-tools.orig/man/Makefile
-+++ s390-tools/man/Makefile
-@@ -6,8 +6,8 @@
+@@ -79,12 +78,9 @@
+ all:
- 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
+ install_dirs:
+- for dir in $(INSTDIRS); do \
+- test -d $$dir || $(INSTALL) -g $(GROUP) -o $(OWNER) -d $$dir; \
+- done
++ $(INSTALL) -d $(INSTDIRS)
+ for i in 1 2 3 4 5 6 7 8; do \
+- test -d $(MANDIR)/man$$i || $(INSTALL) -g $(GROUP) -o $(OWNER) \
+- -d $(MANDIR)/man$$i; \
++ $(INSTALL) -d $(MANDIR)/man$$i; \
+ done
+
+ install_echo:
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -9,7 +9,7 @@
+ install: $(MANS)
+ for man in $(MANS); do \
+ msection=`echo $$man |sed 's/.*\.\([1-8]\)$$/man\1/'` ; \
+- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 -D $$man $(MANDIR)/$$msection/$$man ; \
++ $(INSTALL_DATA) -D $$man $(MANDIR)/$$msection/$$man ; \
+ done
+
+ pdf: $(MANS)
+--- a/osasnmpd/Makefile
++++ b/osasnmpd/Makefile
+@@ -6,9 +6,9 @@
+ osasnmpd: $(OBJS)
- .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) -d -m 755 $(USRSBINDIR) $(MANDIR)/man8
- $(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
++ $(INSTALL) -d $(USRSBINDIR) $(MANDIR)/man8
++ $(INSTALL) osasnmpd $(USRSBINDIR)
++ $(INSTALL_DATA) osasnmpd.8 $(MANDIR)/man8
- .PHONY: all install clean
---- s390-tools.orig/qethconf/Makefile
-+++ s390-tools/qethconf/Makefile
-@@ -8,10 +8,9 @@
+ clean:
+ rm -f $(OBJS) osasnmpd core
+--- a/qethconf/Makefile
++++ b/qethconf/Makefile
+@@ -5,11 +5,10 @@
+ install: qethconf
cat qethconf | \
sed -e 's+%S390_TOOLS_VERSION%+$(S390_TOOLS_RELEASE)+' \
- >$(BINDIR)/qethconf; \
+- >$(BINDIR)/qethconf; \
- chown $(OWNER).$(GROUP) $(BINDIR)/qethconf; \
- chmod 755 $(BINDIR)/qethconf; \
- $(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man8
+- 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
++ >$(BINDIR)/qethconf
++ chmod 755 $(BINDIR)/qethconf
++ $(INSTALL) -d $(BINDIR) $(MANDIR)/man8
++ $(INSTALL_DATA) qethconf.8 $(MANDIR)/man8
clean:
---- s390-tools.orig/scripts/Makefile
-+++ s390-tools/scripts/Makefile
-@@ -12,10 +12,9 @@
+--- a/scripts/Makefile
++++ b/scripts/Makefile
+@@ -5,16 +5,15 @@
+ all:
+
+ install:
+- $(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man1
++ $(INSTALL) -d $(BINDIR) $(MANDIR)/man1
+ @for i in $(SCRIPTS); \
+ do \
cat $$i | \
sed -e 's+%S390_TOOLS_VERSION%+$(S390_TOOLS_RELEASE)+' \
>$(BINDIR)/$$i; \
@@ -249,13 +282,24 @@
chmod 755 $(BINDIR)/$$i; \
done
- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 zfcpdbf.1 $(MANDIR)/man1;
-+ $(INSTALL) -m 644 zfcpdbf.1 $(MANDIR)/man1;
++ $(INSTALL_DATA) zfcpdbf.1 $(MANDIR)/man1
+
+ clean:
+--- a/zconf/Makefile
++++ b/zconf/Makefile
+@@ -13,29 +13,21 @@
clean:
---- s390-tools.orig/zconf/Makefile
-+++ s390-tools/zconf/Makefile
-@@ -19,21 +19,18 @@
+ install: install-scripts install-manpages
+- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 lsznet.raw $(TOOLS_LIBDIR)
+- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 znetcontrolunits \
+- $(TOOLS_LIBDIR)
++ $(INSTALL) lsznet.raw $(TOOLS_LIBDIR)
++ $(INSTALL) znetcontrolunits $(TOOLS_LIBDIR)
+
+ install-scripts: $(SCRIPTS)
+ @for i in $^; do \
cat $$i | \
sed -e 's+%S390_TOOLS_VERSION%+$(S390_TOOLS_RELEASE)+' \
>$(BINDIR)/$$i; \
@@ -264,51 +308,246 @@
done
install-manpages: $(MANPAGES)
- @if [ ! -d $(MANDIR) ]; then \
- mkdir -p $(MANDIR)/man8; \
+- @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; \
+- chmod 755 $(MANDIR); \
+- chmod 755 $(MANDIR)/man8; \
+- fi; \
++ $(INSTALL) -d $(MANDIR)/man8
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; \
++ $(INSTALL_DATA) $$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 @@
+--- a/zfcpdump_v2/Makefile
++++ b/zfcpdump_v2/Makefile
+@@ -29,9 +29,8 @@
+ cp $(LINUX_DIR)/arch/s390/boot/image zfcpdump.image
install: all
- $(INSTALL) -d $(INSTROOT)/$(ZFCPDUMP_DIR) -m 775
+- $(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)
++ $(INSTALL) -d $(INSTROOT)/$(ZFCPDUMP_DIR)
++ $(INSTALL_DATA) 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 @@
+--- a/tunedasd/src/Makefile
++++ b/tunedasd/src/Makefile
+@@ -11,8 +11,8 @@
+ tunedasd: $(objects)
install: all
- $(INSTALL) -d -m 755 $(BINDIR)
-- $(INSTALL) -s -g $(GROUP) -o $(OWNER) -m 755 tunedasd $(BINDIR)
-+ $(INSTALL) -m 755 tunedasd $(BINDIR)
+- $(INSTALL) -d -m 755 $(BINDIR)
+- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 tunedasd $(BINDIR)
++ $(INSTALL) -d $(BINDIR)
++ $(INSTALL) tunedasd $(BINDIR)
clean:
rm -f *.o tunedasd
---- s390-tools.orig/tunedasd/man/Makefile
-+++ s390-tools/tunedasd/man/Makefile
-@@ -6,7 +6,7 @@
+--- a/tunedasd/man/Makefile
++++ b/tunedasd/man/Makefile
+@@ -4,8 +4,8 @@
+ all:
+
install:
- @echo $(INSTALL)
- $(INSTALL) -d -m 755 $(MANDIR)/man8
+- $(INSTALL) -d -m 755 $(MANDIR)/man8
- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 tunedasd.8 $(MANDIR)/man8
-+ $(INSTALL) -m 644 tunedasd.8 $(MANDIR)/man8
++ $(INSTALL) -d $(MANDIR)/man8
++ $(INSTALL_DATA) tunedasd.8 $(MANDIR)/man8
+
+ clean:
+
+--- a/cpuplugd/Makefile
++++ b/cpuplugd/Makefile
+@@ -16,9 +16,9 @@
+ rm -f cpuplugd $(OBJECTS)
+
+ install: all
+- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 cpuplugd $(USRSBINDIR)
+- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 man/cpuplugd.8 $(MANDIR)/man8
+- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 man/cpuplugd.conf.5 \
+- $(MANDIR)/man5
++ $(INSTALL) -d $(USRSBINDIR) $(MANDIR)/man8 $(MANDIR)/man5
++ $(INSTALL) cpuplugd $(USRSBINDIR)
++ $(INSTALL_DATA) man/cpuplugd.8 $(MANDIR)/man8
++ $(INSTALL_DATA) man/cpuplugd.conf.5 $(MANDIR)/man5
+
+ .PHONY: all install clean
+--- a/zipl/man/Makefile
++++ b/zipl/man/Makefile
+@@ -4,9 +4,9 @@
+ all:
+
+ install:
+- $(INSTALL) -d -m 755 $(MANDIR)/man5
+- $(INSTALL) -d -m 755 $(MANDIR)/man8
+- $(INSTALL) -m 644 -c zipl.8 $(MANDIR)/man8
+- $(INSTALL) -m 644 -c zipl.conf.5 $(MANDIR)/man5
++ $(INSTALL) -d $(MANDIR)/man5
++ $(INSTALL) -d $(MANDIR)/man8
++ $(INSTALL_DATA) -c zipl.8 $(MANDIR)/man8
++ $(INSTALL_DATA) -c zipl.conf.5 $(MANDIR)/man5
+
+ clean:
+--- a/ipl_tools/Makefile
++++ b/ipl_tools/Makefile
+@@ -17,14 +17,14 @@
+ rm -f *.o lsreipl chreipl chshut lsshut
+
+ install: all
+- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 chreipl $(USRSBINDIR)
++ $(INSTALL) chreipl $(USRSBINDIR)
+ ln -f -s chreipl $(USRSBINDIR)/lsreipl
+ ln -f -s chreipl $(USRSBINDIR)/chshut
+ ln -f -s chreipl $(USRSBINDIR)/lsshut
+- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 man/chreipl.8 $(MANDIR)/man8
+- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 man/lsreipl.8 $(MANDIR)/man8
+- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 man/lsshut.8 $(MANDIR)/man8
+- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 man/chshut.8 $(MANDIR)/man8
++ $(INSTALL_DATA) man/chreipl.8 $(MANDIR)/man8
++ $(INSTALL_DATA) man/lsreipl.8 $(MANDIR)/man8
++ $(INSTALL_DATA) man/lsshut.8 $(MANDIR)/man8
++ $(INSTALL_DATA) man/chshut.8 $(MANDIR)/man8
+
+ .PHONY: all install clean
+
+--- a/ziomon/Makefile
++++ b/ziomon/Makefile
+@@ -40,35 +40,28 @@
+ install: all
+ cat ziomon | sed -e 's/%S390_TOOLS_VERSION%/$(S390_TOOLS_RELEASE)/' \
+ > $(USRSBINDIR)/ziomon;
+- chown $(OWNER).$(GROUP) $(USRSBINDIR)/ziomon;
+ chmod 755 $(USRSBINDIR)/ziomon;
+ cat ziomon_fcpconf | sed -e \
+ 's/%S390_TOOLS_VERSION%/$(S390_TOOLS_RELEASE)/' \
+ > $(USRSBINDIR)/ziomon_fcpconf;
+- chown $(OWNER).$(GROUP) $(USRSBINDIR)/ziomon_fcpconf;
+ chmod 755 $(USRSBINDIR)/ziomon_fcpconf;
+ cat ziorep_config | sed -e \
+ 's/%S390_TOOLS_VERSION%/$(S390_TOOLS_RELEASE)/' > \
+ $(USRSBINDIR)/ziorep_config;
+- chown $(OWNER).$(GROUP) $(USRSBINDIR)/ziorep_config;
+ chmod 755 $(USRSBINDIR)/ziorep_config;
+- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 ziomon.8 $(MANDIR)/man8
+- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 ziomon_fcpconf.8 \
+- $(MANDIR)/man8
+- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 ziomon_util $(USRSBINDIR)
+- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 ziomon_util.8 $(MANDIR)/man8
+- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 ziomon_mgr $(USRSBINDIR)
+- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 ziomon_mgr.8 $(MANDIR)/man8
+- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 ziomon_zfcpdd $(USRSBINDIR)
+- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 ziomon_zfcpdd.8 $(MANDIR)/man8
+- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 ziorep_config.8 $(MANDIR)/man8
+- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 ziorep_utilization \
+- $(USRSBINDIR)
+- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 ziorep_utilization.8 \
+- $(MANDIR)/man8
+- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 ziorep_traffic $(USRSBINDIR)
+- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 ziorep_traffic.8 \
+- $(MANDIR)/man8
++ $(INSTALL_DATA) ziomon.8 $(MANDIR)/man8
++ $(INSTALL_DATA) ziomon_fcpconf.8 $(MANDIR)/man8
++ $(INSTALL) ziomon_util $(USRSBINDIR)
++ $(INSTALL_DATA) ziomon_util.8 $(MANDIR)/man8
++ $(INSTALL) ziomon_mgr $(USRSBINDIR)
++ $(INSTALL_DATA) ziomon_mgr.8 $(MANDIR)/man8
++ $(INSTALL) ziomon_zfcpdd $(USRSBINDIR)
++ $(INSTALL_DATA) ziomon_zfcpdd.8 $(MANDIR)/man8
++ $(INSTALL_DATA) ziorep_config.8 $(MANDIR)/man8
++ $(INSTALL) ziorep_utilization $(USRSBINDIR)
++ $(INSTALL_DATA) ziorep_utilization.8 $(MANDIR)/man8
++ $(INSTALL) ziorep_traffic $(USRSBINDIR)
++ $(INSTALL_DATA) ziorep_traffic.8 $(MANDIR)/man8
+
+ uninstall:
+ rm $(USRSBINDIR)/ziomon
+--- a/iucvterm/bin/Makefile
++++ b/iucvterm/bin/Makefile
+@@ -12,13 +12,9 @@
+ all:
+ check:
+ install: $(SCRIPTS)
+- for prg in $(BIN_SCRIPTS); do \
+- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 $$prg $(USRBINDIR) ; \
+- done
+- for prg in $(SBIN_SCRIPTS); do \
+- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 $$prg $(USRSBINDIR) ; \
+- done
+- $(INSTALL) -g $(GROUP) -o $(OWNER) -d $(INSTROOT)/var/log/ts-shell
++ $(INSTALL) $(BIN_SCRIPTS) $(USRBINDIR)
++ $(INSTALL) $(SBIN_SCRIPTS) $(USRSBINDIR)
++ $(INSTALL) -d $(INSTROOT)/var/log/ts-shell
+ ln -f -s chiucvallow $(USRSBINDIR)/lsiucvallow
clean:
+--- a/iucvterm/doc/Makefile
++++ b/iucvterm/doc/Makefile
+@@ -13,7 +13,7 @@
+ install-man: $(MANS)
+ for man in $(MANS); do \
+ msection=`echo $$man |sed 's/.*\.\([1-9]\)$$/man\1/'` ; \
+- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 -D $$man $(MANDIR)/$$msection/$$man ; \
++ $(INSTALL_DATA) -D $$man $(MANDIR)/$$msection/$$man ; \
+ done
+ clean:
+--- a/iucvterm/etc/Makefile
++++ b/iucvterm/etc/Makefile
+@@ -11,10 +11,8 @@
+ all:
+ check:
+ install: $(CONFIG_FILES)
+- $(INSTALL) -g $(GROUP) -o $(OWNER) -d $(IUCVTERM_DIR) ; \
+- for cnf in $(CONFIG_FILES); do \
+- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 $$cnf $(IUCVTERM_DIR) ; \
+- done
++ $(INSTALL) -d $(IUCVTERM_DIR)
++ $(INSTALL_DATA) $(CONFIG_FILES) $(IUCVTERM_DIR)
+
+ clean:
+ -rm -f *.o ts-shell.conf
+--- a/iucvterm/src/Makefile
++++ b/iucvterm/src/Makefile
+@@ -15,9 +15,7 @@
+ all: $(PROGRAMS)
+ check:
+ install:
+- for prg in $(PROGRAMS); do \
+- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 $$prg $(USRBINDIR) ; \
+- done
++ $(INSTALL) $(PROGRAMS) $(USRBINDIR)
+
+ clean:
+ -rm -f *.o $(PROGRAMS)
+--- a/zdump/Makefile
++++ b/zdump/Makefile
+@@ -8,9 +8,9 @@
+ zgetdump: zgetdump.o
+
+ install: all
+- $(INSTALL) -d -m 755 $(MANDIR)/man8 $(BINDIR)
+- $(INSTALL) -m 755 zgetdump $(BINDIR)
+- $(INSTALL) -m 644 zgetdump.8 $(MANDIR)/man8
++ $(INSTALL) -d $(MANDIR)/man8 $(BINDIR)
++ $(INSTALL) zgetdump $(BINDIR)
++ $(INSTALL_DATA) zgetdump.8 $(MANDIR)/man8
+
+ clean:
+ rm -f *.o *~ zgetdump core
+--- a/zfcpdump/Makefile
++++ b/zfcpdump/Makefile
+@@ -31,7 +31,7 @@
+
+ install:
+ /bin/sh ./get_files.sh -c; if [ "$$?" != "0" ] ; then exit ; fi; \
+- if [ ! -d $(INSTROOT)/$(ZFCPDUMP_DIR) ]; then install -d $(INSTROOT)/$(ZFCPDUMP_DIR) -m 775; fi ; \
++ $(INSTALL) -d $(INSTROOT)/$(ZFCPDUMP_DIR); \
+ for dir in $(SUB_DIRS) ; do \
+ (cd $$dir && $(MAKE) ARCH=$(ARCH) install) \
+ || exit $$?; \
Modified: people/waldi/s390/s390-tools/debian/patches/zipl-optional.patch
==============================================================================
--- people/waldi/s390/s390-tools/debian/patches/zipl-optional.patch Wed Jan 27 10:45:36 2010 (r15027)
+++ people/waldi/s390/s390-tools/debian/patches/zipl-optional.patch Wed Jan 27 10:46:51 2010 (r15028)
@@ -1,27 +1,25 @@
---- s390-tools.orig/zipl/include/scan.h
-+++ s390-tools/zipl/include/scan.h
+--- a/zipl/include/scan.h
++++ b/zipl/include/scan.h
@@ -15,7 +15,7 @@
- #define SCAN_SECTION_NUM 6
--#define SCAN_KEYWORD_NUM 13
-+#define SCAN_KEYWORD_NUM 14
+ #define SCAN_SECTION_NUM 7
+-#define SCAN_KEYWORD_NUM 14
++#define SCAN_KEYWORD_NUM 15
enum scan_id {
scan_id_empty = 0,
-@@ -38,7 +38,8 @@
- scan_keyword_prompt = 9,
- scan_keyword_timeout = 10,
+@@ -40,6 +40,7 @@
scan_keyword_defaultmenu = 11,
-- scan_keyword_tape = 12
-+ scan_keyword_tape = 12,
-+ scan_keyword_optional = 13
+ scan_keyword_tape = 12,
+ scan_keyword_mvdump = 13,
++ scan_keyword_optional = 14,
};
enum scan_section_type {
---- s390-tools.orig/zipl/src/bootmap.c
-+++ s390-tools/zipl/src/bootmap.c
-@@ -794,6 +794,12 @@
+--- a/zipl/src/bootmap.c
++++ b/zipl/src/bootmap.c
+@@ -793,6 +793,12 @@
for (i=0; i < job->data.menu.num; i++) {
switch (job->data.menu.entry[i].id) {
case job_ipl:
@@ -34,40 +32,43 @@
printf("Adding #%d: IPL section '%s'%s\n",
job->data.menu.entry[i].pos,
job->data.menu.entry[i].name,
---- s390-tools.orig/zipl/src/scan.c
-+++ s390-tools/zipl/src/scan.c
-@@ -28,22 +28,22 @@
+--- a/zipl/src/scan.c
++++ b/zipl/src/scan.c
+@@ -28,24 +28,24 @@
/* Determines which keyword may be present in which section */
enum scan_key_state scan_key_table[SCAN_SECTION_NUM][SCAN_KEYWORD_NUM] = {
--/* defa dump dump imag para parm ramd segm targ prom time defa tape
-- * ult to tofs e mete file isk ent et pt out ultm
-+/* defa dump dump imag para parm ramd segm targ prom time defa tape opti
-+ * ult to tofs e mete file isk ent et pt out ultm onal
+-/* defa dump dump imag para parm ramd segm targ prom time defa tape mv
+- * ult to tofs e mete file isk ent et pt out ultm dump
++/* defa dump dump imag para parm ramd segm targ prom time defa tape mv opti
++ * ult to tofs e mete file isk ent et pt out ultm dump onal
* rs enu
*/
/* defaultboot */
-- {opt, inv, inv, inv, inv, inv, inv, inv, inv, inv, inv, opt, inv},
-+ {opt, inv, inv, inv, inv, inv, inv, inv, inv, inv, inv, opt, inv, inv},
+- {opt, inv, inv, inv, inv, inv, inv, inv, inv, inv, inv, opt, inv, inv},
++ {opt, inv, inv, inv, inv, inv, inv, inv, inv, inv, inv, opt, inv, inv, inv},
/* ipl */
-- {inv, inv, inv, req, opt, opt, opt, inv, req, inv, inv, inv, inv},
-+ {inv, inv, inv, req, opt, opt, opt, inv, req, inv, inv, inv, inv, opt},
+- {inv, inv, inv, req, opt, opt, opt, inv, req, inv, inv, inv, inv, inv},
++ {inv, inv, inv, req, opt, opt, opt, inv, req, inv, inv, inv, inv, inv, opt},
/* segment load */
-- {inv, inv, inv, inv, inv, inv, inv, req, req, inv, inv, inv, inv},
-+ {inv, inv, inv, inv, inv, inv, inv, req, req, inv, inv, inv, inv, inv},
+- {inv, inv, inv, inv, inv, inv, inv, req, req, inv, inv, inv, inv, inv},
++ {inv, inv, inv, inv, inv, inv, inv, req, req, inv, inv, inv, inv, inv, inv},
/* part dump */
-- {inv, req, inv, inv, inv, inv, inv, inv, opt, inv, inv, inv, inv},
-+ {inv, req, inv, inv, inv, inv, inv, inv, opt, inv, inv, inv, inv, inv},
+- {inv, req, inv, inv, inv, inv, inv, inv, opt, inv, inv, inv, inv, inv},
++ {inv, req, inv, inv, inv, inv, inv, inv, opt, inv, inv, inv, inv, inv, inv},
/* fs dump */
-- {inv, inv, req, inv, opt, opt, inv, inv, req, inv, inv, inv, inv},
-+ {inv, inv, req, inv, opt, opt, inv, inv, req, inv, inv, inv, inv, inv},
+- {inv, inv, req, inv, opt, opt, inv, inv, req, inv, inv, inv, inv, inv},
++ {inv, inv, req, inv, opt, opt, inv, inv, req, inv, inv, inv, inv, inv, inv},
/* ipl tape */
-- {inv, inv, inv, req, opt, opt, opt, inv, inv, inv, inv, inv, req}
-+ {inv, inv, inv, req, opt, opt, opt, inv, inv, inv, inv, inv, req, inv}
+- {inv, inv, inv, req, opt, opt, opt, inv, inv, inv, inv, inv, req, inv},
++ {inv, inv, inv, req, opt, opt, opt, inv, inv, inv, inv, inv, req, inv, inv},
+ /* multi volume dump */
+- {inv, inv, inv, inv, inv, inv, inv, inv, inv, inv, inv, inv, inv, req}
++ {inv, inv, inv, inv, inv, inv, inv, inv, inv, inv, inv, inv, inv, req, inv}
};
/* Mapping of keyword IDs to strings */
-@@ -63,7 +63,8 @@
+@@ -66,7 +66,8 @@
{ "target", scan_keyword_target},
{ "prompt", scan_keyword_prompt},
{ "timeout", scan_keyword_timeout},
@@ -77,8 +78,8 @@
};
---- s390-tools.orig/zipl/include/job.h
-+++ s390-tools/zipl/include/job.h
+--- a/zipl/include/job.h
++++ b/zipl/include/job.h
@@ -12,6 +12,8 @@
#ifndef JOB_H
#define JOB_H
@@ -88,7 +89,7 @@
#include "zipl.h"
-@@ -33,6 +35,8 @@
+@@ -34,6 +36,8 @@
address_t image_addr;
address_t parm_addr;
address_t ramdisk_addr;
@@ -97,9 +98,9 @@
};
struct job_segment_data {
---- s390-tools.orig/zipl/src/job.c
-+++ s390-tools/zipl/src/job.c
-@@ -358,14 +358,20 @@
+--- a/zipl/src/job.c
++++ b/zipl/src/job.c
+@@ -390,14 +390,20 @@
static int
@@ -122,7 +123,7 @@
error_text("Image file '%s'", ipl->image);
} else {
error_text("Image file '%s' in section '%s'",
-@@ -377,7 +383,13 @@
+@@ -409,7 +415,13 @@
if (ipl->ramdisk != NULL) {
rc = misc_check_readable_file(ipl->ramdisk);
if (rc) {
@@ -137,7 +138,7 @@
error_text("Ramdisk file '%s'", ipl->ramdisk);
} else {
error_text("Ramdisk file '%s' in section '%s'",
-@@ -466,9 +478,13 @@
+@@ -498,9 +510,13 @@
switch (menu->entry[i].id) {
case job_ipl:
rc = check_job_ipl_data(&menu->entry[i].data.ipl,
@@ -152,7 +153,7 @@
break;
case job_dump_fs:
rc = check_job_dump_fs_data(
-@@ -560,7 +576,7 @@
+@@ -654,7 +670,7 @@
case job_print_version:
break;
case job_ipl:
@@ -161,7 +162,7 @@
case job_menu:
return check_job_menu_data(&job->data.menu);
case job_segment:
-@@ -767,6 +783,8 @@
+@@ -863,6 +879,8 @@
DEFAULT_RAMDISK_ADDRESS;
}
}
More information about the Kernel-svn-changes
mailing list