enable zfs, compile witg gcc 4.7

diff --git a/Makefile b/Makefile
new file mode 100644 (file)
index 0000000..8ce1c21
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,48 @@
+
+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
+
+DEBS=                                          \
+grub2-common_2.02~beta2-19_amd64.deb           \
+grub-common_2.02~beta2-19_amd64.deb            \
+grub-efi_2.02~beta2-19_amd64.deb               \
+grub-efi-amd64_2.02~beta2-19_amd64.deb         \
+grub-efi-amd64-bin_2.02~beta2-19_amd64.deb     \
+grub-efi-ia32_2.02~beta2-19_amd64.deb          \
+grub-efi-ia32-bin_2.02~beta2-19_amd64.deb      \
+grub-pc_2.02~beta2-19_amd64.deb                        \
+grub-pc-bin_2.02~beta2-19_amd64.deb            \
+grub-pc-dbg_2.02~beta2-19_amd64.deb            \
+grub-rescue-pc_2.02~beta2-19_amd64.deb         \
+grub-theme-starfield_2.02~beta2-19_amd64.deb
+
+#grub2_2.02~beta2-19_amd64.deb
+#grub-coreboot_2.02~beta2-19_amd64.deb
+#grub-coreboot-bin_2.02~beta2-19_amd64.deb
+#grub-coreboot-dbg_2.02~beta2-19_amd64.deb
+#grub-efi-amd64-dbg_2.02~beta2-19_amd64.deb
+#grub-efi-ia32-dbg_2.02~beta2-19_amd64.deb
+#grub-emu_2.02~beta2-19_amd64.deb
+#grub-emu-dbg_2.02~beta2-19_amd64.deb
+#grub-firmware-qemu_2.02~beta2-19_amd64.deb
+#grub-ieee1275_2.02~beta2-19_amd64.deb
+#grub-ieee1275-bin_2.02~beta2-19_amd64.deb
+#grub-ieee1275-dbg_2.02~beta2-19_amd64.deb
+#grub-linuxbios_2.02~beta2-19_amd64.deb
+
+
+all: ${DEBS}
+       #cp ${DEBS} /home/dietmar/pve2-proxdev/pve-rep/zfs-grub/
+
+test:
+       rm -rf ${GRUB_DIR}
+       tar xf ${GRUB_SRC}
+       cd ${GRUB_DIR}; tar xf ../${GRUB_DEB_SRC}
+       cd ${GRUB_DIR}; ln -s ../pvepatches patches
+       cd ${GRUB_DIR}; quilt push -a
+       cd ${GRUB_DIR}; dpkg-buildpackage -b -uc -us 
+
+
+clean:
+       rm -rf *~ *.deb *.udeb *.changes ${GRUB_DIR}
\ No newline at end of file

diff --git a/pvepatches/fix-control.patch b/pvepatches/fix-control.patch
new file mode 100644 (file)
index 0000000..e564a88
--- /dev/null
+++ b/pvepatches/fix-control.patch
@@ -0,0 +1,45 @@
+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
+@@ -14,8 +14,8 @@
+  po-debconf,
+  help2man,
+  texinfo,
+- gcc-4.9-multilib [i386 kopensolaris-i386 any-amd64 any-ppc64 any-sparc],
+- gcc-4.9,
++ gcc-4.7-multilib [i386 kopensolaris-i386 any-amd64 any-ppc64 any-sparc],
++ gcc-4.7,
+  xfonts-unifont,
+  libfreetype6-dev,
+  gettext,
+@@ -24,7 +24,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],
+  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
+Index: new/debian/rules
+===================================================================
+--- new.orig/debian/rules      2014-12-22 12:55:53.000000000 +0100
++++ new/debian/rules   2015-01-13 06:31:13.000000000 +0100
+@@ -28,7 +28,7 @@
+ with_check := yes
+ endif
+ 
+-CC := gcc-4.9
++CC := gcc-4.7
+ 
+ confflags = PACKAGE_VERSION="$(deb_version)" PACKAGE_STRING="GRUB $(deb_version)" CC=$(CC) TARGET_CC=$(CC) --enable-grub-mkfont
+ substvars =

diff --git a/pvepatches/fix-zfs-ldadd.patch b/pvepatches/fix-zfs-ldadd.patch
new file mode 100644 (file)
index 0000000..dbe4dcb
--- /dev/null
+++ b/pvepatches/fix-zfs-ldadd.patch
@@ -0,0 +1,12 @@
+Index: new/Makefile.util.def
+===================================================================
+--- new.orig/Makefile.util.def 2013-12-24 17:45:34.000000000 +0100
++++ new/Makefile.util.def      2015-01-13 08:28:23.000000000 +0100
+@@ -385,6 +385,7 @@
+   ldadd = libgrubkern.a;
+   ldadd = grub-core/gnulib/libgnu.a;
+   ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBGEOM)';
++  ldadd = '$(LIBZFS) $(LIBNVPAIR)';
+ };
+ 
+ program = {

diff --git a/pvepatches/series b/pvepatches/series
new file mode 100644 (file)
index 0000000..23c9f3f
--- /dev/null
+++ b/pvepatches/series
@@ -0,0 +1,2 @@
+fix-control.patch
+fix-zfs-ldadd.patch