Skip to content
This repository has been archived by the owner on Sep 5, 2023. It is now read-only.

Commit

Permalink
Merge pull request #871 from ldorau/common-remove-unneeded-scripts-fo…
Browse files Browse the repository at this point in the history
…r-installing-ndctl-and-pmdk

common: remove Ubuntu 16.04 and unneeded scripts for installing ndctl and pmdk
  • Loading branch information
ldorau authored Feb 11, 2021
2 parents d9fb10a + 3ff979c commit 448bac2
Show file tree
Hide file tree
Showing 8 changed files with 7 additions and 253 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ jobs:
CONFIG: ["N=Ubuntu20.10 OS=ubuntu OS_VER=20.10",
"N=Ubuntu20.04 OS=ubuntu OS_VER=20.04",
"N=Ubuntu18.04 OS=ubuntu OS_VER=18.04",
"N=Ubuntu16.04 OS=ubuntu OS_VER=16.04",
"N=Fedora33 OS=fedora OS_VER=33",
"N=Fedora32 OS=fedora OS_VER=32",
"N=Fedora31 OS=fedora OS_VER=31",
Expand Down Expand Up @@ -79,7 +78,6 @@ jobs:
CONFIG: ["N=Ubuntu20.10 OS=ubuntu OS_VER=20.10",
"N=Ubuntu20.04 OS=ubuntu OS_VER=20.04",
"N=Ubuntu18.04 OS=ubuntu OS_VER=18.04",
"N=Ubuntu16.04 OS=ubuntu OS_VER=16.04",
"N=Fedora33 OS=fedora OS_VER=33",
"N=Fedora32 OS=fedora OS_VER=32",
"N=Fedora31 OS=fedora OS_VER=31",
Expand Down
4 changes: 2 additions & 2 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -126,14 +126,14 @@ $ make test
$ ctest
```

## Supported OSes
## OS support

Known supported OSes:

- CentOS >= 6
- Debian >= 9
- Fedora >= 27
- Ubuntu >= 16.04
- Ubuntu >= 18.04

Known unsupported OSes:

Expand Down
4 changes: 2 additions & 2 deletions utils/docker/build.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
#
# SPDX-License-Identifier: BSD-3-Clause
# Copyright 2017-2020, Intel Corporation
# Copyright 2017-2021, Intel Corporation
#

#
Expand All @@ -14,7 +14,7 @@
# where the root of this project is on the host machine,
# - set variables 'OS' and 'OS_VER' properly to a system you want to build this
# repo on (for proper values take a look on the list of Dockerfiles at the
# utils/docker/images directory), eg. OS=ubuntu, OS_VER=16.04.
# utils/docker/images directory), eg. OS=ubuntu, OS_VER=20.04.
#

set -e
Expand Down
29 changes: 1 addition & 28 deletions utils/docker/images/Dockerfile.debian-9
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# SPDX-License-Identifier: BSD-3-Clause
# Copyright 2016-2020, Intel Corporation
# Copyright 2016-2021, Intel Corporation
#

#
Expand All @@ -16,7 +16,6 @@ ENV DEBIAN_FRONTEND noninteractive

# Additional parameters to build docker without building components
ARG SKIP_SCRIPTS_DOWNLOAD
ARG SKIP_PMDK_BUILD

# Update the Apt cache and install basic tools
RUN apt-get update && apt-get dist-upgrade -y
Expand All @@ -33,31 +32,6 @@ ENV BASE_DEPS "\
sudo \
whois"

# ndctl (optional if libndctl-dev and libdaxctl-dev >= 60.1, 64.1 preferred)
ENV NDCTL_DEPS "\
automake \
bash-completion \
build-essential \
git \
libjson-c-dev \
libkeyutils-dev \
libkmod-dev \
libtool \
libudev-dev \
pkg-config \
systemd \
uuid-dev"

# PMDK deps
ENV PMDK_DEPS "\
debhelper \
devscripts \
pandoc"

ENV EXAMPLES_DEPS "\
$NDCTL_DEPS \
$PMDK_DEPS"

# RPMA deps
ENV RPMA_DEPS "\
cmake \
Expand All @@ -73,7 +47,6 @@ ENV RPMA_DEPS "\
# Install all required packages
RUN apt-get install -y --no-install-recommends \
$BASE_DEPS \
$EXAMPLES_DEPS \
$RPMA_DEPS \
&& rm -rf /var/lib/apt/lists/*

Expand Down
106 changes: 0 additions & 106 deletions utils/docker/images/Dockerfile.ubuntu-16.04

This file was deleted.

70 changes: 0 additions & 70 deletions utils/docker/images/install-libndctl.sh

This file was deleted.

41 changes: 0 additions & 41 deletions utils/docker/images/install-pmdk.sh

This file was deleted.

4 changes: 2 additions & 2 deletions utils/docker/pull-or-rebuild-image.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
#
# SPDX-License-Identifier: BSD-3-Clause
# Copyright 2016-2020, Intel Corporation
# Copyright 2016-2021, Intel Corporation
#

#
Expand Down Expand Up @@ -64,7 +64,7 @@ fi

if [[ -z "$OS" || -z "$OS_VER" ]]; then
echo "ERROR: The variables OS and OS_VER have to be set properly " \
"(eg. OS=ubuntu, OS_VER=16.04)."
"(eg. OS=ubuntu, OS_VER=20.04)."
exit 1
fi

Expand Down

0 comments on commit 448bac2

Please sign in to comment.