diff --git a/debian/changelog b/debian/changelog index 57f482304..c83809aa2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,7 +23,7 @@ grub2 (2.00+20131127-1) UNRELEASED; urgency=low - Don't decompress initrd when booting with Xen (closes: #700197). - Document how to delete the whole environment block (closes: #726265). - New ports to arm-uboot, arm-efi, i386-xen, and x86_64-xen. - * Add grub-uboot* and grub-efi-arm* binary packages. + * Add grub-uboot*, grub-efi-arm*, and grub-xen* binary packages. * Ignore functional test failures for now as they are broken. * Move working directories around (build/ -> obj/, build/stamps -> debian/stamps) so that "debian/rules build" still works diff --git a/debian/control b/debian/control index 9f3d9c8f7..70454efe4 100644 --- a/debian/control +++ b/debian/control @@ -535,6 +535,51 @@ Description: GRand Unified Bootloader, version 2 (ARM U-Boot version) This package contains a version of GRUB that has been built for use with ARM systems with U-Boot. +Package: grub-xen-bin +Architecture: any-i386 any-amd64 +Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (= ${binary:Version}) +Multi-Arch: foreign +Description: GRand Unified Bootloader, version 2 (Xen binaries) + GRUB is a portable, powerful bootloader. This version of GRUB is based on a + cleaner design than its predecessors, and provides the following new features: + . + - Scripting in grub.cfg using BASH-like syntax. + - Support for modern partition maps such as GPT. + - Modular generation of grub.cfg via update-grub. Packages providing GRUB + add-ons can plug in their own script rules and trigger updates by invoking + update-grub. + . + This package contains a version of GRUB that has been built for use with + the Xen hypervisor (i.e. PV-GRUB). It will not automatically install GRUB + as the active boot loader, nor will it automatically update grub.cfg on + upgrade, so most people should install grub-xen instead. + +Package: grub-xen-dbg +Section: debug +Architecture: any-i386 any-amd64 +Depends: ${misc:Depends}, grub-xen-bin (= ${binary:Version}), grub-common (= ${binary:Version}) +Multi-Arch: foreign +Description: GRand Unified Bootloader, version 2 (Xen debug files) + This package contains debugging files for grub-xen-bin. You only need + these if you are trying to debug GRUB using its GDB stub. + +Package: grub-xen +Architecture: any-i386 any-amd64 +Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-xen-bin (= ${binary:Version}), ucf +Multi-Arch: foreign +Description: GRand Unified Bootloader, version 2 (Xen version) + GRUB is a portable, powerful bootloader. This version of GRUB is based on a + cleaner design than its predecessors, and provides the following new features: + . + - Scripting in grub.cfg using BASH-like syntax. + - Support for modern partition maps such as GPT. + - Modular generation of grub.cfg via update-grub. Packages providing GRUB + add-ons can plug in their own script rules and trigger updates by invoking + update-grub. + . + This package contains a version of GRUB that has been built for use with + the Xen hypervisor (i.e. PV-GRUB). + Package: grub-yeeloong-bin Architecture: any-mipsel Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (= ${binary:Version}) diff --git a/debian/rules b/debian/rules index 56b71f69d..d15be6bb6 100755 --- a/debian/rules +++ b/debian/rules @@ -38,7 +38,7 @@ confflags = PACKAGE_VERSION="$(deb_version)" PACKAGE_STRING="GRUB $(deb_version) AUTOGEN_DEB_FILES = config templates preinst postinst postrm dirs install links maintscript BUILD_PACKAGES := $(strip $(shell dh_listpackages)) -REAL_PACKAGES = grub-emu grub-pc grub-coreboot grub-efi-ia32 grub-efi-amd64 grub-efi-ia64 grub-efi-arm grub-ieee1275 grub-firmware-qemu grub-uboot grub-yeeloong +REAL_PACKAGES = grub-emu grub-pc grub-coreboot grub-efi-ia32 grub-efi-amd64 grub-efi-ia64 grub-efi-arm grub-ieee1275 grub-firmware-qemu grub-uboot grub-xen grub-yeeloong ifneq (,$(filter i386 amd64,$(DEB_HOST_ARCH_CPU))) COMMON_PLATFORM := pc @@ -119,7 +119,7 @@ debian/stamps/configure-grub-common: debian/stamps/configure-grub-$(COMMON_PLATF debian/stamps/build-grub-common: debian/stamps/build-grub-$(COMMON_PLATFORM) -debian/stamps/configure-grub-pc debian/stamps/configure-grub-ieee1275 debian/stamps/configure-grub-coreboot debian/stamps/configure-grub-emu debian/stamps/configure-grub-uboot debian/stamps/configure-grub-yeeloong: debian/stamps/autogen +debian/stamps/configure-grub-pc debian/stamps/configure-grub-ieee1275 debian/stamps/configure-grub-coreboot debian/stamps/configure-grub-emu debian/stamps/configure-grub-uboot debian/stamps/configure-grub-xen debian/stamps/configure-grub-yeeloong: debian/stamps/autogen mkdir -p debian/stamps obj/$(package) dh_auto_configure -- $(confflags) --with-platform=$(subst grub-,,$(package)) touch $@ @@ -147,7 +147,7 @@ debian/stamps/configure-grub-firmware-qemu: debian/stamps/autogen dh_auto_configure -- $(confflags) --with-platform=qemu touch $@ -debian/stamps/build-grub-efi-ia32 debian/stamps/build-grub-efi-amd64 debian/stamps/build-grub-efi-ia64 debian/stamps/build-grub-efi-arm debian/stamps/build-grub-ieee1275 debian/stamps/build-grub-coreboot debian/stamps/build-grub-emu debian/stamps/build-grub-uboot debian/stamps/build-grub-yeeloong: debian/stamps/build-%: debian/stamps/configure-% +debian/stamps/build-grub-efi-ia32 debian/stamps/build-grub-efi-amd64 debian/stamps/build-grub-efi-ia64 debian/stamps/build-grub-efi-arm debian/stamps/build-grub-ieee1275 debian/stamps/build-grub-coreboot debian/stamps/build-grub-emu debian/stamps/build-grub-uboot debian/stamps/build-grub-xen debian/stamps/build-grub-yeeloong: debian/stamps/build-%: debian/stamps/configure-% dh_auto_build touch $@ @@ -208,7 +208,7 @@ platform_subst = \ >> debian/$(2).$(3); \ fi -install/grub-pc install/grub-efi-ia32 install/grub-efi-amd64 install/grub-efi-ia64 install/grub-efi-arm install/grub-ieee1275 install/grub-coreboot install/grub-emu install/grub-uboot install/grub-yeeloong: +install/grub-pc install/grub-efi-ia32 install/grub-efi-amd64 install/grub-efi-ia64 install/grub-efi-arm install/grub-ieee1275 install/grub-coreboot install/grub-emu install/grub-uboot install/grub-xen install/grub-yeeloong: dh_auto_install --destdir=debian/tmp-$(package) if [ "$@" = "install/grub-emu" ] ; then \ @@ -339,7 +339,7 @@ override_dh_install: done rm -f debian/grub2-common/usr/share/info/dir* rm -f debian/grub-theme-starfield/usr/share/grub/themes/starfield/COPYING.CC-BY-SA-3.0 - set -e; for package in grub-pc grub-efi-ia32 grub-efi-amd64 grub-efi-ia64 grub-efi-arm grub-ieee1275 grub-coreboot grub-uboot grub-yeeloong; do \ + set -e; for package in grub-pc grub-efi-ia32 grub-efi-amd64 grub-efi-ia64 grub-efi-arm grub-ieee1275 grub-coreboot grub-uboot grub-xen grub-yeeloong; do \ dh_install -p$$package --sourcedir=debian/tmp-$$package; \ dh_install -p$$package-bin --sourcedir=debian/tmp-$$package; \ dh_install -p$$package-dbg --sourcedir=debian/tmp-$$package; \ @@ -419,7 +419,7 @@ override_dh_clean: debian/legacy/update-grub debian/grub-extras chmod +x debian/{bug-script,grub.d/*,legacy/*,kernel/*} for i in $(AUTOGEN_DEB_FILES) ; do \ - rm -f debian/grub-{pc,efi-*,ieee1275,coreboot,uboot,yeeloong,emu}{,-bin,-dbg}.$$i ; \ + rm -f debian/grub-{pc,efi-*,ieee1275,coreboot,uboot,xen,yeeloong,emu}{,-bin,-dbg}.$$i ; \ done rm -f debian/grub-common.maintscript rm -rf debian/tmp-*/