Commit Graph

74 Commits

Author SHA1 Message Date
dougb
1b7168ad86 The change to add subversion ID has two problems. The first is that when
newvers.sh is run pwd is actually the obj directory, so "../../.svn"
doesn't exist and the test always fails. The second is that buildkernel
is executed with a restrictive PATH, so unless you have svnversion in
/bin or /usr/bin it can't run.

Fix this by looking for svnversion in /bin, /usr/bin, and /usr/local/bin
in that order. If found, store the location and derive the value of the
source directory. Then run svnversion in the appropriate directory.

There is one possible refinement which would be to add a test for
LOCALBASE!=/usr/local if we don't find svnversion the first time, but
IMO that's not necessary at this time.
2008-06-08 19:46:23 +00:00
phk
b7b2e13417 If we can find it, include SVN version number in kernel version strings.
See also: http://www.bikeshed.org/
2008-06-07 09:49:57 +00:00
kensmith
c80a7cd238 To honor the birth of RELENG_7 bump HEAD to 8.0-CURRENT.
Approved by:	re (implicit)
2007-10-11 04:28:08 +00:00
cperciva
53f5361a40 Pad the strings sccs[], version[], and osrelease[] up to a minimum of
128 bytes, 256 bytes, and 32 bytes respectively.  This makes it much
easier to identify when two kernels are identical apart from a version
number bump (as often happens on security branches).

Discussed on:	freebsd-arch, in May 2005
2005-08-19 01:49:15 +00:00
scottl
cab029400d Make the RELENG_6 branch operation official by moving HEAD to 7.0-CURRENT.
Approved by: re
2005-07-11 08:34:49 +00:00
jhb
2523f63590 Fix what(1) on kernel binaries by duplicating part of version[] in sccs[]
and stop trying to play cute games so that sccs[] shares space with
version[].

