diff mbox series

isar-installer: Add logic to call other install script

Message ID 20251006135501.1593114-1-clara.kowalsky@siemens.com
State New
Headers show
Series isar-installer: Add logic to call other install script | expand

Commit Message

Clara Kowalsky Oct. 6, 2025, 1:55 p.m. UTC 
By setting INSTALL_SCRIPT, another script than the default
deploy-image-wic.sh can be called in case of a different installation
procedure.

Signed-off-by: Clara Kowalsky <clara.kowalsky@siemens.com>
---
 .../deploy-image-service/deploy-image-service.bb          | 8 ++++++--
 .../deploy-image-service/files/install.override.conf      | 5 -----
 .../deploy-image-service/files/install.override.conf.tmpl | 5 +++++
 3 files changed, 11 insertions(+), 7 deletions(-)
 delete mode 100644 meta-isar/recipes-installer/deploy-image-service/files/install.override.conf
 create mode 100644 meta-isar/recipes-installer/deploy-image-service/files/install.override.conf.tmpl

Comments

Felix Moessbauer Oct. 7, 2025, 7:59 a.m. UTC | #1 
On Mon, 2025-10-06 at 15:55 +0200, 'Clara Kowalsky' via isar-users
wrote:
> By setting INSTALL_SCRIPT, another script than the default
> deploy-image-wic.sh can be called in case of a different installation
> procedure.
> 
> Signed-off-by: Clara Kowalsky <clara.kowalsky@siemens.com>
> ---
>  .../deploy-image-service/deploy-image-service.bb          | 8 ++++++--
>  .../deploy-image-service/files/install.override.conf      | 5 -----
>  .../deploy-image-service/files/install.override.conf.tmpl | 5 +++++
>  3 files changed, 11 insertions(+), 7 deletions(-)
>  delete mode 100644 meta-isar/recipes-installer/deploy-image-service/files/install.override.conf
>  create mode 100644 meta-isar/recipes-installer/deploy-image-service/files/install.override.conf.tmpl
> 
> diff --git a/meta-isar/recipes-installer/deploy-image-service/deploy-image-service.bb b/meta-isar/recipes-installer/deploy-image-service/deploy-image-service.bb
> index 0fa3dcf3..7f5ff749 100644
> --- a/meta-isar/recipes-installer/deploy-image-service/deploy-image-service.bb
> +++ b/meta-isar/recipes-installer/deploy-image-service/deploy-image-service.bb
> @@ -5,11 +5,15 @@
>  
>  DESCRIPTION = "systemd service to add target image to rootfs"
>  
> -
>  inherit dpkg-raw

Hi!

this change is unrelated.

>  
> -SRC_URI = "file://install.override.conf \
> +SRC_URI = "file://install.override.conf.tmpl \
>            "
> +
> +INSTALL_SCRIPT ??= "deploy-image-wic.sh"
> +TEMPLATE_VARS += "INSTALL_SCRIPT"
> +TEMPLATE_FILES += "install.override.conf.tmpl"
> +
>  DEPENDS += " deploy-image"
>  DEBIAN_DEPENDS = "deploy-image"

The install script comes from the deploy-image package. Why not simply
add multiple providers for the deploy-image package and just install
the corresponding one? Here we pull in dependencies which are then not
used. Apart from that, by modeling this via dependencies, the risk for
package-name-collisions under multiconfig can be avoided.

Felix

