public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
* [PATCH] meta-isar: Example of SBUILD_FLAVOR usage
@ 2023-06-28  3:22 Uladzimir Bely
  2023-06-28 11:00 ` Henning Schild
  2023-06-30 11:56 ` Uladzimir Bely
  0 siblings, 2 replies; 5+ messages in thread
From: Uladzimir Bely @ 2023-06-28  3:22 UTC (permalink / raw)
  To: isar-users

Packages `hello-isar` and `libhello` both depend on `docbook-to-man`.
Use this fact for demonstrating SBUILD_FLAVOR feature.

Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
---
For apply on top of "[PATCH] add support for derived sbuild chroots".

 meta-isar/recipes-app/hello-isar/hello-isar.bb       |  3 +++
 meta-isar/recipes-app/libhello/libhello.bb           |  3 +++
 .../sbuild-chroot/sbuild-chroot-host-db2m.bb         | 12 ++++++++++++
 .../sbuild-chroot/sbuild-chroot-target-db2m.bb       | 12 ++++++++++++
 4 files changed, 30 insertions(+)
 create mode 100644 meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-host-db2m.bb
 create mode 100644 meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-target-db2m.bb

diff --git a/meta-isar/recipes-app/hello-isar/hello-isar.bb b/meta-isar/recipes-app/hello-isar/hello-isar.bb
index 7d9f8322..51dac2b7 100644
--- a/meta-isar/recipes-app/hello-isar/hello-isar.bb
+++ b/meta-isar/recipes-app/hello-isar/hello-isar.bb
@@ -21,3 +21,6 @@ SRC_URI = " \
 SRCREV = "a18c14cc11ce6b003f3469e89223cffb4016861d"
 
 inherit dpkg
+
+# Example of using alternative sbuild chroot
+SBUILD_FLAVOR="db2m"
diff --git a/meta-isar/recipes-app/libhello/libhello.bb b/meta-isar/recipes-app/libhello/libhello.bb
index 8b10842f..71604bf5 100644
--- a/meta-isar/recipes-app/libhello/libhello.bb
+++ b/meta-isar/recipes-app/libhello/libhello.bb
@@ -14,3 +14,6 @@ SRC_URI = "git://github.com/ilbers/libhello.git;protocol=https;branch=master;des
 SRCREV = "98f2e41e7d05ab8d19b0c5d160b104b725c8fd93"
 
 inherit dpkg
+
+# Example of using alternative sbuild chroot
+SBUILD_FLAVOR="db2m"
diff --git a/meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-host-db2m.bb b/meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-host-db2m.bb
new file mode 100644
index 00000000..1795c5a2
--- /dev/null
+++ b/meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-host-db2m.bb
@@ -0,0 +1,12 @@
+# Root filesystem for packages building
+# Example of SBUILD_FLAVOR usage with docbook-to-man preinstalled
+#
+# This software is a part of ISAR.
+# Copyright (C) 2023 ilbers GmbH
+
+DESCRIPTION = "Isar sbuild/schroot filesystem for host (docbook-to-man)"
+
+require recipes-devtools/sbuild-chroot/sbuild-chroot-host.bb
+
+SBUILD_FLAVOR = "db2m"
+SBUILD_CHROOT_PREINSTALL_EXTRA ?= "docbook-to-man"
diff --git a/meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-target-db2m.bb b/meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-target-db2m.bb
new file mode 100644
index 00000000..e2e10433
--- /dev/null
+++ b/meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-target-db2m.bb
@@ -0,0 +1,12 @@
+# Root filesystem for packages building
+# Example of SBUILD_FLAVOR usage with docbook-to-man preinstalled
+#
+# This software is a part of ISAR.
+# Copyright (C) 2023 ilbers GmbH
+
+DESCRIPTION = "Isar sbuild/schroot filesystem for target (docbook-to-man)"
+
+require recipes-devtools/sbuild-chroot/sbuild-chroot-target.bb
+
+SBUILD_FLAVOR = "db2m"
+SBUILD_CHROOT_PREINSTALL_EXTRA ?= "docbook-to-man"
-- 
2.20.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] meta-isar: Example of SBUILD_FLAVOR usage
  2023-06-28  3:22 [PATCH] meta-isar: Example of SBUILD_FLAVOR usage Uladzimir Bely
