diff --git a/zconf/Makefile b/zconf/Makefile index 5ca5e8a0..44159d74 100644 --- a/zconf/Makefile +++ b/zconf/Makefile @@ -17,8 +17,6 @@ clean: $(SUB_DIRS) install: install-scripts install-manpages install-usrsbin-scripts $(SUB_DIRS) $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 lsznet.raw \ $(DESTDIR)$(TOOLS_LIBDIR) - $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 znetcontrolunits \ - $(DESTDIR)$(TOOLS_LIBDIR) install-scripts: $(SCRIPTS) @for i in $^; do \ diff --git a/zconf/lsznet.raw b/zconf/lsznet.raw index 2488db37..5c0e3c22 100755 --- a/zconf/lsznet.raw +++ b/zconf/lsznet.raw @@ -25,10 +25,6 @@ function error() { exit 1 } -# currently requires bash version 3.0 or later - -. /lib/s390-tools/znetcontrolunits - # The arrays (among other things) should be adapted, if any of those device # drivers start supporting different CU types/models. diff --git a/zconf/znetcontrolunits b/zconf/znetcontrolunits deleted file mode 100644 index 8bca8304..00000000 --- a/zconf/znetcontrolunits +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -# -# znetcontrolunits - define some common control unit mappings -# -# This definitions are not intended to be used as standalone tool, but should be -# used from other tools like a library. E.g. znetconf is one exploiter -# of them. -# -# Copyright IBM Corp. 2008, 2017 -# -# s390-tools is free software; you can redistribute it and/or modify -# it under the terms of the MIT license. See LICENSE for details. -# - -# The arrays (among other things) should be adapted, if any of those device -# drivers start supporting different CU types/models. - -readonly -a CU=( - 1731/01 - 1731/05 - 3088/08 - 3088/1f - 3088/1e - 3088/60 - 1731/02 - 1731/02 -) -# 1731/06 (OSN) is no longer supported