For discussion of Alpine Linux development and developer support

1

[alpine-devel] [PATCH] xen: update to 4.2.0

Roger Pau Monne
Details
Message ID
<1347883853-4816-1-git-send-email-roger.pau@citrix.com>
Sender timestamp
1347883853
DKIM signature
missing
Download raw message
Patch: +10 -11
---
 main/xen/APKBUILD                    | 13 ++++++-------
 main/xen/librt.patch                 |  4 ++--
 main/xen/qemu_uclibc_configure.patch |  4 ++--
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/main/xen/APKBUILD b/main/xen/APKBUILD
index fdc01f0..1a5643d 100644
--- a/main/xen/APKBUILD
+++ b/main/xen/APKBUILD
@@ -3,8 +3,7 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=xen
 pkgver=4.2.0
-pkgrc=4
-pkgrel=0
+pkgrel=1
 pkgdesc="Xen hypervisor"
 url="http://www.xen.org/"
 arch="x86 x86_64"
@@ -15,7 +14,7 @@ depends_dev="openssl-dev python-dev e2fsprogs-dev gettext zlib-dev ncurses-dev
 makedepends="$depends_dev"
 install=""
 subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-hypervisor $pkgname-xend"
-source="http://xenbits.xen.org/people/royger/$pkgname-$pkgver-rc$pkgrc.tar.gz
+source="http://bits.xensource.com/oss-xen/release/$pkgver/$pkgname-$pkgver.tar.gz
 	qemu_uclibc_configure.patch
 	librt.patch
 	make_stubdoms.patch
@@ -34,7 +33,7 @@ source="http://xenbits.xen.org/people/royger/$pkgname-$pkgver-rc$pkgrc.tar.gz
 	xenqemu.initd
 	"
 
-_builddir="$srcdir"/$pkgname
+_builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
@@ -129,9 +128,9 @@ xend() {
 		-exec mv '{}' "$subpkgdir"/"$sitepackages"/xen \;
 }
 
-md5sums="336a2a6cde9cbbe861decf442bf5cd5e  xen-4.2.0-rc4.tar.gz
-1b165c3b1288e2952cf852d36dfaaa67  qemu_uclibc_configure.patch
-35039c88b4f573f672b3178d9d65c5b7  librt.patch
+md5sums="f4f217969afc38f09251039966d91a87  xen-4.2.0.tar.gz
+506e7ab6f9482dc95f230978d340bcd9  qemu_uclibc_configure.patch
+2dc5ddf47c53ea168729975046c3c1f9  librt.patch
 41ad48fdc269749776fa6aa04f6778c2  make_stubdoms.patch
 1ccde6b36a6f9542a16d998204dc9a22  qemu-xen_paths.patch
 6e5739dad7e2bd1b625e55ddc6c782b7  xenstored.initd
diff --git a/main/xen/librt.patch b/main/xen/librt.patch
index 1393f7f..1964add 100644
--- a/main/xen/librt.patch
+++ b/main/xen/librt.patch
@@ -1,5 +1,5 @@
---- ./tools/qemu-xen-traditional-dir/Makefile.target.orig
-+++ ./tools/qemu-xen-traditional-dir/Makefile.target
+--- ./tools/qemu-xen-traditional/Makefile.target.orig
 @@ -520,7 +520,7 @@
  OBJS+=block-raw-posix.o
  endif
diff --git a/main/xen/qemu_uclibc_configure.patch b/main/xen/qemu_uclibc_configure.patch
index bef93c1..c948f8c 100644
--- a/main/xen/qemu_uclibc_configure.patch
+++ b/main/xen/qemu_uclibc_configure.patch
@@ -1,5 +1,5 @@
---- a/tools/qemu-xen-dir/configure
-+++ b/tools/qemu-xen-dir/configure
+--- a/tools/qemu-xen/configure
 @@ -2457,19 +2457,44 @@ EOF
    fi
  fi
-- 
1.7.11.4



---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---
William Pitcock
Details
Message ID
<CA+T2pCELZH+e1wf1oP6nEX89_BVJZiaHXCZO3Tmmcs+UhYcgpQ@mail.gmail.com>
In-Reply-To
<1347883853-4816-1-git-send-email-roger.pau@citrix.com> (view parent)
Sender timestamp
1347902645
DKIM signature
missing
Download raw message
The patch has been integrated into edge.

William

