From 391db22cf34e6f1f26267674ab9a2cd93650a5f0 Mon Sep 17 00:00:00 2001 From: hanzongcheng Date: Thu, 23 Nov 2023 00:01:19 +0800 Subject: [PATCH 1/2] openeuler-image: don't remove iso * QEMU certainly supports iso, do not remove iso from IMAGE_FSTYPES. For generic-x86-64, we will make an iso for users. Signed-off-by: hanzongcheng --- meta-openeuler/recipes-core/images/generic-x86-64.inc | 6 ++++++ meta-openeuler/recipes-core/images/openeuler-image.bb | 9 --------- meta-openeuler/recipes-core/images/qemu.inc | 6 ------ 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/meta-openeuler/recipes-core/images/generic-x86-64.inc b/meta-openeuler/recipes-core/images/generic-x86-64.inc index 2ea50b5e2c9..037024aabdd 100644 --- a/meta-openeuler/recipes-core/images/generic-x86-64.inc +++ b/meta-openeuler/recipes-core/images/generic-x86-64.inc @@ -1,2 +1,8 @@ # image configuration for x86-64 require qemu.inc + +# Create an iso image. The openeuler-image-live as the live-os. +# When LIVE_ROOTFS_TYPE defined, bug may come out in poky, so just use default value ext4 in image-live.bbclass. +# Notice: We need MACHINE_FEATURES += "efi" in machine conf +IMAGE_FSTYPES:append = " iso" +INITRD_IMAGE_LIVE = "openeuler-image-live" diff --git a/meta-openeuler/recipes-core/images/openeuler-image.bb b/meta-openeuler/recipes-core/images/openeuler-image.bb index ca6458716d8..d85ee193537 100644 --- a/meta-openeuler/recipes-core/images/openeuler-image.bb +++ b/meta-openeuler/recipes-core/images/openeuler-image.bb @@ -1,12 +1,3 @@ - -# build an iso image, the live-os uses openeuler-image-live, it must be the same as itself(openeuler-image) -# when LIVE_ROOTFS_TYPE defined, bug may come out in poky, so just use default value ext4 in image-live.bbclass. -# notice we need MACHINE_FEATURES += "efi" in machine conf -IMAGE_FSTYPES:append:aarch64 = " iso" -IMAGE_FSTYPES:append:x86-64 = " iso" -IMAGE_FSTYPES:remove:raspberrypi4 = "iso" -INITRD_IMAGE_LIVE = "openeuler-image-live" - # notice: IMAGE_FEATURE configs such as IMAGE_FSTYPES should be defined before openeuler-image-common.inc(before core-image and image.bbclass) require openeuler-image-common.inc # package sdk diff --git a/meta-openeuler/recipes-core/images/qemu.inc b/meta-openeuler/recipes-core/images/qemu.inc index 1a716bdbc83..ec5391d9131 100644 --- a/meta-openeuler/recipes-core/images/qemu.inc +++ b/meta-openeuler/recipes-core/images/qemu.inc @@ -4,12 +4,6 @@ IMAGE_FSTYPES = "cpio.gz" IMAGE_FSTYPES_DEBUGFS = "cpio.gz" INITRAMFS_MAXSIZE = "262144" -# the qemu rootfs type should be cpio.gz, however IMAGE_FSTYPS add append operation with "iso", so when parse -# IMAGE_FSTYPES finally, it can be set "cpio.gz iso", in order to drop "iso" from IMAGE_FSTYPES we add remove -# operation with "iso" -IMAGE_FSTYPES:remove = "iso" -IMAGE_FSTYPES_DEBUGFS:remove = "iso" - delete_unneeded_from_rootfs() { set -x test -d "${OUTPUT_DIR}" || mkdir -p "${OUTPUT_DIR}" -- Gitee From a36ffea806f844fe94dbf82b2f7c77c355fc7e07 Mon Sep 17 00:00:00 2001 From: tangwei55170831 Date: Tue, 28 Nov 2023 17:00:01 +0800 Subject: [PATCH 2/2] gitlint: modify two rules 1.modify subject to include at least 3 to 2 words 2.the first letter of subject in revert commit is not limited in case where revert Signed-off-by: tangwei (cherry picked from commit 8d6160fbc3b0500a2b697ba89e0e304548ba9fc4) --- meta-openeuler/classes/autotools.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-openeuler/classes/autotools.bbclass b/meta-openeuler/classes/autotools.bbclass index 7de42236531..8b6233da0cb 100644 --- a/meta-openeuler/classes/autotools.bbclass +++ b/meta-openeuler/classes/autotools.bbclass @@ -2,5 +2,6 @@ OPENEULER_AUTOTOOLS_BBCLASS = "${@['${COREBASE}/meta/classes/autotools.bbclass', require ${OPENEULER_AUTOTOOLS_BBCLASS} + # used for exporting tasks in openeuler_autotools.bbclass EXPORT_FUNCTIONS do_configure do_compile do_install -- Gitee