[PATCH] expand-on-first-boot: Add missing dependency for btrfs

[PATCH] expand-on-first-boot: Add missing dependency for btrfs

['Jan Kiszka' via isar-users]

From: Jan Kiszka <jan.kiszka@siemens.com>

This was forgotten in 412059fc8f5f.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

Needs to go on top of https://patchwork.isar-build.org/project/isar/patch/5b0f1ad9-3d12-4d05-a5e4-bb9dcf258545@siemens.com/

 ...-first-boot_1.5.bb => expand-on-first-boot_1.6.bb} | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
 rename meta/recipes-support/expand-on-first-boot/{expand-on-first-boot_1.5.bb => expand-on-first-boot_1.6.bb} (75%)

diff --git a/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.5.bb b/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.6.bb
similarity index 75%
rename from meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.5.bb
rename to meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.6.bb
index 4b9cf376..071bed24 100644
--- a/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.5.bb
+++ b/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.6.bb
@@ -10,7 +10,16 @@ inherit dpkg-raw
 DESCRIPTION = "This service grows the last partition to the full medium during first boot"
 MAINTAINER = "isar-users <isar-users@googlegroups.com>"
 
-DEBIAN_DEPENDS = "systemd, sed, grep, coreutils, mount, e2fsprogs, fdisk (>=2.29.2-3) | util-linux (<2.29.2-3), util-linux"
+DEBIAN_DEPENDS = " \
+    systemd, \
+    sed, \
+    grep, \
+    coreutils, \
+    mount, \
+    btrfs-progs, \
+    e2fsprogs, \
+    fdisk (>=2.29.2-3) | util-linux (<2.29.2-3), \
+    util-linux"
 
 SRC_URI = " \
     file://expand-on-first-boot.service \
-- 
2.43.0

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/90455867-dcc2-4339-8ce4-8c0a1567c570%40siemens.com.

Re: [PATCH] expand-on-first-boot: Add missing dependency for btrfs

['MOESSBAUER, Felix' via isar-users]

On Fri, 2024-11-08 at 12:36 +0100, 'Jan Kiszka' via isar-users wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> This was forgotten in 412059fc8f5f.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
> 
> Needs to go on top of
> https://patchwork.isar-build.org/project/isar/patch/5b0f1ad9-3d12-4d05-a5e4-bb9dcf258545@siemens.com/
> 
>  ...-first-boot_1.5.bb => expand-on-first-boot_1.6.bb} | 11
> ++++++++++-
>  1 file changed, 10 insertions(+), 1 deletion(-)
>  rename meta/recipes-support/expand-on-first-boot/{expand-on-first-
> boot_1.5.bb => expand-on-first-boot_1.6.bb} (75%)
> 
> diff --git a/meta/recipes-support/expand-on-first-boot/expand-on-
> first-boot_1.5.bb b/meta/recipes-support/expand-on-first-boot/expand-
> on-first-boot_1.6.bb
> similarity index 75%
> rename from meta/recipes-support/expand-on-first-boot/expand-on-
> first-boot_1.5.bb
> rename to meta/recipes-support/expand-on-first-boot/expand-on-first-
> boot_1.6.bb
> index 4b9cf376..071bed24 100644
> --- a/meta/recipes-support/expand-on-first-boot/expand-on-first-
> boot_1.5.bb
> +++ b/meta/recipes-support/expand-on-first-boot/expand-on-first-
> boot_1.6.bb
> @@ -10,7 +10,16 @@ inherit dpkg-raw
>  DESCRIPTION = "This service grows the last partition to the full
> medium during first boot"
>  MAINTAINER = "isar-users <isar-users@googlegroups.com>"
>  
> -DEBIAN_DEPENDS = "systemd, sed, grep, coreutils, mount, e2fsprogs,
> fdisk (>=2.29.2-3) | util-linux (<2.29.2-3), util-linux"
> +DEBIAN_DEPENDS = " \
> +    systemd, \
> +    sed, \
> +    grep, \
> +    coreutils, \
> +    mount, \
> +    btrfs-progs, \

By that we unconditionally pull in the btrfs-progs, despite most images
not using btrfs. Why not just emit a meaningful error message in case
we try to resize a btrfs. Then people can add the tool to the image
directly.

Felix

> +    e2fsprogs, \
> +    fdisk (>=2.29.2-3) | util-linux (<2.29.2-3), \
> +    util-linux"
>  
>  SRC_URI = " \
>      file://expand-on-first-boot.service \
> -- 
> 2.43.0
> 
> -- 
> You received this message because you are subscribed to the Google
> Groups "isar-users" group.
> To unsubscribe from this group and stop receiving emails from it,
> send an email to isar-users+unsubscribe@googlegroups.com.
> To view this discussion visit
> https://groups.google.com/d/msgid/isar-users/90455867-dcc2-4339-8ce4-8c0a1567c570%40siemens.com
> .

-- 
Siemens AG, Technology
Linux Expert Center


-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/8939bc189690f9024f766c999e36edcc8df05294.camel%40siemens.com.

Re: [PATCH] expand-on-first-boot: Add missing dependency for btrfs

['Jan Kiszka' via isar-users]

