expand-on-first-boot: List fdisk as explicit dependency

Message ID 182f140a-2675-6e77-5aca-0897599422ad@siemens.com
State Accepted, archived
Headers show
Series expand-on-first-boot: List fdisk as explicit dependency | expand

Commit Message

Jan Kiszka Jan. 15, 2021, 6:53 a.m. UTC
From: Jan Kiszka <jan.kiszka@siemens.com>

Needed for bullseye where this dropped from util-linux.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 .../expand-on-first-boot/expand-on-first-boot_1.1.bb            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Henning Schild Jan. 18, 2021, 5:40 a.m. UTC | #1
Am Fri, 15 Jan 2021 17:53:51 +0100
schrieb "[ext] Jan Kiszka" <jan.kiszka@siemens.com>:

> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> Needed for bullseye where this dropped from util-linux.

And util-linux remains needed?

Henning

> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  .../expand-on-first-boot/expand-on-first-boot_1.1.bb            | 2
> +- 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git
> a/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.1.bb
> b/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.1.bb
> index 49d6c3bd..1703a648 100644 ---
> a/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.1.bb
> +++
> b/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.1.bb
> @@ -9,7 +9,7 @@ inherit dpkg-raw DESCRIPTION = "This service grows
> the last partition to the full medium during first boot"
> -DEBIAN_DEPENDS = "systemd, sed, grep, coreutils, mount, e2fsprogs,
> util-linux" +DEBIAN_DEPENDS = "systemd, sed, grep, coreutils, mount,
> e2fsprogs, fdisk, util-linux" SRC_URI = " \
>      file://expand-on-first-boot.service \
Jan Kiszka Jan. 18, 2021, 6:14 a.m. UTC | #2
On 18.01.21 16:40, Henning Schild wrote:
> Am Fri, 15 Jan 2021 17:53:51 +0100
> schrieb "[ext] Jan Kiszka" <jan.kiszka@siemens.com>:
> 
>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>
>> Needed for bullseye where this dropped from util-linux.
> 
> And util-linux remains needed?

Yes, for findmnt or partx, possibly more.

Jan

> 
> Henning
> 
>>
>> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
>> ---
>>  .../expand-on-first-boot/expand-on-first-boot_1.1.bb            | 2
>> +- 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git
>> a/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.1.bb
>> b/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.1.bb
>> index 49d6c3bd..1703a648 100644 ---
>> a/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.1.bb
>> +++
>> b/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.1.bb
>> @@ -9,7 +9,7 @@ inherit dpkg-raw DESCRIPTION = "This service grows
>> the last partition to the full medium during first boot"
>> -DEBIAN_DEPENDS = "systemd, sed, grep, coreutils, mount, e2fsprogs,
>> util-linux" +DEBIAN_DEPENDS = "systemd, sed, grep, coreutils, mount,
>> e2fsprogs, fdisk, util-linux" SRC_URI = " \
>>      file://expand-on-first-boot.service \
>
Anton Mikanovich Feb. 9, 2021, 11:14 p.m. UTC | #3
15.01.2021 19:53, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
>
> Needed for bullseye where this dropped from util-linux.
>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

Applied to next, thanks.
Henning Schild Oct. 25, 2022, 3:14 p.m. UTC | #4
This breaks stretch since sfdisk is part of the package util-linux
there and there is not package called fdisk.

Henning

Am Fri, 15 Jan 2021 17:53:51 +0100
schrieb "[ext] Jan Kiszka" <jan.kiszka@siemens.com>:

> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> Needed for bullseye where this dropped from util-linux.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  .../expand-on-first-boot/expand-on-first-boot_1.1.bb            | 2
> +- 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git
> a/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.1.bb
> b/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.1.bb
> index 49d6c3bd..1703a648 100644 ---
> a/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.1.bb
> +++
> b/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.1.bb
> @@ -9,7 +9,7 @@ inherit dpkg-raw DESCRIPTION = "This service grows
> the last partition to the full medium during first boot"
> -DEBIAN_DEPENDS = "systemd, sed, grep, coreutils, mount, e2fsprogs,
> util-linux" +DEBIAN_DEPENDS = "systemd, sed, grep, coreutils, mount,
> e2fsprogs, fdisk, util-linux" SRC_URI = " \
>      file://expand-on-first-boot.service \
Jan Kiszka Oct. 25, 2022, 6:21 p.m. UTC | #5
On 25.10.22 17:14, Henning Schild wrote:
> This breaks stretch since sfdisk is part of the package util-linux
> there and there is not package called fdisk.
> 

