Date: Sun, 8 Jul 2018 07:42:59 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336085 - in head/stand: common i386/libi386 i386/loader ofw/libofw sparc64/loader userboot/userboot Message-ID: <201807080742.w687gxcg093905@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Sun Jul 8 07:42:58 2018 New Revision: 336085 URL: https://svnweb.freebsd.org/changeset/base/336085 Log: Stop using ../zfs/libzfs.h but instead use libzfs.h. While ../zfs/libzfs.h mostly works, there are a few situations where it does not. Eliminate the problem by using plain libzfs.h, like we do for ufs support. This fixes the weird cases, and is easier to understand. It also follows the general style convetion of avoiding ../ in #includes. Modified: head/stand/common/zfs_cmd.c head/stand/i386/libi386/Makefile head/stand/i386/libi386/devicename.c head/stand/i386/loader/conf.c head/stand/i386/loader/main.c head/stand/ofw/libofw/Makefile head/stand/ofw/libofw/devicename.c head/stand/sparc64/loader/main.c head/stand/userboot/userboot/conf.c head/stand/userboot/userboot/devicename.c head/stand/userboot/userboot/main.c Modified: head/stand/common/zfs_cmd.c ============================================================================== --- head/stand/common/zfs_cmd.c Sun Jul 8 07:42:49 2018 (r336084) +++ head/stand/common/zfs_cmd.c Sun Jul 8 07:42:58 2018 (r336085) @@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$"); #include "bootstrap.h" #ifdef LOADER_ZFS_SUPPORT -#include "../zfs/libzfs.h" +#include "libzfs.h" #endif COMMAND_SET(lszfs, "lszfs", "list child datasets of a zfs dataset", Modified: head/stand/i386/libi386/Makefile ============================================================================== --- head/stand/i386/libi386/Makefile Sun Jul 8 07:42:49 2018 (r336084) +++ head/stand/i386/libi386/Makefile Sun Jul 8 07:42:58 2018 (r336085) @@ -14,6 +14,7 @@ SRCS= biosacpi.c bioscd.c biosdisk.c biosmem.c biospnp smbios.c time.c vidconsole.c amd64_tramp.S spinconsole.c .PATH: ${ZFSSRC} SRCS+= devicename_stubs.c +CFLAGS+= -I${ZFSSRC} BOOT_COMCONSOLE_PORT?= 0x3f8 CFLAGS+= -DCOMPORT=${BOOT_COMCONSOLE_PORT} Modified: head/stand/i386/libi386/devicename.c ============================================================================== --- head/stand/i386/libi386/devicename.c Sun Jul 8 07:42:49 2018 (r336084) +++ head/stand/i386/libi386/devicename.c Sun Jul 8 07:42:58 2018 (r336085) @@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$"); #include "bootstrap.h" #include "disk.h" #include "libi386.h" -#include "../zfs/libzfs.h" +#include "libzfs.h" static int i386_parsedev(struct i386_devdesc **dev, const char *devspec, const char **path); Modified: head/stand/i386/loader/conf.c ============================================================================== --- head/stand/i386/loader/conf.c Sun Jul 8 07:42:49 2018 (r336084) +++ head/stand/i386/loader/conf.c Sun Jul 8 07:42:58 2018 (r336085) @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <bootstrap.h> #include "libi386/libi386.h" #if defined(LOADER_ZFS_SUPPORT) -#include "../zfs/libzfs.h" +#include "libzfs.h" #endif /* Modified: head/stand/i386/loader/main.c ============================================================================== --- head/stand/i386/loader/main.c Sun Jul 8 07:42:49 2018 (r336084) +++ head/stand/i386/loader/main.c Sun Jul 8 07:42:58 2018 (r336085) @@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$"); #include "btxv86.h" #ifdef LOADER_ZFS_SUPPORT -#include "../zfs/libzfs.h" +#include "libzfs.h" #endif CTASSERT(sizeof(struct bootargs) == BOOTARGS_SIZE); Modified: head/stand/ofw/libofw/Makefile ============================================================================== --- head/stand/ofw/libofw/Makefile Sun Jul 8 07:42:49 2018 (r336084) +++ head/stand/ofw/libofw/Makefile Sun Jul 8 07:42:58 2018 (r336085) @@ -9,6 +9,7 @@ SRCS= devicename.c ofw_console.c ofw_copy.c ofw_disk.c ofw_time.c openfirm.c .PATH: ${ZFSSRC} SRCS+= devicename_stubs.c +CFLAGS+= -I${ZFSSRC} # Pick up the bootstrap header for some interface items CFLAGS+= -I${LDRSRC} Modified: head/stand/ofw/libofw/devicename.c ============================================================================== --- head/stand/ofw/libofw/devicename.c Sun Jul 8 07:42:49 2018 (r336084) +++ head/stand/ofw/libofw/devicename.c Sun Jul 8 07:42:58 2018 (r336085) @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include "bootstrap.h" #include "libofw.h" -#include "../zfs/libzfs.h" +#include "libzfs.h" static int ofw_parsedev(struct ofw_devdesc **, const char *, const char **); Modified: head/stand/sparc64/loader/main.c ============================================================================== --- head/stand/sparc64/loader/main.c Sun Jul 8 07:42:49 2018 (r336084) +++ head/stand/sparc64/loader/main.c Sun Jul 8 07:42:58 2018 (r336085) @@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$"); #include <sys/types.h> #ifdef LOADER_ZFS_SUPPORT #include <sys/vtoc.h> -#include "../zfs/libzfs.h" +#include "libzfs.h" #endif #include <vm/vm.h> Modified: head/stand/userboot/userboot/conf.c ============================================================================== --- head/stand/userboot/userboot/conf.c Sun Jul 8 07:42:49 2018 (r336084) +++ head/stand/userboot/userboot/conf.c Sun Jul 8 07:42:58 2018 (r336085) @@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$"); #include "libuserboot.h" #if defined(USERBOOT_ZFS_SUPPORT) -#include "../zfs/libzfs.h" +#include "libzfs.h" #endif /* Modified: head/stand/userboot/userboot/devicename.c ============================================================================== --- head/stand/userboot/userboot/devicename.c Sun Jul 8 07:42:49 2018 (r336084) +++ head/stand/userboot/userboot/devicename.c Sun Jul 8 07:42:58 2018 (r336085) @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$"); #include "libuserboot.h" #if defined(USERBOOT_ZFS_SUPPORT) -#include "../zfs/libzfs.h" +#include "libzfs.h" #endif static int userboot_parsedev(struct disk_devdesc **dev, const char *devspec, const char **path); Modified: head/stand/userboot/userboot/main.c ============================================================================== --- head/stand/userboot/userboot/main.c Sun Jul 8 07:42:49 2018 (r336084) +++ head/stand/userboot/userboot/main.c Sun Jul 8 07:42:58 2018 (r336085) @@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$"); #include "libuserboot.h" #if defined(USERBOOT_ZFS_SUPPORT) -#include "../zfs/libzfs.h" +#include "libzfs.h" static void userboot_zfs_probe(void); static int userboot_zfs_found;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807080742.w687gxcg093905>