svn commit: r376537 - in head/sysutils: grub2-efi grub2-efi/files grub2-pcbsd grub2-pcbsd/files

[Kris Moore]

Author: kmoore
Date: Thu Jan  8 14:41:53 2015
New Revision: 376537
URL: https://svnweb.freebsd.org/changeset/ports/376537
QAT: https://qat.redports.org/buildarchive/r376537/

Log:
  - Add patch to fix providing the full pathname for kernel + modules
    This fixes using dtrace when booting from grub, and perhaps others
    that expect full pathname in kldstat(2)
  - Bump PORTREV

Added:
  head/sysutils/grub2-efi/files/patch-grub-core_loader_i386_bsd.c   (contents, props changed)
  head/sysutils/grub2-pcbsd/files/patch-grub-core_loader_i386_bsd.c   (contents, props changed)
Modified:
  head/sysutils/grub2-efi/Makefile
  head/sysutils/grub2-pcbsd/Makefile

Modified: head/sysutils/grub2-efi/Makefile
==============================================================================
--- head/sysutils/grub2-efi/Makefile	Thu Jan  8 14:39:11 2015	(r376536)
+++ head/sysutils/grub2-efi/Makefile	Thu Jan  8 14:41:53 2015	(r376537)
@@ -3,7 +3,7 @@
 
 PORTNAME=	grub2-efi
 PORTVERSION=	2.02
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.pcbsd.org/~kris/software/ \
 		ftp://ftp.pcbsd.org/pub/software/

Added: head/sysutils/grub2-efi/files/patch-grub-core_loader_i386_bsd.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/grub2-efi/files/patch-grub-core_loader_i386_bsd.c	Thu Jan  8 14:41:53 2015	(r376537)
@@ -0,0 +1,20 @@
+diff --git grub-core/loader/i386/bsd.c grub-core/loader/i386/bsd.c
+index 8f691e0..8c7decd 100644
+--- grub-core/loader/i386/bsd.c
++++ grub-core/loader/i386/bsd.c
+@@ -415,11 +415,14 @@ grub_freebsd_add_meta_module (const char *filename, const char *type,
+ 			      grub_addr_t addr, grub_uint32_t size)
+ {
+   const char *name;
+-  name = grub_strrchr (filename, '/');
++ /* Don't strip the full path, some FreeBSD functionality, such
++  * as dtrace, rely on this. Instead only strip out the portion after ZFS @ sign */
++  name = grub_strrchr (filename, '@');
+   if (name)
+     name++;
+   else
+     name = filename;
++
+   if (grub_strcmp (type, "/boot/zfs/zpool.cache") == 0)
+     name = "/boot/zfs/zpool.cache";
+ 

Modified: head/sysutils/grub2-pcbsd/Makefile
==============================================================================
--- head/sysutils/grub2-pcbsd/Makefile	Thu Jan  8 14:39:11 2015	(r376536)
+++ head/sysutils/grub2-pcbsd/Makefile	Thu Jan  8 14:41:53 2015	(r376537)
@@ -3,7 +3,7 @@
 
 PORTNAME=	grub2-pcbsd
 PORTVERSION=	2.02p
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	sysutils
 MASTER_SITES=   http://www.pcbsd.org/~kris/software/ \
 		ftp://ftp.pcbsd.org/pub/software/

Added: head/sysutils/grub2-pcbsd/files/patch-grub-core_loader_i386_bsd.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/grub2-pcbsd/files/patch-grub-core_loader_i386_bsd.c	Thu Jan  8 14:41:53 2015	(r376537)
@@ -0,0 +1,20 @@
+diff --git grub-core/loader/i386/bsd.c grub-core/loader/i386/bsd.c
+index 8f691e0..8c7decd 100644
+--- grub-core/loader/i386/bsd.c
++++ grub-core/loader/i386/bsd.c
+@@ -415,11 +415,14 @@ grub_freebsd_add_meta_module (const char *filename, const char *type,
+ 			      grub_addr_t addr, grub_uint32_t size)
+ {
+   const char *name;
+-  name = grub_strrchr (filename, '/');
++ /* Don't strip the full path, some FreeBSD functionality, such
++  * as dtrace, rely on this. Instead only strip out the portion after ZFS @ sign */
++  name = grub_strrchr (filename, '@');
+   if (name)
+     name++;
+   else
+     name = filename;
++
+   if (grub_strcmp (type, "/boot/zfs/zpool.cache") == 0)
+     name = "/boot/zfs/zpool.cache";
+