diff --git a/abuild b/abuild index 574a70cfc8f9cfe947b56f27763f5c04f15622c4..f46bcfe93d2de9c5afedeb14f2119423da7e166e 100755 --- a/abuild +++ b/abuild @@ -23,8 +23,7 @@ pkgrel=0 SRCDEST=${SRCDEST:-$startdir} PKGDEST=${PKGDEST:-$startdir} -default_cmds="sanitycheck makedepcheck clean fetch md5check unpack rootpkg" -all_cmds="checksum fetch unpack rootpkg build package cleancache clean srcpkg" +default_cmds="sanitycheck builddeps clean fetch md5check unpack rootpkg" # functions msg() { @@ -66,18 +65,6 @@ sanitycheck() { return 0 } -# check if we have needed packages to build this thing -makedepcheck() { - local i - local missing= - for i in $makedepends; do - apk_info -e $i || missing="$missing $i" - done - [ -z "$missing" ] && return 0 - warning "Missing makedepends: $missing" - return 1 -} - md5check() { if [ -z "$source" ]; then return 0 @@ -203,7 +190,7 @@ package_apk() { local name=${subpkgname:-$pkgname} [ -z "${name##* *}" ] && die "package name contains spaces" local dir=${subpkgdir:-$pkgdir} - local pkg="$name-$pkgver-$pkgrel.apk" + local pkg="$name-$pkgver-r$pkgrel.apk" [ ! -d "$dir" ] && die "Missing $dir" cd "$dir" @@ -218,7 +205,7 @@ package_apk() { echo "# $(date -u)" >> .PKGINFO cat >> .PKGINFO <