1 Star 0 Fork 0

zhengzengkai/openEuler_scripts

加入 Gitee
与超过 1200万 开发者一起发现、参与优秀开源项目,私有仓库也完全免费 :)
免费加入
文件
该仓库未声明开源许可证文件(LICENSE),使用请关注具体项目描述及其代码上游依赖。
克隆/下载
0001-lkp-setup-rootfs-fix-boot-failure-during-linux-pkgbu.patch 1.90 KB
一键复制 编辑 原始数据 按行查看 历史
zhengzengkai 提交于 2024-10-26 21:46 . commit20241026 for lkp
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
Loading...
马建仓 AI 助手
尝试更多
代码解读
代码找茬
代码优化
1
https://gitee.com/zhengzengkai/openEuler_scripts.git
[email protected]:zhengzengkai/openEuler_scripts.git
zhengzengkai
openEuler_scripts
openEuler_scripts
master

搜索帮助