On 11.11.24 09:24, Moessbauer, Felix (FT RPD CED OES-DE) wrote:
> On Fri, 2024-11-08 at 12:36 +0100, 'Jan Kiszka' via isar-users wrote:
>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>
>> This was forgotten in 412059fc8f5f.
>>
>> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
>> ---
>>
>> Needs to go on top of
>> https://patchwork.isar-build.org/project/isar/patch/5b0f1ad9-3d12-4d05-a5e4-bb9dcf258545@siemens.com/
>>
>>  ...-first-boot_1.5.bb => expand-on-first-boot_1.6.bb} | 11
>> ++++++++++-
>>  1 file changed, 10 insertions(+), 1 deletion(-)
>>  rename meta/recipes-support/expand-on-first-boot/{expand-on-first-
>> boot_1.5.bb => expand-on-first-boot_1.6.bb} (75%)
>>
>> diff --git a/meta/recipes-support/expand-on-first-boot/expand-on-
>> first-boot_1.5.bb b/meta/recipes-support/expand-on-first-boot/expand-
>> on-first-boot_1.6.bb
>> similarity index 75%
>> rename from meta/recipes-support/expand-on-first-boot/expand-on-
>> first-boot_1.5.bb
>> rename to meta/recipes-support/expand-on-first-boot/expand-on-first-
>> boot_1.6.bb
>> index 4b9cf376..071bed24 100644
>> --- a/meta/recipes-support/expand-on-first-boot/expand-on-first-
>> boot_1.5.bb
>> +++ b/meta/recipes-support/expand-on-first-boot/expand-on-first-
>> boot_1.6.bb
>> @@ -10,7 +10,16 @@ inherit dpkg-raw
>>  DESCRIPTION = "This service grows the last partition to the full
>> medium during first boot"
>>  MAINTAINER = "isar-users <isar-users@googlegroups.com>"
>>  
>> -DEBIAN_DEPENDS = "systemd, sed, grep, coreutils, mount, e2fsprogs,
>> fdisk (>=2.29.2-3) | util-linux (<2.29.2-3), util-linux"
>> +DEBIAN_DEPENDS = " \
>> +    systemd, \
>> +    sed, \
>> +    grep, \
>> +    coreutils, \
>> +    mount, \
>> +    btrfs-progs, \
> 
> By that we unconditionally pull in the btrfs-progs, despite most images
> not using btrfs. Why not just emit a meaningful error message in case
> we try to resize a btrfs. Then people can add the tool to the image
> directly.

We also pull e2fsprogs even when not using it. If we want to make this
more efficient, we would have to ask the user for opting-out from unused
formats.

Given the current state of the script, this here is correct, the other
thing is an optimization.

Jan

-- 
Siemens AG, Technology
Linux Expert Center

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/5b0057cf-c01f-482f-9b91-fbe12119b202%40siemens.com.

Re: [PATCH] expand-on-first-boot: Add missing dependency for btrfs

[Uladzimir Bely]

On Fri, 2024-11-08 at 12:36 +0100, 'Jan Kiszka' via isar-users wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> This was forgotten in 412059fc8f5f.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
> 
> Needs to go on top of
> https://patchwork.isar-build.org/project/isar/patch/5b0f1ad9-3d12-4d05-a5e4-bb9dcf258545@siemens.com/
> 
>  ...-first-boot_1.5.bb => expand-on-first-boot_1.6.bb} | 11
> ++++++++++-
>  1 file changed, 10 insertions(+), 1 deletion(-)
>  rename meta/recipes-support/expand-on-first-boot/{expand-on-first-
> boot_1.5.bb => expand-on-first-boot_1.6.bb} (75%)
> 
> diff --git a/meta/recipes-support/expand-on-first-boot/expand-on-
> first-boot_1.5.bb b/meta/recipes-support/expand-on-first-boot/expand-
> on-first-boot_1.6.bb
> similarity index 75%
> rename from meta/recipes-support/expand-on-first-boot/expand-on-
> first-boot_1.5.bb
> rename to meta/recipes-support/expand-on-first-boot/expand-on-first-
> boot_1.6.bb
> index 4b9cf376..071bed24 100644
> --- a/meta/recipes-support/expand-on-first-boot/expand-on-first-
> boot_1.5.bb
> +++ b/meta/recipes-support/expand-on-first-boot/expand-on-first-
> boot_1.6.bb
> @@ -10,7 +10,16 @@ inherit dpkg-raw
>  DESCRIPTION = "This service grows the last partition to the full
> medium during first boot"
>  MAINTAINER = "isar-users <isar-users@googlegroups.com>"
>  
> -DEBIAN_DEPENDS = "systemd, sed, grep, coreutils, mount, e2fsprogs,
> fdisk (>=2.29.2-3) | util-linux (<2.29.2-3), util-linux"
> +DEBIAN_DEPENDS = " \
> +    systemd, \
> +    sed, \
> +    grep, \
> +    coreutils, \
> +    mount, \
> +    btrfs-progs, \
> +    e2fsprogs, \
> +    fdisk (>=2.29.2-3) | util-linux (<2.29.2-3), \
> +    util-linux"
>  
>  SRC_URI = " \
>      file://expand-on-first-boot.service \
> -- 
> 2.43.0
> 

Applied to next, thanks.

-- 
Best regards,
Uladzimir.

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/cc4f48ba8498d8e381b4df28b69ea236861bc0e1.camel%40ilbers.de.