svn commit: r263924 - head/usr.bin/mkimg

[Marcel Moolenaar]

Author: marcel
Date: Sat Mar 29 22:10:54 2014
New Revision: 263924
URL: http://svnweb.freebsd.org/changeset/base/263924

Log:
  Fix build on FreeBSD 8 where partition types for nandfs do not exist.

Modified:
  head/usr.bin/mkimg/apm.c
  head/usr.bin/mkimg/bsd.c
  head/usr.bin/mkimg/gpt.c
  head/usr.bin/mkimg/vtoc8.c

Modified: head/usr.bin/mkimg/apm.c
==============================================================================
--- head/usr.bin/mkimg/apm.c	Sat Mar 29 22:02:25 2014	(r263923)
+++ head/usr.bin/mkimg/apm.c	Sat Mar 29 22:10:54 2014	(r263924)
@@ -38,6 +38,10 @@ __FBSDID("$FreeBSD$");
 #include "mkimg.h"
 #include "scheme.h"
 
+#ifndef APM_ENT_TYPE_FREEBSD_NANDFS
+#define	APM_ENT_TYPE_FREEBSD_NANDFS	"FreeBSD-nandfs"
+#endif
+
 static struct mkimg_alias apm_aliases[] = {
     {	ALIAS_FREEBSD, ALIAS_PTR2TYPE(APM_ENT_TYPE_FREEBSD) },
     {	ALIAS_FREEBSD_NANDFS, ALIAS_PTR2TYPE(APM_ENT_TYPE_FREEBSD_NANDFS) },

Modified: head/usr.bin/mkimg/bsd.c
==============================================================================
--- head/usr.bin/mkimg/bsd.c	Sat Mar 29 22:02:25 2014	(r263923)
+++ head/usr.bin/mkimg/bsd.c	Sat Mar 29 22:10:54 2014	(r263924)
@@ -38,6 +38,10 @@ __FBSDID("$FreeBSD$");
 #include "mkimg.h"
 #include "scheme.h"
 
+#ifndef FS_NANDFS
+#define	FS_NANDFS	30
+#endif
+
 static struct mkimg_alias bsd_aliases[] = {
     {	ALIAS_FREEBSD_NANDFS, ALIAS_INT2TYPE(FS_NANDFS) },
     {	ALIAS_FREEBSD_SWAP, ALIAS_INT2TYPE(FS_SWAP) },

Modified: head/usr.bin/mkimg/gpt.c
==============================================================================
--- head/usr.bin/mkimg/gpt.c	Sat Mar 29 22:02:25 2014	(r263923)
+++ head/usr.bin/mkimg/gpt.c	Sat Mar 29 22:10:54 2014	(r263924)
@@ -42,6 +42,11 @@ __FBSDID("$FreeBSD$");
 #include "mkimg.h"
 #include "scheme.h"
 
+#ifndef GPT_ENT_TYPE_FREEBSD_NANDFS
+#define	GPT_ENT_TYPE_FREEBSD_NANDFS	\
+    {0x74ba7dd9,0xa689,0x11e1,0xbd,0x04,{0x00,0xe0,0x81,0x28,0x6a,0xcf}}
+#endif
+
 static uuid_t gpt_uuid_efi = GPT_ENT_TYPE_EFI;
 static uuid_t gpt_uuid_freebsd = GPT_ENT_TYPE_FREEBSD;
 static uuid_t gpt_uuid_freebsd_boot = GPT_ENT_TYPE_FREEBSD_BOOT;

Modified: head/usr.bin/mkimg/vtoc8.c
==============================================================================
--- head/usr.bin/mkimg/vtoc8.c	Sat Mar 29 22:02:25 2014	(r263923)
+++ head/usr.bin/mkimg/vtoc8.c	Sat Mar 29 22:10:54 2014	(r263924)
@@ -39,6 +39,10 @@ __FBSDID("$FreeBSD$");
 #include "mkimg.h"
 #include "scheme.h"
 
+#ifndef VTOC_TAG_FREEBSD_NANDFS
+#define	VTOC_TAG_FREEBSD_NANDFS	0x0905
+#endif
+
 static struct mkimg_alias vtoc8_aliases[] = {
     {	ALIAS_FREEBSD_NANDFS, ALIAS_INT2TYPE(VTOC_TAG_FREEBSD_NANDFS) },
     {	ALIAS_FREEBSD_SWAP, ALIAS_INT2TYPE(VTOC_TAG_FREEBSD_SWAP) },