diff options
| author | imp <imp@FreeBSD.org> | 2010-03-31 18:18:37 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2010-03-31 18:18:37 +0000 |
| commit | e62c77fe41c3665e07e23e9feb6b0352ac8844b0 (patch) | |
| tree | 8697df0be06222723c005207f7d0ebdd1a756f99 /tools | |
| parent | 8b3f44d23fac2bd1e913f667399bb16b04678075 (diff) | |
| download | FreeBSD-src-e62c77fe41c3665e07e23e9feb6b0352ac8844b0.zip FreeBSD-src-e62c77fe41c3665e07e23e9feb6b0352ac8844b0.tar.gz | |
Two fixes:
(1) We don't need a custom install_kernel. We can install without
symbols by adding INSTALL_NODEBUG (which likely should be
WITHOUT_KERNEL_SYMBOLS_FILE, or something shorter) to CONF_INSTALL
(2) for make buildenv stage, use NANO_MAKE_CONF_BUILD rather than the
non-existant NANO_MAKE_CONF.
MFC after: 7 days
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/tools/nanobsd/gateworks/common | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/tools/tools/nanobsd/gateworks/common b/tools/tools/nanobsd/gateworks/common index 750cd39..2e2d46c 100644 --- a/tools/tools/nanobsd/gateworks/common +++ b/tools/tools/nanobsd/gateworks/common @@ -37,7 +37,7 @@ NANO_CUSTOMIZE="$NANO_CUSTOMIZE cust_install_files cust_install_machine_files" buildenv() { cd ${NANO_SRC} - env TARGET_ARCH=${NANO_ARCH} __MAKE_CONF=${NANO_MAKE_CONF} \ + env TARGET_ARCH=${NANO_ARCH} __MAKE_CONF=${NANO_MAKE_CONF_BUILD} \ DESTDIR=${NANO_WORLDDIR} make buildenv } @@ -146,22 +146,9 @@ WITHOUT_TCSH=true CONF_INSTALL="$CONF_BUILD WITHOUT_TOOLCHAIN=true WITHOUT_INSTALLLIB=true +INSTALL_NODEBUG=true " -# NB: override to suppress install of kernel.symbols -install_kernel() -{ - pprint 2 "install kernel" - pprint 3 "log: ${MAKEOBJDIRPREFIX}/_.ik" - - cd ${NANO_SRC} - env TARGET_ARCH=${NANO_ARCH} ${NANO_PMAKE} installkernel \ - INSTALL_NODEBUG=true \ - DESTDIR=${NANO_WORLDDIR} \ - __MAKE_CONF=${NANO_MAKE_CONF} KERNCONF=`basename ${NANO_KERNEL}` \ - > ${MAKEOBJDIRPREFIX}/_.ik 2>&1 -} - # NB: override to force / on s1 instead of s1a setup_nanobsd_etc() { |