>  
> diff --git a/meta-isar/recipes-installer/deploy-image-service/files/install.override.conf b/meta-isar/recipes-installer/deploy-image-service/files/install.override.conf
> deleted file mode 100644
> index 357d8662..00000000
> --- a/meta-isar/recipes-installer/deploy-image-service/files/install.override.conf
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -[Service]
> -ExecStart=
> -ExecStart=/bin/sh -c "deploy-image-wic.sh || (echo 'Rebooting in 60 s'; sleep 60); reboot"
> -StandardInput=tty
> -StandardOutput=tty
> diff --git a/meta-isar/recipes-installer/deploy-image-service/files/install.override.conf.tmpl b/meta-isar/recipes-installer/deploy-image-service/files/install.override.conf.tmpl
> new file mode 100644
> index 00000000..e09c5036
> --- /dev/null
> +++ b/meta-isar/recipes-installer/deploy-image-service/files/install.override.conf.tmpl
> @@ -0,0 +1,5 @@
> +[Service]
> +ExecStart=
> +ExecStart=/bin/sh -c "${INSTALL_SCRIPT} || (echo 'Rebooting in 60 s'; sleep 60); reboot"
> +StandardInput=tty
> +StandardOutput=tty
> -- 
> 2.51.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/20251006135501.1593114-1-clara.kowalsky%40siemens.com.
Clara Kowalsky Oct. 13, 2025, 6:54 a.m. UTC | #2 
On 07.10.25 09:59, Moessbauer, Felix (FT RPD CED OES-DE) wrote:
> On Mon, 2025-10-06 at 15:55 +0200, 'Clara Kowalsky' via isar-users
> wrote:
>> By setting INSTALL_SCRIPT, another script than the default
>> deploy-image-wic.sh can be called in case of a different installation
>> procedure.
>>
>> Signed-off-by: Clara Kowalsky <clara.kowalsky@siemens.com>
>> ---
>>   .../deploy-image-service/deploy-image-service.bb          | 8 ++++++--
>>   .../deploy-image-service/files/install.override.conf      | 5 -----
>>   .../deploy-image-service/files/install.override.conf.tmpl | 5 +++++
>>   3 files changed, 11 insertions(+), 7 deletions(-)
>>   delete mode 100644 meta-isar/recipes-installer/deploy-image-service/files/install.override.conf
>>   create mode 100644 meta-isar/recipes-installer/deploy-image-service/files/install.override.conf.tmpl
>>
>> diff --git a/meta-isar/recipes-installer/deploy-image-service/deploy-image-service.bb b/meta-isar/recipes-installer/deploy-image-service/deploy-image-service.bb
>> index 0fa3dcf3..7f5ff749 100644
>> --- a/meta-isar/recipes-installer/deploy-image-service/deploy-image-service.bb
>> +++ b/meta-isar/recipes-installer/deploy-image-service/deploy-image-service.bb
>> @@ -5,11 +5,15 @@
>>   
>>   DESCRIPTION = "systemd service to add target image to rootfs"
>>   
>> -
>>   inherit dpkg-raw
> 
> Hi!
> 
> this change is unrelated.
> 
>>   
>> -SRC_URI = "file://install.override.conf \
>> +SRC_URI = "file://install.override.conf.tmpl \
>>             "
>> +
>> +INSTALL_SCRIPT ??= "deploy-image-wic.sh"
>> +TEMPLATE_VARS += "INSTALL_SCRIPT"
>> +TEMPLATE_FILES += "install.override.conf.tmpl"
>> +
>>   DEPENDS += " deploy-image"
>>   DEBIAN_DEPENDS = "deploy-image"
> 
> The install script comes from the deploy-image package. Why not simply
> add multiple providers for the deploy-image package and just install
> the corresponding one? Here we pull in dependencies which are then not
> used. Apart from that, by modeling this via dependencies, the risk for
> package-name-collisions under multiconfig can be avoided.
> 
> Felix

Hi,

true, it works fine by just adding to the new recipe:
PROVIDES = "deploy-image"
DEBIAN_PROVIDES = "deploy-image"

And setting: PREFERRED_PROVIDER_deploy-image = <new-recipe>
Thank you.

