[Pkg-xen-changes] r17 - in trunk/debian: . patches

Ralph Passgang tha-guest at costa.debian.org
Sat Feb 18 00:45:57 UTC 2006 

Author: tha-guest
Date: 2006-02-18 00:45:56 +0000 (Sat, 18 Feb 2006)
New Revision: 17

Added:
   trunk/debian/patches/00list
   trunk/debian/patches/10sysconfig.dpatch
   trunk/debian/xen-hypervisor-pae.install
   trunk/debian/xen-hypervisor.install
   trunk/debian/xen-utils.install
   trunk/debian/xen-utils.manpages
   trunk/debian/xen-utils.postinst
   trunk/debian/xen-utils.postrm
   trunk/debian/xen-utils.prerm
Removed:
   trunk/debian/xen.install
   trunk/debian/xen.manpages
   trunk/debian/xen.postinst
   trunk/debian/xen.postrm
   trunk/debian/xen.prerm
Modified:
   trunk/debian/rules
   trunk/debian/xen-docs.install
Log:
- moved xen.* to xen-utils.*, because xen is a meta-package now and
  all userspace tools should be installed with xen-utils from now on.
- removed empty line from xen-docs.install file.
- removed all useless pae-related stuff from debian/rules.
- created xen-hypervisor(-pae).install
- added dpatch to have the xendomains config path set to /etc/default)

now the package builds again and should be useable, just the real pae-
hypervisor is not build and packaged correctly at the moment.


Added: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list	2006-02-17 23:22:37 UTC (rev 16)
+++ trunk/debian/patches/00list	2006-02-18 00:45:56 UTC (rev 17)
@@ -0,0 +1 @@
+10sysconfig

