Julien Danjou
2007-Jul-18 06:30 UTC
[Pkg-xen-changes] r405 - in trunk/xen-3.0/debian: . arch arch/ia64 patches
Author: acid Date: Wed Jul 18 06:30:53 2007 New Revision: 405 Log: * Add support for ia64 (Closes: #389320) Added: trunk/xen-3.0/debian/arch/ia64/ trunk/xen-3.0/debian/arch/ia64/defines trunk/xen-3.0/debian/patches/ia64-build.dpatch trunk/xen-3.0/debian/patches/install-boot.dpatch trunk/xen-3.0/debian/xen-hypervisor-3.0.4-1-ia64.postinst trunk/xen-3.0/debian/xen-hypervisor-3.0.4-1-ia64.postrm Modified: trunk/xen-3.0/debian/arch/defines trunk/xen-3.0/debian/changelog trunk/xen-3.0/debian/patches/00list trunk/xen-3.0/debian/patches/qemu-arch.dpatch Modified: trunk/xen-3.0/debian/arch/defines =============================================================================--- trunk/xen-3.0/debian/arch/defines (original) +++ trunk/xen-3.0/debian/arch/defines Wed Jul 18 06:30:53 2007 @@ -5,3 +5,4 @@ arches: amd64 i386 + ia64 Added: trunk/xen-3.0/debian/arch/ia64/defines =============================================================================--- (empty file) +++ trunk/xen-3.0/debian/arch/ia64/defines Wed Jul 18 06:30:53 2007 @@ -0,0 +1,8 @@ +[base] +flavours: + ia64 +xen-arch: ia64 + +[ia64] +class: ia64 +longclass: all single- and multiprocessor Intel Itanium II Modified: trunk/xen-3.0/debian/changelog =============================================================================--- trunk/xen-3.0/debian/changelog (original) +++ trunk/xen-3.0/debian/changelog Wed Jul 18 06:30:53 2007 @@ -1,8 +1,9 @@ xen-3.0 (3.0.4-1-2) UNRELEASED; urgency=low * Don''t compress PDF (Closes: #429045) + * Add support for ia64 (Closes: #389320) - -- Julien Danjou <acid at debian.org> Tue, 19 Jun 2007 22:08:51 +0200 + -- Julien Danjou <acid at debian.org> Wed, 18 Jul 2007 08:24:51 +0200 xen-3.0 (3.0.4-1-1) unstable; urgency=low Modified: trunk/xen-3.0/debian/patches/00list =============================================================================--- trunk/xen-3.0/debian/patches/00list (original) +++ trunk/xen-3.0/debian/patches/00list Wed Jul 18 06:30:53 2007 @@ -8,3 +8,5 @@ blktap-disable path-relative not-reinvent-udev +install-boot +ia64-build Added: trunk/xen-3.0/debian/patches/ia64-build.dpatch =============================================================================--- (empty file) +++ trunk/xen-3.0/debian/patches/ia64-build.dpatch Wed Jul 18 06:30:53 2007 @@ -0,0 +1,40 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## ia64-build.dpatch by Alex Williamson <alex.williamson at hp.com> +## +## Build fixes for ia64 +## +## All lines beginning with `## DP:'' are a description of the patch. +## DP: No description. + + at DPATCH@ +## DP: # HG changeset patch +## DP: # User kaf24 at firebug.cl.cam.ac.uk +## DP: # Date 1166866818 0 +## DP: # Node ID bbd1c469ff5b17170fa657f21817aaa0d19dd7fd +## DP: # Parent 36e33da5146bef9109723bb96a356d1fca14496e +## DP: [XEN] Add const attribute to elf_sanity_check() parameter on all arches. +## DP: Signed-off-by: Alex Williamson <alex.williamson at hp.com> +## DP: +--- a/xen/arch/ia64/xen/domain.c Sat Dec 23 09:38:07 2006 +0000 ++++ b/xen/arch/ia64/xen/domain.c Sat Dec 23 09:40:18 2006 +0000 +@@ -867,7 +867,7 @@ int shadow_mode_control(struct domain *d + #endif + + // see arch/x86/xxx/domain_build.c +-int elf_sanity_check(Elf_Ehdr *ehdr) ++int elf_sanity_check(const Elf_Ehdr *ehdr) + { + if (!(IS_ELF(*ehdr))) + { +--- a/xen/arch/powerpc/domain_build.c Sat Dec 23 09:38:07 2006 +0000 ++++ b/xen/arch/powerpc/domain_build.c Sat Dec 23 09:40:18 2006 +0000 +@@ -51,7 +51,7 @@ static unsigned int opt_dom0_shadow; + static unsigned int opt_dom0_shadow; + boolean_param("dom0_shadow", opt_dom0_shadow); + +-int elf_sanity_check(Elf_Ehdr *ehdr) ++int elf_sanity_check(const Elf_Ehdr *ehdr) + { + if (IS_ELF(*ehdr)) + /* we are happy with either */ + Added: trunk/xen-3.0/debian/patches/install-boot.dpatch =============================================================================--- (empty file) +++ trunk/xen-3.0/debian/patches/install-boot.dpatch Wed Jul 18 06:30:53 2007 @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## install-boot.dpatch by Alex Williamson <alex.williamson at hp.com> +## +## Only archs building tools/firmware end up with /usr/lib/xen/boot, +## create it if the subdirs install didn''t +## +## All lines beginning with `## DP:'' are a description of the patch. +## DP: No description. + + at DPATCH@ +--- xen-3.0/tools/Makefile 2007-07-17 08:53:23.000000000 -0600 ++++ xen-3.0/tools/Makefile 2007-07-17 08:55:57.000000000 -0600 +@@ -42,6 +42,8 @@ + $(MAKE) ioemuinstall + $(INSTALL_DIR) -p $(DESTDIR)/var/xen/dump + $(INSTALL_DIR) -p $(DESTDIR)/var/log/xen ++ [ -d $(DESTDIR)/usr/lib/xen-$(XEN_VERSION)/boot ] || \ ++ $(INSTALL_DIR) -p $(DESTDIR)/usr/lib/xen-$(XEN_VERSION)/boot + + .PHONY: clean + clean: check_clean Modified: trunk/xen-3.0/debian/patches/qemu-arch.dpatch =============================================================================--- trunk/xen-3.0/debian/patches/qemu-arch.dpatch (original) +++ trunk/xen-3.0/debian/patches/qemu-arch.dpatch Wed Jul 18 06:30:53 2007 @@ -8,7 +8,7 @@ diff -urNad xen-unstable~/tools/ioemu/configure xen-unstable/tools/ioemu/configure --- xen-unstable~/tools/ioemu/configure 2006-08-18 15:35:45.000000000 +0000 +++ xen-unstable/tools/ioemu/configure 2006-08-18 16:19:34.759859866 +0000 -@@ -27,46 +27,18 @@ +@@ -27,46 +27,21 @@ make="make" install="install" strip="strip" @@ -58,6 +58,9 @@ + powerpc) + cpu="powerpc" + ;; ++ ia64) ++ cpu="ia64" ++ ;; *) cpu="unknown" ;; Added: trunk/xen-3.0/debian/xen-hypervisor-3.0.4-1-ia64.postinst =============================================================================--- (empty file) +++ trunk/xen-3.0/debian/xen-hypervisor-3.0.4-1-ia64.postinst Wed Jul 18 06:30:53 2007 @@ -0,0 +1,23 @@ +#!/bin/bash + +set -e + +case "$1" in + configure) + if command -v elilo > /dev/null; then + elilo || : + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1''" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 Added: trunk/xen-3.0/debian/xen-hypervisor-3.0.4-1-ia64.postrm =============================================================================--- (empty file) +++ trunk/xen-3.0/debian/xen-hypervisor-3.0.4-1-ia64.postrm Wed Jul 18 06:30:53 2007 @@ -0,0 +1,23 @@ +#!/bin/bash + +set -e + +case "$1" in + remove) + if command -v elilo > /dev/null; then + elilo || : + fi + ;; + + purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm called with unknown argument \`$1''" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0