APPLIED: [SRU][H][PATCH 0/2] Fix udeb-less derivatives

[Juerg Haefliger]

Applied to hirsute:linux master-next.

...Juerg


> Commit ("UBUNTU: [Packaging] replace custom filter script with dctrl-tools")
> introduced the use of grep-dctrl which is called in the 'clean' rule.
> Unfortunately, this fails fast if d-i/kernel-versions is empty which is true
> for raspi and other derivatives that don't need/want udebs.
> 
> In fact, kernel-wedge shouldn't be called for these kernels, neither should
> they need to carry a use-less debian.<foo>/d-i/ directory tree.
> 
> The first patch skips d-i related code if disable_d_i is non-empty.
> The second patch sets disable_d_i=true if there is no d-i directory present.
> 
> With that, the whole d-i tree can be removed for udeb-less kernels *and*
> d-i code (including kernel-wedge) is never called for these kernels. Note,
> there is also no longer the need to explicitly set disable_d_i=true in
> debian.<foo>/rules.d/<arch>.mk.
> 
> Juerg Haefliger (2):
>   UBUNTU: [Packaging] Skip d-i code if udebs are disabled
>   UBUNTU: [Packaging] Disable udebs if $DEBIAN/d-i doesn't exist
> 
>  debian/rules                    |  7 +++++++
>  debian/rules.d/1-maintainer.mk  |  1 +
>  debian/rules.d/2-binary-arch.mk | 20 ++++++++++++--------
>  3 files changed, 20 insertions(+), 8 deletions(-)
> 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20210305/e421aa54/attachment.sig>