Skip to content

Commit a893ed7

Browse files
authored
Resolve fetcher failures (#85)
- Fix the URL to fetch msopenjdk - Revert the workaround to add resolv.conf in chroot introduced earlier. - Do not add path to RPM repository in PACKAGE_URL_LIST
1 parent 08683d2 commit a893ed7

File tree

3 files changed

+2
-8
lines changed

3 files changed

+2
-8
lines changed

toolkit/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,7 @@ SOURCE_URL ?= https://files-rs.edgeorchestration.intel.com/files-edge-or
143143
# assignments do not take affect without using 'override'. This means that all of the following PACKAGE_URL_LIST values will
144144
# be ignored if the user sets any value.
145145
##help:var:PACKAGE_URL_LIST:<urls_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'.
146-
PACKAGE_URL_LIST ?= https://files-rs.edgeorchestration.intel.com/files-edge-orch/microvisor/rpm/$(RELEASE_MAJOR_ID)
147-
PACKAGE_URL_LIST += https://files-rs.edgeorchestration.intel.com/files-edge-orch/microvisor/rpm/$(RELEASE_MAJOR_ID)/RPMS/x86_64
146+
PACKAGE_URL_LIST ?= https://files-rs.edgeorchestration.intel.com/files-edge-orch/microvisor/rpm/$(RELEASE_MAJOR_ID)/RPMS/x86_64
148147
PACKAGE_URL_LIST += https://files-rs.edgeorchestration.intel.com/files-edge-orch/microvisor/rpm/$(RELEASE_MAJOR_ID)/RPMS/noarch
149148
PACKAGE_URL_LIST += https://files-rs.edgeorchestration.intel.com/files-edge-orch/microvisor/rpm/$(RELEASE_MAJOR_ID)/RPMS/debuginfo
150149

toolkit/scripts/toolchain/build_official_toolchain_rpms.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ start_record_timestamp "build packages/install"
348348
# Download JDK rpm
349349
echo "Downloading MsOpenJDK rpm"
350350
MSOPENJDK_FILENAME="msopenjdk-17-17.0.12-1.$(uname -m).rpm"
351-
MSOPENJDK_URL="https://files-rs.edgeorchestration.intel.com/files-edge-orch/microvisor/rpm/3.0/RPM/$(uname -m)/$MSOPENJDK_FILENAME"
351+
MSOPENJDK_URL="https://files-rs.edgeorchestration.intel.com/files-edge-orch/microvisor/rpm/3.0/RPMS/$(uname -m)/$MSOPENJDK_FILENAME"
352352
case $(uname -m) in
353353
x86_64) MSOPENJDK_EXPECTED_HASH="ec41e3ccf6f78c49f2ee2373df80b375ed3c2d5d97eac412b7ade0f045b0d9f4" ;;
354354
aarch64) MSOPENJDK_EXPECTED_HASH="0532d42d5c010152c09e88971f9aecd84af54f935973bbf0f1eba2c1c6839726" ;;

toolkit/tools/internal/packagerepo/repocloner/rpmrepocloner/rpmrepocloner.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,11 +182,6 @@ func (r *RpmRepoCloner) initialize(destinationDir, tmpDir, workerTar, existingRp
182182
return
183183
}
184184

185-
files := []safechroot.FileToCopy{
186-
{Src: "/etc/resolv.conf", Dest: "/etc/resolv.conf"},
187-
}
188-
err = r.chroot.AddFiles(files...)
189-
190185
// The 'cacheRepoDir' repo is only used during Docker based builds, which don't
191186
// use overlay so cache repo must be explicitly initialized.
192187
// We make sure it's present during all builds to avoid noisy TDNF error messages in the logs.

0 commit comments

Comments
 (0)