Clara
> 
>>   
>> diff --git a/meta-isar/recipes-installer/deploy-image-service/files/install.override.conf b/meta-isar/recipes-installer/deploy-image-service/files/install.override.conf
>> deleted file mode 100644
>> index 357d8662..00000000
>> --- a/meta-isar/recipes-installer/deploy-image-service/files/install.override.conf
>> +++ /dev/null
>> @@ -1,5 +0,0 @@
>> -[Service]
>> -ExecStart=
>> -ExecStart=/bin/sh -c "deploy-image-wic.sh || (echo 'Rebooting in 60 s'; sleep 60); reboot"
>> -StandardInput=tty
>> -StandardOutput=tty
>> diff --git a/meta-isar/recipes-installer/deploy-image-service/files/install.override.conf.tmpl b/meta-isar/recipes-installer/deploy-image-service/files/install.override.conf.tmpl
>> new file mode 100644
>> index 00000000..e09c5036
>> --- /dev/null
>> +++ b/meta-isar/recipes-installer/deploy-image-service/files/install.override.conf.tmpl
>> @@ -0,0 +1,5 @@
>> +[Service]
>> +ExecStart=
>> +ExecStart=/bin/sh -c "${INSTALL_SCRIPT} || (echo 'Rebooting in 60 s'; sleep 60); reboot"
>> +StandardInput=tty
>> +StandardOutput=tty
>> -- 
>> 2.51.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/20251006135501.1593114-1-clara.kowalsky%40siemens.com.
>
Heinisch, Alexander Oct. 13, 2025, 9:58 a.m. UTC | #3 
Have you seen:
https://groups.google.com/g/isar-users/c/fP88xwMFQuQ/m/qAzBGXQ5AgAJ

BR Alexander

On Mon, 2025-10-13 at 08:54 +0200, 'Clara Kowalsky' via isar-users
wrote:
>
>
> On 07.10.25 09:59, Moessbauer, Felix (FT RPD CED OES-DE) wrote:
> > On Mon, 2025-10-06 at 15:55 +0200, 'Clara Kowalsky' via isar-users
> > wrote:
> > > By setting INSTALL_SCRIPT, another script than the default
> > > deploy-image-wic.sh can be called in case of a different
> > > installation
> > > procedure.
> > >
> > > Signed-off-by: Clara Kowalsky <clara.kowalsky@siemens.com>
> > > ---
> > >   .../deploy-image-service/deploy-image-service.bb          | 8
> > > ++++++--
> > >   .../deploy-image-service/files/install.override.conf      | 5 -
> > > ----
> > >   .../deploy-image-service/files/install.override.conf.tmpl | 5
> > > +++++
> > >   3 files changed, 11 insertions(+), 7 deletions(-)
> > >   delete mode 100644 meta-isar/recipes-installer/deploy-image-
> > > service/files/install.override.conf
> > >   create mode 100644 meta-isar/recipes-installer/deploy-image-
> > > service/files/install.override.conf.tmpl
> > >
> > > diff --git a/meta-isar/recipes-installer/deploy-image-
> > > service/deploy-image-service.bb b/meta-isar/recipes-
> > > installer/deploy-image-service/deploy-image-service.bb
> > > index 0fa3dcf3..7f5ff749 100644
> > > --- a/meta-isar/recipes-installer/deploy-image-service/deploy-
> > > image-service.bb
> > > +++ b/meta-isar/recipes-installer/deploy-image-service/deploy-
> > > image-service.bb
> > > @@ -5,11 +5,15 @@
> > >
> > >   DESCRIPTION = "systemd service to add target image to rootfs"
> > >
> > > -
> > >   inherit dpkg-raw
> >
> > Hi!
> >
> > this change is unrelated.
> >
> > >
> > > -SRC_URI = "file://install.override.conf \
> > > +SRC_URI = "file://install.override.conf.tmpl \
> > >             "
> > > +
> > > +INSTALL_SCRIPT ??= "deploy-image-wic.sh"
> > > +TEMPLATE_VARS += "INSTALL_SCRIPT"
> > > +TEMPLATE_FILES += "install.override.conf.tmpl"
> > > +
> > >   DEPENDS += " deploy-image"
> > >   DEBIAN_DEPENDS = "deploy-image"
> >
> > The install script comes from the deploy-image package. Why not
> > simply
> > add multiple providers for the deploy-image package and just
> > install
> > the corresponding one? Here we pull in dependencies which are then
> > not
> > used. Apart from that, by modeling this via dependencies, the risk
> > for
> > package-name-collisions under multiconfig can be avoided.
> >
> > Felix
>
> Hi,
>
> true, it works fine by just adding to the new recipe:
> PROVIDES = "deploy-image"
> DEBIAN_PROVIDES = "deploy-image"
>
> And setting: PREFERRED_PROVIDER_deploy-image = <new-recipe>
> Thank you.
>
> Clara
> >
> > >
> > > diff --git a/meta-isar/recipes-installer/deploy-image-
> > > service/files/install.override.conf b/meta-isar/recipes-
> > > installer/deploy-image-service/files/install.override.conf
> > > deleted file mode 100644
> > > index 357d8662..00000000
> > > --- a/meta-isar/recipes-installer/deploy-image-
> > > service/files/install.override.conf
> > > +++ /dev/null
> > > @@ -1,5 +0,0 @@
> > > -[Service]
> > > -ExecStart=
> > > -ExecStart=/bin/sh -c "deploy-image-wic.sh || (echo 'Rebooting in
> > > 60 s'; sleep 60); reboot"
> > > -StandardInput=tty
> > > -StandardOutput=tty
> > > diff --git a/meta-isar/recipes-installer/deploy-image-
> > > service/files/install.override.conf.tmpl b/meta-isar/recipes-
> > > installer/deploy-image-service/files/install.override.conf.tmpl
> > > new file mode 100644
> > > index 00000000..e09c5036
> > > --- /dev/null
> > > +++ b/meta-isar/recipes-installer/deploy-image-
> > > service/files/install.override.conf.tmpl
> > > @@ -0,0 +1,5 @@
> > > +[Service]
> > > +ExecStart=
> > > +ExecStart=/bin/sh -c "${INSTALL_SCRIPT} || (echo 'Rebooting in
> > > 60 s'; sleep 60); reboot"
> > > +StandardInput=tty
> > > +StandardOutput=tty
> > > --
> > > 2.51.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/20251006135501.1593114-1-clara.kowalsky%40siemens.com
> > > .
> >
>

