Skip to content

Commit 9a91496

Browse files
arif-aliTurboTurtle
arif-ali
authored and
TurboTurtle
committed
[debian][pkg] Update to latest packaging config
Bringing in most of the relevant changes from downstream build environment No transitional package to be used upstream Signed-off-by: Arif Ali <arif.ali@canonical.com>
1 parent c506cee commit 9a91496

File tree

14 files changed

+228
-41
lines changed

14 files changed

+228
-41
lines changed

‎.cirrus.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ deb_build_task:
158158
apt update --allow-releaseinfo-change
159159
apt -y install devscripts equivs python3-pip
160160
mk-build-deps
161-
apt -y install ./sosreport-build-deps*.deb
161+
apt -y install ./sos-build-deps*.deb
162162
[[ $(pip3 install --help | grep break-system) ]] && PIP_EXTRA="--break-system-packages"
163163
pip3 install -r test-requirements.txt ${PIP_EXTRA}
164164
main_script: |
@@ -243,7 +243,8 @@ report_stageone_task:
243243
DEB_BUILD_NAME: ${BUILD_NAME}
244244
setup_script: &setup |
245245
if [ $(command -v apt) ]; then
246-
apt -y purge sosreport
246+
[[ "$(dpkg -l sos)" ]] && apt -y purge sos
247+
[[ "$(dpkg -l sosreport)" ]] && apt -y purge sosreport
247248
apt update --allow-releaseinfo-change
248249
apt -y install python3-pip ethtool python3-systemd
249250
if [ ${PKG} == "snap" ] ; then

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ docs/_build
2424
.idea/
2525

