compile error in stable?

[Mike Burgett]

I synced up sources today, did buildworld, and when trying to build my
kernel, I got the following error, which is actually copied from an
attempted build of a GENERIC kernel.


===> geom/geom_part (all)
===> 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/usr/src/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/usr/src/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 /usr/src/sys/modules/geom/geom_part/geom_part_apm/../../../../geom/part/g_part_apm.c
/usr/src/sys/modules/geom/geom_part/geom_part_apm/../../../../geom/part/g_part_apm.c: In function 'apm_parse_type':
/usr/src/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)
/usr/src/sys/modules/geom/geom_part/geom_part_apm/../../../../geom/part/g_part_apm.c:131: error: (Each undeclared identifier is reported only once
/usr/src/sys/modules/geom/geom_part/geom_part_apm/../../../../geom/part/g_part_apm.c:131: error: for each function it appears in.)
/usr/src/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)
/usr/src/sys/modules/geom/geom_part/geom_part_apm/../../../../geom/part/g_part_apm.c: In function 'g_part_apm_type':
/usr/src/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)
/usr/src/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
1 error

from /usr/src/sys/geom/g_part.h :

enum g_part_alias {
        G_PART_ALIAS_APPLE_HFS,         /* An HFS file system entry. */
        G_PART_ALIAS_EFI,               /* A EFI system partition entry. */
        G_PART_ALIAS_FREEBSD,           /* A BSD labeled partition entry. */
        G_PART_ALIAS_FREEBSD_BOOT,      /* A FreeBSD boot partition entry. */
        G_PART_ALIAS_FREEBSD_SWAP,      /* A swap partition entry. */
        G_PART_ALIAS_FREEBSD_UFS,       /* A UFS/UFS2 file system entry. */
        G_PART_ALIAS_FREEBSD_VINUM,     /* A Vinum partition entry. */
        G_PART_ALIAS_FREEBSD_ZFS,       /* A ZFS file system entry. */
        G_PART_ALIAS_MBR,               /* A MBR (extended) partition entry. */
        /* Keep the following last */
        G_PART_ALIAS_COUNT
};

        alias = g_part_alias_name(G_PART_ALIAS_APPLE_BOOT);
        if (!strcasecmp(type, alias)) {
                strcpy(buf, APM_ENT_TYPE_APPLE_BOOT);
                return (0);
        }
        alias = g_part_alias_name(G_PART_ALIAS_APPLE_HFS);
        if (!strcasecmp(type, alias)) {
                strcpy(buf, APM_ENT_TYPE_APPLE_HFS);
                return (0);
        }
        alias = g_part_alias_name(G_PART_ALIAS_APPLE_UFS);
        if (!strcasecmp(type, alias)) {
                strcpy(buf, APM_ENT_TYPE_APPLE_UFS);
                return (0);
        }
        alias = g_part_alias_name(G_PART_ALIAS_FREEBSD_BOOT);

I've even completely deleted /usr/src and /usr/obj, re-supped and
rebuilt world, with the same results.

 * $FreeBSD: src/sys/geom/part/g_part.h,v 1.14.2.1 2009/08/03 08:13:06 kensmith Exp $

__FBSDID("$FreeBSD: src/sys/geom/part/g_part_apm.c,v 1.11.2.2 2010/05/23 02:40:04 nwhitehorn Exp $");


uname -a
FreeBSD smaug.awen.com 8.0-STABLE FreeBSD 8.0-STABLE #7: Sun Apr  4
13:15:24 PDT 2010     mburgett at smaug.awen.com:/usr/obj/usr/src/sys/AWEN  amd64

I did a quick search of the mailing list archives, but no hits.

Any suggestions, or did the tree get broken?

-- 
Thanks,
Mike                          mailto:mburgett at awen.com