diff mbox series

[1/1,Jammy,linux-meta-realtime] UBUNTU: [Packaging] Add dependency for linux-modules-extra in debian control file

Message ID 6f3030d49d76fe49af94a95d429d0fffab72e646.1637702077.git.joseph.salisbury@canonical.com
State New
Headers show
Series UBUNTU: [Packaging] Fix for LP#1950968 | expand

Commit Message

Joseph Salisbury Nov. 23, 2021, 9:30 p.m. UTC
BugLink: https://bugs.launchpad.net/bugs/1950968

Update the realtime control file to function simlar to the generic
kernel control file.

Add dependency on the linux-modules-extra package.

Remove uneeded linux-modules-extra-realtime package section.

Signed-off-by: Joseph Salisbury <joseph.salisbury@canonical.com>
---
 debian/control.d/realtime | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

--
2.32.0

Comments

Krzysztof Kozlowski Nov. 24, 2021, 8:59 a.m. UTC | #1
On 23/11/2021 22:30, Joseph Salisbury wrote:
> BugLink: https://bugs.launchpad.net/bugs/1950968
> 
> Update the realtime control file to function simlar to the generic
> kernel control file.
> 
> Add dependency on the linux-modules-extra package.

You do more - add also firmware and microcodes. These should be
mentioned here as well.

> 
> Remove uneeded linux-modules-extra-realtime package section.
> 
> Signed-off-by: Joseph Salisbury <joseph.salisbury@canonical.com>
> ---
>  debian/control.d/realtime | 11 +----------
>  1 file changed, 1 insertion(+), 10 deletions(-)
> 
> diff --git a/debian/control.d/realtime b/debian/control.d/realtime
> index 2e200cb..5c55e9c 100644
> --- a/debian/control.d/realtime
> +++ b/debian/control.d/realtime
> @@ -9,21 +9,12 @@ Description: Linux kernel headers for real-time systems.
>  Package: linux-image-realtime${variant:suffix}
>  Architecture: amd64 arm64
>  Section: kernel
> -Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-realtime, microcode-initrd [amd64]
>  Provides: ${dkms:zfs-modules} ${dkms:virtualbox-guest-modules} ${dkms:wireguard-linux-compat-modules}
> +Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-realtime, linux-modules-extra-${kernel-abi-version}-realtime [amd64 arm64], linux-firmware [amd64 arm64], intel-microcode [amd64], amd64-microcode [amd64]
>  Description: Linux kernel image for real-time systems.
>   This package will always depend on the latest kernel image available
>   for real-time systems.

Best regards,
Krzysztof
Joseph Salisbury Nov. 24, 2021, 4:06 p.m. UTC | #2
On 11/24/21 03:59, Krzysztof Kozlowski wrote:
> On 23/11/2021 22:30, Joseph Salisbury wrote:
>> BugLink: https://bugs.launchpad.net/bugs/1950968
>>
>> Update the realtime control file to function simlar to the generic
>> kernel control file.
>>
>> Add dependency on the linux-modules-extra package.
> You do more - add also firmware and microcodes. These should be
> mentioned here as well.
Thanks for the feedback. I will update the commit message and send a V2.
>
>> Remove uneeded linux-modules-extra-realtime package section.
>>
>> Signed-off-by: Joseph Salisbury <joseph.salisbury@canonical.com>
>> ---
>>   debian/control.d/realtime | 11 +----------
>>   1 file changed, 1 insertion(+), 10 deletions(-)
>>
>> diff --git a/debian/control.d/realtime b/debian/control.d/realtime
>> index 2e200cb..5c55e9c 100644
>> --- a/debian/control.d/realtime
>> +++ b/debian/control.d/realtime
>> @@ -9,21 +9,12 @@ Description: Linux kernel headers for real-time systems.
>>   Package: linux-image-realtime${variant:suffix}
>>   Architecture: amd64 arm64
>>   Section: kernel
>> -Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-realtime, microcode-initrd [amd64]
>>   Provides: ${dkms:zfs-modules} ${dkms:virtualbox-guest-modules} ${dkms:wireguard-linux-compat-modules}
>> +Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-realtime, linux-modules-extra-${kernel-abi-version}-realtime [amd64 arm64], linux-firmware [amd64 arm64], intel-microcode [amd64], amd64-microcode [amd64]
>>   Description: Linux kernel image for real-time systems.
>>    This package will always depend on the latest kernel image available
>>    for real-time systems.
> Best regards,
> Krzysztof
Krzysztof Kozlowski Nov. 24, 2021, 6:19 p.m. UTC | #3
On 24/11/2021 17:12, Joseph Salisbury wrote:
> BugLink: https://bugs.launchpad.net/bugs/1950968
> 
> Update the realtime control file to function simlar to the generic
> kernel control file.
> 
> Add dependencies on the linux-modules-extra, linux-firmware,
> intel-microcode and amd64-microcode packages.  These additional
> dependancies replicate the dependencies in the -generic kernel.
> 
> Remove uneeded linux-modules-extra-realtime package section.
> 
> Signed-off-by: Joseph Salisbury <joseph.salisbury@canonical.com>
> ---
>  debian/control.d/realtime | 11 +----------
>  1 file changed, 1 insertion(+), 10 deletions(-)
> 

