diff --git a/.oebuild/workflows/ci.yaml b/.oebuild/workflows/ci.yaml index ad2ad1ce87cb0525ba5a18f046838a29b13f5797..fa9dac371bd36cbd0b1c17d434ad774be322a794 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 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 0000000000000000000000000000000000000000..c3e09aba3499704e3faa327da6f265a25a82c8e8 --- /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() 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 010f7501579490dbce8fea9010f3b9a43af99b97..1a4f3d2e766b22bfebf49709b50b54b87743b641 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 diff --git a/docs/source/bsp/arm32/index.rst b/docs/source/bsp/arm32/index.rst deleted file mode 100644 index 3371553099b7bd63325685edaaa72a20a6f485fa..0000000000000000000000000000000000000000 --- 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 0e45c83ea399e3bcf6ba035b8e96d9864bc0a04a..0000000000000000000000000000000000000000 --- 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 cf2bdb22785b8a57f3747c9a125519cc3e7083d3..0000000000000000000000000000000000000000 --- 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 diff --git a/meta-openeuler/classes/openeuler.bbclass b/meta-openeuler/classes/openeuler.bbclass index 5ef65ae435b3472dac1726f4f65d7e520e4b5f2f..81812a82d2b19b51d5b99866b9dd91bd34c3ff19 100644 --- a/meta-openeuler/classes/openeuler.bbclass +++ b/meta-openeuler/classes/openeuler.bbclass @@ -223,11 +223,15 @@ def download_repo(repo_dir, repo_url ,version = None): remote_name = "upstream" remote = git.Remote.add(repo = repo, name = remote_name, url = repo_url) - remote.fetch(version, depth=1) # if repo is modified, restore it if repo.is_dirty(): repo.git.checkout(".") - repo.git.checkout(version) + + try: + repo.git.checkout(version) + except GitCommandError: + remote.fetch(version, depth=1) + repo.git.checkout(version) bb.utils.unlockfile(lf) 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 045c1fd22bf9b0091d88c7035b4e5496dda014c3..d830bfb33dfdaa3208561d607e83fa0701007970 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 41b2e4784a35f38cae0efe220b1e5bfbf075c157..391f0efd25a1fc4f6444507b4b213a332099da11 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