On Thu, Nov 05, 2020 at 09:29:18AM +0800, Wu Fengguang wrote:

On Wed, Nov 04, 2020 at 07:52:30PM +0800, Liu Shaofei wrote:

...

[why] the path of *.cgz file generated by build-pkg script cannot be obtained during test. So the path of cgz file need to be changed. [how] below is example for openeuler:

• path:

  /srv/initrd/build-pkg/initramfs/openeuler/aarch64/20.03/nasm-git

• filename:

  latest.cgz -> f71820d6055373c9b9381615e28a28f307bb2df4.cgz f71820d6055373c9b9381615e28a28f307bb2df4.cgz v1.8.1.cgz -> 92c89f904a14d4bfc25abcd2c3d5c2da35a589d6.cgz 92c89f904a14d4bfc25abcd2c3d5c2da35a589d6.cgz v1.5.1.cgz -> df0584e46db9e7b412626deab10b923504745b2c.cgz df0584e46db9e7b412626deab10b923504745b2c.cgz

Signed-off-by: Liu Shaofei liushaofei5@huawei.com

tests/build-pkg | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/tests/build-pkg b/tests/build-pkg index b10b1497..7c494a15 100755 --- a/tests/build-pkg +++ b/tests/build-pkg @@ -2,10 +2,12 @@ # - os # - os_arch # - os_version +# - os_mount # - pkgbuild_repo # - upstream_repo # - upstream_url # - upstream_commit +# - upstream_tag

## makepkg is a script that automates the building of packages; it can download and validate source files, ## check dependencies, configure build-time settings, compile the sources, install into a temporary root, @@ -21,15 +23,19 @@ check_vars() [ -n "$os_version" ] || die "os_version is empty" [ -n "$pkgbuild_repo" ] || die "pkgbuild_repo is empty" [ -n "$upstream_commit" ] || die "upstream_commit is empty"

• [ -n "$os_mount" ] || die "os_mount is empty"

}

mount_dest() {

• [[ "$os_mount" = "cifs" ]] && os_mount="nfs"

Need a comment here to explain why.

ok.

...

• pack_to=${os_mount}/${os}/${os_arch}/${os_version}

• PKG_MNT=/initrd/build-pkg mkdir -p "$PKG_MNT"

  [ -n "$LKP_SERVER" ] && {

• mount $LKP_SERVER:$PKG_MNT $PKG_MNT || die "Failed to run mount"

• mount -t cifs -o guest,vers=1.0,noacl,nouser_xattr //$LKP_SERVER$PKG_MNT $PKG_MNT || die "Failed to run mount"

Are there better env var to use than LKP_SERVER?

No, currently, the LKP_SERVER content has not been split, there is not other env var to use.

...

} }

@@ -75,12 +81,22 @@ build_source_pkg() sed -i "s|^source=.*|${upstream_source}|g" PKGBUILD }

• cgz_name="$PKG_MNT/${pkgname}/${upstream_commit}.cgz"

• cgz_name="$PKG_MNT/${pack_to}/${pkgname}/${upstream_commit}.cgz" PACMAN=true BUILDDIR=$TMP CARCH=$os_arch PKGEXT=.cgz CGZDEST="$cgz_name" \

• $LKP_SRC/sbin/makepkg -A --check --config $LKP_SRC/etc/makepkg.conf 2>&1

• $LKP_SRC/sbin/makepkg -A --check --skippgpcheck --config $LKP_SRC/etc/makepkg.conf 2>&1

+}

+create_softlink() +{

• [ -n "$upstream_tag" ] || return 0
• [ -e "$PKG_MNT/${pack_to}/${pkgname}/${upstream_tag}.cgz" ] && return 0

That file name can be stored in a local variable for reuse.

ok.

Move the below echo here, so that when ln failed, we know better the context.

ok. Thanks, Liushaofei

...

• ln -sf "$(basename $(realpath ${cgz_name}))" "$PKG_MNT/${pack_to}/${pkgname}/${upstream_tag}.cgz" || return 0
• echo "create soft link: $PKG_MNT/${pack_to}/${pkgname}/${upstream_tag}.cgz -> $(basename $(realpath ${cgz_name}))"

}

check_vars mount_dest request_pkg build_source_pkg

+create_softlink

2.23.0