Followup-For: Bug #1095295
Control: tag -1 pending
Hi,
I've just uploaded a NMU of the attached updated patch series to
DELAYED/10 since I want to see the architecture and autopkgtest changes
in trixie.
Please let me know if I should delay it longer.
Andreas
>From 8100d1683232f73ec36b98d12c6efb6003bf8bc4 Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <a...@debian.org>
Date: Thu, 6 Feb 2025 12:53:34 +0100
Subject: [PATCH 1/5] broadcom-sta-source: add autopkgtest
---
debian/changelog | 6 ++++++
debian/tests/control | 12 ++++++++++++
2 files changed, 18 insertions(+)
create mode 100644 debian/tests/control
diff --git a/debian/changelog b/debian/changelog
index 2c6f4b7..d8a6820 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+broadcom-sta (6.30.223.271-25.1) UNRELEASED; urgency=medium
+
+ * broadcom-sta-source: Add autopkgtest. (Closes: #1095295)
+
+ -- Andreas Beckmann <a...@debian.org> Thu, 06 Feb 2025 12:52:31 +0100
+
broadcom-sta (6.30.223.271-25) unstable; urgency=low
[ Eduard Bloch ]
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..b1ecf46
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,12 @@
+Test-Command: /usr/share/modass/module-assistant-autopkgtest
broadcom-sta-source
+Features: test-name=m-a-autopkgtest
+Architecture: amd64 i386
+Depends:
+ broadcom-sta-source,
+ module-assistant-autopkgtest,
+ linux-doc,
+Restrictions:
+ superficial,
+ needs-root,
+ breaks-testbed,
+ allow-stderr,
--
2.39.5
>From 41c1f9cac0d24ab2737248b13c21bc4f7668e703 Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <a...@debian.org>
Date: Thu, 6 Feb 2025 13:11:31 +0100
Subject: [PATCH 2/5] promote module-assistant to Depends
---
debian/changelog | 1 +
debian/control | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d8a6820..048bf5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
broadcom-sta (6.30.223.271-25.1) UNRELEASED; urgency=medium
* broadcom-sta-source: Add autopkgtest. (Closes: #1095295)
+ * Promote module-assistant to Depends.
-- Andreas Beckmann <a...@debian.org> Thu, 06 Feb 2025 12:52:31 +0100
diff --git a/debian/control b/debian/control
index 5c1f2c3..28c6c28 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Testsuite: autopkgtest-pkg-dkms
Package: broadcom-sta-common
Architecture: all
Depends: ${misc:Depends}
-Recommends: broadcom-sta-source, module-assistant
+Recommends: broadcom-sta-source
Description: Common files for the Broadcom STA Wireless driver
Broadcom STA is a binary-only device driver to support the following IEEE
802.11a/b/g/n wireless network cards: BCM4311-, BCM4312-, BCM4313-,
@@ -53,9 +53,9 @@ Architecture: all
Depends:
${misc:Depends},
debhelper-compat (= 12),
+ module-assistant,
make,
xz-utils
-Recommends: module-assistant
Description: Source for the Broadcom STA Wireless driver
Broadcom STA is a binary-only device driver to support the following IEEE
802.11a/b/g/n wireless network cards: BCM4311-, BCM4312-, BCM4313-,
--
2.39.5
>From 216e928220c753b234a8c3731c76cb9fb4672da4 Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <a...@debian.org>
Date: Thu, 6 Feb 2025 13:14:10 +0100
Subject: [PATCH 3/5] switch Architecture from all to amd64 i386
---
debian/broadcom-sta-common.lintian-overrides | 2 ++
debian/broadcom-sta-dkms.lintian-overrides | 1 -
debian/changelog | 1 +
debian/control | 6 +++---
debian/rules | 3 +--
5 files changed, 7 insertions(+), 6 deletions(-)
create mode 100644 debian/broadcom-sta-common.lintian-overrides
diff --git a/debian/broadcom-sta-common.lintian-overrides
b/debian/broadcom-sta-common.lintian-overrides
new file mode 100644
index 0000000..355ff5a
--- /dev/null
+++ b/debian/broadcom-sta-common.lintian-overrides
@@ -0,0 +1,2 @@
+# support package only needed on amd64 and i386
+package-contains-no-arch-dependent-files
diff --git a/debian/broadcom-sta-dkms.lintian-overrides
b/debian/broadcom-sta-dkms.lintian-overrides
index bc8caa6..499a0b4 100644
--- a/debian/broadcom-sta-dkms.lintian-overrides
+++ b/debian/broadcom-sta-dkms.lintian-overrides
@@ -1,4 +1,3 @@
# Shipped libraries for i386 and amd64
-broadcom-sta-dkms: arch-independent-package-contains-binary-or-object
*lib/wlc_hybrid.o_*
broadcom-sta-dkms: unstripped-binary-or-object *lib/wlc_hybrid.o_*
broadcom-sta-dkms: spelling-error-in-binary *lib/wlc_hybrid.o_*
diff --git a/debian/changelog b/debian/changelog
index 048bf5d..a640450 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ broadcom-sta (6.30.223.271-25.1) UNRELEASED; urgency=medium
* broadcom-sta-source: Add autopkgtest. (Closes: #1095295)
* Promote module-assistant to Depends.
+ * Switch Architecture from all to amd64 i386.
-- Andreas Beckmann <a...@debian.org> Thu, 06 Feb 2025 12:52:31 +0100
diff --git a/debian/control b/debian/control
index 28c6c28..dc23cda 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Vcs-Browser:
https://salsa.debian.org/broadcom-sta-team/broadcom-sta
Testsuite: autopkgtest-pkg-dkms
Package: broadcom-sta-common
-Architecture: all
+Architecture: amd64 i386
Depends: ${misc:Depends}
Recommends: broadcom-sta-source
Description: Common files for the Broadcom STA Wireless driver
@@ -29,7 +29,7 @@ Description: Common files for the Broadcom STA Wireless driver
(it will be installed automatically as needed).
Package: broadcom-sta-dkms
-Architecture: all
+Architecture: amd64 i386
Depends: ${misc:Depends}
Recommends: wireless-tools
Conflicts: broadcom-sta-modules
@@ -49,7 +49,7 @@ Description: dkms source for the Broadcom STA Wireless driver
modules. Kernel source or headers are required to compile these modules.
Package: broadcom-sta-source
-Architecture: all
+Architecture: amd64 i386
Depends:
${misc:Depends},
debhelper-compat (= 12),
diff --git a/debian/rules b/debian/rules
index ec7300e..800b78f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,8 +29,7 @@ install-tmp:
# Shipped proprietary precompiled driver
rm -f debian/tmp/lib/wlc_hybrid.o_shipped
rm -f debian/tmp/lib/LICENSE.txt # License is in copyright file
- cp amd64/lib/wlc_hybrid.o_shipped debian/tmp/lib/wlc_hybrid.o_amd64
- cp i386/lib/wlc_hybrid.o_shipped debian/tmp/lib/wlc_hybrid.o_i386
+ cp -p $(DEB_HOST_ARCH)/lib/wlc_hybrid.o_shipped
debian/tmp/lib/wlc_hybrid.o_$(DEB_HOST_ARCH)
install-dkms: install-tmp
dh_installdirs -p $(dkms_package) $(dkms_target)
--
2.39.5
>From 7e0a6aaa9ef0a4da3f3d2034c1d5c9c828d28934 Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <a...@debian.org>
Date: Thu, 6 Mar 2025 08:12:08 +0100
Subject: [PATCH 4/5] update Lintian overrides
---
debian/broadcom-sta-dkms.lintian-overrides | 4 +++-
debian/broadcom-sta-source.lintian-overrides | 3 ---
debian/changelog | 1 +
debian/source/lintian-overrides | 6 ++----
4 files changed, 6 insertions(+), 8 deletions(-)
delete mode 100644 debian/broadcom-sta-source.lintian-overrides
diff --git a/debian/broadcom-sta-dkms.lintian-overrides
b/debian/broadcom-sta-dkms.lintian-overrides
index 499a0b4..f96f888 100644
--- a/debian/broadcom-sta-dkms.lintian-overrides
+++ b/debian/broadcom-sta-dkms.lintian-overrides
@@ -1,3 +1,5 @@
-# Shipped libraries for i386 and amd64
+# Ignore the proprietary blobs
broadcom-sta-dkms: unstripped-binary-or-object *lib/wlc_hybrid.o_*
broadcom-sta-dkms: spelling-error-in-binary *lib/wlc_hybrid.o_*
+
+repeated-path-segment src [usr/src/broadcom-sta-*/src/]
diff --git a/debian/broadcom-sta-source.lintian-overrides
b/debian/broadcom-sta-source.lintian-overrides
deleted file mode 100644
index 5ee7c3e..0000000
--- a/debian/broadcom-sta-source.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# Ignore warning caused by how changelogs are truncated
-# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1021502
-broadcom-sta-source: debian-news-entry-has-unknown-version
*/doc/broadcom-sta-source/NEWS.Debian*
diff --git a/debian/changelog b/debian/changelog
index a640450..4d07a05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ broadcom-sta (6.30.223.271-25.1) UNRELEASED; urgency=medium
* broadcom-sta-source: Add autopkgtest. (Closes: #1095295)
* Promote module-assistant to Depends.
* Switch Architecture from all to amd64 i386.
+ * Update Lintian overrides.
-- Andreas Beckmann <a...@debian.org> Thu, 06 Feb 2025 12:52:31 +0100
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 56580f6..7219478 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,6 +1,4 @@
# Ignore the proprietary blobs
+source-contains-prebuilt-binary [*/lib/wlc_hybrid.o_shipped]
broadcom-sta source: source-is-missing *lib/wlc_hybrid.o_shipped*
-
-# `XS-Autobuild` is incorrectly reported as unknown
-# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1013414
-broadcom-sta source: unknown-field Autobuild
+very-long-line-length-in-source-file * > 512 [*/lib/wlc_hybrid.o_shipped:*]
--
2.39.5
>From 678222ad7f3dd4085fd95f0c157b82d4e5722e83 Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <a...@debian.org>
Date: Thu, 6 Mar 2025 09:07:45 +0100
Subject: [PATCH 5/5] release broadcom-sta (6.30.223.271-25.1) to unstable
---
debian/changelog | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4d07a05..e82a951 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-broadcom-sta (6.30.223.271-25.1) UNRELEASED; urgency=medium
+broadcom-sta (6.30.223.271-25.1) unstable; urgency=medium
+ * Non-maintainer upload.
* broadcom-sta-source: Add autopkgtest. (Closes: #1095295)
* Promote module-assistant to Depends.
* Switch Architecture from all to amd64 i386.
* Update Lintian overrides.
- -- Andreas Beckmann <a...@debian.org> Thu, 06 Feb 2025 12:52:31 +0100
+ -- Andreas Beckmann <a...@debian.org> Thu, 06 Mar 2025 09:07:30 +0100
broadcom-sta (6.30.223.271-25) unstable; urgency=low
--
2.39.5
