June 2012 - Pacman-dev - lists.archlinux.org

[pacman-dev] [RFC] [PATCH 0/4] makepkg: VCS package overhaul
by Allan McRae 04 Jun '12

04 Jun '12

This is my first attempt at overhauling the really crap VCS PKGBUILD support in makepkg. So far only git is implemented. This is for initial comments. There is still much to tidy up (apart from reinstating all the other VCS...), but using git works. E.g. to make a package for pacman-git from the maint branch: source=('git+https://projects.archlinux.org/git/pacman.git#branch=maint') Currently you need to use --skipinteg, as integrity checking is broken. So is generating the integrity checks. Also, I would like ideas on how to stop the git repo being updated. This is a common request for having VCS PKGBUILDs work offline (assumably after an initial checkout...). Should I add a new flag, or just not error out when updating the repo fails? Allan McRae (4): makepkg: remove VCS package support makepkg: reorder source handling functions makepkg: generalize download_sources makepkg: allow using GIT source URLs scripts/makepkg.sh.in | 467 ++++++++++++++++++++++++------------------------- 1 file changed, 230 insertions(+), 237 deletions(-) -- 1.7.10.3

1 5

[pacman-dev] [PATCH] makepkg patch for scp
by William J. Bowman 03 Jun '12

03 Jun '12

Hello all, I recently tried to specify a source URL in a PKGBUILD of the form "scp://host:file". This caused all kinds of problem because, despite a DLAGENT for scp existing in the default makepkg.conf, that is an invalid URL for scp. After a bit of discussion in #archlinux, the correct solution seemed to be patching makepkg to seperate the protocol from the URL. So here's a patch. William Bowman From 4d0b60a4108bb71835553d0aafa70ba327bac036 Mon Sep 17 00:00:00 2001 From: "William J. Bowman" <wjb(a)williamjbowman.com> Date: Sat, 2 Jun 2012 17:17:18 -0400 Subject: [PATCH] Modified makepkg so DLAGENT can work with scp. Require %p to be specified in the DLAGENT agent string for the protocol to be included in the agent string, and changed the makepkg.conf to use it as part of the URL for all except scp. This change is because "scp://host:file" is not a valid URL for scp. Instead, scp expects only "host:file" (or user@host:file), without the protocol. Signed-off-by: William J. Bowman <wjb(a)williamjbowman.com> --- etc/makepkg.conf.in | 8 ++++---- scripts/makepkg.sh.in | 12 +++++++++++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 51df493..433fd5d 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -8,10 +8,10 @@ # #-- The download utilities that makepkg should use to acquire sources # Format: 'protocol::agent' -DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u' - 'http::/usr/bin/curl -b "" -fLC - --retry 3 --retry-delay 3 -o %o %u' - 'https::/usr/bin/curl -b "" -fLC - --retry 3 --retry-delay 3 -o %o %u' - 'rsync::/usr/bin/rsync --no-motd -z %u %o' +DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %p://%u' + 'http::/usr/bin/curl -b "" -fLC - --retry 3 --retry-delay 3 -o %o %p://%u' + 'https::/usr/bin/curl -b "" -fLC - --retry 3 --retry-delay 3 -o %o %p://%u' + 'rsync::/usr/bin/rsync --no-motd -z %p://%u %o' 'scp::/usr/bin/scp -C %u %o') # Other common tools: diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 718b4e9..dccad87 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -433,6 +433,12 @@ download_file() { local url=$2 # destination file local file=$3 + + # To use scp, we can't have the protocol as part of the URL, so we + # seperate them and let the DLAGENT decide what to do with them. + local proto="${url%%://*}" + url="${url##*://}" + # temporary download file, default to last component of the URL local dlfile="${url##*/}" @@ -441,11 +447,15 @@ download_file() { dlcmd=${dlcmd//\%o/\"$file.part\"} dlfile="$file.part" fi + # add the protocol, or don't + if [[ $dlcmd = *%p* ]]; then + dlcmd=${dlcmd//\%p/\"$proto\"} + fi # add the URL, either in place of %u or at the end if [[ $dlcmd = *%u* ]]; then dlcmd=${dlcmd//\%u/\"$url\"} else - dlcmd="$dlcmd \"$url\"" + dlcmd="$dlcmd \"$proto://$url\"" fi local ret=0 -- 1.7.10.3

2 1

[pacman-dev] [PATCH] makepkg: allow url to be overridden in split packages
by Allan McRae 02 Jun '12

02 Jun '12

This is already being used (despite not working...) in packages in the Arch Linux repos. Signed-off-by: Allan McRae <allan(a)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

1 0