diff mbox series

[Unstable/Lunar] UBUNTU: [Packaging] Drop wireguard DKMS

Message ID 20230419065213.339255-1-juerg.haefliger@canonical.com
State New
Headers show
Series [Unstable/Lunar] UBUNTU: [Packaging] Drop wireguard DKMS | expand

Commit Message

Juerg Haefliger April 19, 2023, 6:52 a.m. UTC
The wireguard module is now part of the regular kernel source so we don't
need the DKMS any longer. Drop it.

Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
---
 debian/rules                    | 4 ----
 debian/rules.d/1-maintainer.mk  | 2 --
 debian/wireguard-modules.ignore | 1 -
 3 files changed, 7 deletions(-)
 delete mode 100644 debian/wireguard-modules.ignore

Comments

Andrei Gherzan April 19, 2023, 8:50 a.m. UTC | #1
On 23/04/19 08:52AM, Juerg Haefliger wrote:
> The wireguard module is now part of the regular kernel source so we don't
> need the DKMS any longer. Drop it.
> 
> Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
> ---
>  debian/rules                    | 4 ----
>  debian/rules.d/1-maintainer.mk  | 2 --
>  debian/wireguard-modules.ignore | 1 -
>  3 files changed, 7 deletions(-)
>  delete mode 100644 debian/wireguard-modules.ignore
> 
> diff --git a/debian/rules b/debian/rules
> index 7936c244a904..034aa2b789a6 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -112,10 +112,6 @@ $(foreach _m,$(all_built-in_dkms_modules), \
>    ) \
>  )
>  
> -ifeq ($(do_dkms_wireguard),false)
> -	do_wireguard_disable:=$(shell for m in $$(cat $(DROOT)/wireguard-modules.ignore); do grep -qxF $$m $(prev_abidir)/../modules.ignore 2>/dev/null || echo $$m >> $(prev_abidir)/../modules.ignore; done)
> -endif
> -
>  # Either tools package needs the common source preparation
>  do_any_tools=$(sort $(filter-out false,$(do_linux_tools) $(do_cloud_tools)))
>  
> diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk
> index a5c81896cc84..f731cbffa48f 100644
> --- a/debian/rules.d/1-maintainer.mk
> +++ b/debian/rules.d/1-maintainer.mk
> @@ -117,8 +117,6 @@ printenv:
>  	@echo " do_tools_x86             = $(do_tools_x86)"
>  	@echo "do_cloud_tools            = $(do_cloud_tools)"
>  	@echo " do_tools_hyperv          = $(do_tools_hyperv)"
> -	@echo "do_dkms_wireguard         = $(do_dkms_wireguard)"
> -	@echo " do_wireguard_disable     = $(do_wireguard_disable)"
>  
>  .PHONY: printchanges
>  printchanges:
> diff --git a/debian/wireguard-modules.ignore b/debian/wireguard-modules.ignore
> deleted file mode 100644
> index a82c63a2033f..000000000000
> --- a/debian/wireguard-modules.ignore
> +++ /dev/null
> @@ -1 +0,0 @@
> -wireguard
> -- 
> 2.37.2

Acked-by: Andrei Gherzan <andrei.gherzan@canonical.com>
Roxana Nicolescu April 19, 2023, 9:03 a.m. UTC | #2
On 19/04/2023 08:52, Juerg Haefliger wrote:
> The wireguard module is now part of the regular kernel source so we don't
> need the DKMS any longer. Drop it.
>
> Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
> ---
>   debian/rules                    | 4 ----
>   debian/rules.d/1-maintainer.mk  | 2 --
>   debian/wireguard-modules.ignore | 1 -
>   3 files changed, 7 deletions(-)
>   delete mode 100644 debian/wireguard-modules.ignore
>
> diff --git a/debian/rules b/debian/rules
> index 7936c244a904..034aa2b789a6 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -112,10 +112,6 @@ $(foreach _m,$(all_built-in_dkms_modules), \
>     ) \
>   )
>   
> -ifeq ($(do_dkms_wireguard),false)
> -	do_wireguard_disable:=$(shell for m in $$(cat $(DROOT)/wireguard-modules.ignore); do grep -qxF $$m $(prev_abidir)/../modules.ignore 2>/dev/null || echo $$m >> $(prev_abidir)/../modules.ignore; done)
> -endif
> -
>   # Either tools package needs the common source preparation
>   do_any_tools=$(sort $(filter-out false,$(do_linux_tools) $(do_cloud_tools)))
>   
> diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk
> index a5c81896cc84..f731cbffa48f 100644
> --- a/debian/rules.d/1-maintainer.mk
> +++ b/debian/rules.d/1-maintainer.mk
> @@ -117,8 +117,6 @@ printenv:
>   	@echo " do_tools_x86             = $(do_tools_x86)"
>   	@echo "do_cloud_tools            = $(do_cloud_tools)"
>   	@echo " do_tools_hyperv          = $(do_tools_hyperv)"
> -	@echo "do_dkms_wireguard         = $(do_dkms_wireguard)"
> -	@echo " do_wireguard_disable     = $(do_wireguard_disable)"
>   
>   .PHONY: printchanges
>   printchanges:
> diff --git a/debian/wireguard-modules.ignore b/debian/wireguard-modules.ignore
> deleted file mode 100644
> index a82c63a2033f..000000000000
> --- a/debian/wireguard-modules.ignore
> +++ /dev/null
> @@ -1 +0,0 @@
> -wireguard
Acked-by: Roxana Nicolescu <roxana.nicolescu@canonical.com>
Paolo Pisati April 19, 2023, 9:40 a.m. UTC | #3
On Wed, Apr 19, 2023 at 08:52:13AM +0200, Juerg Haefliger wrote:
> The wireguard module is now part of the regular kernel source so we don't
> need the DKMS any longer. Drop it.
> 
> Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
diff mbox series

Patch

diff --git a/debian/rules b/debian/rules
index 7936c244a904..034aa2b789a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -112,10 +112,6 @@  $(foreach _m,$(all_built-in_dkms_modules), \
   ) \
 )
 
-ifeq ($(do_dkms_wireguard),false)
-	do_wireguard_disable:=$(shell for m in $$(cat $(DROOT)/wireguard-modules.ignore); do grep -qxF $$m $(prev_abidir)/../modules.ignore 2>/dev/null || echo $$m >> $(prev_abidir)/../modules.ignore; done)
-endif
-
 # Either tools package needs the common source preparation
 do_any_tools=$(sort $(filter-out false,$(do_linux_tools) $(do_cloud_tools)))
 
diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk
index a5c81896cc84..f731cbffa48f 100644
--- a/debian/rules.d/1-maintainer.mk
+++ b/debian/rules.d/1-maintainer.mk
@@ -117,8 +117,6 @@  printenv:
 	@echo " do_tools_x86             = $(do_tools_x86)"
 	@echo "do_cloud_tools            = $(do_cloud_tools)"
 	@echo " do_tools_hyperv          = $(do_tools_hyperv)"
-	@echo "do_dkms_wireguard         = $(do_dkms_wireguard)"
-	@echo " do_wireguard_disable     = $(do_wireguard_disable)"
 
 .PHONY: printchanges
 printchanges:
diff --git a/debian/wireguard-modules.ignore b/debian/wireguard-modules.ignore
deleted file mode 100644
index a82c63a2033f..000000000000
--- a/debian/wireguard-modules.ignore
+++ /dev/null
@@ -1 +0,0 @@ 
-wireguard