Reported by:	Jilles Tjoelker jilles at stack dot nl
Discussed with:	bde, "R. Imura" imura at ryu16 dot org
Idea from:	NetBSD (via bde)
Approved by:	re (scottl)
MFC after:	1 week
2005-07-01 15:43:09 +00:00
ru
6f0bb99740 If USER of HOSTNAME is set to an empty value, use the fallback value.
Submitted by:	marck
2005-01-15 13:25:41 +00:00
trhodes
484b5dcecd Give up on trying to please everyone and restore 1.64 with regards to
dealing with sudo users.
2005-01-14 18:13:56 +00:00
trhodes
0361a4b247 Improve previous commit with regards to the user check.
Submitted by:	nectar
2005-01-13 00:21:38 +00:00
trhodes
197ad7c3b9 Reflect reality when a sudo user builds/installs a kernel. [1]
/* -> /*- for copyright notices. [2]

[1]:
PR:		41317
Submitted by:	marck (original version)

[2]:
Discussed with:	imp
2005-01-12 21:28:25 +00:00
ru
a4752ef7b0 Pass the idea of the make(1) binary to use down to newvers.sh.
This is necessary so source upgrades use the correct binary.

MFC after:	3 days

For the record: Problem spotted by Scott Long, who mentioned
that source upgrades from 4.7 to recent 5.x and 6.0 are broken.
Detailed analysis shows that 4.7 has a broken make(1) binary.
A breakage was fixed in RELENG_4 in make/main.c,v 1.35.2.7 by
imp@, though the commit log erroneously stated "MFC 1.68"
while in fact it should have been spelled as "MFC 1.67".
2004-09-17 09:17:33 +00:00
scottl
02e483dd36 HEAD is now 6-CURRENT 2004-08-18 00:21:12 +00:00
ps
268ac8d0b8 When building a kernel or the loader, let the hostname be overridden 2004-07-01 06:40:12 +00:00
imp
b49b7fe799 Remove advertising clause from University of California Regent's
license, per letter dated July 22, 1999 and email from Peter Wemm,
Alan Cox and Robert Watson.

Approved by: core, peter, alc, rwatson
2004-04-07 20:46:16 +00:00
ru
354564e949 Stay in sync with src/COPYRIGHT and src/sys/sys/copyright.h,
and put the starting year of the project into the copyright.
2004-01-11 14:13:29 +00:00
ru
a7dfeddaf7 Properly fix the FreeBSD copyright.
Pointed by:	scottl
2004-01-10 16:24:22 +00:00
ru
81048a3975 s/FreeBSD Inc./The FreeBSD Foundation/g 2004-01-10 15:38:47 +00:00
scottl
21f6404bdb HEAD is at 5.2-CURRENT now 2003-12-07 03:56:12 +00:00
scottl
5e7a1979e6 Move us into 5.2-BETA 2003-11-22 06:04:12 +00:00
peter
843fb5fa73 ARGH. I *knew* I'd eventually accidently commit this. Change 5.1-XP back
to 5.1-CURRENT.
2003-07-23 20:07:49 +00:00
peter
d2d693aa23 Provide a knob for raising the inline instruction estimate threshold and
set an initial value.  This is aimed at getting us closer to being able to
turn -Werror back on and we can adjust the settings later on.  Yes, we
could turn off -Wno-inline instead, but that would hide the effect of
gcc's bogo-estimator ignoring inline (either rightly or wrongly).
2003-07-23 20:03:42 +00:00
jmallett
2f59062691 Attempt to fix Alpha build by renaming ident[] to kern_ident[]. 2003-06-09 18:19:33 +00:00
jmallett
f315e03eaf Make kernel identification (`ident' in the config(8) driver) available to
userland, and the kernel.  In the kernel by way of the 'ident[]' variable
akin to all the other stuff generated by newvers.sh.  In userland it is
available to sysctl consumers via KERN_IDENT or 'kern.ident'.  It is exported
by uname(1) by the -i flag.

Reviewed by:	hackers@
2003-06-09 09:38:20 +00:00
scottl
dfed809574 We are at 5.1-CURRENT now 2003-06-02 04:58:43 +00:00
scottl
4963dbef47 We are now in 5.1-BETA 2003-05-06 03:55:24 +00:00
murray
add83e3b73 HEAD reverts to 5.0-CURRENT
RELENG_5_0 is 5.0-RC
5.0-RELEASE will be built off of the RELENG_5_0 branch
2002-12-13 08:47:15 +00:00
murray
a07d11f79d Welcome to 5.0-RC.
Approved by:	re
2002-12-05 05:27:49 +00:00
ru
3e8d7346e8 setlocale(3) has been fixed to match POSIX standard:
LC_ALL takes precedence over other LC_* envariables.
2001-03-02 16:52:14 +00:00
jkh
8a85dfc7bd SNAPDATE is an obsolete mechanism which has also been pretty much
of a no-op all along anyway.  There are other ways to set this
for release building, so nuke it.

PR:	22979
2000-12-15 22:26:42 +00:00
jkh
eeed1bb150 Welcome to 5.0-current!
"First commit" claimed by:	jkh :)
2000-03-13 09:13:01 +00:00
peter
3b842d34e8 $Id$ -> $FreeBSD$ 1999-08-28 01:08:13 +00:00
jkh
d58be4a80e The following simplifies newvers.sh somewhat and makes what(1) work with
kernels again, now that we're using EGCS/GCC 2.9+. This "here"
file is compatible with the Bourne shell and the Korn shell (incl. pdksh
and KSH93 from AT&T, which I do have), so it doesn't make newvers.sh
unportable, but makes it easier to modify in the future/read now.

Submitted by:		green
1999-08-08 07:51:16 +00:00
jkh
e1a2cb0a33 This is now 4.0-current 1999-01-21 03:07:33 +00:00
wosch
692a15ffe3 The kernel should compile even /dev/null does not exists. 1998-11-01 15:36:20 +00:00
jkh
ef590ab720 Back to -current again. 1998-10-16 06:55:36 +00:00
jkh
f6a4576494 Change to 3.0-RELEASE in anticipation of the tag. 1998-10-16 02:08:20 +00:00
jkh
b8141a2f66 Note that we're in BETA status. 1998-09-19 11:45:37 +00:00
eivind
dd22670484 Move __FreeBSD_version from src/sys/conf/newvers.sh to
src/sys/sys/param.h, to facilitate access from the kernel.  This make
it possible to do outside kernel development and have it actually work
properly.
1998-05-21 19:21:46 +00:00
eivind
5f4e516680 Back out previous commit - it breaks when called from 'buildworld' :-(
(Damn, I wanted that in the -snap).
1998-05-20 20:54:10 +00:00
eivind
7535afa645 Move __FreeBSD_version into <sys/param.h> (with automated duplication
to <osreldate.h>).  This allow kernel drivers access to it.

Approved by:	-current
1998-05-20 20:35:42 +00:00
jdp
0f3d4fc289 Increment RELDATE so that it is possible to distinguish between the
incompatible old and new forms of mount(2).
1997-09-24 04:36:19 +00:00
wosch
45d57b586f Delete $Id$ line from copyright.
Submitted: Bruce
1997-07-09 20:38:19 +00:00
peter
94b6d72794 Back out part 1 of the MCFH that changed $Id$ to $FreeBSD$. We are not
ready for it yet.
1997-02-22 09:48:43 +00:00
asami
e14e57c697 Set RELDATE=300000. With the parallel version development, it has
become impractical to distinguish versions using "real" release dates, so
might as well make it correspond to real version number (-current is
on the 3.0 branch) so at least the feature increments are guaranteed to
be linear.

Silently approved by:	current list
1997-02-19 06:05:48 +00:00
jkh
808a36ef65 Make the long-awaited change from $Id$ to $FreeBSD$
This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore.  This update would have been
insane otherwise.
1997-01-14 07:20:47 +00:00
ache
5a915103a4 Replace LC_TIME= with LC_TIME=C 1996-11-26 06:55:35 +00:00
asami
2d01bd1cba I'm not going to whine to Jordan anymore, since he seems to be busy with
the other two trees.  Bump RELDATE to Feb 1997, one greater than 2.2.
Now I can go update my porting.sgml.

NOT a 2.2 candidate, in case phk's wondering. :)
1996-11-15 09:19:22 +00:00
phk
53b1df78e8 Set REVISION=3.0 and RELDATE=199701 1996-11-03 12:04:05 +00:00
jkh
e5e444ee58 Yikes! This must have fallen in with a mass-commit by mistake.
Put RELEASE back.
Pointed-out-by: peter
1996-10-11 14:35:10 +00:00
jkh
92667e3313 Multiple changes stacked as one commit since they all depend on one another.
First, change sysinstall and the Makefile rules to not build the kernel
nlist directly into sysinstall now.  Instead, spit it out as an ascii
file in /stand and parse it from sysinstall later.  This solves the chicken-n-
egg problem of building sysinstall into the fsimage before BOOTMFS is built
and can have its symbols extracted.  Now we generate the symbol file in
release.8.

Second, add Poul-Henning's USERCONFIG_BOOT changes.  These have two
effects:

	1. Userconfig is always entered, rather than only after a -c
	   (don't scream yet, it's not as bad as it sounds).

	2. Userconfig reads a message string which can optionally be
	   written just past the boot blocks.  This string "preloads"
	   the userconfig input buffer and is parsed as user input.
	   If the first command is not "USERCONFIG", userconfig will
	   treat this as an implied "quit" (which is why you don't need
	   to scream - you never even know you went through userconfig
	   and back out again if you don't specifically ask for it),
	   otherwise it will read and execute the following commands
	   until a "quit" is seen or the end is reached, in which case
	   the normal userconfig command prompt will then be presented.

  How to create your own startup sequences, using any boot.flp image
from the next snap forward (not yet, but soon):

	% dd of=/dev/rfd0 seek=1 bs=512 count=1 conv=sync <<WAKKA_WAKKA_DOO
USERCONFIG
irq ed0 10
iomem ed0 0xcc000
disable ed1
quit
WAKKA_WAKKA_DOO


Third, add an intro screen to UserConfig so that users aren't just thrown
into this strange screen if userconfig is auto-launched.  The default
boot.flp startup sequence is now, in fact, this:

	USERCONFIG
	intro
	visual

(Since visual never returns, we don't need a following "quit").

Submitted-By: phk & jkh
1996-10-05 10:44:07 +00:00