From: Bastian Germann <bage at linutronix.de>
Python 2 is end of life and every major Linux distribution is removing it
from their repositories. Stop building the Debian packages for Python 2.
Signed-off-by: Bastian Germann <bage at linutronix.de>
---
debian/control | 84 ------------------------
debian/python-elbe-bin.install | 19 ------
debian/python-elbe-bin.lintian-overrides | 2 -
debian/python-elbe-bin.postinst | 5 --
debian/python-elbe-buildenv.install | 33 ----------
debian/python-elbe-buildenv.postinst | 4 --
debian/python-elbe-common.install | 37 -----------
debian/python-elbe-control.install | 5 --
8 files changed, 189 deletions(-)
delete mode 100644 debian/python-elbe-bin.install
delete mode 100644 debian/python-elbe-bin.lintian-overrides
delete mode 100644 debian/python-elbe-bin.postinst
delete mode 100644 debian/python-elbe-buildenv.install
delete mode 100644 debian/python-elbe-buildenv.postinst
delete mode 100644 debian/python-elbe-common.install
delete mode 100644 debian/python-elbe-control.install
diff --git a/debian/control b/debian/control
index a2d71db76..de0771252 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,6 @@ Maintainer: Linutronix GmbH <info at linutronix.de>
Build-Depends: debhelper (>= 9),
dh-python,
dh-systemd,
- python-setuptools,
- python (>= 2.7~),
python3,
python3-setuptools,
python3-lxml,
@@ -38,17 +36,6 @@ Description: xml schema files
Common files for ELBE (embedded linux build environment). These
schemas are used by ELBE.
-Package: python-elbe-bin
-Conflicts: elbe (<< 12.3), elbe-common, python3-elbe-bin
-Architecture: all
-Depends: python-elbe-common (= ${binary:Version}),
- python (>= 2.7~),
- python-mako,
- debian-archive-keyring (>= 2017.5+deb9u1)
-Description: elbe executable
- Common files for ELBE (embedded linux build environment). These
- python-modules are shared by several elbe subcommands.
-
Package: python3-elbe-bin
Conflicts: elbe (<< 12.3), elbe-common, python-elbe-bin
Architecture: all
@@ -60,22 +47,6 @@ Description: elbe executable
Common files for ELBE (embedded linux build environment). These
python modules are shared by several elbe subcommands.
-Package: python-elbe-common
-Architecture: all
-Conflicts: elbe-common
-Depends: ${misc:Depends},
- elbe-schema (= ${binary:Version}),
- python (>= 2.7~),
- python-lxml,
- python-apt,
- python-gpg,
- python-libvirt,
- wget,
- cpio
-Description: common files
- Common files for ELBE (embedded linux build environment). These
- python-modules are shared by several elbe subcommands.
-
Package: python3-elbe-common
Architecture: all
Depends: ${misc:Depends},
@@ -174,48 +145,6 @@ Description: Embedded Linux Build Environment Server Component
subcommands need to be executed with root privileges. It is not recommended to
install this package on a native system.
-
-Package: python-elbe-buildenv
-Architecture: all
-Conflicts: elbe-buildenv
-Depends: ${misc:Depends},
- python (>= 2.7~),
- apt-rdepends,
- binfmt-support,
- debootstrap,
- dosfstools,
- dpkg-dev,
- python-elbe-bin (= ${binary:Version}),
- python-elbe-common (= ${binary:Version}),
- genisoimage,
- mtd-utils,
- python-apt,
- python-junit.xml,
- python-mako,
- python-parted,
- python-passlib,
- python-sqlalchemy,
- python-debian,
- qemu-user-static,
- qemu-utils,
- reprepro,
- rsync,
- kpartx,
- squashfs-tools,
- sudo,
- pbuilder,
- git,
- ca-certificates,
- subversion,
- haveged
-Recommends: elbe-daemon (= ${binary:Version}),
- elbe-soap (= ${binary:Version})
-Description: Embedded Linux Build Environment Server Component
- This package is typically installed in a virtual machine (that can be created
- with the 'elbe initvm create' command from the 'elbe' package). Several
- subcommands need to be executed with root privileges. It is not recommended to
- install this package on a native system.
-
Package: elbe-bootup-check
Architecture: all
Depends: ${misc:Depends},
@@ -237,19 +166,6 @@ Depends: ${misc:Depends},
Description: SOAP Interface for elbe buildenv
Enables remote control of the elbe buildenv via SOAP.
-Package: python-elbe-control
-Architecture: all
-Conflicts: elbe-control
-Depends: ${misc:Depends},
- python (>= 2.7~),
- python-suds,
- python-debian,
- python-elbe-common (= ${binary:Version}),
- libvirt-clients,
- libvirt-daemon-system
-Description: Commandline Tool to control an elbe buildenv
- The SOAP Interface is used to control an elbe buildenv.
-
Package: python3-elbe-control
Architecture: all
Depends: ${misc:Depends},
diff --git a/debian/python-elbe-bin.install b/debian/python-elbe-bin.install
deleted file mode 100644
index d8a9f77b7..000000000
--- a/debian/python-elbe-bin.install
+++ /dev/null
@@ -1,19 +0,0 @@
-./usr/bin/*
-./usr/share/man/man1/elbe.1
-./usr/lib/python2.*/*-packages/elbepack/commands/add.py
-./usr/lib/python2.*/*-packages/elbepack/commands/check_updates.py
-./usr/lib/python2.*/*-packages/elbepack/commands/chg_archive.py
-./usr/lib/python2.*/*-packages/elbepack/commands/diff.py
-./usr/lib/python2.*/*-packages/elbepack/commands/get_archive.py
-./usr/lib/python2.*/*-packages/elbepack/commands/init.py
-./usr/lib/python2.*/*-packages/elbepack/commands/parselicence.py
-./usr/lib/python2.*/*-packages/elbepack/commands/pin_versions.py
-./usr/lib/python2.*/*-packages/elbepack/commands/pkgdiff.py
-./usr/lib/python2.*/*-packages/elbepack/commands/preprocess.py
-./usr/lib/python2.*/*-packages/elbepack/commands/remove_sign.py
-./usr/lib/python2.*/*-packages/elbepack/commands/setsel.py
-./usr/lib/python2.*/*-packages/elbepack/commands/show.py
-./usr/lib/python2.*/*-packages/elbepack/commands/sign.py
-./usr/lib/python2.*/*-packages/elbepack/commands/validate.py
-./usr/lib/python2.*/*-packages/elbepack/commands/xsdtoasciidoc.py
-./usr/lib/python2.*/*-packages/elbepack/xsdtoasciidoc.mako
diff --git a/debian/python-elbe-bin.lintian-overrides b/debian/python-elbe-bin.lintian-overrides
deleted file mode 100644
index b4d500586..000000000
--- a/debian/python-elbe-bin.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# documentation is provided in elbe-doc
-python-elbe-bin: binary-without-manpage usr/bin/elbe
diff --git a/debian/python-elbe-bin.postinst b/debian/python-elbe-bin.postinst
deleted file mode 100644
index 897eeb40f..000000000
--- a/debian/python-elbe-bin.postinst
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-set -e
-
-# force usage of python2 for the moment
-sed -i'' -e s#/usr/bin/python3#/usr/bin/python2#g /usr/bin/elbe
diff --git a/debian/python-elbe-buildenv.install b/debian/python-elbe-buildenv.install
deleted file mode 100644
index 57abe2d90..000000000
--- a/debian/python-elbe-buildenv.install
+++ /dev/null
@@ -1,33 +0,0 @@
-./usr/lib/python2.*/*-packages/elbepack/commands/adjustpkgs.py
-./usr/lib/python2.*/*-packages/elbepack/commands/buildchroot.py
-./usr/lib/python2.*/*-packages/elbepack/commands/buildsysroot.py
-./usr/lib/python2.*/*-packages/elbepack/commands/chroot.py
-./usr/lib/python2.*/*-packages/elbepack/commands/db.py
-./usr/lib/python2.*/*-packages/elbepack/commands/fetch_initvm_pkgs.py
-./usr/lib/python2.*/*-packages/elbepack/commands/genlicence.py
-./usr/lib/python2.*/*-packages/elbepack/commands/gen_update.py
-./usr/lib/python2.*/*-packages/elbepack/commands/hdimg.py
-./usr/lib/python2.*/*-packages/elbepack/commands/mkcdrom.py
-./usr/lib/python2.*/*-packages/elbepack/commands/toolchainextract.py
-./usr/lib/python2.*/*-packages/elbepack/makofiles/preferences.mako
-./usr/lib/python2.*/*-packages/elbepack/makofiles/environment-setup-elbe.mako
-./usr/lib/python2.*/*-packages/elbepack/makofiles/toolchain-shar-extract.sh.mako
-./usr/lib/python2.*/*-packages/elbepack/hdimg.py
-./usr/lib/python2.*/*-packages/elbepack/db.py
-./usr/lib/python2.*/*-packages/elbepack/dbaction.py
-./usr/lib/python2.*/*-packages/elbepack/dump.py
-./usr/lib/python2.*/*-packages/elbepack/ziparchives.py
-./usr/lib/python2.*/*-packages/elbepack/repomanager.py
-./usr/lib/python2.*/*-packages/elbepack/finetuning.py
-./usr/lib/python2.*/*-packages/elbepack/junit.py
-./usr/lib/python2.*/*-packages/elbepack/rfs.py
-./usr/lib/python2.*/*-packages/elbepack/aptpkgutils.py
-./usr/lib/python2.*/*-packages/elbepack/cdroms.py
-./usr/lib/python2.*/*-packages/elbepack/debianreleases.py
-./usr/lib/python2.*/*-packages/elbepack/debpkg.py
-./usr/lib/python2.*/*-packages/elbepack/efilesystem.py
-./usr/lib/python2.*/*-packages/elbepack/fstab.py
-./usr/lib/python2.*/*-packages/elbepack/rpcaptcache.py
-./usr/lib/python2.*/*-packages/elbepack/updatepkg.py
-./usr/lib/python2.*/*-packages/elbepack/pbuilder.py
-./usr/lib/python2.*/*-packages/elbepack/packers.py
diff --git a/debian/python-elbe-buildenv.postinst b/debian/python-elbe-buildenv.postinst
deleted file mode 100644
index 08dc7eca8..000000000
--- a/debian/python-elbe-buildenv.postinst
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -e
-/usr/bin/python2 /usr/bin/elbe db init --name=root --password=foo
-#DEBHELPER#
diff --git a/debian/python-elbe-common.install b/debian/python-elbe-common.install
deleted file mode 100644
index 9283b0dcd..000000000
--- a/debian/python-elbe-common.install
+++ /dev/null
@@ -1,37 +0,0 @@
-./usr/lib/python2.*/*-packages/elbepack/init/default-init.xml
-./usr/lib/python2.*/*-packages/elbepack/init/Makefile.mako
-./usr/lib/python2.*/*-packages/elbepack/init/libvirt.xml.mako
-./usr/lib/python2.*/*-packages/elbepack/init/apt.conf.mako
-./usr/lib/python2.*/*-packages/elbepack/init/preseed.cfg.mako
-./usr/lib/python2.*/*-packages/elbepack/init/init-elbe.sh.mako
-./usr/lib/python2.*/*-packages/elbepack/__init__.py
-./usr/lib/python2.*/*-packages/elbepack/commands/__init__.py
-./usr/lib/python2.*/*-packages/elbepack/aptprogress.py
-./usr/lib/python2.*/*-packages/elbepack/archivedir.py
-./usr/lib/python2.*/*-packages/elbepack/changelogxml.py
-./usr/lib/python2.*/*-packages/elbepack/config.py
-./usr/lib/python2.*/*-packages/elbepack/debinstaller.py
-./usr/lib/python2.*/*-packages/elbepack/default-preseed.xml
-./usr/lib/python2.*/*-packages/elbepack/directories.py
-./usr/lib/python2.*/*-packages/elbepack/dosunix.py
-./usr/lib/python2.*/*-packages/elbepack/elbexml.py
-./usr/lib/python2.*/*-packages/elbepack/elbeproject.py
-./usr/lib/python2.*/*-packages/elbepack/filesystem.py
-./usr/lib/python2.*/*-packages/elbepack/egpg.py
-./usr/lib/python2.*/*-packages/elbepack/hashes.py
-./usr/lib/python2.*/*-packages/elbepack/initvmaction.py
-./usr/lib/python2.*/*-packages/elbepack/isooptions.py
-./usr/lib/python2.*/*-packages/elbepack/kvm.py
-./usr/lib/python2.*/*-packages/elbepack/licencexml.py
-./usr/lib/python2.*/*-packages/elbepack/log.py
-./usr/lib/python2.*/*-packages/elbepack/pbuilderaction.py
-./usr/lib/python2.*/*-packages/elbepack/pkgutils.py
-./usr/lib/python2.*/*-packages/elbepack/xmlpreprocess.py
-./usr/lib/python2.*/*-packages/elbepack/shellhelper.py
-./usr/lib/python2.*/*-packages/elbepack/templates.py
-./usr/lib/python2.*/*-packages/elbepack/toolchain.py
-./usr/lib/python2.*/*-packages/elbepack/treeutils.py
-./usr/lib/python2.*/*-packages/elbepack/validate.py
-./usr/lib/python2.*/*-packages/elbepack/version.py
-./usr/lib/python2.*/*-packages/elbepack/virtapt.py
-./usr/lib/python2.*/*-packages/elbepack/xmldefaults.py
diff --git a/debian/python-elbe-control.install b/debian/python-elbe-control.install
deleted file mode 100644
index e7e22e517..000000000
--- a/debian/python-elbe-control.install
+++ /dev/null
@@ -1,5 +0,0 @@
-./usr/lib/python2.*/*-packages/elbepack/commands/control.py
-./usr/lib/python2.*/*-packages/elbepack/commands/initvm.py
-./usr/lib/python2.*/*-packages/elbepack/commands/pbuilder.py
-./usr/lib/python2.*/*-packages/elbepack/commands/prjrepo.py
-./usr/lib/python2.*/*-packages/elbepack/soapclient.py
--
2.20.1