[pve-devel] [PATCH grub 1/4] update to grub2.02-beta3-1

Fabian Grünbichler f.gruenbichler at proxmox.com
Wed Oct 19 11:23:14 CEST 2016


and switch to Debian as package upstream.

refresh and consolidate existing patches
---
Note: this is for review, the binary diff cannot be sent and applied!

 Makefile                                   |  10 +-
 grub.tar.gz                                | Bin 158230227 -> 67493168 bytes
 pvepatches/disable-unwanted-packages.patch | 561 +++++++++++++++++++++++++++++
 pvepatches/disbale-unwanted-packages.patch | 406 ---------------------
 pvepatches/fix-build-dependencies.patch    |  58 +++
 pvepatches/fix-default-grub-config.patch   |  42 +++
 pvepatches/series                          |  11 +-
 pvepatches/suggest-os-prober.patch         |  34 +-
 8 files changed, 695 insertions(+), 427 deletions(-)
 create mode 100644 pvepatches/disable-unwanted-packages.patch
 delete mode 100644 pvepatches/disbale-unwanted-packages.patch
 create mode 100644 pvepatches/fix-build-dependencies.patch
 create mode 100644 pvepatches/fix-default-grub-config.patch

diff --git a/Makefile b/Makefile
index 23c963e..8e09f09 100644
--- a/Makefile
+++ b/Makefile
@@ -2,12 +2,13 @@ RELEASE=4.0
 
 GRUB_DIR=grub
 GRUB_SRC=${GRUB_DIR}.tar.gz
-SNAPVER=2.02-beta2.9-ZOL11-7aa9f6
+TAG=debian/2.02.beta3-1
 
 # update/sync changelog.pve
-DEBVER=2.02-pve4
+DEBVER=2.02-pve5
 
 PC_DEBS=					\
+grub2_${DEBVER}_amd64.deb			\
 grub2-common_${DEBVER}_amd64.deb		\
 grub-common_${DEBVER}_amd64.deb			\
 grub-efi-amd64-bin_${DEBVER}_amd64.deb		\
@@ -42,13 +43,12 @@ grub ${DEBS}:
 	# hack: remove quilt dir, so that dpkg-buildpackage correctly apply
 	# all debian patches
 	rm -rf ${GRUB_DIR}/.pc ${GRUB_DIR}/patches
-	cd ${GRUB_DIR}; dpkg-buildpackage -b -uc -us 
+	cd ${GRUB_DIR}; dpkg-buildpackage -b -uc -us
 
 .PHONY: download
 download:
 	rm -rf grub ${GRUB_SRC} ${GRUB_SRC}.tmp
-	git clone https://github.com/zfsonlinux/grub
-	cd grub; git checkout snapshot/debian/jessie/${SNAPVER}
+	git clone --recursive -b ${TAG} https://anonscm.debian.org/cgit/pkg-grub/grub.git
 	tar czf ${GRUB_SRC}.tmp grub
 	mv ${GRUB_SRC}.tmp ${GRUB_SRC}
 
diff --git a/grub.tar.gz b/grub.tar.gz
index b652e16..815fe77 100644
Binary files a/grub.tar.gz and b/grub.tar.gz differ
diff --git a/pvepatches/disable-unwanted-packages.patch b/pvepatches/disable-unwanted-packages.patch
new file mode 100644
index 0000000..b4107c9
--- /dev/null
+++ b/pvepatches/disable-unwanted-packages.patch
@@ -0,0 +1,561 @@
+From f3882b8a99c3bbf68447104ae91e98a8e1aa7563 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler at proxmox.com>
+Date: Tue, 18 Oct 2016 11:04:24 +0200
+Subject: [PATCH] disable unwanted packages
+
+to reduce compile time and build dependencies
+---
+ debian/control | 505 ---------------------------------------------------------
+ 1 file changed, 505 deletions(-)
+
+diff --git a/debian/control b/debian/control
+index 0603238..2d3e153 100644
+--- a/debian/control
++++ b/debian/control
+@@ -49,15 +49,6 @@ Description: GRand Unified Bootloader, version 2 (dummy package)
+  This is a dummy transitional package to handle GRUB 2 upgrades.  It can be
+  safely removed.
+ 
+-Package: grub-linuxbios
+-Section: oldlibs
+-Architecture: any-i386 any-amd64
+-Pre-Depends: ${misc:Pre-Depends}
+-Depends: grub-coreboot (= ${binary:Version}), ${misc:Depends}
+-Multi-Arch: foreign
+-Description: GRand Unified Bootloader, version 2 (dummy package)
+- This is a dummy transitional package that depends on grub-coreboot.
+-
+ Package: grub-efi
+ Section: oldlibs
+ Architecture: any-i386 any-amd64
+@@ -68,7 +59,6 @@ Description: GRand Unified Bootloader, version 2 (dummy package)
+  This is a dummy transitional package that depends on either grub-efi-ia32 or
+  grub-efi-amd64, depending on the architecture.
+ 
+-
+ Package: grub-common
+ Priority: optional
+ Architecture: any
+@@ -100,25 +90,6 @@ Description: GRand Unified Bootloader (common files for version 2)
+  The files in this package are specific to GRUB 2, and would break GRUB
+  Legacy if installed on the same system.
+ 
+-Package: grub-emu
+-Architecture: any-i386 any-amd64 any-powerpc
+-Pre-Depends: ${misc:Pre-Depends}
+-Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (= ${binary:Version})
+-Replaces: grub-common (<= 1.97~beta3-1)
+-Multi-Arch: foreign
+-Description: GRand Unified Bootloader, version 2 (emulated version)
+- This package contains grub-emu, an emulated version of GRUB.  It is only
+- provided for debugging purposes.
+-
+-Package: grub-emu-dbg
+-Section: debug
+-Architecture: any-i386 any-amd64 any-powerpc
+-Depends: ${misc:Depends}, grub-emu (= ${binary:Version}), grub-common (= ${binary:Version})
+-Multi-Arch: foreign
+-Description: GRand Unified Bootloader, version 2 (emulated debug files)
+- This package contains debugging files for grub-emu.  You only need these if
+- you are trying to debug GRUB using its GDB stub.
+-
+ Package: grub-pc-bin
+ Priority: optional
+ Architecture: any-i386 any-amd64
+@@ -191,107 +162,6 @@ Description: GRUB bootable rescue images, version 2 (PC/BIOS version)
+   - grub-rescue-cdrom.iso: El Torito CDROM image.
+   - grub-rescue-usb.img: USB image.
+ 
+-Package: grub-coreboot-bin
+-Architecture: any-i386 any-amd64
+-Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (= ${binary:Version})
+-Replaces: grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-linuxbios, grub-coreboot (<< 1.99-1)
+-Conflicts: grub-linuxbios (<< ${source:Version})
+-Multi-Arch: foreign
+-Description: GRand Unified Bootloader, version 2 (Coreboot 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
+- platforms running the Coreboot firmware.  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-coreboot instead.
+-
+-Package: grub-coreboot-dbg
+-Section: debug
+-Architecture: any-i386 any-amd64
+-Depends: ${misc:Depends}, grub-coreboot-bin (= ${binary:Version}), grub-common (= ${binary:Version})
+-Multi-Arch: foreign
+-Description: GRand Unified Bootloader, version 2 (Coreboot debug files)
+- This package contains debugging files for grub-coreboot-bin.  You only need
+- these if you are trying to debug GRUB using its GDB stub.
+-
+-Package: grub-coreboot
+-Architecture: any-i386 any-amd64
+-Pre-Depends: ${misc:Pre-Depends}
+-Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-coreboot-bin (= ${binary:Version}), ucf
+-Replaces: grub-legacy, grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-linuxbios, grub-efi-amd64, grub-efi-ia32, grub-pc, grub-ieee1275
+-Conflicts: grub (<< 0.97-54), grub-legacy, grub-linuxbios (<< ${source:Version}), grub-efi-amd64, grub-efi-ia32, grub-pc, grub-ieee1275, grub-xen
+-Multi-Arch: foreign
+-Description: GRand Unified Bootloader, version 2 (Coreboot 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
+- platforms running the Coreboot firmware.
+-
+-Package: grub-efi-ia32-bin
+-Architecture: any-i386 any-amd64
+-Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (= ${binary:Version}), efibootmgr [linux-any]
+-Replaces: grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-efi, grub-efi-ia32 (<< 1.99-1)
+-Multi-Arch: foreign
+-Description: GRand Unified Bootloader, version 2 (EFI-IA32 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
+- EFI-IA32 architecture, such as the one provided by Intel Macs (that is, unless
+- a BIOS interface has been activated).  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-efi-ia32 instead.
+-
+-Package: grub-efi-ia32-dbg
+-Section: debug
+-Architecture: any-i386 any-amd64
+-Depends: ${misc:Depends}, grub-efi-ia32-bin (= ${binary:Version}), grub-common (= ${binary:Version})
+-Multi-Arch: foreign
+-Description: GRand Unified Bootloader, version 2 (EFI-IA32 debug files)
+- This package contains debugging files for grub-efi-ia32-bin.  You only need
+- these if you are trying to debug GRUB using its GDB stub.
+-
+-Package: grub-efi-ia32
+-Architecture: any-i386 any-amd64
+-Pre-Depends: ${misc:Pre-Depends}
+-Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-efi-ia32-bin (= ${binary:Version}), ucf
+-Replaces: grub, grub-legacy, grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-efi, grub-efi-amd64, grub-pc, grub-coreboot, grub-ieee1275
+-Conflicts: grub (<< 0.97-54), grub-legacy, grub-efi-amd64, grub-pc, grub-coreboot, grub-ieee1275, grub-xen, elilo
+-Multi-Arch: foreign
+-Description: GRand Unified Bootloader, version 2 (EFI-IA32 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
+- EFI-IA32 architecture, such as the one provided by Intel Macs (that is, unless
+- a BIOS interface has been activated).
+-
+ Package: grub-efi-amd64-bin
+ Architecture: i386 kopensolaris-i386 any-amd64
+ Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (= ${binary:Version}), efibootmgr [linux-any]
+@@ -343,374 +213,6 @@ Description: GRand Unified Bootloader, version 2 (EFI-AMD64 version)
+  EFI-AMD64 architecture, such as the one provided by Intel Macs (that is, unless
+  a BIOS interface has been activated).
+ 
+-Package: grub-efi-ia64-bin
+-Architecture: any-ia64
+-Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (= ${binary:Version})
+-Multi-Arch: foreign
+-Description: GRand Unified Bootloader, version 2 (IA64 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 on
+- IA64.  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-efi-ia64 instead.
+-
+-Package: grub-efi-ia64-dbg
+-Section: debug
+-Architecture: any-ia64
+-Depends: ${misc:Depends}, grub-efi-ia64-bin (= ${binary:Version}), grub-common (= ${binary:Version})
+-Multi-Arch: foreign
+-Description: GRand Unified Bootloader, version 2 (IA64 debug files)
+- This package contains debugging files for grub-efi-ia64-bin.  You only need
+- these if you are trying to debug GRUB using its GDB stub.
+-
+-Package: grub-efi-ia64
+-Architecture: any-ia64
+-Pre-Depends: ${misc:Pre-Depends}
+-Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-efi-ia64-bin (= ${binary:Version}), ucf
+-Conflicts: elilo
+-Multi-Arch: foreign
+-Description: GRand Unified Bootloader, version 2 (IA64 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 on
+- IA64.
+-
+-Package: grub-efi-arm-bin
+-Architecture: any-arm
+-Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (= ${binary:Version}), efibootmgr [linux-any]
+-Multi-Arch: foreign
+-Description: GRand Unified Bootloader, version 2 (ARM UEFI 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 on ARM
+- systems with UEFI.  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-efi-arm instead.
+-
+-Package: grub-efi-arm-dbg
+-Section: debug
+-Architecture: any-arm
+-Depends: ${misc:Depends}, grub-efi-arm-bin (= ${binary:Version}), grub-common (= ${binary:Version})
+-Multi-Arch: foreign
+-Description: GRand Unified Bootloader, version 2 (ARM UEFI debug files)
+- This package contains debugging files for grub-efi-arm-bin.  You only need
+- these if you are trying to debug GRUB using its GDB stub.
+-
+-Package: grub-efi-arm
+-Architecture: any-arm
+-Pre-Depends: ${misc:Pre-Depends}
+-Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-efi-arm-bin (= ${binary:Version}), ucf
+-Conflicts: grub-uboot
+-Multi-Arch: foreign
+-Description: GRand Unified Bootloader, version 2 (ARM UEFI 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 on ARM
+- systems with UEFI.
+-
+-Package: grub-efi-arm64-bin
+-Architecture: any-arm64
+-Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (= ${binary:Version}), efibootmgr [linux-any]
+-Multi-Arch: foreign
+-Description: GRand Unified Bootloader, version 2 (ARM64 UEFI 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 on
+- ARM64 systems with UEFI.  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-efi-arm64 instead.
+-
+-Package: grub-efi-arm64-dbg
+-Section: debug
+-Architecture: any-arm64
+-Depends: ${misc:Depends}, grub-efi-arm64-bin (= ${binary:Version}), grub-common (= ${binary:Version})
+-Multi-Arch: foreign
+-Description: GRand Unified Bootloader, version 2 (ARM64 UEFI debug files)
+- This package contains debugging files for grub-efi-arm64-bin.  You only
+- need these if you are trying to debug GRUB using its GDB stub.
+-
+-Package: grub-efi-arm64
+-Architecture: any-arm64
+-Pre-Depends: ${misc:Pre-Depends}
+-Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-efi-arm64-bin (= ${binary:Version}), ucf
+-Multi-Arch: foreign
+-Description: GRand Unified Bootloader, version 2 (ARM64 UEFI 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 on
+- ARM64 systems with UEFI.
+-
+-Package: grub-ieee1275-bin
+-Architecture: any-i386 any-amd64 any-powerpc any-ppc64 any-ppc64el any-sparc any-sparc64
+-Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (= ${binary:Version})
+-Replaces: grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-ieee1275 (<< 1.99-1)
+-Suggests: genisoimage [any-powerpc any-ppc64 any-ppc64el]
+-Multi-Arch: foreign
+-Description: GRand Unified Bootloader, version 2 (Open Firmware 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
+- Open Firmware implementations.  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-ieee1275 instead.
+-
+-Package: grub-ieee1275-dbg
+-Section: debug
+-Architecture: any-i386 any-amd64 any-powerpc any-ppc64 any-ppc64el any-sparc any-sparc64
+-Depends: ${misc:Depends}, grub-ieee1275-bin (= ${binary:Version}), grub-common (= ${binary:Version})
+-Multi-Arch: foreign
+-Description: GRand Unified Bootloader, version 2 (Open Firmware debug files)
+- This package contains debugging files for grub-ieee1275-bin.  You only
+- need these if you are trying to debug GRUB using its GDB stub.
+-
+-Package: grub-ieee1275
+-Architecture: any-i386 any-amd64 any-powerpc any-ppc64 any-ppc64el any-sparc any-sparc64
+-Pre-Depends: ${misc:Pre-Depends}
+-Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-ieee1275-bin (= ${binary:Version}), ucf, powerpc-ibm-utils (>= 1.2.12-1) [any-powerpc any-ppc64 any-ppc64el], powerpc-utils [any-powerpc any-ppc64 any-ppc64el]
+-Replaces: grub-legacy, grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-efi-amd64, grub-efi-ia32, grub-coreboot, grub-pc
+-Conflicts: grub (<< 0.97-54), grub-legacy, grub-efi-amd64, grub-efi-ia32, grub-coreboot, grub-pc, grub-xen
+-Multi-Arch: foreign
+-Description: GRand Unified Bootloader, version 2 (Open Firmware 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
+- Open Firmware implementations.
+-
+-Package: grub-firmware-qemu
+-Architecture: any-i386 any-amd64
+-Depends: ${misc:Depends}
+-Recommends: qemu
+-Enhances: qemu
+-Multi-Arch: foreign
+-Description: GRUB firmware image for QEMU
+- This package contains a binary of GRUB that has been built for use as
+- firmware for QEMU.  It can be used as a replacement for other PC BIOS
+- images provided by seabios, bochsbios, and so on.
+- .
+- In order to make QEMU use this firmware, simply add `-bios grub.bin' when
+- invoking it.
+- .
+- This package behaves in the same way as GRUB for coreboot, but doesn't
+- contain any code from coreboot itself, and is only suitable for QEMU. If
+- you want to install GRUB as firmware on real hardware, you need to use the
+- grub-coreboot package, and manually combine that with coreboot.
+-
+-Package: grub-uboot-bin
+-Architecture: any-arm
+-Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (= ${binary:Version})
+-Multi-Arch: foreign
+-Description: GRand Unified Bootloader, version 2 (ARM U-Boot 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
+- ARM systems with U-Boot.  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-uboot instead.
+-
+-Package: grub-uboot-dbg
+-Section: debug
+-Architecture: any-arm
+-Depends: ${misc:Depends}, grub-uboot-bin (= ${binary:Version}), grub-common (= ${binary:Version})
+-Multi-Arch: foreign
+-Description: GRand Unified Bootloader, version 2 (ARM U-Boot debug files)
+- This package contains debugging files for grub-uboot-bin.  You only need
+- these if you are trying to debug GRUB using its GDB stub.
+-
+-Package: grub-uboot
+-Architecture: any-arm
+-Pre-Depends: ${misc:Pre-Depends}
+-Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-uboot-bin (= ${binary:Version}), ucf
+-Conflicts: grub-efi-arm
+-Multi-Arch: foreign
+-Description: GRand Unified Bootloader, version 2 (ARM U-Boot 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
+- ARM systems with U-Boot.
+-
+-Package: grub-xen-bin
+-Architecture: i386 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: i386 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: i386 amd64
+-Pre-Depends: ${misc:Pre-Depends}
+-Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-xen-bin (= ${binary:Version}), ucf
+-Conflicts: grub (<< 0.97-54), grub-legacy, grub-efi-amd64, grub-efi-ia32, grub-coreboot, grub-ieee1275, grub-pc
+-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-xen-host
+-Architecture: i386 amd64
+-Depends: ${shlibs:Depends}, ${misc:Depends}, grub-xen-bin (= ${binary:Version})
+-Multi-Arch: foreign
+-Description: GRand Unified Bootloader, version 2 (Xen host 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 arranges for GRUB binary images which can be used to boot a Xen
+- guest (i.e. PV-GRUB) to be present in the control domain filesystem.
+-
+-Package: grub-yeeloong-bin
+-Architecture: any-mipsel
+-Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (= ${binary:Version})
+-Replaces: grub-common (<< 1.98+20100617-2), grub-yeeloong (<< 1.99-1)
+-Multi-Arch: foreign
+-Description: GRand Unified Bootloader, version 2 (Yeeloong 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 Lemote Yeeloong laptop.  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-yeeloong instead.
+-
+-Package: grub-yeeloong-dbg
+-Section: debug
+-Architecture: any-mipsel
+-Depends: ${misc:Depends}, grub-yeeloong-bin (= ${binary:Version}), grub-common (= ${binary:Version})
+-Multi-Arch: foreign
+-Description: GRand Unified Bootloader, version 2 (Yeeloong debug files)
+- This package contains debugging files for grub-yeeloong-bin.  You only
+- need these if you are trying to debug GRUB using its GDB stub.
+-
+-Package: grub-yeeloong
+-Architecture: any-mipsel
+-Pre-Depends: ${misc:Pre-Depends}
+-Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-yeeloong-bin (= ${binary:Version}), ucf
+-Replaces: grub-common (<< 1.98+20100617-2)
+-Multi-Arch: foreign
+-Description: GRand Unified Bootloader, version 2 (Yeeloong 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 Lemote Yeeloong laptop.
+-
+ Package: grub-theme-starfield
+ # Could be Architecture: any, but in practice this package is useless in a
+ # utilities-only build.
+@@ -719,10 +221,3 @@ Depends: ${misc:Depends}, grub-common (= ${binary:Version})
+ Multi-Arch: foreign
+ Description: GRand Unified Bootloader, version 2 (starfield theme)
+  This is the default theme for GRUB's graphical menu.
+-
+-Package: grub-mount-udeb
+-Package-Type: udeb
+-Section: debian-installer
+-Architecture: linux-any kfreebsd-any
+-Depends: ${shlibs:Depends}, ${misc:Depends}
+-Description: export GRUB filesystems using FUSE
+-- 
+2.1.4
+
diff --git a/pvepatches/disbale-unwanted-packages.patch b/pvepatches/disbale-unwanted-packages.patch
deleted file mode 100644
index 4c97c5d..0000000
--- a/pvepatches/disbale-unwanted-packages.patch
+++ /dev/null
@@ -1,406 +0,0 @@
-Just to reduce compile time.
-
-
-Index: new/debian/control
-===================================================================
---- new.orig/debian/control	2015-04-13 10:27:15.000000000 +0200
-+++ new/debian/control	2015-04-13 10:28:05.000000000 +0200
-@@ -53,14 +53,6 @@
-  This is a dummy transitional package to handle GRUB 2 upgrades.  It can be
-  safely removed.
- 
--Package: grub-linuxbios
--Section: oldlibs
--Architecture: any-i386 any-amd64
--Depends: grub-coreboot (= ${binary:Version}), ${misc:Depends}
--Multi-Arch: foreign
--Description: GRand Unified Bootloader, version 2 (dummy package)
-- This is a dummy transitional package that depends on grub-coreboot.
--
- Package: grub-efi
- Section: oldlibs
- Architecture: any-i386 any-amd64
-@@ -99,24 +91,6 @@
-  The files in this package are specific to GRUB 2, and would break GRUB
-  Legacy if installed on the same system.
- 
--Package: grub-emu
--Architecture: any-i386 any-amd64 any-powerpc
--Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (= ${binary:Version})
--Replaces: grub-common (<= 1.97~beta3-1)
--Multi-Arch: foreign
--Description: GRand Unified Bootloader, version 2 (emulated version)
-- This package contains grub-emu, an emulated version of GRUB.  It is only
-- provided for debugging purposes.
--
--Package: grub-emu-dbg
--Section: debug
--Architecture: any-i386 any-amd64 any-powerpc
--Depends: ${misc:Depends}, grub-emu (= ${binary:Version}), grub-common (= ${binary:Version})
--Multi-Arch: foreign
--Description: GRand Unified Bootloader, version 2 (emulated debug files)
-- This package contains debugging files for grub-emu.  You only need these if
-- you are trying to debug GRUB using its GDB stub.
--
- Package: grub-pc-bin
- Priority: optional
- Architecture: any-i386 any-amd64
-@@ -188,55 +162,6 @@
-   - grub-rescue-cdrom.iso: El Torito CDROM image.
-   - grub-rescue-usb.img: USB image.
- 
--Package: grub-coreboot-bin
--Architecture: any-i386 any-amd64
--Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (= ${binary:Version})
--Replaces: grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-linuxbios, grub-coreboot (<< 1.99-1)
--Conflicts: grub-linuxbios (<< ${source:Version})
--Multi-Arch: foreign
--Description: GRand Unified Bootloader, version 2 (Coreboot 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
-- platforms running the Coreboot firmware.  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-coreboot instead.
--
--Package: grub-coreboot-dbg
--Section: debug
--Architecture: any-i386 any-amd64
--Depends: ${misc:Depends}, grub-coreboot-bin (= ${binary:Version}), grub-common (= ${binary:Version})
--Multi-Arch: foreign
--Description: GRand Unified Bootloader, version 2 (Coreboot debug files)
-- This package contains debugging files for grub-coreboot-bin.  You only need
-- these if you are trying to debug GRUB using its GDB stub.
--
--Package: grub-coreboot
--Architecture: any-i386 any-amd64
--Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-coreboot-bin (= ${binary:Version}), ucf
--Replaces: grub-legacy, grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-linuxbios, grub-efi-amd64, grub-efi-ia32, grub-pc, grub-ieee1275
--Conflicts: grub (<< 0.97-54), grub-legacy, grub-linuxbios (<< ${source:Version}), grub-efi-amd64, grub-efi-ia32, grub-pc, grub-ieee1275, grub-xen
--Multi-Arch: foreign
--Description: GRand Unified Bootloader, version 2 (Coreboot 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
-- platforms running the Coreboot firmware.
--
- Package: grub-efi-ia32-bin
- Architecture: any-i386 any-amd64
- Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (= ${binary:Version}), efibootmgr [i386 amd64]
-@@ -383,146 +308,6 @@
-  This package contains a version of GRUB that has been built for use on
-  IA64.
- 
--Package: grub-efi-arm-bin
--Architecture: any-arm
--Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (= ${binary:Version})
--Multi-Arch: foreign
--Description: GRand Unified Bootloader, version 2 (ARM UEFI 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 on ARM
-- systems with UEFI.  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-efi-arm instead.
--
--Package: grub-efi-arm-dbg
--Section: debug
--Architecture: any-arm
--Depends: ${misc:Depends}, grub-efi-arm-bin (= ${binary:Version}), grub-common (= ${binary:Version})
--Multi-Arch: foreign
--Description: GRand Unified Bootloader, version 2 (ARM UEFI debug files)
-- This package contains debugging files for grub-efi-arm-bin.  You only need
-- these if you are trying to debug GRUB using its GDB stub.
--
--Package: grub-efi-arm
--Architecture: any-arm
--Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-efi-arm-bin (= ${binary:Version}), ucf
--Conflicts: grub-uboot
--Multi-Arch: foreign
--Description: GRand Unified Bootloader, version 2 (ARM UEFI 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 on ARM
-- systems with UEFI.
--
--Package: grub-efi-arm64-bin
--Architecture: any-arm64
--Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (= ${binary:Version})
--Multi-Arch: foreign
--Description: GRand Unified Bootloader, version 2 (ARM64 UEFI 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 on
-- ARM64 systems with UEFI.  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-efi-arm64 instead.
--
--Package: grub-efi-arm64-dbg
--Section: debug
--Architecture: any-arm64
--Depends: ${misc:Depends}, grub-efi-arm64-bin (= ${binary:Version}), grub-common (= ${binary:Version})
--Multi-Arch: foreign
--Description: GRand Unified Bootloader, version 2 (ARM64 UEFI debug files)
-- This package contains debugging files for grub-efi-arm64-bin.  You only
-- need these if you are trying to debug GRUB using its GDB stub.
--
--Package: grub-efi-arm64
--Architecture: any-arm64
--Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-efi-arm64-bin (= ${binary:Version}), ucf
--Multi-Arch: foreign
--Description: GRand Unified Bootloader, version 2 (ARM64 UEFI 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 on
-- ARM64 systems with UEFI.
--
--Package: grub-ieee1275-bin
--Architecture: any-i386 any-amd64 any-powerpc any-ppc64 any-ppc64el any-sparc
--Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (= ${binary:Version})
--Replaces: grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-ieee1275 (<< 1.99-1)
--Suggests: genisoimage [any-powerpc any-ppc64 any-ppc64el]
--Multi-Arch: foreign
--Description: GRand Unified Bootloader, version 2 (Open Firmware 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
-- Open Firmware implementations.  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-ieee1275 instead.
--
--Package: grub-ieee1275-dbg
--Section: debug
--Architecture: any-i386 any-amd64 any-powerpc any-ppc64 any-ppc64el any-sparc
--Depends: ${misc:Depends}, grub-ieee1275-bin (= ${binary:Version}), grub-common (= ${binary:Version})
--Multi-Arch: foreign
--Description: GRand Unified Bootloader, version 2 (Open Firmware debug files)
-- This package contains debugging files for grub-ieee1275-bin.  You only
-- need these if you are trying to debug GRUB using its GDB stub.
--
--Package: grub-ieee1275
--Architecture: any-i386 any-amd64 any-powerpc any-ppc64 any-ppc64el any-sparc
--Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-ieee1275-bin (= ${binary:Version}), ucf, powerpc-ibm-utils (>= 1.2.12-1) [any-powerpc any-ppc64 any-ppc64el], powerpc-utils [any-powerpc any-ppc64 any-ppc64el]
--Replaces: grub-legacy, grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-efi-amd64, grub-efi-ia32, grub-coreboot, grub-pc
--Conflicts: grub (<< 0.97-54), grub-legacy, grub-efi-amd64, grub-efi-ia32, grub-coreboot, grub-pc, grub-xen
--Multi-Arch: foreign
--Description: GRand Unified Bootloader, version 2 (Open Firmware 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
-- Open Firmware implementations.
--
- Package: grub-firmware-qemu
- Architecture: any-i386 any-amd64
- Depends: ${misc:Depends}
-@@ -542,145 +327,6 @@
-  you want to install GRUB as firmware on real hardware, you need to use the
-  grub-coreboot package, and manually combine that with coreboot.
- 
--Package: grub-uboot-bin
--Architecture: any-arm
--Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (= ${binary:Version})
--Multi-Arch: foreign
--Description: GRand Unified Bootloader, version 2 (ARM U-Boot 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
-- ARM systems with U-Boot.  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-uboot instead.
--
--Package: grub-uboot-dbg
--Section: debug
--Architecture: any-arm
--Depends: ${misc:Depends}, grub-uboot-bin (= ${binary:Version}), grub-common (= ${binary:Version})
--Multi-Arch: foreign
--Description: GRand Unified Bootloader, version 2 (ARM U-Boot debug files)
-- This package contains debugging files for grub-uboot-bin.  You only need
-- these if you are trying to debug GRUB using its GDB stub.
--
--Package: grub-uboot
--Architecture: any-arm
--Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-uboot-bin (= ${binary:Version}), ucf
--Conflicts: grub-efi-arm
--Multi-Arch: foreign
--Description: GRand Unified Bootloader, version 2 (ARM U-Boot 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
-- ARM systems with U-Boot.
--
--Package: grub-xen-bin
--Architecture: i386 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: i386 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: i386 amd64
--Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-xen-bin (= ${binary:Version}), ucf
--Conflicts: grub (<< 0.97-54), grub-legacy, grub-efi-amd64, grub-efi-ia32, grub-coreboot, grub-ieee1275, grub-pc
--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})
--Replaces: grub-common (<< 1.98+20100617-2), grub-yeeloong (<< 1.99-1)
--Multi-Arch: foreign
--Description: GRand Unified Bootloader, version 2 (Yeeloong 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 Lemote Yeeloong laptop.  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-yeeloong instead.
--
--Package: grub-yeeloong-dbg
--Section: debug
--Architecture: any-mipsel
--Depends: ${misc:Depends}, grub-yeeloong-bin (= ${binary:Version}), grub-common (= ${binary:Version})
--Multi-Arch: foreign
--Description: GRand Unified Bootloader, version 2 (Yeeloong debug files)
-- This package contains debugging files for grub-yeeloong-bin.  You only
-- need these if you are trying to debug GRUB using its GDB stub.
--
--Package: grub-yeeloong
--Architecture: any-mipsel
--Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-yeeloong-bin (= ${binary:Version}), ucf
--Replaces: grub-common (<< 1.98+20100617-2)
--Multi-Arch: foreign
--Description: GRand Unified Bootloader, version 2 (Yeeloong 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 Lemote Yeeloong laptop.
--
- Package: grub-theme-starfield
- Architecture: any-i386 any-amd64 any-powerpc any-ppc64 any-ppc64el any-sparc any-mipsel any-ia64 any-arm any-arm64
- Depends: ${misc:Depends}, grub-common (= ${binary:Version})
-@@ -688,9 +334,3 @@
- Description: GRand Unified Bootloader, version 2 (starfield theme)
-  This is the default theme for GRUB's graphical menu.
- 
--Package: grub-mount-udeb
--XC-Package-Type: udeb
--Section: debian-installer
--Architecture: i386 amd64 powerpc ppc64 ppc64el sparc mipsel ia64 armel armhf arm64 kfreebsd-i386 kfreebsd-amd64
--Depends: ${shlibs:Depends}, ${misc:Depends}
--Description: export GRUB filesystems using FUSE
diff --git a/pvepatches/fix-build-dependencies.patch b/pvepatches/fix-build-dependencies.patch
new file mode 100644
index 0000000..450882c
--- /dev/null
+++ b/pvepatches/fix-build-dependencies.patch
@@ -0,0 +1,58 @@
+From c0917df7081bbc75b4d18fc2b36320fd51dbcf95 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler at proxmox.com>
+Date: Tue, 18 Oct 2016 11:07:54 +0200
+Subject: [PATCH] fix build dependencies
+
+---
+ debian/control | 5 ++---
+ debian/rules   | 4 ++--
+ 2 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/debian/control b/debian/control
+index 6905282..956bff9 100644
+--- a/debian/control
++++ b/debian/control
+@@ -13,8 +13,8 @@ Build-Depends: debhelper (>= 7.4.2~),
+  po-debconf,
+  help2man,
+  texinfo,
+- gcc-6,
+- gcc-6-multilib [i386 kopensolaris-i386 any-amd64 any-ppc64 any-sparc],
++ gcc-4.9,
++ gcc-4.9-multilib [i386 kopensolaris-i386 any-amd64 any-ppc64 any-sparc],
+  xfonts-unifont,
+  libfreetype6-dev,
+  gettext,
+@@ -22,7 +22,6 @@ Build-Depends: debhelper (>= 7.4.2~),
+  libgeom-dev (>= 8.2+ds1-1~) [kfreebsd-any] | libgeom-dev (<< 8.2) [kfreebsd-any],
+  libsdl1.2-dev [!hurd-any],
+  xorriso,
+- qemu-system [i386 kfreebsd-i386 kopensolaris-i386 any-amd64],
+  cpio [i386 kopensolaris-i386 amd64 x32],
+  parted [!hurd-any],
+  libfuse-dev (>= 2.8.4-1.4) [linux-any kfreebsd-any],
+diff --git a/debian/rules b/debian/rules
+index 8c73042..f4e6e98 100755
+--- a/debian/rules
++++ b/debian/rules
+@@ -21,7 +21,7 @@ export HOST_CPPFLAGS
+ export HOST_CFLAGS
+ export HOST_LDFLAGS
+ export TARGET_CPPFLAGS := -Wno-unused-but-set-variable
+-export TARGET_LDFLAGS := -no-pie
++export TARGET_LDFLAGS
+ 
+ ifeq (,$(shell which qemu-system-i386 2>/dev/null))
+ with_check := no
+@@ -29,7 +29,7 @@ else
+ with_check := yes
+ endif
+ 
+-CC := gcc-6
++CC := gcc-4.9
+ 
+ confflags = \
+ 	PACKAGE_VERSION="$(deb_version)" PACKAGE_STRING="GRUB $(deb_version)" \
+-- 
+2.1.4
+
diff --git a/pvepatches/fix-default-grub-config.patch b/pvepatches/fix-default-grub-config.patch
new file mode 100644
index 0000000..5834b6e
--- /dev/null
+++ b/pvepatches/fix-default-grub-config.patch
@@ -0,0 +1,42 @@
+From 761f4932b5634f5a12ef01e20ae9aa0c66c171ac Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler at proxmox.com>
+Date: Tue, 18 Oct 2016 11:33:18 +0200
+Subject: [PATCH] fix default grub config
+
+---
+ debian/default/grub | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/debian/default/grub b/debian/default/grub
+index 7617f01..483b6f6 100644
+--- a/debian/default/grub
++++ b/debian/default/grub
+@@ -5,10 +5,13 @@
+ 
+ GRUB_DEFAULT=0
+ GRUB_TIMEOUT=@DEFAULT_TIMEOUT@
+-GRUB_DISTRIBUTOR=`lsb_release -i -s 2> /dev/null || echo Debian`
++GRUB_DISTRIBUTOR="Proxmox Virtual Environment"
+ GRUB_CMDLINE_LINUX_DEFAULT="@DEFAULT_CMDLINE@"
+ GRUB_CMDLINE_LINUX=""
+ 
++# Disable os-prober, it might add menu entries for each guest
++GRUB_DISABLE_OS_PROBER=true
++
+ # Uncomment to enable BadRAM filtering, modify to suit your needs
+ # This works with Linux (no patch required) and with any kernel that obtains
+ # the memory map information from GRUB (GNU Mach, kernel of FreeBSD ...)
+@@ -25,8 +28,8 @@ GRUB_CMDLINE_LINUX=""
+ # Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to Linux
+ #GRUB_DISABLE_LINUX_UUID=true
+ 
+-# Uncomment to disable generation of recovery mode menu entries
+-#GRUB_DISABLE_RECOVERY="true"
++# Disable generation of recovery mode menu entries
++GRUB_DISABLE_RECOVERY="true"
+ 
+ # Uncomment to get a beep at grub start
+ #GRUB_INIT_TUNE="480 440 1"
+-- 
+2.1.4
+
diff --git a/pvepatches/series b/pvepatches/series
index deb936f..21be043 100644
--- a/pvepatches/series
+++ b/pvepatches/series
@@ -1,5 +1,5 @@
-disbale-unwanted-packages.patch
-fix-control.patch
+disable-unwanted-packages.patch
+fix-build-dependencies.patch
 fix-grub-pc-postinst.patch
 #fix-zfs-ldadd.patch
 #zfsinfo.c-memory-leak-in-print_vdev_info.patch
@@ -11,7 +11,8 @@ fix-grub-pc-postinst.patch
 #biosdisk-Add-missing-cast.patch
 #biosdisk.c-Check-disk-size-sanity.patch
 #ahci.c-Increase-timeout.patch
-fix-grub-distributor.patch
+#fix-grub-distributor.patch
 suggest-os-prober.patch
-grub-disable-os-prober.patch
-grub-disable-recovery.patch
+#grub-disable-os-prober.patch
+#grub-disable-recovery.patch
+fix-default-grub-config.patch
diff --git a/pvepatches/suggest-os-prober.patch b/pvepatches/suggest-os-prober.patch
index e1c961f..86f68bb 100644
--- a/pvepatches/suggest-os-prober.patch
+++ b/pvepatches/suggest-os-prober.patch
@@ -1,14 +1,26 @@
-Index: new/debian/control
-===================================================================
---- new.orig/debian/control
-+++ new/debian/control
-@@ -67,8 +67,7 @@ Priority: optional
- Architecture: any-i386 any-amd64 any-powerpc any-ppc64 any-ppc64el any-sparc any-mipsel any-ia64 any-arm any-arm64
+From 6b025bc0fcb9a9315ff4e3aaa3a4b3e7c1af81e3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler at proxmox.com>
+Date: Tue, 18 Oct 2016 11:31:02 +0200
+Subject: [PATCH] suggest os prober
+
+---
+ debian/control | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/debian/control b/debian/control
+index 956bff9..7954721 100644
+--- a/debian/control
++++ b/debian/control
+@@ -63,8 +63,7 @@ Priority: optional
+ Architecture: any
  Depends: ${shlibs:Depends}, ${misc:Depends}, gettext-base, ${lsb-base-depends}
  Replaces: grub-pc (<< 2.00-4), grub-ieee1275 (<< 2.00-4), grub-efi (<< 1.99-1), grub-coreboot (<< 2.00-4), grub-linuxbios (<< 1.96+20080831-1), grub-efi-ia32 (<< 2.00-4), grub-efi-amd64 (<< 2.00-4), grub-efi-ia64 (<< 2.00-4), grub-yeeloong (<< 2.00-4)
 -Recommends: os-prober (>= 1.33)
--Suggests: multiboot-doc, grub-emu, xorriso (>= 0.5.6.pl00), desktop-base (>= 4.0.6), console-setup
-+Suggests:  os-prober (>= 1.33), multiboot-doc, grub-emu, xorriso (>= 0.5.6.pl00), desktop-base (>= 4.0.6), console-setup
- # See bugs #435983 and #455746
- Conflicts: mdadm (<< 2.6.7-2)
- Breaks: lupin-support (<< 0.55), friendly-recovery (<< 0.2.13), apport (<< 2.1.1)
+-Suggests: multiboot-doc, grub-emu [any-i386 any-amd64 any-powerpc], xorriso (>= 0.5.6.pl00), desktop-base (>= 4.0.6), console-setup
++Suggests: os-prober (>= 1.33), multiboot-doc, grub-emu [any-i386 any-amd64 any-powerpc], xorriso (>= 0.5.6.pl00), desktop-base (>= 4.0.6), console-setup
+ # mdadm: See bugs #435983 and #455746
+ Breaks: mdadm (<< 2.6.7-2), lupin-support (<< 0.55), friendly-recovery (<< 0.2.13), apport (<< 2.1.1)
+ Multi-Arch: foreign
+-- 
+2.1.4
+
-- 
2.1.4





More information about the pve-devel mailing list