Browse Source

Separate the dynamic variables

When setting non-default values in a custom config, the dynamic
variables are already set based on the defaults. This commit makes the
dynamic variables respect the values from the config.

Signed-off-by:	Shawn Webb <shawn.webb@hardenedbsd.org>
pull/4/head
Shawn Webb 11 months ago
parent
commit
0a617f4e1b
Signed by: shawn.webb <shawn.webb@hardenedbsd.org> GPG Key ID: FF2E67A277F8E1FA
2 changed files with 8 additions and 2 deletions
  1. +2
    -0
      bin/ci.sh
  2. +6
    -2
      lib/config.sh

+ 2
- 0
bin/ci.sh View File

@@ -57,6 +57,8 @@ main() {
esac
done

config_set_dynamic

(
assert_unlocked && \
lock_build && \


+ 6
- 2
lib/config.sh View File

@@ -39,8 +39,12 @@ config_set_defaults() {
HBSD_NOCLEAN="-DNO_CLEAN"
HBSD_LOGDIR=/build/logs/13-current.amd64

HBSD_BUILDNUMBER=$(build_number)
HBSD_BUILD_LOG=${HBSD_LOGDIR}/${HBSD_BUILDNUMBER}.log
return 0
}

config_set_dynamic() {
HBSD_BUILDNUMBER=${HBSD_BUILDNUMBER:-$(build_number)}
HBSD_BUILD_LOG=${HBSD_BUILD_LOG:-${HBSD_LOGDIR}/${HBSD_BUILDNUMBER}.log}

HBSD_OBJRELDIR="$(make -C ${HBSD_SRC} -V .OBJDIR)/release"



Loading…
Cancel
Save