From 0fc770798ce45af085ce2005c888d7ae198db6f9 Mon Sep 17 00:00:00 2001 From: Yongmao Luo Date: Tue, 18 Jun 2024 21:12:18 +0800 Subject: [PATCH 1/2] isulad: set COMPATIBLE_MACHINE * Because we only support aarch64 and x86_64 binary, set this variable to prevent building for none-compatible architecture. * modify cmake flags neccessary for building isulad * enable cri & cdi * remove useless flags * skip rpath Signed-off-by: Yongmao Luo --- meta-openeuler/recipes-core/isulad/isulad_2.1.5.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-openeuler/recipes-core/isulad/isulad_2.1.5.bb b/meta-openeuler/recipes-core/isulad/isulad_2.1.5.bb index f6757e4a85c..77255cea335 100644 --- a/meta-openeuler/recipes-core/isulad/isulad_2.1.5.bb +++ b/meta-openeuler/recipes-core/isulad/isulad_2.1.5.bb @@ -137,6 +137,8 @@ SRC_URI:append = " \ S = "${WORKDIR}/iSulad-v${PV}" +COMPATIBLE_MACHINE = "qemu-aarch64|raspberrypi4-64|hieulerpi1" + inherit cmake pkgconfig OECMAKE_GENERATOR = "Unix Makefiles" -- Gitee From cbe916d934de6650c4d63aaea546ca3c7e33c099 Mon Sep 17 00:00:00 2001 From: Yongmao Luo Date: Fri, 21 Jun 2024 17:40:17 +0800 Subject: [PATCH 2/2] docs: add feature when building isulad * since now isulad is a feature, open it if the user wants to use isulad. Signed-off-by: Yongmao Luo --- docs/source/features/isula.rst | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/docs/source/features/isula.rst b/docs/source/features/isula.rst index 26dbd8f4799..0563dff4735 100644 --- a/docs/source/features/isula.rst +++ b/docs/source/features/isula.rst @@ -33,9 +33,21 @@ openeuler-container-os镜像简介 构建带有iSula的openEuler Embedded镜像 ========================================= -当前openEuler Embedded标准镜像中已经集成了iSula容器引擎。 -只需要构建一个标准的openEuler Embedded镜像即可。 -具体的构建过程，参见 :ref:`openeuler_embedded_oebuild`。 +当前openEuler Embedded标准镜像中默认不集成iSula容器引擎。 +如果需要使用iSula容器引擎，用户需要在 ``local.conf`` 中增加如下特性： + +.. code-block:: shell + + DISTRO_FEATURES:append = " isulad " + +当然，也可以通过oebuild在生成构建目录的时候，指定增加容器特性。 +oebuild会在生成构建目录的时候帮忙将上述配置添加到 ``local.conf`` ： + +.. code-block:: shell + + $ oebuild generate -f openeuler-container + +之后具体的构建过程，参见 :ref:`openeuler_embedded_oebuild`。 构建openeuler-container-os的过程和标准的openEuler Embedded镜像类似， 不同之处仅仅在于，在构建镜像中需要输入如下命令而非 ``bitbake openeuler-image`` ： -- Gitee