diff --git a/flavours/linux/conf-notes.txt b/flavours/linux/conf-notes.txt index 465fb47f60fda8a89f383b19edb58f5f1fdab23a..ffe964a4ac7b41864c8b22d6004a001254a4acfd 100644 --- a/flavours/linux/conf-notes.txt +++ b/flavours/linux/conf-notes.txt @@ -5,8 +5,10 @@ You can now run 'bitbake <target>' Supported targets: - allscenarios-image-base +- allscenarios-image-base-dev - allscenarios-image-base-tests - allscenarios-image-extra +- allscenarios-image-extra-dev - allscenarios-image-extra-tests Supported machines (first is the default): diff --git a/meta-ohos-core/recipes-core/images/allscenarios-image-base-dev.bb b/meta-ohos-core/recipes-core/images/allscenarios-image-base-dev.bb new file mode 100644 index 0000000000000000000000000000000000000000..7d98ae4ad873ea343451424b4abd58b56ff93542 --- /dev/null +++ b/meta-ohos-core/recipes-core/images/allscenarios-image-base-dev.bb @@ -0,0 +1,14 @@ +# SPDX-FileCopyrightText: Huawei Inc. +# +# SPDX-License-Identifier: Apache-2.0 + +require recipes-core/images/core-image-base.bb +require allscenarios-image-common.inc + +SUMMARY = "AllScenariOS development image including the base OS software stack" + +IMAGE_INSTALL_append = "\ + packagegroup-net-tools \ + " + +EXTRA_IMAGE_FEATURES += "dev-pkgs dbg-pkgs src-pkgs tools-sdk tools-debug tools-profile" diff --git a/meta-ohos-core/recipes-core/images/allscenarios-image-common.inc b/meta-ohos-core/recipes-core/images/allscenarios-image-common.inc index 2f21ce7637b8dfe4539febd71669ddcb84941f95..20a1c6a6f17e248dca0983c8c64b02d1c5ce1e77 100644 --- a/meta-ohos-core/recipes-core/images/allscenarios-image-common.inc +++ b/meta-ohos-core/recipes-core/images/allscenarios-image-common.inc @@ -9,9 +9,7 @@ inherit ohos-image IMAGE_INSTALL_append = "\ packagegroup-allscenarios-core \ packagegroup-net-essentials \ - packagegroup-net-tools \ packagegroup-ble-essentials \ - gdbserver \ " IMAGE_INSTALL_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'optee-client', '', d)} " diff --git a/meta-ohos-core/recipes-core/images/allscenarios-image-extra-dev.bb b/meta-ohos-core/recipes-core/images/allscenarios-image-extra-dev.bb new file mode 100644 index 0000000000000000000000000000000000000000..40e5787fc09803e89f9c6feb998e65b142e0e8cf --- /dev/null +++ b/meta-ohos-core/recipes-core/images/allscenarios-image-extra-dev.bb @@ -0,0 +1,17 @@ +# SPDX-FileCopyrightText: Huawei Inc. +# +# SPDX-License-Identifier: Apache-2.0 + +require recipes-core/images/allscenarios-image-extra.bb + +SUMMARY = "AllScenariOS Wayland development image including the base OS \ +software stack and tests" + +IMAGE_INSTALL_append = "\ + packagegroup-net-tools \ + " + +EXTRA_IMAGE_FEATURES += "dev-pkgs dbg-pkgs src-pkgs tools-sdk tools-debug tools-profile" + +# With the EXTRA_IMAGE_FEATURES we need to bump the size of the rootfs slightly +ROOT_PARTITION_SIZE = "1300M"