Arch Linux

dlm1065

Member

Registered: 2014-09-21

Posts: 7

VCS PKGBUILD question (ANSWERED- thanks all)

I am totally confused I keep finding contradictory info on the forums. On the wiki it shows

source=('project_name::git+http://project_url#branch=project_branch')

but when I use branch like that I get

[root@xenarch xen-git]# makepkg -s --asroot
==> Making package: xen-git 1-1 (Sat Nov  8 15:09:10 CST 2014)
==> Checking runtime dependencies...
==> Checking buildtime dependencies...
==> Retrieving sources...
  -> Cloning xen git repo...
Cloning into bare repository '/root/build/xen-git/xen'...
remote: Counting objects: 300228, done.
remote: Compressing objects: 100% (63823/63823), done.
remote: Total 300228 (delta 236569), reused 295015 (delta 231658)
Receiving objects: 100% (300228/300228), 57.95 MiB | 11.12 MiB/s, done.
Resolving deltas: 100% (236569/236569), done.
Checking connectivity... done.
==> Validating source files with md5sums...
    xen ... Skipped
==> Extracting sources...
  -> Creating working copy of xen git repo...
Cloning into 'xen'...
done.
fatal: Cannot update paths and switch to branch 'makepkg' at the same time.
Did you intend to checkout 'origin/4.5.0-rc1' which can not be resolved as commit?
==> ERROR: Failure while creating working copy of xen git repo
    Aborting...
[root@xenarch xen-git]# 

If I drop the branch off

source=('project_name::git+http://project_url')

it seems to pull fine though. Can someone tell me what I am doing wrong or point me at a good example I pulled https://projects.archlinux.org/abs.git/tree/prototypes (out of date found post to that affect later). I looked at several AUR that had git in the name but only 2 of those actually used GIT and neither worked.

This is what I am trying to pull

git clone -b 4.5.0-rc1 git://xenbits.xen.org/xen.git

Below is the start of my PKGBUILD

pkgname=xen-git
pkgver=1
pkgrel=1
pkgdesc="Virtual Machine Hypervisor & Tools"
arch=(i686 x86_64)
url="http://www.xenproject.org/"
license=(GPL2)
#groups=("xen")
depends=(bridge-utils curl gnutls iproute2 libaio libcap-ng libiscsi libjpeg-turbo libpng libseccomp lzo2 nss pixman pciutils python python2 sdl yajl spice usbredir)
[[ "$CARCH" == "x86_64" ]] && depends+=(lib32-glibc)
makedepends=(bin86 cmake dev86 git iasl markdown ocaml-findlib figlet wget spice-protocol)
optdepends=('xen-docs: Official Xen Documentation' 'openvswitch: Optional Networking support')
conflicts=(xen-4.2{,-testing-hg} xen-{gdbsx,hg-unstable,rc,git} xen-4.3{,-testing-hg})
backup=(etc/modules-load.d/$pkgname.conf etc/$pkgname/xl.conf etc/conf.d/xen{stored,consoled,domains,commons} etc/$pkgname/grub.conf)
provides=('xen')
options=(!buildflags !strip)
install=xen.install
changelog=ChangeLog
source=('xen::git+git://xenbits.xen.org/xen.git#branch=4.5.0-rc1')
md5sums=('SKIP')

package() {
  cd xen
}

Last edited by dlm1065 (2014-11-08 23:33:33)

karol

Archivist

Registered: 2009-05-06

Posts: 25,440

Re: VCS PKGBUILD question (ANSWERED- thanks all)

Is https://aur.archlinux.org/packages/xen-git/ working for you?

parchedas

Member

From: Cambridge, UK

Registered: 2013-06-01

Posts: 74

Re: VCS PKGBUILD question (ANSWERED- thanks all)

#tag= not #branch=

Allan

Pacman

From: Brisbane, AU

Registered: 2007-06-09

Posts: 11,393

Website

Re: VCS PKGBUILD question (ANSWERED- thanks all)

#tag= not #branch=

Wrong...

Did you check the branch exists and there was no typo?

---

PGP Key: F99FFE0FEAE999BD

Scimmia

Fellow

Registered: 2012-09-01

Posts: 11,560

Re: VCS PKGBUILD question (ANSWERED- thanks all)

#tag= not #branch=

Wrong...

Did you check the branch exists and there was no typo?

Actually, I think he's right. There is no "4.5.0-rc1" branch, but there is a tag by that name.

dlm1065

Member

Registered: 2014-09-21

Posts: 7

Re: VCS PKGBUILD question (ANSWERED- thanks all)

