diff --git a/.oebuild/features/oebeidge.yaml b/.oebuild/features/oebeidge.yaml new file mode 100644 index 0000000000000000000000000000000000000000..d5da9c819ea6ee390d75bfeecba82c0016c353a5 --- /dev/null +++ b/.oebuild/features/oebeidge.yaml @@ -0,0 +1,7 @@ +type: feature + +local_conf: | + DISTRO_FEATURES:append = " oebridge " + SERVER_MIRROR = "https://mirrors.tuna.tsinghua.edu.cn/openeuler" + SERVER_VERSION = "openEuler-24.03-LTS" + SERVER_GROUP_TYPE = "everything" diff --git a/meta-openeuler/classes/oebridge.bbclass b/meta-openeuler/classes/oebridge.bbclass new file mode 100644 index 0000000000000000000000000000000000000000..e3e00a52738c7a1b780a26125f384df506df1da3 --- /dev/null +++ b/meta-openeuler/classes/oebridge.bbclass @@ -0,0 +1,329 @@ +python(){ + import os + import subprocess + + repo_name = d.getVar('OPENEULER_LOCAL_NAME') + + # 获取软件包仓库 + src_dir = d.getVar('OPENEULER_SP_DIR') + repo_dir = os.path.join(src_dir, repo_name) + spec_path = os.path.join(repo_dir, repo_name+".spec") + spec_name = repo_name+".spec" + server_rpms = "" + # 分析spec文件,获取子包的名称 + if os.path.exists(spec_path): + # 将子包的文件路径全部改为标准包的安装路径 + res = subprocess.run(f"rpmspec -q {spec_name} \ + --rcfile=/opt/buildtools/nativesdk/sysroots/x86_64-openeulersdk-linux/usr/lib/rpm/rpmrc \ + --macros=/lib/rpm/macros:/lib/rpm/openEuler/macros \ + --define='_sourcedir ./' | sed 's/-[0-9].*//'", + shell=True, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + text=True, + cwd=repo_dir) + if res.returncode != 0: + bb.error(res.stderr) + return + server_rpms = res.stdout.replace("\n"," ") + # note: if set ASSUME_PROVIDE_PKGS mean to all PACKAGES is ASSUME_PROVIDE_PKGS value, + # but if set sub package, the sub pacakge will be it's own value + if d.getVar("ASSUME_PROVIDE_PKGS") is not None and d.getVar("ASSUME_PROVIDE_PKGS") != "": + server_rpms = d.getVar("ASSUME_PROVIDE_PKGS") + for sub_name in d.getVar("PACKAGES").split(" "): + sub_name = sub_name.strip() + if sub_name == "": + continue + if d.getVar(f"ASSUME_PROVIDE_PKGS:{sub_name}") is None: + d.setVar(f"ASSUME_PROVIDE_PKGS:{sub_name}", server_rpms) +} + +addtask do_save_k before do_package_write_rpm after do_package_qa + +def init_base(repo_url): + import dnf + import dnf.base + import dnf.conf + + base = dnf.Base() + # disable systemd repo + base.conf.substitutions['releasever'] = '' + base.repos.all().disable() + base.conf.sslverify = False + # create and enable repo from remote + repo_id = "remote_repo" + repo = base.repos.add_new_repo(repo_id, base.conf, baseurl=[repo_url]) + repo.enable() + # load remote data + base.fill_sack(load_system_repo=False, load_available_repos=True) + return base + +def get_package_details(base, package_name): + query = base.sack.query().available().filter(name=package_name) + if not query: + print(f"Package '{package_name}' not found in the repository.") + return + pkg = query[0] + return { + "Package": os.path.basename(pkg.remote_location()), + "Url": pkg.remote_location(), + "Checksum": pkg.chksum[1].hex() + } + +python do_save_k(){ + import os + import subprocess + + rpms_cache_dir = f"{d.getVar('TOPDIR')}/cache/rpms" + os.makedirs(name=rpms_cache_dir, exist_ok=True) + repo_url = f"{d.getVar('SERVER_MIRROR')}/{d.getVar('SERVER_VERSION')}/{d.getVar('SERVER_GROUP_TYPE')}/{d.getVar('TUNE_ARCH')}/" + base = init_base(repo_url) + for sub_name in d.getVar("PACKAGES").split(" "): + sub_name = sub_name.strip() + if sub_name == "": + continue + # bb.plain(d.getVar(f"ASSUME_PROVIDE_PKGS:{sub_name}")) + if d.getVar(f"ASSUME_PROVIDE_PKGS:{sub_name}") is None: + continue + prefix_name = d.getVar("PN")+":"+sub_name + # remove duplicates + subprocess.run(f"test -f ASSUME_PROVIDE_PKGS && sed -i '/^{prefix_name}:/d' ASSUME_PROVIDE_PKGS", + shell=True, + cwd=f"{d.getVar('TOPDIR')}/cache", + text=True) + + # write server rpm info to ASSUME_PROVIDE_PKGS file + server_rpms = " ".join(d.getVar(f"ASSUME_PROVIDE_PKGS:{sub_name}").replace("\n", " ").split()) + with open(f"{d.getVar('TOPDIR')}/cache/ASSUME_PROVIDE_PKGS", 'a', encoding='utf-8') as f: + f.write(prefix_name+":"+server_rpms+"\n") + + # download server rpm + download_pre_dir = rpms_cache_dir+ \ + "/"+d.getVar('SERVER_VERSION')+ \ + "/"+d.getVar('SERVER_GROUP_TYPE')+ \ + "/"+d.getVar('TUNE_ARCH') + pn_dir = download_pre_dir+"/"+d.getVar("PN") + os.makedirs(name=pn_dir, exist_ok=True) + for server_rpm in server_rpms.split(" "): + rpm_info = get_package_details(base, server_rpm) + if rpm_info is None: + continue + if os.path.exists(os.path.join(pn_dir, rpm_info['Package'])): + continue + res = subprocess.run(f"wget {rpm_info['Url']}", + shell=True, + stderr=subprocess.PIPE, + cwd=pn_dir, + text=True) + if res.returncode != 0: + bb.fatal(res.stderr) + return +} + +fakeroot python do_make_rootfs_db(){ + import os + import shutil + import subprocess + + def make_db(db_dir, rpms_dir, root_tmp): + with open(f"{d.getVar('TOPDIR')}/cache/ASSUME_PROVIDE_PKGS", 'r', encoding='utf-8') as f: + pkg_data = f.readlines() + for pkg in pkg_data: + pkg = pkg.strip("\n").strip(" ") + pkg_split = pkg.split(":") + # 如果分隔数组小于3,则表示没有服务器包,格式为pkg:pkg-sub:server pkg + if len(pkg_split)<3: + continue + for fi in os.walk(os.path.join(rpms_dir, pkg_split[0])): + if len(fi[2])==0: + continue + for rpm_pkg in fi[2]: + if not rpm_pkg.endswith(".rpm"): + continue + res = subprocess.run(f"rpm -ivh --dbpath {db_dir} --nosignature \ + --root {root_tmp} --nodeps --justdb --ignorearch {rpm_pkg} --force", + shell=True, + stderr=subprocess.PIPE, + cwd=fi[0], + text=True) + if res.returncode != 0: + bb.fatal(res.stderr) + + # make db + rpms_cache_dir = f"{d.getVar('TOPDIR')}/cache/rpms"+ \ + "/"+d.getVar('SERVER_VERSION')+ \ + "/"+d.getVar('SERVER_GROUP_TYPE')+ \ + "/"+d.getVar('TUNE_ARCH') + db_cache_dir = "/var/lib/rpm" + subprocess.run(f"rm -rf {os.path.join(d.getVar('IMAGE_ROOTFS'), db_cache_dir)}",shell=True) + make_db(db_dir=db_cache_dir, rpms_dir=rpms_cache_dir, root_tmp=d.getVar("IMAGE_ROOTFS")) +} + +fakeroot python do_dnf_install_pkgs(){ + import os + import shutil + import subprocess + import dnf + import dnf.base + import dnf.conf + + def get_pkg_map(repo_url, rootfs, cache_dir): + dnf.rpm.transaction.rpm.addMacro('_dbpath', '/var/lib/rpm') + base = dnf.Base() + + # disable systemd repo + base.conf.substitutions['releasever'] = '' + base.repos.all().disable() + + # create and enable repo from remote + repo_id = "remote_repo" + + # 配置基础参数 + base.conf.substitutions['arch'] = 'aarch64' # 指定aarch64架构 + base.conf.install_weak_deps = False + base.conf.clean_requirements_on_remove = False + base.conf.ignorearch = True + base.conf.sslverify = False + + # 禁用系统仓库和已安装包检查 + base.conf.cachedir = cache_dir + base.conf.config_file_path = cache_dir + base.conf.persistdir = cache_dir + + base.conf.installroot = os.path.abspath(rootfs) + + repo = base.repos.add_new_repo(repo_id, base.conf, baseurl=[repo_url]) + repo.enable() + + dnf.rpm.transaction.rpm.addMacro('_dbpath', '/var/lib/rpm') + # load remote data + base.fill_sack(load_system_repo=True, load_available_repos=True) + + cached_pkgs_map = {} + for pkg in base.sack.query().available(): + pkg_path = pkg.localPkg() # 核心API调用 + if os.path.exists(pkg_path): + cached_pkgs_map[pkg.name] = pkg_path + # cached_pkgs.append(pkg_path) + return cached_pkgs_map + + + def install_pkg(repo_url, rootfs, cache_dir, package_name): + dnf.rpm.transaction.rpm.addMacro('_dbpath', '/var/lib/rpm') + base = dnf.Base() + + # disable systemd repo + base.conf.substitutions['releasever'] = '' + base.repos.all().disable() + + # create and enable repo from remote + repo_id = "remote_repo" + + # 配置基础参数 + base.conf.substitutions['arch'] = 'aarch64' # 指定aarch64架构 + base.conf.install_weak_deps = False + base.conf.clean_requirements_on_remove = False + base.conf.ignorearch = True + base.conf.sslverify = False + + # 禁用系统仓库和已安装包检查 + base.conf.cachedir = cache_dir + base.conf.config_file_path = cache_dir + base.conf.persistdir = cache_dir + + base.conf.installroot = os.path.abspath(rootfs) + + repo = base.repos.add_new_repo(repo_id, base.conf, baseurl=[repo_url]) + repo.enable() + + dnf.rpm.transaction.rpm.addMacro('_dbpath', '/var/lib/rpm') + # load remote data + base.fill_sack(load_system_repo=True, load_available_repos=True) + # 创建包请求 + base.install(package_name) + + # 解析依赖关系 + try: + base.resolve() + except dnf.exceptions.DepsolveError as e: + raise RuntimeError(f"Dependency resolution failed: {str(e)}") + base.download_packages(base.transaction.install_set) + base.do_transaction() + # 收集下载地址 + # rpm_urls = [] + # for pkg in base.transaction.install_set: + # location = pkg.remote_location() + # if location.startswith('/'): + # location = f"{repo.baseurl.rstrip('/')}/{location.lstrip('/')}" + # rpm_urls.append(location) + + # return rpm_urls + + # need delete var/log else raise error + # subprocess.run(f"rm -rf var/log/*", shell=True, cwd=d.getVar('IMAGE_ROOTFS'), text=True) + repo_url = f"{d.getVar('SERVER_MIRROR')}/{d.getVar('SERVER_VERSION')}/{d.getVar('SERVER_GROUP_TYPE')}/{d.getVar('TUNE_ARCH')}/" + cache_dir = f"{d.getVar('TOPDIR')}/cache/install_pkgs" + force_list = [] + with open(f"{d.getVar('TOPDIR')}/cache/INSTALL_PKG_LIST", 'r', encoding='utf-8') as f: + pkg_lists = f.read().replace("\n"," ") + for pkg in pkg_lists.split(): + if pkg == "": + continue + is_force = False + if ":force" in pkg: + pkg = pkg.split(":")[0] + force_list.append(pkg) + install_pkg(repo_url, d.getVar('IMAGE_ROOTFS'), cache_dir, pkg) + + base = init_base(repo_url) + # download server rpm + rpms_cache_dir = f"{d.getVar('TOPDIR')}/cache/rpms" + download_pre_dir = rpms_cache_dir+ \ + "/"+d.getVar('SERVER_VERSION')+ \ + "/"+d.getVar('SERVER_GROUP_TYPE')+ \ + "/"+d.getVar('TUNE_ARCH') + for pkg in force_list: + bb.plain(f"force pakcage: {pkg}") + pkg_dir = download_pre_dir+"/"+pkg + os.makedirs(name=pkg_dir, exist_ok=True) + rpm_info = get_package_details(base, pkg) + if rpm_info is None: + bb.plain(f"force pakcage: {pkg} info is None") + continue + if not os.path.exists(os.path.join(pkg_dir, rpm_info['Package'])): + res = subprocess.run(f"wget {rpm_info['Url']}", + shell=True, + stderr=subprocess.PIPE, + cwd=pkg_dir, + text=True) + if res.returncode != 0: + bb.fatal(res.stderr) + return + bb.plain(rpm_info['Package']) + res = subprocess.run(f"rpm -ivh --dbpath /var/lib/rpm --nosignature \ + --root {d.getVar('IMAGE_ROOTFS')} --nodeps --ignorearch {rpm_info['Package']} --force", + shell=True, + stderr=subprocess.PIPE, + cwd=pkg_dir, + text=True) + if res.returncode != 0: + bb.fatal(res.stderr) +} + +python do_run_post_action(){ + import os + import subprocess + + ln_list = ["/bin/bash:usr/bin/bash", + "/bin/pidof:usr/bin/pidof", + "/sbin/restorecon:usr/sbin/restorecon", + "/bin/sh:usr/bin/sh"] + for ln_line in ln_list: + ln_split = ln_line.split(":") + if os.path.join(d.getVar("IMAGE_ROOTFS"), ln_split[0]): + subprocess.run(f"ln -s {ln_split[0]} {ln_split[1]}",shell=True,cwd=d.getVar("IMAGE_ROOTFS"),text=True) +} + +addtask do_make_rootfs_db after do_rootfs before do_dnf_install_pkgs +addtask do_dnf_install_pkgs before do_run_post_action +addtask do_run_post_action before do_image diff --git a/meta-openeuler/classes/openeuler.bbclass b/meta-openeuler/classes/openeuler.bbclass index 00ffab66aa1dee5ac1f7c16cec6de466e02f813c..bf75025b1043ac91710f3a101e64b570a00cfe90 100644 --- a/meta-openeuler/classes/openeuler.bbclass +++ b/meta-openeuler/classes/openeuler.bbclass @@ -349,3 +349,9 @@ python do_openeuler_clean() { } addtask do_openeuler_clean before do_clean + +# OEBridge is designed to seamlessly integrate openEuler Embedded with the Euler +# northbound ecosystem. This enables openEuler Embedded to install server software +# packages via DNF, significantly reducing development complexity and simplifying +# software adaptation. +inherit ${@bb.utils.contains('DISTRO_FEATURES', 'oebridge', 'oebridge', '', d)} diff --git a/meta-openeuler/dynamic-layers/clang-layer/recipes-external/gcc/libgcc-external.bbappend b/meta-openeuler/dynamic-layers/clang-layer/recipes-external/gcc/libgcc-external.bbappend index 7770a6d80de51aadb02dcd79add777e138c19e8f..8d286be573828af9b9b8ac0d020c79b4ec78545d 100644 --- a/meta-openeuler/dynamic-layers/clang-layer/recipes-external/gcc/libgcc-external.bbappend +++ b/meta-openeuler/dynamic-layers/clang-layer/recipes-external/gcc/libgcc-external.bbappend @@ -4,3 +4,5 @@ # to prevent the strip. INHIBIT_SYSROOT_STRIP = "1" INHIBIT_PACKAGE_STRIP = "1" + +ASSUME_PROVIDE_PKGS = "libgcc" diff --git a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-extended/libpwquality/libpwquality_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-extended/libpwquality/libpwquality_%.bbappend index 069cc2bf0c40ab6d1949dcfed8fae7d020c98cb5..1eaaf80b4dbee1485793046fccc2df8afb0d0756 100644 --- a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-extended/libpwquality/libpwquality_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-extended/libpwquality/libpwquality_%.bbappend @@ -35,3 +35,5 @@ FILES:${PN} += "${base_libdir}/security/pam_pwquality.so" FILES:${PN}-dbg += "${base_libdir}/security/.debug" FILES:${PN}-staticdev += "${base_libdir}/security/pam_pwquality.a" FILES:${PN}-dev += "${base_libdir}/security/pam_pwquality.la" + +ASSUME_PROVIDE_PKGS = "libpwquality" diff --git a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/fuse/fuse_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/fuse/fuse_%.bbappend index e3bbdb9d2d9b970b874680784734b918fea910bf..cf29da4970c3b98cc4990a05bd8779a0d4afc380 100644 --- a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/fuse/fuse_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/fuse/fuse_%.bbappend @@ -18,3 +18,5 @@ SRC_URI:prepend = " \ file://0002-util-ulockmgr_server.c-conditionally-define-closefro.patch \ file://0003-add-fuse-test-dir.patch \ " + +ASSUME_PROVIDE_PKGS = "fuse fuse-common fuse-help" diff --git a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/lvm2/lvm2_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/lvm2/lvm2_%.bbappend index 124093d5322d6b66dc969db0c6cb9c2549d79367..74968dfc6ab9b61cdc4a662d78d91d655d1d70af 100644 --- a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/lvm2/lvm2_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/lvm2/lvm2_%.bbappend @@ -45,3 +45,5 @@ FILES:${PN} += " \ " RDEPENDS:${PN} = "bash" + +ASSUME_PROVIDE_PKGS ="device-mapper" diff --git a/meta-openeuler/recipes-bsp/grub/grub_%.bbappend b/meta-openeuler/recipes-bsp/grub/grub_%.bbappend index 1dcd06095b1c50a38b2eb3b8f67fdc5028fd2106..f8b79ab576e65fe692d8c7ad64b425abb102fb43 100644 --- a/meta-openeuler/recipes-bsp/grub/grub_%.bbappend +++ b/meta-openeuler/recipes-bsp/grub/grub_%.bbappend @@ -1,2 +1,4 @@ # main bbfile: yocto-poky/meta/recipes-bsp/grub/grub_git.bb require grub-source-openeuler.inc + +ASSUME_PROVIDE_PKGS = "grub2-common grub2-tools grub2-tools-minimal" diff --git a/meta-openeuler/recipes-connectivity/bluez5/bluez5_%.bbappend b/meta-openeuler/recipes-connectivity/bluez5/bluez5_%.bbappend index f618dcb53aa368ef4073a56ffd7d641b3d784e9f..ccb0bfe5f31f40142b4cc6d174435b100d06eebd 100644 --- a/meta-openeuler/recipes-connectivity/bluez5/bluez5_%.bbappend +++ b/meta-openeuler/recipes-connectivity/bluez5/bluez5_%.bbappend @@ -24,6 +24,8 @@ PACKAGECONFIG:remove = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', ' # testtools depends python3-core python3-dbus python3-pygobject, we do not need these RDEPENDS:${PN}-testtools:openeuler-prebuilt = "" +INSANE_SKIP:${PN}-testtools += "file-rdeps" + # From oe-core bluez5_5.71.bb EXTRA_OECONF += "--enable-pie" diff --git a/meta-openeuler/recipes-connectivity/openssl/openssl_%.bbappend b/meta-openeuler/recipes-connectivity/openssl/openssl_%.bbappend index 9e7e953799a972b7dfde1cd215529470cf283250..e48489790f6f5bc57f704312158e8523a32c65a8 100644 --- a/meta-openeuler/recipes-connectivity/openssl/openssl_%.bbappend +++ b/meta-openeuler/recipes-connectivity/openssl/openssl_%.bbappend @@ -72,3 +72,5 @@ do_install:append:class-nativesdk () { rm -f ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh install -m 644 ${WORKDIR}/environment.d-openeuler-openssl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh } + +ASSUME_PROVIDE_PKGS ="openssl openssl-libs" diff --git a/meta-openeuler/recipes-core/audit/audit_%.bbappend b/meta-openeuler/recipes-core/audit/audit_%.bbappend index 67e60b66f4dfc192adc722a8e5f49b063ad97c31..7baf47136a256088a95b234c6b869799c1429ea8 100644 --- a/meta-openeuler/recipes-core/audit/audit_%.bbappend +++ b/meta-openeuler/recipes-core/audit/audit_%.bbappend @@ -63,3 +63,5 @@ do_install:append() { do_install:append:arm() { sed -i "/arch=b64/d" ${D}/etc/audit/audit.rules } + +ASSUME_PROVIDE_PKGS = "audit-libs" diff --git a/meta-openeuler/recipes-core/base-files/base-files_%.bbappend b/meta-openeuler/recipes-core/base-files/base-files_%.bbappend index 4161ee3c77096f2f09e6cea9dc0fb0e9fb44650c..295f5fa0d730a4a8b7d5bc5e63c0500746c28cbc 100644 --- a/meta-openeuler/recipes-core/base-files/base-files_%.bbappend +++ b/meta-openeuler/recipes-core/base-files/base-files_%.bbappend @@ -23,3 +23,5 @@ do_install:append () { echo "${BANNERSTR}" >> ${D}${sysconfdir}/motd echo >> ${D}${sysconfdir}/motd } + +ASSUME_PROVIDE_PKGS:${PN} = "setup filesystem basesystem" diff --git a/meta-openeuler/recipes-core/busybox/busybox_%.bbappend b/meta-openeuler/recipes-core/busybox/busybox_%.bbappend index 7a1a42f3762cdc4b20ce915881c7debf63a6ce82..70f2afb8873f331acc918fe10aa3e10d9d22aed6 100644 --- a/meta-openeuler/recipes-core/busybox/busybox_%.bbappend +++ b/meta-openeuler/recipes-core/busybox/busybox_%.bbappend @@ -59,3 +59,5 @@ do_install:append () { } SRC_URI[tarball.sha256sum] = "b8cc24c9574d809e7279c3be349795c5d5ceb6fdf19ca709f80cde50e47de314" + +ASSUME_PROVIDE_PKGS = "which cpio vim-minimal diffutils systemd systemd-libs systemd-udev" diff --git a/meta-openeuler/recipes-core/coreutils/coreutils_%.bbappend b/meta-openeuler/recipes-core/coreutils/coreutils_%.bbappend index 2d9c3d12afcab6283b374e374aea46dbdd993fe2..e1d461e505a5863de7207a49064d65d1bd201a40 100644 --- a/meta-openeuler/recipes-core/coreutils/coreutils_%.bbappend +++ b/meta-openeuler/recipes-core/coreutils/coreutils_%.bbappend @@ -34,3 +34,5 @@ SRC_URI:prepend = " \ " SRC_URI[sha256sum] = "ea613a4cf44612326e917201bbbcdfbd301de21ffc3b59b6e5c07e040b275e52" + +ASSUME_PROVIDE_PKGS = "coreutils" diff --git a/meta-openeuler/recipes-core/dbus/dbus_%.bbappend b/meta-openeuler/recipes-core/dbus/dbus_%.bbappend index 9ec7a5c506f09d910c291ab1274a691fb5940558..291dfce1fbd04245c80e1c07ab1f49b7f9d29d93 100644 --- a/meta-openeuler/recipes-core/dbus/dbus_%.bbappend +++ b/meta-openeuler/recipes-core/dbus/dbus_%.bbappend @@ -67,3 +67,5 @@ do_install() { # Remove /var/run as it is created on startup rm -rf ${D}${localstatedir}/run } + +ASSUME_PROVIDE_PKGS = "dbus dbus-common dbus-daemon dbus-libs dbus-tools" diff --git a/meta-openeuler/recipes-core/expat/expat_%.bbappend b/meta-openeuler/recipes-core/expat/expat_%.bbappend index f5aed692570d65bb3877fdafad6863adbb8b61cf..e14d836fe4224f7fc1437010eed74326b1f49aab 100644 --- a/meta-openeuler/recipes-core/expat/expat_%.bbappend +++ b/meta-openeuler/recipes-core/expat/expat_%.bbappend @@ -11,3 +11,5 @@ SRC_URI[sha256sum] = "9c7c1b5dcbc3c237c500a8fb1493e14d9582146dd9b42aa8d3ffb856a3 SRC_URI = " \ file://${BP}.tar.gz \ " + +ASSUME_PROVIDE_PKGS = "expat" diff --git a/meta-openeuler/recipes-core/gettext/gettext_%.bbappend b/meta-openeuler/recipes-core/gettext/gettext_%.bbappend index 63fe65e9533d1cd1e6223c689058a6f0e4a01f05..2fb65ce14177310c4bc942ac3216360affae6a90 100644 --- a/meta-openeuler/recipes-core/gettext/gettext_%.bbappend +++ b/meta-openeuler/recipes-core/gettext/gettext_%.bbappend @@ -1 +1,3 @@ require gettext-openeuler-src.inc + +ASSUME_PROVIDE_PKGS = "gettext" diff --git a/meta-openeuler/recipes-core/glib-2.0/glib-2.0_%.bbappend b/meta-openeuler/recipes-core/glib-2.0/glib-2.0_%.bbappend index f4bd93e43d164d26d38ff7753c7b89cee59dd443..1b86866f8aee1950d870b99b046d42226cbaef3e 100644 --- a/meta-openeuler/recipes-core/glib-2.0/glib-2.0_%.bbappend +++ b/meta-openeuler/recipes-core/glib-2.0/glib-2.0_%.bbappend @@ -84,3 +84,5 @@ do_install:append () { chrpath --delete ${D}${libdir}/libgmodule-2.0.so fi } + +ASSUME_PROVIDE_PKGS = "glib2" diff --git a/meta-openeuler/recipes-core/images/openeuler-image-common.inc b/meta-openeuler/recipes-core/images/openeuler-image-common.inc index b4a5e7e0758c2bb9250db8e4b22914fa76a8236b..52e139f2ca77660ba3329c593ef85e7ac47360eb 100644 --- a/meta-openeuler/recipes-core/images/openeuler-image-common.inc +++ b/meta-openeuler/recipes-core/images/openeuler-image-common.inc @@ -7,6 +7,8 @@ packagegroup-base-extended \ packagegroup-network \ packagegroup-kernel-modules \ packagegroup-core-full-cmdline \ +libgpg-error \ +libgcrypt \ " # no extra language settings diff --git a/meta-openeuler/recipes-core/images/openeuler-image.bb b/meta-openeuler/recipes-core/images/openeuler-image.bb index 7ec2a6679a10d126df0fce7f07e7eb3273b58f87..71efbbd63cd1dbd895fbbea222cdf66b051055dc 100644 --- a/meta-openeuler/recipes-core/images/openeuler-image.bb +++ b/meta-openeuler/recipes-core/images/openeuler-image.bb @@ -30,6 +30,7 @@ ${@bb.utils.contains("DISTRO_FEATURES", "isulad", "packagegroup-isulad", "", d)} ${@bb.utils.contains("DISTRO_FEATURES", "preempt-rt", "packagegroup-preempt-rt", "", d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "dsoftbus", "packagegroup-dsoftbus", "", d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "benchmarks", "packagegroup-openeuler-benchmarks", "", d)} \ +${@bb.utils.contains("DISTRO_FEATURES", "oebridge", "packagegroup-oebridge", "", d)} \ " # You can add extra user here, suck like: diff --git a/meta-openeuler/recipes-core/kbd/kbd_%.bbappend b/meta-openeuler/recipes-core/kbd/kbd_%.bbappend index 37cc5d6fce4f29f6ab241ed58eb59c59d2f1c2f6..3010d8dedde63c4aa49125d50e985db61b63e5d8 100644 --- a/meta-openeuler/recipes-core/kbd/kbd_%.bbappend +++ b/meta-openeuler/recipes-core/kbd/kbd_%.bbappend @@ -19,3 +19,5 @@ SRC_URI:prepend = "file://${BP}.tar.xz \ SRC_URI[sha256sum] = "ccdf452387a6380973d2927363e9cbb939fa2068915a6f937ff9d24522024683" EXTRA_OECONF = "--disable-tests" + +ASSUME_PROVIDE_PKGS = "kbd" diff --git a/meta-openeuler/recipes-core/libseccomp/libseccomp_%.bbappend b/meta-openeuler/recipes-core/libseccomp/libseccomp_%.bbappend index 2d2e946952128f191aa639f56d0773338fb1e381..74a1e238aa5b9e40e440c097aadc4a08faf1a6d6 100644 --- a/meta-openeuler/recipes-core/libseccomp/libseccomp_%.bbappend +++ b/meta-openeuler/recipes-core/libseccomp/libseccomp_%.bbappend @@ -11,3 +11,5 @@ SRC_URI:prepend = " \ " S = "${WORKDIR}/${BP}" + +ASSUME_PROVIDE_PKGS = "libseccomp" diff --git a/meta-openeuler/recipes-core/libxcrypt/libxcrypt_%.bbappend b/meta-openeuler/recipes-core/libxcrypt/libxcrypt_%.bbappend index 13d3c53384fb6a090bc3274f4d33234f40e1173c..7aea51285f4725e40630760c454628ca690d2a83 100644 --- a/meta-openeuler/recipes-core/libxcrypt/libxcrypt_%.bbappend +++ b/meta-openeuler/recipes-core/libxcrypt/libxcrypt_%.bbappend @@ -6,3 +6,5 @@ SRC_URI:prepend = "file://v${PV}.tar.gz \ " S = "${WORKDIR}/${BP}" + +ASSUME_PROVIDE_PKGS = "libxcrypt" diff --git a/meta-openeuler/recipes-core/libxml/libxml2_%.bbappend b/meta-openeuler/recipes-core/libxml/libxml2_%.bbappend index add20ccdb0267ee2a1957d0bd48d93fb4f3516f0..8a795003b56fc39c57ec804bc3f524b1d9a2ed60 100644 --- a/meta-openeuler/recipes-core/libxml/libxml2_%.bbappend +++ b/meta-openeuler/recipes-core/libxml/libxml2_%.bbappend @@ -17,3 +17,5 @@ LIC_FILES_CHKSUM = "file://Copyright;md5=fec7ecfe714722b2bb0aaff7d200c701 \ do_configure:remove() { find ${S}/xmlconf/ -type f -exec chmod -x {} \+ } + +ASSUME_PROVIDE_PKGS = "libxml2" diff --git a/meta-openeuler/recipes-core/ncurses/ncurses_%.bbappend b/meta-openeuler/recipes-core/ncurses/ncurses_%.bbappend index a970549a83d4a114584f90b64757be8795ef5518..eadfd3fd5dd4b47192719830cdb8bc31eb6ca2ae 100644 --- a/meta-openeuler/recipes-core/ncurses/ncurses_%.bbappend +++ b/meta-openeuler/recipes-core/ncurses/ncurses_%.bbappend @@ -30,3 +30,5 @@ SRC_URI += "\ " S = "${WORKDIR}/${BP}" + +ASSUME_PROVIDE_PKGS = "ncurses-libs ncurses-base ncureses" diff --git a/meta-openeuler/recipes-core/os-release/os-release.bbappend b/meta-openeuler/recipes-core/os-release/os-release.bbappend index 6b67f0cc39a1bd04e0030157c639aebdf325f261..49c243ebcb2b8e7805a7e752c80e5db36bfb174d 100644 --- a/meta-openeuler/recipes-core/os-release/os-release.bbappend +++ b/meta-openeuler/recipes-core/os-release/os-release.bbappend @@ -25,3 +25,5 @@ OS_RELEASE_FIELDS:append = " BUILD_ID OEE_REVISION" # Ensure the git commands run every time bitbake is invoked. BB_DONT_CACHE = "1" + +ASSUME_PROVIDE_PKGS:${PN} = "openEuler-repos openEuler-release openEuler-gpg-keys" diff --git a/meta-openeuler/recipes-core/packagegroups/packagegroup-oebridge.bb b/meta-openeuler/recipes-core/packagegroups/packagegroup-oebridge.bb new file mode 100644 index 0000000000000000000000000000000000000000..1b0ba275ed4cc753963c95e68f3a173f031ea97b --- /dev/null +++ b/meta-openeuler/recipes-core/packagegroups/packagegroup-oebridge.bb @@ -0,0 +1,79 @@ +SUMMARY = "packagegroup of oebridge" +PR = "r1" +inherit packagegroup + +INSTALL_PKG_LISTS = " \ +libsigsegv \ +libev \ +info \ +chkconfig \ +kbd-legacy \ +kbd-misc \ +keyutils-libs \ +libutempter \ +libverto \ +man-db \ +newt \ +slang \ +kpartx \ +openssl-pkcs11 \ +crypto-policies \ +dracut \ +krb5-libs \ +libkcapi \ +os-prober \ +grubby \ +dnf \ +rpm \ +python3:force \ +libstdc++:force \ +libgomp:force \ +libvorbis:force \ +libogg:force \ +ncurses-libs:force \ +libsndfile:force \ +libsamplerate:force \ +flac:force \ +glib2:force \ +avahi-libs:force \ +gobject-introspection:force \ +" + +python() { + import os + import subprocess + + # write INSTALL_PKG_LISTS to a file for getting install pkg list when do_rootfs + with open(f"{d.getVar('TOPDIR')}/cache/INSTALL_PKG_LIST", 'w', encoding='utf-8') as f: + f.write(d.getVar('INSTALL_PKG_LISTS').replace(" ", "\n")) + + d.setVar("ASSUME_PROVIDE_PKGS", d.getVar('INSTALL_PKG_LISTS')) + + # repo_url = f"{d.getVar('SERVER_MIRROR')}/{d.getVar('SERVER_VERSION')}/{d.getVar('SERVER_GROUP_TYPE')}/{d.getVar('TUNE_ARCH')}/" + # base = init_base(repo_url) + # download_pre_dir = rpms_cache_dir+ \ + # "/"+d.getVar('SERVER_VERSION')+ \ + # "/"+d.getVar('SERVER_GROUP_TYPE')+ \ + # "/"+d.getVar('TUNE_ARCH') + + # for rpm_name in d.getVar('INSTALL_PKG_LISTS').split("\n"): + # rpm_mame = rpm_name.strip() + # if rpm_name == "": + # continue + # pn_dir = download_pre_dir+"/"+rpm_name + # os.makedirs(name=pn_dir, exist_ok=True) + # rpm_info = get_package_details(base, rpm_name) + # if rpm_info is None: + # continue + # if os.path.exists(os.path.join(pn_dir, rpm_info['Package'])): + # continue + # # download rpm + # res = subprocess.run(f"wget {rpm_info['Url']}", + # shell=True, + # stderr=subprocess.PIPE, + # cwd=pn_dir, + # text=True) + # if res.returncode != 0: + # bb.fatal(res.stderr) + # return +} \ No newline at end of file diff --git a/meta-openeuler/recipes-core/readline/readline_%.bbappend b/meta-openeuler/recipes-core/readline/readline_%.bbappend index 9be421e97746f0925289563f6fc9016da0e2bce8..361e13de8d5b7f7b5cda46e51cba54072f126be8 100644 --- a/meta-openeuler/recipes-core/readline/readline_%.bbappend +++ b/meta-openeuler/recipes-core/readline/readline_%.bbappend @@ -20,3 +20,5 @@ SRC_URI[archive.sha256sum] = "a3d4637cdbd76f3cbc9566db90306a6af7bef90b291f7c9bc5 # diff from oe 8.2 bb # see: http://cgit.openembedded.org/openembedded-core/plain/meta/recipes-core/readline/readline.inc EXTRA_OECONF += "bash_cv_termcap_lib=ncurses --with-shared-termcap-library" + +ASSUME_PROVIDE_PKGS = "readline" diff --git a/meta-openeuler/recipes-core/selinux/libselinux_%.bbappend b/meta-openeuler/recipes-core/selinux/libselinux_%.bbappend index 5e9bc3edde600dd4ecceb23a0d0ff5f496c278ac..f87957a345fc11a8955a8581e705789ce044c7bd 100644 --- a/meta-openeuler/recipes-core/selinux/libselinux_%.bbappend +++ b/meta-openeuler/recipes-core/selinux/libselinux_%.bbappend @@ -17,3 +17,5 @@ SRC_URI:prepend = "file://${BP}.tar.gz \ SRC_URI += "file://0003-libselinux-restore-drop-the-obsolete-LSF-transitiona.patch" S = "${WORKDIR}/${BP}" + +ASSUME_PROVIDE_PKGS = "libselinux" diff --git a/meta-openeuler/recipes-core/selinux/libsemanage_%.bbappend b/meta-openeuler/recipes-core/selinux/libsemanage_%.bbappend index 5ce627be50fcd3309428c548b9ab0563643c9f2c..e6cc06c8e52d2ca7144740f102ea7d4b3654503f 100644 --- a/meta-openeuler/recipes-core/selinux/libsemanage_%.bbappend +++ b/meta-openeuler/recipes-core/selinux/libsemanage_%.bbappend @@ -8,3 +8,5 @@ SRC_URI:prepend = "file://${BP}.tar.gz \ " S = "${WORKDIR}/${BP}" + +ASSUME_PROVIDE_PKGS = "libsemanage" diff --git a/meta-openeuler/recipes-core/selinux/libsepol_%.bbappend b/meta-openeuler/recipes-core/selinux/libsepol_%.bbappend index 57df5c0723026dafaeb702f34ad7aecd7d15be0d..e73a4ae1dcab6e2c6ff4ee04eba85b9f84de6760 100644 --- a/meta-openeuler/recipes-core/selinux/libsepol_%.bbappend +++ b/meta-openeuler/recipes-core/selinux/libsepol_%.bbappend @@ -10,3 +10,5 @@ SRC_URI:prepend = "file://${BP}.tar.gz \ " S = "${WORKDIR}/${BP}" + +ASSUME_PROVIDE_PKGS = "libsepol" diff --git a/meta-openeuler/recipes-core/systemd/systemd_253.7.bb b/meta-openeuler/recipes-core/systemd/systemd_253.7.bb index 1fd4556afd0e7a9446485171f28ce53d89c19ba2..09c732c7a61b55b7ddfc509b92bd89f9efc75dc5 100644 --- a/meta-openeuler/recipes-core/systemd/systemd_253.7.bb +++ b/meta-openeuler/recipes-core/systemd/systemd_253.7.bb @@ -834,3 +834,5 @@ pkg_postinst:udev-hwdb () { pkg_prerm:udev-hwdb () { rm -f $D${sysconfdir}/udev/hwdb.bin } + +ASSUME_PROVIDE_PKGS = "systemd systemd-libs systemd-udev" diff --git a/meta-openeuler/recipes-core/tzdata/tzdata.bbappend b/meta-openeuler/recipes-core/tzdata/tzdata.bbappend index cae5ac752f9c477514ef0bb84e5e466f92219ea4..9fc16f17db603a50c9e6db35fce7e47d1440fd00 100644 --- a/meta-openeuler/recipes-core/tzdata/tzdata.bbappend +++ b/meta-openeuler/recipes-core/tzdata/tzdata.bbappend @@ -57,3 +57,5 @@ do_install:openeuler-prebuilt() { chown -R root:root ${D} } + +ASSUME_PROVIDE_PKGS = "tzdata" diff --git a/meta-openeuler/recipes-core/util-linux/util-linux-libuuid_%.bbappend b/meta-openeuler/recipes-core/util-linux/util-linux-libuuid_%.bbappend index 239a0648726dc6d9253126a17b4a331383dffedf..a75b7bcf4bbbae26a73231245d0f3661f7998c6d 100644 --- a/meta-openeuler/recipes-core/util-linux/util-linux-libuuid_%.bbappend +++ b/meta-openeuler/recipes-core/util-linux/util-linux-libuuid_%.bbappend @@ -2,3 +2,5 @@ require util-linux-common.inc # code is the same with util-linux OPENEULER_LOCAL_NAME = "util-linux" + +ASSUME_PROVIDE_PKGS = "libuuid" diff --git a/meta-openeuler/recipes-core/util-linux/util-linux_%.bbappend b/meta-openeuler/recipes-core/util-linux/util-linux_%.bbappend index a81d337b4fa533c849365ab4a0cf66313653df09..fc0f005524b8cc5c911a1ab078a7a3fbd44c062d 100644 --- a/meta-openeuler/recipes-core/util-linux/util-linux_%.bbappend +++ b/meta-openeuler/recipes-core/util-linux/util-linux_%.bbappend @@ -5,3 +5,5 @@ PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" RRECOMMENDS:${PN}-ptest += " kernel-module-algif-hash " ALTERNATIVE_LINK_NAME[ipcrm] = "${bindir}/ipcrm" ALTERNATIVE_LINK_NAME[ipcs] = "${bindir}/ipcs" + +ASSUME_PROVIDE_PKGS = "libsmartcols libmount libblkid libfdisk util-linux" diff --git a/meta-openeuler/recipes-core/zlib/zlib_%.bbappend b/meta-openeuler/recipes-core/zlib/zlib_%.bbappend index 7273439c282f585e1e075604666cefc387064b4d..c0e2affd40edac16ea776f65283a34cfb36b5aac 100644 --- a/meta-openeuler/recipes-core/zlib/zlib_%.bbappend +++ b/meta-openeuler/recipes-core/zlib/zlib_%.bbappend @@ -24,3 +24,5 @@ do_configure() { LDCONFIG=true ${S}/configure --prefix=${prefix} --shared --libdir=${libdir} --uname=GNU } do_configure[cleandirs] += "${B}" + +ASSUME_PROVIDE_PKGS = "zlib" diff --git a/meta-openeuler/recipes-devtools/dnf/dnf_%.bbappend b/meta-openeuler/recipes-devtools/dnf/dnf_%.bbappend index b500bfd544e97e83fb54314a5e1c381768d9569b..50d583842f483daeb09f03c72df2797addb85617 100644 --- a/meta-openeuler/recipes-devtools/dnf/dnf_%.bbappend +++ b/meta-openeuler/recipes-devtools/dnf/dnf_%.bbappend @@ -39,7 +39,7 @@ FILES:${PN}:append:class-target = " \ do_install:append:class-target() { mkdir -p ${D}/etc/yum.repos.d/ || echo "" - local version_dir="openEuler-${DISTRO_VERSION}" + local version_dir="${@bb.utils.contains("DISTRO_FEATURES", "oebridge", "${SERVER_VERSION}", "openEuler-${DISTRO_VERSION}", d)}" sed -i "s/OPENEULER_VER/${version_dir}/g" ${WORKDIR}/openEuler.repo cp -f ${WORKDIR}/openEuler.repo ${D}/etc/yum.repos.d/ } diff --git a/meta-openeuler/recipes-devtools/e2fsprogs/e2fsprogs_%.bbappend b/meta-openeuler/recipes-devtools/e2fsprogs/e2fsprogs_%.bbappend index 393e2a6c6d2ff7ab98804337feebb586094a6ec2..48a4f64f3cd41373ab4a0ce1471dbe7adb698c27 100644 --- a/meta-openeuler/recipes-devtools/e2fsprogs/e2fsprogs_%.bbappend +++ b/meta-openeuler/recipes-devtools/e2fsprogs/e2fsprogs_%.bbappend @@ -34,3 +34,5 @@ SRC_URI += " \ SRC_URI[sha256sum] = "144af53f2bbd921cef6f8bea88bb9faddca865da3fbc657cc9b4d2001097d5db" EXTRA_OECONF += "--enable-largefile" + +ASSUME_PROVIDE_PKGS = "e2fsprogs e2fsprogs-help" diff --git a/meta-openeuler/recipes-devtools/file/file_%.bbappend b/meta-openeuler/recipes-devtools/file/file_%.bbappend index 09d81c0db101cff9bcbd0c3fdf39ae9286affb72..763d64d40c895fc52c756d50b7ea71a8db96dafb 100644 --- a/meta-openeuler/recipes-devtools/file/file_%.bbappend +++ b/meta-openeuler/recipes-devtools/file/file_%.bbappend @@ -7,3 +7,5 @@ SRC_URI = " \ file://0001-file-localmagic.patch \ " SRC_URI[sha256sum] = "3751c7fba8dbc831cb8d7cc8aff21035459b8ce5155ef8b0880a27d028475f3b" + +ASSUME_PROVIDE_PKGS = "file-libs file" diff --git a/meta-openeuler/recipes-extended/bash/bash_%.bbappend b/meta-openeuler/recipes-extended/bash/bash_%.bbappend index 3ce70b5a8f0352455c9db40cdc2f5942131b62cf..a2ae4c1a3b67a43ebe8fcb782c175efd257ac0be 100644 --- a/meta-openeuler/recipes-extended/bash/bash_%.bbappend +++ b/meta-openeuler/recipes-extended/bash/bash_%.bbappend @@ -40,3 +40,5 @@ SRC_URI[tarball.sha256sum] = "c8e31bdc59b69aaffc5b36509905ba3e5cbb12747091d27b4b # When testing the performance of the shell using UnixBench, we found that the sh of busybox(ash) # outperformed bash, so we still make sh link to busybox instead of bash. ALTERNATIVE:${PN}:remove = "sh" + +ASSUME_PROVIDE_PKGS = "bash" diff --git a/meta-openeuler/recipes-extended/bc/bc_%.bbappend b/meta-openeuler/recipes-extended/bc/bc_%.bbappend index 2fe564c43601c713f2428fa5c5b72f4fc0a3e691..b3c2749842eeae7b9e552329aab4cfca36de78c4 100644 --- a/meta-openeuler/recipes-extended/bc/bc_%.bbappend +++ b/meta-openeuler/recipes-extended/bc/bc_%.bbappend @@ -1 +1,3 @@ SRC_URI:prepend = " file://${BP}.tar.gz " + +ASSUME_PROVIDE_PKGS = "bc" diff --git a/meta-openeuler/recipes-extended/bzip2/bzip2_%.bbappend b/meta-openeuler/recipes-extended/bzip2/bzip2_%.bbappend index 329cab5e5523639c7ff34c8ad5aece4b741e9344..fcdecf37301988965f6c26de0967b04ff1bc82ec 100644 --- a/meta-openeuler/recipes-extended/bzip2/bzip2_%.bbappend +++ b/meta-openeuler/recipes-extended/bzip2/bzip2_%.bbappend @@ -14,3 +14,5 @@ SRC_URI:append = " \ file://0003-license-and-version-print-should-output-to-stdout-and-exit-with-code-0.patch \ file://bzip2-1.0.8-toolchain-variable.patch \ " + +ASSUME_PROVIDE_PKGS = "bzip2" diff --git a/meta-openeuler/recipes-extended/cracklib/cracklib_%.bbappend b/meta-openeuler/recipes-extended/cracklib/cracklib_%.bbappend index daefd6f582996a51a204181677d40b3f3564d810..0363ac0127605cc6e6be0ea917951138d51964f9 100644 --- a/meta-openeuler/recipes-extended/cracklib/cracklib_%.bbappend +++ b/meta-openeuler/recipes-extended/cracklib/cracklib_%.bbappend @@ -30,3 +30,5 @@ do_configure:prepend() { SRC_URI[md5sum] = "48a0c8810ec4780b99c0a4f9931c21c6" SRC_URI[sha256sum] = "8b6fd202f3f1d8fa395d3b7a5d821227cfd8bb4a9a584a7ae30cf62cea6287dd" + +ASSUME_PROVIDE_PKGS = "cracklib" diff --git a/meta-openeuler/recipes-extended/cronie/cronie_%.bbappend b/meta-openeuler/recipes-extended/cronie/cronie_%.bbappend index be3073edb08876dfb02514414206cd32cdb17e47..503f15d8a6a95963ce5c7665f791bc0f4cd990f6 100644 --- a/meta-openeuler/recipes-extended/cronie/cronie_%.bbappend +++ b/meta-openeuler/recipes-extended/cronie/cronie_%.bbappend @@ -9,3 +9,5 @@ SRC_URI += " \ SRC_URI[md5sum] = "de07b7229520bc859d987c721bab87c5" SRC_URI[sha256sum] = "2cd0f0dd1680e6b9c39bf1e3a5e7ad6df76aa940de1ee90a453633aa59984e62" + +ASSUME_PROVIDE_PKGS ="crontabs cronie" diff --git a/meta-openeuler/recipes-extended/findutils/findutils_%.bbappend b/meta-openeuler/recipes-extended/findutils/findutils_%.bbappend index 0e843967a91264e25519de99848ebd4e40994463..1fadc11fca9d78ced3d326a2d7f50d9eac5e48af 100644 --- a/meta-openeuler/recipes-extended/findutils/findutils_%.bbappend +++ b/meta-openeuler/recipes-extended/findutils/findutils_%.bbappend @@ -10,3 +10,5 @@ SRC_URI += " \ " SRC_URI[sha256sum] = "1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5" + +ASSUME_PROVIDE_PKGS = "findutils" diff --git a/meta-openeuler/recipes-extended/gawk/gawk_%.bbappend b/meta-openeuler/recipes-extended/gawk/gawk_%.bbappend index 24a0d0d0c0c99bdc54698c46b0360581e057cef5..1e3a06278c1626b08182ccb1ffd1e2f0b54bdc6f 100644 --- a/meta-openeuler/recipes-extended/gawk/gawk_%.bbappend +++ b/meta-openeuler/recipes-extended/gawk/gawk_%.bbappend @@ -28,3 +28,5 @@ do_install:append() { # Strip non-reproducible build flags (containing build paths) sed -i -e 's|^CC.*|CC=""|g' -e 's|^CFLAGS.*|CFLAGS=""|g' ${D}${bindir}/gawkbug } + +ASSUME_PROVIDE_PKGS = "gawk" diff --git a/meta-openeuler/recipes-extended/grep/grep_%.bbappend b/meta-openeuler/recipes-extended/grep/grep_%.bbappend index 724e4f63b449206a65d5a7163a9e44dc7e7d8bcd..09b541d427a836958f2a7dbf4f6ba8284d51f6c5 100644 --- a/meta-openeuler/recipes-extended/grep/grep_%.bbappend +++ b/meta-openeuler/recipes-extended/grep/grep_%.bbappend @@ -15,3 +15,5 @@ SRC_URI:prepend = " \ " SRC_URI[sha256sum] = "498d7cc1b4fb081904d87343febb73475cf771e424fb7e6141aff66013abc382" + +ASSUME_PROVIDE_PKGS = "grep" diff --git a/meta-openeuler/recipes-extended/groff/groff_%.bbappend b/meta-openeuler/recipes-extended/groff/groff_%.bbappend index 3ca3594f546b6651bf83c8937bb9e9fbcbda9609..6c8f502198d5ac6b1e66d38e8b5772aacab2736a 100644 --- a/meta-openeuler/recipes-extended/groff/groff_%.bbappend +++ b/meta-openeuler/recipes-extended/groff/groff_%.bbappend @@ -45,3 +45,5 @@ do_install:append() { # strip hosttool path out of generated files sed -i -e 's:${HOSTTOOLS_DIR}/::g' ${D}${docdir}/${BP}/examples/hdtbl/*.roff } + +ASSUME_PROVIDE_PKGS = "groff-base" diff --git a/meta-openeuler/recipes-extended/gzip/gzip_%.bbappend b/meta-openeuler/recipes-extended/gzip/gzip_%.bbappend index 3bcb96c5495114a368c26cbae638345472982732..a6fd8be52ffd16ccaa0ce5ff15dfdd149b9b114a 100644 --- a/meta-openeuler/recipes-extended/gzip/gzip_%.bbappend +++ b/meta-openeuler/recipes-extended/gzip/gzip_%.bbappend @@ -19,3 +19,5 @@ SRC_URI:remove = " \ LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ file://gzip.h;beginline=8;endline=20;md5=6e47caaa630e0c8bf9f1bc8d94a8ed0e" SRC_URI[sha256sum] = "ce5e03e519f637e1f814011ace35c4f87b33c0bbabeec35baf5fbd3479e91956" + +ASSUME_PROVIDE_PKGS = "gzip" diff --git a/meta-openeuler/recipes-extended/less/less_%.bbappend b/meta-openeuler/recipes-extended/less/less_%.bbappend index 380449835b5943b6b89cd5f3cb494ea1f9bf44eb..20a8b2fb8ee1b5c4ebe0c85322575f6976d9f018 100644 --- a/meta-openeuler/recipes-extended/less/less_%.bbappend +++ b/meta-openeuler/recipes-extended/less/less_%.bbappend @@ -16,3 +16,5 @@ SRC_URI = "file://${BP}.tar.gz \ SRC_URI[md5sum] = "1cdec714569d830a68f4cff11203cdba" SRC_URI[sha256sum] = "a69abe2e0a126777e021d3b73aa3222e1b261f10e64624d41ec079685a6ac209" + +ASSUME_PROVIDE_PKGS = "less" diff --git a/meta-openeuler/recipes-extended/libnsl/libnsl2_%.bbappend b/meta-openeuler/recipes-extended/libnsl/libnsl2_%.bbappend index 73805e6247699041258e5d7b742f53d3cb1e1f4a..d2bea962db57f1a7fe5433d2da0c0813c3f4277c 100644 --- a/meta-openeuler/recipes-extended/libnsl/libnsl2_%.bbappend +++ b/meta-openeuler/recipes-extended/libnsl/libnsl2_%.bbappend @@ -12,3 +12,5 @@ SRC_URI:append = " \ SRC_URI[tarball.md5sum] = "e1ee6772c2ee5ddc25ea465a33af3004" SRC_URI[tarball.sha256sum] = "eb37be57c1cf650b3a8a4fc7cd66c8b3dfc06215b41956a16325a9388171bc40" + +ASSUME_PROVIDE_PKGS = "libnsl2" diff --git a/meta-openeuler/recipes-extended/libtirpc/libtirpc_%.bbappend b/meta-openeuler/recipes-extended/libtirpc/libtirpc_%.bbappend index f07ffab47ed756f2d205841979a1b1d34255c482..2b1d0b67d0701207cb2cb87792e82180370c47d1 100644 --- a/meta-openeuler/recipes-extended/libtirpc/libtirpc_%.bbappend +++ b/meta-openeuler/recipes-extended/libtirpc/libtirpc_%.bbappend @@ -20,3 +20,5 @@ PACKAGECONFIG ??= "\ " PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6" PACKAGECONFIG[gssapi] = "--enable-gssapi,--disable-gssapi,krb5" + +ASSUME_PROVIDE_PKGS = "libtirpc" diff --git a/meta-openeuler/recipes-extended/pam/libpam_%.bbappend b/meta-openeuler/recipes-extended/pam/libpam_%.bbappend index 69b1580afe24d1cfbd845e3a0d8166e387fbe952..35229826361a1184ff5394e715bfa99b63d543b0 100644 --- a/meta-openeuler/recipes-extended/pam/libpam_%.bbappend +++ b/meta-openeuler/recipes-extended/pam/libpam_%.bbappend @@ -115,4 +115,6 @@ do_install_ptest() { ANY_OF_DISTRO_FEATURES = "pam systemd" -# ============= end from 1.5.3.bb ============= \ No newline at end of file +# ============= end from 1.5.3.bb ============= + +ASSUME_PROVIDE_PKGS = "pam" diff --git a/meta-openeuler/recipes-extended/pigz/pigz_%.bbappend b/meta-openeuler/recipes-extended/pigz/pigz_%.bbappend index ab523156da7a13ac51feaa7bb8b6b7d5bd27546d..4ea0965669aa48363aa31fa2fb3e5be6adf06a0d 100644 --- a/meta-openeuler/recipes-extended/pigz/pigz_%.bbappend +++ b/meta-openeuler/recipes-extended/pigz/pigz_%.bbappend @@ -7,3 +7,5 @@ SRC_URI:prepend = " file://${BP}.tar.gz \ " SRC_URI[sha256sum] = "eb872b4f0e1f0ebe59c9f7bd8c506c4204893ba6a8492de31df416f0d5170fd0" + +ASSUME_PROVIDE_PKGS = "pigz" diff --git a/meta-openeuler/recipes-extended/procps/procps_%.bbappend b/meta-openeuler/recipes-extended/procps/procps_%.bbappend index b143b146190cdd8b49a37dc03f21b9cd5bbd4ad2..87ed6b6d076df7d2466411a572e98819edd9726d 100644 --- a/meta-openeuler/recipes-extended/procps/procps_%.bbappend +++ b/meta-openeuler/recipes-extended/procps/procps_%.bbappend @@ -45,3 +45,5 @@ do_configure:prepend() { } SRC_URI[sha256sum] = "ee3fcd2ea6ff94aa43a81ba5cc7912b7c9615acd2911c7a3d3ea081287fdf47a" + +ASSUME_PROVIDE_PKGS = "procps" diff --git a/meta-openeuler/recipes-extended/sed/sed_%.bbappend b/meta-openeuler/recipes-extended/sed/sed_%.bbappend index 46bb708733bb9e9d460bde31ebfbe3a56ff58672..2ff36e296f4170f3d573baa0f97104db1af80ee5 100644 --- a/meta-openeuler/recipes-extended/sed/sed_%.bbappend +++ b/meta-openeuler/recipes-extended/sed/sed_%.bbappend @@ -12,3 +12,5 @@ SRC_URI += " \ file://sed/backport-sed-c-flag.patch \ file://backport-sed-fix-symlink-bufsize-readlink-check.patch \ " + +ASSUME_PROVIDE_PKGS = "sed" diff --git a/meta-openeuler/recipes-extended/shadow/shadow_%.bbappend b/meta-openeuler/recipes-extended/shadow/shadow_%.bbappend index c9eaf7a2afbe61f219faab6e5c670752a0fe2110..a1038344d61736a2beb59549c374f49a726ce7eb 100644 --- a/meta-openeuler/recipes-extended/shadow/shadow_%.bbappend +++ b/meta-openeuler/recipes-extended/shadow/shadow_%.bbappend @@ -102,3 +102,5 @@ INSANE_SKIP:${PN}:class-native = "already-stripped" # keep as 4.13 recipe PAM_PLUGINS:remove = "pam-plugin-lastlog" + +ASSUME_PROVIDE_PKGS = "shadow shadow-subid-devel" diff --git a/meta-openeuler/recipes-extended/texinfo/texinfo_%.bbappend b/meta-openeuler/recipes-extended/texinfo/texinfo_%.bbappend index b1aa23637c40618ab369a673f35162612b267850..e38a2e19eaba55a052fb9883bceb59f0d895c574 100644 --- a/meta-openeuler/recipes-extended/texinfo/texinfo_%.bbappend +++ b/meta-openeuler/recipes-extended/texinfo/texinfo_%.bbappend @@ -22,3 +22,5 @@ FILES:${PN}-doc = "${infodir}/texi* \ ${mandir}/man1 ${mandir}/man5" S = "${WORKDIR}/${BP}" + +ASSUME_PROVIDE_PKGS = "info openEuler-gpg-keys" diff --git a/meta-openeuler/recipes-extended/xz/xz_%.bbappend b/meta-openeuler/recipes-extended/xz/xz_%.bbappend index 99b69da652dc5ca52e0ad7218dd55b071efa6149..87b4846f64305ad02b8aaba303ec38cdf7e73dad 100644 --- a/meta-openeuler/recipes-extended/xz/xz_%.bbappend +++ b/meta-openeuler/recipes-extended/xz/xz_%.bbappend @@ -13,3 +13,5 @@ SRC_URI += " \ file://${BP}.tar.xz \ file://xz-5213-547-562-libtool.patch \ " + +ASSUME_PROVIDE_PKGS = "xz-libs xz" diff --git a/meta-openeuler/recipes-external/gcc/gcc-runtime-external.bb b/meta-openeuler/recipes-external/gcc/gcc-runtime-external.bb index 183f1076d0ef594ffe18150b2d5b2837b73ea2be..eafc7d1f864f6dd53ad2093072fa3e059114a6a8 100644 --- a/meta-openeuler/recipes-external/gcc/gcc-runtime-external.bb +++ b/meta-openeuler/recipes-external/gcc/gcc-runtime-external.bb @@ -115,4 +115,6 @@ do_deploy_source_date_epoch () { else echo "${SDE_FILE} not found!" fi -} \ No newline at end of file +} + +ASSUME_PROVIDE_PKGS = "libstdc++ libgomp" diff --git a/meta-openeuler/recipes-external/gcc/libgcc-external.bb b/meta-openeuler/recipes-external/gcc/libgcc-external.bb index 699e5936106b77fbb8f9eaf54a66174b08a7c182..5c01dde66910aae2e0fa22c77f12bbfae64e5b40 100644 --- a/meta-openeuler/recipes-external/gcc/libgcc-external.bb +++ b/meta-openeuler/recipes-external/gcc/libgcc-external.bb @@ -89,3 +89,5 @@ python add_sys_symlink () { pn = d.getVar('PN') d.appendVar('FILES:%s-dev' % pn, ' ${libdir}/${TARGET_SYS}') } + +ASSUME_PROVIDE_PKGS = "libgcc" diff --git a/meta-openeuler/recipes-external/glibc/glibc-external.bb b/meta-openeuler/recipes-external/glibc/glibc-external.bb index fe23c694633401b66f80157726ef5f51d6d4101d..26a2fdfb888209c2555abb983a86df18352ceb3c 100644 --- a/meta-openeuler/recipes-external/glibc/glibc-external.bb +++ b/meta-openeuler/recipes-external/glibc/glibc-external.bb @@ -302,3 +302,5 @@ RDEPENDS:${PN}-dev:remove = "${LINUX_LIBC_RDEP_REMOVE}" FILES:${PN}-dev:remove = "${base_libdir}/*_nonshared.a ${libdir}/*_nonshared.a" FILES:${PN}-dev += "${libdir}/libc_nonshared.a ${libdir}/libpthread_nonshared.a ${libdir}/libmvec_nonshared.a" + +ASSUME_PROVIDE_PKGS:${PN} = "glibc glibc-common" diff --git a/meta-openeuler/recipes-graphics/xorg-lib/libxkbcommon_%.bbappend b/meta-openeuler/recipes-graphics/xorg-lib/libxkbcommon_%.bbappend index 044b2d6a93cfb78f9d10287cc61dd36d8161492d..ceb3905685d4d77081a4129b8b94c9a7fcca9262 100644 --- a/meta-openeuler/recipes-graphics/xorg-lib/libxkbcommon_%.bbappend +++ b/meta-openeuler/recipes-graphics/xorg-lib/libxkbcommon_%.bbappend @@ -9,3 +9,5 @@ SRC_URI[sha256sum] = "0edc14eccdd391514458bc5f5a4b99863ed2d651e4dd761a90abf4f46e inherit bash-completion BBCLASSEXTEND += "native" CVE_PRODUCT += "xkbcommon:libxkbcommon" + +ASSUME_PROVIDE_PKGS = "libxkcommon" diff --git a/meta-openeuler/recipes-graphics/xorg-lib/xkeyboard-config_%.bbappend b/meta-openeuler/recipes-graphics/xorg-lib/xkeyboard-config_%.bbappend index db4ffd6f5b0e200e35139d6a68920fa6309c8a2d..32b1b082e5f9af8db80a62d4bc9670563ef92e3b 100644 --- a/meta-openeuler/recipes-graphics/xorg-lib/xkeyboard-config_%.bbappend +++ b/meta-openeuler/recipes-graphics/xorg-lib/xkeyboard-config_%.bbappend @@ -9,3 +9,5 @@ SRC_URI:prepend = " \ " BBCLASSEXTEND += "native" + +ASSUME_PROVIDE_PKGS = "xkeyboard-config" diff --git a/meta-openeuler/recipes-kernel/kmod/kmod_%.bbappend b/meta-openeuler/recipes-kernel/kmod/kmod_%.bbappend index 8604ed058a75ebc785704ee9812b9745dc209461..844059338093d5c41d85c3428dfa6a5f65c6ade3 100644 --- a/meta-openeuler/recipes-kernel/kmod/kmod_%.bbappend +++ b/meta-openeuler/recipes-kernel/kmod/kmod_%.bbappend @@ -19,3 +19,5 @@ SRC_URI[sha256sum] = "f897dd72698dc6ac1ef03255cd0a5734ad932318e4adbaebc7338ef2f5 # yocto-poky specifies 'S = "${WORKDIR}/git', but since we are using the openeuler package, # we need to re-specify it S = "${WORKDIR}/${BP}" + +ASSUME_PROVIDE_PKGS = "kmod kmod-libs" diff --git a/meta-openeuler/recipes-multimedia/libpng/libpng_%.bbappend b/meta-openeuler/recipes-multimedia/libpng/libpng_%.bbappend index 78b210eef5cee68c6ddddbee6b0e529ba1f7741b..3ba36245ddafa4cc8238f6bf2a9a80047f4ff034 100644 --- a/meta-openeuler/recipes-multimedia/libpng/libpng_%.bbappend +++ b/meta-openeuler/recipes-multimedia/libpng/libpng_%.bbappend @@ -9,3 +9,5 @@ SRC_URI:prepend = "file://${BP}.tar.gz \ " SRC_URI[sha256sum] = "6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c" + +ASSUME_PROVIDE_PKGS = "libpng" diff --git a/meta-openeuler/recipes-support/acl/acl_%.bbappend b/meta-openeuler/recipes-support/acl/acl_%.bbappend index 3a7bdd62cc8c049b40b119f5755436306e323dec..68b614d476c7364969e5cdd4c8801655184161c7 100644 --- a/meta-openeuler/recipes-support/acl/acl_%.bbappend +++ b/meta-openeuler/recipes-support/acl/acl_%.bbappend @@ -11,3 +11,5 @@ SRC_URI = "file://${BP}.tar.xz \ # because PV is different, the md5 and sha256 should also be updated SRC_URI[md5sum] = "3cecb80cb0a52a0b273e6698ba642263" SRC_URI[sha256sum] = "5f2bdbad629707aa7d85c623f994aa8a1d2dec55a73de5205bac0bf6058a2f7c" + +ASSUME_PROVIDE_PKGS = "libacl" diff --git a/meta-openeuler/recipes-support/attr/attr_%.bbappend b/meta-openeuler/recipes-support/attr/attr_%.bbappend index 938eaf5c0f5e1a45feb0228f10c3757e4a2a71a7..b84ce5f577b26cb3c38a4bb9385e53bb9ad87514 100644 --- a/meta-openeuler/recipes-support/attr/attr_%.bbappend +++ b/meta-openeuler/recipes-support/attr/attr_%.bbappend @@ -10,3 +10,5 @@ SRC_URI += " \ file://0003-attr-eliminate-a-dead-store-in-attr_copy_action.patch \ file://0004-fix-stale-attr-references.patch \ " + +ASSUME_PROVIDE_PKGS = "attr" diff --git a/meta-openeuler/recipes-support/ca-certificates/ca-certificates_2023.2.64.bb b/meta-openeuler/recipes-support/ca-certificates/ca-certificates_2023.2.64.bb index 5518d49d387e14a163eaffc5320a62e68743f005..26b5cc8644d2c68aab18afab93869ec72ee52f37 100644 --- a/meta-openeuler/recipes-support/ca-certificates/ca-certificates_2023.2.64.bb +++ b/meta-openeuler/recipes-support/ca-certificates/ca-certificates_2023.2.64.bb @@ -234,3 +234,5 @@ do_install:append:class-native () { RDEPENDS:${PN} += "p11-kit" BBCLASSEXTEND = "native nativesdk" + +ASSUME_PROVIDE_PKGS = "ca-certificates" diff --git a/meta-openeuler/recipes-support/gdbm/gdbm_%.bbappend b/meta-openeuler/recipes-support/gdbm/gdbm_%.bbappend index 07da6cc3fefa54578204728f720f0350345ce1b5..1752200d887439b9704842896940aaf59feda5cf 100644 --- a/meta-openeuler/recipes-support/gdbm/gdbm_%.bbappend +++ b/meta-openeuler/recipes-support/gdbm/gdbm_%.bbappend @@ -26,3 +26,5 @@ SRC_URI[sha256sum] = "f366c823a6724af313b6bbe975b2809f9a157e5f6a43612a72949138d1 # openeuler patch need bison binary DEPENDS += "bison-native" + +ASSUME_PROVIDE_PKGS = "gdbm" diff --git a/meta-openeuler/recipes-support/gmp/gmp_%.bbappend b/meta-openeuler/recipes-support/gmp/gmp_%.bbappend index 0f20ae32adf935ff7391352be10955e7f25af132..bf84259ef8fd45b0071daeb1324b2884e900dbb0 100644 --- a/meta-openeuler/recipes-support/gmp/gmp_%.bbappend +++ b/meta-openeuler/recipes-support/gmp/gmp_%.bbappend @@ -14,3 +14,5 @@ SRC_URI:append = "file://${BP}.tar.xz \ SRC_URI[md5sum] = "956dc04e864001a9c22429f761f2c283" SRC_URI[sha256sum] = "a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898" + +ASSUME_PROVIDE_PKGS = "gmp" diff --git a/meta-openeuler/recipes-support/gnutls/libtasn1_%.bbappend b/meta-openeuler/recipes-support/gnutls/libtasn1_%.bbappend index 8a4a0baca12a156ca0129d6d1f89ec7a721bbe7d..382d2033c24fcf1b6759e154ba75f297468df8f5 100644 --- a/meta-openeuler/recipes-support/gnutls/libtasn1_%.bbappend +++ b/meta-openeuler/recipes-support/gnutls/libtasn1_%.bbappend @@ -1 +1,3 @@ SRC_URI:prepend = "file://${BP}.tar.gz " + +ASSUME_PROVIDE_PKGS = "libtasn1" diff --git a/meta-openeuler/recipes-support/libcap-ng/libcap-ng_%.bbappend b/meta-openeuler/recipes-support/libcap-ng/libcap-ng_%.bbappend index 3549b2f4c451f9b23eb838e0d1e9d1b59fde94ab..99ea1389b3b36e89937ef52286c0c01e87b38506 100644 --- a/meta-openeuler/recipes-support/libcap-ng/libcap-ng_%.bbappend +++ b/meta-openeuler/recipes-support/libcap-ng/libcap-ng_%.bbappend @@ -12,3 +12,5 @@ SRC_URI:append = " \ " S = "${WORKDIR}/${BP}" + +ASSUME_PROVIDE_PKGS = "libcap-ng" diff --git a/meta-openeuler/recipes-support/libcap/libcap_%.bbappend b/meta-openeuler/recipes-support/libcap/libcap_%.bbappend index aff81681c15672c4348a5eb08953bbbcac016e37..74cf37e5db778902b0fe329528b721b8d1cb6660 100644 --- a/meta-openeuler/recipes-support/libcap/libcap_%.bbappend +++ b/meta-openeuler/recipes-support/libcap/libcap_%.bbappend @@ -29,3 +29,5 @@ EXTRA_OEMAKE:class-target = " \ # The Go application for libcap does not currently support cross-compilation. # Turn it off so that it remains consistent with historical features. export GOLANG="no" + +ASSUME_PROVIDE_PKGS = "libcap" diff --git a/meta-openeuler/recipes-support/libevent/libevent_%.bbappend b/meta-openeuler/recipes-support/libevent/libevent_%.bbappend index ac90e05bf27aca7f6ef5ded03ee6530654086086..17943f37435182aa36f1b067eba14227d7ad75b7 100644 --- a/meta-openeuler/recipes-support/libevent/libevent_%.bbappend +++ b/meta-openeuler/recipes-support/libevent/libevent_%.bbappend @@ -16,3 +16,5 @@ SRC_URI:prepend = " \ file://0002-Avoid-calling-read-2-on-eventfd-on-each-event-loop-w.patch \ file://backport-Fix-potential-Null-pointer-dereference-in-regress_fi.patch \ " + +ASSUME_PROVIDE_PKGS = "libevent" diff --git a/meta-openeuler/recipes-support/libffi/libffi_%.bbappend b/meta-openeuler/recipes-support/libffi/libffi_%.bbappend index e4b3b16c2aae7135ab1a91f586990105ca15801a..c17d6fa4f8d00c25f690e3deba83d9556d528318 100644 --- a/meta-openeuler/recipes-support/libffi/libffi_%.bbappend +++ b/meta-openeuler/recipes-support/libffi/libffi_%.bbappend @@ -5,3 +5,5 @@ SRC_URI:prepend = " \ file://backport-Fix-signed-vs-unsigned-comparison.patch \ file://fix-AARCH64EB-support.patch \ " + +ASSUME_PROVIDE_PKGS = "libffi" diff --git a/meta-openeuler/recipes-support/libgcrypt/libgcrypt_%.bbappend b/meta-openeuler/recipes-support/libgcrypt/libgcrypt_%.bbappend index 76720574ec270c0161893fc1e51ae0fb0abd34f2..a6807b2b8f348792aeb348d814872125f0d3122a 100644 --- a/meta-openeuler/recipes-support/libgcrypt/libgcrypt_%.bbappend +++ b/meta-openeuler/recipes-support/libgcrypt/libgcrypt_%.bbappend @@ -7,3 +7,5 @@ SRC_URI:prepend = " \ file://${BP}.tar.bz2 \ file://Use-the-compiler-switch-O0-for-compiling-jitterentro.patch \ " + +ASSUME_PROVIDE_PKGS = "libgcrypt" diff --git a/meta-openeuler/recipes-support/libgpg-error/libgpg-error_%.bbappend b/meta-openeuler/recipes-support/libgpg-error/libgpg-error_%.bbappend index 95cb2e21493c282d0292f325a3d34d9f1f4d5a52..c22f4170a44aa94f98d60a2344afc5d9493ee39b 100644 --- a/meta-openeuler/recipes-support/libgpg-error/libgpg-error_%.bbappend +++ b/meta-openeuler/recipes-support/libgpg-error/libgpg-error_%.bbappend @@ -19,3 +19,5 @@ SRC_URI += "file://pkgconfig-fix.patch" SRC_URI:prepend = "file://${BP}.tar.bz2 \ file://libgpg-error-1.48-multilib.patch \ " + +ASSUME_PROVIDE_PKGS = "libgpg-error" diff --git a/meta-openeuler/recipes-support/libpcre/libpcre2_%.bbappend b/meta-openeuler/recipes-support/libpcre/libpcre2_%.bbappend index ff5b006774b251c75d0ad14ca2198008bcfaced0..03f247d46c7be343458e52cfdf097b82fb7e654a 100644 --- a/meta-openeuler/recipes-support/libpcre/libpcre2_%.bbappend +++ b/meta-openeuler/recipes-support/libpcre/libpcre2_%.bbappend @@ -33,3 +33,5 @@ SRC_URI:prepend = "file://pcre2-${PV}.tar.bz2 \ " SRC_URI[sha256sum] = "8d36cd8cb6ea2a4c2bb358ff6411b0c788633a2a45dabbf1aeb4b701d1b5e840" + +ASSUME_PROVIDE_PKGS = "pcre2" diff --git a/meta-openeuler/recipes-support/libunistring/libunistring_%.bbappend b/meta-openeuler/recipes-support/libunistring/libunistring_%.bbappend index f69beb7318ad013e4ac121189ea09dd41332e3af..44e6eae7a9ddb6731b208921c813bc46109fea05 100644 --- a/meta-openeuler/recipes-support/libunistring/libunistring_%.bbappend +++ b/meta-openeuler/recipes-support/libunistring/libunistring_%.bbappend @@ -10,4 +10,6 @@ SRC_URI:prepend = " \ SRC_URI[tarball.md5sum] = "db08bb384e81968957f997ec9808926e" SRC_URI[tarball.sha256sum] = "eb8fb2c3e4b6e2d336608377050892b54c3c983b646c561836550863003c05d7" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6" \ No newline at end of file +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6" + +ASSUME_PROVIDE_PKGS = "libunistring" diff --git a/meta-openeuler/recipes-support/lz4/lz4_%.bbappend b/meta-openeuler/recipes-support/lz4/lz4_%.bbappend index e4d63536c6be42eb8dada17ce57883386a12df9b..d054ca5273b7b9c45c6057088175aedbd43409ca 100644 --- a/meta-openeuler/recipes-support/lz4/lz4_%.bbappend +++ b/meta-openeuler/recipes-support/lz4/lz4_%.bbappend @@ -26,3 +26,5 @@ SRC_URI[tarball.sha256sum] = "030644df4611007ff7dc962d981f390361e6c97a34e5cbc393 # 1.10.0 version need to change EXTRA_OEMAKE, otherwise some header files can't be found EXTRA_OEMAKE = "DESTDIR=${D} BUILD_STATIC=no" + +ASSUME_PROVIDE_PKGS = "lz4" diff --git a/meta-openeuler/recipes-support/mpfr/mpfr_%.bbappend b/meta-openeuler/recipes-support/mpfr/mpfr_%.bbappend index 385ad88fe7aa1874d546eb58f81014812e4a6730..efd43a3cac3c5cc2ca9d707918a2fdc52966c4c6 100644 --- a/meta-openeuler/recipes-support/mpfr/mpfr_%.bbappend +++ b/meta-openeuler/recipes-support/mpfr/mpfr_%.bbappend @@ -8,4 +8,6 @@ SRC_URI:append = " \ SRC_URI[sha256sum] = "06a378df13501248c1b2db5aa977a2c8126ae849a9d9b7be2546fb4a9c26d993" -DEPENDS = "gmp autoconf-archive-native" \ No newline at end of file +DEPENDS = "gmp autoconf-archive-native" + +ASSUME_PROVIDE_PKGS = "mpfr" diff --git a/meta-openeuler/recipes-support/p11-kit/p11-kit_%.bbappend b/meta-openeuler/recipes-support/p11-kit/p11-kit_%.bbappend index 16b975f6f0fada51b007c9fdaf26a79115f510ce..2c2f1a0c3b25287231e29912e5d38ac4d25f20e5 100644 --- a/meta-openeuler/recipes-support/p11-kit/p11-kit_%.bbappend +++ b/meta-openeuler/recipes-support/p11-kit/p11-kit_%.bbappend @@ -23,3 +23,5 @@ BBCLASSEXTEND += " native" # but if we do not include the path /usr/share/pki/ca-trust-source, # the trusted certificates installed by ca-certificates package will not be found. EXTRA_OEMESON += "-Dtrust_paths=/etc/pki/ca-trust/source:/usr/share/pki/ca-trust-source" + +ASSUME_PROVIDE_PKGS = "p11-kit p11-kit-trust" diff --git a/meta-openeuler/recipes-support/popt/popt_%.bbappend b/meta-openeuler/recipes-support/popt/popt_%.bbappend index 75f8ec43e7d4fee6c8b76a35246b4fbbcc3eba18..9c183180e235505a059a479eb1f0d47026c76818 100644 --- a/meta-openeuler/recipes-support/popt/popt_%.bbappend +++ b/meta-openeuler/recipes-support/popt/popt_%.bbappend @@ -17,3 +17,5 @@ SRC_URI:prepend = "file://${BP}.tar.gz \ SRC_URI[md5sum] = "eaa2135fddb6eb03f2c87ee1823e5a78" SRC_URI[sha256sum] = "bef3de159bcd61adf98bb7cc87ee9046e944644ad76b7633f18ab063edb29e57" LIC_FILES_CHKSUM = "file://COPYING;md5=e0206ac9471d06667e076212db20c5f4" + +ASSUME_PROVIDE_PKGS = "popt" diff --git a/meta-openeuler/recipes-support/shared-mime-info/shared-mime-info_%.bbappend b/meta-openeuler/recipes-support/shared-mime-info/shared-mime-info_%.bbappend index 79d6a95fd7e32351c52d946eae18d369a697d728..581b3e11d4e6cc2a923d49313eba6c7041f9fa31 100644 --- a/meta-openeuler/recipes-support/shared-mime-info/shared-mime-info_%.bbappend +++ b/meta-openeuler/recipes-support/shared-mime-info/shared-mime-info_%.bbappend @@ -18,3 +18,5 @@ SRC_URI:append = " \ " S = "${WORKDIR}/${BP}" + +ASSUME_PROVIDE_PKGS = "shared-mime-info"