[Compass-ci] Re: [PATCH v3 lkp-tests 1/2] sbin/makepkg: support applying patch for PKGBUILD

On Fri, Nov 06, 2020 at 11:06:09AM +0800, Lin Jiaxin wrote:

[Why] Support more version's PKGBUILD.

[How] Replace the previous content with two source command.

example:

PKGBUILD_TAG=-1.1 BUILDFILE -> PKGBUILD BUILDFILE$PKGBUILD_TAG -> PKGBUILD-1.1

PKGBUILD-1.1 contains only the changed part. % cat PKGBUILD-1.1 pkgver=1.1 pkgrel=2

build() { make install DESTDIR="${pkgdir}/lkp/benchmarks/${pkgname}" }

Signed-off-by: Lin Jiaxin ljx.joe@qq.com

sbin/makepkg | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/sbin/makepkg b/sbin/makepkg index 25773621..dc8471b9 100755 --- a/sbin/makepkg +++ b/sbin/makepkg @@ -888,7 +888,7 @@ update_pkgver() { exit 1 fi sed --follow-symlinks -i "s:^pkgrel=[^ ]*:pkgrel=1:" "$BUILDFILE"

• 	source_safe "$BUILDFILE"
  

• 	source_safe "$BUILDFILE" "$BUILDFILE$PKGBUILD_TAG"
  local fullver=$(get_full_version)
  msg "$(gettext "Updated version: %s")" "$pkgbase $fullver"
  

  else

@@ -1604,10 +1604,14 @@ cd_safe() {

source_safe() { shopt -u extglob

• if ! source "$@"; then

• error "$(gettext "Failed to source %s")" "$1"
  

• exit 1
  

• fi

• local file

I think there is no need to define the loacl file

Thanks, Luan Shengde

• for file in "$@"
• do

• if ! source "$file"; then
  

• 	error "$(gettext "Failed to source %s")" "$1"
  

• 	exit 1
  

• fi
  

• done shopt -s extglob

}

@@ -1626,7 +1630,6 @@ merge_arch_attrs() {

source_buildfile() { source_safe "$@"

• if (( !SOURCEONLY )); then merge_arch_attrs fi

@@ -3661,6 +3664,7 @@ SRCEXT=${_SRCEXT:-$SRCEXT} GPGKEY=${_GPGKEY:-$GPGKEY} PACKAGER=${_PACKAGER:-$PACKAGER} CARCH=${_CARCH:-$CARCH} +PKGBUILD_TAG=$PKGBUILD_TAG

if (( INFAKEROOT )); then if [[ -z $FAKEROOTKEY ]]; then @@ -3691,7 +3695,7 @@ else if [[ ${BUILDFILE:0:1} != "/" ]]; then BUILDFILE="$startdir/$BUILDFILE" fi

• source_buildfile "$BUILDFILE"

• source_buildfile "$BUILDFILE" "$BUILDFILE$PKGBUILD_TAG"

fi

# set defaults if they weren't specified in buildfile

2.23.0