From 2a9f7f814bd986f510681c7761fea2d0e3edaeb8 Mon Sep 17 00:00:00 2001 From: tangwei55170831 Date: Wed, 27 Sep 2023 17:28:35 +0800 Subject: [PATCH 01/11] ci: add raspberrypi4-64-ros build in ci.yaml add raspberrypi4-64-ros build in ci.yaml Signed-off-by: tangwei --- .oebuild/workflows/ci.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.oebuild/workflows/ci.yaml b/.oebuild/workflows/ci.yaml index ad2ad1ce87c..fa9dac371bd 100644 --- a/.oebuild/workflows/ci.yaml +++ b/.oebuild/workflows/ci.yaml @@ -37,14 +37,14 @@ build_list: - target: openeuler-image - target: openeuler-image -c do_populate_sdk ########################################## -# - name: raspberrypi4-64-ros -# platform: raspberrypi4-64 -# directory: raspberrypi4-64-ros -# feature: -# - name: openeuler-ros -# bitbake: -# - target: openeuler-image-ros -# - target: openeuler-image-ros -c do_populate_sdk + - name: raspberrypi4-64-ros + platform: raspberrypi4-64 + directory: raspberrypi4-64-ros + feature: + - name: openeuler-ros + bitbake: + - target: openeuler-image-ros + - target: openeuler-image-ros -c do_populate_sdk ########################################## - name: raspberrypi4-64-qt platform: raspberrypi4-64 -- Gitee From 21df28e4ef8c432bad041380d48416e7a3e75ed7 Mon Sep 17 00:00:00 2001 From: liangqifeng Date: Thu, 28 Sep 2023 11:10:00 +0800 Subject: [PATCH 02/11] ok3399: fix compile bug * fix a bug during processing kernel image Signed-off-by: liangqifeng --- .../rockchip/recipes-kernel/linux/linux-rockchip.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bsp/meta-openeuler-bsp/rockchip/recipes-kernel/linux/linux-rockchip.inc b/bsp/meta-openeuler-bsp/rockchip/recipes-kernel/linux/linux-rockchip.inc index 010f7501579..4da644537e6 100644 --- a/bsp/meta-openeuler-bsp/rockchip/recipes-kernel/linux/linux-rockchip.inc +++ b/bsp/meta-openeuler-bsp/rockchip/recipes-kernel/linux/linux-rockchip.inc @@ -52,7 +52,7 @@ do_compile:append:ok3399(){ cp ../logo/* ./ scripts/mkkrnlimg ${KERNEL_OUTPUT_DIR}/Image kernel.img ../tools/mkimg --dtb ${ROCKCHIP_KERNEL_DTB_NAME} - scripts/mkbootimg --kernel ${KERNEL_OUTPUT_DIR}/Image --second resource.img -o boot.img && + scripts/mkbootimg --kernel ${KERNEL_OUTPUT_DIR}/Image --second resource.img -o boot.img } # add boot.img to $D -- Gitee From 79138697eca3cc1a0a55b482ba7174521d239a86 Mon Sep 17 00:00:00 2001 From: tangwei55170831 Date: Thu, 28 Sep 2023 16:52:58 +0800 Subject: [PATCH 03/11] docs: remove unuse docs remove unuse docs Signed-off-by: tangwei --- docs/source/bsp/arm32/index.rst | 13 ------------- .../bsp/arm32/qemu_virt_cortex_a15/index.rst | 17 ----------------- docs/source/bsp/riscv/index.rst | 13 ------------- 3 files changed, 43 deletions(-) delete mode 100644 docs/source/bsp/arm32/index.rst delete mode 100644 docs/source/bsp/arm32/qemu_virt_cortex_a15/index.rst delete mode 100644 docs/source/bsp/riscv/index.rst diff --git a/docs/source/bsp/arm32/index.rst b/docs/source/bsp/arm32/index.rst deleted file mode 100644 index 3371553099b..00000000000 --- a/docs/source/bsp/arm32/index.rst +++ /dev/null @@ -1,13 +0,0 @@ -.. _openeuler_embedded_arm32: - - -ARM32硬件 -################################ - -所支持的ARM32硬件如下： - -.. toctree:: - :maxdepth: 1 - :glob: - - */index diff --git a/docs/source/bsp/arm32/qemu_virt_cortex_a15/index.rst b/docs/source/bsp/arm32/qemu_virt_cortex_a15/index.rst deleted file mode 100644 index 0e45c83ea39..00000000000 --- a/docs/source/bsp/arm32/qemu_virt_cortex_a15/index.rst +++ /dev/null @@ -1,17 +0,0 @@ -.. _board_qemu_cortex_a15: - - -QEMU Virt Cortex-A15 -###################################### - -基本介绍 -================= - - -构建说明 -================== - - -使用说明 -================= - diff --git a/docs/source/bsp/riscv/index.rst b/docs/source/bsp/riscv/index.rst deleted file mode 100644 index cf2bdb22785..00000000000 --- a/docs/source/bsp/riscv/index.rst +++ /dev/null @@ -1,13 +0,0 @@ -.. _openeuler_embedded_riscv: - - -RISC-V硬件 -################################ - -所支持的RISC-V硬件如下： - -.. toctree:: - :maxdepth: 1 - :glob: - - */index \ No newline at end of file -- Gitee From 310b527531e14985604de89a8868c9f585fd24c7 Mon Sep 17 00:00:00 2001 From: emancipator Date: Sun, 8 Oct 2023 11:00:59 +0800 Subject: [PATCH 04/11] ok3399: fix bug for kernel image tools * fix bug finding kernel image tools mkbootimg Signed-off-by: liangqifeng --- .../rockchip/recipes-kernel/linux/linux-rockchip.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bsp/meta-openeuler-bsp/rockchip/recipes-kernel/linux/linux-rockchip.inc b/bsp/meta-openeuler-bsp/rockchip/recipes-kernel/linux/linux-rockchip.inc index 4da644537e6..1a4f3d2e766 100644 --- a/bsp/meta-openeuler-bsp/rockchip/recipes-kernel/linux/linux-rockchip.inc +++ b/bsp/meta-openeuler-bsp/rockchip/recipes-kernel/linux/linux-rockchip.inc @@ -52,7 +52,7 @@ do_compile:append:ok3399(){ cp ../logo/* ./ scripts/mkkrnlimg ${KERNEL_OUTPUT_DIR}/Image kernel.img ../tools/mkimg --dtb ${ROCKCHIP_KERNEL_DTB_NAME} - scripts/mkbootimg --kernel ${KERNEL_OUTPUT_DIR}/Image --second resource.img -o boot.img + ../tools/mkbootimg --kernel ${KERNEL_OUTPUT_DIR}/Image --second resource.img -o boot.img } # add boot.img to $D -- Gitee From 2b28da0079075e9d1f8795178b048f74dd85a26c Mon Sep 17 00:00:00 2001 From: emancipator Date: Sun, 8 Oct 2023 15:12:16 +0800 Subject: [PATCH 05/11] ok3399: add mkbootimg into tools to populate boot.img * add mkbootimg into tools to populate boot.img Signed-off-by: liangqifeng --- .../linux/files/tools/mkbootimg | 234 ++++++++++++++++++ 1 file changed, 234 insertions(+) create mode 100755 bsp/meta-openeuler-bsp/rockchip/recipes-kernel/linux/files/tools/mkbootimg diff --git a/bsp/meta-openeuler-bsp/rockchip/recipes-kernel/linux/files/tools/mkbootimg b/bsp/meta-openeuler-bsp/rockchip/recipes-kernel/linux/files/tools/mkbootimg new file mode 100755 index 00000000000..c3e09aba349 --- /dev/null +++ b/bsp/meta-openeuler-bsp/rockchip/recipes-kernel/linux/files/tools/mkbootimg @@ -0,0 +1,234 @@ +#!/usr/bin/env python +# Copyright 2015, The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +from __future__ import print_function +from sys import argv, exit, stderr +from argparse import ArgumentParser, FileType, Action +from os import fstat +from struct import pack +from hashlib import sha1 +import sys +import re + +def filesize(f): + if f is None: + return 0 + try: + return fstat(f.fileno()).st_size + except OSError: + return 0 + + +def update_sha(sha, f): + if f: + sha.update(f.read()) + f.seek(0) + sha.update(pack('I', filesize(f))) + else: + sha.update(pack('I', 0)) + + +def pad_file(f, padding): + pad = (padding - (f.tell() & (padding - 1))) & (padding - 1) + f.write(pack(str(pad) + 'x')) + + +def get_number_of_pages(image_size, page_size): + """calculates the number of pages required for the image""" + return (image_size + page_size - 1) / page_size + + +def get_recovery_dtbo_offset(args): + """calculates the offset of recovery_dtbo image in the boot image""" + num_header_pages = 1 # header occupies a page + num_kernel_pages = get_number_of_pages(filesize(args.kernel), args.pagesize) + num_ramdisk_pages = get_number_of_pages(filesize(args.ramdisk), args.pagesize) + num_second_pages = get_number_of_pages(filesize(args.second), args.pagesize) + dtbo_offset = args.pagesize * (num_header_pages + num_kernel_pages + + num_ramdisk_pages + num_second_pages) + return dtbo_offset + + +def write_header(args): + BOOT_IMAGE_HEADER_V1_SIZE = 1648 + BOOT_IMAGE_HEADER_V2_SIZE = 1660 + BOOT_MAGIC = 'ANDROID!'.encode() + + if (args.header_version > 2): + raise ValueError('Boot header version %d not supported' % args.header_version) + + args.output.write(pack('8s', BOOT_MAGIC)) + final_ramdisk_offset = (args.base + args.ramdisk_offset) if filesize(args.ramdisk) > 0 else 0 + final_second_offset = (args.base + args.second_offset) if filesize(args.second) > 0 else 0 + args.output.write(pack('10I', + filesize(args.kernel), # size in bytes + args.base + args.kernel_offset, # physical load addr + filesize(args.ramdisk), # size in bytes + final_ramdisk_offset, # physical load addr + filesize(args.second), # size in bytes + final_second_offset, # physical load addr + args.base + args.tags_offset, # physical addr for kernel tags + args.pagesize, # flash page size we assume + args.header_version, # version of bootimage header + (args.os_version << 11) | args.os_patch_level)) # os version and patch level + args.output.write(pack('16s', args.board.encode())) # asciiz product name + args.output.write(pack('512s', args.cmdline[:512].encode())) + + sha = sha1() + update_sha(sha, args.kernel) + update_sha(sha, args.ramdisk) + update_sha(sha, args.second) + + if args.header_version > 0: + update_sha(sha, args.recovery_dtbo) + if args.header_version > 1: + update_sha(sha, args.dtb) + + img_id = pack('32s', sha.digest()) + + args.output.write(img_id) + args.output.write(pack('1024s', args.cmdline[512:].encode())) + + if args.header_version > 0: + args.output.write(pack('I', filesize(args.recovery_dtbo))) # size in bytes + if args.recovery_dtbo: + args.output.write(pack('Q', get_recovery_dtbo_offset(args))) # recovery dtbo offset + else: + args.output.write(pack('Q', 0)) # Will be set to 0 for devices without a recovery dtbo + + # Populate boot image header size for header versions 1 and 2. + if args.header_version == 1: + args.output.write(pack('I', BOOT_IMAGE_HEADER_V1_SIZE)) + elif args.header_version == 2: + args.output.write(pack('I', BOOT_IMAGE_HEADER_V2_SIZE)) + + if args.header_version > 1: + args.output.write(pack('I', filesize(args.dtb))) # size in bytes + args.output.write(pack('Q', args.base + args.dtb_offset)) # dtb physical load address + pad_file(args.output, args.pagesize) + return img_id + + +class ValidateStrLenAction(Action): + def __init__(self, option_strings, dest, nargs=None, **kwargs): + if 'maxlen' not in kwargs: + raise ValueError('maxlen must be set') + self.maxlen = int(kwargs['maxlen']) + del kwargs['maxlen'] + super(ValidateStrLenAction, self).__init__(option_strings, dest, **kwargs) + + def __call__(self, parser, namespace, values, option_string=None): + if len(values) > self.maxlen: + raise ValueError('String argument too long: max {0:d}, got {1:d}'. + format(self.maxlen, len(values))) + setattr(namespace, self.dest, values) + + +def write_padded_file(f_out, f_in, padding): + if f_in is None: + return + f_out.write(f_in.read()) + pad_file(f_out, padding) + + +def parse_int(x): + return int(x, 0) + +def parse_os_version(x): + match = re.search(r'^(\d{1,3})(?:\.(\d{1,3})(?:\.(\d{1,3}))?)?', x) + if match: + a = int(match.group(1)) + b = c = 0 + if match.lastindex >= 2: + b = int(match.group(2)) + if match.lastindex == 3: + c = int(match.group(3)) + # 7 bits allocated for each field + assert a < 128 + assert b < 128 + assert c < 128 + return (a << 14) | (b << 7) | c + return 0 + +def parse_os_patch_level(x): + match = re.search(r'^(\d{4})-(\d{2})-(\d{2})', x) + if match: + y = int(match.group(1)) - 2000 + m = int(match.group(2)) + # 7 bits allocated for the year, 4 bits for the month + assert y >= 0 and y < 128 + assert m > 0 and m <= 12 + return (y << 4) | m + return 0 + +def parse_cmdline(): + parser = ArgumentParser() + parser.add_argument('--kernel', help='path to the kernel', type=FileType('rb'), + required=True) + parser.add_argument('--ramdisk', help='path to the ramdisk', type=FileType('rb')) + parser.add_argument('--second', help='path to the 2nd bootloader', type=FileType('rb')) + parser.add_argument('--dtb', help='path to dtb', type=FileType('rb')) + recovery_dtbo_group = parser.add_mutually_exclusive_group() + recovery_dtbo_group.add_argument('--recovery_dtbo', help='path to the recovery DTBO', type=FileType('rb')) + recovery_dtbo_group.add_argument('--recovery_acpio', help='path to the recovery ACPIO', + type=FileType('rb'), metavar='RECOVERY_ACPIO', dest='recovery_dtbo') + parser.add_argument('--cmdline', help='extra arguments to be passed on the ' + 'kernel command line', default='', action=ValidateStrLenAction, maxlen=1536) + parser.add_argument('--base', help='base address', type=parse_int, default=0x10000000) + parser.add_argument('--kernel_offset', help='kernel offset', type=parse_int, default=0x00008000) + parser.add_argument('--ramdisk_offset', help='ramdisk offset', type=parse_int, default=0x01000000) + parser.add_argument('--second_offset', help='2nd bootloader offset', type=parse_int, + default=0x00f00000) + parser.add_argument('--dtb_offset', help='dtb offset', type=parse_int, default=0x01f00000) + + parser.add_argument('--os_version', help='operating system version', type=parse_os_version, + default=0) + parser.add_argument('--os_patch_level', help='operating system patch level', + type=parse_os_patch_level, default=0) + parser.add_argument('--tags_offset', help='tags offset', type=parse_int, default=0x00000100) + parser.add_argument('--board', help='board name', default='', action=ValidateStrLenAction, + maxlen=16) + parser.add_argument('--pagesize', help='page size', type=parse_int, + choices=[2**i for i in range(11,15)], default=2048) + parser.add_argument('--id', help='print the image ID on standard output', + action='store_true') + parser.add_argument('--header_version', help='boot image header version', type=parse_int, default=0) + parser.add_argument('-o', '--output', help='output file name', type=FileType('wb'), + required=True) + return parser.parse_args() + + +def write_data(args): + write_padded_file(args.output, args.kernel, args.pagesize) + write_padded_file(args.output, args.ramdisk, args.pagesize) + write_padded_file(args.output, args.second, args.pagesize) + + if args.header_version > 0: + write_padded_file(args.output, args.recovery_dtbo, args.pagesize) + if args.header_version > 1: + write_padded_file(args.output, args.dtb, args.pagesize) + +def main(): + args = parse_cmdline() + img_id = write_header(args) + write_data(args) + if args.id: + if isinstance(img_id, str): + # Python 2's struct.pack returns a string, but py3 returns bytes. + img_id = [ord(x) for x in img_id] + print('0x' + ''.join('{:02x}'.format(c) for c in img_id)) + +if __name__ == '__main__': + main() -- Gitee From 385eb30128f009eca7e6b8d4921aebc699561803 Mon Sep 17 00:00:00 2001 From: tangwei55170831 Date: Mon, 9 Oct 2023 15:34:56 +0800 Subject: [PATCH 06/11] yocto: Update domain name Update domain name from repo.openeuler.org to repo.openeuler.openatom.cn. Because network access to the original domain name is restricted by a firewall. Signed-off-by: tangwei --- .../isulad/lib-shim-v2-bin_0.0.1.bb | 7 +++--- .../dnf/files/aarch64/openEuler.repo | 24 +++++++++---------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/meta-openeuler/recipes-core/isulad/lib-shim-v2-bin_0.0.1.bb b/meta-openeuler/recipes-core/isulad/lib-shim-v2-bin_0.0.1.bb index 045c1fd22bf..d830bfb33df 100644 --- a/meta-openeuler/recipes-core/isulad/lib-shim-v2-bin_0.0.1.bb +++ b/meta-openeuler/recipes-core/isulad/lib-shim-v2-bin_0.0.1.bb @@ -14,9 +14,9 @@ SRC_URI[x86.md5sum] = "fb1cdaba15faae97c94f9595b09ff945" SRC_URI[header.md5sum] = "97c8e9fff736e0f96c36dac0e5426aa2" SRC_URI = " \ - http://repo.openeuler.org/openEuler-22.03-LTS-SP2/OS/aarch64/Packages/lib-shim-v2-0.0.1-6.oe2203sp2.aarch64.rpm;name=arm64 \ - http://repo.openeuler.org/openEuler-22.03-LTS-SP2/OS/x86_64/Packages/lib-shim-v2-0.0.1-6.oe2203sp2.x86_64.rpm;name=x86 \ - http://repo.openeuler.org/openEuler-22.03-LTS-SP2/everything/aarch64/Packages/lib-shim-v2-devel-0.0.1-6.oe2203sp2.aarch64.rpm;name=header \ + http://repo.openeuler.openatom.cn/openEuler-22.03-LTS-SP2/OS/aarch64/Packages/lib-shim-v2-0.0.1-6.oe2203sp2.aarch64.rpm;name=arm64 \ + http://repo.openeuler.openatom.cn/openEuler-22.03-LTS-SP2/OS/x86_64/Packages/lib-shim-v2-0.0.1-6.oe2203sp2.x86_64.rpm;name=x86 \ + http://repo.openeuler.openatom.cn/openEuler-22.03-LTS-SP2/everything/aarch64/Packages/lib-shim-v2-devel-0.0.1-6.oe2203sp2.aarch64.rpm;name=header \ " S = "${WORKDIR}/repack" @@ -54,4 +54,3 @@ FILES:${PN}-dev = " \ " INSANE_SKIP:${PN} += "already-stripped" - diff --git a/meta-openeuler/recipes-devtools/dnf/files/aarch64/openEuler.repo b/meta-openeuler/recipes-devtools/dnf/files/aarch64/openEuler.repo index 41b2e4784a3..391f0efd25a 100644 --- a/meta-openeuler/recipes-devtools/dnf/files/aarch64/openEuler.repo +++ b/meta-openeuler/recipes-devtools/dnf/files/aarch64/openEuler.repo @@ -9,42 +9,42 @@ [OS] name=OS -baseurl=http://repo.openeuler.org/OPENEULER_VER/OS/$basearch/ +baseurl=http://repo.openeuler.openatom.cn/OPENEULER_VER/OS/$basearch/ enabled=1 gpgcheck=1 -gpgkey=http://repo.openeuler.org/OPENEULER_VER/OS/$basearch/RPM-GPG-KEY-openEuler +gpgkey=http://repo.openeuler.openatom.cn/OPENEULER_VER/OS/$basearch/RPM-GPG-KEY-openEuler [everything] name=everything -baseurl=http://repo.openeuler.org/OPENEULER_VER/everything/$basearch/ +baseurl=http://repo.openeuler.openatom.cn/OPENEULER_VER/everything/$basearch/ enabled=1 gpgcheck=1 -gpgkey=http://repo.openeuler.org/OPENEULER_VER/everything/$basearch/RPM-GPG-KEY-openEuler +gpgkey=http://repo.openeuler.openatom.cn/OPENEULER_VER/everything/$basearch/RPM-GPG-KEY-openEuler [EPOL] name=EPOL -baseurl=http://repo.openeuler.org/OPENEULER_VER/EPOL/main/$basearch/ +baseurl=http://repo.openeuler.openatom.cn/OPENEULER_VER/EPOL/main/$basearch/ enabled=1 gpgcheck=1 -gpgkey=http://repo.openeuler.org/OPENEULER_VER/OS/$basearch/RPM-GPG-KEY-openEuler +gpgkey=http://repo.openeuler.openatom.cn/OPENEULER_VER/OS/$basearch/RPM-GPG-KEY-openEuler [debuginfo] name=debuginfo -baseurl=http://repo.openeuler.org/OPENEULER_VER/debuginfo/$basearch/ +baseurl=http://repo.openeuler.openatom.cn/OPENEULER_VER/debuginfo/$basearch/ enabled=1 gpgcheck=1 -gpgkey=http://repo.openeuler.org/OPENEULER_VER/debuginfo/$basearch/RPM-GPG-KEY-openEuler +gpgkey=http://repo.openeuler.openatom.cn/OPENEULER_VER/debuginfo/$basearch/RPM-GPG-KEY-openEuler [source] name=source -baseurl=http://repo.openeuler.org/OPENEULER_VER/source/ +baseurl=http://repo.openeuler.openatom.cn/OPENEULER_VER/source/ enabled=1 gpgcheck=1 -gpgkey=http://repo.openeuler.org/OPENEULER_VER/source/RPM-GPG-KEY-openEuler +gpgkey=http://repo.openeuler.openatom.cn/OPENEULER_VER/source/RPM-GPG-KEY-openEuler [update] name=update -baseurl=http://repo.openeuler.org/OPENEULER_VER/update/$basearch/ +baseurl=http://repo.openeuler.openatom.cn/OPENEULER_VER/update/$basearch/ enabled=1 gpgcheck=1 -gpgkey=http://repo.openeuler.org/OPENEULER_VER/OS/$basearch/RPM-GPG-KEY-openEuler +gpgkey=http://repo.openeuler.openatom.cn/OPENEULER_VER/OS/$basearch/RPM-GPG-KEY-openEuler -- Gitee From 20fad57cf1aee76d5a46264f145ec9c41551a1c6 Mon Sep 17 00:00:00 2001 From: emancipator Date: Tue, 10 Oct 2023 13:52:21 +0800 Subject: [PATCH 07/11] rockchip: fix patch bug introduce by meta-rockchip * remove patch in systemd since it already fixed Signed-off-by: liangqifeng --- .../rockchip/recipes-core/systemd/systemd_%.bbappend | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 bsp/meta-openeuler-bsp/rockchip/recipes-core/systemd/systemd_%.bbappend diff --git a/bsp/meta-openeuler-bsp/rockchip/recipes-core/systemd/systemd_%.bbappend b/bsp/meta-openeuler-bsp/rockchip/recipes-core/systemd/systemd_%.bbappend new file mode 100644 index 00000000000..0a8af110253 --- /dev/null +++ b/bsp/meta-openeuler-bsp/rockchip/recipes-core/systemd/systemd_%.bbappend @@ -0,0 +1,3 @@ +SRC_URI:remove = " \ + file://0001-basic-Allow-unknown-filesystems.patch \ +" -- Gitee From 07c804518719d753e0287306a236de84865af6be Mon Sep 17 00:00:00 2001 From: saarloos <9090-90-90-9090@163.com> Date: Tue, 20 Jun 2023 00:29:56 +0800 Subject: [PATCH 08/11] doc: add x86 sdk depend, add rt of x86 grub.cfg info add x86 sdk depend, add rt of x86 grub.cfg info Signed-off-by: saarloos <9090-90-90-9090@163.com> --- docs/source/features/preempt_rt.rst | 2 ++ docs/source/getting_started/index.rst | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/source/features/preempt_rt.rst b/docs/source/features/preempt_rt.rst index 956e17ef4b8..92531ad2acb 100644 --- a/docs/source/features/preempt_rt.rst +++ b/docs/source/features/preempt_rt.rst @@ -246,3 +246,5 @@ ____ menuentry 'boot'{ linux /bzImage root=PARTUUID=eaecae14-7021-4551-9183-29b0d210222f rw quiet } + + 如果没有``/run/media/sda1/efi/boot/grub.cfg``可以使用``fdisk -l``查看磁盘情况，使用``mount``自行挂载。 diff --git a/docs/source/getting_started/index.rst b/docs/source/getting_started/index.rst index 16e067b5e2b..d42e2f43479 100644 --- a/docs/source/getting_started/index.rst +++ b/docs/source/getting_started/index.rst @@ -184,15 +184,15 @@ openEuler Embedded提供了SDK自解压安装包，包含了应用程序开发 .. tab:: openEuler - $ sudo yum install make gcc g++ flex bison gmp-devel libmpc-devel openssl-devel + $ sudo yum install make gcc g++ flex bison gmp-devel libmpc-devel openssl-devel elfutils-libelf-devel .. tab:: Ubuntu - $ sudo apt-get install make gcc g++ flex bison libgmp3-dev libmpc-dev libssl-dev + $ sudo apt-get install make gcc g++ flex bison libgmp3-dev libmpc-dev libssl-dev libelf-dev .. tab:: SUSELeap15.4 - $ sudo zypper in gcc gcc-c++ make bison gmp-devel libmpc3 openssl cmake flex + $ sudo zypper in gcc gcc-c++ make bison gmp-devel libmpc3 openssl cmake flex libelf-devel - **执行SDK自解压安装脚本** -- Gitee From 85318fa40cbc4e21c85f9f1d64d30226cdc0e22c Mon Sep 17 00:00:00 2001 From: yykk Date: Mon, 9 Oct 2023 18:03:56 +0800 Subject: [PATCH 09/11] docs: modifying application guide of dsoftbus-3.2 Use the correct image download link Signed-off-by: yukaii --- docs/source/features/distributed_softbus.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/source/features/distributed_softbus.rst b/docs/source/features/distributed_softbus.rst index 4761e63c8a3..6aa81878c8f 100644 --- a/docs/source/features/distributed_softbus.rst +++ b/docs/source/features/distributed_softbus.rst @@ -1043,7 +1043,7 @@ hichain的客户端API头文件在嵌入式版本提供的sdk中对外开放， 基于isula的软总线应用指南 ************************* -在嵌入式23.09版本中，利用isula，制作了预装3.2版本软总线容器镜像，可以在嵌入式环境中通过几行命令就可以完成软总线复杂依赖的安装部署，以及与嵌入式、服务器设备的通信测试。此版本软总线使用binder作为IPC底层驱动，在树莓派静默无业务场景下，资源占用由原来的CPU单核80%降低到1%，并且为支持上层的分布式数据模块的拓展打下了基础。 +嵌入式23.09版本中，利用isula，制作了预装3.2版本软总线容器镜像。在嵌入式环境中通过几行命令就可以安装软总线及其复杂依赖，并完成设备间通信测试。此版本软总线使用binder作为IPC底层驱动，在树莓派静默无业务场景下，资源占用由原来的CPU单核80%降低到1%，并且为支持上层的分布式数据模块的拓展打下了基础。 .. note:: @@ -1064,7 +1064,7 @@ hichain的客户端API头文件在嵌入式版本提供的sdk中对外开放， .. code-block:: console - http://repo.openeuler.org/openEuler-23.09/embedded_img/aarch64/raspberrypi4-64-systemd/openeuler-image-raspberrypi4-64-20230921165629.rootfs.rpi-sdimg + https://repo.openeuler.org/openEuler-23.09/embedded_img/aarch64/raspberrypi4-64-systemd/openeuler-image-raspberrypi4-64-20230927180859.rootfs.rpi-sdimg 参考: @@ -1097,13 +1097,13 @@ hichain的客户端API头文件在嵌入式版本提供的sdk中对外开放， .. code-block:: console - cd /home; wget http://repo.openeuler.org/openEuler-23.09/embedded_img/dsoftbus_isula_image/softbus.xz + cd /home; wget https://repo.openeuler.org/openEuler-23.09/embedded_img/isula_img/openEuler-23.09-isula-softbus.aarch64.xz 6.使用isula加载软总线镜像 .. code-block:: console - isula import /home/softbus.xz softbus + isula import /home/openEuler-23.09-isula-softbus.aarch64.xz softbus 7.查看加载的镜像ID @@ -1120,7 +1120,7 @@ hichain的客户端API头文件在嵌入式版本提供的sdk中对外开放， 容器中启动并测试软总线 ---------------------- -以下操作均在宿主机执行 +以下操作均在容器中执行 1.在容器中写SN号，注意此SN号是本设备标识，需要与其他设备不一致，建议使用本机IP -- Gitee From c35638203cedf48852cf2c94c143ba46101b2871 Mon Sep 17 00:00:00 2001 From: alichinese Date: Wed, 11 Oct 2023 17:34:21 +0800 Subject: [PATCH 10/11] workflows: add gate jenkinsfile * The jenkinsfile is adapted to the gate system's operation. In the future, the gate system will run directly through a jenkinsfile, with jenkins directly parsing the jenkinsfile to run the gate system. Signed-off-by: alichinese --- .oebuild/workflows/jenkinsfile_gate | 457 ++++++++++++++++++++++++++++ 1 file changed, 457 insertions(+) create mode 100644 .oebuild/workflows/jenkinsfile_gate diff --git a/.oebuild/workflows/jenkinsfile_gate b/.oebuild/workflows/jenkinsfile_gate new file mode 100644 index 00000000000..ad8872c9b17 --- /dev/null +++ b/.oebuild/workflows/jenkinsfile_gate @@ -0,0 +1,457 @@ +def downloadEmbeddedCI(){ + sh 'rm -rf embedded-ci' + sh "git clone ${embeddedRemote} -b ${embeddedBranch} -v embedded-ci --depth=1" +} + +def downloadYoctoWithPr(String workspace, String namespace, String repo, Integer prnum, Integer deepth){ + sh """ + python3 main.py clone_repo \ + -w ${workspace} \ + -r https://gitee.com/${namespace}/${repo} \ + -p ${repo} \ + -pr ${prnum} \ + -dp ${deepth} + """ +} + +def formatRes(String name, String action, String check_res, String log_path){ + return sh (script: """ + python3 main.py serial \ + -c name=$name \ + -c action=$action \ + -c result=$check_res \ + -c log_path=$log_path + """, returnStdout: true).trim() +} + +def getRandomStr(){ + return sh(script: """ + cat /proc/sys/kernel/random/uuid + """, returnStdout: true).trim() +} + +def mkdirOpeneulerLog(){ + def logdir = "openeuler/log" + sh "mkdir -p $logdir" + return logdir +} + +def STAGES_RES = [] + +pipeline { + agent { node "${node}" } + environment { + PATH = "/home/jenkins/.local/bin:${env.PATH}" + } + stages { + stage("clone embedded-ci"){ + steps{ + dir('/home/jenkins/agent'){ + script{ + downloadEmbeddedCI() + } + } + } + } + stage("pre") { + steps { + dir('/home/jenkins/agent/embedded-ci'){ + script{ + withCredentials([ + string(credentialsId: "${giteeId}", variable: 'GITEETOKEN'), + usernamePassword(credentialsId: "${jenkinsId}", usernameVariable: 'JUSER',passwordVariable: 'JPASSWD')]){ + // 执行pre + sh """ + python3 main.py pre \ + -s /home/jenkins/ccache/openeuler_embedded \ + -o $giteeTargetNamespace \ + -p $giteeRepoName \ + -pr $giteePullRequestid \ + -juser $JUSER \ + -jpwd $JPASSWD \ + -gt $GITEETOKEN + """ + // 执行pr_check + env.pr_check_result = sh (script: """ + python3 main.py pr_check \ + -o $giteeTargetNamespace \ + -p $giteeRepoName \ + -pr $giteePullRequestid \ + -gt $GITEETOKEN + """, returnStdout: true).trim() + } + } + } + } + } + stage("check task"){ + parallel { + stage("check commit"){ + agent { node "${node}" } + steps { + dir('/home/jenkins/agent'){ + script{ + downloadEmbeddedCI() + } + } + dir('/home/jenkins/agent/embedded-ci'){ + script{ + // 下载yocto源码 + downloadYoctoWithPr("/home/jenkins/agent", giteeTargetNamespace, giteeRepoName, Integer.parseInt(giteePullRequestid), Integer.parseInt(commitCount)) + def randomStr = getRandomStr() + def logDir = mkdirOpeneulerLog() + // 执行commit检查 + def task_res_code = sh (script: """ + python3 main.py codecheck \ + -c /home/jenkins/agent/yocto-meta-openeuler \ + -target commit_msg \ + -o $giteeTargetNamespace \ + -p $giteeRepoName \ + -pr $giteePullRequestid > ${logDir}/${randomStr}.log + """, returnStatus: true) + def check_res = "" + if (task_res_code == 0){ + check_res = "success" + }else{ + check_res = "failed" + } + // 对检查赋值 + // env.task_check_commit = formatRes("check", "commit_check", check_res, "xxx") + archiveArtifacts "${logDir}/*.log" + STAGES_RES.push(formatRes("check", "commit_check", check_res, "artifact/${logDir}/${randomStr}.log")) + } + } + } + } + stage("check scope"){ + agent { node "${node}" } + steps { + dir('/home/jenkins/agent'){ + script{ + downloadEmbeddedCI() + } + } + dir('/home/jenkins/agent/embedded-ci'){ + script{ + // 执行scope检查 + // 下载yocto源码 + downloadYoctoWithPr("/home/jenkins/agent", giteeTargetNamespace, giteeRepoName, Integer.parseInt(giteePullRequestid), 1) + def randomStr = getRandomStr() + def logDir = mkdirOpeneulerLog() + // 执行commit检查 + def task_res_code = sh (script: """ + python3 main.py codecheck \ + -c /home/jenkins/agent/yocto-meta-openeuler \ + -target commit_scope \ + -o $giteeTargetNamespace \ + -p $giteeRepoName \ + -pr $giteePullRequestid > ${logDir}/${randomStr}.log + """, returnStatus: true) + def check_res = "" + if (task_res_code == 0){ + check_res = "success" + }else{ + check_res = "failed" + } + // 对检查赋值 + // env.task_check_scope = formatRes("check", "scope_check", check_res, "xxx") + archiveArtifacts "${logDir}/*.log" + STAGES_RES.push(formatRes("check", "scope_check", check_res, "artifact/${logDir}/${randomStr}.log")) + } + } + } + } + stage("docs"){ + agent { node "${node}" } + when { + expression { + return env.pr_check_result.contains("docs") + } + } + steps{ + dir('/home/jenkins/agent'){ + script{ + downloadEmbeddedCI() + } + } + dir('/home/jenkins/agent/embedded-ci'){ + script{ + // 执行docs编译 + // 下载yocto源码 + downloadYoctoWithPr("/home/jenkins/agent", giteeTargetNamespace, giteeRepoName, Integer.parseInt(giteePullRequestid), 1) + def randomStr = getRandomStr() + def logDir = mkdirOpeneulerLog() + // 执行文档编译检查 + def task_res_code = sh (script: """ + python3 main.py build \ + -c /home/jenkins/agent/yocto-meta-openeuler \ + -target openeuler_doc > ${logDir}/${randomStr}.log + """, returnStatus: true) + def check_res = "" + if (task_res_code == 0){ + check_res = "success" + }else{ + check_res = "failed" + } + // 对检查赋值 + // env.task_build_docs = formatRes("docs", "build", check_res, "xxx") + archiveArtifacts "${logDir}/*.log" + STAGES_RES.push(formatRes("docs", "build", check_res, "artifact/${logDir}/${randomStr}.log")) + } + } + } + } + stage("qemu_aarch64"){ + agent { node "${node}" } + when { + expression { + return env.pr_check_result.contains("code") + } + } + steps { + dir('/home/jenkins/agent'){ + script{ + downloadEmbeddedCI() + } + } + dir('/home/jenkins/agent/embedded-ci'){ + script{ + // 执行qemu_aarch64编译 + // 下载yocto源码 + downloadYoctoWithPr("/home/jenkins/agent", giteeTargetNamespace, giteeRepoName, Integer.parseInt(giteePullRequestid), 1) + def randomStr = getRandomStr() + def logDir = mkdirOpeneulerLog() + // 执行镜像编译检查 + def task_res_code = sh (script: """ + python3 main.py build \ + -c /home/jenkins/agent/yocto-meta-openeuler \ + -target openeuler_image \ + -a aarch64 \ + -t /usr1/openeuler/gcc/openeuler_gcc_arm64le \ + -p qemu-aarch64 \ + -i openeuler-image \ + -d qemu-aarch64 > ${logDir}/${randomStr}.log + """, returnStatus: true) + + def check_res = "" + if (task_res_code == 0){ + check_res = "success" + }else{ + check_res = "failed" + } + // 对检查赋值 + archiveArtifacts "${logDir}/*.log" + STAGES_RES.push(formatRes("qemu_aarch64", "build", check_res, "artifact/${logDir}/${randomStr}.log")) + } + } + } + } + stage("qemu_aarch64_tiny"){ + agent { node "${node}" } + when { + expression { + return env.pr_check_result.contains("code") + } + } + steps { + dir('/home/jenkins/agent'){ + script{ + downloadEmbeddedCI() + } + } + dir('/home/jenkins/agent/embedded-ci'){ + script{ + // 执行qemu_aarch64编译 + // 下载yocto源码 + downloadYoctoWithPr("/home/jenkins/agent", giteeTargetNamespace, giteeRepoName, Integer.parseInt(giteePullRequestid), 1) + def randomStr = getRandomStr() + def logDir = mkdirOpeneulerLog() + // 执行镜像编译检查 + def task_res_code = sh (script: """ + python3 main.py build \ + -c /home/jenkins/agent/yocto-meta-openeuler \ + -target openeuler_image \ + -a aarch64 \ + -t /usr1/openeuler/gcc/openeuler_gcc_arm64le \ + -p qemu-aarch64 \ + -i openeuler-image-tiny \ + -d qemu-aarch64-tiny > ${logDir}/${randomStr}.log + """, returnStatus: true) + + def check_res = "" + if (task_res_code == 0){ + check_res = "success" + }else{ + check_res = "failed" + } + // 对检查赋值 + archiveArtifacts "${logDir}/*.log" + STAGES_RES.push(formatRes("qemu_aarch64_tiny", "build", check_res, "artifact/${logDir}/${randomStr}.log")) + } + } + } + } + stage("qemu_arm"){ + agent { node "${node}" } + when { + expression { + return env.pr_check_result.contains("code") + } + } + steps { + dir('/home/jenkins/agent'){ + script{ + downloadEmbeddedCI() + } + } + dir('/home/jenkins/agent/embedded-ci'){ + script{ + // 执行qemu_arm编译 + // 下载yocto源码 + downloadYoctoWithPr("/home/jenkins/agent", giteeTargetNamespace, giteeRepoName, Integer.parseInt(giteePullRequestid), 1) + def randomStr = getRandomStr() + def logDir = mkdirOpeneulerLog() + // 执行镜像编译检查 + def task_res_code = sh (script: """ + python3 main.py build \ + -c /home/jenkins/agent/yocto-meta-openeuler \ + -target openeuler_image \ + -a arm \ + -t /usr1/openeuler/gcc/openeuler_gcc_arm32le \ + -p qemu-arm \ + -i openeuler-image \ + -d qemu-arm > ${logDir}/${randomStr}.log + """, returnStatus: true) + + def check_res = "" + if (task_res_code == 0){ + check_res = "success" + }else{ + check_res = "failed" + } + // 对检查赋值 + archiveArtifacts "${logDir}/*.log" + STAGES_RES.push(formatRes("qemu_arm", "build", check_res, "artifact/${logDir}/${randomStr}.log")) + } + } + } + } + stage("qemu_x86"){ + agent { node "${node}" } + when { + expression { + return env.pr_check_result.contains("code") + } + } + steps { + dir('/home/jenkins/agent'){ + script{ + downloadEmbeddedCI() + } + } + dir('/home/jenkins/agent/embedded-ci'){ + script{ + // 执行qemu_arm编译 + // 下载yocto源码 + def randomStr = getRandomStr() + def logDir = mkdirOpeneulerLog() + downloadYoctoWithPr("/home/jenkins/agent", giteeTargetNamespace, giteeRepoName, Integer.parseInt(giteePullRequestid), 1) + // 执行镜像编译检查 + def task_res_code = sh (script: """ + python3 main.py build \ + -c /home/jenkins/agent/yocto-meta-openeuler \ + -target openeuler_image \ + -a x86_64 \ + -t /usr1/openeuler/gcc/openeuler_gcc_x86_64 \ + -p x86-64 \ + -i openeuler-image \ + -d qemu-x86-64 > ${logDir}/${randomStr}.log + """, returnStatus: true) + + def check_res = "" + if (task_res_code == 0){ + check_res = "success" + }else{ + check_res = "failed" + } + // 对检查赋值 + archiveArtifacts "${logDir}/*.log" + STAGES_RES.push(formatRes("qemu_x86", "build", check_res, "artifact/${logDir}/${randomStr}.log")) + } + } + } + } + stage("qemu_riscv64"){ + agent { node "${node}" } + when { + expression { + return env.pr_check_result.contains("code") + } + } + steps { + dir('/home/jenkins/agent'){ + script{ + downloadEmbeddedCI() + } + } + dir('/home/jenkins/agent/embedded-ci'){ + script{ + // 执行qemu_arm编译 + // 下载yocto源码 + def randomStr = getRandomStr() + def logDir = mkdirOpeneulerLog() + downloadYoctoWithPr("/home/jenkins/agent", giteeTargetNamespace, giteeRepoName, Integer.parseInt(giteePullRequestid), 1) + // 执行镜像编译检查 + def task_res_code = sh (script: """ + python3 main.py build \ + -c /home/jenkins/agent/yocto-meta-openeuler \ + -target openeuler_image \ + -a riscv64 \ + -t /usr1/openeuler/gcc/openeuler_gcc_riscv64 \ + -p qemu-riscv64 \ + -i openeuler-image \ + -d qemu-riscv64 > ${logDir}/${randomStr}.log + """, returnStatus: true) + + def check_res = "" + if (task_res_code == 0){ + check_res = "success" + }else{ + check_res = "failed" + } + // 对检查赋值 + archiveArtifacts "${logDir}/*.log" + STAGES_RES.push(formatRes("qemu_riscv64", "build", check_res, "artifact/${logDir}/${randomStr}.log")) + } + } + } + } + } + } + } + post { + always { + dir('/home/jenkins/agent/embedded-ci'){ + script{ + withCredentials([ + string(credentialsId: "${giteeId}", variable: 'GITEETOKEN'), + usernamePassword(credentialsId: "${jenkinsId}", usernameVariable: 'JUSER',passwordVariable: 'JPASSWD')]){ + def chks = "" + for (int i = 0; i < STAGES_RES.size(); ++i) { + chks = "${chks} -chk ${STAGES_RES[i]}" + } + sh """ + python3 main.py comment \ + -m gate \ + -o $giteeTargetNamespace \ + -p $giteeRepoName \ + -pr $giteePullRequestid \ + -gt $GITEETOKEN \ + $chks + """ + } + } + } + } + } +} -- Gitee From b2de740014a0318580ff728570962fb4ac410d3a Mon Sep 17 00:00:00 2001 From: alichinese Date: Sat, 14 Oct 2023 18:03:20 +0800 Subject: [PATCH 11/11] docs: updated the introduction of openeuler_fetch * The documentation for openeuler_fetch has been updated accordingly after optimization. Signed-off-by: lixinyu --- .../infrastructure/openeuler_fetch/index.rst | 57 ++++--------------- 1 file changed, 12 insertions(+), 45 deletions(-) diff --git a/docs/source/infrastructure/openeuler_fetch/index.rst b/docs/source/infrastructure/openeuler_fetch/index.rst index e2bb6e05d71..e72d796ecba 100644 --- a/docs/source/infrastructure/openeuler_fetch/index.rst +++ b/docs/source/infrastructure/openeuler_fetch/index.rst @@ -19,40 +19,22 @@ openeuler_fetch运行逻辑 openeuler_fetch通过以下控制变量来完成相关包下载： - - OPENEULER_GIT_URL: 远程仓库前缀，默认值为https://gitee.com/src-openeuler，该变量在.oebuild/local.conf.sample中设置，全局生效，也可以在bb或bbappend文件中设置使之局部生效 - - - OPENEULER_BRANCH: 软件包分支，在下载软件包时会通过该变量指定分支名称，该变量在.oebuild/local.conf.sample中设置，全局生效，也可以在bb或bbappend文件中设置使之局部生效 - - OPENEULER_REPO_NAME: 软件包名，该名一般和构建包名一致，但在特殊情况下需要改动，例如构建libtool-cross时，构建包名为libtool-cross，因此默认OPENEULER_REPO_NAME为libtool-cross，但是依赖包路径是libtool，则需要将OPENEULER_REPO_NAME改为libtool - OPENEULER_LOCAL_NAME: 软件包本地名称，即软件包在本地路径名称，一般该变量如果不设置则在系统处理时默认和OPENEULER_REPO_NAME一样，该变量意在解决软件包名和本地存储路径不一致问题 - - OPENEULER_SRC_URI_REMOVE: SRC_URI过滤变量，设置该变量可以在bitbake执行fetch之前移除设定的相关uri文件路径，该变量通过前缀进行匹配，例如设定OPENEULER_SRC_URI_REMOVE="https git"，则openeuler_fetch在处理时遇到以https和git开头的uri则会去除 - -整体openeuler_fetch下载就是依靠以上相关变量完成，由以上变量最终组成git下载参数： - - - remote: 默认为https://gitee.com/src-openeuler/xxx，由OPENEULER_GIT_URL/OPENEULER_REPO_NAME组成 - - - branch: 默认为OPENEULER_BRANCH - -依据remote和branch，openeuler_fetch完成下载 - -openeuler_fetch 运行原理图如下： - .. image:: ../../../image/infrastructure/openeuler_fetch_process.png - -repo_init 运行原理图如下： - .. image:: ../../../image/infrastructure/openeuler_fetch_repo_init.png +整体openeuler_fetch下载就是依靠以上相关变量确定下载的包信息，而获取下载包的信息是在openEuler Embedded的基线文件中记录的，该文件目录为.oebuild/manifest.yaml，如果在基线文件中能命中该包信息，则会进行下载，否则不做任何操作。基线文件中的包信息包含该包的version，因此在命中该包后会根据version来确定该包的版本，并且为了更快的完成下载任务，我们尽可能的减少下载的代码量，因此openeuler_fetch在下载代码时其深度设定为1。在对该包的匹配过程中，如果本地可以检出该包的version，则直接切换包版本，否则进行fetch操作，然后再进行包版本检出。 如何适配其他软件包 *************************** -在构建openEuler Embedded时经常会引入其他相关包或修改非指定包版本，那么此时该如何做呢？从上文中已经得知openeuler_fetch依赖5个变量来进行下载，内核是例外，因此我们只需要关注这五个变量即可，接下来我们以busybox为例进行讲解： +在构建openEuler Embedded时经常会引入其他相关包或修改非指定包版本，那么此时该如何做呢？直接修改基线文件即可，内核是例外，接下来我们以busybox为例进行讲解： -- 如果想要某一个版本的busybox参与构建：在busybox的bbappend文件中设定OPENEULER_BRANCH值为相关版本即可 +- 如果想要某一个版本的busybox参与构建：在manifest.yaml中将busybox的version进行修改即可 -- 如果想要使用自有仓库的busybox参与构建：在busybox的bbappend文件中设定OPENEULER_GIT_URL为自有空间即可，注意：如果busybox已经下载在本地，则需要手动删除，然后再执行构建 +- 如果想要使用自有仓库的busybox参与构建：在manifest.yaml中将remote_url修改为自有仓库的链接即可 -- 如果需要其他代码仓的busybox参与构建，则修改OPENEULER_GIT_URL为其他平台仓域名即可，例如https://github.com/xxx +- 如果需要其他代码仓的busybox参与构建：同理，直接在manifest.yaml中修改对应的busybox中remote_url即可 - 另外，当构建busybox时需要的依赖并不会是某一款特定包，即不能直接通过depends添加依赖，而仅仅是需要某个路径下的文件，此时需要在bbappend中添加do_fetch:prepend，在该函数中添加需要依赖的包，例如： @@ -60,34 +42,19 @@ repo_init 运行原理图如下： python do_fetch:prepend() { - repoList = [{ - "repo_name": "yocto-embedded-tools", - "git_url": "https://gitee.com/openeuler", - "branch": "master" - },{ - "repo_name": "libboundscheck", - "git_url": "https://gitee.com/openeuler", - "branch": "openEuler-22.09" - },{ - "repo_name": "dsoftbus_standard", - "git_url": "https://gitee.com/openeuler", - "branch": "v3.1" - },{ - "repo_name": "embedded-ipc", - "git_url": "https://gitee.com/openeuler", - "branch": "master" - }] + repoList = [ + "yocto-embedded-tools", + "libboundscheck", + "dsoftbus_standard", + "embedded-ipc" + ] d.setVar("PKG_REPO_LIST", repoList) dd.build.exec_func("do_openeuler_fetchs", d) } -通过repoList设置好需要依赖的包，包结构格式不可更改，PKG_REPO_LIST变量的设定是为在do_openeuler_fetchs中获取依赖的包列表，do_openeuler_fetchs将依次解析PKG_REPO_LIST，并调用do_openeuler_fetch完成相关包的下载。 - -- 如果想要下载的busybox包在本地用其他路径，比如busyboyy，则在busybox的bb文件或bbappend文件设定OPENEULER_LOCAL_NAME="busyboyy"，当clone busybox时本地路径会变成busyboyy。注意,如果本地已经有busybox，但是依然设置了OPENEULER_LOCAL_NAME，那么原本地仓将不会做任何操作，openeuler_fetch将直接新建一个busyboyy - -- 如果在编译busybox中所依赖的某些文件不想要，想统一去除，则可以在bb文件或bbappend文件中设定OPENEULER_SRC_URI_REMOVE变量，比如busybox的SRC_URI中有https或git开头的文件路径，但是我们想自己下载而不需要系统默认设定的，则可以设置OPENEULER_SRC_URI_REMOVE="https git"，这样openeuler_fetch在处理时就会去除以https和git开头的文件 +通过repoList设置好需要依赖的包，同时列表中的包需要在manifest.yaml中有相关信息的记录，以以上的列表为例，我们需要在manifest.yaml中有关于yocto-embedded-tools的包信息，否则不会有任何下载功能，PKG_REPO_LIST变量的设定是为在do_openeuler_fetchs中获取依赖的包列表，do_openeuler_fetchs将依次解析PKG_REPO_LIST，并调用do_openeuler_fetch完成相关包的下载。 如何关闭openeuler_fetch功能 *************************** -- Gitee