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

[Jan Kiszka]

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

This was forgotten in 412059fc8f5f.

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

Needs to go on top of https://patchwork.isar-build.org/project/isar/patch/5b0f1ad9-3d12-4d05...@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-...@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

[MOESSBAUER, Felix]

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+...@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

[Jan Kiszka]

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

[Uladzimir Bely]

On Fri, 2024-11-08 at 12:36 +0100, 'Jan Kiszka' via isar-users wrote:

> From: Jan Kiszka <jan.k...@siemens.com>
>
> This was forgotten in 412059fc8f5f.
>
> Signed-off-by: Jan Kiszka <jan.k...@siemens.com>
> ---
>
> Needs to go on top of
> https://patchwork.isar-build.org/project/isar/patch/5b0f1ad9-3d12-4d05...@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-...@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.