diff options
| author |   visa <visa@openbsd.org> | 2019-07-28 15:45:30 +0000 |
|---|---|---|
| committer | visa <visa@openbsd.org> | 2019-07-28 15:45:30 +0000 |
| commit | 71181cf612fe94d115b41b3bd6b45d6de6124ea8 (patch) | |
| tree | a27b30aa7712ef97b4112f9d04b18a835158de44 | |
| parent | Add a dedicated ramdisk entry for the octeon bootloader to reduce (diff) | |
| download | wireguard-openbsd-71181cf612fe94d115b41b3bd6b45d6de6124ea8.tar.xz wireguard-openbsd-71181cf612fe94d115b41b3bd6b45d6de6124ea8.zip | |
Link octeon bootloader to the build.
OK deraadt@
| -rw-r--r-- | distrib/octeon/Makefile | 5 | ||||
| -rw-r--r-- | etc/etc.octeon/Makefile.inc | 4 | ||||
| -rw-r--r-- | sys/arch/octeon/Makefile | 3 | ||||
| -rw-r--r-- | sys/arch/octeon/stand/Makefile | 8 | ||||
| -rw-r--r-- | sys/arch/octeon/stand/rdboot/Makefile | 10 |
5 files changed, 16 insertions, 14 deletions
diff --git a/distrib/octeon/Makefile b/distrib/octeon/Makefile index ba1e6b62b19..446059794ee 100644 --- a/distrib/octeon/Makefile +++ b/distrib/octeon/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.3 2019/04/30 17:46:05 deraadt Exp $ +# $OpenBSD: Makefile,v 1.4 2019/07/28 15:45:30 visa Exp $ -SUBDIR= ramdisk +SUBDIR= boot ramdisk unconfig: + cd boot; ${MAKE} unconfig cd ramdisk; ${MAKE} unconfig .include <bsd.subdir.mk> diff --git a/etc/etc.octeon/Makefile.inc b/etc/etc.octeon/Makefile.inc index cfac89617a3..8748b623ab1 100644 --- a/etc/etc.octeon/Makefile.inc +++ b/etc/etc.octeon/Makefile.inc @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile.inc,v 1.4 2015/06/13 18:22:57 jasper Exp $ +# $OpenBSD: Makefile.inc,v 1.5 2019/07/28 15:45:30 visa Exp $ KERNELS += GENERIC.MP bsd.mp bootblocks: # None yet. -MDEXT= bsd.rd miniroot${OSrev}.fs +MDEXT= boot bsd.rd miniroot${OSrev}.fs diff --git a/sys/arch/octeon/Makefile b/sys/arch/octeon/Makefile index c6964fd88cf..92749dfe740 100644 --- a/sys/arch/octeon/Makefile +++ b/sys/arch/octeon/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2017/01/22 03:27:31 tb Exp $ +# $OpenBSD: Makefile,v 1.9 2019/07/28 15:45:30 visa Exp $ .include <bsd.own.mk> # for KEEPKERNELS @@ -13,6 +13,7 @@ TAGS= ${.CURDIR}/tags NOPROG= NOMAN= NOOBJ= +SUBDIR= stand .if !defined(KEEPKERNELS) || !(make(clean) || make(cleandir)) SUBDIR+=compile .endif diff --git a/sys/arch/octeon/stand/Makefile b/sys/arch/octeon/stand/Makefile index 14be3455386..cead237a45e 100644 --- a/sys/arch/octeon/stand/Makefile +++ b/sys/arch/octeon/stand/Makefile @@ -1,9 +1,5 @@ -# $OpenBSD: Makefile,v 1.2 2013/06/05 01:32:10 jasper Exp $ +# $OpenBSD: Makefile,v 1.3 2019/07/28 15:45:30 visa Exp $ -.if ${MACHINE} == "octeon" -SUBDIR += libsa -.endif - -SUBDIR += boot +SUBDIR += rdboot .include <bsd.subdir.mk> diff --git a/sys/arch/octeon/stand/rdboot/Makefile b/sys/arch/octeon/stand/rdboot/Makefile index 38f01e78ef6..c6d3e966a9b 100644 --- a/sys/arch/octeon/stand/rdboot/Makefile +++ b/sys/arch/octeon/stand/rdboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2019/07/17 14:36:32 visa Exp $ +# $OpenBSD: Makefile,v 1.2 2019/07/28 15:45:30 visa Exp $ NOMAN= @@ -7,10 +7,14 @@ PROG= rdboot SRCS= cmd.c disk.c rdboot.c vars.c LDADD+= -lutil LDSTATIC+= -static + +realinstall: + cd ${.CURDIR}/../../../../../distrib/octeon/boot && ${MAKE} bsd.rd + ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${.CURDIR}/../../../../../distrib/octeon/boot/obj/bsd.rd \ + ${DESTDIR}/usr/mdec/boot .else NOPROG= .endif -install: - .include <bsd.prog.mk> |