From db72b2c0b7c4bd5035df38fdbfdbcd1aa3f7f11a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eil=C3=ADs=20N=C3=AD=20Fhlannag=C3=A1in?=
<elizabeth.flanagan@huawei.com>
Date: Mon, 20 Sep 2021 14:48:59 +0100
Subject: [PATCH] allscenarios-image-*-dev: Add devel/dbg image.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Looking at allscenarios-image-common.inc I see some devel/dbg packages
in there. These really should be pulled into a development or debug
image as images that endusers would build off of for a production
environment should only contain the minimal packages needed to run the system.
This patch removes gdbserver and packagegroup-net-tools (iperf3) from common
and puts them along with other useful EXTRA_IMAGE_FEATURES into two new images:
allscenarios-image-base-dev
allscenarios-image-extra-dev
Due to the size of the dbg-pkgs and dev-pkgs,
allscenarios-image-extra-dev needs a bump of it's ROOT_PARTITION_SIZE
else wic creation explodes.
Closes <issues 123>
Signed-off-by: EilÃs Nà Fhlannagáin <elizabeth.flanagan@huawei.com>
---
flavours/linux/conf-notes.txt | 2 ++
.../images/allscenarios-image-base-dev.bb | 14 ++++++++++++++
.../images/allscenarios-image-common.inc | 2 --
.../images/allscenarios-image-extra-dev.bb | 17 +++++++++++++++++
4 files changed, 33 insertions(+), 2 deletions(-)
create mode 100644 meta-ohos-core/recipes-core/images/allscenarios-image-base-dev.bb
create mode 100644 meta-ohos-core/recipes-core/images/allscenarios-image-extra-dev.bb
diff --git a/flavours/linux/conf-notes.txt b/flavours/linux/conf-notes.txt
index 465fb47f..ffe964a4 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 00000000..7d98ae4a
--- /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 2f21ce76..20a1c6a6 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 00000000..40e5787f
--- /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"
--
GitLab