commit: 212f004e6c0822c80605f5acf9eee5b83f3be104
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 16 21:20:15 2018 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sat Jun 16 21:24:51 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=212f004e
sys-apps/s390-tools: drop old <1.36.1-r1 versions
sys-apps/s390-tools/Manifest | 3 -
.../s390-tools/files/s390-tools-1.23.1-build.patch | 153 ---------------------
sys-apps/s390-tools/metadata.xml | 1 -
sys-apps/s390-tools/s390-tools-1.23.1.ebuild | 56 --------
sys-apps/s390-tools/s390-tools-1.36.1.ebuild | 51 -------
5 files changed, 264 deletions(-)
diff --git a/sys-apps/s390-tools/Manifest b/sys-apps/s390-tools/Manifest
index 49463a2af85..04bdd70bca6 100644
--- a/sys-apps/s390-tools/Manifest
+++ b/sys-apps/s390-tools/Manifest
@@ -1,5 +1,2 @@
-DIST e2fsprogs-1.41.3.tar.gz 4365234 BLAKE2B
44875ed5890d6f7a690efc5148edc39b45489ee5b4c152d6efa6b3f204fed0397229366fb0e3ff35d1493e0dafdc2e331a62fa384441024d357e49d86ef30027
SHA512
2ab8eafe00b1706658b45b024adca91c3c01970b5b1888b193df30feea84fe209f684df6a24afcad48109cabe451e22d41f29d24fb170bb564e472fe440f4b37
-DIST linux-2.6.27.tar.bz2 50355835 BLAKE2B
7f3a20b510e1127894871e7eabad13fd8b26888110a6cf0b64348667299ba3f7a8018995b0ed41d3a7bc32e802e0db2093e35ae4f889022d04fc911952140e0f
SHA512
fcafcea4148e15ffacb57e4eef731d8a2655bba15c6445a84f7345579bd6b6b9a68ad1a44a58f78e78a619efd84ce79c63ce3de3931ae7857af647a06ac052e2
-DIST s390-tools-1.23.1.tar.bz2 625295 BLAKE2B
657ca9394468605ed26b9e4eb24239971076cd741837913109745598c25ffc4fc024c22af376f1da4f3236da3df31da93ccfdd6766e61dc3c004153913b0abca
SHA512
c1f0fe79cfcbf6217e1aba74172e7644eee25f8886b70885e8558ad48342d6b41b35cefd398c3f5ff430d382ea6103b93ed8f666f0038d4f5abc3c3bc787d0eb
DIST s390-tools-1.36.1.tar.bz2 827505 BLAKE2B
5774062699331c6d5958fef44f6cbb048e05aecc190c2519a29dc9c43b0d0d000d8be8183a447eb81b7affbf236edc21105bfe6a689e23b2f519feea0700b9f0
SHA512
83b3456bce8af0d5e1f6a1b96335809a21b676b2371ca101e5f588a18e0de65b8e15a9a973a7dcc2cad800341ecf5997e8230a68b9670751cdf1d6f8d59be22c
DIST s390-tools-2.2.0.tar.gz 1047199 BLAKE2B
d23cfb277d341b4fe73ca92eba0a7bf49420d3303737d871979a93814d1c0cb53884a6fae78453fe69d4a8a8e35923fe9bf2433a412578f8d7696c9defd8570a
SHA512
f029b92f18f95b49e189a4f5ad78c02ee629e630a93a8bbfe6966030fe8aaf069e86582d77213d68b447300b73317e4dbcb228df5ff0795a2785f6735087ceab
diff --git a/sys-apps/s390-tools/files/s390-tools-1.23.1-build.patch
b/sys-apps/s390-tools/files/s390-tools-1.23.1-build.patch
deleted file mode 100644
index 1733f13f78e..00000000000
--- a/sys-apps/s390-tools/files/s390-tools-1.23.1-build.patch
+++ /dev/null
@@ -1,153 +0,0 @@
- - fix errors in subdir makes
- - parallelize subdir runs
- - cleanup flag handling
-
---- a/Makefile
-+++ b/Makefile
-@@ -9,19 +9,19 @@
- vmconvert vmcp man mon_tools dasdinfo vmur cpuplugd ipl_tools \
- ziomon iucvterm hyptop cmsfs-fuse qethqoat
-
--all: subdirs_make
-+SUB_DIRS_ALL = $(patsubst %,subdirs_all_%,$(SUB_DIRS))
-+SUB_DIRS_CLEAN = $(patsubst %,subdirs_clean_%,$(SUB_DIRS))
-+SUB_DIRS_INSTALL = $(patsubst %,subdirs_install_%,$(SUB_DIRS))
-
--subdirs_make:
-- set -e ; for dir in $(SUB_DIRS) ; do \
-- cd $$dir ; $(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH); cd ..; \
-- done
-+all: $(SUB_DIRS_ALL)
-
--clean:
-- set -e ; for dir in $(SUB_DIRS) ; do \
-- cd $$dir ; $(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH) clean; cd ..; \
-- done
-+_subdir = $(patsubst subdirs_%,%,$@)
-+subdir = $(shell expr $(_subdir) : '[^_]*_\(.*\)')
-+subtarget = $(shell expr $(_subdir) : '\([^_]*\)_.*')
-+subdirs_%:
-+ $(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH) -C $(subdir) $(subtarget)
-+
-+clean: $(SUB_DIRS_CLEAN)
-
- install:
-- set -e ; for dir in $(SUB_DIRS) ; do \
-- cd $$dir ; $(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH) install; cd
..; \
-- done
-+ $(MAKE) $(SUB_DIRS_INSTALL)
---- a/common.mak
-+++ b/common.mak
-@@ -17,10 +17,10 @@
- # Cross Compiling Support
- CROSS_COMPILE =
- AS = $(call echocmd," AS ",/$@)$(CROSS_COMPILE)as
--LINK = $(call echocmd," LINK ",/$@)$(CROSS_COMPILE)gcc
-+LINK = $(call echocmd," LINK ",/$@)$(CROSS_COMPILE)gcc
$(CFLAGS) $(LDFLAGS)
- LD = $(call echocmd," LD ",/$@)$(CROSS_COMPILE)ld
- CC = $(call echocmd," CC ",/$@)$(CROSS_COMPILE)gcc
--LINKXX = $(call echocmd," LINKXX ",/$@)$(CROSS_COMPILE)g++
-+LINKXX = $(call echocmd," LINKXX ",/$@)$(CROSS_COMPILE)g++
$(CXXFLAGS) $(LDFLAGS)
- CXX = $(call echocmd," CXX ",/$@)$(CROSS_COMPILE)g++
- CPP = $(call echocmd," CPP ",/$@)$(CROSS_COMPILE)gcc -E
- AR = $(call echocmd," AR ",/$@)$(CROSS_COMPILE)ar
-@@ -41,14 +41,13 @@
- ZFCPDUMP_RD = zfcpdump.rd
- export ZFCPDUMP_DIR ZFCPDUMP_IMAGE ZFCPDUMP_RD
-
--CFLAGS = $(WARNFLAGS) -O3
-DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \
-- -DS390_TOOLS_LIBDIR=$(TOOLS_LIBDIR) \
-- -DS390_TOOLS_SYSCONFDIR=$(SYSCONFDIR) \
-- -g $(OPT_FLAGS)
--CXXFLAGS = $(WARNFLAGS) -O3 -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \
-- -DS390_TOOLS_LIBDIR=$(TOOLS_LIBDIR) \
-- -DS390_TOOLS_SYSCONFDIR=$(SYSCONFDIR) \
-- -g $(OPT_FLAGS)
-+CFLAGS += $(WARNFLAGS) $(OPT_FLAGS)
-+CXXFLAGS += $(WARNFLAGS) $(OPT_FLAGS)
-+CPPFLAGS += \
-+ -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \
-+ -DS390_TOOLS_LIBDIR=$(TOOLS_LIBDIR) \
-+ -DS390_TOOLS_SYSCONFDIR=$(SYSCONFDIR)
-+export CPPFLAGS
-
- # make G=1
- # Compile tools so that gcov can be used to collect code coverage data.
-@@ -76,7 +75,7 @@
- $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
-
- %: %.o
-- $(LINK) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
-+ $(LINK) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
-
- all:
-
---- a/zfcpdump/ramdisk/Makefile
-+++ b/zfcpdump/ramdisk/Makefile
-@@ -12,16 +12,14 @@
-
- all: $(ZFCPDUMP_RD)
-
--CFLAGS += -D_FILE_OFFSET_BITS=64
-+CPPFLAGS += -D_FILE_OFFSET_BITS=64 -I../../include
-+LDFLAGS += -static
-+LDLIBS += -lz
-
- $(ZFCPDUMP_RD): zfcp_dumper
- /bin/sh ./create_rd.sh $(ARCH)
-
--zfcp_dumper: zfcp_dumper.o
-- $(CC) -o zfcp_dumper -static zfcp_dumper.o -lz
--
- zfcp_dumper.o: zfcp_dumper.c zfcp_dumper.h
-- $(CC) $(CFLAGS) -c -I../../include zfcp_dumper.c
-
- install: $(ZFCPDUMP_RD)
- /bin/sh ./create_rd.sh -i
-@@ -29,6 +27,3 @@
- clean clobber:
- /bin/sh ./create_rd.sh -r
- rm -f *.o
--
--%.o: %.c
-- $(CC) $(CFLAGS) -c -o $@ $<
---- a/zfcpdump_v2/Makefile
-+++ b/zfcpdump_v2/Makefile
-@@ -6,12 +6,13 @@
- LINUX_DIR := linux-$(LINUX_VERSION)
- E2FSPROGS := e2fsprogs-1.41.3
-
--CFLAGS += -D_FILE_OFFSET_BITS=64
-+CPPFLAGS += -D_FILE_OFFSET_BITS=64 -DGZIP_SUPPORT
-+LDFLAGS += -static
-+LDLIBS += -lz
-
- all: zfcpdump.image
-
- zfcpdump: zfcpdump.c zfcpdump.h
-- $(CC) $(CFLAGS) -D GZIP_SUPPORT -static -o $@ zfcpdump.c -lz
-
- e2fsck:
- tar xfzv $(E2FSPROGS).tar.gz
---- a/zipl/boot/Makefile
-+++ b/zipl/boot/Makefile
-@@ -3,9 +3,8 @@
-
- S390_TOOLS_VERSION_EBCDIC := $(shell echo -n $(S390_TOOLS_RELEASE) | dd
conv=ebcdic 2> /dev/null | hexdump -v -e '/1 "0x%02x,"' | sed 's/.$$//')
-
--CFLAGS += -I../include -D__ASSEMBLY__ \
-+CPPFLAGS += -I../include -D__ASSEMBLY__ \
- -DS390_TOOLS_VERSION_EBCDIC=$(S390_TOOLS_VERSION_EBCDIC)
--LDFLAGS = -O2
- FILES := fba0.bin fba1b.bin fba2.bin \
- eckd0_ldl.bin eckd0_cdl.bin \
- eckd1.bin eckd1b.bin eckd2.bin \
-@@ -16,7 +15,7 @@
- %: %.S
-
- %.o: %.S
-- $(CC) $(CFLAGS) -c -o $@ $<
-+ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
-
- %.exec: %.o
- @STAGE=$$( \
diff --git a/sys-apps/s390-tools/metadata.xml b/sys-apps/s390-tools/metadata.xml
index ae19b1043df..7b20e7bd55f 100644
--- a/sys-apps/s390-tools/metadata.xml
+++ b/sys-apps/s390-tools/metadata.xml
@@ -12,7 +12,6 @@ zSeries (s390) Linux kernel and device drivers
<flag name="fuse">build cmsfs-fuse to read files stored on a
z/VM CMS disk</flag>
<flag name="ncurses">build hyptop monitoring program</flag>
<flag name="pfm">build the cpacfstats tool</flag>
- <flag name="zfcpdump">build the kernel disk dumping
utility</flag>
<flag name="zlib">build the zgetdump utility</flag>
</use>
<upstream>
diff --git a/sys-apps/s390-tools/s390-tools-1.23.1.ebuild
b/sys-apps/s390-tools/s390-tools-1.23.1.ebuild
deleted file mode 100644
index dfdc088e665..00000000000
--- a/sys-apps/s390-tools/s390-tools-1.23.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils udev
-
-# look at zfcpdump_v2/README
-E2FSPROGS_P=e2fsprogs-1.41.3
-LINUX_P=linux-2.6.27
-
-DESCRIPTION="User space utilities for the zSeries (s390) Linux kernel and
device drivers"
-HOMEPAGE="https://www.ibm.com/developerworks/linux/linux390/s390-tools.html";
-SRC_URI="https://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/${P}.tar.bz2
- zfcpdump? (
- mirror://sourceforge/e2fsprogs/${E2FSPROGS_P}.tar.gz
- mirror://kernel/linux/kernel/v2.6/${LINUX_P}.tar.bz2
- )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* s390"
-IUSE="fuse ncurses snmp zfcpdump"
-
-RDEPEND="sys-libs/zlib
- fuse? ( sys-fs/fuse )
- ncurses? ( sys-libs/ncurses:0= )
- snmp? ( net-analyzer/net-snmp )"
-DEPEND="${RDEPEND}
- dev-util/indent
- app-admin/genromfs"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.23.1-build.patch
-
- use snmp || sed -i -e 's:osasnmpd::' Makefile
- use fuse || { sed -i -e 's:cmsfs-fuse::' Makefile; export
WITHOUT_FUSE=1; }
- use ncurses || sed -i -e 's:hyptop::' Makefile
-
- if use zfcpdump ; then
- local x
- for x in ${E2FSPROGS_P}.tar.gz ${LINUX_P}.tar.bz2 ; do
- ln -s "${DISTDIR}"/${x} zfcpdump_v2/${x} || die "ln
${x}"
- done
- sed -i -e '/^ZFCPDUMP_DIR/s:local/::' common.mak
- sed -i -e '/^SUB_DIRS/s:=:=zfcpdump_v2 :' Makefile
- fi
-
- export MAKEOPTS+=" V=1"
-}
-
-src_install() {
- emake install INSTROOT="${D}" USRBINDIR="${D}/sbin"
- dodoc README
- udev_dorules etc/udev/rules.d/*.rules
-}
diff --git a/sys-apps/s390-tools/s390-tools-1.36.1.ebuild
b/sys-apps/s390-tools/s390-tools-1.36.1.ebuild
deleted file mode 100644
index 25a2d14a557..00000000000
--- a/sys-apps/s390-tools/s390-tools-1.36.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-funcs udev
-
-DESCRIPTION="User space utilities for the zSeries (s390) Linux kernel and
device drivers"
-HOMEPAGE="https://www.ibm.com/developerworks/linux/linux390/s390-tools.html";
-SRC_URI="https://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/${P}.tar.bz2";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* s390"
-IUSE="fuse ncurses pfm snmp zlib"
-
-RDEPEND="fuse? ( sys-fs/fuse )
- ncurses? ( sys-libs/ncurses:0= )
- pfm? ( app-misc/pfm )
- snmp? ( net-analyzer/net-snmp )
- zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
- dev-util/indent
- app-admin/genromfs"
-
-src_configure() {
- export MAKEOPTS+=" V=1"
- export HAVE_DRACUT=0
- export HAVE_FUSE=$(usex fuse 1 0)
- export HAVE_NCURSES=$(usex ncurses 1 0)
- export HAVE_SNMP=$(usex snmp 1 0)
- export HAVE_PFM=$(usex pfm 1 0)
- export HAVE_ZLIB=$(usex zlib 1 0)
- tc-export AR BUILD_CC CC CXX LD NM OBJCOPY
-}
-
-src_compile() {
- emake \
- AR="${AR}" \
- HOSTCC="${BUILD_CC}" \
- CC="${CC}" LINK="${CC}" \
- CXX="${CXX}" LINKXX="${CXX}" \
- LD="${LD}" \
- NM="${NM}" \
- OBJCOPY="${OBJCOPY}"
-}
-
-src_install() {
- default
- udev_dorules etc/udev/rules.d/*.rules
-}
