From 0c7bf271354e9142b4523428a9406433457edd08 Mon Sep 17 00:00:00 2001 From: Adam Glasgall Date: Thu, 21 Mar 2013 23:25:25 -0700 Subject: [PATCH 01/16] bump version for precise --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4260ecb..c559c0b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +invirt-xen-config (0.0.38~glasgall1) precise; urgency=low + + * Bump version for precise + + -- Adam Glasgall Thu, 21 Mar 2013 23:24:57 -0700 + invirt-xen-config (0.0.37) unstable; urgency=low * Support multiple NICs on HVMs. -- 1.7.9.5 From e7e285b536dd40e4730dc05ac8f730da97463b66 Mon Sep 17 00:00:00 2001 From: Adam Glasgall Date: Thu, 21 Mar 2013 23:30:14 -0700 Subject: [PATCH 02/16] bump Xen dependency --- debian/changelog | 6 ++++++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c559c0b..eb1eee6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +invirt-xen-config (0.0.38~glasgall1ubuntu1) UNRELEASED; urgency=low + + * Bump xen-utils dependency + + -- Adam Glasgall Thu, 21 Mar 2013 23:29:42 -0700 + invirt-xen-config (0.0.38~glasgall1) precise; urgency=low * Bump version for precise diff --git a/debian/control b/debian/control index 5eaa02b..8b2177e 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: invirt-xen-config Section: base Priority: extra Maintainer: Invirt project -Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.0), config-package-dev, xen-utils-3.2 | xen-utils-3.3 +Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.0), config-package-dev, xen-utils-4.1 Standards-Version: 3.8.0 Package: invirt-xen-config -- 1.7.9.5 From c2ee4213a2ad76711b5a8128fecaf1c5987787cb Mon Sep 17 00:00:00 2001 From: Adam Glasgall Date: Sun, 24 Mar 2013 17:38:25 -0400 Subject: [PATCH 03/16] update xend-config.sxp transformer for newer default config --- debian/changelog | 5 +++-- debian/transform_xend-config.sxp.invirt.mako | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index eb1eee6..cfb7147 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -invirt-xen-config (0.0.38~glasgall1ubuntu1) UNRELEASED; urgency=low +invirt-xen-config (0.0.38~glasgall2) precise; urgency=low * Bump xen-utils dependency + * Update xend-config.sxp transformer for newer default config - -- Adam Glasgall Thu, 21 Mar 2013 23:29:42 -0700 + -- Adam Glasgall Sun, 24 Mar 2013 17:37:05 -0400 invirt-xen-config (0.0.38~glasgall1) precise; urgency=low diff --git a/debian/transform_xend-config.sxp.invirt.mako b/debian/transform_xend-config.sxp.invirt.mako index 90555e7..cd0a632 100755 --- a/debian/transform_xend-config.sxp.invirt.mako +++ b/debian/transform_xend-config.sxp.invirt.mako @@ -18,6 +18,6 @@ if internal_ip is None: EOF s/^\#?\(xend-relocation-address ''\)/(xend-relocation-address '\${internal_ip}')/m or die; -s/^\(xend-relocation-hosts-allow '[^']*'\)/(xend-relocation-hosts-allow '')/m or die; +s/^\#?\(xend-relocation-hosts-allow '[^']*'\)/(xend-relocation-hosts-allow '')/m or die; s/^\(dom0-min-mem [0-9]*\)/(dom0-min-mem 1536)/m or die; print; -- 1.7.9.5 From 8a7e2ad8bb0123d9f53f0dceb4e40c01ed58170d Mon Sep 17 00:00:00 2001 From: Adam Glasgall Date: Sun, 24 Mar 2013 17:45:38 -0400 Subject: [PATCH 04/16] replace reference to ubuntu-xen-server with broken-out list of xen packages --- debian/changelog | 7 +++++++ debian/control | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index cfb7147..eb365f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +invirt-xen-config (0.0.38~glasgall3) precise; urgency=low + + * ubuntu-xen-server bit the dust several releases ago. replace it by + explicitly listing the xen bits we need in Depends. + + -- Adam Glasgall Sun, 24 Mar 2013 17:44:24 -0400 + invirt-xen-config (0.0.38~glasgall2) precise; urgency=low * Bump xen-utils dependency diff --git a/debian/control b/debian/control index 8b2177e..4c577bb 100644 --- a/debian/control +++ b/debian/control @@ -7,9 +7,9 @@ Standards-Version: 3.8.0 Package: invirt-xen-config Architecture: all -Depends: ${misc:Depends}, dsniff, lvm2, grub, ubuntu-xen-server, - invirt-base, python-sqlalchemy, python-psycopg2, - invirt-database +Depends: ${misc:Depends}, dsniff, lvm2, grub, + xen-hypervisor-4.1, xen-utils-4.1, xen-tools, invirt-base, + bridge-utils, python-sqlalchemy, python-psycopg2, invirt-database Provides: ${diverted-files} Conflicts: ${diverted-files} Description: Xen configuration for Invirt host -- 1.7.9.5 From 011c92e516a271bf31219d8b7c2b5f619e5b77ad Mon Sep 17 00:00:00 2001 From: Adam Glasgall Date: Sun, 24 Mar 2013 17:50:23 -0400 Subject: [PATCH 05/16] depend on grub-pc instead of grub --- debian/changelog | 7 +++++++ debian/control | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index eb365f3..a4bfc8a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +invirt-xen-config (0.0.38~glasgall4) precise; urgency=low + + * Oops, no, we don't actually want to uninstall grub. Depend on grub-pc + instead. + + -- Adam Glasgall Sun, 24 Mar 2013 17:49:24 -0400 + invirt-xen-config (0.0.38~glasgall3) precise; urgency=low * ubuntu-xen-server bit the dust several releases ago. replace it by diff --git a/debian/control b/debian/control index 4c577bb..19d068f 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.8.0 Package: invirt-xen-config Architecture: all -Depends: ${misc:Depends}, dsniff, lvm2, grub, +Depends: ${misc:Depends}, dsniff, lvm2, grub-pc, xen-hypervisor-4.1, xen-utils-4.1, xen-tools, invirt-base, bridge-utils, python-sqlalchemy, python-psycopg2, invirt-database Provides: ${diverted-files} -- 1.7.9.5 From 3eaf51ca14e9a87597f277ce76a8b071e8cc9e7b Mon Sep 17 00:00:00 2001 From: Adam Glasgall Date: Sun, 24 Mar 2013 20:32:30 -0400 Subject: [PATCH 06/16] s/// out gunk that breaks mako from xend-config.sxp --- debian/changelog | 6 ++++++ debian/transform_xend-config.sxp.invirt.mako | 1 + 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index a4bfc8a..909e9e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +invirt-xen-config (0.0.38~glasgall5) precise; urgency=low + + * s/// out the "${XEN_CONFIG_DIR}" reference that was making mako choke + + -- Adam Glasgall Sun, 24 Mar 2013 20:31:31 -0400 + invirt-xen-config (0.0.38~glasgall4) precise; urgency=low * Oops, no, we don't actually want to uninstall grub. Depend on grub-pc diff --git a/debian/transform_xend-config.sxp.invirt.mako b/debian/transform_xend-config.sxp.invirt.mako index cd0a632..45c0d1e 100755 --- a/debian/transform_xend-config.sxp.invirt.mako +++ b/debian/transform_xend-config.sxp.invirt.mako @@ -20,4 +20,5 @@ EOF s/^\#?\(xend-relocation-address ''\)/(xend-relocation-address '\${internal_ip}')/m or die; s/^\#?\(xend-relocation-hosts-allow '[^']*'\)/(xend-relocation-hosts-allow '')/m or die; s/^\(dom0-min-mem [0-9]*\)/(dom0-min-mem 1536)/m or die; +s/\$(\{XEN_CONFIG_DIR\})/$1/m or die; print; -- 1.7.9.5 From e724d71aed619b39054bb1bbe898324c2fbfaaea Mon Sep 17 00:00:00 2001 From: Adam Glasgall Date: Sat, 13 Apr 2013 17:41:33 -0400 Subject: [PATCH 07/16] explicitly enable network-bridge --- debian/changelog | 7 +++++++ debian/transform_xend-config.sxp.invirt.mako | 1 + 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 909e9e8..80053fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +invirt-xen-config (0.0.38~glasgall6) precise; urgency=low + + * Enable network-bridge in xend-config.sxp, since Precise doesn't by + default anymore. + + -- Adam Glasgall Sat, 13 Apr 2013 17:40:33 -0400 + invirt-xen-config (0.0.38~glasgall5) precise; urgency=low * s/// out the "${XEN_CONFIG_DIR}" reference that was making mako choke diff --git a/debian/transform_xend-config.sxp.invirt.mako b/debian/transform_xend-config.sxp.invirt.mako index 45c0d1e..6400043 100755 --- a/debian/transform_xend-config.sxp.invirt.mako +++ b/debian/transform_xend-config.sxp.invirt.mako @@ -19,6 +19,7 @@ EOF s/^\#?\(xend-relocation-address ''\)/(xend-relocation-address '\${internal_ip}')/m or die; s/^\#?\(xend-relocation-hosts-allow '[^']*'\)/(xend-relocation-hosts-allow '')/m or die; +s/^\#?\(network-script '[^']*'\)/(network-script 'network-bridge')/m or die; s/^\(dom0-min-mem [0-9]*\)/(dom0-min-mem 1536)/m or die; s/\$(\{XEN_CONFIG_DIR\})/$1/m or die; print; -- 1.7.9.5 From 0cdc9084c6c80be2f6ac3ab48d827f5386161ff3 Mon Sep 17 00:00:00 2001 From: Adam Glasgall Date: Sat, 13 Apr 2013 17:47:09 -0400 Subject: [PATCH 08/16] correct regexp --- debian/changelog | 6 ++++++ debian/transform_xend-config.sxp.invirt.mako | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 80053fc..7364944 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +invirt-xen-config (0.0.38~glasgall7) precise; urgency=low + + * Correct regexp in s/// over xend-config.sxp + + -- Adam Glasgall Sat, 13 Apr 2013 17:46:43 -0400 + invirt-xen-config (0.0.38~glasgall6) precise; urgency=low * Enable network-bridge in xend-config.sxp, since Precise doesn't by diff --git a/debian/transform_xend-config.sxp.invirt.mako b/debian/transform_xend-config.sxp.invirt.mako index 6400043..92a3417 100755 --- a/debian/transform_xend-config.sxp.invirt.mako +++ b/debian/transform_xend-config.sxp.invirt.mako @@ -19,7 +19,7 @@ EOF s/^\#?\(xend-relocation-address ''\)/(xend-relocation-address '\${internal_ip}')/m or die; s/^\#?\(xend-relocation-hosts-allow '[^']*'\)/(xend-relocation-hosts-allow '')/m or die; -s/^\#?\(network-script '[^']*'\)/(network-script 'network-bridge')/m or die; +s/^\#?\(network-script network-bridge)/(network-script 'network-bridge')/m or die; s/^\(dom0-min-mem [0-9]*\)/(dom0-min-mem 1536)/m or die; s/\$(\{XEN_CONFIG_DIR\})/$1/m or die; print; -- 1.7.9.5 From dbe72dbed90bef881cd42b07c1be75adb4603f8a Mon Sep 17 00:00:00 2001 From: Adam Glasgall Date: Sat, 13 Apr 2013 17:49:24 -0400 Subject: [PATCH 09/16] fix typo --- debian/changelog | 6 ++++++ debian/transform_xend-config.sxp.invirt.mako | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7364944..f5dc8ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +invirt-xen-config (0.0.38~glasgall8) precise; urgency=low + + * fix typo in regexp + + -- Adam Glasgall Sat, 13 Apr 2013 17:49:08 -0400 + invirt-xen-config (0.0.38~glasgall7) precise; urgency=low * Correct regexp in s/// over xend-config.sxp diff --git a/debian/transform_xend-config.sxp.invirt.mako b/debian/transform_xend-config.sxp.invirt.mako index 92a3417..f6a5ca5 100755 --- a/debian/transform_xend-config.sxp.invirt.mako +++ b/debian/transform_xend-config.sxp.invirt.mako @@ -19,7 +19,7 @@ EOF s/^\#?\(xend-relocation-address ''\)/(xend-relocation-address '\${internal_ip}')/m or die; s/^\#?\(xend-relocation-hosts-allow '[^']*'\)/(xend-relocation-hosts-allow '')/m or die; -s/^\#?\(network-script network-bridge)/(network-script 'network-bridge')/m or die; +s/^\#?\(network-script network-bridge\)/(network-script 'network-bridge')/m or die; s/^\(dom0-min-mem [0-9]*\)/(dom0-min-mem 1536)/m or die; s/\$(\{XEN_CONFIG_DIR\})/$1/m or die; print; -- 1.7.9.5 From 3984404af83a2289bb6f6338fc347e522c9d31e0 Mon Sep 17 00:00:00 2001 From: Adam Glasgall Date: Sat, 13 Apr 2013 17:57:32 -0400 Subject: [PATCH 10/16] really fix regexp --- debian/changelog | 6 ++++++ debian/transform_xend-config.sxp.invirt.mako | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f5dc8ee..9e48f36 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +invirt-xen-config (0.0.38~glasgall9) precise; urgency=low + + * _really_ correct regexp this time. + + -- Adam Glasgall Sat, 13 Apr 2013 17:57:11 -0400 + invirt-xen-config (0.0.38~glasgall8) precise; urgency=low * fix typo in regexp diff --git a/debian/transform_xend-config.sxp.invirt.mako b/debian/transform_xend-config.sxp.invirt.mako index f6a5ca5..dec60ca 100755 --- a/debian/transform_xend-config.sxp.invirt.mako +++ b/debian/transform_xend-config.sxp.invirt.mako @@ -19,7 +19,7 @@ EOF s/^\#?\(xend-relocation-address ''\)/(xend-relocation-address '\${internal_ip}')/m or die; s/^\#?\(xend-relocation-hosts-allow '[^']*'\)/(xend-relocation-hosts-allow '')/m or die; -s/^\#?\(network-script network-bridge\)/(network-script 'network-bridge')/m or die; +s/^(\# )?\(network-script network-bridge\)/(network-script 'network-bridge')/m or die; s/^\(dom0-min-mem [0-9]*\)/(dom0-min-mem 1536)/m or die; s/\$(\{XEN_CONFIG_DIR\})/$1/m or die; print; -- 1.7.9.5 From cef218592a26d5aa8497ea1f06371c1083874123 Mon Sep 17 00:00:00 2001 From: Adam Glasgall Date: Fri, 26 Apr 2013 21:14:59 -0400 Subject: [PATCH 11/16] SQLAlchemy API updates in invirt-database xen config --- debian/changelog | 6 ++++++ invirt-database | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9e48f36..561461f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +invirt-xen-config (0.0.38~glasgall10) precise; urgency=low + + * SQLAlchemy API updates in invirt-database xen config + + -- Adam Glasgall Fri, 26 Apr 2013 21:14:25 -0400 + invirt-xen-config (0.0.38~glasgall9) precise; urgency=low * _really_ correct regexp this time. diff --git a/invirt-database b/invirt-database index e4eed03..92600e7 100644 --- a/invirt-database +++ b/invirt-database @@ -14,12 +14,12 @@ def check(b): import sys sys.exit(1) -machine = models.Machine.query().filter_by(name=machine_name).one() +machine = models.Machine.query.filter_by(name=machine_name).one() check(machine is not None) machine_type = machine.type cdrom = None if 'cdrom_image' in locals(): - cdrom = models.CDROM.query().filter_by(cdrom_id=cdrom_image).one() + cdrom = models.CDROM.query.filter_by(cdrom_id=cdrom_image).one() check(cdrom is not None) memory = machine.memory -- 1.7.9.5 From 78caaecac6d2563d98d65bc48f4201cb99b9d3d1 Mon Sep 17 00:00:00 2001 From: Adam Glasgall Date: Fri, 26 Apr 2013 22:36:31 -0400 Subject: [PATCH 12/16] add dependency on ethtool --- debian/changelog | 6 ++++++ debian/control | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 561461f..2794c53 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +invirt-xen-config (0.0.38~glasgall11) precise; urgency=low + + * Add dependency on ethtool. + + -- Adam Glasgall Fri, 26 Apr 2013 22:36:10 -0400 + invirt-xen-config (0.0.38~glasgall10) precise; urgency=low * SQLAlchemy API updates in invirt-database xen config diff --git a/debian/control b/debian/control index 19d068f..a9af10e 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,8 @@ Package: invirt-xen-config Architecture: all Depends: ${misc:Depends}, dsniff, lvm2, grub-pc, xen-hypervisor-4.1, xen-utils-4.1, xen-tools, invirt-base, - bridge-utils, python-sqlalchemy, python-psycopg2, invirt-database + bridge-utils, python-sqlalchemy, python-psycopg2, invirt-database, + ethtool Provides: ${diverted-files} Conflicts: ${diverted-files} Description: Xen configuration for Invirt host -- 1.7.9.5 From d2146877b1b2ff7830351ffaf3f4a6ae70a98b66 Mon Sep 17 00:00:00 2001 From: Adam Glasgall Date: Sat, 27 Apr 2013 00:23:14 -0400 Subject: [PATCH 13/16] xm was expecting a string and was getting a unistring for machine name, which resulted in the VM name always being 'invirt-database'. Use passed-in machine_name instead, since that will be a string. IBTSOCS. --- debian/changelog | 9 +++++++++ invirt-database | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2794c53..f8bd430 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +invirt-xen-config (0.0.38~glasgall11ubuntu1) UNRELEASED; urgency=low + + * xm was expecting a string and was getting a unistring for machine + name, which resulted in the VM name always being + 'invirt-database'. Use passed-in machine_name instead, since that will + be a string. IBTSOCS. + + -- Adam Glasgall Sat, 27 Apr 2013 00:21:21 -0400 + invirt-xen-config (0.0.38~glasgall11) precise; urgency=low * Add dependency on ethtool. diff --git a/invirt-database b/invirt-database index 92600e7..6008c7a 100644 --- a/invirt-database +++ b/invirt-database @@ -25,7 +25,7 @@ if 'cdrom_image' in locals(): memory = machine.memory maxmem = '2048' check(re.match('^[A-Za-z0-9][A-Za-z0-9._-]*$', machine.name)) -name = prefix + machine.name +name = prefix + machine_name check(re.match('^[0-9a-f-]+$', machine.uuid)) uuid = machine.uuid -- 1.7.9.5 From b13bd7e555c9df527bcda8b0db1889e1b59f85ed Mon Sep 17 00:00:00 2001 From: Adam Glasgall Date: Mon, 6 May 2013 19:15:41 -0400 Subject: [PATCH 14/16] re-disable enabling network-bridge. irony. --- debian/changelog | 11 +++++++++-- debian/transform_xend-config.sxp.invirt.mako | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index f8bd430..b03e8b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,18 @@ -invirt-xen-config (0.0.38~glasgall11ubuntu1) UNRELEASED; urgency=low +invirt-xen-config (0.0.38~glasgall13) precise; urgency=low + + * Undo enabling network-bridge; we want to manage our own bridge config + now. Oh, irony. + + -- Adam Glasgall Mon, 06 May 2013 19:14:41 -0400 + +invirt-xen-config (0.0.38~glasgall12) precise; urgency=low * xm was expecting a string and was getting a unistring for machine name, which resulted in the VM name always being 'invirt-database'. Use passed-in machine_name instead, since that will be a string. IBTSOCS. - -- Adam Glasgall Sat, 27 Apr 2013 00:21:21 -0400 + -- Adam Glasgall Mon, 06 May 2013 19:14:23 -0400 invirt-xen-config (0.0.38~glasgall11) precise; urgency=low diff --git a/debian/transform_xend-config.sxp.invirt.mako b/debian/transform_xend-config.sxp.invirt.mako index dec60ca..41fc9cc 100755 --- a/debian/transform_xend-config.sxp.invirt.mako +++ b/debian/transform_xend-config.sxp.invirt.mako @@ -19,7 +19,7 @@ EOF s/^\#?\(xend-relocation-address ''\)/(xend-relocation-address '\${internal_ip}')/m or die; s/^\#?\(xend-relocation-hosts-allow '[^']*'\)/(xend-relocation-hosts-allow '')/m or die; -s/^(\# )?\(network-script network-bridge\)/(network-script 'network-bridge')/m or die; +# s/^(\# )?\(network-script network-bridge\)/(network-script 'network-bridge')/m or die; s/^\(dom0-min-mem [0-9]*\)/(dom0-min-mem 1536)/m or die; s/\$(\{XEN_CONFIG_DIR\})/$1/m or die; print; -- 1.7.9.5 From ff3f01ccac99975968c562cca4646c35b83b3577 Mon Sep 17 00:00:00 2001 From: Adam Glasgall Date: Wed, 8 May 2013 00:07:17 -0400 Subject: [PATCH 15/16] hvmloader moved. update invirt-database accordingly. --- debian/changelog | 6 ++++++ invirt-database | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b03e8b4..05bf318 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +invirt-xen-config (0.0.38~glasgall14) precise; urgency=low + + * /usr/lib/xen moved to /usr/lib/xen-4.1. teach invirt-database this. + + -- Adam Glasgall Wed, 08 May 2013 00:06:25 -0400 + invirt-xen-config (0.0.38~glasgall13) precise; urgency=low * Undo enabling network-bridge; we want to manage our own bridge config diff --git a/invirt-database b/invirt-database index 6008c7a..599d0b7 100644 --- a/invirt-database +++ b/invirt-database @@ -105,7 +105,7 @@ elif cdrom is not None: if codepath == 'hvm': ioemu = "ioemu:" viftype = "type=ioemu, " - kernel = '/usr/lib/xen/boot/hvmloader' + kernel = '/usr/lib/xen-4.1/boot/hvmloader' builder = 'hvm' vnc = 1 device_model = '/usr/sbin/qemu-dm-invirt' -- 1.7.9.5 From 324594147fc6f7d02bfdd3896e2cd25e34092525 Mon Sep 17 00:00:00 2001 From: Alexander Chernyakhovsky Date: Fri, 31 May 2013 21:17:06 -0400 Subject: [PATCH 16/16] Update packaging to dh7 --- Makefile | 9 ++++++++ debian/changelog | 7 ++++++ debian/compat | 2 +- debian/control | 4 ++-- debian/invirt-xen-config.displace | 2 ++ debian/invirt-xen-config.install | 3 +-- debian/invirt-xen-config.undisplace | 1 + debian/rules | 24 ++------------------ ...onfig.sxp.invirt.mako => templatize-xend-config | 0 9 files changed, 25 insertions(+), 27 deletions(-) create mode 100644 Makefile create mode 100644 debian/invirt-xen-config.displace create mode 100644 debian/invirt-xen-config.undisplace rename debian/transform_xend-config.sxp.invirt.mako => templatize-xend-config (100%) diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..a82703f --- /dev/null +++ b/Makefile @@ -0,0 +1,9 @@ +all: xend-config.sxp.invirt.mako + +xend-config.sxp.invirt.mako: + ./templatize-xend-config < /etc/xen/xend-config.sxp > $@ + +clean: + rm -f xend-config.sxp.invirt.mako + +.PHONY: clean diff --git a/debian/changelog b/debian/changelog index 05bf318..ea3b8bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +invirt-xen-config (0.0.38~glasgall14achernya1) precise; urgency=low + + * Switch to dh7 + * Bump standards version + + -- Alexander Chernyakhovsky Fri, 31 May 2013 21:16:20 -0400 + invirt-xen-config (0.0.38~glasgall14) precise; urgency=low * /usr/lib/xen moved to /usr/lib/xen-4.1. teach invirt-database this. diff --git a/debian/compat b/debian/compat index b8626c4..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +7 diff --git a/debian/control b/debian/control index a9af10e..3bb1dd0 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,8 @@ Source: invirt-xen-config Section: base Priority: extra Maintainer: Invirt project -Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.0), config-package-dev, xen-utils-4.1 -Standards-Version: 3.8.0 +Build-Depends: debhelper (>= 7), config-package-dev (>= 5.0~), xen-utils-4.1 +Standards-Version: 3.9.3 Package: invirt-xen-config Architecture: all diff --git a/debian/invirt-xen-config.displace b/debian/invirt-xen-config.displace new file mode 100644 index 0000000..fa7ab7f --- /dev/null +++ b/debian/invirt-xen-config.displace @@ -0,0 +1,2 @@ +/etc/xen/qemu-ifup.invirt +/etc/xen/xend-config.sxp.invirt diff --git a/debian/invirt-xen-config.install b/debian/invirt-xen-config.install index c1d0e25..05ad6a7 100644 --- a/debian/invirt-xen-config.install +++ b/debian/invirt-xen-config.install @@ -2,5 +2,4 @@ qemu-dm-invirt usr/sbin qemu-ifup.invirt etc/xen invirt-database etc/xen vif-invirtroute etc/xen/scripts - -debian/xend-config.sxp.invirt.mako etc/xen +xend-config.sxp.invirt.mako etc/xen diff --git a/debian/invirt-xen-config.undisplace b/debian/invirt-xen-config.undisplace new file mode 100644 index 0000000..de75fc2 --- /dev/null +++ b/debian/invirt-xen-config.undisplace @@ -0,0 +1 @@ +/etc/apt/preferences.invirt diff --git a/debian/rules b/debian/rules index cb20bf8..cbe925d 100755 --- a/debian/rules +++ b/debian/rules @@ -1,23 +1,3 @@ #!/usr/bin/make -f - -DEB_DIVERT_EXTENSION = .invirt - -DEB_DIVERT_FILES_invirt-xen-config += \ - /etc/xen/qemu-ifup.invirt \ - /etc/xen/xend-config.sxp.invirt - -DEB_UNDIVERT_FILES_invirt-xen-config += \ - /etc/apt/preferences.invirt - -DEB_UNDIVERT_VERSION_/etc/apt/preferences.invirt = 0.0.27~ - -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/config-package.mk - -common-build-indep:: debian/xend-config.sxp.invirt.mako - -debian/xend-config.sxp.invirt.mako: $(call debian_check_files,/etc/xen/xend-config.sxp) - debian/transform_xend-config.sxp.invirt.mako < $< > $@ - -clean:: - rm -f debian/xend-config.sxp.invirt.mako +%: + dh $@ diff --git a/debian/transform_xend-config.sxp.invirt.mako b/templatize-xend-config similarity index 100% rename from debian/transform_xend-config.sxp.invirt.mako rename to templatize-xend-config -- 1.7.9.5