Patchwork [1,of,8,stable] packaging: drop "support" for unsupported Fedora versions

login
register
mail settings
Submitter Mads Kiilerich
Date Nov. 1, 2019, 2:40 p.m.
Message ID <a29e42f5492266b779ab.1572619229@madski>
Download mbox | patch
Permalink /patch/42637/
State Accepted
Headers show

Comments

Mads Kiilerich - Nov. 1, 2019, 2:40 p.m.
# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 1572519191 -3600
#      Thu Oct 31 11:53:11 2019 +0100
# Branch stable
# Node ID a29e42f5492266b779ab24ac4496211c947c6601
# Parent  fdc3af52305b805863d0178b9e8c7150b2495479
packaging: drop "support" for unsupported Fedora versions

Fedora 31 has just been released, and Fedora 29 will be EOL in a month. Don't
spend any time thinking about dead stuff.
Gregory Szorc - Nov. 1, 2019, 5:19 p.m.
On Fri, Nov 1, 2019 at 7:49 AM Mads Kiilerich <mads@kiilerich.com> wrote:

> # HG changeset patch
> # User Mads Kiilerich <mads@kiilerich.com>
> # Date 1572519191 -3600
> #      Thu Oct 31 11:53:11 2019 +0100
> # Branch stable
> # Node ID a29e42f5492266b779ab24ac4496211c947c6601
> # Parent  fdc3af52305b805863d0178b9e8c7150b2495479
> packaging: drop "support" for unsupported Fedora versions
>

Queued for stable.


>
> Fedora 31 has just been released, and Fedora 29 will be EOL in a month.
> Don't
> spend any time thinking about dead stuff.
>
> diff --git a/Makefile b/Makefile
> --- a/Makefile
> +++ b/Makefile
> @@ -189,9 +189,6 @@ packaging_targets := \
>    docker-centos7 \
>    docker-debian-jessie \
>    docker-debian-stretch \
> -  docker-fedora20 \
> -  docker-fedora21 \
> -  docker-fedora28 \
>    docker-fedora29 \
>    docker-ubuntu-trusty \
>    docker-ubuntu-trusty-ppa \
> @@ -201,9 +198,6 @@ packaging_targets := \
>    docker-ubuntu-artful-ppa \
>    docker-ubuntu-bionic \
>    docker-ubuntu-bionic-ppa \
> -  fedora20 \
> -  fedora21 \
> -  fedora28 \
>    fedora29 \
>    linux-wheels \
>    linux-wheels-x86_64 \
> diff --git a/contrib/packaging/Makefile b/contrib/packaging/Makefile
> --- a/contrib/packaging/Makefile
> +++ b/contrib/packaging/Makefile
> @@ -12,9 +12,6 @@ UBUNTU_CODENAMES := \
>    disco
>
>  FEDORA_RELEASES := \
> -  20 \
> -  21 \
> -  28 \
>    29
>
>  CENTOS_RELEASES := \
> diff --git a/contrib/packaging/docker/fedora20
> b/contrib/packaging/docker/fedora20
> deleted file mode 100644
> --- a/contrib/packaging/docker/fedora20
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -FROM fedora:20
> -
> -RUN groupadd -g 1000 build && \
> -    useradd -u 1000 -g 1000 -s /bin/bash -d /build -m build
> -
> -RUN yum install -y \
> -       gcc \
> -       gettext \
> -       make \
> -       python-devel \
> -       python-docutils \
> -       rpm-build
> -
> -# For creating repo meta data
> -RUN yum install -y createrepo
> diff --git a/contrib/packaging/docker/fedora21
> b/contrib/packaging/docker/fedora21
> deleted file mode 100644
> --- a/contrib/packaging/docker/fedora21
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -FROM fedora:21
> -
> -RUN groupadd -g 1000 build && \
> -    useradd -u 1000 -g 1000 -s /bin/bash -d /build -m build
> -
> -RUN yum install -y \
> -       gcc \
> -       gettext \
> -       make \
> -       python-devel \
> -       python-docutils \
> -       rpm-build
> -
> -# For creating repo meta data
> -RUN yum install -y createrepo
> diff --git a/contrib/packaging/docker/fedora28
> b/contrib/packaging/docker/fedora28
> deleted file mode 100644
> --- a/contrib/packaging/docker/fedora28
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -FROM fedora:28
> -
> -RUN groupadd -g 1000 build && \
> -    useradd -u 1000 -g 1000 -s /bin/bash -d /build -m build
> -
> -RUN dnf install -y \
> -       gcc \
> -       gettext \
> -       make \
> -       python-devel \
> -       python-docutils \
> -       rpm-build
> -
> -# For creating repo meta data
> -RUN dnf install -y createrepo
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>

Patch

diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -189,9 +189,6 @@  packaging_targets := \
   docker-centos7 \
   docker-debian-jessie \
   docker-debian-stretch \
-  docker-fedora20 \
-  docker-fedora21 \
-  docker-fedora28 \
   docker-fedora29 \
   docker-ubuntu-trusty \
   docker-ubuntu-trusty-ppa \
@@ -201,9 +198,6 @@  packaging_targets := \
   docker-ubuntu-artful-ppa \
   docker-ubuntu-bionic \
   docker-ubuntu-bionic-ppa \
-  fedora20 \
-  fedora21 \
-  fedora28 \
   fedora29 \
   linux-wheels \
   linux-wheels-x86_64 \
diff --git a/contrib/packaging/Makefile b/contrib/packaging/Makefile
--- a/contrib/packaging/Makefile
+++ b/contrib/packaging/Makefile
@@ -12,9 +12,6 @@  UBUNTU_CODENAMES := \
   disco
 
 FEDORA_RELEASES := \
-  20 \
-  21 \
-  28 \
   29
 
 CENTOS_RELEASES := \
diff --git a/contrib/packaging/docker/fedora20 b/contrib/packaging/docker/fedora20
deleted file mode 100644
--- a/contrib/packaging/docker/fedora20
+++ /dev/null
@@ -1,15 +0,0 @@ 
-FROM fedora:20
-
-RUN groupadd -g 1000 build && \
-    useradd -u 1000 -g 1000 -s /bin/bash -d /build -m build
-
-RUN yum install -y \
-	gcc \
-	gettext \
-	make \
-	python-devel \
-	python-docutils \
-	rpm-build
-
-# For creating repo meta data
-RUN yum install -y createrepo
diff --git a/contrib/packaging/docker/fedora21 b/contrib/packaging/docker/fedora21
deleted file mode 100644
--- a/contrib/packaging/docker/fedora21
+++ /dev/null
@@ -1,15 +0,0 @@ 
-FROM fedora:21
-
-RUN groupadd -g 1000 build && \
-    useradd -u 1000 -g 1000 -s /bin/bash -d /build -m build
-
-RUN yum install -y \
-	gcc \
-	gettext \
-	make \
-	python-devel \
-	python-docutils \
-	rpm-build
-
-# For creating repo meta data
-RUN yum install -y createrepo
diff --git a/contrib/packaging/docker/fedora28 b/contrib/packaging/docker/fedora28
deleted file mode 100644
--- a/contrib/packaging/docker/fedora28
+++ /dev/null
@@ -1,15 +0,0 @@ 
-FROM fedora:28
-
-RUN groupadd -g 1000 build && \
-    useradd -u 1000 -g 1000 -s /bin/bash -d /build -m build
-
-RUN dnf install -y \
-	gcc \
-	gettext \
-	make \
-	python-devel \
-	python-docutils \
-	rpm-build
-
-# For creating repo meta data
-RUN dnf install -y createrepo