diff mbox series

[SRU,F,B,X] UBUNTU: [Packaging] Bring back install-<flavour> prerequisite for checks-<flavour>

Message ID 20240305134215.75386-1-roxana.nicolescu@canonical.com
State New
Headers show
Series [SRU,F,B,X] UBUNTU: [Packaging] Bring back install-<flavour> prerequisite for checks-<flavour> | expand

Commit Message

Roxana Nicolescu March 5, 2024, 1:42 p.m. UTC
BugLink: https://bugs.launchpad.net/bugs/2055686

Previous commit "UBUNTU: [Packaging] Remove in-tree abi checks" removed
module-check, abi-check, retpoline-check prerequisites for checks-<flavour>
target. All these were dependent on the install-<flavour> rule.
By removing these checks, install rule is now forgotten.
This caused issues during udeps build step because modules are nowhere
to be found and depmod failed:
"
...
depmod: ERROR: could not open directory /build/focal/debian/d-i-amd64/lib/modules/5.4.0-173-generic: No such file or directory
depmod: FATAL: could not search modules: No such file or directory
make[1]: *** [debian/rules.d/5-udebs.mk:16: do-binary-udebs] Error 1
make: *** [debian/rules.d/5-udebs.mk:4: binary-udebs] Error 2
"

Note: This should be a temporary fix.
In newer versions > focal, this is not required because install
is a prerequisite for the build rule (lp#1930713). This will be
considered to be backported to focal, bionic and xenial after a thorough
investigation.

Signed-off-by: Roxana Nicolescu <roxana.nicolescu@canonical.com>
---
 debian/rules.d/4-checks.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Andy Whitcroft March 5, 2024, 1:58 p.m. UTC | #1
LGTM  (sorry about that, my testing clearly did not ask for udebs.)

Acked-by: Andy Whitcroft <apw@canonical.com>

-apw

On Tue, Mar 5, 2024 at 1:43 PM Roxana Nicolescu <
roxana.nicolescu@canonical.com> wrote:

> BugLink: https://bugs.launchpad.net/bugs/2055686
>
> Previous commit "UBUNTU: [Packaging] Remove in-tree abi checks" removed
> module-check, abi-check, retpoline-check prerequisites for checks-<flavour>
> target. All these were dependent on the install-<flavour> rule.
> By removing these checks, install rule is now forgotten.
> This caused issues during udeps build step because modules are nowhere
> to be found and depmod failed:
> "
> ...
> depmod: ERROR: could not open directory
> /build/focal/debian/d-i-amd64/lib/modules/5.4.0-173-generic: No such file
> or directory
> depmod: FATAL: could not search modules: No such file or directory
> make[1]: *** [debian/rules.d/5-udebs.mk:16: do-binary-udebs] Error 1
> make: *** [debian/rules.d/5-udebs.mk:4: binary-udebs] Error 2
> "
>
> Note: This should be a temporary fix.
> In newer versions > focal, this is not required because install
> is a prerequisite for the build rule (lp#1930713). This will be
> considered to be backported to focal, bionic and xenial after a thorough
> investigation.
>
> Signed-off-by: Roxana Nicolescu <roxana.nicolescu@canonical.com>
> ---
>  debian/rules.d/4-checks.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/debian/rules.d/4-checks.mk b/debian/rules.d/4-checks.mk
> index 07bba37139431..bea1060e63f23 100644
> --- a/debian/rules.d/4-checks.mk
> +++ b/debian/rules.d/4-checks.mk
> @@ -1,4 +1,4 @@
> -checks-%:
> +checks-%: install-%
>         @echo Debug: $@
>
>  # Check the config against the known options list.
> --
> 2.34.1
>
>
> --
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
>
Stefan Bader March 5, 2024, 1:59 p.m. UTC | #2
On 05.03.24 14:42, Roxana Nicolescu wrote:
> BugLink: https://bugs.launchpad.net/bugs/2055686
> 
> Previous commit "UBUNTU: [Packaging] Remove in-tree abi checks" removed
> module-check, abi-check, retpoline-check prerequisites for checks-<flavour>
> target. All these were dependent on the install-<flavour> rule.
> By removing these checks, install rule is now forgotten.
> This caused issues during udeps build step because modules are nowhere
> to be found and depmod failed:
> "
> ...
> depmod: ERROR: could not open directory /build/focal/debian/d-i-amd64/lib/modules/5.4.0-173-generic: No such file or directory
> depmod: FATAL: could not search modules: No such file or directory
> make[1]: *** [debian/rules.d/5-udebs.mk:16: do-binary-udebs] Error 1
> make: *** [debian/rules.d/5-udebs.mk:4: binary-udebs] Error 2
> "
> 
> Note: This should be a temporary fix.
> In newer versions > focal, this is not required because install
> is a prerequisite for the build rule (lp#1930713). This will be
> considered to be backported to focal, bionic and xenial after a thorough
> investigation.
> 
> Signed-off-by: Roxana Nicolescu <roxana.nicolescu@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
> ---

Right now I would also be hard pressed to remember which are the main 
targets used by Debian packaging and in which order deps are needed. As 
this is tested to be working...

>   debian/rules.d/4-checks.mk | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/debian/rules.d/4-checks.mk b/debian/rules.d/4-checks.mk
> index 07bba37139431..bea1060e63f23 100644
> --- a/debian/rules.d/4-checks.mk
> +++ b/debian/rules.d/4-checks.mk
> @@ -1,4 +1,4 @@
> -checks-%:
> +checks-%: install-%
>   	@echo Debug: $@
>   
>   # Check the config against the known options list.
diff mbox series

Patch

diff --git a/debian/rules.d/4-checks.mk b/debian/rules.d/4-checks.mk
index 07bba37139431..bea1060e63f23 100644
--- a/debian/rules.d/4-checks.mk
+++ b/debian/rules.d/4-checks.mk
@@ -1,4 +1,4 @@ 
-checks-%:
+checks-%: install-%
 	@echo Debug: $@
 
 # Check the config against the known options list.