From e30ecd8da403cc9e578e27c0d048a163e7cb7b7d563fda0d3784fd18fd779c8e Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Thu, 20 Jun 2013 17:01:24 +0000 Subject: [PATCH] - Update to Xen 4.3.0-rc5 - Update to Xen 4.3.0-rc4 OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=251 --- blktap-pv-cdrom.patch | 2 +- disable-wget-check.patch | 145 +++++++++++++++++++----- qemu-xen-dir-remote.tar.bz2 | 4 +- qemu-xen-traditional-dir-remote.tar.bz2 | 4 +- seabios-dir-remote.tar.bz2 | 4 +- xen-4.3.0-testing-src.tar.bz2 | 4 +- xen.changes | 10 ++ xen.spec | 5 +- xend-traditional-qemu.patch | 14 +-- 9 files changed, 148 insertions(+), 44 deletions(-) diff --git a/blktap-pv-cdrom.patch b/blktap-pv-cdrom.patch index 3e8ab2f..d671bd3 100644 --- a/blktap-pv-cdrom.patch +++ b/blktap-pv-cdrom.patch @@ -696,7 +696,7 @@ Index: xen-4.3.0-testing/xen/include/public/io/blkif.h =================================================================== --- xen-4.3.0-testing.orig/xen/include/public/io/blkif.h +++ xen-4.3.0-testing/xen/include/public/io/blkif.h -@@ -439,7 +439,7 @@ +@@ -444,7 +444,7 @@ * Used in SLES sources for device specific command packet * contained within the request. Reserved for that purpose. */ diff --git a/disable-wget-check.patch b/disable-wget-check.patch index 6b00056..704321f 100644 --- a/disable-wget-check.patch +++ b/disable-wget-check.patch @@ -219,32 +219,17 @@ Index: xen-4.3.0-testing/stubdom/configure =================================================================== --- xen-4.3.0-testing.orig/stubdom/configure +++ xen-4.3.0-testing/stubdom/configure -@@ -593,7 +593,6 @@ CPPFLAGS - LDFLAGS +@@ -594,8 +594,6 @@ LDFLAGS CFLAGS CC + FETCHER +-FTP -WGET CMAKE extfiles debug -@@ -657,7 +656,6 @@ enable_extfiles - host_alias - target_alias - CMAKE --WGET - CC - CFLAGS - LDFLAGS -@@ -1299,7 +1297,6 @@ Optional Features: +@@ -2165,104 +2163,104 @@ extfiles=$ax_cv_extfiles - Some influential environment variables: - CMAKE Path to the cmake program -- WGET Path to wget program - CC C compiler command - CFLAGS C compiler flags - LDFLAGS linker flags, e.g. -L if you have libraries in a -@@ -3079,50 +3076,50 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' # Extract the first word of "wget", so it can be a program name with args. -set dummy wget; ac_word=$2 @@ -287,9 +272,63 @@ Index: xen-4.3.0-testing/stubdom/configure -fi - - --if test x"${WGET}" = x"no" --then -- as_fn_error $? "Unable to find wget, please install wget" "$LINENO" 5 +-if test x"$WGET" != x"no"; then : +- +- FETCHER="$WGET -c -O" +- +-else +- +- # Extract the first word of "ftp", so it can be a program name with args. +-set dummy ftp; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_FTP+set}" = set; then : +- $as_echo_n "(cached) " >&6 +-else +- case $FTP in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_FTP="$FTP" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_FTP="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +- test -z "$ac_cv_path_FTP" && ac_cv_path_FTP="no" +- ;; +-esac +-fi +-FTP=$ac_cv_path_FTP +-if test -n "$FTP"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FTP" >&5 +-$as_echo "$FTP" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- if test x"$FTP" != x"no"; then : +- +- FETCHER="$FTP -o" +- +-else +- +- as_fn_error $? "cannot find wget or ftp" "$LINENO" 5 +- +-fi +- -fi +#set dummy wget; ac_word=$2 +#{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -331,10 +370,64 @@ Index: xen-4.3.0-testing/stubdom/configure +#fi +# +# -+#if test x"${WGET}" = x"no" -+#then -+# as_fn_error $? "Unable to find wget, please install wget" "$LINENO" 5 ++#if test x"$WGET" != x"no"; then : ++# ++# FETCHER="$WGET -c -O" ++# ++#else ++# ++# # Extract the first word of "ftp", so it can be a program name with args. ++#set dummy ftp; ac_word=$2 ++#{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++#$as_echo_n "checking for $ac_word... " >&6; } ++#if test "${ac_cv_path_FTP+set}" = set; then : ++# $as_echo_n "(cached) " >&6 ++#else ++# case $FTP in ++# [\\/]* | ?:[\\/]*) ++# ac_cv_path_FTP="$FTP" # Let the user override the test with a path. ++# ;; ++# *) ++# as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++#for as_dir in $PATH ++#do ++# IFS=$as_save_IFS ++# test -z "$as_dir" && as_dir=. ++# for ac_exec_ext in '' $ac_executable_extensions; do ++# if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++# ac_cv_path_FTP="$as_dir/$ac_word$ac_exec_ext" ++# $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++# break 2 ++# fi ++#done ++# done ++#IFS=$as_save_IFS ++# ++# test -z "$ac_cv_path_FTP" && ac_cv_path_FTP="no" ++# ;; ++#esac ++#fi ++#FTP=$ac_cv_path_FTP ++#if test -n "$FTP"; then ++# { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FTP" >&5 ++#$as_echo "$FTP" >&6; } ++#else ++# { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++#$as_echo "no" >&6; } ++#fi ++# ++# ++# if test x"$FTP" != x"no"; then : ++# ++# FETCHER="$FTP -o" ++# ++#else ++# ++# as_fn_error $? "cannot find wget or ftp" "$LINENO" 5 ++# ++#fi ++# +#fi - # Checks for programs that depend on a feature + diff --git a/qemu-xen-dir-remote.tar.bz2 b/qemu-xen-dir-remote.tar.bz2 index ae9afd1..2be4a00 100644 --- a/qemu-xen-dir-remote.tar.bz2 +++ b/qemu-xen-dir-remote.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:70a4cbaa8bae01324a5481d54e4c11b4c3041ce0a2c86ab821cdc4ef9fc02c11 -size 6036208 +oid sha256:8562d711fb6bde9e37d40061471f371d22ad36e01e9e58f2b78a006b5fe5b918 +size 6036830 diff --git a/qemu-xen-traditional-dir-remote.tar.bz2 b/qemu-xen-traditional-dir-remote.tar.bz2 index d6ab203..3460e7a 100644 --- a/qemu-xen-traditional-dir-remote.tar.bz2 +++ b/qemu-xen-traditional-dir-remote.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7d51ba7d520b878e4385c98ed5431ca51f9a7153574d9ee664517540ded7bcd8 -size 3212512 +oid sha256:be24d9ab7d472c51f47c42a45ade048d2d156de2971773dc844982bdf726a22f +size 3213243 diff --git a/seabios-dir-remote.tar.bz2 b/seabios-dir-remote.tar.bz2 index e47bb02..dda4952 100644 --- a/seabios-dir-remote.tar.bz2 +++ b/seabios-dir-remote.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cdaaae60ec643ad1a8a45d92c3ba58ee3e516c8c0c7e0265601c9c98ff678926 -size 366129 +oid sha256:f19c3e7290fc8d00f430614295287504a3f335faba2455a9f7d05cfd0f394306 +size 366143 diff --git a/xen-4.3.0-testing-src.tar.bz2 b/xen-4.3.0-testing-src.tar.bz2 index 9376dc5..80c9636 100644 --- a/xen-4.3.0-testing-src.tar.bz2 +++ b/xen-4.3.0-testing-src.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b74b44d1712495b17d28fd9f217359473b8607dc2ff87fdeb4f837dd85442c9 -size 4352829 +oid sha256:475f932122b22cb15444e6928a61980e3a76fc04e97d8908e89ffd2cb18cc5e3 +size 4355211 diff --git a/xen.changes b/xen.changes index 0f070d9..99cd872 100644 --- a/xen.changes +++ b/xen.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Jun 19 14:34:20 MDT 2013 - carnold@suse.com + +- Update to Xen 4.3.0-rc5 + +------------------------------------------------------------------- +Wed Jun 14 11:06:23 MDT 2013 - carnold@suse.com + +- Update to Xen 4.3.0-rc4 + ------------------------------------------------------------------- Mon Jun 10 18:36:38 MDT 2013 - carnold@suse.com diff --git a/xen.spec b/xen.spec index 09d82e3..8730123 100644 --- a/xen.spec +++ b/xen.spec @@ -20,7 +20,7 @@ Name: xen ExclusiveArch: %ix86 x86_64 %define xvers 4.3 %define xvermaj 4 -%define changeset 27093 +%define changeset 27164 %define xen_build_dir xen-4.3.0-testing %define with_kmp 1 %define with_stubdom 1 @@ -120,7 +120,7 @@ BuildRequires: xorg-x11 BuildRequires: lndir %endif %endif -Version: 4.3.0_03 +Version: 4.3.0_05 Release: 0 PreReq: %insserv_prereq %fillup_prereq Summary: Xen Virtualization: Hypervisor (aka VMM aka Microkernel) @@ -945,6 +945,7 @@ rm -f $RPM_BUILD_ROOT/usr/libexec/qemu-bridge-helper /usr/bin/pygrub /usr/bin/tapdisk-ioemu /usr/bin/remus +/usr/bin/xencov_split /usr/sbin/blktapctrl /usr/sbin/flask-* /usr/sbin/tap* diff --git a/xend-traditional-qemu.patch b/xend-traditional-qemu.patch index e0f0332..14175ea 100644 --- a/xend-traditional-qemu.patch +++ b/xend-traditional-qemu.patch @@ -560,7 +560,7 @@ Index: xen-4.3.0-testing/docs/man/xm.pod.1 =over 4 =item B [ B<-d> I [ B<-w>[B<=>I] | B<-c>[B<=>I] ] ] -@@ -788,8 +785,6 @@ The normal EDF scheduling usage in nanos +@@ -801,8 +798,6 @@ The normal EDF scheduling usage in nanos The normal EDF scheduling usage in nanoseconds @@ -569,7 +569,7 @@ Index: xen-4.3.0-testing/docs/man/xm.pod.1 =item I Scaled period if domain is doing heavy I/O. -@@ -939,9 +934,6 @@ the default setting in xend-config.sxp f +@@ -952,9 +947,6 @@ the default setting in xend-config.sxp f Passes the specified IP Address to the adapter on creation. @@ -579,7 +579,7 @@ Index: xen-4.3.0-testing/docs/man/xm.pod.1 =item BI The MAC address that the domain will see on its Ethernet device. If -@@ -967,9 +959,6 @@ Removes the network device from the doma +@@ -980,9 +972,6 @@ Removes the network device from the doma I is the virtual interface device number within the domain (i.e. the 3 in vif22.3). @@ -5159,7 +5159,7 @@ Index: xen-4.3.0-testing/tools/libxl/libxl_dm.c =================================================================== --- xen-4.3.0-testing.orig/tools/libxl/libxl_dm.c +++ xen-4.3.0-testing/tools/libxl/libxl_dm.c -@@ -222,6 +222,12 @@ static char ** libxl__build_device_model +@@ -220,6 +220,12 @@ static char ** libxl__build_device_model } } } @@ -5172,7 +5172,7 @@ Index: xen-4.3.0-testing/tools/libxl/libxl_dm.c if (b_info->u.hvm.soundhw) { flexarray_vappend(dm_args, "-soundhw", b_info->u.hvm.soundhw, NULL); } -@@ -520,6 +526,12 @@ static char ** libxl__build_device_model +@@ -507,6 +513,12 @@ static char ** libxl__build_device_model } } } @@ -5189,7 +5189,7 @@ Index: xen-4.3.0-testing/tools/libxl/libxl_types.idl =================================================================== --- xen-4.3.0-testing.orig/tools/libxl/libxl_types.idl +++ xen-4.3.0-testing/tools/libxl/libxl_types.idl -@@ -333,6 +333,8 @@ libxl_domain_build_info = Struct("domain +@@ -332,6 +332,8 @@ libxl_domain_build_info = Struct("domain ("soundhw", string), ("xen_platform_pci", libxl_defbool), ("usbdevice_list", libxl_string_list), @@ -5202,7 +5202,7 @@ Index: xen-4.3.0-testing/tools/libxl/xl_cmdimpl.c =================================================================== --- xen-4.3.0-testing.orig/tools/libxl/xl_cmdimpl.c +++ xen-4.3.0-testing/tools/libxl/xl_cmdimpl.c -@@ -1518,6 +1518,8 @@ skip_vfb: +@@ -1516,6 +1516,8 @@ skip_vfb: xlu_cfg_replace_string (config, "soundhw", &b_info->u.hvm.soundhw, 0); xlu_cfg_get_defbool(config, "xen_platform_pci", &b_info->u.hvm.xen_platform_pci, 0);