diff --git a/bsp/meta-openeuler-bsp/conf/machine/openeuler-raspberrypi4-64.conf b/bsp/meta-openeuler-bsp/conf/machine/openeuler-raspberrypi4-64.conf index 6715209142c3aece0cc4889c5c1897a739c86652..a8e8e4943ac6324564e496dabd7a462f21b7b611 100644 --- a/bsp/meta-openeuler-bsp/conf/machine/openeuler-raspberrypi4-64.conf +++ b/bsp/meta-openeuler-bsp/conf/machine/openeuler-raspberrypi4-64.conf @@ -8,3 +8,4 @@ ROOTFS_PACKAGE_ARCH = "aarch64" RPI_USE_U_BOOT = "0" KERNEL_IMAGETYPE_DIRECT = "Image" ENABLE_UART = "1" +CMDLINE_SERIAL = "console=tty1" diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/bootfiles/rpi-bootfiles.bbappend b/bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/bootfiles/rpi-bootfiles.bbappend index 75f469e85cb588dbe3ab353f4b7282d303dda50e..374d29fbcf26907430b3a3a23a042eeb2c47a34e 100644 --- a/bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/bootfiles/rpi-bootfiles.bbappend +++ b/bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/bootfiles/rpi-bootfiles.bbappend @@ -1,5 +1,5 @@ -SRC_URI = "file://raspberrypi-firmware/firmware-1.20210201.tar.gz \ +SRC_URI = "file://raspberrypi-firmware/firmware-1.20220308.tar.gz \ " -S = "${WORKDIR}/firmware-1.20210201/boot" +S = "${WORKDIR}/firmware-1.20220308/boot" #FILESEXTRAPATHS_prepend = "${OPENEULER_SP_DIR}/raspberrypi-firmware/:" diff --git a/docs/image/bsp/rasp_uefi.png b/docs/image/bsp/rasp_uefi.png new file mode 100644 index 0000000000000000000000000000000000000000..d526d39b301565035f46b07a6bc6e21a82a1ec5c Binary files /dev/null and b/docs/image/bsp/rasp_uefi.png differ diff --git a/docs/source/bsp/index.rst b/docs/source/bsp/index.rst new file mode 100644 index 0000000000000000000000000000000000000000..10dd5c2f450019c6a617f217ccb88a82e8c69502 --- /dev/null +++ b/docs/source/bsp/index.rst @@ -0,0 +1,11 @@ +.. _bsp: + +周边设备和硬件底层软件适配 +################################ + +本章介绍周边设备和底层软件适配openEuler Embedded的相关教程，具体内容如下： + +.. toctree:: + :maxdepth: 1 + + rasp_uefi.rst diff --git a/docs/source/bsp/rasp_uefi.rst b/docs/source/bsp/rasp_uefi.rst new file mode 100644 index 0000000000000000000000000000000000000000..1b475c6108a235862cede6d3b2b6430ee2d30624 --- /dev/null +++ b/docs/source/bsp/rasp_uefi.rst @@ -0,0 +1,228 @@ +.. _rasp_uefi: + +树莓派的UEFI支持和网络启动 +############################## + +本文档介绍如何让树莓派4B支持UEFI（UEFI第三方固件支持PCSI标准实现，混合部署的从核启停依赖此功能），并通过网络启动openEuler Embedded + +刷新固件使树莓派4B支持UEFI引导（混合部署依赖此固件的PCSI支持） +************************************************************************************************ + +环境/工具准备 +======================== + +编译工具链：可用openEuler Embedded的交叉编译工具链，参照 :ref:`快速上手/基于SDK的应用开发` 部分。 + +设备：建议树莓派4B的出厂配置，包括树莓派4B基础套件和SD卡 + +树莓派4B固件UEFI固件下载和刷新方法 +================================================ + +**1 下载树莓派官方固件** + +- `树莓派官方固件 `_ + + - 下载上述固件后解压，将boot目录下的内容，拷贝到SD卡（boot盘）根目录,删除kernel*.img文件: + + .. code-block:: console + + rm /xxx/firmware-master/boot/kernel*.img + cp -rf /xxx/firmware-master/boot/* SDbootVolumes/ + +**2 下载树莓派UEFI固件** + +- `树莓派UEFI固件(v1.32版本为例) `_ + + - 下载上述固件后解压，将所有文件拷贝到SD卡（boot盘）根目录（覆盖之前的文件）: + + .. code-block:: console + + cp -rf /xxx/RPi4_UEFI_Firmware_v1.32/* SDbootVolumes/ + + .. attention:: + + * 此UEFI版本的固件默认使用3G内存limit，可以在UEFI菜单中关闭3G limit，否则系统启动后你看到的内存只有3G【参考 `官方配置说明 `_ 】 + + * UEFI+ACPI部署方法，树莓派使用的内核必须支持ACPI特性 + +树莓派网络启动openEuler Embedded +************************************************ + +1 准备PXE部署服务器 +======================== + +以ubunutu 14.04为例，dhcp中指定的filename就是grup的efi引导文件名 + +假设服务器网段为192.168.10.x，服务器ip为192.168.10.1，网卡eth0用于dhcp服务，初始化服务器ip例： + + .. code-block:: console + + sudo ifconfig eth0 192.168.10.1 up + +2 使能DHCP服务 +======================== + +安装DHCP软件: + + .. code-block:: console + + sudo apt-get install isc-dhcp-server + +编辑/etc/dhcp/dhcpd.conf文件，内容示例： + + .. code-block:: console + + allow booting; + allow bootp; + option domain-name "example.org"; + default-lease-time 600; + max-lease-time 7200; + ddns-update-style none; + + subnet 192.168.10.0 netmask 255.255.255.0 { + range 192.168.10.100 192.168.10.200; + filename "mygrub.efi"; #默认下载的grub文件名，和3中制作的efi引导程序名字需匹配 + option routers 192.168.10.1; + next-server 192.168.10.1; #tftp服务器IP，PXE必须，HTTPBOOT可选 + option broadcast-address 192.168.10.255; + } + +配置DHCP服务网络接口,编辑文件/etc/default/isc-dhcp-server 增加/修改字段： + + .. code-block:: console + + INTERFACES=”eth0” #dhcp使用的网卡 + +启动DHCP服务: + + .. code-block:: console + + sudo /etc/init.d/isc-dhcp-server restart + +3 使能TFTP服务 +======================== + +安装TFTP服务器软件: + + .. code-block:: console + + sudo apt-get install tftpd-hpa + +配置TFTP服务，编辑/etc/default/tftpd-hpa 文件，示例内容如下: + + .. code-block:: console + + TFTP_USERNAME="tftp" + TFTP_ADDRESS=":69" + TFTP_DIRECTORY="/var/lib/tftpboot/" + TFTP_OPTIONS="--secure -l -c -s" + +启动TFTP服务: + + .. code-block:: console + + sudo /etc/init.d/tftpd-hpa restart + +4 grub准备（编译+制作grub启动组件） +================================================ + +**grub源码获取** + +下载地址：https://github.com/coreos/grub/releases/tag/grub-2.02 + +**grub组件编译** + +解压源码包并进入根目录，准备开始构建arm64-efi（交叉编译）的grub库，注意此时交叉编译工具已经配置完毕，按如下步骤执行: + + .. code-block:: console + + ./autogen.sh + ./configure --prefix=/xxx/grub-2.02/build --with-platform=efi --disable-werror --target=aarch64-openeuler-linux-gnu + make + +构建成功后，在当前目录会生成对应的二进制和grub组件依赖库，其中，grub-core即制作grub-efi需要的工具库，grub-mkimage即制作板子grub.efi引导的host-tool。 + +**制作引导程序** + +接下来制作板子引导grub程序，下例输出名为mygrub.efi： + + .. code-block:: console + + ./grub-mkimage -d ./grub-core -O arm64-efi -o mygrub.efi -p '' ls grub-core/*.mod | cut -d "." -f 1 + + .. note:: + + xxxxx目录中请不要带“.”，否则请适配上述语法。 + +**制作引导配置文件** + +最后，编辑grub.cfg配置文件，grub.cfg配置文件放在tftp的根目录（/var/lib/tftpboot/grub.cfg），grub.cfg示例内容如下（--- 后面是cmdline内容，linux gz压缩的内核，initrd文件系统）： + + .. code-block:: console + + insmod gzio + set timeout=0 + + menuentry 'Start OpenEuler' { + echo "openEuler test." + linux /Image.gz console=ttyAMA0,115200 + initrd /initrd.cpio.gz + } + + .. note:: + + console=ttyAMA0,115200 这里ttyAMA0是树莓派硬件串口，使用引脚14TXD和15RXD作为控制台，若有HDMI驱动，可另外指定console，比如console=tty1 + +附：openEuler/Embedded内核Image.gz和文件系统initrd的获取 +======================================================================== + +**文件系统例子** + +可使用openEuler Embedded发布的qemu-aarch64参考 `文件系统 `_ + + .. note:: + + 文件系统/etc/inittab的配置注意getty登录时串口重定向要使用ttyAMA0.（树莓派4硬件串口PL011对应，引脚14TXD和15RXD） + +**内核单独编译例子（openEuler）** + +参考： `openEuler树莓派交叉编译内核 `_ + + .. attention:: + + * 上述UEFI+ACPI部署方法，必须在config中开启ACPI系列功能支持。在make menuconfig ARCH=arm64菜单中，选中ACPI默认系列支持，经测试当前UEFI固件只能选ACPI启动，其他两项UEFI+DTB、DTB均未成功。 + + * 编译生成的Image，在上述grub.cfg的引导示例中，需使用gz命令压缩成Image.gz + +**操作说明** + +将上述内核和文件系统，放在tftp服务目录下（/var/lib/tftpboot）即可进行网络启动。 + +网络启动基本流程如下： + +a. DHCP服务器给单板分配IP + +b. 单板启动UEFI选择PXE启动 + +c. PXE根据DHCP的filename和tftp服务器地址，从tftp服务器下载mygrub.efi + +d. 进入grub引导程序，根据grub.cfg配置，从对应tftp目录下载文件系统和内核并加载启动 + +其中，使用的ACPI资源表/DTB是UEFI固件初始化好的（引导内核前已放在对应内存），不过cmdline/bootargs可通过grub.cfg进行配置，在加载内核时，grub会传递给UEFI并上报给系统。 + + .. figure:: ../../image/bsp/rasp_uefi.png + :align: center + +**参考链接** + +https://williamlam.com/2020/07/two-methods-to-network-boot-raspberry-pi-4.html + +https://blog.csdn.net/Lq19880521/article/details/118960749 + +https://en.opensuse.org/HCL:AArch64_EFI + +https://help-grub.gnu.narkive.com/GU2srFKH/building-grub-on-x86-64-for-aarch64-error + +https://www.cnblogs.com/varden/p/13954899.html + +https://shumeipai.nxez.com/raspberry-pi-pins-version-40 diff --git a/docs/source/index.rst b/docs/source/index.rst index fc9abbbaeed0bf0b08cb4728c8a90bd5dd922ec5..b05f8ff2eb9b8899ca9b6ca42f527b6195b5e064 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -26,6 +26,7 @@ openEuler Embedded在内核版本、软件包版本等代码层面会与openEule contribute_doc.rst security_hardening/index.rst releases/index.rst + bsp/index.rst 索引与表格 *********** diff --git a/meta-openeuler/recipes-core/cifs-utils/cifs-utils_6.14.bb b/meta-openeuler/recipes-core/cifs-utils/cifs-utils_6.14.bb index 053dae81a39bd410ff015e0a496593043fe6fba0..8caed2d36060d92f6b2203497aa8a864d6b2941a 100644 --- a/meta-openeuler/recipes-core/cifs-utils/cifs-utils_6.14.bb +++ b/meta-openeuler/recipes-core/cifs-utils/cifs-utils_6.14.bb @@ -27,8 +27,8 @@ do_install_append() { do_compile_prepend() { #fix open source compile error because of the dependency problem - cat Makefile | grep "@\$(MAKE) \$(AM_MAKEFLAGS) install-exec-am install-data-am" || return 1 - sed -i 's/^[[:space:]]@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am/\t\@\$(MAKE) \$(AM_MAKEFLAGS) install-data-am\n\t\@\$(MAKE) \$(AM_MAKEFLAGS) install-exec-am/g' Makefile + cat ${S}/Makefile.in | grep "@\$(MAKE) \$(AM_MAKEFLAGS) install-exec-am install-data-am" || return 1 + sed -i 's/^[[:space:]]@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am/\t\@\$(MAKE) \$(AM_MAKEFLAGS) install-data-am\n\t\@\$(MAKE) \$(AM_MAKEFLAGS) install-exec-am/g' ${S}/Makefile.in } FILES_${PN} += "${base_libdir}/security" diff --git a/meta-openeuler/recipes-core/iSulad/iSulad_2.0.12.bb b/meta-openeuler/recipes-core/iSulad/iSulad_2.0.13.bb similarity index 84% rename from meta-openeuler/recipes-core/iSulad/iSulad_2.0.12.bb rename to meta-openeuler/recipes-core/iSulad/iSulad_2.0.13.bb index ce2bc0e16efc746875158be06bdfbc4096438fff..11e7c40f3857fa29d5972ed35069f8a4388a165e 100644 --- a/meta-openeuler/recipes-core/iSulad/iSulad_2.0.12.bb +++ b/meta-openeuler/recipes-core/iSulad/iSulad_2.0.13.bb @@ -4,6 +4,9 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" SRC_URI = "file://iSulad/v${PV}.tar.gz \ + file://iSulad/0001-cleancode-http-request.patch \ + file://iSulad/0002-refactor-mount-parse-in-spec-module.patch \ + file://iSulad/0003-support-isula-wait-even-if-it-s-not-oci-image.patch \ " S = "${WORKDIR}/${BPN}-v${PV}" diff --git a/meta-openeuler/recipes-core/lcr/lcr_2.0.7.bb b/meta-openeuler/recipes-core/lcr/lcr_2.0.7.bb index 00dedc84583d2c491f7e31174cca4fa4adc31895..8867957363fbb8ff797843ebbe16737cc5ef1d1e 100644 --- a/meta-openeuler/recipes-core/lcr/lcr_2.0.7.bb +++ b/meta-openeuler/recipes-core/lcr/lcr_2.0.7.bb @@ -16,6 +16,8 @@ inherit cmake ### Build metadata SRC_URI = "file://lcr/v${PV}.tar.gz \ file://lcr/0001-parse-userns-remap-in-daemmon.json.patch \ + file://lcr/0002-add-rename-json-schema-for-rename-subcommand-in-rest.patch \ + file://lcr/0003-Add-restful-interface-isula-pull.patch \ " S = "${WORKDIR}/${BPN}-v${PV}" diff --git a/meta-openeuler/recipes-core/lvm2/lvm2_2.03.14.bb b/meta-openeuler/recipes-core/lvm2/lvm2_2.03.14.bb index b4f6609fc97bca0487fca545448ccd7082bbd334..06a805c1fc0962a37f2ea44f50c194d09331f401 100644 --- a/meta-openeuler/recipes-core/lvm2/lvm2_2.03.14.bb +++ b/meta-openeuler/recipes-core/lvm2/lvm2_2.03.14.bb @@ -1,7 +1,5 @@ require lvm2.inc -DEPENDS += "autoconf-archive-native" - MULTILIB_SCRIPTS = "${PN}:${sysconfdir}/lvm/lvm.conf" CACHED_CONFIGUREVARS += "MODPROBE_CMD=${base_sbindir}/modprobe" diff --git a/meta-openeuler/recipes-core/openssl/openssl.inc b/meta-openeuler/recipes-core/openssl/openssl.inc index a371265b860b137d498839b3717162b10e8fd9b3..3ad0b70c5ad60cd5989f9b5144fb2a44dbbbdaff 100644 --- a/meta-openeuler/recipes-core/openssl/openssl.inc +++ b/meta-openeuler/recipes-core/openssl/openssl.inc @@ -1,15 +1,4 @@ -SUMMARY = "Secure Socket Layer" -DESCRIPTION = "Secure Socket Layer (SSL) binary and related cryptographic tools." -HOMEPAGE = "http://www.openssl.org/" -BUGTRACKER = "http://www.openssl.org/news/vulnerabilities.html" -SECTION = "libs/network" - -# "openssl | SSLeay" dual license -LICENSE = "openssl" - DEPENDS = "perl-native-runtime nettle" -DEPENDS_append_class-target = " openssl-native" -#DEPENDS_append_class-target = " linux-libc-headers" SRC_URI = "file://openssl/${BP}.tar.gz \ file://openssl/openssl-1.1.1-build.patch \ @@ -26,8 +15,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d343e62fc9c833710bbbed25f27364c8" S = "${WORKDIR}/${BP}" -PACKAGECONFIG[perl] = ",,," - #AR_append = " r" # Avoid binaries being marked as requiring an executable stack since it # doesn't(which causes and this causes issues with SELinux @@ -43,24 +30,7 @@ export DIRS = "crypto ssl apps" export EX_LIBS = "-lgcc -ldl" export AS = "${CC} -c" -inherit pkgconfig siteinfo multilib_header ptest - -PACKAGES =+ "libcrypto libssl ${PN}-misc openssl-conf" -FILES_libcrypto = "${base_libdir}/libcrypto${SOLIBS}" -FILES_libssl = "${libdir}/libssl.so.*" -FILES_${PN} =+ " ${libdir}/ssl/*" -FILES_${PN}-misc = "${libdir}/ssl/misc ${bindir}/c_rehash" -RDEPENDS_${PN}-misc = "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" -FILES_${PN}-dev += "${base_libdir}/libcrypto${SOLIBSDEV}" - -# Add the openssl.cnf file to the openssl-conf package. Make the libcrypto -# package RRECOMMENDS on this package. This will enable the configuration -# file to be installed for both the base openssl package and the libcrypto -# package since the base openssl package depends on the libcrypto package. -FILES_openssl-conf = "${libdir}/ssl/openssl.cnf" -CONFFILES_openssl-conf = "${libdir}/ssl/openssl.cnf" -RRECOMMENDS_libcrypto += "openssl-conf" -RDEPENDS_${PN}-ptest += "${PN}-misc make perl perl-module-filehandle bc" +inherit pkgconfig siteinfo ptest # Remove this to enable SSLv3. SSLv3 is defaulted to disabled due to the POODLE # vulnerability @@ -70,101 +40,6 @@ do_configure_prepend_darwin () { sed -i -e '/version-script=openssl\.ld/d' Configure } -do_configure () { - cd util - perl perlpath.pl ${STAGING_BINDIR_NATIVE} - cd .. - ln -sf apps/openssl.pod crypto/crypto.pod ssl/ssl.pod doc/ - - os=${HOST_OS} - case $os in - linux-uclibc |\ - linux-uclibceabi |\ - linux-gnueabi |\ - linux-uclibcspe |\ - linux-gnuspe |\ - linux-musl*) - os=linux - ;; - *) - ;; - esac - if [ "${libdir}" != "/usr/libilp32" ]; then - target="$os-${HOST_ARCH}" - else - target="${HOST_OS}-${HOST_ARCH}" - fi - case $target in - linux-arm) - target=linux-armv4 - ;; - linux-armeb) - target=linux-elf-armeb - ;; - linux-aarch64*) - target=linux-generic64 - ;; - linux-gnuilp32-aarch64*) - target=linux-aarch64-ilp32 - ;; - linux-sh3) - target=debian-sh3 - ;; - linux-sh4) - target=debian-sh4 - ;; - linux-i486) - target=debian-i386-i486 - ;; - linux-i586 | linux-viac3) - target=debian-i386-i586 - ;; - linux-i686) - target=debian-i386-i686/cmov - ;; - linux-gnux32-x86_64) - target=linux-x32 - ;; - linux-gnu64-x86_64) - target=linux-x86_64 - ;; - linux-mips) - target=debian-mips - ;; - linux-mipsel) - target=debian-mipsel - ;; - linux-*-mips64) - target=linux-mips - ;; - linux-microblaze*) - target=linux-generic32 - ;; - linux-powerpc) - target=linux-ppc - ;; - linux-powerpc64) - target=linux-ppc64 - ;; - linux-supersparc) - target=linux-sparcv8 - ;; - linux-sparc) - target=linux-sparcv8 - ;; - darwin-i386) - target=darwin-i386-cc - ;; - esac - # inject machine-specific flags - sed -i -e "s|^\(\"$target\",\s*\"[^:]\+\):\([^:]\+\)|\1:${CFLAG}|g" Configure - useprefix=${prefix} - if [ "x$useprefix" = "x" ]; then - useprefix=/ - fi - perl ./Configure ${EXTRA_OECONF} shared --prefix=$useprefix --openssldir=${libdir}/ssl --libdir=`basename ${libdir}` $target -} - do_compile_prepend_class-target () { sed -i 's/\((OPENSSL=\)".*"/\1"openssl"/' Makefile } @@ -177,41 +52,6 @@ do_compile_ptest () { oe_runmake buildtest } -do_install () { - # Create ${D}/${prefix} to fix parallel issues - mkdir -p ${D}/${prefix}/ - - oe_runmake INSTALL_PREFIX="${D}" MANDIR="${mandir}" install - - oe_libinstall -so libcrypto ${D}${libdir} - oe_libinstall -so libssl ${D}${libdir} - - # Moving libcrypto to /lib - if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then - mkdir -p ${D}/${base_libdir}/ - mv ${D}${libdir}/libcrypto* ${D}${base_libdir}/ - sed -i s#libdir=\$\{exec_prefix\}\/lib#libdir=${base_libdir}# ${D}/${libdir}/pkgconfig/libcrypto.pc - fi - - install -d ${D}${includedir} - cp --dereference -R include/openssl ${D}${includedir} - - if [ "${libdir}" != "/usr/libilp32" ]; then - oe_multilib_header openssl/opensslconf.h - fi - - if [ "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" = "perl" ]; then - install -m 0755 ${S}/tools/c_rehash ${D}${bindir} - sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${bindir}/c_rehash - sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl - sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/tsget - # The c_rehash utility isn't installed by the normal installation process. - else - rm -f ${D}${bindir}/c_rehash - rm -f ${D}${libdir}/ssl/misc/CA.pl ${D}${libdir}/ssl/misc/tsget - fi -} - do_install_ptest () { cp -r Makefile test ${D}${PTEST_PATH} cp -r certs ${D}${PTEST_PATH} diff --git a/meta-openeuler/recipes-core/openssl/openssl_1.1.1m.bb b/meta-openeuler/recipes-core/openssl/openssl_1.1.1m.bb index a1976e482122a0e46ba4cddb94e3d18ec49ca352..cd3fb7e97c758908eca76a20a9e76292ef3187d6 100644 --- a/meta-openeuler/recipes-core/openssl/openssl_1.1.1m.bb +++ b/meta-openeuler/recipes-core/openssl/openssl_1.1.1m.bb @@ -17,7 +17,7 @@ MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash" PACKAGECONFIG ?= "" PACKAGECONFIG_class-native = "" PACKAGECONFIG_class-nativesdk = "" - +PACKAGECONFIG[perl] = ",,," PACKAGECONFIG[cryptodev-linux] = "enable-devcryptoeng,disable-devcryptoeng,cryptodev-linux" #| ./libcrypto.so: undefined reference to `getcontext' @@ -149,6 +149,8 @@ do_install_append_class-nativesdk () { sed 's|/usr/lib/ssl/|/usr/lib/ssl-1.1/|g' -i ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh } +PACKAGES =+ "libcrypto libssl ${PN}-conf ${PN}-misc" + # Add the openssl.cnf file to the openssl-conf package. Make the libcrypto # package RRECOMMENDS on this package. This will enable the configuration # file to be installed for both the openssl-bin package and the libcrypto @@ -156,20 +158,16 @@ do_install_append_class-nativesdk () { FILES_libcrypto = "${libdir}/libcrypto${SOLIBS}" FILES_libssl = "${libdir}/libssl${SOLIBS}" -FILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf" -FILES_${PN}-engines = "${libdir}/engines-1.1" +FILES_${PN}-conf = "${sysconfdir}/ssl/openssl.cnf" FILES_${PN}-misc = "${libdir}/ssl-1.1/misc" -FILES_${PN} += "${libdir}/ssl-1.1/* ${sysconfdir}/ssl/*" +FILES_${PN} += "${libdir}/ssl-1.1/* ${sysconfdir}/ssl/* ${libdir}/engines-1.1/*" FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/openssl.sh" -FILES_${PN} += "${libdir}/engines-1.1/*" CONFFILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf" RRECOMMENDS_libcrypto += "openssl-conf" -RDEPENDS_${PN}-ptest += "openssl-bin perl perl-modules bash" - -# Remove bash dependencies for all image -RDEPENDS_${PN}-ptest_remove += "bash" +RDEPENDS_${PN}-misc = "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" +RDEPENDS_${PN}-ptest += "openssl-bin perl perl-modules" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openeuler/recipes-core/os-base/os-base_1.0.bb b/meta-openeuler/recipes-core/os-base/os-base_1.0.bb index 7fe1933bb98d2aab56a4a615196daa2ff5c3cdd7..e1a7427a11cf58c773471b66306b86b4870c5887 100644 --- a/meta-openeuler/recipes-core/os-base/os-base_1.0.bb +++ b/meta-openeuler/recipes-core/os-base/os-base_1.0.bb @@ -71,7 +71,7 @@ do_install_append_arm() { } do_install_append_raspberrypi4() { - sed -i 's/ttyAMA0/ttyS0/g' ${D}/etc/inittab + sed -i 's/ttyAMA0/tty1/g' ${D}/etc/inittab sed -i '/\# load kernel modules/imount -o remount,rw \/' ${D}/etc/rc.d/rc.sysinit } diff --git a/meta-openeuler/recipes-core/tzdata/tzcode-native_2021e.bb b/meta-openeuler/recipes-core/tzdata/tzcode-native_2022a.bb similarity index 100% rename from meta-openeuler/recipes-core/tzdata/tzcode-native_2021e.bb rename to meta-openeuler/recipes-core/tzdata/tzcode-native_2022a.bb diff --git a/meta-openeuler/recipes-core/tzdata/tzdata_2021e.bb b/meta-openeuler/recipes-core/tzdata/tzdata_2022a.bb similarity index 100% rename from meta-openeuler/recipes-core/tzdata/tzdata_2021e.bb rename to meta-openeuler/recipes-core/tzdata/tzdata_2022a.bb diff --git a/scripts/download_code.sh b/scripts/download_code.sh index 3335db558bfaa8496712fea530cb11b4fcd241e9..18b69b0da9503926621b769c1f43b0d4100557ee 100644 --- a/scripts/download_code.sh +++ b/scripts/download_code.sh @@ -62,7 +62,7 @@ update_code_repo() # pull from orgin git config pull.ff only git pull || echo "git pull failure, please check ${pkg}" - git status | grep -Eq "is up to date with|is up-to-date with" || exit 1 + LANG="en_US.UTF-8" git status | grep -Eq "is up to date with|is up-to-date with" || exit 1 fi #check if checkout tag successfully