@ 2023-06-28 11:00 ` Henning Schild
  2023-06-29  6:40   ` Uladzimir Bely
  2023-06-30 11:56 ` Uladzimir Bely
  1 sibling, 1 reply; 5+ messages in thread
From: Henning Schild @ 2023-06-28 11:00 UTC (permalink / raw)
  To: Uladzimir Bely; +Cc: isar-users

Am Wed, 28 Jun 2023 05:22:33 +0200
schrieb Uladzimir Bely <ubely@ilbers.de>:

> Packages `hello-isar` and `libhello` both depend on `docbook-to-man`.
> Use this fact for demonstrating SBUILD_FLAVOR feature.
> 
> Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
> ---
> For apply on top of "[PATCH] add support for derived sbuild chroots".
> 
>  meta-isar/recipes-app/hello-isar/hello-isar.bb       |  3 +++
>  meta-isar/recipes-app/libhello/libhello.bb           |  3 +++
>  .../sbuild-chroot/sbuild-chroot-host-db2m.bb         | 12
> ++++++++++++ .../sbuild-chroot/sbuild-chroot-target-db2m.bb       |
> 12 ++++++++++++ 4 files changed, 30 insertions(+)
>  create mode 100644
> meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-host-db2m.bb
> create mode 100644
> meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-target-db2m.bb
> 
> diff --git a/meta-isar/recipes-app/hello-isar/hello-isar.bb
> b/meta-isar/recipes-app/hello-isar/hello-isar.bb index
> 7d9f8322..51dac2b7 100644 ---
> a/meta-isar/recipes-app/hello-isar/hello-isar.bb +++
> b/meta-isar/recipes-app/hello-isar/hello-isar.bb @@ -21,3 +21,6 @@
> SRC_URI = " \ SRCREV = "a18c14cc11ce6b003f3469e89223cffb4016861d"
>  
>  inherit dpkg
> +
> +# Example of using alternative sbuild chroot
> +SBUILD_FLAVOR="db2m"
> diff --git a/meta-isar/recipes-app/libhello/libhello.bb
> b/meta-isar/recipes-app/libhello/libhello.bb index 8b10842f..71604bf5
> 100644 --- a/meta-isar/recipes-app/libhello/libhello.bb
> +++ b/meta-isar/recipes-app/libhello/libhello.bb
> @@ -14,3 +14,6 @@ SRC_URI =
> "git://github.com/ilbers/libhello.git;protocol=https;branch=master;des
> SRCREV = "98f2e41e7d05ab8d19b0c5d160b104b725c8fd93" 
>  inherit dpkg
> +
> +# Example of using alternative sbuild chroot
> +SBUILD_FLAVOR="db2m"
> diff --git
> a/meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-host-db2m.bb
> b/meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-host-db2m.bb
> new file mode 100644 index 00000000..1795c5a2 --- /dev/null
> +++
> b/meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-host-db2m.bb
> @@ -0,0 +1,12 @@ +# Root filesystem for packages building
> +# Example of SBUILD_FLAVOR usage with docbook-to-man preinstalled
> +#
> +# This software is a part of ISAR.
> +# Copyright (C) 2023 ilbers GmbH
> +
> +DESCRIPTION = "Isar sbuild/schroot filesystem for host
> (docbook-to-man)" +
> +require recipes-devtools/sbuild-chroot/sbuild-chroot-host.bb
> +
> +SBUILD_FLAVOR = "db2m"
> +SBUILD_CHROOT_PREINSTALL_EXTRA ?= "docbook-to-man"
> diff --git
> a/meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-target-db2m.bb
> b/meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-target-db2m.bb
> new file mode 100644 index 00000000..e2e10433 --- /dev/null
> +++
> b/meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-target-db2m.bb
> @@ -0,0 +1,12 @@ +# Root filesystem for packages building
> +# Example of SBUILD_FLAVOR usage with docbook-to-man preinstalled
> +#
> +# This software is a part of ISAR.
> +# Copyright (C) 2023 ilbers GmbH
> +
> +DESCRIPTION = "Isar sbuild/schroot filesystem for target
> (docbook-to-man)" +
> +require recipes-devtools/sbuild-chroot/sbuild-chroot-target.bb
> +
> +SBUILD_FLAVOR = "db2m"
> +SBUILD_CHROOT_PREINSTALL_EXTRA ?= "docbook-to-man"

I think we should really try to deduplicate here.

Maybe split FILE and use the last part as SBUILD_FLAVOR and the second
to last to see about host vs target, then we have one file and one
symlink.

Henning




^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] meta-isar: Example of SBUILD_FLAVOR usage
  2023-06-28 11:00 ` Henning Schild
