Skip to content

Commit 02edbff

Browse files
committed
fix: use explicit cockpit deps for debian to avoid network-manager
1 parent 7ab3682 commit 02edbff

10 files changed

Lines changed: 44 additions & 6 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
## 2FA module 1.2.1-2
1+
## 2FA module 1.2.1-3
22

3-
* fix: add permissions for release job
3+
* fix: use explicit cockpit deps for debian to avoid network-manager

manifest.json

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"title": "2FA module",
55
"stable": true,
66
"version": "1.2.1",
7-
"build_number": "2",
7+
"build_number": "3",
88
"author": "Rachit Hans <rhans@45drives.com>",
99
"git_url": "https://github.com/45Drives/cockpit-zfs-45d",
1010
"license": "GPL-3.0+",
@@ -29,6 +29,16 @@
2929
"python3",
3030
"python3-pip",
3131
"google-authenticator"
32+
],
33+
"debian_common": [
34+
"cockpit-ws",
35+
"cockpit-bridge",
36+
"cockpit-system",
37+
"cockpit-storaged",
38+
"cockpit-packagekit",
39+
"python3",
40+
"python3-pip",
41+
"libpam-google-authenticator"
3242
]
3343
},
3444
"builds": [
@@ -70,7 +80,7 @@
7080
"changelog": {
7181
"urgency": "medium",
7282
"version": "1.2.1",
73-
"build_number": "2",
83+
"build_number": "3",
7484
"date": null,
7585
"packager": "Rachit Hans <rhans@45drives.com>",
7686
"changes": []

packaging/debian-bookworm/changelog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
cockpit-2fa (1.2.1-3bookworm) bookworm; urgency=medium
2+
3+
* fix: use explicit cockpit deps for debian to avoid network-manager
4+
5+
-- Rachit Hans <rhans@45drives.com> Wed, 08 Jul 2026 14:38:16 -0300
6+
17
cockpit-2fa (1.2.1-2bookworm) bookworm; urgency=medium
28

39
* fix: add permissions for release job

packaging/debian-bookworm/control.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ Vcs-Git: {{ git_url }}
99

1010
Package: {{ name }}
1111
Architecture: {{ architecture.ubuntu }}
12-
Depends: {{ dependencies.ubuntu_common | join(',') }}
12+
Depends: {{ dependencies.debian_common | join(',') }}
1313
Description: {{ description }}

packaging/debian-trixie/changelog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
cockpit-2fa (1.2.1-3trixie) trixie; urgency=medium
2+
3+
* fix: use explicit cockpit deps for debian to avoid network-manager
4+
5+
-- Rachit Hans <rhans@45drives.com> Wed, 08 Jul 2026 14:38:16 -0300
6+
17
cockpit-2fa (1.2.1-2trixie) trixie; urgency=medium
28

39
* fix: add permissions for release job

packaging/debian-trixie/control.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ Vcs-Git: {{ git_url }}
99

1010
Package: {{ name }}
1111
Architecture: {{ architecture.ubuntu }}
12-
Depends: {{ dependencies.ubuntu_common | join(',') }}
12+
Depends: {{ dependencies.debian_common | join(',') }}
1313
Description: {{ description }}

packaging/rocky-el8/main.spec.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ find /home /root -name ".google_authenticator" -exec rm -f {} \; 2>/dev/null
6969

7070

7171
%changelog
72+
* Wed Jul 08 2026 Rachit Hans <rhans@45drives.com> 1.2.1-3
73+
- fix: use explicit cockpit deps for debian to avoid network-manager
7274
* Wed Jul 08 2026 Rachit Hans <rhans@45drives.com> 1.2.1-2
7375
- fix: add permissions for release job
7476
* Wed Jul 08 2026 Rachit Hans <rhans@45drives.com> 1.2.1-1

packaging/rocky-el9/main.spec.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ find /home /root -name ".google_authenticator" -exec rm -f {} \; 2>/dev/null
6363

6464

6565
%changelog
66+
* Wed Jul 08 2026 Rachit Hans <rhans@45drives.com> 1.2.1-3
67+
- fix: use explicit cockpit deps for debian to avoid network-manager
6668
* Wed Jul 08 2026 Rachit Hans <rhans@45drives.com> 1.2.1-2
6769
- fix: add permissions for release job
6870
* Wed Jul 08 2026 Rachit Hans <rhans@45drives.com> 1.2.1-1

packaging/ubuntu-focal/changelog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
cockpit-2fa (1.2.1-3focal) focal; urgency=medium
2+
3+
* fix: use explicit cockpit deps for debian to avoid network-manager
4+
5+
-- Rachit Hans <rhans@45drives.com> Wed, 08 Jul 2026 14:38:16 -0300
6+
17
cockpit-2fa (1.2.1-2focal) focal; urgency=medium
28

39
* fix: add permissions for release job

packaging/ubuntu-jammy/changelog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
cockpit-2fa (1.2.1-3jammy) jammy; urgency=medium
2+
3+
* fix: use explicit cockpit deps for debian to avoid network-manager
4+
5+
-- Rachit Hans <rhans@45drives.com> Wed, 08 Jul 2026 14:38:16 -0300
6+
17
cockpit-2fa (1.2.1-2jammy) jammy; urgency=medium
28

39
* fix: add permissions for release job

0 commit comments

Comments
 (0)