the package now always include the pkgrel
This commit is contained in:
parent
ec3f3eaf61
commit
04738df3a7
12
abuild
12
abuild
|
@ -154,8 +154,7 @@ cleancache() {
|
||||||
}
|
}
|
||||||
|
|
||||||
cleanpkg() {
|
cleanpkg() {
|
||||||
local p=$pkgname-$pkgver
|
local p="$pkgname-$pkgver-$pkgrel"
|
||||||
[ $pkgrel -ne 0 ] && p="$p-r$pkgrel"
|
|
||||||
rm -f "$PKGDEST/$p.apk" "$PKGDEST/$p.src.tar.gz"
|
rm -f "$PKGDEST/$p.apk" "$PKGDEST/$p.src.tar.gz"
|
||||||
local i
|
local i
|
||||||
for i in $subpackages; do
|
for i in $subpackages; do
|
||||||
|
@ -303,22 +302,19 @@ rootpkg() {
|
||||||
}
|
}
|
||||||
|
|
||||||
srcpkg() {
|
srcpkg() {
|
||||||
local p="$pkgname-$pkgver"
|
local p="$pkgname-$pkgver-$pkgrel"
|
||||||
[ "$pkgrel" -ne 0 ] && p="$p-r$pkgrel"
|
|
||||||
local prefix="${startdir##*/}"
|
local prefix="${startdir##*/}"
|
||||||
local i files="$prefix/APKBUILD"
|
local i files="$prefix/APKBUILD"
|
||||||
for i in $source; do
|
for i in $source; do
|
||||||
files="$files $prefix/${i##*/}"
|
files="$files $prefix/${i##*/}"
|
||||||
done
|
done
|
||||||
mkdir -p "$PKGDEST"
|
mkdir -p "$PKGDEST"
|
||||||
(cd .. && tar -zcf $PKGDEST/$p.src.tar.gz $files)
|
(cd .. && tar -zcf "$PKGDEST/$p.src.tar.gz" $files)
|
||||||
}
|
}
|
||||||
|
|
||||||
# check if package is up to date
|
# check if package is up to date
|
||||||
up2date() {
|
up2date() {
|
||||||
local p="$pkgname-$pkgver"
|
local pkg="$PKGDEST/$pkgname-$pkgver-$pkgrel.apk"
|
||||||
[ "$pkgrel" -ne 0 ] && p="$p-r$pkgrel"
|
|
||||||
local pkg="$PKGDEST/$p.apk"
|
|
||||||
local i s
|
local i s
|
||||||
cd "$startdir"
|
cd "$startdir"
|
||||||
[ -f "$pkg" ] || return 1
|
[ -f "$pkg" ] || return 1
|
||||||
|
|
Loading…
Reference in New Issue