[pacman-dev] [PATCH] makepkg: allow url to be overridden in split packages

Allan McRae allan at archlinux.org
Sat Jun 2 09:39:27 EDT 2012


This is already being used (despite not working...) in packages
in the Arch Linux repos.

Signed-off-by: Allan McRae <allan at archlinux.org>
---
 doc/PKGBUILD.5.txt         |    6 +++---
 proto/PKGBUILD-split.proto |    1 +
 scripts/makepkg.sh.in      |    2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt
index 384af7c..404a55c 100644
--- a/doc/PKGBUILD.5.txt
+++ b/doc/PKGBUILD.5.txt
@@ -324,9 +324,9 @@ Each split package uses a corresponding packaging function with name
 All options and directives for the split packages default to the global values
 given in the PKGBUILD. Nevertheless, the following ones can be overridden within
 each split package's packaging function:
-`pkgver`, `pkgrel`, `epoch`, `pkgdesc`, `arch`, `license`, `groups`, `depends`,
-`optdepends`, `provides`, `conflicts`, `replaces`, `backup`, `options`,
-`install` and `changelog`.
+`pkgver`, `pkgrel`, `epoch`, `pkgdesc`, `arch`, `url`, `license`, `groups`,
+`depends`, `optdepends`, `provides`, `conflicts`, `replaces`, `backup`,
+`options`, `install` and `changelog`.
 
 An optional global directive is available when building a split package:
 
diff --git a/proto/PKGBUILD-split.proto b/proto/PKGBUILD-split.proto
index 763cb86..f873db6 100644
--- a/proto/PKGBUILD-split.proto
+++ b/proto/PKGBUILD-split.proto
@@ -46,6 +46,7 @@ package_pkg1() {
   epoch=
   pkgdesc=""
   arch=()
+  url=""
   license=()
   groups=()
   depends=()
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index b0918ae..bd7a44f 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -46,7 +46,7 @@ declare -r startdir="$PWD"
 
 packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge' 'upx')
 other_options=('ccache' 'distcc' 'buildflags' 'makeflags')
-splitpkg_overrides=('pkgver' 'pkgrel' 'epoch' 'pkgdesc' 'arch' 'license' \
+splitpkg_overrides=('pkgver' 'pkgrel' 'epoch' 'pkgdesc' 'arch' 'url' 'license' \
                     'groups' 'depends' 'optdepends' 'provides' 'conflicts' \
                     'replaces' 'backup' 'options' 'install' 'changelog')
 readonly -a packaging_options other_options splitpkg_overrides
-- 
1.7.10.3



More information about the pacman-dev mailing list