[Pkg-xen-changes] r721 - trunk/xen-3/debian/patches

Bastian Blank waldi at alioth.debian.org
Mon Mar 1 20:49:15 UTC 2010 

Author: waldi
Date: Mon Mar  1 20:49:14 2010
New Revision: 721

Log:
* debian/patches/series: Add new patches.
* debian/patches/tools-python-shebang.diff:
  Add patch to remove shebangs from modules.
* debian/patches/tools-xenmon-install.diff,
  debian/patches/tools-xentrace-install.diff:
  Install python scripts via install wrapper.

Added:
   trunk/xen-3/debian/patches/tools-python-shebang.diff
   trunk/xen-3/debian/patches/tools-xenmon-install.diff
   trunk/xen-3/debian/patches/tools-xentrace-install.diff
Modified:
   trunk/xen-3/debian/patches/series

Modified: trunk/xen-3/debian/patches/series
==============================================================================
--- trunk/xen-3/debian/patches/series	Mon Mar  1 20:47:50 2010	(r720)
+++ trunk/xen-3/debian/patches/series	Mon Mar  1 20:49:14 2010	(r721)
@@ -42,3 +42,7 @@
 tools-blktap-crypto.patch
 
 tools-include-install.diff
+tools-xenmon-install.diff
+tools-xentrace-install.diff
+
+tools-python-shebang.diff

Added: trunk/xen-3/debian/patches/tools-python-shebang.diff
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/xen-3/debian/patches/tools-python-shebang.diff	Mon Mar  1 20:49:14 2010	(r721)
@@ -0,0 +1,95 @@
+--- a/tools/python/xen/util/bugtool.py
++++ b/tools/python/xen/util/bugtool.py
+@@ -1,5 +1,3 @@
+-#!/usr/bin/env python
+-
+ # This library is free software; you can redistribute it and/or
+ # modify it under the terms of version 2.1 of the GNU Lesser General Public
+ # License as published by the Free Software Foundation.
+--- a/tools/python/xen/util/pci.py
++++ b/tools/python/xen/util/pci.py
+@@ -1,5 +1,3 @@
+-#!/usr/bin/env python
+-#
+ # PCI Device Information Class
+ # - Helps obtain information about which I/O resources a PCI device needs
+ #
+--- a/tools/python/xen/util/vscsi_util.py
++++ b/tools/python/xen/util/vscsi_util.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ #  -*- mode: python; -*-
+ 
+ #============================================================================
+--- a/tools/python/xen/xend/XendBase.py
++++ b/tools/python/xen/xend/XendBase.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/python
+ #============================================================================
+ # This library is free software; you can redistribute it and/or
+ # modify it under the terms of version 2.1 of the GNU Lesser General Public
+--- a/tools/python/xen/xend/XendClient.py
++++ b/tools/python/xen/xend/XendClient.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ #============================================================================
+ # This library is free software; you can redistribute it and/or
+ # modify it under the terms of version 2.1 of the GNU Lesser General Public
+--- a/tools/python/xen/xend/XendLocalStorageRepo.py
++++ b/tools/python/xen/xend/XendLocalStorageRepo.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/python
+ #============================================================================
+ # This library is free software; you can redistribute it and/or
+ # modify it under the terms of version 2.1 of the GNU Lesser General Public
+--- a/tools/python/xen/xend/XendQCoWStorageRepo.py
++++ b/tools/python/xen/xend/XendQCoWStorageRepo.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/python
+ #============================================================================
+ # This library is free software; you can redistribute it and/or
+ # modify it under the terms of version 2.1 of the GNU Lesser General Public
+--- a/tools/python/xen/xend/XendStorageRepository.py
++++ b/tools/python/xen/xend/XendStorageRepository.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/python
+ #============================================================================
+ # This library is free software; you can redistribute it and/or
+ # modify it under the terms of version 2.1 of the GNU Lesser General Public
+--- a/tools/python/xen/xend/XendVDI.py
++++ b/tools/python/xen/xend/XendVDI.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/python
+ #============================================================================
+ # This library is free software; you can redistribute it and/or
+ # modify it under the terms of version 2.1 of the GNU Lesser General Public
+--- a/tools/python/xen/xend/arch.py
++++ b/tools/python/xen/xend/arch.py
+@@ -1,5 +1,3 @@
+-#!/usr/bin/env python
+-#
+ # This library is free software; you can redistribute it and/or
+ # modify it under the terms of version 2.1 of the GNU Lesser General Public
+ # License as published by the Free Software Foundation.
+--- a/tools/python/xen/xend/osdep.py
++++ b/tools/python/xen/xend/osdep.py
+@@ -1,5 +1,3 @@
+-#!/usr/bin/env python
+-#
+ # This library is free software; you can redistribute it and/or
+ # modify it under the terms of version 2.1 of the GNU Lesser General Public
+ # License as published by the Free Software Foundation.
+--- a/tools/python/xen/xend/sxp.py
++++ b/tools/python/xen/xend/sxp.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ #============================================================================
+ # This library is free software; you can redistribute it and/or
+ # modify it under the terms of version 2.1 of the GNU Lesser General Public
+--- a/tools/python/xen/xm/xenapi_create.py
++++ b/tools/python/xen/xm/xenapi_create.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/python
+ #============================================================================
+ # This library is free software; you can redistribute it and/or
+ # modify it under the terms of version 2.1 of the GNU Lesser General Public

