Commit 5dbb964d authored by Pierre Schmitz's avatar Pierre Schmitz Committed by Aaron Griffin
Browse files

Use $PKGEXT defined in makepkg.conf 



Also replace some uses of tar with bsdtar

Signed-off-by: default avatarPierre Schmitz <pierre@archlinux.de>
Signed-off-by: default avatarAaron Griffin <aaronmgriffin@gmail.com>
parent 1401d571

checkpkg

+5 −5
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ fi 


source PKGBUILD



pkgfile=${pkgname}-${pkgver}-${pkgrel}-${CARCH}.pkg.tar.gz

oldstylepkgfile=${pkgname}-${pkgver}-${pkgrel}.pkg.tar.gz

pkgfile=${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}

oldstylepkgfile=${pkgname}-${pkgver}-${pkgrel}${PKGEXT}



if [ -f "$(pwd)/$pkgfile" ]; then

    pkgfile=$(pwd)/$pkgfile
@@ -64,8 +64,8 @@ if [ ! -f $oldpkg ]; then 
	fi

fi



tar tzf $oldpkg > filelist-old

tar tzf "$pkgfile" > filelist

bsdtar tf $oldpkg > filelist-old

bsdtar tf "$pkgfile" > filelist



sort -o filelist filelist

sort -o filelist-old filelist-old
@@ -75,7 +75,7 @@ diff filelist-old filelist 
if diff filelist-old filelist | grep '\.so\.' > /dev/null 2>&1; then

	mkdir -p pkg

	cd pkg

	tar xzf "$pkgfile" > /dev/null

	bsdtar xf "$pkgfile" > /dev/null

	for i in `diff ../filelist-old ../filelist | grep \> | grep \.so\. | awk '{print $2}'`; do

		echo -n "${i}: "

		objdump -p $i | grep SONAME

commitpkg

+2 −2
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ if [ -z "$CARCH" ]; then 
fi



source PKGBUILD

pkgfile=${pkgname}-${pkgver}-${pkgrel}-${CARCH}.pkg.tar.gz

oldstylepkgfile=${pkgname}-${pkgver}-${pkgrel}.pkg.tar.gz

pkgfile=${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}

oldstylepkgfile=${pkgname}-${pkgver}-${pkgrel}${PKGEXT}



if [ ! -f $pkgfile ]; then

    if [ -f $PKGDEST/$pkgfile ]; then

makechrootpkg

+3 −3
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ export LANG=$LOCALE 
cd /build

export HOME=/build

sudo -u nobody makepkg $MAKEPKG_ARGS || touch BUILD_FAILED

which namcap 2>&1 >/dev/null && namcap *.pkg.tar.gz > /pkgdest/namcap.log

which namcap 2>&1 >/dev/null && namcap *${PKGEXT} > /pkgdest/namcap.log

exit 0

EOF

) > "$uniondir/chrootbuild"
@@ -223,13 +223,13 @@ chmod +x "$uniondir/chrootbuild" 
if mkarchroot -r "/chrootbuild" "$uniondir"; then

    source ${WORKDIR}/PKGBUILD



    pkgfile=${chrootdir}/union/pkgdest/${pkgname}-${pkgver}-${pkgrel}-*.pkg.tar.gz

    pkgfile=${chrootdir}/union/pkgdest/${pkgname}-${pkgver}-${pkgrel}-*${PKGEXT}



    if [ -n "$add_to_db" -a -e "$pkgfile" ]; then

        [ -d "${chrootdir}/union/repo" ] || mkdir -p "${chrootdir}/union/repo"

        pushd "${chrootdir}/union/repo" >/dev/null

        cp "$pkgfile" .

        repo-add repo.db.tar.gz "${pkgname}-${pkgver}-${pkgrel}-*.pkg.tar.gz"

        repo-add repo.db.tar.${DB_COMPRESSION} "${pkgname}-${pkgver}-${pkgrel}-*${PKGEXT}"

        popd >/dev/null

    fi