From owner-dev-commits-src-branches@freebsd.org Sun Jan 24 04:58:47 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D8EE04ECEEB; Sun, 24 Jan 2021 04:58:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DNgkb5p16z4Vjl; Sun, 24 Jan 2021 04:58:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B9E2D1DBE7; Sun, 24 Jan 2021 04:58:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 10O4wleQ059631; Sun, 24 Jan 2021 04:58:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10O4wl7I059630; Sun, 24 Jan 2021 04:58:47 GMT (envelope-from git) Date: Sun, 24 Jan 2021 04:58:47 GMT Message-Id: <202101240458.10O4wl7I059630@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 3c136581b69d - stable/12 - Move stand/ofw/libofw to stand/libofw. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 3c136581b69d7fbcb1e2e36add31f69487ba1b65 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Jan 2021 04:58:47 -0000 The branch stable/12 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=3c136581b69d7fbcb1e2e36add31f69487ba1b65 commit 3c136581b69d7fbcb1e2e36add31f69487ba1b65 Author: Brandon Bergren AuthorDate: 2020-01-02 04:34:22 +0000 Commit: Kyle Evans 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 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}