--
Alexander Heinisch
Siemens AG
http://www.siemens.com/
diff mbox series

Patch

diff --git a/meta-isar/recipes-installer/deploy-image-service/deploy-image-service.bb b/meta-isar/recipes-installer/deploy-image-service/deploy-image-service.bb
index 0fa3dcf3..7f5ff749 100644
--- a/meta-isar/recipes-installer/deploy-image-service/deploy-image-service.bb
+++ b/meta-isar/recipes-installer/deploy-image-service/deploy-image-service.bb
@@ -5,11 +5,15 @@ 
 
 DESCRIPTION = "systemd service to add target image to rootfs"
 
-
 inherit dpkg-raw
 
-SRC_URI = "file://install.override.conf \
+SRC_URI = "file://install.override.conf.tmpl \
           "
+
+INSTALL_SCRIPT ??= "deploy-image-wic.sh"
+TEMPLATE_VARS += "INSTALL_SCRIPT"
+TEMPLATE_FILES += "install.override.conf.tmpl"
+
 DEPENDS += " deploy-image"
 DEBIAN_DEPENDS = "deploy-image"
 
diff --git a/meta-isar/recipes-installer/deploy-image-service/files/install.override.conf b/meta-isar/recipes-installer/deploy-image-service/files/install.override.conf
deleted file mode 100644
index 357d8662..00000000
--- a/meta-isar/recipes-installer/deploy-image-service/files/install.override.conf
+++ /dev/null
@@ -1,5 +0,0 @@ 
-[Service]
-ExecStart=
-ExecStart=/bin/sh -c "deploy-image-wic.sh || (echo 'Rebooting in 60 s'; sleep 60); reboot"
-StandardInput=tty
-StandardOutput=tty
diff --git a/meta-isar/recipes-installer/deploy-image-service/files/install.override.conf.tmpl b/meta-isar/recipes-installer/deploy-image-service/files/install.override.conf.tmpl
new file mode 100644
index 00000000..e09c5036
--- /dev/null
+++ b/meta-isar/recipes-installer/deploy-image-service/files/install.override.conf.tmpl
@@ -0,0 +1,5 @@ 
+[Service]
+ExecStart=
+ExecStart=/bin/sh -c "${INSTALL_SCRIPT} || (echo 'Rebooting in 60 s'; sleep 60); reboot"
+StandardInput=tty
+StandardOutput=tty