From 618d6bd0ce190b4186add0f8f5d7f8f380d6c7c5 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 11 Apr 2017 14:05:17 +0200 Subject: [PATCH] Remove Ubuntu 12.04 "precise pangolin" from build scripts Ubuntu 12.04 will be EOL on April 28, after which it won't receive updates and security fixes; https://lists.ubuntu.com/archives/ubuntu-announce/2017-March/000218.html This patch removes Ubuntu 12.04 from the build scripts Signed-off-by: Sebastiaan van Stijn --- contrib/builder/deb/amd64/generate.sh | 27 ++++--------------- .../deb/amd64/ubuntu-precise/Dockerfile | 16 ----------- contrib/builder/deb/armhf/generate.sh | 27 ++++--------------- 3 files changed, 10 insertions(+), 60 deletions(-) delete mode 100644 contrib/builder/deb/amd64/ubuntu-precise/Dockerfile diff --git a/contrib/builder/deb/amd64/generate.sh b/contrib/builder/deb/amd64/generate.sh index b72893b842..38972baadd 100755 --- a/contrib/builder/deb/amd64/generate.sh +++ b/contrib/builder/deb/amd64/generate.sh @@ -81,15 +81,15 @@ for version in "${versions[@]}"; do ) # packaging for "sd-journal.h" and libraries varies case "$suite" in - precise|wheezy) ;; - jessie|trusty) packages+=( libsystemd-journal-dev );; - *) packages+=( libsystemd-dev );; + wheezy) ;; + jessie|trusty) packages+=( libsystemd-journal-dev ) ;; + *) packages+=( libsystemd-dev ) ;; esac - # debian wheezy & ubuntu precise do not have the right libseccomp libs + # debian wheezy does not have the right libseccomp libs # debian jessie & ubuntu trusty have a libseccomp < 2.2.1 :( case "$suite" in - precise|wheezy|jessie|trusty) + wheezy|jessie|trusty) packages=( "${packages[@]/libseccomp-dev}" ) runcBuildTags="apparmor selinux" ;; @@ -99,23 +99,6 @@ for version in "${versions[@]}"; do ;; esac - - if [ "$suite" = 'precise' ]; then - # precise has a few package issues - - # - dh-systemd doesn't exist at all - packages=( "${packages[@]/dh-systemd}" ) - - # - libdevmapper-dev is missing critical structs (too old) - packages=( "${packages[@]/libdevmapper-dev}" ) - extraBuildTags+=' exclude_graphdriver_devicemapper' - - # - btrfs-tools is missing "ioctl.h" (too old), so it's useless - # (since kernels on precise are old too, just skip btrfs entirely) - packages=( "${packages[@]/btrfs-tools}" ) - extraBuildTags+=' exclude_graphdriver_btrfs' - fi - if [ "$suite" = 'wheezy' ]; then # pull a couple packages from backports explicitly # (build failures otherwise) diff --git a/contrib/builder/deb/amd64/ubuntu-precise/Dockerfile b/contrib/builder/deb/amd64/ubuntu-precise/Dockerfile deleted file mode 100644 index f183ef2472..0000000000 --- a/contrib/builder/deb/amd64/ubuntu-precise/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -# -# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/amd64/generate.sh"! -# - -FROM ubuntu:precise - -RUN apt-get update && apt-get install -y apparmor bash-completion build-essential cmake curl ca-certificates debhelper dh-apparmor git libapparmor-dev libltdl-dev pkg-config vim-common --no-install-recommends && rm -rf /var/lib/apt/lists/* - -ENV GO_VERSION 1.7.5 -RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local -ENV PATH $PATH:/usr/local/go/bin - -ENV AUTO_GOPATH 1 - -ENV DOCKER_BUILDTAGS apparmor exclude_graphdriver_btrfs exclude_graphdriver_devicemapper pkcs11 selinux -ENV RUNC_BUILDTAGS apparmor selinux diff --git a/contrib/builder/deb/armhf/generate.sh b/contrib/builder/deb/armhf/generate.sh index dcd135ada5..9bb943ed72 100755 --- a/contrib/builder/deb/armhf/generate.sh +++ b/contrib/builder/deb/armhf/generate.sh @@ -83,15 +83,15 @@ for version in "${versions[@]}"; do ) # packaging for "sd-journal.h" and libraries varies case "$suite" in - precise|wheezy) ;; - jessie|trusty) packages+=( libsystemd-journal-dev );; - *) packages+=( libsystemd-dev );; + wheezy) ;; + jessie|trusty) packages+=( libsystemd-journal-dev ) ;; + *) packages+=( libsystemd-dev ) ;; esac - # debian wheezy & ubuntu precise do not have the right libseccomp libs + # debian wheezy does not have the right libseccomp libs # debian jessie & ubuntu trusty have a libseccomp < 2.2.1 :( case "$suite" in - precise|wheezy|jessie|trusty) + wheezy|jessie|trusty) packages=( "${packages[@]/libseccomp-dev}" ) runcBuildTags="apparmor selinux" ;; @@ -101,23 +101,6 @@ for version in "${versions[@]}"; do ;; esac - - if [ "$suite" = 'precise' ]; then - # precise has a few package issues - - # - dh-systemd doesn't exist at all - packages=( "${packages[@]/dh-systemd}" ) - - # - libdevmapper-dev is missing critical structs (too old) - packages=( "${packages[@]/libdevmapper-dev}" ) - extraBuildTags+=' exclude_graphdriver_devicemapper' - - # - btrfs-tools is missing "ioctl.h" (too old), so it's useless - # (since kernels on precise are old too, just skip btrfs entirely) - packages=( "${packages[@]/btrfs-tools}" ) - extraBuildTags+=' exclude_graphdriver_btrfs' - fi - if [ "$suite" = 'wheezy' ]; then # pull a couple packages from backports explicitly # (build failures otherwise)