Menu

/branches/8.0.3/build/functions.sh Commit Log


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
unnecessary changes, and I've limited the FREENAS* KERNCONFs to just remove
the MODULES_OVERRIDE lines and place them in freenas-common (similar to, but
not the same as what's done in nano_env). I'm doing this primarily to pull in
r8778 as the 8.0.3-BETA1 images are borked (/tmp is an md, not a symlink to
/var/tmp) due to the fact that they were built on build.ix, not
streetfighter.ix (which doesn't have the coredump format string sysctl set).

Also, do the one-stop-shop image creation process at the end of the build
like is currently being done on trunk to prevent potential for human error
when posting images to various places :).

Some of the included changes for [build/nanobsd] are as follows...

------------------------------------------------------------------------
r8778 | yaberauneya | 2011-11-22 17:59:42 -0800 (Tue, 22 Nov 2011) | 2 lines

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).

------------------------------------------------------------------------
r8513 | yaberauneya | 2011-10-28 21:07:29 -0700 (Fri, 28 Oct 2011) | 2 lines

Missed an option. Agh.

------------------------------------------------------------------------
r8508 | yaberauneya | 2011-10-28 16:08:59 -0700 (Fri, 28 Oct 2011) | 4 lines

How quaint. Apparently I wasn't the only person to forget adding a continuation operator ('\') at the end of the line.

Unbreak this.

------------------------------------------------------------------------
r8507 | yaberauneya | 2011-10-28 16:06:17 -0700 (Fri, 28 Oct 2011) | 6 lines

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.

------------------------------------------------------------------------
r8499 | jhixson | 2011-10-28 13:19:06 -0700 (Fri, 28 Oct 2011) | 1 line

Move the specification of which kernel modules to build from the kernel config files to nanobsd configs
------------------------------------------------------------------------
r8471 | yaberauneya | 2011-10-27 11:12:11 -0700 (Thu, 27 Oct 2011) | 2 lines

Fix the late customize nanobsd command.

------------------------------------------------------------------------
r8470 | yaberauneya | 2011-10-27 11:04:10 -0700 (Thu, 27 Oct 2011) | 2 lines

One more cosmetic typo fix following up on r8466.

------------------------------------------------------------------------
r8451 | yaberauneya | 2011-10-26 18:16:03 -0700 (Wed, 26 Oct 2011) | 4 lines

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.

------------------------------------------------------------------------
r8450 | yaberauneya | 2011-10-26 16:52:36 -0700 (Wed, 26 Oct 2011) | 10 lines

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.
2. Adds a -j option so that users can specify -j via the command line, which is passed to make.
3. Delays the sourcing of the nanobsd config_file so that users can depend on already on internal variables that are set later, like $NANO_MAKE_CONF_BUILD . This makes it possible for developers to depend on this file.

These enhancements were based on some of the code present in the FreeNAS sourcebase.

------------------------------------------------------------------------
r8449 | yaberauneya | 2011-10-26 16:24:32 -0700 (Wed, 26 Oct 2011) | 6 lines

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.

------------------------------------------------------------------------
r8448 | yaberauneya | 2011-10-26 16:12:11 -0700 (Wed, 26 Oct 2011) | 128 lines

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
it. Instead, report that 0 packages are reported.

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.
(-z not taken from PR, it is no longer needed since we basically always
do that now)

PR: misc/151698
Submitted by: lev@

r221850 - imp:

Copy symbolic links as files rather than recreating the links.

PR: misc/151697
Submitted by: lev@
MFC after: 2 weeks

r220091 - mr:

Use ${NANO_WORLDDIR}/var/empty as copy source since it has no schg flag set.
Copying over /var/empty's schg flag had unpleasant side effects (schg flag on /etc and /cfg) during nanobsd boot before.

r216929 - imp:

Bump the media size from approx 600MB to approx 750MB. The great
hob-nailed tennis shoe of progress demands it!

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.
o Create a sparse file instead of a fully zerod one. This trades the
possibiltiy of running out of space during the build for the speed
gain not having do write all those zeros...

Submitted by: n_hibma

r216144 - imp:

_WITHOUT_SRCCONF has too much baggage. Instead, use the simpler
SRCCONF=/dev/null.

r215070 - imp:

Insulate the nanobsd build from the current system by opting out of
the SRCCONF processing.

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
kernel is.

PR: 151696
Submitted by: lev@

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.
- Use KERNCONFDIR with KERNCONF instead of copying the kernel config into the source tree
so included kernel configs work.
- Put more stuff in the _.bk/_.ik log file, not just make statements.
- Add the kernel config name to the pprint during kernel installation.
- Add NANO_MODULES providing a list of modules to build and install.

Reviewed by: imp
MFC after: 2 weeks

r212990 - imp:

Make the labels match the device name that's mounted, not just the
slice they are on. When NANO_LABEL is not defined, the fstab
generates entries that specify /dev/ad0s1a. When NANO_LABEL is
defined, it generates /dev/usb/${NANO_LABEL}s1a. The prior code
created the file system with a label of ${NANO_LABEL}s1, leading to
problems on boot.

Pointy hat to: imp@

r212938 - imp:

Support new variable NANO_LABEL. When set to a non-null string,
nanobsd will build a system that uses this label (via
/dev/ufs/${NANO_LABEL}sX) in preference to NANO_DRIVE (well, it forces
NANO_DRIVE to be ufs/${NANO_LABEL}). This allows images that will
boot off usb stick or CF card easily well.

There is no change if you don't set this variable.

------------------------------------------------------------------------
r8447 | yaberauneya | 2011-10-26 15:55:12 -0700 (Wed, 26 Oct 2011) | 7 lines

Patch r218528 from upstream.

imp - Add 'generic' flash images. This is for projects producing generic
images that are of a certain size. The geometery is bogus, but that
doesn't matter since the new packet mode onviates the need to get the
geometry right.

------------------------------------------------------------------------
r8446 | yaberauneya | 2011-10-26 15:52:40 -0700 (Wed, 26 Oct 2011) | 4 lines

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

2011-12-11 21:41:20 View
Download
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.