Reviewed-by: Wang Chenglong 18509160991@163.com

On Fri, Oct 30, 2020 at 10:27:48AM +0800, Liu Yinsi wrote:

[what] when execute sparrow/4-docker/buildall in x86_64 machine [error] lockfile-create: command not found [how]

1. wget link and rpm not support ${arch}, must use arch=$(arch) to support download lockfile-create command in aarch64 and x86_64.
2. delete rpm file after download.

Signed-off-by: Liu Yinsi liuyinsi@163.com

sparrow/0-package/os/openEuler | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/sparrow/0-package/os/openEuler b/sparrow/0-package/os/openEuler index ba298c8..ea4b29a 100755 --- a/sparrow/0-package/os/openEuler +++ b/sparrow/0-package/os/openEuler @@ -23,7 +23,9 @@ pkgs=(

yum install -y --skip-broken "${pkgs[@]}"

-wget http://rpmfind.net/linux/openmandriva/cooker/repository/aarch64/main/release... -wget http://rpmfind.net/linux/openmandriva/cooker/repository/aarch64/main/release... +arch=$(arch) +wget http://rpmfind.net/linux/openmandriva/cooker/repository/$%7Barch%7D/main/rel... +wget http://rpmfind.net/linux/openmandriva/cooker/repository/$%7Barch%7D/main/rel...

-rpm -i lib64lockfile1-1.16-1-omv4002.aarch64.rpm lockfile-progs-0.1.18-5-omv4002.aarch64.rpm +rpm -i lib64lockfile1-1.16-1-omv4002.${arch}.rpm lockfile-progs-0.1.18-5-omv4002.${arch}.rpm

+rm -rf *.rpm

2.23.0