diff mbox series

[3/9] UBUNTU: [Packaging] generate nvidia version mappings at clean time -- handle Build-Depends

Message ID 20210122162312.459010-5-apw@canonical.com
State New
Headers show
Series LP: #1912803 -- autogenerate Nvidia rules/control | expand

Commit Message

Andy Whitcroft Jan. 22, 2021, 4:23 p.m. UTC 
Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
 debian/control.common    | 5 +----
 debian/scripts/gen-rules | 5 +++--
 2 files changed, 4 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/debian/control.common b/debian/control.common
index f877453..024f702 100644
--- a/debian/control.common
+++ b/debian/control.common
@@ -11,9 +11,6 @@  Build-Depends:
  dkms,
  curl,
  gawk,
- linux-headers-@ABI@-generic (>= @VERSION@),
- linux-headers-@ABI@-lowlatency (>= @VERSION@),
- linux-buildinfo-@ABI@-generic (>= @VERSION@),
- linux-buildinfo-@ABI@-lowlatency (>= @VERSION@),
+ @BUILD-INTERLOCK@
 Standards-Version: 3.9.4
 Vcs-Git: git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux-restricted-modules/+git/@SERIES@
diff --git a/debian/scripts/gen-rules b/debian/scripts/gen-rules
index 2b7a177..f52697d 100755
--- a/debian/scripts/gen-rules
+++ b/debian/scripts/gen-rules
@@ -2,6 +2,7 @@ 
 
 mkdir -p "debian/control.d"
 cat "debian/rules.in" >"debian/rules.gen"
+: >"debian/control.gen"
 : >"debian/control.d/meta-nvidia"
 : >"debian/control.d/nvidia"
 : >"debian/control.d/migrate-nvidia"
@@ -17,8 +18,8 @@  do
 	targets=$(echo "$archs" | sed -e 's/\</nvidia-/g')
 
 	cat - >>"debian/control.gen" <<EOL
- linux-headers-@ABI@-${flavour} [${archs}] (>= @VERSION@),
- linux-buildinfo-@ABI@-${flavour} [${archs}] (>= @VERSION@),
+ linux-headers-@ABI@-${flavour} (>= @VERSION@) [${archs}],
+ linux-buildinfo-@ABI@-${flavour} (>= @VERSION@) [${archs}],
 EOL
 
 	while read package version extra