Thanks! Patch looks good but threading is confusing. This appeared under
NAK-ed patchset v1, but should be it's own new set. The same applies for
your second patchset. No need to resend, though.

Best regards,
Krzysztof
Krzysztof Kozlowski Nov. 24, 2021, 6:20 p.m. UTC | #4
On 24/11/2021 19:19, Krzysztof Kozlowski wrote:
> On 24/11/2021 17:12, Joseph Salisbury wrote:
>> BugLink: https://bugs.launchpad.net/bugs/1950968
>>
>> Update the realtime control file to function simlar to the generic
>> kernel control file.
>>
>> Add dependencies on the linux-modules-extra, linux-firmware,
>> intel-microcode and amd64-microcode packages.  These additional
>> dependancies replicate the dependencies in the -generic kernel.
>>
>> Remove uneeded linux-modules-extra-realtime package section.
>>
>> Signed-off-by: Joseph Salisbury <joseph.salisbury@canonical.com>
>> ---
>>  debian/control.d/realtime | 11 +----------
>>  1 file changed, 1 insertion(+), 10 deletions(-)
>>
> 
> Thanks! Patch looks good but threading is confusing. This appeared under
> NAK-ed patchset v1, but should be it's own new set. The same applies for
> your second patchset. No need to resend, though.


That was of course:

Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>


Best regards,
Krzysztof
Krzysztof Kozlowski Nov. 25, 2021, 8:01 a.m. UTC | #5
On 24/11/2021 17:12, Joseph Salisbury wrote:
> BugLink: https://bugs.launchpad.net/bugs/1950968
> 
> Update the realtime control file to function simlar to the generic
> kernel control file.
> 
> Add dependencies on the linux-modules-extra, linux-firmware,
> intel-microcode and amd64-microcode packages.  These additional
> dependancies replicate the dependencies in the -generic kernel.
> 
> Remove uneeded linux-modules-extra-realtime package section.
> 
> Signed-off-by: Joseph Salisbury <joseph.salisbury@canonical.com>
> ---
>  debian/control.d/realtime | 11 +----------
>  1 file changed, 1 insertion(+), 10 deletions(-)
> 

Best regards,
Krzysztof
diff mbox series

Patch

diff --git a/debian/control.d/realtime b/debian/control.d/realtime
index 2e200cb..5c55e9c 100644
--- a/debian/control.d/realtime
+++ b/debian/control.d/realtime
@@ -9,21 +9,12 @@  Description: Linux kernel headers for real-time systems.
 Package: linux-image-realtime${variant:suffix}
 Architecture: amd64 arm64
 Section: kernel
-Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-realtime, microcode-initrd [amd64]
 Provides: ${dkms:zfs-modules} ${dkms:virtualbox-guest-modules} ${dkms:wireguard-linux-compat-modules}
+Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-realtime, linux-modules-extra-${kernel-abi-version}-realtime [amd64 arm64], linux-firmware [amd64 arm64], intel-microcode [amd64], amd64-microcode [amd64]
 Description: Linux kernel image for real-time systems.
  This package will always depend on the latest kernel image available
  for real-time systems.

-Package: linux-modules-extra-realtime${variant:suffix}
-Architecture: amd64 arm64
-Section: kernel
-Provides: ${test:provides-modules-extra-realtime}
-Depends: ${misc:Depends}, linux-modules-extra-${kernel-abi-version}-realtime
-Description: Extra modules for real-time systems.
- This package will always depend on the latest extra modules package available
- for real-time systems.
-
 Package: linux-tools-realtime${variant:suffix}
 Architecture: amd64 arm64
 Section: kernel