#tag= not #branch=

Wrong...
Did you check the branch exists and there was no typo?

I thought -b in git meant that was the branch so when I went to the xen site
http://wiki.xenproject.org/wiki/Xen_4.5 … structions and saw

git clone -b 4.5.0-rc1 git://xenbits.xen.org/xen.git

I thought I was pulling a branch

#tag= not #branch=

tag works so it pulls correctly thank you.

Is https://aur.archlinux.org/packages/xen-git/ working for you?

Ok hitting weird here. When I tried it before I had an error but now the git does appear to pull master.
Using #tag just works here also.  So the AUR build just fails because it doe not know were the file it is to patch.

Cloning into 'xen'...
remote: Counting objects: 300228, done.
remote: Compressing objects: 100% (63823/63823), done.
remote: Total 300228 (delta 236569), reused 295015 (delta 231658)
Receiving objects: 100% (300228/300228), 57.95 MiB | 11.20 MiB/s, done.
Resolving deltas: 100% (236569/236569), done.
Checking connectivity... done.
patching file Config.mk
Hunk #1 FAILED at 75.
1 out of 1 hunk FAILED -- saving rejects to file Config.mk.rej
patching file Makefile
Hunk #1 FAILED at 217.
1 out of 1 hunk FAILED -- saving rejects to file Makefile.rej
patching file config/StdGNU.mk
Hunk #1 FAILED at 42.
1 out of 1 hunk FAILED -- saving rejects to file config/StdGNU.mk.rej
patching file configure
Hunk #1 succeeded at 705 (offset 14 lines).
Hunk #2 succeeded at 1247 (offset 14 lines).
patching file tools/blktap/drivers/blktapctrl.c
patching file tools/blktap/lib/blktaplib.h
patching file tools/blktap2/include/blktap2.h
patching file tools/blktap2/include/blktaplib.h
patching file tools/configure
Hunk #1 succeeded at 875 (offset 36 lines).
Hunk #2 succeeded at 1417 (offset 36 lines).
The next patch would create the file tools/configure.orig,
which already exists!  Skipping patch.
1 out of 1 hunk ignored
patching file tools/console/daemon/main.c
patching file tools/examples/xl.conf
can't find file to patch at input line 9603
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Naur xen/tools/hotplug/Linux/init.d/xencommons xen-a/tools/hotplug/Linux/init.d/xencommons
|--- xen/tools/hotplug/Linux/init.d/xencommons	2014-07-04 19:59:45.096666817 -0600
|+++ xen-a/tools/hotplug/Linux/init.d/xencommons	2014-07-07 09:08:53.626663995 -0600
--------------------------
File to patch:                                                       
Skip this patch? [y] y
Skipping patch.
5 out of 5 hunks ignored
can't find file to patch at input line 9708
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Naur xen/tools/hotplug/Linux/init.d/xendomains xen-a/tools/hotplug/Linux/init.d/xendomains
|--- xen/tools/hotplug/Linux/init.d/xendomains	2014-07-07 09:07:39.486666668 -0600
|+++ xen-a/tools/hotplug/Linux/init.d/xendomains	2014-07-07 09:08:53.626663995 -0600
--------------------------
File to patch: y
y: No such file or directory
Skip this patch? [y] y
Skipping patch.
1 out of 1 hunk ignored
patching file tools/hotplug/Linux/locking.sh
patching file tools/misc/xenpvnetboot
patching file tools/ocaml/libs/xs/xs.ml
patching file tools/ocaml/xenstored/define.ml
patching file tools/ocaml/xenstored/disk.ml
patching file tools/ocaml/xenstored/oxenstored.conf
patching file tools/ocaml/xenstored/xenstored.ml
Hunk #1 succeeded at 66 (offset 7 lines).
Hunk #2 succeeded at 81 with fuzz 2 (offset 7 lines).
Hunk #3 succeeded at 265 (offset 10 lines).
Hunk #4 succeeded at 293 (offset 12 lines).
Hunk #5 succeeded at 440 (offset 50 lines).
patching file tools/pygrub/src/pygrub
Hunk #1 FAILED at 778.
1 out of 1 hunk FAILED -- saving rejects to file tools/pygrub/src/pygrub.rej
patching file tools/xenbackendd/xenbackendd.c
patching file tools/xenmon/xenbaked.c
patching file tools/xenmon/xenmon.py
patching file tools/xenstore/xs_lib.c
patching file xen/Makefile
==> ERROR: A failure occurred in prepare().
    Aborting...
[root@xenarch xen-git]#