Added: trunk/debian/patches/10sysconfig.dpatch
===================================================================
--- trunk/debian/patches/10sysconfig.dpatch	2006-02-17 23:22:37 UTC (rev 16)
+++ trunk/debian/patches/10sysconfig.dpatch	2006-02-18 00:45:56 UTC (rev 17)
@@ -0,0 +1,53 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10sysconfig.dpatch by Ralph Passgang <ralph at debianbase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -Naur a/Makefile b/Makefile
+--- a/Makefile	2006-02-16 23:44:08.000000000 +0100
++++ b/Makefile	2006-02-18 01:34:35.659936303 +0100
+@@ -173,7 +173,6 @@
+ 	rm -rf $(D)/etc/hotplug/xen-backend.agent
+ 	rm -f  $(D)/etc/udev/rules.d/xen-backend.rules
+ 	rm -f  $(D)/etc/udev/xen-backend.rules
+-	rm -f  $(D)/etc/sysconfig/xendomains
+ 	rm -rf $(D)/var/run/xen* $(D)/var/lib/xen*
+ 	rm -rf $(D)/boot/*xen*
+ 	rm -rf $(D)/lib/modules/*xen*
+diff -Naur a/tools/examples/init.d/xendomains b/tools/examples/init.d/xendomains
+--- a/tools/examples/init.d/xendomains	2006-02-16 23:44:08.000000000 +0100
++++ b/tools/examples/init.d/xendomains	2006-02-18 01:34:35.659936303 +0100
+@@ -35,7 +35,7 @@
+ fi
+ 
+ LOCKFILE=/var/lock/subsys/xendomains
+-XENDOM_CONFIG=/etc/sysconfig/xendomains
++XENDOM_CONFIG=/etc/default/xendomains
+ 
+ test -r $XENDOM_CONFIG || { echo "$XENDOM_CONFIG not existing";
+ 	if [ "$1" = "stop" ]; then exit 0;
+diff -Naur a/tools/examples/Makefile b/tools/examples/Makefile
+--- a/tools/examples/Makefile	2006-02-16 23:44:08.000000000 +0100
++++ b/tools/examples/Makefile	2006-02-18 01:35:13.225266374 +0100
+@@ -56,10 +56,8 @@
+ 
+ install-initd:
+ 	[ -d $(DESTDIR)/etc/init.d ] || $(INSTALL_DIR) $(DESTDIR)/etc/init.d
+-	[ -d $(DESTDIR)/etc/sysconfig ] || $(INSTALL_DIR) $(DESTDIR)/etc/sysconfig
+ 	$(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)/etc/init.d
+ 	$(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)/etc/init.d
+-	$(INSTALL_PROG) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)/etc/sysconfig/xendomains
+ 
+ install-configs: $(XEN_CONFIGS)
+ 	[ -d $(DESTDIR)$(XEN_CONFIG_DIR) ] || \
+@@ -70,6 +68,8 @@
+ 	    do [ -e $(DESTDIR)$(XEN_CONFIG_DIR)/$$i ] || \
+ 	    $(INSTALL_DATA) $$i $(DESTDIR)$(XEN_CONFIG_DIR); \
+ 	done
++	[ -d $(DESTDIR)/etc/default ] || $(INSTALL_DIR) $(DESTDIR)/etc/default
++	$(INSTALL_DATA) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)/etc/default/xendomains
+ 
+ install-scripts:
+ 	[ -d $(DESTDIR)$(XEN_SCRIPT_DIR) ] || \


Property changes on: trunk/debian/patches/10sysconfig.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2006-02-17 23:22:37 UTC (rev 16)
+++ trunk/debian/rules	2006-02-18 00:45:56 UTC (rev 17)
@@ -4,7 +4,6 @@
 KERNELS		:=
 LINUX_VERSIONS	:= 2.6.12
 ALLSPARSETREES	:= $(patsubst %,linux-%,$(LINUX_VERSIONS))
-PAE		:= n
 #DH_VERBOSE	:= -v
 
 export KERNELS ALLSPARSETREES DH_VERBOSE
@@ -30,12 +29,12 @@
 debian/stamps/build:
 	mkdir -p $(@D)
 	rm -rf debian/install
-	$(MAKE) all DESTDIR=$(CURDIR)/debian/install KERNELS= GCC=$(CC) CC=$(CC) HOSTCC=$(CC) XEN_TARGET_X86_PAE=$(PAE)
+	$(MAKE) all DESTDIR=$(CURDIR)/debian/install KERNELS= GCC=$(CC) CC=$(CC) HOSTCC=$(CC)
 	touch $@
 
 install: debian/stamps/build
 	rm -rf debian/install
-	$(MAKE) dist DESTDIR=$(CURDIR)/debian/install KERNELS= XEN_PYTHON_NATIVE_INSTALL=1 CC=$(CC) GCC=$(CC) HOSTCC=$(CC) XEN_TARGET_X86_PAE=$(PAE)
+	$(MAKE) dist DESTDIR=$(CURDIR)/debian/install KERNELS= XEN_PYTHON_NATIVE_INSTALL=1 CC=$(CC) GCC=$(CC) HOSTCC=$(CC)
 	$(MAKE) -C tools/examples install-udev DESTDIR=$(CURDIR)/debian/install
 	find $(CURDIR)/debian/install -name '*.pyc' | xargs rm
 	mkdir -p debian/install/etc/xen/sv debian/install/etc/xen/xend/server

Modified: trunk/debian/xen-docs.install
===================================================================
--- trunk/debian/xen-docs.install	2006-02-17 23:22:37 UTC (rev 16)
+++ trunk/debian/xen-docs.install	2006-02-18 00:45:56 UTC (rev 17)
@@ -1,2 +1 @@
 usr/share/doc/xen
-

Added: trunk/debian/xen-hypervisor-pae.install
===================================================================
--- trunk/debian/xen-hypervisor-pae.install	2006-02-17 23:22:37 UTC (rev 16)
+++ trunk/debian/xen-hypervisor-pae.install	2006-02-18 00:45:56 UTC (rev 17)
@@ -0,0 +1 @@
+boot

Added: trunk/debian/xen-hypervisor.install
===================================================================
--- trunk/debian/xen-hypervisor.install	2006-02-17 23:22:37 UTC (rev 16)
+++ trunk/debian/xen-hypervisor.install	2006-02-18 00:45:56 UTC (rev 17)
@@ -0,0 +1 @@
+boot

Added: trunk/debian/xen-utils.install
===================================================================
--- trunk/debian/xen-utils.install	2006-02-17 23:22:37 UTC (rev 16)
+++ trunk/debian/xen-utils.install	2006-02-18 00:45:56 UTC (rev 17)
@@ -0,0 +1,5 @@
+usr/bin
+usr/sbin
+usr/share/xen/qemu/keymaps
+usr/share/doc/xen/examples
+etc

Added: trunk/debian/xen-utils.manpages
===================================================================
--- trunk/debian/xen-utils.manpages	2006-02-17 23:22:37 UTC (rev 16)
+++ trunk/debian/xen-utils.manpages	2006-02-18 00:45:56 UTC (rev 17)
@@ -0,0 +1,7 @@
+debian/install/usr/share/man/man1/xm.1
+debian/install/usr/share/man/man1/xentop.1
+debian/install/usr/share/man/man1/xentrace_format.1
+debian/install/usr/share/man/man5/xmdomain.cfg.5
+debian/install/usr/share/man/man5/xend-config.sxp.5
+debian/install/usr/share/man/man8/xentrace.8
+

Added: trunk/debian/xen-utils.postinst
===================================================================
--- trunk/debian/xen-utils.postinst	2006-02-17 23:22:37 UTC (rev 16)
+++ trunk/debian/xen-utils.postinst	2006-02-18 00:45:56 UTC (rev 17)
@@ -0,0 +1,25 @@
+#!/bin/sh
+set -e
+
+mkdir -p /var/lib/xenstored /var/run/xenstored /var/lib/xen/save /var/lock/subsys
+
+if [ -x /usr/sbin/invoke-rc.d ]; then
+	invoke() {
+		script=$1
+		shift
+		invoke-rc.d $script "$@"
+	}
+else
+	invoke() {
+		script=$1
+		shift
+		/etc/init.d/$script "$@"
+	}
+fi
+
+update-rc.d xend start 20 2 3 4 5 . stop 21 0 1 6 .
+invoke xend start
+update-rc.d xendomains start 21 2 3 4 5 . stop 20 0 1 6 .
+invoke xendomains start
+
+#DEBHELPER#

Added: trunk/debian/xen-utils.postrm
===================================================================
--- trunk/debian/xen-utils.postrm	2006-02-17 23:22:37 UTC (rev 16)
+++ trunk/debian/xen-utils.postrm	2006-02-18 00:45:56 UTC (rev 17)
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+if [ "$1" = purge ]; then
+	update-rc.d xend remove
+	update-rc.d xendomains remove
+fi
+
+#DEBHELPER#

Added: trunk/debian/xen-utils.prerm
===================================================================
--- trunk/debian/xen-utils.prerm	2006-02-17 23:22:37 UTC (rev 16)
+++ trunk/debian/xen-utils.prerm	2006-02-18 00:45:56 UTC (rev 17)
@@ -0,0 +1,20 @@
+#!/bin/sh
+set -e
+if [ -x /usr/sbin/invoke-rc.d ]; then
+	invoke() {
+		script=$1
+		shift
+		invoke-rc.d $script "$@"
+	}
+else
+	invoke() {
+		script=$1
+		shift
+		/etc/init.d/$script "$@"
+	}
+fi
+
+invoke xendomains stop
+invoke xend stop
+
+#DEBHELPER#

Deleted: trunk/debian/xen.install
===================================================================
--- trunk/debian/xen.install	2006-02-17 23:22:37 UTC (rev 16)
+++ trunk/debian/xen.install	2006-02-18 00:45:56 UTC (rev 17)
@@ -1,6 +0,0 @@
-usr/bin
-usr/sbin
-usr/share/xen/qemu/keymaps
-usr/share/doc/xen/examples
-etc
-boot

Deleted: trunk/debian/xen.manpages
===================================================================
--- trunk/debian/xen.manpages	2006-02-17 23:22:37 UTC (rev 16)
+++ trunk/debian/xen.manpages	2006-02-18 00:45:56 UTC (rev 17)
@@ -1,7 +0,0 @@
-debian/install/usr/share/man/man1/xm.1
-debian/install/usr/share/man/man1/xentop.1
-debian/install/usr/share/man/man1/xentrace_format.1
-debian/install/usr/share/man/man5/xmdomain.cfg.5
-debian/install/usr/share/man/man5/xend-config.sxp.5
-debian/install/usr/share/man/man8/xentrace.8
-

Deleted: trunk/debian/xen.postinst
===================================================================
--- trunk/debian/xen.postinst	2006-02-17 23:22:37 UTC (rev 16)
+++ trunk/debian/xen.postinst	2006-02-18 00:45:56 UTC (rev 17)
@@ -1,25 +0,0 @@
-#!/bin/sh
-set -e
-
-mkdir -p /var/lib/xenstored /var/run/xenstored /var/lib/xen/save /var/lock/subsys
-
-if [ -x /usr/sbin/invoke-rc.d ]; then
-	invoke() {
-		script=$1
-		shift
-		invoke-rc.d $script "$@"
-	}
-else
-	invoke() {
-		script=$1
-		shift
-		/etc/init.d/$script "$@"
-	}
-fi
-
-update-rc.d xend start 20 2 3 4 5 . stop 21 0 1 6 .
-invoke xend start
-update-rc.d xendomains start 21 2 3 4 5 . stop 20 0 1 6 .
-invoke xendomains start
-
-#DEBHELPER#

Deleted: trunk/debian/xen.postrm
===================================================================
--- trunk/debian/xen.postrm	2006-02-17 23:22:37 UTC (rev 16)
+++ trunk/debian/xen.postrm	2006-02-18 00:45:56 UTC (rev 17)
@@ -1,8 +0,0 @@
-#!/bin/sh
-set -e
-if [ "$1" = purge ]; then
-	update-rc.d xend remove
-	update-rc.d xendomains remove
-fi
-
-#DEBHELPER#

Deleted: trunk/debian/xen.prerm
===================================================================
--- trunk/debian/xen.prerm	2006-02-17 23:22:37 UTC (rev 16)
+++ trunk/debian/xen.prerm	2006-02-18 00:45:56 UTC (rev 17)
@@ -1,20 +0,0 @@
-#!/bin/sh
-set -e
-if [ -x /usr/sbin/invoke-rc.d ]; then
-	invoke() {
-		script=$1
-		shift
-		invoke-rc.d $script "$@"
-	}
-else
-	invoke() {
-		script=$1
-		shift
-		/etc/init.d/$script "$@"
-	}
-fi
-
-invoke xendomains stop
-invoke xend stop
-
-#DEBHELPER#

More information about the Pkg-xen-changes mailing list