[PATCH compass-ci] sparrow/0-package: adapt to x86_64 architectures

lockfile-create download link compatible with x86_64 and aarch64 architectures. Signed-off-by: Liu Yinsi <liuyinsi@163.com> --- sparrow/0-package/os/openEuler | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sparrow/0-package/os/openEuler b/sparrow/0-package/os/openEuler index bd1f728..da13831 100755 --- a/sparrow/0-package/os/openEuler +++ b/sparrow/0-package/os/openEuler @@ -24,7 +24,8 @@ pkgs=( yum install -y "${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/${arch}/main/release/lib64lockfile1-1.16-1-omv4002.${arch}.rpm +wget http://rpmfind.net/linux/openmandriva/cooker/repository/${arch}/main/release/lockfile-progs-0.1.18-5-omv4002.${arch}.rpm -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 -- 2.23.0

On Fri, Oct 23, 2020 at 11:32:23AM +0800, Liu Yinsi wrote:
lockfile-create download link compatible with x86_64 and aarch64 architectures.
Signed-off-by: Liu Yinsi <liuyinsi@163.com> --- sparrow/0-package/os/openEuler | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/sparrow/0-package/os/openEuler b/sparrow/0-package/os/openEuler index bd1f728..da13831 100755 --- a/sparrow/0-package/os/openEuler +++ b/sparrow/0-package/os/openEuler @@ -24,7 +24,8 @@ pkgs=(
yum install -y "${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)
It seems you don't need this change. You can use $(arch) below directly. Thanks, Yuanchao
+wget http://rpmfind.net/linux/openmandriva/cooker/repository/${arch}/main/release/lib64lockfile1-1.16-1-omv4002.${arch}.rpm +wget http://rpmfind.net/linux/openmandriva/cooker/repository/${arch}/main/release/lockfile-progs-0.1.18-5-omv4002.${arch}.rpm
-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 -- 2.23.0
participants (2)
-
Li Yuanchao
-
Liu Yinsi