@ 2023-06-29  6:40   ` Uladzimir Bely
  2023-06-29  9:01     ` Henning Schild
  0 siblings, 1 reply; 5+ messages in thread
From: Uladzimir Bely @ 2023-06-29  6:40 UTC (permalink / raw)
  To: Henning Schild; +Cc: isar-users

On Wed, 2023-06-28 at 13:00 +0200, Henning Schild wrote:
> Am Wed, 28 Jun 2023 05:22:33 +0200
> schrieb Uladzimir Bely <ubely@ilbers.de>:
> 
> > Packages `hello-isar` and `libhello` both depend on `docbook-to-
> > man`.
> > Use this fact for demonstrating SBUILD_FLAVOR feature.
> > 
> > Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
> > ---
> > For apply on top of "[PATCH] add support for derived sbuild
> > chroots".
> > 
> >  meta-isar/recipes-app/hello-isar/hello-isar.bb       |  3 +++
> >  meta-isar/recipes-app/libhello/libhello.bb           |  3 +++
> >  .../sbuild-chroot/sbuild-chroot-host-db2m.bb         | 12
> > ++++++++++++ .../sbuild-chroot/sbuild-chroot-target-db2m.bb       |
> > 12 ++++++++++++ 4 files changed, 30 insertions(+)
> >  create mode 100644
> > meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-host-db2m.bb
> > create mode 100644
> > meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-target-
> > db2m.bb
> > 
> > diff --git a/meta-isar/recipes-app/hello-isar/hello-isar.bb
> > b/meta-isar/recipes-app/hello-isar/hello-isar.bb index
> > 7d9f8322..51dac2b7 100644 ---
> > a/meta-isar/recipes-app/hello-isar/hello-isar.bb +++
> > b/meta-isar/recipes-app/hello-isar/hello-isar.bb @@ -21,3 +21,6 @@
> > SRC_URI = " \ SRCREV = "a18c14cc11ce6b003f3469e89223cffb4016861d"
> >  
> >  inherit dpkg
> > +
> > +# Example of using alternative sbuild chroot
> > +SBUILD_FLAVOR="db2m"
> > diff --git a/meta-isar/recipes-app/libhello/libhello.bb
> > b/meta-isar/recipes-app/libhello/libhello.bb index
> > 8b10842f..71604bf5
> > 100644 --- a/meta-isar/recipes-app/libhello/libhello.bb
> > +++ b/meta-isar/recipes-app/libhello/libhello.bb
> > @@ -14,3 +14,6 @@ SRC_URI =
> > "git://github.com/ilbers/libhello.git;protocol=https;branch=master;
> > des
> > SRCREV = "98f2e41e7d05ab8d19b0c5d160b104b725c8fd93" 
> >  inherit dpkg
> > +
> > +# Example of using alternative sbuild chroot
> > +SBUILD_FLAVOR="db2m"
> > diff --git
> > a/meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-host-
> > db2m.bb
> > b/meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-host-
> > db2m.bb
> > new file mode 100644 index 00000000..1795c5a2 --- /dev/null
> > +++
> > b/meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-host-
> > db2m.bb
> > @@ -0,0 +1,12 @@ +# Root filesystem for packages building
> > +# Example of SBUILD_FLAVOR usage with docbook-to-man preinstalled
> > +#
> > +# This software is a part of ISAR.
> > +# Copyright (C) 2023 ilbers GmbH
> > +
> > +DESCRIPTION = "Isar sbuild/schroot filesystem for host
> > (docbook-to-man)" +
> > +require recipes-devtools/sbuild-chroot/sbuild-chroot-host.bb
> > +
> > +SBUILD_FLAVOR = "db2m"
> > +SBUILD_CHROOT_PREINSTALL_EXTRA ?= "docbook-to-man"
> > diff --git
> > a/meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-target-
> > db2m.bb
> > b/meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-target-
> > db2m.bb
> > new file mode 100644 index 00000000..e2e10433 --- /dev/null
> > +++
> > b/meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-target-
> > db2m.bb
> > @@ -0,0 +1,12 @@ +# Root filesystem for packages building
> > +# Example of SBUILD_FLAVOR usage with docbook-to-man preinstalled
> > +#
> > +# This software is a part of ISAR.
> > +# Copyright (C) 2023 ilbers GmbH
> > +
> > +DESCRIPTION = "Isar sbuild/schroot filesystem for target
> > (docbook-to-man)" +
> > +require recipes-devtools/sbuild-chroot/sbuild-chroot-target.bb
> > +
> > +SBUILD_FLAVOR = "db2m"
> > +SBUILD_CHROOT_PREINSTALL_EXTRA ?= "docbook-to-man"
> 
> I think we should really try to deduplicate here.
> 
> Maybe split FILE and use the last part as SBUILD_FLAVOR and the
> second
> to last to see about host vs target, then we have one file and one
> symlink.
> 
> Henning
> 
> 
I thought about placing these two lines under some `sbuild-chroot-
db2m.inc` and add `require` for this file from both new recipes. I
skipped this since it doesn't make the patch smaller, but from the
point of correct hierarchy, it might be done.

