From 2e2881239d5a2fc5f2c92173fef8782db345d3fe Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Sun, 14 Jul 2024 13:58:29 +0200 Subject: [PATCH] cleanup --- .../buster/katello-host-tools/build_vars.sh | 1 - client/buster/katello-host-tools/changelog | 5 --- client/buster/katello-host-tools/clean | 1 - client/buster/katello-host-tools/compat | 1 - client/buster/katello-host-tools/control | 30 --------------- client/buster/katello-host-tools/copyright | 38 ------------------- .../katello-host-tools-tracer.install | 4 -- .../katello-host-tools.pyinstall | 1 - client/buster/katello-host-tools/rules | 28 -------------- .../buster/katello-host-tools/source/format | 1 - .../buster/katello-host-tools/source/options | 1 - client/focal/katello-host-tools/clean | 1 - client/focal/katello-host-tools/compat | 1 - client/focal/katello-host-tools/control | 10 +---- .../katello-host-tools-tracer.install | 5 ++- .../katello-host-tools.install | 10 +++++ .../katello-host-tools.pyinstall | 1 - client/focal/katello-host-tools/rules | 23 +---------- 18 files changed, 17 insertions(+), 145 deletions(-) delete mode 100644 client/buster/katello-host-tools/build_vars.sh delete mode 100644 client/buster/katello-host-tools/changelog delete mode 100644 client/buster/katello-host-tools/clean delete mode 100644 client/buster/katello-host-tools/compat delete mode 100644 client/buster/katello-host-tools/control delete mode 100644 client/buster/katello-host-tools/copyright delete mode 100755 client/buster/katello-host-tools/katello-host-tools-tracer.install delete mode 100644 client/buster/katello-host-tools/katello-host-tools.pyinstall delete mode 100755 client/buster/katello-host-tools/rules delete mode 100644 client/buster/katello-host-tools/source/format delete mode 100644 client/buster/katello-host-tools/source/options delete mode 100644 client/focal/katello-host-tools/clean delete mode 100644 client/focal/katello-host-tools/compat create mode 100644 client/focal/katello-host-tools/katello-host-tools.install delete mode 100644 client/focal/katello-host-tools/katello-host-tools.pyinstall diff --git a/client/buster/katello-host-tools/build_vars.sh b/client/buster/katello-host-tools/build_vars.sh deleted file mode 100644 index 1ef96cd442f..00000000000 --- a/client/buster/katello-host-tools/build_vars.sh +++ /dev/null @@ -1 +0,0 @@ -BUILD_TYPE=python diff --git a/client/buster/katello-host-tools/changelog b/client/buster/katello-host-tools/changelog deleted file mode 100644 index 8ea09891c8c..00000000000 --- a/client/buster/katello-host-tools/changelog +++ /dev/null @@ -1,5 +0,0 @@ -katello-host-tools (4.3.0-1) unstable; urgency=medium - - * Initial packaging attempts - - -- Bernhard Suttner Mon, 07 Nov 2022 16:41:42 +0100 diff --git a/client/buster/katello-host-tools/clean b/client/buster/katello-host-tools/clean deleted file mode 100644 index 45149aa16d6..00000000000 --- a/client/buster/katello-host-tools/clean +++ /dev/null @@ -1 +0,0 @@ -*.egg-info/* diff --git a/client/buster/katello-host-tools/compat b/client/buster/katello-host-tools/compat deleted file mode 100644 index ec635144f60..00000000000 --- a/client/buster/katello-host-tools/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/client/buster/katello-host-tools/control b/client/buster/katello-host-tools/control deleted file mode 100644 index 27d9d3d8be5..00000000000 --- a/client/buster/katello-host-tools/control +++ /dev/null @@ -1,30 +0,0 @@ -Source: katello-host-tools -Section: unknown -Priority: optional -Maintainer: ATIX Team -Build-Depends: debhelper (>= 9), - dh-exec, - dh-python, - lsb-release, - python3-setuptools, - python3-all -Standards-Version: 3.9.8 -Homepage: https://github.com/katello/katello-host-tools -X-Python-Version: >= 2.6 -X-Python3-Version: >= 3.2 - -Package: katello-host-tools -Architecture: all -Depends: ${python3:Depends}, ${misc:Depends}, python3-subscription-manager -Description: - . - A set of commands that support a Katello host including faster package profile uploading and bound repository reporting. - . - -Package: katello-host-tools-tracer -Architecture: all -Depends: ${python3:Depends}, ${misc:Depends}, katello-host-tools -Description: - . - Adds Tracer functionality to a client managed by katello-host-tools. - . diff --git a/client/buster/katello-host-tools/copyright b/client/buster/katello-host-tools/copyright deleted file mode 100644 index acf7a0e7c00..00000000000 --- a/client/buster/katello-host-tools/copyright +++ /dev/null @@ -1,38 +0,0 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: katello-host-tools -Source: - -Files: * -Copyright: - -License: - - - . - - -# If you want to use GPL v2 or later for the /debian/* files use -# the following clauses, or change it to suit. Delete these two lines -Files: debian/* -Copyright: 2021 Bernhard Suttner -License: GPL-2+ - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see - . - On Debian systems, the complete text of the GNU General - Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". - -# Please also look if there are files or directories which have a -# different copyright/license attached and list them here. -# Please avoid picking licenses with terms that are more restrictive than the -# packaged work, as it may make Debian's contributions unacceptable upstream. diff --git a/client/buster/katello-host-tools/katello-host-tools-tracer.install b/client/buster/katello-host-tools/katello-host-tools-tracer.install deleted file mode 100755 index ad6e9160d7b..00000000000 --- a/client/buster/katello-host-tools/katello-host-tools-tracer.install +++ /dev/null @@ -1,4 +0,0 @@ -#! /usr/bin/dh-exec -katello/contrib/extra/81-tracer-upload-apt => /etc/apt/apt.conf.d/81-tracer-upload -katello/contrib/extra/katello-tracer-upload.cron => /etc/cron.d/katello-host-tools -katello/apt_plugins/tracer_upload.py => /usr/bin/tracer-upload diff --git a/client/buster/katello-host-tools/katello-host-tools.pyinstall b/client/buster/katello-host-tools/katello-host-tools.pyinstall deleted file mode 100644 index 9e327e14509..00000000000 --- a/client/buster/katello-host-tools/katello-host-tools.pyinstall +++ /dev/null @@ -1 +0,0 @@ -src/katello/*.py katello diff --git a/client/buster/katello-host-tools/rules b/client/buster/katello-host-tools/rules deleted file mode 100755 index f05ef56d25e..00000000000 --- a/client/buster/katello-host-tools/rules +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/make -f -# See debhelper(7) (uncomment to enable) -# output every command that modifies files on the build system. -export DH_VERBOSE = 1 - -export PYBUILD_NAME=katello-host-tools -export PYBUILD_DISABLE=test -export PYBUILD_DESTDIR_python2=${PWD}/debian/python-${PYBUILD_NAME}/ -export PYBUILD_DESTDIR_python2-dbg=${PWD}/debian/python-${PYBUILD_NAME}-dbg/ -export PYBUILD_DESTDIR_python3=${PWD}/debian/python3-${PYBUILD_NAME}/ -export PYBUILD_DESTDIR_python3-dbg=${PWD}/debian/python3-${PYBUILD_NAME}-dbg/ - -export PYTHON=python3 -export INCLUDE_SYSPURPOSE=1 -export PYBUILD_SYSTEM=custom - -include /usr/share/dpkg/default.mk - -%: - dh $@ --with python3 --buildsystem=pybuild - -override_dh_auto_clean: - dh_auto_clean - rm -rf build - rm -rf *.egg-info - -override_dh_auto_build: - dh_auto_build diff --git a/client/buster/katello-host-tools/source/format b/client/buster/katello-host-tools/source/format deleted file mode 100644 index 163aaf8d82b..00000000000 --- a/client/buster/katello-host-tools/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/client/buster/katello-host-tools/source/options b/client/buster/katello-host-tools/source/options deleted file mode 100644 index cb61fa5267b..00000000000 --- a/client/buster/katello-host-tools/source/options +++ /dev/null @@ -1 +0,0 @@ -extend-diff-ignore = "^[^/]*[.]egg-info/" diff --git a/client/focal/katello-host-tools/clean b/client/focal/katello-host-tools/clean deleted file mode 100644 index 45149aa16d6..00000000000 --- a/client/focal/katello-host-tools/clean +++ /dev/null @@ -1 +0,0 @@ -*.egg-info/* diff --git a/client/focal/katello-host-tools/compat b/client/focal/katello-host-tools/compat deleted file mode 100644 index ec635144f60..00000000000 --- a/client/focal/katello-host-tools/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/client/focal/katello-host-tools/control b/client/focal/katello-host-tools/control index 27d9d3d8be5..e022663861b 100644 --- a/client/focal/katello-host-tools/control +++ b/client/focal/katello-host-tools/control @@ -2,29 +2,23 @@ Source: katello-host-tools Section: unknown Priority: optional Maintainer: ATIX Team -Build-Depends: debhelper (>= 9), +Build-Depends: debhelper-compat (= 12), dh-exec, dh-python, lsb-release, python3-setuptools, python3-all -Standards-Version: 3.9.8 +Standards-Version: 4.6.1 Homepage: https://github.com/katello/katello-host-tools -X-Python-Version: >= 2.6 -X-Python3-Version: >= 3.2 Package: katello-host-tools Architecture: all Depends: ${python3:Depends}, ${misc:Depends}, python3-subscription-manager Description: - . A set of commands that support a Katello host including faster package profile uploading and bound repository reporting. - . Package: katello-host-tools-tracer Architecture: all Depends: ${python3:Depends}, ${misc:Depends}, katello-host-tools Description: - . Adds Tracer functionality to a client managed by katello-host-tools. - . diff --git a/client/focal/katello-host-tools/katello-host-tools-tracer.install b/client/focal/katello-host-tools/katello-host-tools-tracer.install index ad6e9160d7b..3a0d66ff7eb 100755 --- a/client/focal/katello-host-tools/katello-host-tools-tracer.install +++ b/client/focal/katello-host-tools/katello-host-tools-tracer.install @@ -1,4 +1,5 @@ -#! /usr/bin/dh-exec +#!/usr/bin/dh-exec +usr/bin/katello-tracer-upload +usr/lib/python*/dist-packages/katello/tracer/ katello/contrib/extra/81-tracer-upload-apt => /etc/apt/apt.conf.d/81-tracer-upload katello/contrib/extra/katello-tracer-upload.cron => /etc/cron.d/katello-host-tools -katello/apt_plugins/tracer_upload.py => /usr/bin/tracer-upload diff --git a/client/focal/katello-host-tools/katello-host-tools.install b/client/focal/katello-host-tools/katello-host-tools.install new file mode 100644 index 00000000000..aa2fb12b464 --- /dev/null +++ b/client/focal/katello-host-tools/katello-host-tools.install @@ -0,0 +1,10 @@ +usr/bin/katello-enabled-repos-upload +usr/bin/katello-package-upload +usr/lib/python*/dist-packages/katello/__init__.py +usr/lib/python*/dist-packages/katello/constants.py +usr/lib/python*/dist-packages/katello/enabled_report.py +usr/lib/python*/dist-packages/katello/packages.py +usr/lib/python*/dist-packages/katello/repos.py +usr/lib/python*/dist-packages/katello/scripts.py +usr/lib/python*/dist-packages/katello/uep.py +usr/lib/python*/dist-packages/katello/utils.py diff --git a/client/focal/katello-host-tools/katello-host-tools.pyinstall b/client/focal/katello-host-tools/katello-host-tools.pyinstall deleted file mode 100644 index 9e327e14509..00000000000 --- a/client/focal/katello-host-tools/katello-host-tools.pyinstall +++ /dev/null @@ -1 +0,0 @@ -src/katello/*.py katello diff --git a/client/focal/katello-host-tools/rules b/client/focal/katello-host-tools/rules index f05ef56d25e..0c8bd218fac 100755 --- a/client/focal/katello-host-tools/rules +++ b/client/focal/katello-host-tools/rules @@ -1,28 +1,9 @@ #!/usr/bin/make -f -# See debhelper(7) (uncomment to enable) -# output every command that modifies files on the build system. -export DH_VERBOSE = 1 - -export PYBUILD_NAME=katello-host-tools +#export PYBUILD_NAME=katello-host-tools export PYBUILD_DISABLE=test -export PYBUILD_DESTDIR_python2=${PWD}/debian/python-${PYBUILD_NAME}/ -export PYBUILD_DESTDIR_python2-dbg=${PWD}/debian/python-${PYBUILD_NAME}-dbg/ -export PYBUILD_DESTDIR_python3=${PWD}/debian/python3-${PYBUILD_NAME}/ -export PYBUILD_DESTDIR_python3-dbg=${PWD}/debian/python3-${PYBUILD_NAME}-dbg/ - -export PYTHON=python3 -export INCLUDE_SYSPURPOSE=1 -export PYBUILD_SYSTEM=custom +export PYBUILD_AFTER_INSTALL=rm -rf '{destdir}/{install_dir}/katello/contrib' '{destdir}/{install_dir}/katello/tracer/zypper.py' '{destdir}/{install_dir}/zypper_plugins' '{destdir}/{install_dir}/dnf-plugins' '{destdir}/{install_dir}/yum-plugins' '{destdir}/{install_dir}/katello/agent' include /usr/share/dpkg/default.mk %: dh $@ --with python3 --buildsystem=pybuild - -override_dh_auto_clean: - dh_auto_clean - rm -rf build - rm -rf *.egg-info - -override_dh_auto_build: - dh_auto_build