Commit | Date | |
---|---|---|
[r9076]
(342 Bytes)
by
yaberauneya
Merge changes from trunk to 8.0.3 This doesn't include the changes to nano_env to avoid pulling in a lot of Also, do the one-stop-shop image creation process at the end of the build Some of the included changes for [build/nanobsd] are as follows... ------------------------------------------------------------------------ Apply the super secret delphij method to remove /tmp in the event that it has stuff in it (in particular if someone setup the core dump format string to point to somewhere in /tmp.. hehe). ------------------------------------------------------------------------ Missed an option. Agh. ------------------------------------------------------------------------ How quaint. Apparently I wasn't the only person to forget adding a continuation operator ('\') at the end of the line. Unbreak this. ------------------------------------------------------------------------ r8499 was a good idea, but unfortunately -- as one discovers with a clean tree -- nanobsd.sh only overrides MODULES_OVERRIDE for installkernel and not buildkernel. So installkernel bombs today with a clean tree. Fun. Move NANO_MODULES to build/nano_env to avoid polluting nanobsd.sh with too many local changes that can't or shouldn't be pushed back upstream to FreeBSD. Part of the reason why I created it :). Also, remove MODULES_OVERRIDE from the KERNCONF. This gets us closer to GENERIC, and looks much cleaner. ------------------------------------------------------------------------ Move the specification of which kernel modules to build from the kernel config files to nanobsd configs Fix the late customize nanobsd command. ------------------------------------------------------------------------ One more cosmetic typo fix following up on r8466. ------------------------------------------------------------------------ Resolve the chicken and egg problem with r8450 by sourcing the files before checking the value of ${MAKEOBJDIRPREFIX}, etc.. otherwise we'll be putting files in /usr/obj, etc. Document MAKEOBJDIRPREFIX in nanobsd.sh as well. ------------------------------------------------------------------------ Commit the draft 2 patch for PR 160896: This patch does the following items: 1. Drops getopt in favor of getopts builtin handling. This is preferred as getopt is deprecated by POSIX. These enhancements were based on some of the code present in the FreeNAS sourcebase. ------------------------------------------------------------------------ Commit fix for PR 160443: The current incarnation of nanobsd doesn't deal with src.conf properly. In particular, src.conf is included before make.conf, s.t. if SRCCONF is defined in __MAKE_CONF, builds with become non-deterministic and the point of specifying SRCCONF=/dev/null will become null and moot. The following also adds an environmental knob so people can specify $SRCCONF, if they desire. ------------------------------------------------------------------------ Merge changes from upstream: r222535 - imp: Don't need (and can't use) -L to copy links here. r221877 - imp: Restore BOOT2CFG, accidentally removed in r212938. PR: 157020 r221856 - imp: If there's no package directory, don't try to install packages from PR: misc/140436 r221852 - imp: Add ${} around variable dereference... Submitted by: garrett coopper (seriously.. my name is Garrett Cooper -_-) r221851 - imp: Implement -f to inhibit copying s1 partition out for speed. PR: misc/151698 r221850 - imp: Copy symbolic links as files rather than recreating the links. PR: misc/151697 r220091 - mr: Use ${NANO_WORLDDIR}/var/empty as copy source since it has no schg flag set. r216929 - imp: Bump the media size from approx 600MB to approx 750MB. The great Submitted by: phk r216928 - imp: Put in the other half of the SRCCONF patch. Submitted by: phk r216145 - imp: o Mount the device async when we're doing the copy. Submitted by: n_hibma r216144 - imp: _WITHOUT_SRCCONF has too much baggage. Instead, use the simpler r215070 - imp: Insulate the nanobsd build from the current system by opting out of Noted by: gcopper@ (I don't rust.. well, ok.. I am Washingtonian, so maybe I do) r215070 - imp: Build make.conf when the world is not selected to build, but the PR: 151696 r215069 - imp: Document NANO_CFGDIR and NANO_DATADIR Submitted by: n_hibma@ r214955 - n_hibma: - Set -x flag when executing customisation scripts to aid in debugging them. Reviewed by: imp r212990 - imp: Make the labels match the device name that's mounted, not just the Pointy hat to: imp@ r212938 - imp: Support new variable NANO_LABEL. When set to a non-null string, There is no change if you don't set this variable. ------------------------------------------------------------------------ Patch r218528 from upstream. imp - Add 'generic' flash images. This is for projects producing generic ------------------------------------------------------------------------ Add the 8.2.0 copy of nanobsd to maintain local copy (and get out of the patch hell we've been working with for the past while as we're basically synched up against CURRENT in nanobsd.sh, etc). Suggested by: jpaetzel
renamed from
/trunk/build/functions.sh
|
2011-12-11 21:41:20 |
View
Download |