diff --git a/SPECS/edge-repos/edge-base.repo b/SPECS/edge-repos/edge-base.repo index b87dd87a4b..cf1aac843e 100755 --- a/SPECS/edge-repos/edge-base.repo +++ b/SPECS/edge-repos/edge-base.repo @@ -1,6 +1,6 @@ [edge-base] name=Edge Base $releasever $basearch -baseurl=https://files-rs.edgeorchestration.intel.com/files-edge-orch/microvisor/rpm/3.0/ +baseurl=https://files-rs.edgeorchestration.intel.com/files-edge-orch/microvisor/rpms/3.0/base/ gpgkey=file:///etc/pki/rpm-gpg/INTEL-RPM-GPG-KEY gpgcheck=1 repo_gpgcheck=0 diff --git a/SPECS/edge-repos/edge-repos.signatures.json b/SPECS/edge-repos/edge-repos.signatures.json index 86a2af63c8..349d107f25 100644 --- a/SPECS/edge-repos/edge-repos.signatures.json +++ b/SPECS/edge-repos/edge-repos.signatures.json @@ -1,6 +1,6 @@ { "Signatures": { - "edge-base.repo": "5193b38582bd23705715df7c23a5a4cc6e0fbf7ffe5ced82b0ebe5297382a7c6", + "edge-base.repo": "c33244959fbc4dbb9a65983aa8bd1360d8457ba2f85bc56e87462464ff6ce769", "INTEL-RPM-GPG-KEY": "90cf27d0aff4e69a11cc3da2e492a383e05e681cafff23525e796c6494d58336" } } diff --git a/SPECS/edge-repos/edge-repos.spec b/SPECS/edge-repos/edge-repos.spec index 5965f47283..1583f5dc03 100644 --- a/SPECS/edge-repos/edge-repos.spec +++ b/SPECS/edge-repos/edge-repos.spec @@ -1,7 +1,7 @@ Summary: Edge Microvisor Toolkit repo files, gpg keys Name: edge-repos Version: 3.0 -Release: 4%{?dist} +Release: 5%{?dist} License: MIT Vendor: Intel Corporation Distribution: Edge Microvisor Toolkit @@ -54,6 +54,9 @@ gpg --batch --yes --delete-keys 84910237BDFAAD16C4F9D44411FF864ABDCE8692 %{_sysconfdir}/pki/rpm-gpg/INTEL-RPM-GPG-KEY %changelog +* Mon Oct 06 2025 Lishan Liu - 3.0-5 +- Update repo URL + * Mon Apr 21 2025 Mun Chun Yep - 3.0-4 - Update Intel rpm gpg key and repo URL. - License verified diff --git a/toolkit/Makefile b/toolkit/Makefile index 759b698370..6c26de8442 100644 --- a/toolkit/Makefile +++ b/toolkit/Makefile @@ -143,14 +143,13 @@ SOURCE_URL ?= https://files-rs.edgeorchestration.intel.com/files-edge-or # assignments do not take affect without using 'override'. This means that all of the following PACKAGE_URL_LIST values will # be ignored if the user sets any value. ##help:var:PACKAGE_URL_LIST:=Space-separated list of URLs to download toolchain RPM packages from, used to populate the toolchain packages if `REBUILD_TOOLCHAIN=n'. The URLs will replace the default set of URLs. Print default list with 'make -s printvar-PACKAGE_URL_LIST'. -PACKAGE_URL_LIST ?= https://files-rs.edgeorchestration.intel.com/files-edge-orch/microvisor/rpm/$(RELEASE_MAJOR_ID)/RPMS/x86_64 -PACKAGE_URL_LIST += https://files-rs.edgeorchestration.intel.com/files-edge-orch/microvisor/rpm/$(RELEASE_MAJOR_ID)/RPMS/noarch -PACKAGE_URL_LIST += https://files-rs.edgeorchestration.intel.com/files-edge-orch/microvisor/rpm/$(RELEASE_MAJOR_ID)/RPMS/debuginfo +PACKAGE_URL_LIST ?= https://files-rs.edgeorchestration.intel.com/files-edge-orch/microvisor/rpms/$(RELEASE_MAJOR_ID)/base +PACKAGE_URL_LIST += https://files-rs.edgeorchestration.intel.com/files-edge-orch/microvisor/rpms/$(RELEASE_MAJOR_ID)/debuginfo -PACKAGE_REPO_LIST ?= https://files-rs.edgeorchestration.intel.com/files-edge-orch/microvisor/rpm/$(RELEASE_MAJOR_ID) +PACKAGE_REPO_LIST ?= $(PACKAGE_URL_LIST) -REPO_LIST ?= -SRPM_URL_LIST ?= https://files-rs.edgeorchestration.intel.com/files-edge-orch/microvisor/rpm/$(RELEASE_MAJOR_ID)/SRPMS +REPO_LIST ?= +SRPM_URL_LIST ?= https://files-rs.edgeorchestration.intel.com/files-edge-orch/microvisor/rpms/$(RELEASE_MAJOR_ID)/srpm ##help:var:VALIDATE_TOOLCHAIN_GPG={y,n}=Enable or disable GPG validation of the toolchain RPMs. If enabled toolchain RPMs will be validated against the GPG keys in the TOOLCHAIN_GPG_VALIDATION_KEYS variable. On by default when using upstream toolchain RPMs. # Based on REBUILD_TOOLCHAIN and DAILY_BUILD_ID. If REBUILD_TOOLCHAIN is set to 'y' or DAILY_BUILD_ID is set to any non-empty value, then GPG validation is disabled by default. diff --git a/toolkit/resources/manifests/package/development.repo b/toolkit/resources/manifests/package/development.repo index a110df4ef4..abdf729484 100644 --- a/toolkit/resources/manifests/package/development.repo +++ b/toolkit/resources/manifests/package/development.repo @@ -1,6 +1,6 @@ [development-repo] name=development Repo -baseurl=http://rpm-edgemicrovisor.intel.com/3.0 +baseurl=http://rpm-emt.intel.com/pulp/content/emt-3.0-test-base enabled=1 gpgcheck=0 skip_if_unavailable=1 diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index ce1715d2df..18683bfa18 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -213,8 +213,8 @@ libltdl-2.4.7-1.emt3.x86_64.rpm libltdl-devel-2.4.7-1.emt3.x86_64.rpm lua-5.4.6-1.emt3.x86_64.rpm lua-libs-5.4.6-1.emt3.x86_64.rpm -edge-repos-3.0-4.emt3.noarch.rpm -edge-repos-shared-3.0-4.emt3.noarch.rpm +edge-repos-3.0-5.emt3.noarch.rpm +edge-repos-shared-3.0-5.emt3.noarch.rpm tdnf-3.5.8-10.emt3.x86_64.rpm tdnf-cli-libs-3.5.8-10.emt3.x86_64.rpm tdnf-devel-3.5.8-10.emt3.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index c390f01db3..e68cd467ec 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -72,8 +72,8 @@ e2fsprogs-devel-1.47.0-2.emt3.x86_64.rpm e2fsprogs-lang-1.47.0-2.emt3.x86_64.rpm e2fsprogs-libs-1.47.0-2.emt3.x86_64.rpm edge-check-macros-3.0-2.emt3.noarch.rpm -edge-repos-3.0-4.emt3.noarch.rpm -edge-repos-shared-3.0-4.emt3.noarch.rpm +edge-repos-3.0-5.emt3.noarch.rpm +edge-repos-shared-3.0-5.emt3.noarch.rpm edge-rpm-macros-3.0-2.emt3.noarch.rpm elfutils-0.189-6.emt3.x86_64.rpm elfutils-debuginfo-0.189-6.emt3.x86_64.rpm diff --git a/toolkit/scripts/daily_build.mk b/toolkit/scripts/daily_build.mk index 55ef1f19c4..e114565021 100644 --- a/toolkit/scripts/daily_build.mk +++ b/toolkit/scripts/daily_build.mk @@ -65,6 +65,8 @@ endif ifneq ($(DAILY_BUILD_REPO),) PACKAGE_ROOT := $(shell grep -m 1 "baseurl" $(DAILY_BUILD_REPO) | sed 's|baseurl=||g') + PACKAGE_DEBUGINFO := $(subst base,debuginfo,$(PACKAGE_ROOT)) + PACKAGE_SRPM := $(subst base,srpm,$(PACKAGE_ROOT)) $(warning ) $(warning ######################### WARNING #########################) $(warning Using a Daily Build Repo at following location:) @@ -72,12 +74,11 @@ ifneq ($(DAILY_BUILD_REPO),) $(warning ######################### WARNING #########################) $(warning ) override PACKAGE_URL_LIST := $(PACKAGE_URL_LIST) \ - $(PACKAGE_ROOT)/RPMS/x86_64 \ - $(PACKAGE_ROOT)/RPMS/noarch \ - $(PACKAGE_ROOT)/RPMS/debuginfo + $(PACKAGE_ROOT) \ + $(PACKAGE_DEBUGINFO) override SRPM_URL_LIST := $(SRPM_URL_LIST) \ - $(PACKAGE_ROOT)/SRPMS + $(PACKAGE_SRPM) override PACKAGE_REPO_LIST := $(PACKAGE_REPO_LIST) \ $(PACKAGE_ROOT) diff --git a/toolkit/scripts/toolchain/build_official_toolchain_rpms.sh b/toolkit/scripts/toolchain/build_official_toolchain_rpms.sh index 553201ecbc..6a33782796 100755 --- a/toolkit/scripts/toolchain/build_official_toolchain_rpms.sh +++ b/toolkit/scripts/toolchain/build_official_toolchain_rpms.sh @@ -348,7 +348,7 @@ start_record_timestamp "build packages/install" # Download JDK rpm echo "Downloading MsOpenJDK rpm" MSOPENJDK_FILENAME="msopenjdk-17-17.0.12-1.$(uname -m).rpm" -MSOPENJDK_URL="https://files-rs.edgeorchestration.intel.com/files-edge-orch/microvisor/rpm/3.0/RPMS/$(uname -m)/$MSOPENJDK_FILENAME" +MSOPENJDK_URL="https://files-rs.edgeorchestration.intel.com/files-edge-orch/microvisor/rpms/3.0/base/Packages/m/$MSOPENJDK_FILENAME" case $(uname -m) in x86_64) MSOPENJDK_EXPECTED_HASH="ec41e3ccf6f78c49f2ee2373df80b375ed3c2d5d97eac412b7ade0f045b0d9f4" ;; aarch64) MSOPENJDK_EXPECTED_HASH="0532d42d5c010152c09e88971f9aecd84af54f935973bbf0f1eba2c1c6839726" ;; diff --git a/toolkit/scripts/toolchain/download_toolchain_rpm.sh b/toolkit/scripts/toolchain/download_toolchain_rpm.sh index 92de52431f..0548c2c739 100755 --- a/toolkit/scripts/toolchain/download_toolchain_rpm.sh +++ b/toolkit/scripts/toolchain/download_toolchain_rpm.sh @@ -165,7 +165,8 @@ function download() { log_num=$((log_num + 1)) attempt_log_file="$log_file.$log_num" src_url="$url/$rpm_name" - + first_char=$(echo "${rpm_name:0:1}" | tr '[:upper:]' '[:lower:]') + src_url="$url/Packages/$first_char/$rpm_name" echo "$src_url -> $attempt_log_file" >> "$log_file" { $downloader_tool $cert $key --no-clobber --output-file="$dst_file" --log-file="$attempt_log_file" "$src_url" 1>/dev/null 2>&1 ; res=$? ; } || true