RepoMirrors
/
abuild
mirror of https://gitlab.alpinelinux.org/alpine/abuild.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

abuild: rename apkcache to abuildrepo 

To avoid confusing with the /etc/apk/cache
This commit is contained in:
Natanael Copa 2010-05-06 07:58:44 +00:00
parent 5a3bb63846
commit ed0613adda
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -5,7 +5,7 @@ VERSION := 2.2
prefix ?= /usr prefix ?= /usr
sysconfdir ?= /etc sysconfdir ?= /etc
datadir ?= $(prefix)/share/$(PACKAGE) datadir ?= $(prefix)/share/$(PACKAGE)
apkcache ?= ~/.cache/apks abuildrepo ?= ~/.cache/apks
SCRIPTS := abuild devbuild mkalpine buildrepo abuild-keygen \ SCRIPTS := abuild devbuild mkalpine buildrepo abuild-keygen \
abuild-sign newapkbuild abuild-sign newapkbuild
@ -33,7 +33,7 @@ SED_REPLACE := -e 's:@VERSION@:$(FULL_VERSION):g' \
-e 's:@prefix@:$(prefix):g' \ -e 's:@prefix@:$(prefix):g' \
-e 's:@sysconfdir@:$(sysconfdir):g' \ -e 's:@sysconfdir@:$(sysconfdir):g' \
-e 's:@datadir@:$(datadir):g' \ -e 's:@datadir@:$(datadir):g' \
-e 's:@apkcache@:$(apkcache):g' -e 's:@abuildrepo@:$(abuildrepo):g'
SSL_LIBS := $(shell pkg-config --libs openssl) SSL_LIBS := $(shell pkg-config --libs openssl)

28
abuild.in
View File

@ -10,7 +10,7 @@
abuild_ver=@VERSION@ abuild_ver=@VERSION@
sysconfdir=@sysconfdir@ sysconfdir=@sysconfdir@
apkcache=@apkcache@ abuildrepo=@abuildrepo@
datadir=@datadir@ datadir=@datadir@
program=${0##*/} program=${0##*/}
@ -259,7 +259,7 @@ cleanpkg() {
for i in $pkgname $subpackages; do for i in $pkgname $subpackages; do
local p="${i%:*}-$pkgver-r$pkgrel" local p="${i%:*}-$pkgver-r$pkgrel"
rm -f "$PKGDEST/$p.apk" "$PKGDEST/$p.src.tar.gz" \ rm -f "$PKGDEST/$p.apk" "$PKGDEST/$p.src.tar.gz" \
"$apkcache"/$p.apk "$abuildrepo"/$p.apk
done done
# remove given packages from index # remove given packages from index
} }
@ -535,15 +535,15 @@ create_apks() {
done done
} }
apkcache() { abuildrepo() {
if ! apk_up2date || [ -n "$force" ]; then if ! apk_up2date || [ -n "$force" ]; then
sanitycheck && builddeps && clean && fetch && unpack \ sanitycheck && builddeps && clean && fetch && unpack \
&& prepare && mkusers && rootpkg || return 1 && prepare && mkusers && rootpkg || return 1
fi fi
local apk local apk
mkdir -p "$apkcache" || return 1 mkdir -p "$abuildrepo" || return 1
cd "$apkcache" cd "$abuildrepo"
# remove broken links # remove broken links
for apk in *.apk; do for apk in *.apk; do
@ -554,7 +554,7 @@ apkcache() {
# create links for this package # create links for this package
for apk in $(listpkg); do for apk in $(listpkg); do
ln -sf "$PKGDEST"/$apk "$apkcache"/$apk ln -sf "$PKGDEST"/$apk "$abuildrepo"/$apk
done done
msg "Updating the cached abuild repository index..." msg "Updating the cached abuild repository index..."
@ -712,7 +712,7 @@ cache_up2date() {
getpkgver || return 1 getpkgver || return 1
for i in $pkgname $subpackages; do for i in $pkgname $subpackages; do
apk="${i%:*}-$pkgver-r$pkgrel.apk" apk="${i%:*}-$pkgver-r$pkgrel.apk"
[ "$apkcache"/APKINDEX.tar.gz -nt "$apkcache"/$apk ] || return 1 [ "$abuildrepo"/APKINDEX.tar.gz -nt "$abuildrepo"/$apk ] || return 1
done done
return 0 return 0
} }
@ -829,10 +829,10 @@ builddeps() {
if [ -n "$install_deps" ] && [ -z "$recursive" ]; then if [ -n "$install_deps" ] && [ -z "$recursive" ]; then
# make a --simluate run first to detect missing deps # make a --simluate run first to detect missing deps
# apk-tools --virtual is no goot at reporting those. # apk-tools --virtual is no goot at reporting those.
$SUDO $APK add --repository "$apkcache" \ $SUDO $APK add --repository "$abuildrepo" \
--wait 30 \ --wait 30 \
--simulate --quiet $deps || return 1 --simulate --quiet $deps || return 1
$SUDO $APK add --repository "$apkcache" \ $SUDO $APK add --repository "$abuildrepo" \
--wait 30 \ --wait 30 \
--virtual .makedepends-$pkgname $deps \ --virtual .makedepends-$pkgname $deps \
&& return 0 && return 0
@ -842,7 +842,7 @@ builddeps() {
# find dependencies that are installed but missing in repo. # find dependencies that are installed but missing in repo.
for i in $deps; do for i in $deps; do
local m=$($APK search --repository "$apkcache" ${i%[<>=]*}) local m=$($APK search --repository "$abuildrepo" ${i%[<>=]*})
if [ -z "$m" ]; then if [ -z "$m" ]; then
missing="$missing $i" missing="$missing $i"
fi fi
@ -854,10 +854,10 @@ builddeps() {
local pkg=${i%:*} local pkg=${i%:*}
if [ -d "$dir" ]; then if [ -d "$dir" ]; then
msg "Entering $dir" msg "Entering $dir"
cd "$dir" && $0 -k -r apkcache || return 1 cd "$dir" && $0 -k -r abuildrepo || return 1
fi fi
done done
$SUDO $APK add -u --repository "$apkcache" \ $SUDO $APK add -u --repository "$abuildrepo" \
--wait 30 \ --wait 30 \
--virtual .makedepends-$pkgname $deps --virtual .makedepends-$pkgname $deps
} }
@ -975,7 +975,7 @@ post_add() {
installdeps() { installdeps() {
local deps i local deps i
sudo $APK add --wait 30 --repository "$apkcache" \ sudo $APK add --wait 30 --repository "$abuildrepo" \
--virtual .makedepends-$pkgname \ --virtual .makedepends-$pkgname \
$makedepends $makedepends
} }
@ -988,7 +988,7 @@ all() {
if up2date && [ -z "$force" ]; then if up2date && [ -z "$force" ]; then
msg "Package is up to date" msg "Package is up to date"
else else
apkcache abuildrepo
fi fi
} }