| Message ID | 20231005023505.1072671-1-raj.khem@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-openembedded,1/4] images: Inherit from core-image-base | expand |
diff --git a/meta-filesystems/recipes-filesystems/images/meta-filesystems-image.bb b/meta-filesystems/recipes-filesystems/images/meta-filesystems-image.bb index ca21d2a0ed..80fb9f9137 100644 --- a/meta-filesystems/recipes-filesystems/images/meta-filesystems-image.bb +++ b/meta-filesystems/recipes-filesystems/images/meta-filesystems-image.bb @@ -1,3 +1,3 @@ -require meta-filesystems-image-base.bb +require recipes-core/images/core-image-base.bb IMAGE_INSTALL += "packagegroup-meta-filesystems" diff --git a/meta-multimedia/recipes-multimedia/images/meta-multimedia-image.bb b/meta-multimedia/recipes-multimedia/images/meta-multimedia-image.bb index 9f2fda9fef..dc76265a9b 100644 --- a/meta-multimedia/recipes-multimedia/images/meta-multimedia-image.bb +++ b/meta-multimedia/recipes-multimedia/images/meta-multimedia-image.bb @@ -1,3 +1,3 @@ -require meta-multimedia-image-base.bb +require recipes-core/images/core-image-base.bb IMAGE_INSTALL += "packagegroup-meta-multimedia" diff --git a/meta-networking/recipes-core/images/meta-networking-image.bb b/meta-networking/recipes-core/images/meta-networking-image.bb index f4c7401b35..20d3271c94 100644 --- a/meta-networking/recipes-core/images/meta-networking-image.bb +++ b/meta-networking/recipes-core/images/meta-networking-image.bb @@ -1,3 +1,3 @@ -require meta-networking-image-base.bb +require recipes-core/images/core-image-base.bb IMAGE_INSTALL += "packagegroup-meta-networking" diff --git a/meta-oe/recipes-core/images/meta-oe-image.bb b/meta-oe/recipes-core/images/meta-oe-image.bb index 1565549059..1338adf29f 100644 --- a/meta-oe/recipes-core/images/meta-oe-image.bb +++ b/meta-oe/recipes-core/images/meta-oe-image.bb @@ -1,4 +1,4 @@ -require meta-oe-image-base.bb +require recipes-core/images/core-image-base.bb SUMMARY = "meta-oe build test image" diff --git a/meta-oe/recipes-core/images/meta-oe-ptest-image.bb b/meta-oe/recipes-core/images/meta-oe-ptest-image.bb index 613da02977..dd03022c57 100644 --- a/meta-oe/recipes-core/images/meta-oe-ptest-image.bb +++ b/meta-oe/recipes-core/images/meta-oe-ptest-image.bb @@ -1,10 +1,9 @@ inherit features_check REQUIRED_DISTRO_FEATURES = "ptest" +require recipes-core/images/core-image-base.bb require conf/include/ptest-packagelists-meta-oe.inc -require meta-oe-image-base.bb - SUMMARY = "meta-oe ptest test image" DESCRIPTION += "Also including the ${MCNAME} ptest package." diff --git a/meta-perl/recipes-core/images/meta-perl-image.bb b/meta-perl/recipes-core/images/meta-perl-image.bb index b8d3a76e6a..c46cba21cd 100644 --- a/meta-perl/recipes-core/images/meta-perl-image.bb +++ b/meta-perl/recipes-core/images/meta-perl-image.bb @@ -1,4 +1,4 @@ -require meta-perl-base.bb +require recipes-core/images/core-image-base.bb SUMMARY = "meta-perl build test image" diff --git a/meta-perl/recipes-core/images/meta-perl-ptest-image.bb b/meta-perl/recipes-core/images/meta-perl-ptest-image.bb index 7cca6402b2..d846717580 100644 --- a/meta-perl/recipes-core/images/meta-perl-ptest-image.bb +++ b/meta-perl/recipes-core/images/meta-perl-ptest-image.bb @@ -1,10 +1,9 @@ inherit features_check REQUIRED_DISTRO_FEATURES += "ptest" -require meta-perl-base.bb - SUMMARY = "meta-perl build ptest image" +require recipes-core/images/core-image-base.bb require conf/include/ptest-packagelists-meta-perl.inc DESCRIPTION += "Also including the ${MCNAME} ptest package." diff --git a/meta-python/recipes-core/images/meta-python-image.bb b/meta-python/recipes-core/images/meta-python-image.bb index 6353d389b5..fbe3efc600 100644 --- a/meta-python/recipes-core/images/meta-python-image.bb +++ b/meta-python/recipes-core/images/meta-python-image.bb @@ -1,4 +1,4 @@ -require meta-python-image-base.bb +require recipes-core/images/core-image-base.bb SUMMARY = "meta-python build test image" diff --git a/meta-python/recipes-core/images/meta-python-ptest-image.bb b/meta-python/recipes-core/images/meta-python-ptest-image.bb index a649cbb94c..f781322537 100644 --- a/meta-python/recipes-core/images/meta-python-ptest-image.bb +++ b/meta-python/recipes-core/images/meta-python-ptest-image.bb @@ -1,10 +1,9 @@ inherit features_check REQUIRED_DISTRO_FEATURES = "ptest" +require recipes-core/images/core-image-base.bb require conf/include/ptest-packagelists-meta-python.inc -require meta-python-image-base.bb - SUMMARY = "meta-python ptest test image" DESCRIPTION += "Also including the ${MCNAME} ptest package." diff --git a/meta-webserver/recipes-core/images/meta-webserver-image.bb b/meta-webserver/recipes-core/images/meta-webserver-image.bb index ce4f8a0387..9d2badc236 100644 --- a/meta-webserver/recipes-core/images/meta-webserver-image.bb +++ b/meta-webserver/recipes-core/images/meta-webserver-image.bb @@ -1,3 +1,3 @@ -require meta-webserver-image-base.bb +require recipes-core/images/core-image-base.bb IMAGE_INSTALL += "packagegroup-meta-webserver"
We really do not need to define base images which already exist in core layer, reuse them here. Signed-off-by: Khem Raj <raj.khem@gmail.com> --- .../recipes-filesystems/images/meta-filesystems-image.bb | 2 +- .../recipes-multimedia/images/meta-multimedia-image.bb | 2 +- meta-networking/recipes-core/images/meta-networking-image.bb | 2 +- meta-oe/recipes-core/images/meta-oe-image.bb | 2 +- meta-oe/recipes-core/images/meta-oe-ptest-image.bb | 3 +-- meta-perl/recipes-core/images/meta-perl-image.bb | 2 +- meta-perl/recipes-core/images/meta-perl-ptest-image.bb | 3 +-- meta-python/recipes-core/images/meta-python-image.bb | 2 +- meta-python/recipes-core/images/meta-python-ptest-image.bb | 3 +-- meta-webserver/recipes-core/images/meta-webserver-image.bb | 2 +- 10 files changed, 10 insertions(+), 13 deletions(-)