bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

makepkg: Optional argument for run_package and create_package

Browse source 
Generalize run_package to allow the passing of a package name
directing the use of an alternative package function. A similar
adjustment to create_package to prepare split packages.

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2009-01-16 22:26:52 +10:00
parent 708ce1480f
commit 21b8a5418d
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
scripts/makepkg.sh.in
View file

@ -714,12 +714,20 @@ run_build() {
} }
run_package() { run_package() {
if [ -z "$1" ]; then
pkgfunc="package"
nameofpkg="$pkgname"
else
pkgfunc="package_$1"
nameofpkg="$1"
fi
# clear user-specified makeflags if requested # clear user-specified makeflags if requested
if [ "$(check_option makeflags)" = "n" ]; then if [ "$(check_option makeflags)" = "n" ]; then
MAKEFLAGS="" MAKEFLAGS=""
fi fi
msg "$(gettext "Starting package()...")" msg "$(gettext "Starting %s()...")" "$pkgfunc"
cd "$srcdir" cd "$srcdir"
# ensure all necessary build variables are exported # ensure all necessary build variables are exported
@ -727,7 +735,7 @@ run_package() {
local ret=0 local ret=0
if [ "$LOGGING" = "1" ]; then if [ "$LOGGING" = "1" ]; then
BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}-package.log" BUILDLOG="${startdir}/${nameofpkg}-${pkgver}-${pkgrel}-${CARCH}-package.log"
if [ -f "$BUILDLOG" ]; then if [ -f "$BUILDLOG" ]; then
local i=1 local i=1
while true; do while true; do
@ -746,12 +754,12 @@ run_package() {
exec 3>&1 exec 3>&1
tee "$BUILDLOG" < "$logpipe" & tee "$BUILDLOG" < "$logpipe" &
exec 1>"$logpipe" 2>"$logpipe" exec 1>"$logpipe" 2>"$logpipe"
package 2>&1 || ret=$? $pkgfunc 2>&1 || ret=$?
sync sync
exec 1>&3 2>&3 3>&- exec 1>&3 2>&3 3>&-
rm "$logpipe" rm "$logpipe"
else else
package 2>&1 || ret=$? $pkgfunc 2>&1 || ret=$?
fi fi
if [ $ret -gt 0 ]; then if [ $ret -gt 0 ]; then
@ -845,6 +853,12 @@ tidy_install() {
} }
create_package() { create_package() {
if [ -z "$1" ]; then
nameofpkg="$pkgname"
else
nameofpkg="$1"
fi
if [ ! -d "$pkgdir" ]; then if [ ! -d "$pkgdir" ]; then
error "$(gettext "Missing pkg/ directory.")" error "$(gettext "Missing pkg/ directory.")"
plain "$(gettext "Aborting...")" plain "$(gettext "Aborting...")"
@ -869,7 +883,7 @@ create_package() {
echo "# using $(fakeroot -v)" >>.PKGINFO echo "# using $(fakeroot -v)" >>.PKGINFO
fi fi
echo "# $(LC_ALL=C date -u)" >>.PKGINFO echo "# $(LC_ALL=C date -u)" >>.PKGINFO
echo "pkgname = $pkgname" >>.PKGINFO echo "pkgname = $nameofpkg" >>.PKGINFO
echo "pkgver = $pkgver-$pkgrel" >>.PKGINFO echo "pkgver = $pkgver-$pkgrel" >>.PKGINFO
echo "pkgdesc = $pkgdesc" >>.PKGINFO echo "pkgdesc = $pkgdesc" >>.PKGINFO
echo "url = $url" >>.PKGINFO echo "url = $url" >>.PKGINFO
@ -953,7 +967,7 @@ create_package() {
"$PKGEXT" ;; "$PKGEXT" ;;
esac esac
local pkg_file="$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" local pkg_file="$PKGDEST/${nameofpkg}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}"
# when fileglobbing, we want * in an empty directory to expand to # when fileglobbing, we want * in an empty directory to expand to
# the null string rather than itself # the null string rather than itself