| Message ID | 20230331220143.20090-1-reatmon@ti.com |
|---|---|
| State | Accepted |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [meta-arago,dunfell] images: Add variable to add extra packages from the local.conf | expand |
On Fri, Mar 31, 2023 at 05:01:43PM -0500, Ryan Eatmon via lists.yoctoproject.org wrote: > The bootstrap, thinlinux and tiny images all had a variable that allowed > for adding additional packages to the image from the local.conf file. > Add this same concept to the default and base images. Missing Suggested-by? :) But sure, looks good to me! Why is it dunfell specific? > Signed-off-by: Ryan Eatmon <reatmon@ti.com> > --- > meta-arago-distro/recipes-core/images/tisdk-base-image.bb | 3 +++ > meta-arago-distro/recipes-core/images/tisdk-default-image.bb | 3 +++ > 2 files changed, 6 insertions(+) > > diff --git a/meta-arago-distro/recipes-core/images/tisdk-base-image.bb b/meta-arago-distro/recipes-core/images/tisdk-base-image.bb > index 8698816d..ec09b90b 100644 > --- a/meta-arago-distro/recipes-core/images/tisdk-base-image.bb > +++ b/meta-arago-distro/recipes-core/images/tisdk-base-image.bb > @@ -8,12 +8,15 @@ require arago-image.inc > IMAGE_FSTYPES += "cpio.xz" > IMAGE_FSTYPES_append_dra7xx = " ubifs ubi" > > +ARAGO_BASE_IMAGE_EXTRA_INSTALL ?= "" > + > IMAGE_INSTALL += "\ > packagegroup-arago-base \ > packagegroup-arago-console \ > packagegroup-arago-base-tisdk \ > ${VIRTUAL-RUNTIME_initramfs} \ > ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', 'ti-test', '', d)} \ > + ${ARAGO_BASE_IMAGE_EXTRA_INSTALL} \ > " > > export IMAGE_BASENAME = "tisdk-base-image" > diff --git a/meta-arago-distro/recipes-core/images/tisdk-default-image.bb b/meta-arago-distro/recipes-core/images/tisdk-default-image.bb > index 16772ee9..9cd0a28f 100644 > --- a/meta-arago-distro/recipes-core/images/tisdk-default-image.bb > +++ b/meta-arago-distro/recipes-core/images/tisdk-default-image.bb > @@ -7,6 +7,8 @@ require arago-image.inc > > SPLASH = "${@bb.utils.contains('MACHINE_FEATURES','gpu','psplash','',d)}" > > +ARAGO_DEFAULT_IMAGE_EXTRA_INSTALL ?= "" > + > IMAGE_INSTALL += "\ > packagegroup-arago-base \ > packagegroup-arago-console \ > @@ -27,6 +29,7 @@ IMAGE_INSTALL += "\ > ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-hmi','packagegroup-arago-base-tisdk-server-extra',d)} \ > ti-analytics \ > ti-demos \ > + ${ARAGO_DEFAULT_IMAGE_EXTRA_INSTALL} \ > " > > export IMAGE_BASENAME = "tisdk-default-image" > -- > 2.17.1
On 3/31/2023 17:08, Denys Dmytriyenko wrote: > On Fri, Mar 31, 2023 at 05:01:43PM -0500, Ryan Eatmon via lists.yoctoproject.org wrote: >> The bootstrap, thinlinux and tiny images all had a variable that allowed >> for adding additional packages to the image from the local.conf file. >> Add this same concept to the default and base images. > > Missing Suggested-by? :) But sure, looks good to me! > > Why is it dunfell specific? > Because the patch did not apply to kirkstone/master, so I sent a second patch with the updated patch. >> Signed-off-by: Ryan Eatmon <reatmon@ti.com> >> --- >> meta-arago-distro/recipes-core/images/tisdk-base-image.bb | 3 +++ >> meta-arago-distro/recipes-core/images/tisdk-default-image.bb | 3 +++ >> 2 files changed, 6 insertions(+) >> >> diff --git a/meta-arago-distro/recipes-core/images/tisdk-base-image.bb b/meta-arago-distro/recipes-core/images/tisdk-base-image.bb >> index 8698816d..ec09b90b 100644 >> --- a/meta-arago-distro/recipes-core/images/tisdk-base-image.bb >> +++ b/meta-arago-distro/recipes-core/images/tisdk-base-image.bb >> @@ -8,12 +8,15 @@ require arago-image.inc >> IMAGE_FSTYPES += "cpio.xz" >> IMAGE_FSTYPES_append_dra7xx = " ubifs ubi" >> >> +ARAGO_BASE_IMAGE_EXTRA_INSTALL ?= "" >> + >> IMAGE_INSTALL += "\ >> packagegroup-arago-base \ >> packagegroup-arago-console \ >> packagegroup-arago-base-tisdk \ >> ${VIRTUAL-RUNTIME_initramfs} \ >> ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', 'ti-test', '', d)} \ >> + ${ARAGO_BASE_IMAGE_EXTRA_INSTALL} \ >> " >> >> export IMAGE_BASENAME = "tisdk-base-image" >> diff --git a/meta-arago-distro/recipes-core/images/tisdk-default-image.bb b/meta-arago-distro/recipes-core/images/tisdk-default-image.bb >> index 16772ee9..9cd0a28f 100644 >> --- a/meta-arago-distro/recipes-core/images/tisdk-default-image.bb >> +++ b/meta-arago-distro/recipes-core/images/tisdk-default-image.bb >> @@ -7,6 +7,8 @@ require arago-image.inc >> >> SPLASH = "${@bb.utils.contains('MACHINE_FEATURES','gpu','psplash','',d)}" >> >> +ARAGO_DEFAULT_IMAGE_EXTRA_INSTALL ?= "" >> + >> IMAGE_INSTALL += "\ >> packagegroup-arago-base \ >> packagegroup-arago-console \ >> @@ -27,6 +29,7 @@ IMAGE_INSTALL += "\ >> ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-hmi','packagegroup-arago-base-tisdk-server-extra',d)} \ >> ti-analytics \ >> ti-demos \ >> + ${ARAGO_DEFAULT_IMAGE_EXTRA_INSTALL} \ >> " >> >> export IMAGE_BASENAME = "tisdk-default-image" >> -- >> 2.17.1
On Fri, Mar 31, 2023 at 05:29:31PM -0500, Ryan Eatmon wrote: > > > On 3/31/2023 17:08, Denys Dmytriyenko wrote: > >On Fri, Mar 31, 2023 at 05:01:43PM -0500, Ryan Eatmon via lists.yoctoproject.org wrote: > >>The bootstrap, thinlinux and tiny images all had a variable that allowed > >>for adding additional packages to the image from the local.conf file. > >>Add this same concept to the default and base images. > > > >Missing Suggested-by? :) But sure, looks good to me! > > > >Why is it dunfell specific? > > > > Because the patch did not apply to kirkstone/master, so I sent a > second patch with the updated patch. Yeah, I saw that later - I guess I commented too fast... > >>Signed-off-by: Ryan Eatmon <reatmon@ti.com> > >>--- > >> meta-arago-distro/recipes-core/images/tisdk-base-image.bb | 3 +++ > >> meta-arago-distro/recipes-core/images/tisdk-default-image.bb | 3 +++ > >> 2 files changed, 6 insertions(+) > >> > >>diff --git a/meta-arago-distro/recipes-core/images/tisdk-base-image.bb b/meta-arago-distro/recipes-core/images/tisdk-base-image.bb > >>index 8698816d..ec09b90b 100644 > >>--- a/meta-arago-distro/recipes-core/images/tisdk-base-image.bb > >>+++ b/meta-arago-distro/recipes-core/images/tisdk-base-image.bb > >>@@ -8,12 +8,15 @@ require arago-image.inc > >> IMAGE_FSTYPES += "cpio.xz" > >> IMAGE_FSTYPES_append_dra7xx = " ubifs ubi" > >>+ARAGO_BASE_IMAGE_EXTRA_INSTALL ?= "" > >>+ > >> IMAGE_INSTALL += "\ > >> packagegroup-arago-base \ > >> packagegroup-arago-console \ > >> packagegroup-arago-base-tisdk \ > >> ${VIRTUAL-RUNTIME_initramfs} \ > >> ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', 'ti-test', '', d)} \ > >>+ ${ARAGO_BASE_IMAGE_EXTRA_INSTALL} \ > >> " > >> export IMAGE_BASENAME = "tisdk-base-image" > >>diff --git a/meta-arago-distro/recipes-core/images/tisdk-default-image.bb b/meta-arago-distro/recipes-core/images/tisdk-default-image.bb > >>index 16772ee9..9cd0a28f 100644 > >>--- a/meta-arago-distro/recipes-core/images/tisdk-default-image.bb > >>+++ b/meta-arago-distro/recipes-core/images/tisdk-default-image.bb > >>@@ -7,6 +7,8 @@ require arago-image.inc > >> SPLASH = "${@bb.utils.contains('MACHINE_FEATURES','gpu','psplash','',d)}" > >>+ARAGO_DEFAULT_IMAGE_EXTRA_INSTALL ?= "" > >>+ > >> IMAGE_INSTALL += "\ > >> packagegroup-arago-base \ > >> packagegroup-arago-console \ > >>@@ -27,6 +29,7 @@ IMAGE_INSTALL += "\ > >> ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-hmi','packagegroup-arago-base-tisdk-server-extra',d)} \ > >> ti-analytics \ > >> ti-demos \ > >>+ ${ARAGO_DEFAULT_IMAGE_EXTRA_INSTALL} \ > >> " > >> export IMAGE_BASENAME = "tisdk-default-image" > >>-- > >>2.17.1
diff --git a/meta-arago-distro/recipes-core/images/tisdk-base-image.bb b/meta-arago-distro/recipes-core/images/tisdk-base-image.bb index 8698816d..ec09b90b 100644 --- a/meta-arago-distro/recipes-core/images/tisdk-base-image.bb +++ b/meta-arago-distro/recipes-core/images/tisdk-base-image.bb @@ -8,12 +8,15 @@ require arago-image.inc IMAGE_FSTYPES += "cpio.xz" IMAGE_FSTYPES_append_dra7xx = " ubifs ubi" +ARAGO_BASE_IMAGE_EXTRA_INSTALL ?= "" + IMAGE_INSTALL += "\ packagegroup-arago-base \ packagegroup-arago-console \ packagegroup-arago-base-tisdk \ ${VIRTUAL-RUNTIME_initramfs} \ ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', 'ti-test', '', d)} \ + ${ARAGO_BASE_IMAGE_EXTRA_INSTALL} \ " export IMAGE_BASENAME = "tisdk-base-image" diff --git a/meta-arago-distro/recipes-core/images/tisdk-default-image.bb b/meta-arago-distro/recipes-core/images/tisdk-default-image.bb index 16772ee9..9cd0a28f 100644 --- a/meta-arago-distro/recipes-core/images/tisdk-default-image.bb +++ b/meta-arago-distro/recipes-core/images/tisdk-default-image.bb @@ -7,6 +7,8 @@ require arago-image.inc SPLASH = "${@bb.utils.contains('MACHINE_FEATURES','gpu','psplash','',d)}" +ARAGO_DEFAULT_IMAGE_EXTRA_INSTALL ?= "" + IMAGE_INSTALL += "\ packagegroup-arago-base \ packagegroup-arago-console \ @@ -27,6 +29,7 @@ IMAGE_INSTALL += "\ ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-hmi','packagegroup-arago-base-tisdk-server-extra',d)} \ ti-analytics \ ti-demos \ + ${ARAGO_DEFAULT_IMAGE_EXTRA_INSTALL} \ " export IMAGE_BASENAME = "tisdk-default-image"
The bootstrap, thinlinux and tiny images all had a variable that allowed for adding additional packages to the image from the local.conf file. Add this same concept to the default and base images. Signed-off-by: Ryan Eatmon <reatmon@ti.com> --- meta-arago-distro/recipes-core/images/tisdk-base-image.bb | 3 +++ meta-arago-distro/recipes-core/images/tisdk-default-image.bb | 3 +++ 2 files changed, 6 insertions(+)