代码拉取完成,页面将自动刷新
From af2b093c7e100cff83c0ea6f89cafec6fa3f4940 Mon Sep 17 00:00:00 2001
From: Zheng Zengkai <[email protected]>
Date: Sat, 26 Oct 2024 14:32:57 +0800
Subject: [PATCH 1/3] lkp-setup-rootfs: fix boot failure during linux pkgbuild
job
After submitting linux pkgbuild job by using following commands:
"submit pkgbuild.yaml testbox=dc-8g upstream_repo=l/linux/linux-next
pkgbuild_repo=pkgbuild/aur-l/linux _upstream_url=https://mirrors.
tuna.tsinghua.edu.cn/git/linux-next.git _upstream_dir=upstream
_pkgbuild_source=https://git.archlinux.org/linux.git
pkg_ver=v1 config=openeuler_defconfig_arm64
upstream_commit=2c85ebc57b3e os=openeuler os_version=22.03-lts-sp4"
The docker will hang during install_http_proxy().
The commit aacec1ea725d ("fix:/lkp/lkp/src/bin/lkp-setup-rootfs:
source not found") removed the source command and add an extra blank
space between the "." and the "$shell_profile" by mistake.
Considering current use cases, there is no need to add the http proxy
setting in the shell_profile, so get rid of it and set the http proxy
directly.
Signed-off-by: Zheng Zengkai <[email protected]>
---
bin/lkp-setup-rootfs | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/bin/lkp-setup-rootfs b/bin/lkp-setup-rootfs
index ef57517b8..45a5eda25 100755
--- a/bin/lkp-setup-rootfs
+++ b/bin/lkp-setup-rootfs
@@ -224,11 +224,9 @@ install_goproxy()
install_http_proxy()
{
- local shell_profile=$(shell_profile)
- [ -n "$HTTP_PROXY" ] && echo "export http_proxy=$HTTP_PROXY" >> "$shell_profile"
- [ -n "$HTTPS_PROXY" ] && echo "export https_proxy=$HTTPS_PROXY" >> "$shell_profile"
- [ -n "$NO_PROXY" ] && echo "export no_proxy=$NO_PROXY" >> "$shell_profile"
- . "$shell_profile"
+ [ -n "$HTTP_PROXY" ] && export http_proxy=$HTTP_PROXY
+ [ -n "$HTTPS_PROXY" ] && export https_proxy=$HTTPS_PROXY
+ [ -n "$NO_PROXY" ] && export no_proxy=$NO_PROXY
}
install_git_proxy()
--
2.23.0
此处可能存在不合适展示的内容,页面不予展示。您可通过相关编辑功能自查并修改。
如您确认内容无涉及 不当用语 / 纯广告导流 / 暴力 / 低俗色情 / 侵权 / 盗版 / 虚假 / 无价值内容或违法国家有关法律法规的内容,可点击提交进行申诉,我们将尽快为您处理。