summaryrefslogtreecommitdiffstats
path: root/usr.sbin/config
Commit message (Collapse)AuthorAgeFilesLines
* MFC r263429asomers2014-04-104-1/+38
| | | | | | | | | | | | | | | | | | | Fix kern/187712: config(8) does not respect KERNCONFDIR. The impact of this bug is that you cannot build a kernel if both of the following are true: 1) The kernel config file is in a non-default location 2) The kernel config file uses the "include" statement from config(5). usr.sbin/config/main.c usr.sbin/config/config.8 usr.sbin/config/config.h usr.sbin/config/lang.l Added a "-I path" option to config(8). By analogy to cc(1), it adds an extra path in which the "include" statement will search for files. Makefile.inc1 Pass "-I ${KERNCONFDIR}" to config(8).
* Work around build breakages with GCC 4.2.jkim2013-05-231-0/+1
| | | | Reported by: tinderbox
* Improve compatibility with recent flex from flex.sourceforge.net.jkim2013-05-031-3/+4
|
* Make the internal assertion correct--only fail when '\0' is found inwkoszek2013-05-011-10/+4
| | | | | | | | | | places other than the end of the test section. Otherwise, with kernel compiled with Clang which happens to be setting ELF section alignment differently config(8) was throwing assert() failure unnecessarily Reported by: Kimmo Paasiala <kpaasial (at) gmail.com> Tested by: Kimmo Paasiala <kpaasial (at) gmail.com> MFC after: 10 days
* Add the Clang specific -Wmissing-variable-declarations to WARNS=6.ed2013-04-191-0/+2
| | | | | | | | | | | | | This compiler flag enforces that that people either mark variables static or use an external declarations for the variable, similar to how -Wmissing-prototypes works for functions. Due to the fact that Yacc/Lex generate code that cannot trivially be changed to not warn because of this (lots of yy* variables), add a NO_WMISSING_VARIABLE_DECLARATIONS that can be used to turn off this specific compiler warning. Announced on: toolchain@
* Loosen restrictions for quoted strings. Now we can use more complex stringsjkim2013-03-261-2/+10
| | | | | | and "escaped" quote characters. MFC after: 1 month
* - Fix the error message when a dependency string is not provided tojhb2012-10-101-2/+2
| | | | | | | | | reference a missing dependency rather than a missing compile command. - Don't append a newline to the auto-generated compile command. The compile command has a newline appended when it is later output to the Makefile. MFC after: 2 weeks
* Fix world after byacc import:bapt2012-05-222-1/+1
| | | | | | | | - old yacc(1) use to magicially append stdlib.h, while new one don't - new yacc(1) do declare yyparse by itself, fix redundant declaration of 'yyparse' Approved by: des (mentor)
* Remove trailing whitespace per mdoc lint warningeadler2012-03-291-3/+3
| | | | | | | Disussed with: gavin No objection from: doc Approved by: joel MFC after: 3 days
* Fix copyright yearkevlo2012-01-131-1/+1
| | | | Spotted by: pluknet
* fgets(3) returns a pointer, so compare against NULL, not integer 0.kevlo2012-01-131-4/+4
|
* Replace index() and rindex() calls with strchr() and strrchr().ed2012-01-032-8/+8
| | | | | | | | | | The index() and rindex() functions were marked LEGACY in the 2001 revision of POSIX and were subsequently removed from the 2008 revision. The strchr() and strrchr() functions are part of the C standard. This makes the source code a lot more consistent, as most of these C files also call into other str*() routines. In fact, about a dozen already perform strchr() calls.
* Generate ${NORMAL_CTFCONVERT} invocation without '@' modifier:fjoe2011-11-301-1/+1
| | | | | - ${NORMAL_CC} is also invoked without '@' - Userland CTF support was changed previously to echo ctfconvert invocations too
* The generated Makefile for the kernel was not running ctfconvert onrstone2011-11-101-3/+8
| | | | | | | | | | | | | object files corresponding to source files that had the compile-with option set in conf/files. This means that any fbt probes for functions in that object file would not have correct argument types. The fix is to run ctfconvert on any target file that does not have the no-obj option set in files. PR: bin/160275 Reported by: Paul Ambrose (ambrosehua AT gmail DOT com) MFC after: 1 week
* Improve portability of config(8).ed2011-07-031-4/+5
| | | | | | | | | | | | - Use strlen(dp->d_name) instead of the unportable dp->d_namlen. Rename i to len to make it slightly more descriptive and prevent negative indexing of the array. - Replace index() by strchr(). This supposedly fixes compilation on GNU systems. Submitted by: Robert Millan <rmh debian org> (original patch) MFC after: 3 weeks
* - Merge changes to the base system to support OFED. These includejeff2011-03-212-14/+36
| | | | | a wider arg2 for sysctl, updates to vlan code, IFT_INFINIBAND, and other miscellaneous small features.
* Generate MACHINE= and MACHINE_ARCH= lines based on the machineimp2011-02-112-1/+3
| | | | | | | directive. Once this is MFC'd, we can move these out of the template files where they are (incosnsitently) defined. MFC after: 1 week
* Remove the advertising clause from UCB copyrighted files in usr.sbin. Thisjoel2010-12-111-4/+0
| | | | | is in accordance with the information provided at ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
* Move most of the remaining USD/PSD/SMM papers into share/docuqs2010-12-0413-2681/+0
|
* Don't generate input() since it's not used.brucec2010-11-221-0/+1
|
* Remove references to MAKEDEV(8)dougb2010-11-152-9/+2
|
* Fix typos.brucec2010-11-091-1/+1
| | | | | PR: bin/148894 Submitted by: olgeni
* Give the user a hint as to what config(8) is unhappy with.obrien2010-11-021-2/+2
|
* Remove support for creating the 'machine' symlink as well as creating thejhb2010-10-291-27/+0
| | | | | | | | | extra MACHINE_ARCH symlink for certain platforms (such as pc98). The support for creating these symlinks was added to sys/conf/kern.post.mk in changeset 152964. The intention of that commit was to remove this code from config(8), but config(8) was never updated. Approved by: imp
* mdoc: drop redundant .Pp calls, kill EOL whitespaceuqs2010-10-091-4/+3
|
* Allow a kernel config to specify a set but empty value viaemaste2010-09-131-0/+1
| | | | | | | | 'makeoptions OPTION=' for consistency with the make commandline. Previously 'makeoptions WERROR=' would result in a syntax error; now it produces the same effect as 'makeoptions WERROR'. Both forms now result in 'WERROR=' in the generated Makefile.
* Given the lag between introducing the options-compat and fixing theimp2010-08-151-1/+1
| | | | | | | | bug in the config file was long, and merged to stable, we have to bump the version here so that stable/8 kernels can have their required version number bumped to make sure the right config is used. MFC after: 3 days
* Turns out that it is a bad idea to have a missing compat option be aimp2010-08-151-3/+5
| | | | | | | | | | | | | fatal condition. While it works out really well for diagnosing the case where you want it, but don't have it, it works really badly for the case where you don't have it and don't want it. Remove the printf and exit pair. Replate it with simple return to silently ignore this condition. This is needed to fix the COMPAT_IA32 being required in options.* in stable, but we need to run this change through -current first... MFC after: 3 days
* Put warnings out to stderr rather than stdout.imp2010-07-153-41/+54
| | | | MFC after: 3 days
* Enhance config to handle MACHINEs with multiple architectures:nwhitehorn2010-07-134-10/+38
| | | | | | | | | | | | | - Passing -m to config will now print the MACHINE and MACHINE_ARCH given in the passed kernel configuration file and then exit. - If an option is defined in options.MACHINE with the same name as the architecture of the kernel being configured, that option will be considered set. This allows conditional compilation based on CPU architecture. Config version is now 600010. Reviewed by: imp
* style(9) fixes:imp2010-06-131-5/+3
| | | | | | | | | o make cmd scoped to the whole do_rules function, since it really is scoped to the whole fucnion. Making it static was the wrong way to fix referencing it outside of the block in which it was declared (and conforms to the style of the rest of the file). o remove a couple of meaningless blank lines o properly wrap one line.
* sparc64, and possibly other architectures, pads the length of theimp2010-05-011-7/+11
| | | | | | | | section holding the config file to sh_addralign bytes using NULs. This bogusly triggers an assert. Break out of the loop when we hit an NUL within that many bytes of the end. MFC after: 3 days
* Require the option that's mapped be listed in the options file. Thisimp2010-04-271-9/+28
| | | | | | | | | | | | | | | | | will allow people with old config options to either have it just work (if config is new enough), or get a version error (if their config is about 7.0 or newer) rather than getting a cryptic error about duplicated options in the options file, or getting an error about an unknown option, at which point they'd update their config file only to learn they need a new config, only to learn they didn't really need to update their config file... All this because our version checking was in the wrong place for the past decade... # hopefully this is the last change, and we'll be able to config with an # 8.0 GENERIC file on stable/8 after I merge this change and add the # compat options. MFC after: 3 days
* Redo how we add compat options so as to be compatible with oldimp2010-04-272-78/+81
| | | | | | | | | | | | | | versions of config. Remove support for the syntax OLD = NEW form the options file, and instead have a new file $S/conf/options-compat. This file will be parsed as OLD NEW on each line. Bump version of config. Since nothing in -current ever used this, there's no hazards for current users, so I'm not bumping the version in the Makefiles.$MACHINE. No need, really, for this version bump in -current, but this was introduced into -stable before I realized the version check was ineffective there, so the verison bump doesn't hurt here and keeps the two branches in sync, versionwise, after the MFC. MFC after: 3 days
* Move checking the version up from Makefile generation to just afterimp2010-04-273-24/+62
| | | | | | | | | | | | | | | | | | | | | | | | we've parsed the config file. Makefile generation is too late if we've introduce changes to the syntax of the metafiles to warn about version skew, since we have to try to parse them and we get an parse error that's rather baffling to the user rather than a 'your config is too old, upgrade' which we should get. We have to defer doing it until after we've read the user's config file because we define machinename there. The version required to compile the kernel is encoded in Makefile.machinename. There's no real reason for this to be the case, but changing it now would introduce some logistical issues that I'd rather avoid for the moment. I intend to revisit this if we're still using config in FreeBSD 10. This also means that we cannot introduce any config metafile changes that result in a syntax error or other error for the user until 9.0 is released. Otherwise, we break the upgrade path, or at least reduce the usefulness of the error messages we generate. # This implies that the config file option mapping will need to be redone. MFC after: 3 days
* Revert r206179 (by imp) and do something similar which is more consistentnetchild2010-04-221-1/+1
| | | | | | | | | | with all other corresponding CTF places by changing the corresponding code which is generated by config(8). Or in short, move the '@' from the variable definition to the use of the variable. [1] While I'm here break up a long line. [2] Discussed with: imp [1,2], bde [2]
* Bump minor version of config to reflect the new option remappingimp2010-04-201-1/+1
| | | | | | | | | | | | | feature. The kernel makefiles have specifically not been bumped because nothing uses this new feature and doing so forces everybody to recompile for no good reason. This chnage will be MFC'd where the kernel version numbers for amd64 and ia64 will be bumped, since those are the only two that have use the option remapping feature. Once merged, this will give a better error message to folks that are using buildkernel without buildworld or kernel-toolchain to update their kernels. MFC after: 3 days
* Allow option aliasing. Lines of the form:imp2010-04-152-1/+28
| | | | | | | | | | | | OLD_OPT = NEW_OPT in options* files will now map OLD_OPT to NEW_OPT with a friendly message. This is indented for situations where we need to preserve an interface in the config file in an upwards compatible fashion on a stable branch. Reviewed by: nwhitehorn@ MFC after: 3 days
* - Handle calloc() allocation failures.ru2010-03-305-9/+36
| | | | | | | | | - Fixed a comment. - 2 -> EXIT_FAILURE in some places. - errx() -> err() where appropriate. PR: 144644 Submitted by: Garrett Cooper
* The last big commit: let usr.sbin/ use WARNS=6 by default.ed2010-01-021-1/+0
|
* ANSIfy almost all applications that use WARNS=6.ed2009-12-291-1/+1
| | | | | | | I was considering committing all these patches one by one, but as discussed with brooks@, there is no need to do this. If we ever need/want to merge these changes back, it is still possible to do this per application.
* Move the comment to it's correct place.wkoszek2009-02-071-5/+5
|
* Remove leftover of alpha support for config(8)--we have MAP_FAILEDwkoszek2009-02-071-3/+0
| | | | globally defined.
* Make config -x <kernel> only return non-zero characters,wkoszek2009-02-061-2/+13
| | | | | | | | | | so that: config -x <kernel> | grep <something> just works. Reported by: Danny Braniss <danny@cs.huji.ac.il>
* Delete commented out ancient history.imp2009-01-261-14/+0
|
* Allow multiple makeoption lines to be used with the += operator, this permitsthompsa2008-11-226-16/+32
| | | | | | | | | | the following syntax in the kernel config. makeoptions MODULES_OVERRIDE=foo makeoptions MODULES_OVERRIDE+=bar makeoptions MODULES_OVERRIDE+=baz Bump config minor version to 600007.
* Allow kernel config files to include files other than those in the CWD,obrien2008-07-282-0/+12
| | | | using unquoted paths.
* Revice the way the CTF conversion is done per object. Avoid creating a secondjb2008-06-291-1/+1
| | | | | | shell (which was the problem with the original implementation) and avoid letting make see an empty definition (which was the problem with the current implementation).
* Change the CTF conversion makefile code to use a new line to avoidjb2008-06-091-1/+1
| | | | | | | | spawning another shell. Requested by: Ed Schouten M config/mkmakefile.c
* Add the CTF conversion to the generated makefile. In the case wherejb2008-05-231-1/+1
| | | | NO_CTF or !WITH_CTF, the macro is empty.
OpenPOWER on IntegriCloud