sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-13 23:39:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions
ports/sysutils/grub2/files/patch-grub-core-Makefile.core.am
Juergen Lock 0e7d58890a - Update to 2.00 . [1] 
- Add kfreebsd >= 9.1 fix to boot a kernel directly w/o chainloading [2]
  - see also:

	http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=699002

- Add zfs support including zfs feature flags, see: [3]

	http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-boot/grub/files/grub-2.00-zfs-feature-flag-support-r1.patch

- Add FUSE support and knob.
- Switch to USES=gmake .
- Add LICENSE.
- Fix build on head.
- Mark MAKE_JOBS_UNSAFE:

	https://redports.org/~nox/20130803161801-34924-135687/grub2-2.00_1.log

- Misc. other changes.
- This version is now used successfully by the PCBSD folks so I thought
  it's finally time to commit it. :)

PR: ports/170417 [1]
Submitted by: Norihiko Murase <mur1080224@inter7.jp> [1]
		(original version of the update)
Submitted by: Christian Mangin <christian.mangin@gmail.com> [1]
Submitted by: Richard Yao <ryao@gentoo.org> [1]
		(additional contributors to the PR)
Obtained from: grub2 upstream [2]
Obtained from: gentoo [3]
2013-08-03 19:02:27 +00:00

128 lines
7 KiB
Text
Raw Blame History

--- grub-core/Makefile.core.am.orig
+++ grub-core/Makefile.core.am
@@ -32004,7 +32004,7 @@ endif
if COND_emu
platform_PROGRAMS += zfs.module
MODULE_FILES += zfs.module$(EXEEXT)
-zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
+zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
nodist_zfs_module_SOURCES = ## platform nodist sources
zfs_module_LDADD =
zfs_module_CFLAGS = $(AM_CFLAGS) $(CFLAGS_MODULE)
@@ -32026,7 +32026,7 @@ endif
if COND_i386_pc
platform_PROGRAMS += zfs.module
MODULE_FILES += zfs.module$(EXEEXT)
-zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
+zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
nodist_zfs_module_SOURCES = ## platform nodist sources
zfs_module_LDADD =
zfs_module_CFLAGS = $(AM_CFLAGS) $(CFLAGS_MODULE)
@@ -32048,7 +32048,7 @@ endif
if COND_i386_efi
platform_PROGRAMS += zfs.module
MODULE_FILES += zfs.module$(EXEEXT)
-zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
+zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
nodist_zfs_module_SOURCES = ## platform nodist sources
zfs_module_LDADD =
zfs_module_CFLAGS = $(AM_CFLAGS) $(CFLAGS_MODULE)
@@ -32070,7 +32070,7 @@ endif
if COND_i386_qemu
platform_PROGRAMS += zfs.module
MODULE_FILES += zfs.module$(EXEEXT)
-zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
+zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
nodist_zfs_module_SOURCES = ## platform nodist sources
zfs_module_LDADD =
zfs_module_CFLAGS = $(AM_CFLAGS) $(CFLAGS_MODULE)
@@ -32092,7 +32092,7 @@ endif
if COND_i386_coreboot
platform_PROGRAMS += zfs.module
MODULE_FILES += zfs.module$(EXEEXT)
-zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
+zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
nodist_zfs_module_SOURCES = ## platform nodist sources
zfs_module_LDADD =
zfs_module_CFLAGS = $(AM_CFLAGS) $(CFLAGS_MODULE)
@@ -32114,7 +32114,7 @@ endif
if COND_i386_multiboot
platform_PROGRAMS += zfs.module
MODULE_FILES += zfs.module$(EXEEXT)
-zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
+zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
nodist_zfs_module_SOURCES = ## platform nodist sources
zfs_module_LDADD =
zfs_module_CFLAGS = $(AM_CFLAGS) $(CFLAGS_MODULE)
@@ -32136,7 +32136,7 @@ endif
if COND_i386_ieee1275
platform_PROGRAMS += zfs.module
MODULE_FILES += zfs.module$(EXEEXT)
-zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
+zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
nodist_zfs_module_SOURCES = ## platform nodist sources
zfs_module_LDADD =
zfs_module_CFLAGS = $(AM_CFLAGS) $(CFLAGS_MODULE)
@@ -32158,7 +32158,7 @@ endif
if COND_x86_64_efi
platform_PROGRAMS += zfs.module
MODULE_FILES += zfs.module$(EXEEXT)
-zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
+zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
nodist_zfs_module_SOURCES = ## platform nodist sources
zfs_module_LDADD =
zfs_module_CFLAGS = $(AM_CFLAGS) $(CFLAGS_MODULE)
@@ -32180,7 +32180,7 @@ endif
if COND_mips_loongson
platform_PROGRAMS += zfs.module
MODULE_FILES += zfs.module$(EXEEXT)
-zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
+zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
nodist_zfs_module_SOURCES = ## platform nodist sources
zfs_module_LDADD =
zfs_module_CFLAGS = $(AM_CFLAGS) $(CFLAGS_MODULE)
@@ -32202,7 +32202,7 @@ endif
if COND_sparc64_ieee1275
platform_PROGRAMS += zfs.module
MODULE_FILES += zfs.module$(EXEEXT)
-zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
+zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
nodist_zfs_module_SOURCES = ## platform nodist sources
zfs_module_LDADD =
zfs_module_CFLAGS = $(AM_CFLAGS) $(CFLAGS_MODULE)
@@ -32224,7 +32224,7 @@ endif
if COND_powerpc_ieee1275
platform_PROGRAMS += zfs.module
MODULE_FILES += zfs.module$(EXEEXT)
-zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
+zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
nodist_zfs_module_SOURCES = ## platform nodist sources
zfs_module_LDADD =
zfs_module_CFLAGS = $(AM_CFLAGS) $(CFLAGS_MODULE)
@@ -32246,7 +32246,7 @@ endif
if COND_mips_arc
platform_PROGRAMS += zfs.module
MODULE_FILES += zfs.module$(EXEEXT)
-zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
+zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
nodist_zfs_module_SOURCES = ## platform nodist sources
zfs_module_LDADD =
zfs_module_CFLAGS = $(AM_CFLAGS) $(CFLAGS_MODULE)
@@ -32268,7 +32268,7 @@ endif
if COND_ia64_efi
platform_PROGRAMS += zfs.module
MODULE_FILES += zfs.module$(EXEEXT)
-zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
+zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
nodist_zfs_module_SOURCES = ## platform nodist sources
zfs_module_LDADD =
zfs_module_CFLAGS = $(AM_CFLAGS) $(CFLAGS_MODULE)
@@ -32290,7 +32290,7 @@ endif
if COND_mips_qemu_mips
platform_PROGRAMS += zfs.module
MODULE_FILES += zfs.module$(EXEEXT)
-zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
+zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
nodist_zfs_module_SOURCES = ## platform nodist sources
zfs_module_LDADD =
zfs_module_CFLAGS = $(AM_CFLAGS) $(CFLAGS_MODULE)
Reference in a new issue View git blame Copy permalink