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/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/coder.py b/scripts/coder.py new file mode 100644 index 0000000000000000000000000000000000000000..a6ceba75ea5bc568a986bdbeca2c35ec269c6306 --- /dev/null +++ b/scripts/coder.py @@ -0,0 +1,124 @@ +#!/usr/bin/env python + +import argparse +import yaml +import os +import git +import sys +from concurrent.futures import ThreadPoolExecutor + +def analay_yaml(yaml_dir = "conf/manifest.yaml"): + with open(yaml_dir, 'r') as yaml_file: + try: + dict = yaml.load(yaml_file.read(), Loader=yaml.SafeLoader) + return dict + except yaml.YAMLError as exec: + print("exec: %s", exec) + +def create_yaml(dist_dir = "conf/manifest.yaml"): + dict = {} + manifest = { + "upstream": "openEuler-22.03-LTS", + "base-url": "https://gitee.com", + "path": "/openeuler/yocto-meta-openeuler.git" + } + dict["manifest"] = manifest + projects = [] + parent_dir = os.path.join(os.getcwd(),"../..") + listdir = os.listdir(parent_dir) + for dir in listdir: + if os.path.isdir(os.path.join(parent_dir,dir)) and dir != "yocto-meta-openeuler": + try: + local_path = os.path.join(parent_dir, dir) + item = {} + repo = Repo(local_path) + item["name"] = dir + item["revision"] = repo.git.log('-1','--pretty=%H').split("\n")[0] + remote = repo.git.remote('-v').split("\n")[0] + path = remote.split(" ")[0].split('\t')[1] + path = path.replace("https://gitee.com","") + item["path"]=path + projects.append(item) + except: + continue + dict["projects"] = projects + file = open(dist_dir,'w') + yaml.dump(dict,file) + file.close() + +def update_component(base_url,upstream,items): + parent_dir = os.path.join(os.getcwd(),"../..") + t = 50 + total = len(items) + per = t / total + thread_pool = ThreadPoolExecutor(max_workers = 15) + for index,item in enumerate(items): + # process = (index+1)/total * 100 + # finish = "#" * int((index + 1) * per) + # need = "-" * int((total - index - 1) * per) + # item_name = "{0:<30}".format(item["name"]) + # print("\r {:^3.0f}%[{}{}] now cloneing...: {}".format(process, finish, need, item_name), end = "") + thread_pool.submit(clone_repo,parent_dir=parent_dir,upstream=upstream,base_url=base_url,item=item) + thread_pool.shutdown(cancel_futures=True) + +def clone_repo(parent_dir, upstream, base_url, item): + print("now clone...: %s" % item['name']) + local_path = os.path.join(parent_dir, item['name']) + if os.path.exists(local_path): + repo = git.Repo(local_path) + repo.git.checkout(upstream) + repo.git.reset('--hard', item['revision']) + else: + remote = base_url + item['path'] + ".git" + git.Repo.clone_from(remote, to_path = local_path, branch = upstream, progress=Progress()) + print("clone: %s finish" % item['name']) + +class Progress(git.remote.RemoteProgress): + def update(self, op_code, cur_count, max_count=None, message=''): + print('update(%s, %s, %s, %s)' % op_code, cur_count, max_count, message) + +def init_args(): + """ + init args + :return: + """ + parser = argparse.ArgumentParser() + parser.add_argument("action") + parser.add_argument("-f", type=str, dest="file_dir", default="conf/manifest.yaml", help="manifest.yaml dir", required=False) + + return parser.parse_args() + +def usage(): + print("usage") + +def unit_test(): + parent_dir = os.path.join(os.getcwd(),"../..") + upstream = "openEuler-22.03-LTS" + item = { + "name": "libfastjson", + "path": "//src-openeuler/libfastjson.git", + "revision": "f41e3c0d607ae6c23df288532dce5c8c40aa6e11" + } + base_url = "https://gitee.com" + clone_repo(parent_dir=parent_dir,upstream=upstream,base_url=base_url,item=item) + +def main(): + is_test = True + if is_test: + unit_test() + sys.exit(0) + args = init_args() + action=args.action + if action=="updatesub": + dict = analay_yaml(args.file_dir) + manifest = dict["manifest"] + projects = dict["projects"] + update_component(manifest['base-url'],manifest['upstream'],projects) + elif action=="createyaml": + yaml_dir = args.file_dir + create_yaml(yaml_dir) + else: + usage() + +if __name__ == "__main__": + main() \ No newline at end of file diff --git a/scripts/conf/manifest.yaml b/scripts/conf/manifest.yaml new file mode 100644 index 0000000000000000000000000000000000000000..3d4f6af1e1fa6d4c76c8bc522a0137996928c8a7 --- /dev/null +++ b/scripts/conf/manifest.yaml @@ -0,0 +1,284 @@ +manifest: + base-url: https://gitee.com + path: /openeuler/yocto-meta-openeuler.git + upstream: openEuler-22.03-LTS +projects: +- name: libfastjson + path: //src-openeuler/libfastjson.git + revision: f41e3c0d607ae6c23df288532dce5c8c40aa6e11 +- name: libhugetlbfs + path: //src-openeuler/libhugetlbfs.git + revision: 2f977a8407c045649b1274639b6f206b663720ab +- name: libselinux + path: //src-openeuler/libselinux.git + revision: 517af2a17440ba49f45639cafde9395c6c25ddfb +- name: popt + path: //src-openeuler/popt.git + revision: 7c1384fb2d64f6eb417233a2b5e87394a871ca50 +- name: kpatch + path: //src-openeuler/kpatch.git + revision: a00c38a3b2262e9f240499b20d95371f4261287c +- name: libnl3 + path: //src-openeuler/libnl3.git + revision: a7add92049ddfd340af85c4c664171f3e5cf2043 +- name: initscripts + path: //src-openeuler/initscripts.git + revision: cf398639d2b6935ee48ed7e4d1d29aa42c5731c6 +- name: strace + path: //src-openeuler/strace.git + revision: 1e558d795402d3b5116713ca6296a76d7a4f6a5d +- name: cronie + path: //src-openeuler/cronie.git + revision: 463e2e99379644295920ed871b933651034f2b4b +- name: procps-ng + path: //src-openeuler/procps-ng.git + revision: 78e9d8422e1ff382a6d8a5d61c203c307046248c +- name: lvm2 + path: //src-openeuler/lvm2.git + revision: b5bbe7b18d1514b99f5e87ca096ed5e9085e96be +- name: gzip + path: //src-openeuler/gzip.git + revision: b4dc6ba6e22ff855d95cc36354614a7f4bc1bda0 +- name: quota + path: //src-openeuler/quota.git + revision: 912db01178178da5b8d31f92b8bf80b5ed20d937 +- name: cracklib + path: //src-openeuler/cracklib.git + revision: 2e27b4a93d72408b7632170bdd84a9315997d6c4 +- name: libcap + path: //src-openeuler/libcap.git + revision: 9e221451bce00ae7a3f963b7f1891afab2580751 +- name: libxml2 + path: //src-openeuler/libxml2.git + revision: 6c98c77b7eb17b8fe3c3fa7a83098b712d486d84 +- name: libcap-ng + path: //src-openeuler/libcap-ng.git + revision: f3d5c2cb80ba4c96697df330e0e19fde344d5569 +- name: bzip2 + path: //src-openeuler/bzip2.git + revision: 3959fd5836def8cd7498571ea13d44f9de3f131f +- name: libevhtp + path: //src-openeuler/libevhtp.git + revision: d531d8427a044393e5317bb5cfee8b6391677117 +- name: libseccomp + path: //src-openeuler/libseccomp.git + revision: b959b124bf0fa0670304b69665b11931d44caf77 +- name: iptables + path: //src-openeuler/iptables.git + revision: ddbc8998c466f149efb0f2a13c1f3bb0a9a7583b +- name: libffi + path: //src-openeuler/libffi.git + revision: 41739cf7d624d1019b68282a345145b923eb8ea2 +- name: yajl + path: //src-openeuler/yajl.git + revision: 98244315575c3118e0888c721f1ca69547778b0b +- name: less + path: //src-openeuler/less.git + revision: 9de306f1889c6db3a3c0da43a0924ca5a84eee5b +- name: attr + path: //src-openeuler/attr.git + revision: 29b2c93c53c1bbc70601e7be5e14a6e417cc7d5d +- name: tzdata + path: //src-openeuler/tzdata.git + revision: 0d4fc4638b79a0609127249df26597ed6e96dcb7 +- name: libestr + path: //src-openeuler/libestr.git + revision: cb5fc8ac466c71701a2c9feaf4c428bf16e53afc +- name: policycoreutils + path: //src-openeuler/policycoreutils.git + revision: 93ded68725b6207af4b35637b3d2aa82afc3964f +- name: elfutils + path: //src-openeuler/elfutils.git + revision: baa06ab4768be8da7f213027c2931eacfc46288f +- name: rsyslog + path: //src-openeuler/rsyslog.git + revision: 0968a76a6bfe0ea661984d09033ab2037e4c3176 +- name: xz + path: //src-openeuler/xz.git + revision: 977aa318eac03d6f508cd0bea7a6d677a5923ebc +- name: kernel-5.10 + path: //openeuler/kernel.git + revision: 52cb1eadceef041555e55aab96733987ec8bfaaa +- name: lxc + path: //src-openeuler/lxc.git + revision: f38661cf999917644a96c6a46a984b5edc37612f +- name: libwebsockets + path: //src-openeuler/libwebsockets.git + revision: 28d9af2ab1837de7c9c54aba3741d044435fd3f4 +- name: libusbx + path: //src-openeuler/libusbx.git + revision: ee813aa8f48b393ae39487f2ab474ec8f5463e57 +- name: expat + path: //src-openeuler/expat.git + revision: 001758b67206b36bca7b7d5d4a133cba317a08ee +- name: iSulad + path: //src-openeuler/iSulad.git + revision: be751dd55c276a4b324dc299c3ac0e2b0d6f5fb6 +- name: yocto-embedded-tools + path: //openeuler/yocto-embedded-tools.git + revision: 3d6e1a5ecfcbd0409b9e87691f9975a2d36db1e3 +- name: sed + path: //src-openeuler/sed.git + revision: a08988c538a5cd3e4842e568b8429c6c48c8500c +- name: dhcp + path: //src-openeuler/dhcp.git + revision: 4c1878e3047ab0ab36f710bb384ab54e272e740a +- name: libmetal + path: //src-openeuler/libmetal.git + revision: 9ec309aa37f8bbe0fc0f41abf66c6caf8ac009d0 +- name: zlib + path: //src-openeuler/zlib.git + revision: 7aed8332612397f5ab23aa3ae5e4d36955387d13 +- name: nfs-utils + path: //src-openeuler/nfs-utils.git + revision: 35da941c658d25616898f8e1b534345d9c235553 +- name: dsoftbus_standard + path: //openeuler/dsoftbus_standard.git + revision: 4108a1f9c9944a46d979126fda3e326b3de35b98 +- name: shadow + path: //src-openeuler/shadow.git + revision: 156cb7e6ea86c5deac022453dee0df13bf00f152 +- name: lcr + path: //src-openeuler/lcr.git + revision: b152176b326836a5df03e512029db0ec219e4ab7 +- name: pam + path: //src-openeuler/pam.git + revision: d7077b66ed4f38e5ac4bd2bc8b51886a565180a8 +- name: raspberrypi-firmware + path: //src-openeuler/raspberrypi-firmware.git + revision: 2182fa66ccf72649007f395679f41088b95efcec +- name: psmisc + path: //src-openeuler/psmisc.git + revision: 34a244e6a0a6452dd70377c24e90e81652719a08 +- name: libevent + path: //src-openeuler/libevent.git + revision: f40f16a5927269683589d8efb6ba6a4953a2f2d5 +- name: libpcap + path: //src-openeuler/libpcap.git + revision: 5c678f3ac646cc21bd621e884ba8c4ae4a8895c1 +- name: OpenAMP + path: //src-openeuler/OpenAMP.git + revision: 9c8027c78cb1b2a10450dc874f563c40777ce168 +- name: bash + path: //src-openeuler/bash.git + revision: d1f10a866b711ab0a3286c9dcab97f23cc2235b1 +- name: libsepol + path: //src-openeuler/libsepol.git + revision: 3dd871170e6bc057917ca19f6e9113d1567178df +- name: yocto-poky + path: //openeuler/yocto-poky.git + revision: d0a649349c4b60f85502989175d8d0ec8112fb4f +- name: glib2 + path: //src-openeuler/glib2.git + revision: 28558da4b52160e5b03359e0dc9e5da1f273f66e +- name: gdb + path: //src-openeuler/gdb.git + revision: 5e2ca639a0a4650d9f289cbeb4f6ffb8ad3eda24 +- name: libboundscheck + path: //src-openeuler/libboundscheck.git + revision: 7ffcd596b083b464e60ae59eaabfe3e6f82053a0 +- name: bind + path: //src-openeuler/bind.git + revision: 0d963e302eac76dcee18c699f7ea2b7a5f9b54c0 +- name: util-linux + path: //src-openeuler/util-linux.git + revision: 14c7bd39313530ca08638b072eb3b6351b72c2d9 +- name: pcre + path: //src-openeuler/pcre.git + revision: ff8c1223f1bdea32b474e7051882dddf26f60ee9 +- name: libtirpc + path: //src-openeuler/libtirpc.git + revision: 4b7338d89ad2671d4ea1930d2581af833ac10b61 +- name: json-c + path: //src-openeuler/json-c.git + revision: 5ef3490390c4447655f157f11b1157fc42488722 +- name: squashfs-tools + path: //src-openeuler/squashfs-tools.git + revision: d634c53b1b0bf7dc489a1ea2b48d6a7184a01e6c +- name: openssl + path: //src-openeuler/openssl.git + revision: 8c17d69923b4322eb2d88357b28c656559d6ff6e +- name: ncurses + path: //src-openeuler/ncurses.git + revision: eb0e1dc0f168681e270569ce87d6c5c5d1d54f2b +- name: src-kernel-5.10 + path: //src-openeuler/kernel.git + revision: 5632e2c9c14ecd62b6bd504ac97c19a7dc363275 +- name: audit + path: //src-openeuler/audit.git + revision: 036fd775d066120a43775e4b97412791c307440f +- name: grep + path: //src-openeuler/grep.git + revision: d3a46f2626e010aa39c78b2717d100f28ac68182 +- name: readline + path: //src-openeuler/readline.git + revision: cbe8222866346c9a2d51fddec74c11b33ad33b0d +- name: cifs-utils + path: //src-openeuler/cifs-utils.git + revision: 09680ff5d4ee69700dcc714d8154091eb5167484 +- name: kmod + path: //src-openeuler/kmod.git + revision: 3f0da4f8e4bf83dafdadd537050f5721b40c5c26 +- name: acl + path: //src-openeuler/acl.git + revision: d17a1f95663c4d0c65a0d9974ea7a29cb774097e +- name: logrotate + path: //src-openeuler/logrotate.git + revision: 087a06a863ba09ce8179bf3e3966dce1ddca85fa +- name: iproute + path: //src-openeuler/iproute.git + revision: d6bf77626ce152ac239f0256be14ce8f59508381 +- name: pciutils + path: //src-openeuler/pciutils.git + revision: d0187243a5df92d4809aa4b50aaaea7b276eb383 +- name: binutils + path: //src-openeuler/binutils.git + revision: e31b150f991afbeb34c166d8c992f091fc3cb12c +- name: kexec-tools + path: //src-openeuler/kexec-tools.git + revision: c0a0af67cf1ac2cff666bf8bf0dfa987bc27739c +- name: curl + path: //src-openeuler/curl.git + revision: 70a83071587ad5d2c08409b6f5cda77472370c09 +- name: openssh + path: //src-openeuler/openssh.git + revision: abca5c78bb41fdaa1c20793d2f97897db0a42fa5 +- name: libarchive + path: //src-openeuler/libarchive.git + revision: 7056481be6b6d2f0f6579b8b0104eb702776f111 +- name: yocto-pseudo + path: //src-openeuler/yocto-pseudo.git + revision: ca3862b68b014221f0c4484d019155844cb4d504 +- name: e2fsprogs + path: //src-openeuler/e2fsprogs.git + revision: 96eb77cd66d1f1f2e709dbf10adb75372a9dc152 +- name: rpcbind + path: //src-openeuler/rpcbind.git + revision: c93f9070bcaebdda7c04299eaac174f2e8a2218b +- name: libpwquality + path: //src-openeuler/libpwquality.git + revision: d2aaa3f337b8446754cc2dfbf764ba6669a2cded +- name: ethtool + path: //src-openeuler/ethtool.git + revision: 76757317e51ef91896721bf263c86c84ab5626be +- name: gmp + path: //src-openeuler/gmp.git + revision: 15ed3a840447948a56a85447397ff818b3effd6b +- name: libsemanage + path: //src-openeuler/libsemanage.git + revision: 417a0b1a021b8c5d70d6525c2949ebc760dcac89 +- name: http-parser + path: //src-openeuler/http-parser.git + revision: 1faf22e948e80d4c76daa8af68dcb8c3722fcae1 +- name: libaio + path: //src-openeuler/libaio.git + revision: d1b0058217ee0c9eae71a6e3894cc9b813916620 +- name: busybox + path: //src-openeuler/busybox.git + revision: 8ea1a050ff6cd6d68fccaf162f830516c8b1f75c +- name: sysfsutils + path: //src-openeuler/sysfsutils.git + revision: f379429940b9bf5472214d7117f1227d829cfaa8 +- name: dosfstools + path: //src-openeuler/dosfstools.git + revision: 24b450ad114cfd12f1de613ea9d02f4d0ff6293b 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