aboutsummaryrefslogtreecommitdiff
path: root/stand
diff options
context:
space:
mode:
Diffstat (limited to 'stand')
-rw-r--r--stand/Makefile.inc2
-rw-r--r--stand/libsa/Makefile4
-rw-r--r--stand/userboot/Makefile.inc4
3 files changed, 8 insertions, 2 deletions
diff --git a/stand/Makefile.inc b/stand/Makefile.inc
index 5d55c4e4a16f..2866ebd20af3 100644
--- a/stand/Makefile.inc
+++ b/stand/Makefile.inc
@@ -1,5 +1,7 @@
SUBDIR_PARALLEL= yes
+PACKAGE= bootloader
+
# Firmware may not be able to handle branch protection failures
MK_BRANCH_PROTECTION= no
diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile
index f5a1acea843e..470c03032f61 100644
--- a/stand/libsa/Makefile
+++ b/stand/libsa/Makefile
@@ -189,9 +189,9 @@ SRCS+= g_eli_hmac.c pkcs5v2.c
.PATH: ${SYSDIR}/crypto/sha2
SRCS+= sha256c.c sha512c.c
-# md5 from the kernel
-.PATH: ${SYSDIR}/kern
+.PATH: ${SYSDIR}/crypto
SRCS+= md5c.c
+CFLAGS.md5c.c+= -DSTANDALONE_SMALL
.if ${DO32:U0} == 0
MAN=libsa.3
diff --git a/stand/userboot/Makefile.inc b/stand/userboot/Makefile.inc
index 01b5f23410c8..392fd59a115f 100644
--- a/stand/userboot/Makefile.inc
+++ b/stand/userboot/Makefile.inc
@@ -1 +1,5 @@
.include "../Makefile.inc"
+
+# userboot.so should be installed in the base bootloader package,
+# not bootloader-dev.
+NO_DEV_PACKAGE=