Date: Wed, 31 Mar 2010 18:18:38 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r205994 - head/tools/tools/nanobsd/gateworks Message-ID: <201003311818.o2VIIcco084836@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Wed Mar 31 18:18:37 2010 New Revision: 205994 URL: http://svn.freebsd.org/changeset/base/205994 Log: 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 Modified: head/tools/tools/nanobsd/gateworks/common Modified: head/tools/tools/nanobsd/gateworks/common ============================================================================== --- head/tools/tools/nanobsd/gateworks/common Wed Mar 31 17:47:57 2010 (r205993) +++ head/tools/tools/nanobsd/gateworks/common Wed Mar 31 18:18:37 2010 (r205994) @@ -37,7 +37,7 @@ NANO_CUSTOMIZE="$NANO_CUSTOMIZE cust_ins 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() {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003311818.o2VIIcco084836>