On Mon, Sep 17, 2012 at 7:10 AM, Roger Pau Monne <roger.pau@citrix.com> wrote:
> ---
>  main/xen/APKBUILD                    | 13 ++++++-------
>  main/xen/librt.patch                 |  4 ++--
>  main/xen/qemu_uclibc_configure.patch |  4 ++--
>  3 files changed, 10 insertions(+), 11 deletions(-)
>
> diff --git a/main/xen/APKBUILD b/main/xen/APKBUILD
> index fdc01f0..1a5643d 100644
> --- a/main/xen/APKBUILD
> +++ b/main/xen/APKBUILD
> @@ -3,8 +3,7 @@
>  # Maintainer: William Pitcock <nenolod@dereferenced.org>
>  pkgname=xen
>  pkgver=4.2.0
> -pkgrc=4
> -pkgrel=0
> +pkgrel=1
>  pkgdesc="Xen hypervisor"
>  url="http://www.xen.org/"
>  arch="x86 x86_64"
> @@ -15,7 +14,7 @@ depends_dev="openssl-dev python-dev e2fsprogs-dev gettext zlib-dev ncurses-dev
>  makedepends="$depends_dev"
>  install=""
>  subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-hypervisor $pkgname-xend"
> -source="http://xenbits.xen.org/people/royger/$pkgname-$pkgver-rc$pkgrc.tar.gz
> +source="http://bits.xensource.com/oss-xen/release/$pkgver/$pkgname-$pkgver.tar.gz
>         qemu_uclibc_configure.patch
>         librt.patch
>         make_stubdoms.patch
> @@ -34,7 +33,7 @@ source="http://xenbits.xen.org/people/royger/$pkgname-$pkgver-rc$pkgrc.tar.gz
>         xenqemu.initd
>         "
>
> -_builddir="$srcdir"/$pkgname
> +_builddir="$srcdir"/$pkgname-$pkgver
>  prepare() {
>         local i
>         cd "$_builddir"
> @@ -129,9 +128,9 @@ xend() {
>                 -exec mv '{}' "$subpkgdir"/"$sitepackages"/xen \;
>  }
>
> -md5sums="336a2a6cde9cbbe861decf442bf5cd5e  xen-4.2.0-rc4.tar.gz
> -1b165c3b1288e2952cf852d36dfaaa67  qemu_uclibc_configure.patch
> -35039c88b4f573f672b3178d9d65c5b7  librt.patch
> +md5sums="f4f217969afc38f09251039966d91a87  xen-4.2.0.tar.gz
> +506e7ab6f9482dc95f230978d340bcd9  qemu_uclibc_configure.patch
> +2dc5ddf47c53ea168729975046c3c1f9  librt.patch
>  41ad48fdc269749776fa6aa04f6778c2  make_stubdoms.patch
>  1ccde6b36a6f9542a16d998204dc9a22  qemu-xen_paths.patch
>  6e5739dad7e2bd1b625e55ddc6c782b7  xenstored.initd
> diff --git a/main/xen/librt.patch b/main/xen/librt.patch
> index 1393f7f..1964add 100644
> --- a/main/xen/librt.patch
> +++ b/main/xen/librt.patch
> @@ -1,5 +1,5 @@
> ---- ./tools/qemu-xen-traditional-dir/Makefile.target.orig
> -+++ ./tools/qemu-xen-traditional-dir/Makefile.target
> +--- ./tools/qemu-xen-traditional/Makefile.target.orig
> ++++ ./tools/qemu-xen-traditional/Makefile.target
>  @@ -520,7 +520,7 @@
>   OBJS+=block-raw-posix.o
>   endif
> diff --git a/main/xen/qemu_uclibc_configure.patch b/main/xen/qemu_uclibc_configure.patch
> index bef93c1..c948f8c 100644
> --- a/main/xen/qemu_uclibc_configure.patch
> +++ b/main/xen/qemu_uclibc_configure.patch
> @@ -1,5 +1,5 @@
> ---- a/tools/qemu-xen-dir/configure
> -+++ b/tools/qemu-xen-dir/configure
> +--- a/tools/qemu-xen/configure
> ++++ b/tools/qemu-xen/configure
>  @@ -2457,19 +2457,44 @@ EOF
>     fi
>   fi
> --
> 1.7.11.4
>
>
>
> ---
> Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
> Help:         alpine-devel+help@lists.alpinelinux.org
> ---
>


---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---