If that was only noticed now, I suppose we are overdue with officially
dropping stretch. It's not tested anywhere broadly (or at all) anymore.

Jan

> Henning
> 
> Am Fri, 15 Jan 2021 17:53:51 +0100
> schrieb "[ext] Jan Kiszka" <jan.kiszka@siemens.com>:
> 
>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>
>> Needed for bullseye where this dropped from util-linux.
>>
>> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
>> ---
>>  .../expand-on-first-boot/expand-on-first-boot_1.1.bb            | 2
>> +- 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git
>> a/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.1.bb
>> b/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.1.bb
>> index 49d6c3bd..1703a648 100644 ---
>> a/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.1.bb
>> +++
>> b/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.1.bb
>> @@ -9,7 +9,7 @@ inherit dpkg-raw DESCRIPTION = "This service grows
>> the last partition to the full medium during first boot"
>> -DEBIAN_DEPENDS = "systemd, sed, grep, coreutils, mount, e2fsprogs,
>> util-linux" +DEBIAN_DEPENDS = "systemd, sed, grep, coreutils, mount,
>> e2fsprogs, fdisk, util-linux" SRC_URI = " \
>>      file://expand-on-first-boot.service \
>
Henning Schild Oct. 26, 2022, 7:58 a.m. UTC | #6
Am Tue, 25 Oct 2022 20:21:51 +0200
schrieb Jan Kiszka <jan.kiszka@siemens.com>:

> On 25.10.22 17:14, Henning Schild wrote:
> > This breaks stretch since sfdisk is part of the package util-linux
> > there and there is not package called fdisk.
> >   
> 
> If that was only noticed now, I suppose we are overdue with officially
> dropping stretch. It's not tested anywhere broadly (or at all)
> anymore.

I have a patch for that ready. And we can merge that while we still
have stretch. But i also agree that we can probably drop that distro,
not sure why Isar still has it.

Henning

> Jan
> 
> > Henning
> > 
> > Am Fri, 15 Jan 2021 17:53:51 +0100
> > schrieb "[ext] Jan Kiszka" <jan.kiszka@siemens.com>:
> >   
> >> From: Jan Kiszka <jan.kiszka@siemens.com>
> >>
> >> Needed for bullseye where this dropped from util-linux.
> >>
> >> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> >> ---
> >>  .../expand-on-first-boot/expand-on-first-boot_1.1.bb            |
> >> 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git
> >> a/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.1.bb
> >> b/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.1.bb
> >> index 49d6c3bd..1703a648 100644 ---
> >> a/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.1.bb
> >> +++
> >> b/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.1.bb
> >> @@ -9,7 +9,7 @@ inherit dpkg-raw DESCRIPTION = "This service grows
> >> the last partition to the full medium during first boot"
> >> -DEBIAN_DEPENDS = "systemd, sed, grep, coreutils, mount, e2fsprogs,
> >> util-linux" +DEBIAN_DEPENDS = "systemd, sed, grep, coreutils,
> >> mount, e2fsprogs, fdisk, util-linux" SRC_URI = " \
> >>      file://expand-on-first-boot.service \  
> >   
>

Patch

diff --git a/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.1.bb b/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.1.bb
index 49d6c3bd..1703a648 100644
--- a/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.1.bb
+++ b/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.1.bb
@@ -9,7 +9,7 @@  inherit dpkg-raw
 
 DESCRIPTION = "This service grows the last partition to the full medium during first boot"
 
-DEBIAN_DEPENDS = "systemd, sed, grep, coreutils, mount, e2fsprogs, util-linux"
+DEBIAN_DEPENDS = "systemd, sed, grep, coreutils, mount, e2fsprogs, fdisk, util-linux"
 
 SRC_URI = " \
     file://expand-on-first-boot.service \