Added: trunk/xen-3/debian/patches/tools-xenmon-install.diff
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/xen-3/debian/patches/tools-xenmon-install.diff	Mon Mar  1 20:49:14 2010	(r721)
@@ -0,0 +1,22 @@
+--- a/tools/xenmon/Makefile
++++ b/tools/xenmon/Makefile
+@@ -13,6 +13,10 @@
+ XEN_ROOT=../..
+ include $(XEN_ROOT)/tools/Rules.mk
+ 
++DEFAULT_PYTHON_PATH := $(shell $(XEN_ROOT)/tools/python/get-path)
++PYTHON_PATH ?= $(DEFAULT_PYTHON_PATH)
++INSTALL_PYTHON_PROG = $(XEN_ROOT)/tools/python/install-wrap "$(PYTHON_PATH)" $(INSTALL_PROG)
++
+ CFLAGS  += -Werror
+ CFLAGS  += -I $(XEN_XC)
+ CFLAGS  += $(CFLAGS_libxenctrl)
+@@ -33,7 +37,7 @@
+ 	$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
+ 	$(INSTALL_PROG) xenbaked $(DESTDIR)$(PRIVATE_BINDIR)/xenbaked
+ 	$(INSTALL_PROG) xentrace_setmask  $(DESTDIR)$(PRIVATE_BINDIR)/xentrace_setmask
+-	$(INSTALL_PROG) xenmon.py  $(DESTDIR)$(PRIVATE_BINDIR)/xenmon.py
++	$(INSTALL_PYTHON_PROG) xenmon.py  $(DESTDIR)$(PRIVATE_BINDIR)/xenmon
+ 	$(INSTALL_DIR) $(DESTDIR)$(DOCDIR)
+ 	$(INSTALL_DATA) README $(DESTDIR)$(DOCDIR)/README.xenmon
+ 

Added: trunk/xen-3/debian/patches/tools-xentrace-install.diff
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/xen-3/debian/patches/tools-xentrace-install.diff	Mon Mar  1 20:49:14 2010	(r721)
@@ -0,0 +1,23 @@
+--- a/tools/xentrace/Makefile
++++ b/tools/xentrace/Makefile
+@@ -1,6 +1,10 @@
+ XEN_ROOT=../..
+ include $(XEN_ROOT)/tools/Rules.mk
+ 
++DEFAULT_PYTHON_PATH := $(shell $(XEN_ROOT)/tools/python/get-path)
++PYTHON_PATH ?= $(DEFAULT_PYTHON_PATH)
++INSTALL_PYTHON_PROG = $(XEN_ROOT)/tools/python/install-wrap "$(PYTHON_PATH)" $(INSTALL_PROG)
++
+ CFLAGS  += -Werror
+ 
+ CFLAGS  += $(CFLAGS_libxenctrl)
+@@ -39,7 +43,8 @@
+ 	$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
+ 	$(INSTALL_DIR) $(DESTDIR)$(MAN1DIR)
+ 	$(INSTALL_DIR) $(DESTDIR)$(MAN8DIR)
+-	$(INSTALL_PROG) $(BIN) $(LIBBIN) $(SCRIPTS) $(DESTDIR)$(PRIVATE_BINDIR)
++	$(INSTALL_PROG) $(BIN) $(LIBBIN) $(DESTDIR)$(PRIVATE_BINDIR)
++	$(INSTALL_PYTHON_PROG) $(SCRIPTS)
+ 	$(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MAN1DIR)
+ 	$(INSTALL_DATA) $(MAN8) $(DESTDIR)$(MAN8DIR)
+

More information about the Pkg-xen-changes mailing list