svn commit: r208431 - in stable/8: sbin/geom/class/part
sys/geom/part sys/sys
Dmitry Morozovsky
marck at rinet.ru
Sun May 23 13:25:48 UTC 2010
On Sun, 23 May 2010, Nathan Whitehorn wrote:
NW> Author: nwhitehorn
NW> Date: Sun May 23 02:40:04 2010
NW> New Revision: 208431
NW> URL: http://svn.freebsd.org/changeset/base/208431
NW>
NW> Log:
NW> MFC r200557,208173:
NW>
NW> Teach gpart about bootcode on APM.
It seems stable/8 is now broken at building geom_part_apm module:
===> geom/geom_part/geom_part_apm (all)
cc -O2 -pipe -fno-strict-aliasing -Werror -D_KERNEL -DKLD_MODULE -nostdinc
-DHAVE_KERNEL_OPTION_HEADERS -include
/usr/obj/FreeBSD/src.8/sys/GENERIC/opt_global.h -I. -I@ -I@/contrib/altq
-finline-limit=8000 --param inline-unit-growth=100 --param
large-function-growth=1000 -fno-common -g -fno-omit-frame-pointer
-I/usr/obj/FreeBSD/src.8/sys/GENERIC -mcmodel=kernel -mno-red-zone
-mfpmath=387 -mno-sse -mno-sse2 -mno-sse3 -mno-mmx -mno-3dnow -msoft-float
-fno-asynchronous-unwind-tables -ffreestanding -fstack-protector
-std=iso9899:1999 -fstack-protector -Wall -Wredundant-decls -Wnested-externs
-Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual
-Wundef -Wno-pointer-sign -fformat-extensions -c
/FreeBSD/src.8/sys/modules/geom/geom_part/geom_part_apm/../../../../geom/part/g_part_apm.c
/FreeBSD/src.8/sys/modules/geom/geom_part/geom_part_apm/../../../../geom/part/g_part_apm.c:
In function 'apm_parse_type':
/FreeBSD/src.8/sys/modules/geom/geom_part/geom_part_apm/../../../../geom/part/g_part_apm.c:131:
error: 'G_PART_ALIAS_APPLE_BOOT' undeclared (first use in this function)
/FreeBSD/src.8/sys/modules/geom/geom_part/geom_part_apm/../../../../geom/part/g_part_apm.c:131:
error: (Each undeclared identifier is reported only once
/FreeBSD/src.8/sys/modules/geom/geom_part/geom_part_apm/../../../../geom/part/g_part_apm.c:131:
error: for each function it appears in.)
/FreeBSD/src.8/sys/modules/geom/geom_part/geom_part_apm/../../../../geom/part/g_part_apm.c:141:
error: 'G_PART_ALIAS_APPLE_UFS' undeclared (first use in this function)
/FreeBSD/src.8/sys/modules/geom/geom_part/geom_part_apm/../../../../geom/part/g_part_apm.c:
In function 'g_part_apm_type':
/FreeBSD/src.8/sys/modules/geom/geom_part/geom_part_apm/../../../../geom/part/g_part_apm.c:453:
error: 'G_PART_ALIAS_APPLE_BOOT' undeclared (first use in this function)
/FreeBSD/src.8/sys/modules/geom/geom_part/geom_part_apm/../../../../geom/part/g_part_apm.c:457:
error: 'G_PART_ALIAS_APPLE_UFS' undeclared (first use in this function)
*** Error code 1
NW> NW> Modified: NW> stable/8/sbin/geom/class/part/geom_part.c
NW> stable/8/sys/geom/part/g_part_apm.c
NW> stable/8/sys/sys/apm.h
NW> Directory Properties:
NW> stable/8/sbin/geom/ (props changed)
NW> stable/8/sbin/geom/class/stripe/ (props changed)
NW> stable/8/sys/ (props changed)
NW> stable/8/sys/amd64/include/xen/ (props changed)
NW> stable/8/sys/cddl/contrib/opensolaris/ (props changed)
NW> stable/8/sys/contrib/dev/acpica/ (props changed)
NW> stable/8/sys/contrib/pf/ (props changed)
NW> stable/8/sys/dev/xen/xenpci/ (props changed)
NW> stable/8/sys/geom/sched/ (props changed)
NW>
NW> Modified: stable/8/sbin/geom/class/part/geom_part.c
NW> ==============================================================================
NW> --- stable/8/sbin/geom/class/part/geom_part.c Sun May 23 02:32:52 2010 (r208430)
NW> +++ stable/8/sbin/geom/class/part/geom_part.c Sun May 23 02:40:04 2010 (r208431)
NW> @@ -602,7 +602,7 @@ gpart_bootcode(struct gctl_req *req, uns
NW>
NW> if (gctl_has_param(req, bootcode_param)) {
NW> s = gctl_get_ascii(req, bootcode_param);
NW> - bootsize = 64 * 1024; /* Arbitrary limit. */
NW> + bootsize = 800 * 1024; /* Arbitrary limit. */
NW> bootcode = gpart_bootfile_read(s, &bootsize);
NW> error = gctl_change_param(req, bootcode_param, bootsize,
NW> bootcode);
NW>
NW> Modified: stable/8/sys/geom/part/g_part_apm.c
NW> ==============================================================================
NW> --- stable/8/sys/geom/part/g_part_apm.c Sun May 23 02:32:52 2010 (r208430)
NW> +++ stable/8/sys/geom/part/g_part_apm.c Sun May 23 02:40:04 2010 (r208431)
NW> @@ -128,6 +128,26 @@ apm_parse_type(const char *type, char *b
NW> strncpy(buf, type, bufsz);
NW> return (0);
NW> }
NW> + alias = g_part_alias_name(G_PART_ALIAS_APPLE_BOOT);
NW> + if (!strcasecmp(type, alias)) {
NW> + strcpy(buf, APM_ENT_TYPE_APPLE_BOOT);
NW> + return (0);
NW> + }
NW> + alias = g_part_alias_name(G_PART_ALIAS_APPLE_HFS);
NW> + if (!strcasecmp(type, alias)) {
NW> + strcpy(buf, APM_ENT_TYPE_APPLE_HFS);
NW> + return (0);
NW> + }
NW> + alias = g_part_alias_name(G_PART_ALIAS_APPLE_UFS);
NW> + if (!strcasecmp(type, alias)) {
NW> + strcpy(buf, APM_ENT_TYPE_APPLE_UFS);
NW> + return (0);
NW> + }
NW> + alias = g_part_alias_name(G_PART_ALIAS_FREEBSD_BOOT);
NW> + if (!strcasecmp(type, alias)) {
NW> + strcpy(buf, APM_ENT_TYPE_APPLE_BOOT);
NW> + return (0);
NW> + }
NW> alias = g_part_alias_name(G_PART_ALIAS_FREEBSD);
NW> if (!strcasecmp(type, alias)) {
NW> strcpy(buf, APM_ENT_TYPE_FREEBSD);
NW> @@ -429,6 +449,12 @@ g_part_apm_type(struct g_part_table *bas
NW>
NW> entry = (struct g_part_apm_entry *)baseentry;
NW> type = entry->ent.ent_type;
NW> + if (!strcmp(type, APM_ENT_TYPE_APPLE_BOOT))
NW> + return (g_part_alias_name(G_PART_ALIAS_APPLE_BOOT));
NW> + if (!strcmp(type, APM_ENT_TYPE_APPLE_HFS))
NW> + return (g_part_alias_name(G_PART_ALIAS_APPLE_HFS));
NW> + if (!strcmp(type, APM_ENT_TYPE_APPLE_UFS))
NW> + return (g_part_alias_name(G_PART_ALIAS_APPLE_UFS));
NW> if (!strcmp(type, APM_ENT_TYPE_FREEBSD))
NW> return (g_part_alias_name(G_PART_ALIAS_FREEBSD));
NW> if (!strcmp(type, APM_ENT_TYPE_FREEBSD_SWAP))
NW>
NW> Modified: stable/8/sys/sys/apm.h
NW> ==============================================================================
NW> --- stable/8/sys/sys/apm.h Sun May 23 02:32:52 2010 (r208430)
NW> +++ stable/8/sys/sys/apm.h Sun May 23 02:40:04 2010 (r208431)
NW> @@ -61,6 +61,8 @@ struct apm_ent {
NW> #define APM_ENT_TYPE_FREEBSD_VINUM "FreeBSD-Vinum"
NW> #define APM_ENT_TYPE_FREEBSD_ZFS "FreeBSD-ZFS"
NW>
NW> +#define APM_ENT_TYPE_APPLE_BOOT "Apple_Bootstrap"
NW> #define APM_ENT_TYPE_APPLE_HFS "Apple_HFS"
NW> +#define APM_ENT_TYPE_APPLE_UFS "Apple_UNIX_SVR2"
NW>
NW> #endif /* _SYS_APM_H_ */
NW> _______________________________________________
NW> svn-src-all at freebsd.org mailing list
NW> http://lists.freebsd.org/mailman/listinfo/svn-src-all
NW> To unsubscribe, send any mail to "svn-src-all-unsubscribe at freebsd.org"
NW>
--
Sincerely,
D.Marck [DM5020, MCK-RIPE, DM3-RIPN]
[ FreeBSD committer: marck at FreeBSD.org ]
------------------------------------------------------------------------
*** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- marck at rinet.ru ***
------------------------------------------------------------------------
More information about the svn-src-all
mailing list