2626
# debian files
27-
debian/sosreport*
27+
debian/sosreport/*
28+
debian/sos/*
2829
debian/files
2930
debian/.debhelper
3031
debian/debhelper-build-stamp

‎debian/changelog‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
sosreport (4.8.2) New upstream release; urgency=medium
1+
sos (4.8.2-4) oracular; urgency=medium
2+
3+
* Update to new sos package and version for Breakage.
4+
5+
-- Arif Ali <arif.ali@canonical.com> Mon, 17 Feb 2025 10:39:30 +0000
6+
7+
sosreport (4.8.2) oracular; urgency=medium
28

39
* New upstream release
410

‎debian/control‎

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,45 @@
1-
Source: sosreport
2-
Maintainer: David Negreira <david.negreira@canonical.com>
1+
Source: sos
2+
Maintainer: sosreport Dev Team <sosreport-dev@lists.canonical.com>
3+
Uploaders:
4+
Arif Ali <arif.ali@canonical.com>,
35
Section: admin
46
Priority: optional
5-
Standards-Version: 4.5.1
7+
Standards-Version: 4.7.0
8+
Rules-Requires-Root: no
69
Build-Depends:
710
debhelper-compat (= 13),
811
dh-python,
12+
fdisk,
913
gettext,
1014
python3-all,
11-
python3-coverage,
12-
python3-nose,
13-
python3-setuptools,
14-
python3-sphinx,
1515
python3-magic,
16-
python3-pexpect,
1716
python3-packaging,
17+
python3-pexpect,
18+
python3-setuptools,
19+
python3-sphinx,
1820
python3-yaml,
1921
Homepage: https://github.com/sosreport/sos
2022
Vcs-Browser: https://salsa.debian.org/sosreport-team/sosreport
2123
Vcs-Git: https://salsa.debian.org/sosreport-team/sosreport.git
22-
X-Python3-Version: >= 3.6
2324

24-
Package: sosreport
25+
Package: sos
26+
Replaces:
27+
sosreport (<< 4.8.2-4~),
28+
Breaks:
29+
sosreport (<< 4.8.2-4~),
2530
Architecture: any
26-
Depends: ${python3:Depends}, ${misc:Depends}, python3-pexpect, python3-magic, python3-packaging, python3-boto3, python3-yaml
31+
Depends:
32+
python3-magic,
33+
python3-packaging,
34+
python3-pexpect,
35+
python3-yaml,
36+
${misc:Depends},
37+
${python3:Depends},
38+
Recommends:
39+
e2fsprogs,
40+
lsof,
41+
mount,
42+
python3-boto3,
2743
Description: Set of tools to gather troubleshooting data from a system
2844
Sos is a set of tools that gathers information about system
2945
hardware and configuration. The information can then be used for

‎debian/copyright‎

Lines changed: 107 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,94 @@ Source: https://github.com/sosreport/sos
55

66
Files: *
77
Copyright: (C) 2012-2017 Bryn M. Reeves
8-
(C) 2007-2024 Red Hat, Inc.
9-
(C) 2012-2024 Canonical Ltd.
8+
(C) 2007-2025 Red Hat, Inc.
9+
(C) 2012-2025 Canonical Ltd.
10+
License: GPL-2
11+
12+
Files: sos/policies/distros/almalinux.py
13+
Copyright: (C) Eduard Abdullin <eabdullin@almalinux.org>
14+
License: GPL-2
15+
16+
Files: sos/policies/distros/azure.py
17+
Copyright: (C) Eric Desrochers <edesrochers@microsoft.com>
18+
License: GPL-2
19+
20+
Files: sos/report/plugins/bird.py
21+
Copyright: (C) 2024 Jake Hunsaker <jacob.r.hunsaker@gmail.com>
22+
(C) 2019 Alexander Petrovskiy <alexpe@mellanox.com>
23+
License: GPL-2
24+
25+
Files: sos/policies/distros/circle.py
26+
Copyright: (C) Bella Zhang <bella@cclinux.org>
27+
License: GPL-2
28+
29+
Files: sos/policies/distros/opencloudos.py
30+
Copyright: (C) 2022 Tencent., ZoeDong <zoedong@tencent.com>
31+
License: GPL-2
32+
33+
Files: sos/policies/distros/rocky.py
34+
Copyright: (C) Louis Abel <label@rockylinux.org>
35+
License: GPL-2
36+
37+
Files: sos/report/plugins/elastic.py
38+
Copyright: (C) 2018 Amit Ghadge <amitg.b14@gmail.com>
39+
License: GPL-2
40+
41+
Files: sos/report/plugins/kimchi.py
42+
Copyright: (C) IBM, Corp. 2014, Christy Perez <christy@linux.vnet.ibm.com>
43+
License: GPL-2
44+
45+
Files: sos/report/plugins/mellanox_firmware.py
46+
Copyright: (C) 2023 Nvidia Corporation, Alin Serdean <aserdean@nvidia.com>
47+
License: GPL-2
48+
49+
Files: sos/report/plugins/memcached.py
50+
Copyright: (C) 2018 Mikel Olasagasti Uranga <mikel@olasagasti.info>
51+
License: GPL-2
52+
53+
Files: sos/report/plugins/navicli.py
54+
sos/report/plugins/powerpath.py
55+
sos/report/plugins/symcli.py
56+
Copyright: (C) 2008 EMC Corporation. Keith Kearnan <kearnan_keith@emc.com>
57+
License: GPL-2
58+
59+
Files: sos/report/plugins/opencontrail.py
60+
Copyright: (C) 2021 Mirantis, Inc., Oleksii Molchanov <omolchanov@mirantis.com>
61+
License: GPL-2
62+
63+
Files: sos/report/plugins/openstack_ansible.py
64+
Copyright: (C) 2017 Major Hayden <major@mhtx.net>
65+
License: GPL-2
66+
67+
Files: sos/report/plugins/openstack_barbican.py
68+
Copyright: (C) 2019 Mirantis, Inc., Denis Egorenko <degorenko@mirantis.com>
69+
License: GPL-2
70+
71+
Files: sos/report/plugins/openstack_ceilometer.py
72+
sos/report/plugins/openstack_cinder.py
73+
sos/report/plugins/openstack_glance.py
74+
sos/report/plugins/openstack_horizon.py
75+
sos/report/plugins/openstack_nova.py
76+
sos/report/plugins/openstack_swift.py
77+
Copyright: (C) 2012 Rackspace US, Inc.
78+
License: GPL-2
79+
80+
Files: sos/report/plugins/pcp.py
81+
Copyright: (C) 2014 Michele Baldessari <michele at acksyn.org>
82+
License: GPL-2
83+
84+
Files: sos/report/plugins/proxmox.py
85+
Copyright: (C) 2024 ORNESS/Ditrit Drien Breton <drien.breton@orness.com>
86+
License: GPL-2
87+
88+
Files: debian/*
89+
Copyright: 2013 Adam Stokes <adam.stokes@ubuntu.com>
90+
(C) 2013-2025 Canonical Ltd.
91+
License: GPL-2+
92+
93+
Files: debian/tests/simple.sh
94+
Copyright: 2020 Eric Desrochers <eric.desrochers@canonical.com>
95+
(C) 2020-2025 Canonical Ltd.
1096
License: GPL-2
1197

1298
License: GPL-2
@@ -23,3 +109,22 @@ License: GPL-2
23109
along with this program; if not, write to the Free Software
24110
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
25111
USA.
112+
113+
License: GPL-2+
114+
This program is free software; you can redistribute it and/or modify
115+
it under the terms of the GNU General Public License as published by
116+
the Free Software Foundation; either version 2 of the License, or (at
117+
your option) any later version.
118+
.
119+
This program is distributed in the hope that it will be useful, but
120+
WITHOUT ANY WARRANTY; without even the implied warranty of
121+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
122+
General Public License for more details.
123+
.
124+
You should have received a copy of the GNU General Public License
125+
along with this program; if not, write to the Free Software
126+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
127+
USA.
128+
.
129+
On Debian systems, the complete text of the GNU General Public
130+
License, version 2, can be found in /usr/share/common-licenses/GPL-2.

‎debian/patches/0001-debian-change-tmp-dir-location.patch‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
1-
Description: Change default location to /tmp
1+
From: Eric Desrochers <slashd@ubuntu.com>
2+
Date: Wed, 19 Aug 2020 22:49:24 +0000
3+
Subject: Change default location to /tmp
4+
5+
Forwarded: not-needed
6+
---
7+
sos.conf | 1 +
8+
1 file changed, 1 insertion(+)
9+
10+
diff --git a/sos.conf b/sos.conf
11+
index 2be22a3..26778d2 100644
212
--- a/sos.conf
313
+++ b/sos.conf
414
@@ -7,6 +7,7 @@

‎debian/patches/0002-debian-do-not-install-LICENSE-README-AUTHORS.patch‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
From: Marc Leeman <marc.leeman@gmail.com>
2+
Date: Mon, 8 Jul 2024 09:53:51 +0100
3+
Subject: Do not install LICENSE file
4+
5+
Last-Update: 2024-08-29
6+
Forwarded: not-needed
7+
8+
The LICENSE in debian is contained in the copyright file that contains
9+
the same information.
10+
11+
The files in share/doc/sos are already being populated into share/doc/sosreport
12+
so we don't want them to be duplicated.
13+
---
14+
setup.py | 2 --
15+
1 file changed, 2 deletions(-)
16+
17+
diff --git a/setup.py b/setup.py
18+
index 6c0b09a1..c214570d 100644
19+
--- a/setup.py
20+
+++ b/setup.py
21+
@@ -26,8 +26,6 @@ setup(
22+
'man/en/sos-mask.1', 'man/en/sos-help.1',
23+
'man/en/sos-upload.1']),
24+
('share/man/man5', ['man/en/sos.conf.5']),
25+
- ('share/licenses/sos', ['LICENSE']),
26+
- ('share/doc/sos', ['AUTHORS', 'README.md']),
27+
('config', ['sos.conf', 'tmpfiles/tmpfilesd-sos-rh.conf'])
28+
],
29+
packages=find_packages(include=['sos', 'sos.*'])

‎debian/patches/series‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
0001-debian-change-tmp-dir-location.patch
2+
0002-debian-do-not-install-LICENSE-README-AUTHORS.patch

‎debian/rules‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
#!/usr/bin/make -f
22

3-
export PYBUILD_NAME=sosreport
3+
export PYBUILD_NAME=sos
4+
export PYBUILD_DESTDIR=debian/$(PYBUILD_NAME)
45

56
%:
67
dh $@ --with python3 --buildsystem=pybuild
78

89
override_dh_install:
910
# Move config file to the right location.
10-
mv debian/sosreport/usr/config/sos.conf debian/sosreport/etc/sos/sos.conf
11+
mkdir -p debian/sos/etc/sos
12+
mv debian/sos/usr/config/sos.conf debian/sos/etc/sos/sos.conf
1113
# Remove unnecessary unused dir.
12-
rm -rf debian/sosreport/usr/config
14+
rm -rf debian/sos/usr/config
1315

1416
override_dh_auto_test:
15-
nosetests3 -v --with-cover --cover-package=sos tests/unittests --ignore-files="policy_tests\.py"
17+
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
18+
python3 -m unittest -v $(shell find tests/unittests -name "*_tests.py" -not -path "*policy_tests.py")
19+
endif

‎debian/source/lintian-overrides‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
sos source: debian-watch-does-not-check-openpgp-signature [debian/watch]
2+
sos source: very-long-line-length-in-source-file 1039 > 512 [tests/report_tests/plugin_tests/juju/agent.conf:188]
3+
sos source: very-long-line-length-in-source-file 2374 > 512 [tests/report_tests/plugin_tests/curtin/curtin-install.log:883]

0 commit comments

Comments
 (0)