From 4b21504ffc947d39a0c69a774fe14a37262942a8 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Wed, 22 Jul 2009 12:33:09 +1000 Subject: makepkg: add pkgbase to .PKGINFO and database for split packages With split packages, the pkgbase variable provides a useful way to find out which packages were build from the same PKGBUILD. Add it to the packages .PKGINFO file and the repo database only when package splitting is used. Original-patch-by: Pierre Schmitz [Allan: restrict to including only with spilt packages and include after pkgname] Signed-off-by: Allan McRae Signed-off-by: Dan McGee --- scripts/makepkg.sh.in | 1 + scripts/repo-add.sh.in | 1 + 2 files changed, 2 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 50cf54d1..7e492f8f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -890,6 +890,7 @@ write_pkginfo() { fi echo "# $(LC_ALL=C date -u)" >>.PKGINFO echo "pkgname = $1" >>.PKGINFO + [ "$SPLITPKG" -eq 1 ] && echo "pkgbase = $pkgbase" >>.PKGINFO echo "pkgver = $pkgver-$pkgrel" >>.PKGINFO echo "pkgdesc = $pkgdesc" >>.PKGINFO echo "url = $url" >>.PKGINFO diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 5454fb0c..d3566f5a 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -242,6 +242,7 @@ db_write_entry() msg2 "$(gettext "Creating 'desc' db entry...")" echo -e "%FILENAME%\n$(basename "$1")\n" >>desc echo -e "%NAME%\n$pkgname\n" >>desc + [ -n "$pkgbase" ] && echo -e "%BASE%\n$pkgbase\n" >>desc echo -e "%VERSION%\n$pkgver\n" >>desc [ -n "$pkgdesc" ] && echo -e "%DESC%\n$pkgdesc\n" >>desc write_list_entry "GROUPS" "$_groups" "desc" -- cgit v1.2.3-70-g09d2