Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 24 Jan 2021 04:58:47 GMT
From:      Kyle Evans <kevans@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 3c136581b69d - stable/12 - Move stand/ofw/libofw to stand/libofw.
Message-ID:  <202101240458.10O4wl7I059630@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by kevans:

URL: https://cgit.FreeBSD.org/src/commit/?id=3c136581b69d7fbcb1e2e36add31f69487ba1b65

commit 3c136581b69d7fbcb1e2e36add31f69487ba1b65
Author:     Brandon Bergren <bdragon@FreeBSD.org>
AuthorDate: 2020-01-02 04:34:22 +0000
Commit:     Kyle Evans <kevans@FreeBSD.org>
CommitDate: 2021-01-24 04:58:40 +0000

    Move stand/ofw/libofw to stand/libofw.
    
    Since rS330365, there has been no particular reason for libofw to be in a
    subdirectory of ofw. Move libofw up a level to make it fit in better with
    the other top level libraries.
    
    Also add a LIBOFWSRC to stand/defs.mk to match what all the other
    libraries are doing.
    
    (cherry picked from commit 475008d6ca47ccb2b4baca59a37421d95916d2ba)
---
 stand/Makefile                       | 2 +-
 stand/defs.mk                        | 1 +
 stand/{ofw => }/libofw/Makefile      | 0
 stand/{ofw => }/libofw/devicename.c  | 0
 stand/{ofw => }/libofw/libofw.h      | 0
 stand/{ofw => }/libofw/ofw_console.c | 0
 stand/{ofw => }/libofw/ofw_copy.c    | 0
 stand/{ofw => }/libofw/ofw_disk.c    | 0
 stand/{ofw => }/libofw/ofw_memory.c  | 0
 stand/{ofw => }/libofw/ofw_module.c  | 0
 stand/{ofw => }/libofw/ofw_net.c     | 0
 stand/{ofw => }/libofw/ofw_reboot.c  | 0
 stand/{ofw => }/libofw/ofw_time.c    | 0
 stand/{ofw => }/libofw/openfirm.c    | 0
 stand/{ofw => }/libofw/openfirm.h    | 0
 stand/ofw/Makefile                   | 5 -----
 stand/ofw/Makefile.inc               | 3 ---
 stand/powerpc/ofw/Makefile           | 4 ++--
 stand/sparc64/loader/Makefile        | 4 ++--
 19 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/stand/Makefile b/stand/Makefile
index bc50e1bfb736..bacf39e26eca 100644
--- a/stand/Makefile
+++ b/stand/Makefile
@@ -16,7 +16,7 @@ S.${MK_FORTH}+=		forth
 S.${MK_LOADER_LUA}+=	liblua
 S.${MK_LOADER_LUA}+=	lua
 S.${MK_FDT}+=		fdt
-S.${MK_LOADER_OFW}+=	ofw
+S.${MK_LOADER_OFW}+=	libofw
 S.yes+=			defaults
 S.yes+=			man
 
diff --git a/stand/defs.mk b/stand/defs.mk
index 6ae9069664ac..514a6c9b98dc 100644
--- a/stand/defs.mk
+++ b/stand/defs.mk
@@ -28,6 +28,7 @@ FDTSRC=		${BOOTSRC}/fdt
 FICLSRC=	${BOOTSRC}/ficl
 LDRSRC=		${BOOTSRC}/common
 LIBLUASRC=	${BOOTSRC}/liblua
+LIBOFWSRC=	${BOOTSRC}/libofw
 LUASRC=		${SRCTOP}/contrib/lua/src
 SASRC=		${BOOTSRC}/libsa
 SYSDIR=		${SRCTOP}/sys
