commit 9178a513a5d519026afa57c47cd339279f12e3a1 Author: Jakub Bogusz <qbo...@pld-linux.org> Date: Mon Jul 31 21:26:07 2017 +0200
- updated to 4.9.0 (rel 0.1, needs testing) - updated no_Werror,stubdom-build,systemd patches - removed obsolete curses,gawk,xen-gmp-abi,fix-misleading-indentation,deprecated-readdir_r,ipxe-build,unused-function patches - added link patch (fix libxenguest linking with -as-needed) - added pkgconfig patch (move .pc files to arch-dependent pkgconfig dir) deprecated-readdir_r.patch | 174 ---------------------- fix-misleading-indentation.patch | 150 ------------------- ipxe-build.patch | 306 --------------------------------------- unused-function.patch | 20 --- xen-curses.patch | 11 -- xen-gawk.patch | 11 -- xen-gmp-abi.patch | 12 -- xen-link.patch | 11 ++ xen-no_Werror.patch | 9 +- xen-pkgconfigdir.patch | 9 ++ xen-stubdom-build.patch | 22 +-- xen-systemd.patch | 33 ++--- xen.spec | 92 ++++++++---- 13 files changed, 108 insertions(+), 752 deletions(-) --- diff --git a/xen.spec b/xen.spec index 71e38ce..ef69389 100644 --- a/xen.spec +++ b/xen.spec @@ -39,13 +39,13 @@ Summary: Xen - a virtual machine monitor Summary(pl.UTF-8): Xen - monitor maszyny wirtualnej Name: xen -Version: 4.6.6 -Release: 1 +Version: 4.9.0 +Release: 0.1 License: GPL v2, interface parts on BSD-like Group: Applications/System # for available versions see https://www.xenproject.org/developers/teams/hypervisor.html Source0: https://downloads.xenproject.org/release/xen/%{version}/%{name}-%{version}.tar.gz -# Source0-md5: 698328dcac775c8ccef0da3167020b19 +# Source0-md5: f0a753637630f982dfbdb64121fd71e1 # used by stubdoms Source10: %{xen_extfiles_url}/lwip-1.3.0.tar.gz # Source10-md5: 36cc57650cffda9a0269493be2a169bb @@ -57,8 +57,8 @@ Source13: %{xen_extfiles_url}/pciutils-2.2.9.tar.bz2 # Source13-md5: cec05e7785497c5e19da2f114b934ffd Source14: %{xen_extfiles_url}/grub-0.97.tar.gz # Source14-md5: cd3f3eb54446be6003156158d51f4884 -Source15: http://xenbits.xen.org/xen-extfiles/ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz -# Source15-md5: 7496268cebf47d5c9ccb0696e3b26065 +Source15: http://xenbits.xen.org/xen-extfiles/ipxe-git-827dd1bfee67daa683935ce65316f7e0f057fe1c.tar.gz +# Source15-md5: 71c69b5e1db9e01d5f246226eca03c22 Source17: %{xen_extfiles_url}/polarssl-%{polarssl_version}-gpl.tgz # Source17-md5: 7b72caf22b01464ee7d6165f2fd85f44 Source18: http://xenbits.xen.org/xen-extfiles/tpm_emulator-%{tpm_emulator_version}.tar.gz @@ -83,27 +83,22 @@ Source60: xen-init-list Source61: xen-toolstack Patch0: %{name}-python_scripts.patch Patch1: %{name}-symbols.patch -Patch2: %{name}-curses.patch +Patch2: %{name}-link.patch Patch3: pygrubfix.patch +Patch4: %{name}-pkgconfigdir.patch # Warning: this disables ingress filtering implemented in xen scripts! Patch7: %{name}-net-disable-iptables-on-bridge.patch -Patch9: %{name}-gawk.patch Patch10: %{name}-qemu.patch Patch12: %{name}-doc.patch Patch13: %{name}-paths.patch Patch14: %{name}-no_fetcher.patch Patch15: odd-glib2-fix.patch -Patch16: %{name}-gmp-abi.patch Patch18: %{name}-make.patch Patch19: %{name}-no_Werror.patch Patch22: %{name}-stubdom-build.patch Patch23: link.patch Patch24: %{name}-systemd.patch -Patch25: fix-misleading-indentation.patch -Patch26: deprecated-readdir_r.patch -Patch27: ipxe-build.patch Patch28: sysmacros.patch -Patch29: unused-function.patch URL: http://www.xen.org/products/xenhyp.html BuildRequires: autoconf >= 2.67 %ifarch %{ix86} %{x8664} @@ -147,11 +142,13 @@ BuildRequires: ocaml-findlib %endif BuildRequires: nss-devel >= 3.12.8 BuildRequires: openssl-devel +BuildRequires: pandoc BuildRequires: pciutils-devel BuildRequires: perl-base BuildRequires: perl-tools-pod BuildRequires: pkgconfig BuildRequires: python-devel >= 2 +BuildRequires: python-markdown BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(macros) >= 1.647 BuildRequires: seabios @@ -392,24 +389,19 @@ Nadzorca Xen w postaci, która może być uruchomiona wprost z firmware %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %patch7 -p1 -%patch9 -p1 %patch10 -p1 %patch12 -p1 %patch13 -p1 %patch14 -p1 %patch15 -p1 -%patch16 -p1 %patch18 -p1 %patch19 -p1 %patch22 -p1 %patch23 -p1 %patch24 -p1 -%patch25 -p1 -%patch26 -p1 -%patch27 -p1 %patch28 -p1 -%patch29 -p1 # stubdom sources ln -s %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} stubdom @@ -609,8 +601,7 @@ fi %{systemdunitdir}/xen-watchdog.service %{systemdunitdir}/xenconsoled.service %{systemdunitdir}/xenstored.service -%{systemdunitdir}/xenstored.socket -%{systemdunitdir}/xenstored_ro.socket +%{systemdunitdir}/xendriverdomain.service %{systemdunitdir}/xendomains.service %{systemdunitdir}/xen-qemu-dom0-disk-backend.service %dir %{_sysconfdir}/xen @@ -627,6 +618,7 @@ fi %attr(755,root,root) %{_bindir}/qemu-img-xen %attr(755,root,root) %{_bindir}/qemu-nbd-xen %endif +%attr(755,root,root) %{_bindir}/xen-cpuid %attr(755,root,root) %{_bindir}/xenalyze %attr(755,root,root) %{_bindir}/xencons %attr(755,root,root) %{_bindir}/xencov_split @@ -635,7 +627,6 @@ fi %attr(755,root,root) %{_sbindir}/flask-* %endif %attr(755,root,root) %{_sbindir}/gdbsx -%attr(755,root,root) %{_sbindir}/gtrace* %attr(755,root,root) %{_sbindir}/img2qcow %attr(755,root,root) %{_sbindir}/kdd %attr(755,root,root) %{_sbindir}/lock-util @@ -685,7 +676,16 @@ fi %{_mandir}/man1/xl.1* %{_mandir}/man5/xl.cfg.5* %{_mandir}/man5/xl.conf.5* +%{_mandir}/man5/xl-disk-configuration.5* +%{_mandir}/man5/xl-network-configuration.5* %{_mandir}/man5/xlcpupool.cfg.5* +%{_mandir}/man7/xen-pci-device-reservations.7* +%{_mandir}/man7/xen-pv-channel.7* +%{_mandir}/man7/xen-tscmode.7* +%{_mandir}/man7/xen-vbd-interface.7* +%{_mandir}/man7/xen-vtpm.7* +%{_mandir}/man7/xen-vtpmmgr.7* +%{_mandir}/man7/xl-numa-placement.7* %{_mandir}/man8/xentrace.8* %{_sharedstatedir}/xen %{_sharedstatedir}/xenstored @@ -723,18 +723,30 @@ fi %attr(755,root,root) %ghost %{_libdir}/libfsimage.so.1.0 %attr(755,root,root) %{_libdir}/libvhd.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libvhd.so.1.0 +%attr(755,root,root) %{_libdir}/libxencall.so.*.* +%attr(755,root,root) %ghost %{_libdir}/libxencall.so.1 %attr(755,root,root) %{_libdir}/libxenctrl.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libxenctrl.so.4.6 +%attr(755,root,root) %ghost %{_libdir}/libxenctrl.so.4.9 +%attr(755,root,root) %{_libdir}/libxendevicemodel.so.*.* +%attr(755,root,root) %ghost %{_libdir}/libxendevicemodel.so.1 +%attr(755,root,root) %{_libdir}/libxenevtchn.so.*.* +%attr(755,root,root) %ghost %{_libdir}/libxenevtchn.so.1 +%attr(755,root,root) %{_libdir}/libxenforeignmemory.so.*.* +%attr(755,root,root) %ghost %{_libdir}/libxenforeignmemory.so.1 +%attr(755,root,root) %{_libdir}/libxengnttab.so.*.* +%attr(755,root,root) %ghost %{_libdir}/libxengnttab.so.1 %attr(755,root,root) %{_libdir}/libxenguest.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libxenguest.so.4.6 +%attr(755,root,root) %ghost %{_libdir}/libxenguest.so.4.9 %attr(755,root,root) %{_libdir}/libxenlight.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libxenlight.so.4.6 +%attr(755,root,root) %ghost %{_libdir}/libxenlight.so.4.9 %attr(755,root,root) %{_libdir}/libxenstat.so.*.* %attr(755,root,root) %ghost %{_libdir}/libxenstat.so.0 +%attr(755,root,root) %{_libdir}/libxentoollog.so.*.* +%attr(755,root,root) %ghost %{_libdir}/libxentoollog.so.1 %attr(755,root,root) %{_libdir}/libxenvchan.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libxenvchan.so.1.0 +%attr(755,root,root) %ghost %{_libdir}/libxenvchan.so.4.9 %attr(755,root,root) %{_libdir}/libxlutil.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libxlutil.so.4.6 +%attr(755,root,root) %ghost %{_libdir}/libxlutil.so.4.9 %dir %{_libdir}/fs %dir %{_libdir}/fs/ext2fs-lib %dir %{_libdir}/fs/fat @@ -755,11 +767,17 @@ fi %attr(755,root,root) %{_libdir}/libblktapctl.so %attr(755,root,root) %{_libdir}/libfsimage.so %attr(755,root,root) %{_libdir}/libvhd.so +%attr(755,root,root) %{_libdir}/libxencall.so %attr(755,root,root) %{_libdir}/libxenctrl.so +%attr(755,root,root) %{_libdir}/libxendevicemodel.so +%attr(755,root,root) %{_libdir}/libxenevtchn.so +%attr(755,root,root) %{_libdir}/libxenforeignmemory.so +%attr(755,root,root) %{_libdir}/libxengnttab.so %attr(755,root,root) %{_libdir}/libxenguest.so %attr(755,root,root) %{_libdir}/libxenlight.so %attr(755,root,root) %{_libdir}/libxenstat.so %attr(755,root,root) %{_libdir}/libxenstore.so +%attr(755,root,root) %{_libdir}/libxentoollog.so %attr(755,root,root) %{_libdir}/libxenvchan.so %attr(755,root,root) %{_libdir}/libxlutil.so %{_includedir}/_libxl_list.h @@ -772,19 +790,37 @@ fi %{_includedir}/xs*.h %{_includedir}/xen %{_includedir}/xenstore-compat -%{_npkgconfigdir}/xenlight.pc -%{_npkgconfigdir}/xlutil.pc +%{_pkgconfigdir}/xenblktapctl.pc +%{_pkgconfigdir}/xencall.pc +%{_pkgconfigdir}/xencontrol.pc +%{_pkgconfigdir}/xendevicemodel.pc +%{_pkgconfigdir}/xenevtchn.pc +%{_pkgconfigdir}/xenforeignmemory.pc +%{_pkgconfigdir}/xengnttab.pc +%{_pkgconfigdir}/xenguest.pc +%{_pkgconfigdir}/xenlight.pc +%{_pkgconfigdir}/xenstat.pc +%{_pkgconfigdir}/xenstore.pc +%{_pkgconfigdir}/xentoollog.pc +%{_pkgconfigdir}/xenvchan.pc +%{_pkgconfigdir}/xlutil.pc %files static %defattr(644,root,root,755) %{_libdir}/libblktapctl.a %{_libdir}/libvhd.a +%{_libdir}/libxencall.a %{_libdir}/libxenctrl.a +%{_libdir}/libxendevicemodel.a +%{_libdir}/libxenevtchn.a +%{_libdir}/libxenforeignmemory.a +%{_libdir}/libxengnttab.a %{_libdir}/libxenguest.a %{_libdir}/libxenlight.a %{_libdir}/libxenvchan.a %{_libdir}/libxenstat.a %{_libdir}/libxenstore.a +%{_libdir}/libxentoollog.a %{_libdir}/libxlutil.a %if %{with ocaml} diff --git a/deprecated-readdir_r.patch b/deprecated-readdir_r.patch deleted file mode 100644 index 6abad15..0000000 --- a/deprecated-readdir_r.patch +++ /dev/null @@ -1,174 +0,0 @@ -From c2a17869d5dcd845d646bf4db122cad73596a2be Mon Sep 17 00:00:00 2001 -From: Chris Patterson <patters...@ainfosec.com> -Date: Fri, 3 Jun 2016 12:50:10 -0400 -Subject: [PATCH] libfsimage: replace deprecated readdir_r() with readdir() - -Replace the usage of readdir_r() with readdir() to address a -compilation error under glibc due to the deprecation of readdir_r -for their next release (2.24) [1, 2]. - -Add new error checking on readdir(), and fail if error occurs. - --- - -From the GNU libc manual [3]: -" - It is expected that future versions of POSIX will obsolete readdir_r and - mandate the level of thread safety for readdir which is provided by the - GNU C Library and other implementations today. -" - -There is a filed bug in the Austin Group Defect Tracker [4] in which 'dalias' -proposes (in comment 0001632) that: -" - I would like to propose an alternate solution. For readdir, replace the text: - "The readdir() function need not be thread-safe." - with: - "If multiple threads call the readdir() function with the same directory - stream argument and without synchronization to preclude simultaneous - access, then the behavior is undefined." - - With this change, the clunky readdir_r function is no longer needed or - useful, and should probably be deprecated. As the only reasonable way - to meet the implementation requirements for readdir is to have the dirent - buffer in the DIR structure, this change should not require any change to - existing implementations. -" - -[1] https://sourceware.org/ml/libc-alpha/2016-02/msg00093.html -[2] https://sourceware.org/bugzilla/show_bug.cgi?id=19056 -[3] https://www.gnu.org/software/libc/manual/html_node/Reading_002fClosing-Directory.html -[4] http://austingroupbugs.net/view.php?id=696 - -Signed-off-by: Chris Patterson <patters...@ainfosec.com> -Acked-by: Ian Jackson <ian.jack...@eu.citrix.com> -Release-acked-by: Wei Liu <wei.l...@citrix.com> ---- - tools/libfsimage/common/fsimage_plugin.c | 21 ++++++++++++--------- - 1 file changed, 12 insertions(+), 9 deletions(-) - -diff --git a/tools/libfsimage/common/fsimage_plugin.c b/tools/libfsimage/common/fsimage_plugin.c -index 3fa06c7..0744e7b 100644 ---- a/tools/libfsimage/common/fsimage_plugin.c -+++ b/tools/libfsimage/common/fsimage_plugin.c -@@ -123,7 +123,6 @@ static int load_plugins(void) - { - const char *fsdir = getenv("FSIMAGE_FSDIR"); - struct dirent *dp = NULL; -- struct dirent *dpp; - DIR *dir = NULL; - char *tmp = NULL; - size_t name_max; -@@ -139,22 +138,26 @@ static int load_plugins(void) - if ((tmp = malloc(name_max + 1)) == NULL) - goto fail; - -- if ((dp = malloc(sizeof (struct dirent) + name_max + 1)) == NULL) -- goto fail; -- - if ((dir = opendir(fsdir)) == NULL) - goto fail; - -- bzero(dp, sizeof (struct dirent) + name_max + 1); -+ for (;;) { -+ errno = 0; -+ dp = readdir(dir); -+ -+ if (dp == NULL && errno != 0) -+ goto fail; -+ -+ if (dp == NULL) -+ break; - -- while (readdir_r(dir, dp, &dpp) == 0 && dpp != NULL) { -- if (strcmp(dpp->d_name, ".") == 0) -+ if (strcmp(dp->d_name, ".") == 0) - continue; -- if (strcmp(dpp->d_name, "..") == 0) -+ if (strcmp(dp->d_name, "..") == 0) - continue; - - (void) snprintf(tmp, name_max, "%s/%s/fsimage.so", fsdir, -- dpp->d_name); -+ dp->d_name); - - if (init_plugin(tmp) != 0) - goto fail; --- -2.1.4 - -From b9daff9d811285f1e40669bc621c2241793f7a95 Mon Sep 17 00:00:00 2001 -From: Chris Patterson <patters...@ainfosec.com> -Date: Fri, 3 Jun 2016 12:50:09 -0400 -Subject: [PATCH] libxl: replace deprecated readdir_r() with readdir() - -Replace the usage of readdir_r() with readdir() to address a -compilation error under glibc due to the deprecation of readdir_r -for their next release (2.24) [1, 2]. - -Remove code specific to usage of readdir_r which is no longer required, -such as zalloc_dirent(). - --- - -From the GNU libc manual [3]: -" - It is expected that future versions of POSIX will obsolete readdir_r and - mandate the level of thread safety for readdir which is provided by the - GNU C Library and other implementations today. -" - -There is a filed bug in the Austin Group Defect Tracker [4] in which 'dalias' -proposes (in comment 0001632) that: -" - I would like to propose an alternate solution. For readdir, replace the text: - "The readdir() function need not be thread-safe." - with: - "If multiple threads call the readdir() function with the same directory - stream argument and without synchronization to preclude simultaneous - access, then the behavior is undefined." - - With this change, the clunky readdir_r function is no longer needed or - useful, and should probably be deprecated. As the only reasonable way - to meet the implementation requirements for readdir is to have the dirent - buffer in the DIR structure, this change should not require any change to - existing implementations. -" - -[1] https://sourceware.org/ml/libc-alpha/2016-02/msg00093.html -[2] https://sourceware.org/bugzilla/show_bug.cgi?id=19056 -[3] https://www.gnu.org/software/libc/manual/html_node/Reading_002fClosing-Directory.html -[4] http://austingroupbugs.net/view.php?id=696 - -Signed-off-by: Chris Patterson <patters...@ainfosec.com> -Acked-by: Ian Jackson <ian.jack...@eu.citrix.com> -Release-acked-by: Wei Liu <wei.l...@citrix.com> ---- - tools/libxl/libxl_utils.c | 8 +++----- - 2 files changed, 9 insertions(+), 23 deletions(-) - -diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c -index ceb8825..4ca6bcb 100644 ---- a/tools/libxl/libxl_utils.c -+++ b/tools/libxl/libxl_utils.c -@@ -548,14 +548,12 @@ int libxl__remove_directory(libxl__gc *gc, const char *dirpath) - goto out; - } - -- size_t need = offsetof(struct dirent, d_name) + -- pathconf(dirpath, _PC_NAME_MAX) + 1; -- struct dirent *de_buf = libxl__zalloc(gc, need); - struct dirent *de; - - for (;;) { -- int r = readdir_r(d, de_buf, &de); -- if (r) { -+ errno = 0; -+ de = readdir(d); -+ if (!de && errno) { - LOGE(ERROR, "failed to readdir %s for removal", dirpath); - rc = ERROR_FAIL; - break; --- -2.1.4 - diff --git a/fix-misleading-indentation.patch b/fix-misleading-indentation.patch deleted file mode 100644 index c844446..0000000 --- a/fix-misleading-indentation.patch +++ /dev/null @@ -1,150 +0,0 @@ -From ebdba150bff1d914805d60efa576337bbef0c305 Mon Sep 17 00:00:00 2001 -From: Ian Campbell <ian.campb...@citrix.com> -Date: Fri, 22 Jan 2016 14:27:28 +0000 -Subject: [PATCH] xenalyze: fix misleading indentation. - -gcc-6 adds -Wmisleading-indentation which found these issues. - -xenalyze.c: In function 'weighted_percentile': -xenalyze.c:2136:18: error: statement is indented as if it were guarded by... [-Werror=misleading-indentation] - L=I; L_weight = I_weight; - ^~~~~~~~ - -xenalyze.c:2135:9: note: ...this 'if' clause, but it is not - if(J_weight<K_weight) - ^~ - -xenalyze.c:2138:18: error: statement is indented as if it were guarded by... [-Werror=misleading-indentation] - R=J; R_weight = J_weight; - ^~~~~~~~ - -xenalyze.c:2137:9: note: ...this 'if' clause, but it is not - if(K_weight<I_weight) - ^~ - -xenalyze.c: In function 'self_weighted_percentile': -xenalyze.c:2215:18: error: statement is indented as if it were guarded by... [-Werror=misleading-indentation] - L=I; L_weight = I_weight; - ^~~~~~~~ - -xenalyze.c:2214:9: note: ...this 'if' clause, but it is not - if(J_weight<K_weight) - ^~ - -xenalyze.c:2217:18: error: statement is indented as if it were guarded by... [-Werror=misleading-indentation] - R=J; R_weight = J_weight; - ^~~~~~~~ - -xenalyze.c:2216:9: note: ...this 'if' clause, but it is not - if(K_weight<I_weight) - ^~ - -I've modified according to what I think the intention is, i.e. added braces -rather than moving the line in question out a level. - -I have only build tested the result. - -Signed-off-by: Ian Campbell <ian.campb...@citrix.com> -Reviewed-by: George Dunlap <george.dun...@citrix.com> ---- - tools/xentrace/xenalyze.c | 24 ++++++++++++++++-------- - 1 file changed, 16 insertions(+), 8 deletions(-) - -diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c -index 5a2735c..4bcaf83 100644 ---- a/tools/xentrace/xenalyze.c -+++ b/tools/xentrace/xenalyze.c -@@ -2132,10 +2132,14 @@ float weighted_percentile(float * A, /* values */ - } while (I <= J); /* Keep going until our pointers meet or pass */ - - /* Re-adjust L and R, based on which element we're looking for */ -- if(J_weight<K_weight) -- L=I; L_weight = I_weight; -- if(K_weight<I_weight) -- R=J; R_weight = J_weight; -+ if(J_weight<K_weight) { -+ L=I; -+ L_weight = I_weight; -+ } -+ if(K_weight<I_weight) { -+ R=J; -+ R_weight = J_weight; -+ } - } - - return A[L]; -@@ -2211,10 +2215,14 @@ long long self_weighted_percentile(long long * A, - } while (I <= J); /* Keep going until our pointers meet or pass */ - - /* Re-adjust L and R, based on which element we're looking for */ -- if(J_weight<K_weight) -- L=I; L_weight = I_weight; -- if(K_weight<I_weight) -- R=J; R_weight = J_weight; -+ if(J_weight<K_weight) { -+ L=I; -+ L_weight = I_weight; -+ } -+ if(K_weight<I_weight) { -+ R=J; -+ R_weight = J_weight; -+ } - } - - return A[L]; --- -2.1.4 - -From 9fdffbbab3ada427bac07076f042f0265e5ae05f Mon Sep 17 00:00:00 2001 -From: =?utf8?q?C=C3=A9dric=20Bosdonnat?= <cbosdon...@suse.com> -Date: Thu, 10 Nov 2016 10:23:31 +0100 -Subject: [PATCH] Fix misleading indentation warnings -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -Gcc6 build reports misleading indentation as warnings. Fix a few -warnings in stubdom. - -Signed-off-by: Cédric Bosdonnat <cbosdon...@suse.com> -Acked-by: Daniel De Graaf <dgde...@tycho.nsa.gov> -Acked-by: Quan Xu <xuqu...@huawei.com> -Release-acked-by: Wei Liu <wei.l...@citrix.com> ---- - stubdom/vtpmmgr/disk_read.c | 8 ++++---- - stubdom/vtpmmgr/log.c | 2 +- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/stubdom/vtpmmgr/disk_read.c b/stubdom/vtpmmgr/disk_read.c -index 944d3ff..48cfbfe 100644 ---- a/stubdom/vtpmmgr/disk_read.c -+++ b/stubdom/vtpmmgr/disk_read.c -@@ -123,10 +123,10 @@ static int parse_root_key(struct mem_tpm_mgr *dst, struct disk_seal_entry *src) - struct disk_root_sealed_data sealed; - - /*TPM 2.0 unbind | TPM 1.x unseal*/ -- if (hw_is_tpm2()) -- rc = TPM2_disk_unbind(&sealed, &olen, src); -- else -- rc = TPM_disk_unseal(&sealed, sizeof(sealed), src); -+ if (hw_is_tpm2()) -+ rc = TPM2_disk_unbind(&sealed, &olen, src); -+ else -+ rc = TPM_disk_unseal(&sealed, sizeof(sealed), src); - - if (rc) - return rc; -diff --git a/stubdom/vtpmmgr/log.c b/stubdom/vtpmmgr/log.c -index a82c913..c1bc8f3 100644 ---- a/stubdom/vtpmmgr/log.c -+++ b/stubdom/vtpmmgr/log.c -@@ -147,5 +147,5 @@ const char* tpm_get_error_name (TPM_RESULT code) { - if (code == error_msgs[i].code) - return error_msgs[i].code_name; - -- return("Unknown Error Code"); -+ return("Unknown Error Code"); - } --- -2.1.4 - diff --git a/ipxe-build.patch b/ipxe-build.patch deleted file mode 100644 index c07b728..0000000 --- a/ipxe-build.patch +++ /dev/null @@ -1,306 +0,0 @@ -diff -urN xen-4.6.5/tools/firmware/etherboot/patches/drivers-fixes.patch xen-4.6.5.build/tools/firmware/etherboot/patches/drivers-fixes.patch ---- xen-4.6.5/tools/firmware/etherboot/patches/drivers-fixes.patch 1970-01-01 01:00:00.000000000 +0100 -+++ xen-4.6.5.build/tools/firmware/etherboot/patches/drivers-fixes.patch 2017-04-14 14:57:04.905408377 +0200 -@@ -0,0 +1,208 @@ -+--- a/src/drivers/net/via-rhine.c~ 2011-12-11 03:28:04.000000000 +0100 -++++ b/src/drivers/net/via-rhine.c 2017-04-14 14:19:52.286247054 +0200 -+@@ -947,11 +947,10 @@ -+ // if (tp->chip_id == 0x3065) -+ if( tp->chip_revision < 0x80 && tp->chip_revision >=0x40 ) -+ intr_status |= inb(nic->ioaddr + IntrStatus2) << 16; -+- intr_status = (intr_status & ~DEFAULT_INTR); -+- if ( action == ENABLE ) -+- intr_status = intr_status | DEFAULT_INTR; -+- outw(intr_status, nic->ioaddr + IntrEnable); -+- break; -++ intr_status = (intr_status & ~DEFAULT_INTR); -++ intr_status = intr_status | DEFAULT_INTR; -++ outw(intr_status, nic->ioaddr + IntrEnable); -++ break; -+ case FORCE : -+ outw(0x0010, nic->ioaddr + 0x84); -+ break; -+--- a/src/drivers/net/skge.c~ 2011-12-11 03:28:04.000000000 +0100 -++++ b/src/drivers/net/skge.c 2017-04-14 14:24:41.466448500 +0200 -+@@ -83,9 +83,6 @@ -+ /* Avoid conditionals by using array */ -+ static const int txqaddr[] = { Q_XA1, Q_XA2 }; -+ static const int rxqaddr[] = { Q_R1, Q_R2 }; -+-static const u32 rxirqmask[] = { IS_R1_F, IS_R2_F }; -+-static const u32 txirqmask[] = { IS_XA1_F, IS_XA2_F }; -+-static const u32 napimask[] = { IS_R1_F|IS_XA1_F, IS_R2_F|IS_XA2_F }; -+ static const u32 portmask[] = { IS_PORT_1, IS_PORT_2 }; -+ -+ /* Determine supported/advertised modes based on hardware. -+@@ -1921,8 +1918,6 @@ -+ skge->tx_ring.to_clean = e; -+ } -+ -+-static const u8 pause_mc_addr[ETH_ALEN] = { 0x1, 0x80, 0xc2, 0x0, 0x0, 0x1 }; -+- -+ static inline u16 phy_length(const struct skge_hw *hw, u32 status) -+ { -+ if (hw->chip_id == CHIP_ID_GENESIS) -+--- a/src/drivers/net/sis190.c~ 2011-12-11 03:28:04.000000000 +0100 -++++ b/src/drivers/net/sis190.c 2017-04-14 14:26:03.937456678 +0200 -+@@ -72,12 +72,6 @@ -+ static const u32 sis190_intr_mask = -+ RxQEmpty | RxQInt | TxQ1Int | TxQ0Int | RxHalt | TxHalt | LinkChange; -+ -+-/* -+- * Maximum number of multicast addresses to filter (vs. Rx-all-multicast). -+- * The chips use a 64 element hash table based on the Ethernet CRC. -+- */ -+-static const int multicast_filter_limit = 32; -+- -+ static void __mdio_cmd(void *ioaddr, u32 ctl) -+ { -+ unsigned int i; -+--- a/src/drivers/net/via-velocity.c~ 2011-12-11 03:28:04.000000000 +0100 -++++ b/src/drivers/net/via-velocity.c 2017-04-14 14:29:33.906690274 +0200 -+@@ -95,7 +95,7 @@ -+ 2: indicate the rxfifo threshold is 1024 bytes. -+ 3: indicate the rxfifo threshold is store & forward. -+ */ -+-VELOCITY_PARAM(rx_thresh, "Receive fifo threshold"); -++//VELOCITY_PARAM(rx_thresh, "Receive fifo threshold"); -+ -+ #define DMA_LENGTH_MIN 0 -+ #define DMA_LENGTH_MAX 7 -+--- a/src/drivers/net/e1000/e1000_phy.c~ 2011-12-11 03:28:04.000000000 +0100 -++++ b/src/drivers/net/e1000/e1000_phy.c 2017-04-14 14:40:51.169290852 +0200 -+@@ -167,18 +167,18 @@ -+ if (!(phy->ops.read_reg)) -+ goto out; -+ -+- ret_val = phy->ops.read_reg(hw, PHY_ID1, &phy_id); -+- if (ret_val) -+- goto out; -++ ret_val = phy->ops.read_reg(hw, PHY_ID1, &phy_id); -++ if (ret_val) -++ goto out; -+ -+- phy->id = (u32)(phy_id << 16); -+- usec_delay(20); -+- ret_val = phy->ops.read_reg(hw, PHY_ID2, &phy_id); -+- if (ret_val) -+- goto out; -++ phy->id = (u32)(phy_id << 16); -++ usec_delay(20); -++ ret_val = phy->ops.read_reg(hw, PHY_ID2, &phy_id); -++ if (ret_val) -++ goto out; -+ -+- phy->id |= (u32)(phy_id & PHY_REVISION_MASK); -+- phy->revision = (u32)(phy_id & ~PHY_REVISION_MASK); -++ phy->id |= (u32)(phy_id & PHY_REVISION_MASK); -++ phy->revision = (u32)(phy_id & ~PHY_REVISION_MASK); -+ -+ out: -+ return ret_val; -+--- a/src/drivers/net/igb/igb_phy.c~ 2011-12-11 03:28:04.000000000 +0100 -++++ b/src/drivers/net/igb/igb_phy.c 2017-04-14 14:43:20.841332677 +0200 -+@@ -91,18 +91,18 @@ -+ if (!(phy->ops.read_reg)) -+ goto out; -+ -+- ret_val = phy->ops.read_reg(hw, PHY_ID1, &phy_id); -+- if (ret_val) -+- goto out; -++ ret_val = phy->ops.read_reg(hw, PHY_ID1, &phy_id); -++ if (ret_val) -++ goto out; -+ -+- phy->id = (u32)(phy_id << 16); -+- usec_delay(20); -+- ret_val = phy->ops.read_reg(hw, PHY_ID2, &phy_id); -+- if (ret_val) -+- goto out; -++ phy->id = (u32)(phy_id << 16); -++ usec_delay(20); -++ ret_val = phy->ops.read_reg(hw, PHY_ID2, &phy_id); -++ if (ret_val) -++ goto out; -+ -+- phy->id |= (u32)(phy_id & PHY_REVISION_MASK); -+- phy->revision = (u32)(phy_id & ~PHY_REVISION_MASK); -++ phy->id |= (u32)(phy_id & PHY_REVISION_MASK); -++ phy->revision = (u32)(phy_id & ~PHY_REVISION_MASK); -+ -+ out: -+ return ret_val; -+--- a/src/drivers/net/ath/ath5k/ath5k_reset.c~ 2011-12-11 03:28:04.000000000 +0100 -++++ b/src/drivers/net/ath/ath5k/ath5k_reset.c 2017-04-14 14:44:37.299026150 +0200 -+@@ -135,13 +135,6 @@ -+ } -+ -+ -+-/* -+- * index into rates for control rates, we can set it up like this because -+- * this is only used for AR5212 and we know it supports G mode -+- */ -+-static const unsigned int control_rates[] = -+- { 0, 1, 1, 1, 4, 4, 6, 6, 8, 8, 8, 8 }; -+- -+ /** -+ * ath5k_hw_write_rate_duration - fill rate code to duration table -+ * -+--- a/src/drivers/net/ath/ath5k/ath5k.c~ 2011-12-11 03:28:04.000000000 +0100 -++++ b/src/drivers/net/ath/ath5k/ath5k.c 2017-04-14 14:46:52.610822110 +0200 -+@@ -85,6 +85,7 @@ -+ PCI_ROM(0x168c, 0x001d, "ath2417", "Atheros 2417 Nala", AR5K_AR5212), -+ }; -+ -++#if DBGLVL_MAX -+ /* Known SREVs */ -+ static const struct ath5k_srev_name srev_names[] = { -+ { "5210", AR5K_VERSION_MAC, AR5K_SREV_AR5210 }, -+@@ -124,6 +125,7 @@ -+ { "5133", AR5K_VERSION_RAD, AR5K_SREV_RAD_5133 }, -+ { "xxxxx", AR5K_VERSION_RAD, AR5K_SREV_UNKNOWN }, -+ }; -++#endif -+ -+ #define ATH5K_SPMBL_NO 1 -+ #define ATH5K_SPMBL_YES 2 -+--- a/src/drivers/net/ath/ath5k/ath5k_phy.c~ 2011-12-11 03:28:04.000000000 +0100 -++++ b/src/drivers/net/ath/ath5k/ath5k_phy.c 2017-04-14 14:50:38.760444548 +0200 -+@@ -1219,12 +1219,12 @@ -+ -+ /* Update radio registers */ -+ ath5k_hw_reg_write(ah, (phy_sig & ~(AR5K_PHY_SIG_FIRPWR)) | -+- AR5K_REG_SM(-1, AR5K_PHY_SIG_FIRPWR), AR5K_PHY_SIG); -++ AR5K_REG_SM(-1U, AR5K_PHY_SIG_FIRPWR), AR5K_PHY_SIG); -+ -+ ath5k_hw_reg_write(ah, (phy_agc & ~(AR5K_PHY_AGCCOARSE_HI | -+ AR5K_PHY_AGCCOARSE_LO)) | -+- AR5K_REG_SM(-1, AR5K_PHY_AGCCOARSE_HI) | -+- AR5K_REG_SM(-127, AR5K_PHY_AGCCOARSE_LO), AR5K_PHY_AGCCOARSE); -++ AR5K_REG_SM(-1U, AR5K_PHY_AGCCOARSE_HI) | -++ AR5K_REG_SM(-127U, AR5K_PHY_AGCCOARSE_LO), AR5K_PHY_AGCCOARSE); -+ -+ ath5k_hw_reg_write(ah, (phy_sat & ~(AR5K_PHY_ADCSAT_ICNT | -+ AR5K_PHY_ADCSAT_THR)) | -+--- a/src/drivers/net/ath/ath9k/ath9k_eeprom.c~ 2011-12-11 03:28:04.000000000 +0100 -++++ b/src/drivers/net/ath/ath9k/ath9k_eeprom.c 2017-04-14 14:56:36.021706193 +0200 -+@@ -371,7 +371,7 @@ -+ /* FIXME: array overrun? */ -+ for (i = 0; i < numXpdGains; i++) { -+ minPwrT4[i] = data_9287[idxL].pwrPdg[i][0]; -+- maxPwrT4[i] = data_9287[idxL].pwrPdg[i][4]; -++ maxPwrT4[i] = data_9287[idxL].pwrPdg[i][intercepts - 1]; -+ ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i], -+ data_9287[idxL].pwrPdg[i], -+ data_9287[idxL].vpdPdg[i], -+@@ -381,7 +381,7 @@ -+ } else if (eeprom_4k) { -+ for (i = 0; i < numXpdGains; i++) { -+ minPwrT4[i] = data_4k[idxL].pwrPdg[i][0]; -+- maxPwrT4[i] = data_4k[idxL].pwrPdg[i][4]; -++ maxPwrT4[i] = data_4k[idxL].pwrPdg[i][intercepts - 1]; -+ ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i], -+ data_4k[idxL].pwrPdg[i], -+ data_4k[idxL].vpdPdg[i], -+@@ -391,7 +391,7 @@ -+ } else { -+ for (i = 0; i < numXpdGains; i++) { -+ minPwrT4[i] = data_def[idxL].pwrPdg[i][0]; -+- maxPwrT4[i] = data_def[idxL].pwrPdg[i][4]; -++ maxPwrT4[i] = data_def[idxL].pwrPdg[i][intercepts - 1]; -+ ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i], -+ data_def[idxL].pwrPdg[i], -+ data_def[idxL].vpdPdg[i], -diff -urN xen-4.6.5/tools/firmware/etherboot/patches/have-strtok.patch xen-4.6.5.build/tools/firmware/etherboot/patches/have-strtok.patch ---- xen-4.6.5/tools/firmware/etherboot/patches/have-strtok.patch 1970-01-01 01:00:00.000000000 +0100 -+++ xen-4.6.5.build/tools/firmware/etherboot/patches/have-strtok.patch 2017-04-14 14:07:35.483912837 +0200 -@@ -0,0 +1,11 @@ -+--- a/src/core/stringextra.c~ 2011-12-11 03:28:04.000000000 +0100 -++++ b/src/core/stringextra.c 2017-04-14 14:07:03.470188756 +0200 -+@@ -174,7 +174,7 @@ -+ } -+ #endif -+ -+-#ifndef __HAVE_ARCH_STRTOK -++#if 0 -+ /** -+ * strtok - Split a string into tokens -+ * @s: The string to be searched -diff -urN xen-4.6.5/tools/firmware/etherboot/patches/mucurses-fix.patch xen-4.6.5.build/tools/firmware/etherboot/patches/mucurses-fix.patch ---- xen-4.6.5/tools/firmware/etherboot/patches/mucurses-fix.patch 1970-01-01 01:00:00.000000000 +0100 -+++ xen-4.6.5.build/tools/firmware/etherboot/patches/mucurses-fix.patch 2017-04-14 14:59:46.177462840 +0200 -@@ -0,0 +1,48 @@ -+--- a/src/hci/mucurses/windows.c~ 2011-12-11 03:28:04.000000000 +0100 -++++ b/src/hci/mucurses/windows.c 2017-04-14 14:59:23.907179591 +0200 -+@@ -16,9 +16,6 @@ -+ * @ret rc return status code -+ */ -+ int delwin ( WINDOW *win ) { -+- if ( win == NULL ) -+- return ERR; -+- -+ /* I think we should blank the region covered by the window - -+ ncurses doesn't do this, but they have a buffer, so they -+ may just be deleting from an offscreen context whereas we -+@@ -49,8 +46,6 @@ -+ WINDOW *derwin ( WINDOW *parent, int nlines, int ncols, -+ int begin_y, int begin_x ) { -+ WINDOW *child; -+- if ( parent == NULL ) -+- return NULL; -+ if ( ( child = malloc( sizeof( WINDOW ) ) ) == NULL ) -+ return NULL; -+ if ( ( (unsigned)ncols > parent->width ) || -+@@ -73,8 +68,6 @@ -+ */ -+ WINDOW *dupwin ( WINDOW *orig ) { -+ WINDOW *copy; -+- if ( orig == NULL ) -+- return NULL; -+ if ( ( copy = malloc( sizeof( WINDOW ) ) ) == NULL ) -+ return NULL; -+ copy->scr = orig->scr; -+@@ -97,8 +90,6 @@ -+ * @ret rc return status code -+ */ -+ int mvwin ( WINDOW *win, int y, int x ) { -+- if ( win == NULL ) -+- return ERR; -+ if ( ( ( (unsigned)y + win->height ) > LINES ) || -+ ( ( (unsigned)x + win->width ) > COLS ) ) -+ return ERR; -+@@ -147,8 +138,6 @@ -+ WINDOW *subwin ( WINDOW *parent, int nlines, int ncols, -+ int begin_y, int begin_x ) { -+ WINDOW *child; -+- if ( parent == NULL ) -+- return NULL; -+ if ( ( child = malloc( sizeof( WINDOW ) ) ) == NULL ) -+ return NULL; -+ child = newwin( nlines, ncols, begin_y, begin_x ); -diff -urN xen-4.6.5/tools/firmware/etherboot/patches/series xen-4.6.5.build/tools/firmware/etherboot/patches/series ---- xen-4.6.5/tools/firmware/etherboot/patches/series 2017-03-07 17:19:05.000000000 +0100 -+++ xen-4.6.5.build/tools/firmware/etherboot/patches/series 2017-04-14 14:59:51.384195712 +0200 -@@ -4,3 +4,7 @@ - build_fix_3.patch - build-compare.patch - build_fix_4.patch -+have-strtok.patch -+unused-variable.patch -+drivers-fixes.patch -+mucurses-fix.patch -diff -urN xen-4.6.5/tools/firmware/etherboot/patches/unused-variable.patch xen-4.6.5.build/tools/firmware/etherboot/patches/unused-variable.patch ---- xen-4.6.5/tools/firmware/etherboot/patches/unused-variable.patch 1970-01-01 01:00:00.000000000 +0100 -+++ xen-4.6.5.build/tools/firmware/etherboot/patches/unused-variable.patch 2017-04-14 14:15:17.032883274 +0200 -@@ -0,0 +1,12 @@ -+--- a/src/include/nic.h~ 2017-04-14 14:13:09.000000000 +0200 -++++ b/src/include/nic.h 2017-04-14 14:13:37.061661840 +0200 -+@@ -199,7 +199,8 @@ -+ -+ #undef DRIVER -+ #define DRIVER(_name_text,_unused2,_unused3,_name,_probe,_disable) \ -+- static const char _name ## _text[] = _name_text; \ -++ static __attribute__ (( unused )) const char \ -++ _name ## _text[] = _name_text; \ -+ static inline int \ -+ _name ## _probe ( struct nic *nic, void *hwdev ) { \ -+ return _probe ( nic, hwdev ); \ diff --git a/unused-function.patch b/unused-function.patch deleted file mode 100644 index a114331..0000000 --- a/unused-function.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- xen-4.6.5/tools/xentrace/xenalyze.c~ 2017-04-14 13:49:33.000000000 +0200 -+++ xen-4.6.5/tools/xentrace/xenalyze.c 2017-04-14 13:53:51.117184985 +0200 -@@ -4128,7 +4128,7 @@ - struct cr3_value_struct *p; - struct cr3_value_struct **qsort_array; - int i, N=0; -- -+#if 0 - int cr3_compare_total(const void *_a, const void *_b) { - struct cr3_value_struct *a=*(typeof(&a))_a; - struct cr3_value_struct *b=*(typeof(&a))_b; -@@ -4145,7 +4145,7 @@ - } else - return -1; - } -- -+#endif - int cr3_compare_start(const void *_a, const void *_b) { - struct cr3_value_struct *a=*(typeof(&a))_a; - struct cr3_value_struct *b=*(typeof(&a))_b; diff --git a/xen-curses.patch b/xen-curses.patch deleted file mode 100644 index 6a47983..0000000 --- a/xen-curses.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xen-4.2.0.orig/tools/xenstat/Makefile 2012-09-17 12:21:19.000000000 +0200 -+++ xen-4.2.0/tools/xenstat/Makefile 2012-10-23 09:59:58.000000000 +0200 -@@ -6,7 +6,7 @@ - - # This doesn't cross-compile (cross-compile environments rarely have curses) - ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH)) --ifeq ($(wildcard /usr/include/curses.h),/usr/include/curses.h) -+ifeq ($(wildcard /usr/include/ncurses/curses.h),/usr/include/ncurses/curses.h) - SUBDIRS += xentop - endif - endif diff --git a/xen-gawk.patch b/xen-gawk.patch deleted file mode 100644 index 4b1b29b..0000000 --- a/xen-gawk.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xen-4.4.1/tools/flask/policy/Makefile.orig 2014-10-22 22:35:07.033124118 +0200 -+++ xen-4.4.1/tools/flask/policy/Makefile 2014-10-22 22:42:54.523104517 +0200 -@@ -86,7 +86,7 @@ - MODENABLED := on - - # extract settings from modules.conf --ENABLED_MODS := $(foreach mod,$(shell awk '/^[ \t]*[a-z]/{ if ($$3 == "$(MODENABLED)") print $$1 }' $(MOD_CONF) 2> /dev/null),$(subst ./,,$(shell find -iname $(mod).te))) -+ENABLED_MODS := $(foreach mod,$(shell gawk '/^[ \t]*[a-z]/{ if ($$3 == "$(MODENABLED)") print $$1 }' $(MOD_CONF) 2> /dev/null),$(subst ./,,$(shell find -iname $(mod).te))) - - ALL_MODULES := $(filter $(ENABLED_MODS),$(DETECTED_MODS)) - diff --git a/xen-gmp-abi.patch b/xen-gmp-abi.patch deleted file mode 100644 index 0929909..0000000 --- a/xen-gmp-abi.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur xen-4.4.1.orig/stubdom/Makefile xen-4.4.1/stubdom/Makefile ---- xen-4.4.1.orig/stubdom/Makefile 2014-09-02 06:20:19.000000000 +0000 -+++ xen-4.4.1/stubdom/Makefile 2014-10-13 06:57:49.075000000 +0000 -@@ -165,7 +165,7 @@ - rm $@ -rf || : - mv gmp-$(GMP_VERSION) $@ - #patch -d $@ -p0 < gmp.patch -- cd $@; CPPFLAGS="-isystem $(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/include $(TARGET_CPPFLAGS)" CFLAGS="$(TARGET_CFLAGS)" CC=$(CC) $(GMPEXT) ./configure --disable-shared --enable-static --disable-fft --without-readline --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf -+ cd $@; CPPFLAGS="-isystem $(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/include $(TARGET_CPPFLAGS)" CFLAGS="$(TARGET_CFLAGS)" CC=$(CC) $(GMPEXT) ./configure --disable-shared --enable-static --disable-fft --without-readline --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf --build=$(GNU_TARGET_ARCH) - sed -i 's/#define HAVE_OBSTACK_VPRINTF 1/\/\/#define HAVE_OBSTACK_VPRINTF 1/' $@/config.h - touch $@ - diff --git a/xen-link.patch b/xen-link.patch new file mode 100644 index 0000000..d7a3668 --- /dev/null +++ b/xen-link.patch @@ -0,0 +1,11 @@ +--- xen-4.9.0/tools/libxc/Makefile.orig 2017-06-27 20:13:19.000000000 +0200 ++++ xen-4.9.0/tools/libxc/Makefile 2017-07-31 17:56:20.268706026 +0200 +@@ -262,7 +262,7 @@ + + libxenguest.so.$(MAJOR).$(MINOR): COMPRESSION_LIBS = $(filter -l%,$(zlib-options)) + libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so +- $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz $(LDLIBS_libxenevtchn) $(LDLIBS_libxenctrl) $(PTHREAD_LIBS) $(APPEND_LDFLAGS) ++ $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz $(LDLIBS_libxenevtchn) $(LDLIBS_libxenctrl) $(LDLIBS_libxencall) $(LDLIBS_libxenforeignmemory) $(LDLIBS_libxentoollog) $(PTHREAD_LIBS) $(APPEND_LDFLAGS) + + -include $(DEPS) + diff --git a/xen-no_Werror.patch b/xen-no_Werror.patch index 6df40b1..299077c 100644 --- a/xen-no_Werror.patch +++ b/xen-no_Werror.patch @@ -1,10 +1,9 @@ -diff -dur -x '*~' xen-4.1.2.orig/Config.mk xen-4.1.2/Config.mk ---- xen-4.1.2.orig/Config.mk 2011-10-20 19:06:04.000000000 +0200 -+++ xen-4.1.2/Config.mk 2012-09-20 08:44:53.000000000 +0200 -@@ -14,7 +14,7 @@ +--- xen-4.9.0/Config.mk.orig 2017-07-30 20:40:20.116246872 +0200 ++++ xen-4.9.0/Config.mk 2017-07-30 20:43:13.782911554 +0200 +@@ -29,7 +29,7 @@ + SHELL ?= /bin/sh # Tools to run on system hosting the build - HOSTCC = gcc -HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer +HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer HOSTCFLAGS += -fno-strict-aliasing diff --git a/xen-pkgconfigdir.patch b/xen-pkgconfigdir.patch new file mode 100644 index 0000000..f1d5f97 --- /dev/null +++ b/xen-pkgconfigdir.patch @@ -0,0 +1,9 @@ +pkg-config files are arch-dependent (due to libdir usage), so use arch-dependent location. +--- xen-4.9.0/config/Paths.mk.in.orig 2017-06-27 20:13:19.000000000 +0200 ++++ xen-4.9.0/config/Paths.mk.in 2017-07-31 20:59:29.558580546 +0200 +@@ -57,4 +57,4 @@ + XEN_CONFIG_DIR := @XEN_CONFIG_DIR@ + XEN_SCRIPT_DIR := @XEN_SCRIPT_DIR@ + +-PKG_INSTALLDIR := ${SHAREDIR}/pkgconfig ++PKG_INSTALLDIR := ${libdir}/pkgconfig diff --git a/xen-stubdom-build.patch b/xen-stubdom-build.patch index b200433..c6161c7 100644 --- a/xen-stubdom-build.patch +++ b/xen-stubdom-build.patch @@ -1,24 +1,10 @@ ---- xen-4.6.1/extras/mini-os/Makefile~ 2016-04-07 22:37:10.000000000 +0900 -+++ xen-4.6.1/extras/mini-os/Makefile 2016-04-07 22:41:43.295354712 +0900 -@@ -7,9 +7,9 @@ - OBJ_DIR=$(CURDIR) - TOPLEVEL_DIR=$(CURDIR) - --ifeq ($(MINIOS_CONFIG),) - include Config.mk --else -+ -+ifneq ($(MINIOS_CONFIG),) - EXTRA_DEPS += $(MINIOS_CONFIG) - include $(MINIOS_CONFIG) - endif ---- xen-4.6.1/stubdom/Makefile.orig 2016-04-07 23:04:54.871970996 +0900 -+++ xen-4.6.1/stubdom/Makefile 2016-04-07 23:06:06.096784272 +0900 -@@ -171,6 +171,7 @@ +--- xen-4.9.0/stubdom/Makefile.orig 2017-07-30 20:44:13.036244212 +0200 ++++ xen-4.9.0/stubdom/Makefile 2017-07-30 21:04:31.269563636 +0200 +@@ -178,6 +178,7 @@ rm $@ -rf || : mv gmp-$(GMP_VERSION) $@ #patch -d $@ -p0 < gmp.patch + sed -i.bak 's/\(\s*\)\(fprintf (f,\)\(.*\)/\1\2\3\n\1clearerr(f);/' $@/configure - cd $@; CPPFLAGS="-isystem $(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/include $(TARGET_CPPFLAGS)" CFLAGS="$(TARGET_CFLAGS)" CC=$(CC) $(GMPEXT) ./configure --disable-shared --enable-static --disable-fft --without-readline --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf --build=$(GNU_TARGET_ARCH) + cd $@; CPPFLAGS="-isystem $(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/include $(TARGET_CPPFLAGS)" CFLAGS="$(TARGET_CFLAGS)" CC=$(CC) $(GMPEXT) ./configure --disable-shared --enable-static --disable-fft --without-readline --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf --libdir=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/lib --build=`gcc -dumpmachine` --host=$(GNU_TARGET_ARCH)-xen-elf sed -i 's/#define HAVE_OBSTACK_VPRINTF 1/\/\/#define HAVE_OBSTACK_VPRINTF 1/' $@/config.h touch $@ diff --git a/xen-systemd.patch b/xen-systemd.patch index 3230232..6353db1 100644 --- a/xen-systemd.patch +++ b/xen-systemd.patch @@ -1,6 +1,6 @@ ---- xen-4.6.1/tools/hotplug/Linux/systemd/xenconsoled.service.in.orig 2016-04-10 22:41:41.095161609 +0900 -+++ xen-4.6.1/tools/hotplug/Linux/systemd/xenconsoled.service.in 2016-04-10 22:42:13.745756123 +0900 -@@ -7,13 +7,13 @@ +--- xen-4.9.0/tools/hotplug/Linux/systemd/xenconsoled.service.in.orig 2017-07-30 21:05:26.089563010 +0200 ++++ xen-4.9.0/tools/hotplug/Linux/systemd/xenconsoled.service.in 2017-07-30 21:12:17.189558321 +0200 +@@ -7,12 +7,12 @@ [Service] Type=simple Environment=XENCONSOLED_ARGS= @@ -9,22 +9,21 @@ Environment=XENCONSOLED_LOG_DIR=@XEN_LOG_DIR@/console -EnvironmentFile=@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons +EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xenconsoled - PIDFile=@XEN_RUN_DIR@/xenconsoled.pid ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities ExecStartPre=/bin/mkdir -p ${XENCONSOLED_LOG_DIR} --ExecStart=@sbindir@/xenconsoled --pid-file @XEN_RUN_DIR@/xenconsoled.pid --log=${XENCONSOLED_TRACE} --log-dir=${XENCONSOLED_LOG_DIR} $XENCONSOLED_ARGS -+ExecStart=@sbindir@/xenconsoled --pid-file @XEN_RUN_DIR@/xenconsoled.pid --log=${XENCONSOLED_LOG} --log-dir=${XENCONSOLED_LOG_DIR} $XENCONSOLED_ARGS +-ExecStart=@sbindir@/xenconsoled -i --log=${XENCONSOLED_TRACE} --log-dir=${XENCONSOLED_LOG_DIR} $XENCONSOLED_ARGS ++ExecStart=@sbindir@/xenconsoled -i --log=${XENCONSOLED_LOG} --log-dir=${XENCONSOLED_LOG_DIR} $XENCONSOLED_ARGS [Install] WantedBy=multi-user.target ---- xen-4.6.1/tools/hotplug/Linux/systemd/xenstored.service.in.orig 2016-04-10 22:43:44.334072370 +0900 -+++ xen-4.6.1/tools/hotplug/Linux/systemd/xenstored.service.in 2016-04-10 22:44:19.164706660 +0900 -@@ -11,7 +11,7 @@ - KillMode=none - Environment=XENSTORED_ARGS= - Environment=XENSTORED=@XENSTORED@ --EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons -+EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xenstored - ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities - ExecStartPre=-/bin/rm -f @XEN_LIB_STORED@/tdb* - ExecStartPre=/bin/mkdir -p @XEN_RUN_DIR@ +--- xen-4.9.0/tools/hotplug/Linux/launch-xenstore.in.orig 2017-06-27 20:13:19.000000000 +0200 ++++ xen-4.9.0/tools/hotplug/Linux/launch-xenstore.in 2017-07-30 21:16:13.246222287 +0200 +@@ -46,7 +46,7 @@ + + test_xenstore && exit 0 + +-test -f @CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons && . @CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons ++test -f @CONFIG_DIR@/@CONFIG_LEAF_DIR@/xenstored && . @CONFIG_DIR@/@CONFIG_LEAF_DIR@/xenstored + + [ "$XENSTORETYPE" = "" ] && XENSTORETYPE=daemon + ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xen.git/commitdiff/9178a513a5d519026afa57c47cd339279f12e3a1 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit