From 67c40cf79405f001073f9fc8d2606e054510d3b7 Mon Sep 17 00:00:00 2001 From: Wayne Ren Date: Fri, 14 Jan 2022 17:21:01 +0800 Subject: [PATCH] all: clean FILESPATH and DL_DIR * use OPENEULER_SP_DIR as the software package dir of openEuler. * All openEuler software packages will be downloaded into OPENEULER_SP_DIR by provided tool. * OPENEULER_SP_DIR will be prepended into FILESEXTRAPATH of all recipes in openeuler.conf, so no need to repeat it in each recipe Signed-off-by: Wayne Ren --- meta-openeuler/classes/get_dl_dir.bbclass | 11 ----------- meta-openeuler/conf/distro/openeuler.conf | 13 +++++++------ meta-openeuler/conf/local.conf.sample | 13 ++++++++----- .../recipes-core/busybox/busybox_1.33.1.bb | 1 - .../recipes-core/clibcni/clibcni_2.0.4.bb | 2 -- meta-openeuler/recipes-core/curl/curl_7.77.0.bb | 2 -- meta-openeuler/recipes-core/glibc/glibc_2.34.bb | 1 - .../recipes-core/http-parser/http-parser_2.9.4.bb | 2 -- meta-openeuler/recipes-core/iSulad/iSulad_2.0.10.bb | 3 +-- meta-openeuler/recipes-core/lcr/lcr_2.0.6.bb | 2 -- .../recipes-core/libarchive/libarchive_3.5.1.bb | 2 -- meta-openeuler/recipes-core/libcap-ng/libcap-ng.inc | 2 -- meta-openeuler/recipes-core/libcap/libcap_2.32.bb | 2 -- .../recipes-core/libevent/libevent_2.1.12.bb | 3 --- .../recipes-core/libevhtp/libevhtp_1.2.18.bb | 2 -- .../recipes-core/libseccomp/libseccomp_2.5.1.bb | 2 -- .../libwebsockets/libwebsockets_4.0.20.bb | 2 -- meta-openeuler/recipes-core/lxc/lxc_4.0.3.bb | 2 -- meta-openeuler/recipes-core/yajl/yajl_2.1.0.bb | 2 -- meta-openeuler/recipes-core/zlib/zlib_1.2.11.bb | 2 -- .../recipes-devtools/pseudo/pseudo_git.bbappend | 2 +- 21 files changed, 17 insertions(+), 56 deletions(-) delete mode 100644 meta-openeuler/classes/get_dl_dir.bbclass diff --git a/meta-openeuler/classes/get_dl_dir.bbclass b/meta-openeuler/classes/get_dl_dir.bbclass deleted file mode 100644 index 1c43639c3d5..00000000000 --- a/meta-openeuler/classes/get_dl_dir.bbclass +++ /dev/null @@ -1,11 +0,0 @@ -python set_dldir() { - import subprocess - dl_dir = d.getVar('DL_DIR', True) - oeroot = d.getVar('COREBASE', True) - srctopdir = os.path.abspath(os.path.dirname(oeroot)) - if not dl_dir or dl_dir == "downloads": - d.setVar('DL_DIR', srctopdir) -} - -addhandler set_dldir -set_dldir[eventmask] = "bb.event.RecipePreFinalise" diff --git a/meta-openeuler/conf/distro/openeuler.conf b/meta-openeuler/conf/distro/openeuler.conf index 93b84711aee..24050299a4b 100644 --- a/meta-openeuler/conf/distro/openeuler.conf +++ b/meta-openeuler/conf/distro/openeuler.conf @@ -56,20 +56,21 @@ INHERIT += "reproducible_build" BB_SIGNATURE_HANDLER ?= "OEEquivHash" BB_HASHSERVE ??= "auto" -#set binary gcc,not effect?? -#TCMODE = "gcc-bin" + PREFERRED_PROVIDER_virtual/kernel = "linux-openeuler" #add by lisimin,delete depends #UNINATIVE_CHECKSUM[x86_64] = "dead" #UNINATIVE_URL = "unset" -LOCAL_SRC_DIR = "${BPN}" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -#DL_DIR = "${LOCAL_FILES}" -DL_DIR = "downloads" + +# for all .bb file, OPENEULER_SP_DIR will be included +# in file path +FILESEXTRAPATHS_prepend = "${OPENEULER_SP_DIR}:" + export RPMDEPS = "default" -INHERIT += "get_dl_dir get_rpmdeps" +INHERIT += "get_rpmdeps" #disable the file checksum of fetch do_fetch[file-checksums] = "" diff --git a/meta-openeuler/conf/local.conf.sample b/meta-openeuler/conf/local.conf.sample index 0c3f35558ad..9934a4f9fa3 100644 --- a/meta-openeuler/conf/local.conf.sample +++ b/meta-openeuler/conf/local.conf.sample @@ -301,8 +301,11 @@ ftp://.*/.* file:///${LOCAL_FILES} \n \ http://.*/.* file:///${LOCAL_FILES} \n \ https://.*/.* file:///${LOCAL_FILES} \n" -#not add PR in workpath -#PF = "${PN}-${EXTENDPE}${PV}" -#STAMP = "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/${EXTENDPE}${PV}" -#WORKDIR = "${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}/${PN}/${EXTENDPE}${PV}" -LOCAL_FILES = "/usr1/openeuler/src/" +# openEuler software package dir +# all openeEuler software packages will be downloaded by specific tool +# into this dir with the following format: +# +# busybox +# openssh +# ..... +OPENEULER_SP_DIR = "/usr1/openeuler/src/" diff --git a/meta-openeuler/recipes-core/busybox/busybox_1.33.1.bb b/meta-openeuler/recipes-core/busybox/busybox_1.33.1.bb index 0c58fe71cb8..51af79e86cc 100644 --- a/meta-openeuler/recipes-core/busybox/busybox_1.33.1.bb +++ b/meta-openeuler/recipes-core/busybox/busybox_1.33.1.bb @@ -19,7 +19,6 @@ inherit kernel-arch SRC_URI = "file://busybox/busybox-1.33.1.tar.bz2 \ file://yocto-embedded-tools/config/arm64/defconfig-busybox \ " -FILESPATH_prepend += "${LOCAL_FILES}/${BPN}:" S = "${WORKDIR}/${BPN}-${PV}" #not split debug files with dwarfsrcfiles,no dwarfsrcfiles diff --git a/meta-openeuler/recipes-core/clibcni/clibcni_2.0.4.bb b/meta-openeuler/recipes-core/clibcni/clibcni_2.0.4.bb index 1f747c41479..751f711a9d9 100644 --- a/meta-openeuler/recipes-core/clibcni/clibcni_2.0.4.bb +++ b/meta-openeuler/recipes-core/clibcni/clibcni_2.0.4.bb @@ -8,8 +8,6 @@ SRC_URI = "file://clibcni/v2.0.4.tar.gz \ file://clibcni/0002-add-error-info-for-failed-run-cni-plugin.patch \ " -FILESPATH_prepend += "${LOCAL_FILES}/${BPN}:" -DL_DIR = "${LOCAL_FILES}" S = "${WORKDIR}/${BPN}" inherit cmake diff --git a/meta-openeuler/recipes-core/curl/curl_7.77.0.bb b/meta-openeuler/recipes-core/curl/curl_7.77.0.bb index 2629ea9568e..370eef54425 100644 --- a/meta-openeuler/recipes-core/curl/curl_7.77.0.bb +++ b/meta-openeuler/recipes-core/curl/curl_7.77.0.bb @@ -16,8 +16,6 @@ SRC_URI = "file://curl/curl-7.77.0.tar.xz \ file://curl/backport-CVE-2021-22926.patch \ " -FILESPATH_prepend += "${LOCAL_FILES}/${BPN}:" -DL_DIR = "${LOCAL_FILES}" S = "${WORKDIR}/${BPN}-${PV}" CVE_PRODUCT = "curl libcurl" diff --git a/meta-openeuler/recipes-core/glibc/glibc_2.34.bb b/meta-openeuler/recipes-core/glibc/glibc_2.34.bb index b4a42602b28..0b073699fc2 100644 --- a/meta-openeuler/recipes-core/glibc/glibc_2.34.bb +++ b/meta-openeuler/recipes-core/glibc/glibc_2.34.bb @@ -28,7 +28,6 @@ SRC_URI_arm = "file://openeuler_gcc_arm32le" #Not strip toolchain INHIBIT_SYSROOT_STRIP = "1" INSANE_SKIP_${PN} += "already-stripped" -#FILESPATH_prepend += "${LOCAL_FILES}:" DL_DIR = "${LOCAL_SYSROOT_DL_DIR}" S_aarch64 = "${WORKDIR}/openeuler_gcc_arm64le" S_arm = "${WORKDIR}/openeuler_gcc_arm32le" diff --git a/meta-openeuler/recipes-core/http-parser/http-parser_2.9.4.bb b/meta-openeuler/recipes-core/http-parser/http-parser_2.9.4.bb index 7e8baf17e6f..76857503b4f 100644 --- a/meta-openeuler/recipes-core/http-parser/http-parser_2.9.4.bb +++ b/meta-openeuler/recipes-core/http-parser/http-parser_2.9.4.bb @@ -7,8 +7,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;m SRC_URI = "file://http-parser/http-parser-2.9.4.tar.gz" -FILESPATH_prepend += "${LOCAL_FILES}/${BPN}:" -DL_DIR = "${LOCAL_FILES}" S = "${WORKDIR}/${BPN}-${PV}" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" diff --git a/meta-openeuler/recipes-core/iSulad/iSulad_2.0.10.bb b/meta-openeuler/recipes-core/iSulad/iSulad_2.0.10.bb index e31bde748f4..c93f9ad5567 100644 --- a/meta-openeuler/recipes-core/iSulad/iSulad_2.0.10.bb +++ b/meta-openeuler/recipes-core/iSulad/iSulad_2.0.10.bb @@ -26,8 +26,7 @@ SRC_URI = "file://iSulad/v2.0.10.tar.gz \ file://iSulad/0019-add-pull-request-gateway-checker-for-build-and-ut.patch \ file://iSulad/0020-Optimize-websocket-streaming-service-code.patch \ " -FILESPATH_prepend += "${LOCAL_FILES}/${BPN}:" -DL_DIR = "${LOCAL_FILES}" + S = "${WORKDIR}/${BPN}" WARN_QA_remove += "uppercase-pn" diff --git a/meta-openeuler/recipes-core/lcr/lcr_2.0.6.bb b/meta-openeuler/recipes-core/lcr/lcr_2.0.6.bb index 6c14926cebb..35afc1b9959 100644 --- a/meta-openeuler/recipes-core/lcr/lcr_2.0.6.bb +++ b/meta-openeuler/recipes-core/lcr/lcr_2.0.6.bb @@ -6,8 +6,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;m SRC_URI = "file://lcr/v2.0.6.tar.gz \ " -FILESPATH_prepend += "${LOCAL_FILES}/${BPN}:" -DL_DIR = "${LOCAL_FILES}" S = "${WORKDIR}/${BPN}" inherit cmake diff --git a/meta-openeuler/recipes-core/libarchive/libarchive_3.5.1.bb b/meta-openeuler/recipes-core/libarchive/libarchive_3.5.1.bb index 68609a9c84e..d2da1f0d4b0 100644 --- a/meta-openeuler/recipes-core/libarchive/libarchive_3.5.1.bb +++ b/meta-openeuler/recipes-core/libarchive/libarchive_3.5.1.bb @@ -7,8 +7,6 @@ SRC_URI = "file://libarchive/libarchive-3.5.1.tar.gz \ file://libarchive/libarchive-uninitialized-value.patch \ " -FILESPATH_prepend += "${LOCAL_FILES}/${BPN}:" -DL_DIR = "${LOCAL_FILES}" S = "${WORKDIR}/${BPN}-${PV}" inherit cmake diff --git a/meta-openeuler/recipes-core/libcap-ng/libcap-ng.inc b/meta-openeuler/recipes-core/libcap-ng/libcap-ng.inc index 69409f0c851..45478074b49 100644 --- a/meta-openeuler/recipes-core/libcap-ng/libcap-ng.inc +++ b/meta-openeuler/recipes-core/libcap-ng/libcap-ng.inc @@ -9,8 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ SRC_URI = "file://libcap-ng/libcap-ng-${PV}.tar.gz" -FILESPATH_prepend += "${LOCAL_FILES}/${BPN}:" -DL_DIR = "${LOCAL_FILES}" S = "${WORKDIR}/${BPN}-${PV}" SRC_URI[md5sum] = "5883ed10b621c87e29a05cff36d2928e" diff --git a/meta-openeuler/recipes-core/libcap/libcap_2.32.bb b/meta-openeuler/recipes-core/libcap/libcap_2.32.bb index 8571b725d0a..8cf19b0ff93 100644 --- a/meta-openeuler/recipes-core/libcap/libcap_2.32.bb +++ b/meta-openeuler/recipes-core/libcap/libcap_2.32.bb @@ -13,8 +13,6 @@ SRC_URI = "file://libcap/libcap-2.32.tar.gz \ file://libcap/Avoid-segfaulting-when-the-kernel-is-ahead-of-libcap.patch \ " -FILESPATH_prepend += "${LOCAL_FILES}/${BPN}:" -DL_DIR = "${LOCAL_FILES}" S = "${WORKDIR}/${BPN}-${PV}" DEPENDS = "hostperl-runtime-native gperf-native" diff --git a/meta-openeuler/recipes-core/libevent/libevent_2.1.12.bb b/meta-openeuler/recipes-core/libevent/libevent_2.1.12.bb index 7bee6e71d8c..932d72669c2 100644 --- a/meta-openeuler/recipes-core/libevent/libevent_2.1.12.bb +++ b/meta-openeuler/recipes-core/libevent/libevent_2.1.12.bb @@ -12,9 +12,6 @@ SRC_URI = "file://libevent/libevent-2.1.12-stable.tar.gz \ file://libevent/http-add-callback-to-allow-server-to-decline-and-the.patch \ " -FILESPATH_prepend += "${LOCAL_FILES}/${BPN}:" -DL_DIR = "${LOCAL_FILES}" - UPSTREAM_CHECK_URI = "http://libevent.org/" S = "${WORKDIR}/${BPN}-${PV}-stable" diff --git a/meta-openeuler/recipes-core/libevhtp/libevhtp_1.2.18.bb b/meta-openeuler/recipes-core/libevhtp/libevhtp_1.2.18.bb index fadb6177fbd..eaa55944000 100644 --- a/meta-openeuler/recipes-core/libevhtp/libevhtp_1.2.18.bb +++ b/meta-openeuler/recipes-core/libevhtp/libevhtp_1.2.18.bb @@ -13,8 +13,6 @@ SRC_URI = "file://libevhtp/1.2.18.tar.gz \ file://libevhtp/0005-libevhtp-add-securce-compile-options.patch \ " -FILESPATH_prepend += "${LOCAL_FILES}/${BPN}:" -DL_DIR = "${LOCAL_FILES}" S = "${WORKDIR}/${BPN}-${PV}" DEPENDS = "libevent" diff --git a/meta-openeuler/recipes-core/libseccomp/libseccomp_2.5.1.bb b/meta-openeuler/recipes-core/libseccomp/libseccomp_2.5.1.bb index 6b14fd0a90c..a37f52bc387 100644 --- a/meta-openeuler/recipes-core/libseccomp/libseccomp_2.5.1.bb +++ b/meta-openeuler/recipes-core/libseccomp/libseccomp_2.5.1.bb @@ -9,8 +9,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;m SRC_URI = "file://libseccomp/libseccomp-2.5.1.tar.gz" -FILESPATH_prepend += "${LOCAL_FILES}/${BPN}:" -DL_DIR = "${LOCAL_FILES}" S = "${WORKDIR}/${BPN}-${PV}" diff --git a/meta-openeuler/recipes-core/libwebsockets/libwebsockets_4.0.20.bb b/meta-openeuler/recipes-core/libwebsockets/libwebsockets_4.0.20.bb index 6528b0dc351..52dd9eea0d0 100644 --- a/meta-openeuler/recipes-core/libwebsockets/libwebsockets_4.0.20.bb +++ b/meta-openeuler/recipes-core/libwebsockets/libwebsockets_4.0.20.bb @@ -5,8 +5,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;m SRC_URI = "file://libwebsockets/libwebsockets-4.0.20.tar.gz" -FILESPATH_prepend += "${LOCAL_FILES}/${BPN}:" -DL_DIR = "${LOCAL_FILES}" S = "${WORKDIR}/${BPN}-${PV}" inherit cmake diff --git a/meta-openeuler/recipes-core/lxc/lxc_4.0.3.bb b/meta-openeuler/recipes-core/lxc/lxc_4.0.3.bb index 7f21b9c1946..9205e33ec24 100644 --- a/meta-openeuler/recipes-core/lxc/lxc_4.0.3.bb +++ b/meta-openeuler/recipes-core/lxc/lxc_4.0.3.bb @@ -44,8 +44,6 @@ SRC_URI = "file://lxc/lxc-4.0.3.tar.gz \ file://check_only_rootfs_as_filesystem_type.patch \ " -FILESPATH_prepend += "${LOCAL_FILES}/${BPN}:" -DL_DIR = "${LOCAL_FILES}" DEPENDS = "yajl libseccomp libcap" diff --git a/meta-openeuler/recipes-core/yajl/yajl_2.1.0.bb b/meta-openeuler/recipes-core/yajl/yajl_2.1.0.bb index f12fa0d475e..ac8d8f6c61c 100644 --- a/meta-openeuler/recipes-core/yajl/yajl_2.1.0.bb +++ b/meta-openeuler/recipes-core/yajl/yajl_2.1.0.bb @@ -11,8 +11,6 @@ SRC_URI = "file://yajl/2.1.0.tar.gz \ file://yajl/yajl-2.1.0-fix-memory-leak.patch \ " -FILESPATH_prepend += "${LOCAL_FILES}/${BPN}:" -DL_DIR = "${LOCAL_FILES}" S = "${WORKDIR}/${BPN}-${PV}" inherit cmake diff --git a/meta-openeuler/recipes-core/zlib/zlib_1.2.11.bb b/meta-openeuler/recipes-core/zlib/zlib_1.2.11.bb index 652448df066..11e045e70cb 100644 --- a/meta-openeuler/recipes-core/zlib/zlib_1.2.11.bb +++ b/meta-openeuler/recipes-core/zlib/zlib_1.2.11.bb @@ -6,8 +6,6 @@ SECTION = "libs" LICENSE = "Zlib" LIC_FILES_CHKSUM = "file://zlib.h;beginline=6;endline=23;md5=5377232268e952e9ef63bc555f7aa6c0" -FILESPATH_prepend += "${LOCAL_FILES}/${BPN}:" -DL_DIR = "${LOCAL_FILES}" S = "${WORKDIR}/${BPN}-${PV}" SRC_URI = "file://${BPN}/${BPN}-${PV}.tar.xz \ " diff --git a/meta-openeuler/recipes-devtools/pseudo/pseudo_git.bbappend b/meta-openeuler/recipes-devtools/pseudo/pseudo_git.bbappend index 3cd742c6ee6..7fe85595a57 100644 --- a/meta-openeuler/recipes-devtools/pseudo/pseudo_git.bbappend +++ b/meta-openeuler/recipes-devtools/pseudo/pseudo_git.bbappend @@ -4,7 +4,7 @@ XSRC_URI = "git://git.yoctoproject.org/pseudo;branch=oe-core \ file://fallback-passwd \ file://fallback-group \ " -FILESPATH_prepend += "${LOCAL_FILES}:" + SRC_URI_remove_class-native = " \ http://downloads.yoctoproject.org/mirror/sources/pseudo-prebuilt-2.33.tar.xz;subdir=git/prebuilt;name=prebuilt \ file://older-glibc-symbols.patch" -- Gitee