diff mbox series

[J/K,linux-meta] UBUNTU: [Packaging] skip standalone dkms modules for virtual flavour

Message ID 20220617162748.82931-1-dimitri.ledkov@canonical.com
State New
Headers show
Series [J/K,linux-meta] UBUNTU: [Packaging] skip standalone dkms modules for virtual flavour | expand

Commit Message

Dimitri John Ledkov June 17, 2022, 4:27 p.m. UTC
Virtual is not a real flavour, but a shallow one. It actually depends
on generic modules, without modules-extra. dkms packages for this
flavour are not build and do not make sense.

Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
---
 debian/rules | 1 +
 1 file changed, 1 insertion(+)

Comments

Tim Gardner June 17, 2022, 5:10 p.m. UTC | #1
On 6/17/22 10:27, Dimitri John Ledkov wrote:
> Virtual is not a real flavour, but a shallow one. It actually depends
> on generic modules, without modules-extra. dkms packages for this
> flavour are not build and do not make sense.
> 
> Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
> ---
>   debian/rules | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/debian/rules b/debian/rules
> index 5b1fd42120..7358137dfe 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -85,6 +85,7 @@ debian/control.d/dkms-%: debian/control.dkms
>   	        available_archs=$$(echo "$${flavour_archs} $(module_archs)" | tr " " "\n" | sort | uniq -d); \
>   	        test -n "$${available_archs}" || continue; \
>   	    fi; \
> +	    [ "$$flavour" = "virtual" ] && continue; \
>   	    cat debian/control.dkms | sed \
>   	            -e "s/MODULE/$(module)/g" \
>   	            -e "s/ARCH/$${available_archs}/g" \
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Dimitri John Ledkov June 17, 2022, 10:32 p.m. UTC | #2
Acked-by: apw @ mattermost
Signed-off-by: xnox

Also cherrypicked "UBUNTU: [Packaging] support standalone dkms module
builds" into kinetic:linux-meta-unstable kinetic:linux-meta as somehow
they are missing that commit.

Applied this patch to kinetic:linux-meta-unstable kinetic:linux-meta
jammy:linux-meta

Respinning jammy:linux-meta, reusing tracker. Otherwise it cannot
migrate due to uninstallable iwlwifi meta packages for shallow virtual
flavour.

On Fri, 17 Jun 2022 at 17:27, Dimitri John Ledkov
<dimitri.ledkov@canonical.com> wrote:
>
> Virtual is not a real flavour, but a shallow one. It actually depends
> on generic modules, without modules-extra. dkms packages for this
> flavour are not build and do not make sense.
>
> Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
> ---
>  debian/rules | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/debian/rules b/debian/rules
> index 5b1fd42120..7358137dfe 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -85,6 +85,7 @@ debian/control.d/dkms-%: debian/control.dkms
>                 available_archs=$$(echo "$${flavour_archs} $(module_archs)" | tr " " "\n" | sort | uniq -d); \
>                 test -n "$${available_archs}" || continue; \
>             fi; \
> +           [ "$$flavour" = "virtual" ] && continue; \
>             cat debian/control.dkms | sed \
>                     -e "s/MODULE/$(module)/g" \
>                     -e "s/ARCH/$${available_archs}/g" \
> --
> 2.32.0
>
diff mbox series

Patch

diff --git a/debian/rules b/debian/rules
index 5b1fd42120..7358137dfe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,6 +85,7 @@  debian/control.d/dkms-%: debian/control.dkms
 	        available_archs=$$(echo "$${flavour_archs} $(module_archs)" | tr " " "\n" | sort | uniq -d); \
 	        test -n "$${available_archs}" || continue; \
 	    fi; \
+	    [ "$$flavour" = "virtual" ] && continue; \
 	    cat debian/control.dkms | sed \
 	            -e "s/MODULE/$(module)/g" \
 	            -e "s/ARCH/$${available_archs}/g" \