summaryrefslogtreecommitdiff
path: root/sys-apps/s390-tools
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-06-23 07:00:28 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-06-23 07:00:28 +0100
commite23cdda4dbb0c83b9e682ab5e916085a35203da5 (patch)
tree5a4ac448a3b288b731c24d947e0ce52df3cab07b /sys-apps/s390-tools
parent8187a741807f3e9a9e26304973cf18087dcf2560 (diff)
gentoo resync : 23.06.2018
Diffstat (limited to 'sys-apps/s390-tools')
-rw-r--r--sys-apps/s390-tools/Manifest12
-rw-r--r--sys-apps/s390-tools/files/s390-tools-1.23.1-build.patch153
-rw-r--r--sys-apps/s390-tools/metadata.xml1
-rw-r--r--sys-apps/s390-tools/s390-tools-1.23.1.ebuild56
-rw-r--r--sys-apps/s390-tools/s390-tools-2.2.0.ebuild2
-rw-r--r--sys-apps/s390-tools/s390-tools-2.4.0.ebuild (renamed from sys-apps/s390-tools/s390-tools-1.36.1.ebuild)8
6 files changed, 9 insertions, 223 deletions
diff --git a/sys-apps/s390-tools/Manifest b/sys-apps/s390-tools/Manifest
index 97002c9175db..31db12e0161e 100644
--- a/sys-apps/s390-tools/Manifest
+++ b/sys-apps/s390-tools/Manifest
@@ -1,11 +1,7 @@
-AUX s390-tools-1.23.1-build.patch 4719 BLAKE2B 78280f0500af40af1ba5606a3fa7a57ca71705fc37acedcbae474464c21a4970e962cf64922b0ce4c429ccdde756389544456cbb190d78f2fea1357a80acc34f SHA512 ffb379479276a86e6b23e495beed69ad4fe49ce82b2096323216a371feecdd7a4056db46328bfe8423da70bd42168b8e1e1c1588bc51019e7f0ac535dda5d6a7
-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
-EBUILD s390-tools-1.23.1.ebuild 1515 BLAKE2B 1f9bdfcad5886a1616e8b2e503266a1e3d83c8eaedbc66e48e19a8b7958ae6c92a07ac9ffab32e60e3ffbdb54f56d0b09a7a24a0e297e604e23e61b55de8f43e SHA512 b232f60652deaab96d3230288faaca2c0c8968ac399822f73c77f6d5b2a778a14513e2bbf7f00872f920ccc85f775adf009e07f98578542b061d919b5af14f9b
+DIST s390-tools-2.4.0.tar.gz 1084322 BLAKE2B 1e603433937a5ebe664bd7e4fbd5da7fafbc556f9fa809a07badda2bccf5819d69a2a3c5f62a0698693cd308dae30663bb2f2e1f1bc4b2598b9bf6085d29bd03 SHA512 de4d89f505567fe313df3c9110242d9476d0e20ff9b6f31ecbaa99c8a4e2b4bc959ab29ec6faf8b47c4e669f2eaa736f29a9e9908c95ced2e33db25b1c620c84
EBUILD s390-tools-1.36.1-r1.ebuild 1385 BLAKE2B 118abdf8d51d926bdc9916a0cf6e4de68e3cdae10ac6652aa569c879bb3a9812d6df6d5f262a1fadabf2ff71a1c22fd2880460a72c823451cfbe6e9ac8120a70 SHA512 2e68aff8976ec3d0e060e01eb403e2473377734fd2ca0733e859ef0eb58ad9633585aac90cf3a78239dfebe4c0f3e0580c3d4452a43a708c1dabce6803f90079
-EBUILD s390-tools-1.36.1.ebuild 1233 BLAKE2B 584bd7cd17a25da1b8e7477295084230fabf6e1d102379f8254c8abf8b6cb86de87aa5929844bd440dd40e07aacc696ad42b0116a6fcbb16103b34d01bac0833 SHA512 3553f385580bcb910e74230188b80800cc9bf05899a18b30a23008b372c3ba6871ef4238e04ea3d2e695cd05dac8439b312fa4f4fa83665254427cd38475eb9b
-EBUILD s390-tools-2.2.0.ebuild 1238 BLAKE2B 00808526cc323eab063ddb459b15a249d6547afbd99749868d00651c3ce02a5c9fca989c5348c062656486ebd8dcef476ed187d36569c834ab15a78daef48fd8 SHA512 505e06e0021ced5049f99bc7e39112387f24dff3928d4d70ecf22bab0b0fbeb3a495b7beff1b7110de204e99ed5b1509988f0eb29eb3a1c1c6c5640086180caf
-MISC metadata.xml 795 BLAKE2B 27e39c453bd207d7cac8a38d5422735a0a581e7b72000452b98f406b00e2c2e7287abb2be992ada611f645b8f7a97c497d905278017b4862193475a34654c810 SHA512 23cd50f27b3b968621713e813ca1a822afccd90beb2f5641344ddc7abd2418d153d86309b690d0d1a84c51b47bc92e57a253a0bdeb34f22b5883a26035a53074
+EBUILD s390-tools-2.2.0.ebuild 1237 BLAKE2B 3539949f21345952571e92df3c4466fb015b6f49aa833ca838a1854ef31c8aa3a07da33163fdbe94c2319991ce4d6fa0b41ddd5271df5ee895ac2d18dfe6e214 SHA512 26e55d3bb79595359e1c86a697f478e48c70f686a7f570f62de47e0f04aa026c829c4f7a01f326d7e932828c8da8f40ec21907e650b6bb274e08a27d60a9fcd2
+EBUILD s390-tools-2.4.0.ebuild 1238 BLAKE2B 00808526cc323eab063ddb459b15a249d6547afbd99749868d00651c3ce02a5c9fca989c5348c062656486ebd8dcef476ed187d36569c834ab15a78daef48fd8 SHA512 505e06e0021ced5049f99bc7e39112387f24dff3928d4d70ecf22bab0b0fbeb3a495b7beff1b7110de204e99ed5b1509988f0eb29eb3a1c1c6c5640086180caf
+MISC metadata.xml 726 BLAKE2B 3d8b378dc8713cacadd8c7a16657bf7b49056284f1cea9a71151492fa8fdbb34ab00673b71c142057b19c520477ff17ea17417941d8939427f71bbb4f003c091 SHA512 9fe97ad8e4d179da9351268abad46e38f0c7d19dd93f35b8b86669c7a636b186b575b8cab72634492f176d174292892be8b3ac29f7a279c401e3f4350e43e385
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 1733f13f78e0..000000000000
--- 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 ae19b1043df6..7b20e7bd55f8 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 dfdc088e6655..000000000000
--- 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-2.2.0.ebuild b/sys-apps/s390-tools/s390-tools-2.2.0.ebuild
index 72f09e63dfbe..a2e08bb6e2aa 100644
--- a/sys-apps/s390-tools/s390-tools-2.2.0.ebuild
+++ b/sys-apps/s390-tools/s390-tools-2.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ibm-s390-tools/s390-tools/archive/v${PV}.tar.gz -> $
LICENSE="GPL-2 MIT"
SLOT="0"
-KEYWORDS="-* ~s390"
+KEYWORDS="-* s390"
IUSE="fuse ncurses pfm snmp zlib"
RDEPEND="fuse? ( sys-fs/fuse:= )
diff --git a/sys-apps/s390-tools/s390-tools-1.36.1.ebuild b/sys-apps/s390-tools/s390-tools-2.4.0.ebuild
index 25a2d14a5578..72f09e63dfbe 100644
--- a/sys-apps/s390-tools/s390-tools-1.36.1.ebuild
+++ b/sys-apps/s390-tools/s390-tools-2.4.0.ebuild
@@ -7,14 +7,14 @@ 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"
+SRC_URI="https://github.com/ibm-s390-tools/s390-tools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
+LICENSE="GPL-2 MIT"
SLOT="0"
-KEYWORDS="-* s390"
+KEYWORDS="-* ~s390"
IUSE="fuse ncurses pfm snmp zlib"
-RDEPEND="fuse? ( sys-fs/fuse )
+RDEPEND="fuse? ( sys-fs/fuse:= )
ncurses? ( sys-libs/ncurses:0= )
pfm? ( app-misc/pfm )
snmp? ( net-analyzer/net-snmp )