xen/tmp_build.patch

Index: xen-4.1.0-testing/tools/xenstore/Makefile
===================================================================
--- xen-4.1.0-testing.orig/tools/xenstore/Makefile
+++ xen-4.1.0-testing/tools/xenstore/Makefile
@@ -58,6 +58,7 @@ $(CLIENTS_DOMU): xenstore
 
 xenstore: xenstore_client.o $(LIBXENSTORE)
 	$(CC) $(CFLAGS) $(LDFLAGS) $< -L. -lxenstore $(SOCKET_LIBS) -o $@
+	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,--build-id=uuid $< -L. -lxenstore $(SOCKET_LIBS) -o domu-$@
 
 xenstore-control: xenstore_control.o $(LIBXENSTORE)
 	$(CC) $(CFLAGS) $(LDFLAGS) $< -L. -lxenstore $(SOCKET_LIBS) -o $@
@@ -106,10 +107,11 @@ install: all
 	$(INSTALL_PROG) xenstore-control $(DESTDIR)$(BINDIR)
 	$(INSTALL_PROG) xenstore $(DESTDIR)$(BINDIR)
 	set -e ; for c in $(CLIENTS) ; do \
-		ln -f $(DESTDIR)$(BINDIR)/xenstore $(DESTDIR)$(BINDIR)/$${c} ; \
+		ln -fs /usr/bin/xenstore $(DESTDIR)/usr/bin/$${c} ; \
 	done
+	$(INSTALL_PROG) domu-xenstore $(DESTDIR)/bin
 	for client in $(CLIENTS_DOMU); do \
-	    $(INSTALL_PROG) $$client $(DESTDIR)/bin/$${client/domu-}; \
+	    ln -fs /bin/domu-xenstore $(DESTDIR)/bin/$${client/domu-}; \
 	done
 	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
 	$(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
- bnc#681302 - xm create -x <guest> returns "ImportError: No module named ext" xm-create-xflag.patch - Fix xen-utils to cope with xen-unstable c/s 21483 - xz-devel is available since 11.2, make it optional for SLES11SP1 - bnc#665610 - xm console > 1 to same VM messes up both consoles Upstream rejected due to portability concern, see http://lists.xensource.com/archives/html/xen-devel/2011-02/msg00942.html xenconsole-no-multiple-connections.patch - Enable support for kernel decompression for gzip, bzip2, and LZMA so that kernels compressed with any of these methods can be launched. - Update to Xen 4.1.0 c/s 22861 OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=102 2011-03-21 17:47:37 +01:00			`Index: xen-4.1.0-testing/tools/xenstore/Makefile`
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xen?expand=0&rev=64 2008-11-25 15:57:48 +01:00			`===================================================================`
- bnc#681302 - xm create -x <guest> returns "ImportError: No module named ext" xm-create-xflag.patch - Fix xen-utils to cope with xen-unstable c/s 21483 - xz-devel is available since 11.2, make it optional for SLES11SP1 - bnc#665610 - xm console > 1 to same VM messes up both consoles Upstream rejected due to portability concern, see http://lists.xensource.com/archives/html/xen-devel/2011-02/msg00942.html xenconsole-no-multiple-connections.patch - Enable support for kernel decompression for gzip, bzip2, and LZMA so that kernels compressed with any of these methods can be launched. - Update to Xen 4.1.0 c/s 22861 OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=102 2011-03-21 17:47:37 +01:00			`--- xen-4.1.0-testing.orig/tools/xenstore/Makefile`
			`+++ xen-4.1.0-testing/tools/xenstore/Makefile`
			`@@ -58,6 +58,7 @@ $(CLIENTS_DOMU): xenstore`
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xen?expand=0&rev=64 2008-11-25 15:57:48 +01:00
			`xenstore: xenstore_client.o $(LIBXENSTORE)`
			`$(CC) $(CFLAGS) $(LDFLAGS) $< -L. -lxenstore $(SOCKET_LIBS) -o $@`
			`+ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,--build-id=uuid $< -L. -lxenstore $(SOCKET_LIBS) -o domu-$@`

			`xenstore-control: xenstore_control.o $(LIBXENSTORE)`
			`$(CC) $(CFLAGS) $(LDFLAGS) $< -L. -lxenstore $(SOCKET_LIBS) -o $@`
- bnc#681302 - xm create -x <guest> returns "ImportError: No module named ext" xm-create-xflag.patch - Fix xen-utils to cope with xen-unstable c/s 21483 - xz-devel is available since 11.2, make it optional for SLES11SP1 - bnc#665610 - xm console > 1 to same VM messes up both consoles Upstream rejected due to portability concern, see http://lists.xensource.com/archives/html/xen-devel/2011-02/msg00942.html xenconsole-no-multiple-connections.patch - Enable support for kernel decompression for gzip, bzip2, and LZMA so that kernels compressed with any of these methods can be launched. - Update to Xen 4.1.0 c/s 22861 OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=102 2011-03-21 17:47:37 +01:00			`@@ -106,10 +107,11 @@ install: all`
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xen?expand=0&rev=64 2008-11-25 15:57:48 +01:00			`$(INSTALL_PROG) xenstore-control $(DESTDIR)$(BINDIR)`
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xen?expand=0&rev=73 2009-05-04 18:38:09 +02:00			`$(INSTALL_PROG) xenstore $(DESTDIR)$(BINDIR)`
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xen?expand=0&rev=64 2008-11-25 15:57:48 +01:00			`set -e ; for c in $(CLIENTS) ; do \`
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xen?expand=0&rev=73 2009-05-04 18:38:09 +02:00			`- ln -f $(DESTDIR)$(BINDIR)/xenstore $(DESTDIR)$(BINDIR)/$${c} ; \`
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xen?expand=0&rev=64 2008-11-25 15:57:48 +01:00			`+ ln -fs /usr/bin/xenstore $(DESTDIR)/usr/bin/$${c} ; \`
			`done`
			`+ $(INSTALL_PROG) domu-xenstore $(DESTDIR)/bin`
			`for client in $(CLIENTS_DOMU); do \`
			`- $(INSTALL_PROG) $$client $(DESTDIR)/bin/$${client/domu-}; \`
			`+ ln -fs /bin/domu-xenstore $(DESTDIR)/bin/$${client/domu-}; \`
			`done`
			`$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)`
			`$(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)`