> 


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] meta-isar: Example of SBUILD_FLAVOR usage
  2023-06-29  6:40   ` Uladzimir Bely
@ 2023-06-29  9:01     ` Henning Schild
  0 siblings, 0 replies; 5+ messages in thread
From: Henning Schild @ 2023-06-29  9:01 UTC (permalink / raw)
  To: Uladzimir Bely; +Cc: isar-users

Am Thu, 29 Jun 2023 09:40:30 +0300
schrieb Uladzimir Bely <ubely@ilbers.de>:

> On Wed, 2023-06-28 at 13:00 +0200, Henning Schild wrote:
> > Am Wed, 28 Jun 2023 05:22:33 +0200
> > schrieb Uladzimir Bely <ubely@ilbers.de>:
> >   
> > > Packages `hello-isar` and `libhello` both depend on `docbook-to-
> > > man`.
> > > Use this fact for demonstrating SBUILD_FLAVOR feature.
> > > 
> > > Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
> > > ---
> > > For apply on top of "[PATCH] add support for derived sbuild
> > > chroots".
> > > 
> > >  meta-isar/recipes-app/hello-isar/hello-isar.bb       |  3 +++
> > >  meta-isar/recipes-app/libhello/libhello.bb           |  3 +++
> > >  .../sbuild-chroot/sbuild-chroot-host-db2m.bb         | 12
> > > ++++++++++++ .../sbuild-chroot/sbuild-chroot-target-db2m.bb
> > > | 12 ++++++++++++ 4 files changed, 30 insertions(+)
> > >  create mode 100644
> > > meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-host-db2m.bb
> > > create mode 100644
> > > meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-target-
> > > db2m.bb
> > > 
> > > diff --git a/meta-isar/recipes-app/hello-isar/hello-isar.bb
> > > b/meta-isar/recipes-app/hello-isar/hello-isar.bb index
> > > 7d9f8322..51dac2b7 100644 ---
> > > a/meta-isar/recipes-app/hello-isar/hello-isar.bb +++
> > > b/meta-isar/recipes-app/hello-isar/hello-isar.bb @@ -21,3 +21,6 @@
> > > SRC_URI = " \ SRCREV = "a18c14cc11ce6b003f3469e89223cffb4016861d"
> > >  
> > >  inherit dpkg
> > > +
> > > +# Example of using alternative sbuild chroot
> > > +SBUILD_FLAVOR="db2m"
> > > diff --git a/meta-isar/recipes-app/libhello/libhello.bb
> > > b/meta-isar/recipes-app/libhello/libhello.bb index
> > > 8b10842f..71604bf5
> > > 100644 --- a/meta-isar/recipes-app/libhello/libhello.bb
> > > +++ b/meta-isar/recipes-app/libhello/libhello.bb
> > > @@ -14,3 +14,6 @@ SRC_URI =
> > > "git://github.com/ilbers/libhello.git;protocol=https;branch=master;
> > > des
> > > SRCREV = "98f2e41e7d05ab8d19b0c5d160b104b725c8fd93" 
> > >  inherit dpkg
> > > +
> > > +# Example of using alternative sbuild chroot
> > > +SBUILD_FLAVOR="db2m"
> > > diff --git
> > > a/meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-host-
> > > db2m.bb
> > > b/meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-host-
> > > db2m.bb
> > > new file mode 100644 index 00000000..1795c5a2 --- /dev/null
> > > +++
> > > b/meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-host-
> > > db2m.bb
> > > @@ -0,0 +1,12 @@ +# Root filesystem for packages building
> > > +# Example of SBUILD_FLAVOR usage with docbook-to-man preinstalled
> > > +#
> > > +# This software is a part of ISAR.
> > > +# Copyright (C) 2023 ilbers GmbH
> > > +
> > > +DESCRIPTION = "Isar sbuild/schroot filesystem for host
> > > (docbook-to-man)" +
> > > +require recipes-devtools/sbuild-chroot/sbuild-chroot-host.bb
> > > +
> > > +SBUILD_FLAVOR = "db2m"
> > > +SBUILD_CHROOT_PREINSTALL_EXTRA ?= "docbook-to-man"
> > > diff --git
> > > a/meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-target-
> > > db2m.bb
> > > b/meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-target-
> > > db2m.bb
> > > new file mode 100644 index 00000000..e2e10433 --- /dev/null
> > > +++
> > > b/meta-isar/recipes-devtools/sbuild-chroot/sbuild-chroot-target-
> > > db2m.bb
> > > @@ -0,0 +1,12 @@ +# Root filesystem for packages building
> > > +# Example of SBUILD_FLAVOR usage with docbook-to-man preinstalled
> > > +#
> > > +# This software is a part of ISAR.
> > > +# Copyright (C) 2023 ilbers GmbH
> > > +
> > > +DESCRIPTION = "Isar sbuild/schroot filesystem for target
> > > (docbook-to-man)" +
> > > +require recipes-devtools/sbuild-chroot/sbuild-chroot-target.bb
> > > +
> > > +SBUILD_FLAVOR = "db2m"
> > > +SBUILD_CHROOT_PREINSTALL_EXTRA ?= "docbook-to-man"  
> > 
> > I think we should really try to deduplicate here.
> > 
> > Maybe split FILE and use the last part as SBUILD_FLAVOR and the
> > second
> > to last to see about host vs target, then we have one file and one
> > symlink.
> > 
> > Henning
> > 
> >   
> I thought about placing these two lines under some `sbuild-chroot-
> db2m.inc` and add `require` for this file from both new recipes. I
> skipped this since it doesn't make the patch smaller, but from the
> point of correct hierarchy, it might be done.

Also true, too much bitbake magic and abstraction maybe more confusing
than a helpful example. So if you tried and it did not get smaller, i
guess it is fine.

Henning

> >   
> 


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] meta-isar: Example of SBUILD_FLAVOR usage
  2023-06-28  3:22 [PATCH] meta-isar: Example of SBUILD_FLAVOR usage Uladzimir Bely
  2023-06-28 11:00 ` Henning Schild
@ 2023-06-30 11:56 ` Uladzimir Bely
  1 sibling, 0 replies; 5+ messages in thread
From: Uladzimir Bely @ 2023-06-30 11:56 UTC (permalink / raw)
  To: isar-users

On Wed, 2023-06-28 at 05:22 +0200, Uladzimir Bely wrote:
> Packages `hello-isar` and `libhello` both depend on `docbook-to-man`.
> Use this fact for demonstrating SBUILD_FLAVOR feature.
> 
> Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
> ---
> For apply on top of "[PATCH] add support for derived sbuild chroots".
> 
>  meta-isar/recipes-app/hello-isar/hello-isar.bb       |  3 +++
>  meta-isar/recipes-app/libhello/libhello.bb           |  3 +++
>  .../sbuild-chroot/sbuild-chroot-host-db2m.bb         | 12
> ++++++++++++
>  .../sbuild-chroot/sbuild-chroot-target-db2m.bb       | 12
> ++++++++++++
>  4 files changed, 30 insertions(+)
>  create mode 100644 meta-isar/recipes-devtools/sbuild-chroot/sbuild-
> chroot-host-db2m.bb
>  create mode 100644 meta-isar/recipes-devtools/sbuild-chroot/sbuild-
> chroot-target-db2m.bb
> 

Applied to next.

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2023-06-30 11:56 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-28  3:22 [PATCH] meta-isar: Example of SBUILD_FLAVOR usage Uladzimir Bely
2023-06-28 11:00 ` Henning Schild
2023-06-29  6:40   ` Uladzimir Bely
2023-06-29  9:01     ` Henning Schild
2023-06-30 11:56 ` Uladzimir Bely

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox