use latest packages from githup (2.02-beta2.9-ZOL11-7aa9f6)

diff --git a/Makefile b/Makefile
index 3e0f7e40f49d20c709c97d9bdc4acebbf0fe3acc..af76075287aa1ff0debb57f4979c021c92418348 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
 RELEASE=4.0
 
-GRUB_DIR=grub-2.02~beta2
-GRUB_SRC=grub2_2.02~beta2.orig.tar.xz
-GRUB_DEB_SRC=grub2_2.02~beta2-19.debian.tar.xz
+GRUB_DIR=grub
+GRUB_SRC=${GRUB_DIR}.tar.gz
+SNAPVER=2.02-beta2.9-ZOL11-7aa9f6
 
 # update/sync changelog.pve
-DEBVER=2.02-pve1
+DEBVER=2.02-pve2
 
 PC_DEBS=                                       \
 grub2-common_${DEBVER}_amd64.deb               \
@@ -25,22 +25,6 @@ grub-efi-ia32-bin_${DEBVER}_amd64.deb                \
 
 DEBS=${PC_DEBS} ${EFI_DEBS}
 
-
-#grub2_${DEBVER}_amd64.deb
-#grub-coreboot_${DEBVER}_amd64.deb
-#grub-coreboot-bin_${DEBVER}_amd64.deb
-#grub-coreboot-dbg_${DEBVER}_amd64.deb
-#grub-efi-amd64-dbg_${DEBVER}_amd64.deb
-#grub-efi-ia32-dbg_${DEBVER}_amd64.deb
-#grub-emu_${DEBVER}_amd64.deb
-#grub-emu-dbg_${DEBVER}_amd64.deb
-#grub-firmware-qemu_${DEBVER}_amd64.deb
-#grub-ieee1275_${DEBVER}_amd64.deb
-#grub-ieee1275-bin_${DEBVER}_amd64.deb
-#grub-ieee1275-dbg_${DEBVER}_amd64.deb
-#grub-linuxbios_${DEBVER}_amd64.deb
-
-
 all: ${DEBS}
 
 .PHONY: dinstall
@@ -51,7 +35,6 @@ dinstall: ${DEBS}
 grub ${DEBS}:
        rm -rf ${GRUB_DIR}
        tar xf ${GRUB_SRC}
-       cd ${GRUB_DIR}; tar xf ../${GRUB_DEB_SRC}
        mv ${GRUB_DIR}/debian/changelog ${GRUB_DIR}/debian/changelog.org
        cat changelog.pve ${GRUB_DIR}/debian/changelog.org > ${GRUB_DIR}/debian/changelog
        cd ${GRUB_DIR}; ln -s ../pvepatches patches
@@ -63,8 +46,11 @@ grub ${DEBS}:
 
 .PHONY: download
 download:
-       wget http://ftp.de.debian.org/debian/pool/main/g/grub2/grub2_2.02~beta2-19.debian.tar.xz
-       wget http://ftp.de.debian.org/debian/pool/main/g/grub2/grub2_2.02~beta2.orig.tar.xz
+       rm -rf grub ${GRUB_SRC} ${GRUB_SRC}.tmp
+       git clone https://github.com/zfsonlinux/grub
+       cd grub; git checkout snapshot/debian/jessie/${SNAPVER}
+       tar czf ${GRUB_SRC}.tmp grub
+       mv ${GRUB_SRC}.tmp ${GRUB_SRC}
 
 .PHONY: upload
 upload: ${DEBS}

diff --git a/README b/README
index c71283a36cab4ac4417d87d5dc9e001ec32a13a8..4508fcdd9710f09e5a31d0d3b58704269e129733 100644 (file)
--- a/README
+++ b/README
@@ -1,2 +1,4 @@
 This is simple a recompile of debian jessie grub packages,
-with zfs enabled.
\ No newline at end of file
+with zfs enabled. This is simple a recompile of zol grub packages from github:
+
+https://github.com/zfsonlinux/grub/archive/snapshot/debian/wheezy/

diff --git a/changelog.pve b/changelog.pve
index 483699607e2558888144f771cb99899d89f90ed0..4878a012d8292f8cd5863de7991f28e631151c7b 100644 (file)
--- a/changelog.pve
+++ b/changelog.pve
@@ -1,3 +1,12 @@
+grub2 (2.02-pve2) unstable; urgency=medium
+
+  *  use latest packagees from github
+     (snapshot/debian/jessie/2.02-beta2.9-ZOL11-7aa9f6)
+
+  * fix grub distributor in /etc/default/grub
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 14 Apr 2015 10:47:05 +0200
+
 grub2 (2.02-pve1) unstable; urgency=medium
 
   * recompile for jessie (gcc 4.9.1)

diff --git a/pvepatches/disbale-unwanted-packages.patch b/pvepatches/disbale-unwanted-packages.patch
new file mode 100644 (file)
index 0000000..4c97c5d
--- /dev/null
+++ b/pvepatches/disbale-unwanted-packages.patch
@@ -0,0 +1,406 @@
+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-control.patch b/pvepatches/fix-control.patch
index df78ea8d007506a938b5a703b565ba177b505d65..1b3f95e27003865a16eeb459f8f5cb164e3ad5e4 100644 (file)
--- a/pvepatches/fix-control.patch
+++ b/pvepatches/fix-control.patch
@@ -1,21 +1,12 @@
 Index: new/debian/control
 ===================================================================
---- new.orig/debian/control    2014-12-22 12:55:53.000000000 +0100
-+++ new/debian/control 2015-01-13 06:30:52.000000000 +0100
-@@ -24,7 +24,6 @@
+--- new.orig/debian/control    2015-04-11 09:20:22.000000000 +0200
++++ new/debian/control 2015-04-12 10:38:15.000000000 +0200
+@@ -27,7 +27,6 @@
   libgeom-dev (>= 8.2+ds1-1) [kfreebsd-any] | libgeom-dev (<< 8.2) [kfreebsd-any],
   libsdl1.2-dev [!hurd-any],
   xorriso (>= 0.5.6.pl00),
 - qemu-system [i386 kfreebsd-i386 kopensolaris-i386 any-amd64],
-  cpio [i386 kopensolaris-i386 amd64 x32],
+  cpio [i386 kopensolaris-i386 amd64],
   parted [!hurd-any],
   libfuse-dev (>= 2.8.4-1.4) [linux-any kfreebsd-any],
-@@ -35,7 +34,7 @@
-  wamerican,
-  libxen-dev [i386 amd64],
-  libparted-dev [any-ppc64el],
--Build-Conflicts: autoconf2.13, libzfs-dev, libnvpair-dev
-+Build-Conflicts: autoconf2.13
- Standards-Version: 3.8.4
- Homepage: http://www.gnu.org/software/grub/
- Vcs-Git: git://anonscm.debian.org/pkg-grub/grub.git

diff --git a/pvepatches/fix-grub-distributor.patch b/pvepatches/fix-grub-distributor.patch
new file mode 100644 (file)
index 0000000..629c9b7
--- /dev/null
+++ b/pvepatches/fix-grub-distributor.patch
@@ -0,0 +1,13 @@
+Index: new/debian/default/grub
+===================================================================
+--- new.orig/debian/default/grub       2015-04-13 09:18:01.000000000 +0200
++++ new/debian/default/grub    2015-04-14 08:31:16.000000000 +0200
+@@ -5,7 +5,7 @@
+ 
+ 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=""
+ 

diff --git a/pvepatches/series b/pvepatches/series
index 87263978bc5e0f3c9c8758da8b9c55f004522fd8..af1c43204315a451452672276ee2d13d7419339f 100644 (file)
--- a/pvepatches/series
+++ b/pvepatches/series
@@ -1,12 +1,14 @@
+disbale-unwanted-packages.patch
 fix-control.patch
 fix-grub-pc-postinst.patch
-fix-zfs-ldadd.patch
-zfsinfo.c-memory-leak-in-print_vdev_info.patch
-zfs.c-Avoid-divisions-by-zero.patch
-zfs-Fix-disk-matching-logic.patch
-zfs-Fix-error-handling.patch
-zfscrypt-Add-missing-explicit-cast.patch
-zfs.c-fix-memory-leak.patch
-biosdisk-Add-missing-cast.patch
-biosdisk.c-Check-disk-size-sanity.patch
-ahci.c-Increase-timeout.patch
+#fix-zfs-ldadd.patch
+#zfsinfo.c-memory-leak-in-print_vdev_info.patch
+#zfs.c-Avoid-divisions-by-zero.patch
+#zfs-Fix-disk-matching-logic.patch
+#zfs-Fix-error-handling.patch
+#zfscrypt-Add-missing-explicit-cast.patch
+#zfs.c-fix-memory-leak.patch
+#biosdisk-Add-missing-cast.patch
+#biosdisk.c-Check-disk-size-sanity.patch
+#ahci.c-Increase-timeout.patch
+fix-grub-distributor.patch