diff --git a/stand/ofw/libofw/Makefile b/stand/libofw/Makefile
similarity index 100%
rename from stand/ofw/libofw/Makefile
rename to stand/libofw/Makefile
diff --git a/stand/ofw/libofw/devicename.c b/stand/libofw/devicename.c
similarity index 100%
rename from stand/ofw/libofw/devicename.c
rename to stand/libofw/devicename.c
diff --git a/stand/ofw/libofw/libofw.h b/stand/libofw/libofw.h
similarity index 100%
rename from stand/ofw/libofw/libofw.h
rename to stand/libofw/libofw.h
diff --git a/stand/ofw/libofw/ofw_console.c b/stand/libofw/ofw_console.c
similarity index 100%
rename from stand/ofw/libofw/ofw_console.c
rename to stand/libofw/ofw_console.c
diff --git a/stand/ofw/libofw/ofw_copy.c b/stand/libofw/ofw_copy.c
similarity index 100%
rename from stand/ofw/libofw/ofw_copy.c
rename to stand/libofw/ofw_copy.c
diff --git a/stand/ofw/libofw/ofw_disk.c b/stand/libofw/ofw_disk.c
similarity index 100%
rename from stand/ofw/libofw/ofw_disk.c
rename to stand/libofw/ofw_disk.c
diff --git a/stand/ofw/libofw/ofw_memory.c b/stand/libofw/ofw_memory.c
similarity index 100%
rename from stand/ofw/libofw/ofw_memory.c
rename to stand/libofw/ofw_memory.c
diff --git a/stand/ofw/libofw/ofw_module.c b/stand/libofw/ofw_module.c
similarity index 100%
rename from stand/ofw/libofw/ofw_module.c
rename to stand/libofw/ofw_module.c
diff --git a/stand/ofw/libofw/ofw_net.c b/stand/libofw/ofw_net.c
similarity index 100%
rename from stand/ofw/libofw/ofw_net.c
rename to stand/libofw/ofw_net.c
diff --git a/stand/ofw/libofw/ofw_reboot.c b/stand/libofw/ofw_reboot.c
similarity index 100%
rename from stand/ofw/libofw/ofw_reboot.c
rename to stand/libofw/ofw_reboot.c
diff --git a/stand/ofw/libofw/ofw_time.c b/stand/libofw/ofw_time.c
similarity index 100%
rename from stand/ofw/libofw/ofw_time.c
rename to stand/libofw/ofw_time.c
diff --git a/stand/ofw/libofw/openfirm.c b/stand/libofw/openfirm.c
similarity index 100%
rename from stand/ofw/libofw/openfirm.c
rename to stand/libofw/openfirm.c
diff --git a/stand/ofw/libofw/openfirm.h b/stand/libofw/openfirm.h
similarity index 100%
rename from stand/ofw/libofw/openfirm.h
rename to stand/libofw/openfirm.h
diff --git a/stand/ofw/Makefile b/stand/ofw/Makefile
deleted file mode 100644
index 3b881b780e87..000000000000
--- a/stand/ofw/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-SUBDIR=		libofw
-
-.include <bsd.subdir.mk>
diff --git a/stand/ofw/Makefile.inc b/stand/ofw/Makefile.inc
deleted file mode 100644
index 265f86d1ed55..000000000000
--- a/stand/ofw/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $FreeBSD$
-
-.include "../Makefile.inc"
diff --git a/stand/powerpc/ofw/Makefile b/stand/powerpc/ofw/Makefile
index de5d5e01037a..35c9d4ae546f 100644
--- a/stand/powerpc/ofw/Makefile
+++ b/stand/powerpc/ofw/Makefile
@@ -39,8 +39,8 @@ CFLAGS+=	-DRELOC=${RELOC}
 LDFLAGS=	-nostdlib -static -T ${.CURDIR}/ldscript.powerpc
 
 # Open Firmware standalone support library
-LIBOFW=		${BOOTOBJ}/ofw/libofw/libofw.a
-CFLAGS+=	-I${BOOTSRC}/ofw/libofw
+LIBOFW=		${BOOTOBJ}/libofw/libofw.a
+CFLAGS+=	-I${BOOTSRC}/libofw
 
 DPADD=		${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA}
 LDADD=		${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA}
diff --git a/stand/sparc64/loader/Makefile b/stand/sparc64/loader/Makefile
index 7bc2ee5aa9fa..c85093c0745a 100644
--- a/stand/sparc64/loader/Makefile
+++ b/stand/sparc64/loader/Makefile
@@ -47,8 +47,8 @@ LINKS=		${BINDIR}/loader ${BINDIR}/zfsloader
 .endif
 
 # Open Firmware standalone support library
-LIBOFW=		${BOOTOBJ}/ofw/libofw/libofw.a
-CFLAGS+=	-I${BOOTSRC}/ofw/libofw/
+LIBOFW=		${BOOTOBJ}/libofw/libofw.a
+CFLAGS+=	-I${BOOTSRC}/libofw
 
 DPADD=		${LDR_INTERP} ${LIBOFW} ${LIBSA}
 LDADD=		${LDR_INTERP} ${LIBOFW} ${LIBSA}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101240458.10O4wl7I059630>