CVS log for src/usr.bin/config/main.c

Up to [cvs.NetBSD.org] / src / usr.bin / config

Request diff between arbitrary revisions

Keyword substitution: kv
Default branch: MAIN

With config(1) as it exists today, a kernel Makefile is able to implement
logic on kernel options so long as those options are not defflag'd or
defparam'd.  This works because such options are automatally added to the
IDENT var in the kernel Makefile as a preprocessor define, and the Makefile
can then do an operation like:

.if !empty(IDENT:M-DSOMECOOLCPUOPTION)
CFLAGS+= -mcpu=somecoolcpu
.endif

Unfortunately, this precludes making it possible to generate a compile-time
dependency on SOMECOOLCPUOPTION, or having SOMECOOLCPUOPTION imply another
kernel config option using the normal config(1) option dependency function.

Fix this by introducing a new option description keyword: mkflagvar.  This
keyword marks an already defflag'd option as wanting a kernel Makefile var
defined if that option is selected in the kernel config file.  So:

defflag opt_coolcpu.h SOMECOOLCPUOPTION ANOTHERCOOLCPUOPTION
mkflagvar SOMECOOLCPUOPTION ANOTHERCOOLCPUOPTION

will cause:

KERNEL_OPT_SOMECOOLCPUOPTION="1"
KERNEL_OPT_ANOTHERCOOLCPUOPTION="1"

...to be emitted into the kernel Makefile if those options are, in fact,
selected with "options ..." in the kernel config file, thus allowing for
a compile-time dependency on the option to be generated in addition to
Makefile logic, which now looks like:

.if !empty(KERNEL_OPT_SOMECOOLCPUOPTION)
CFLAGS+= -mcpu=somecoolcpu
.endif

Pull up following revision(s) (requested by mrg in ticket #1678):

	bin/pax/options.c: revision 1.119
	usr.bin/config/scan.l: revision 1.32
	usr.bin/make/main.c: revision 1.274
	bin/pax/extern.h: revision 1.60
	usr.bin/config/defs.h: revision 1.106
	usr.bin/make/make.h: revision 1.105
	sbin/newfs_udf/udf_create.c: revision 1.27 (patch)
	sbin/newfs_udf/newfs_udf.h: revision 1.7 (patch)
	usr.bin/config/main.c: revision 1.100
	usr.sbin/installboot/Makefile:	revisions 1.53,1.54 (patch)
	usr.sbin/installboot/installboot.h: revision 1.41 (patch)
	usr.sbin/installboot/machines.c: revisisons 1.41,1.42 (patch)

Avoid depending on common symbols.

Pull up following revision(s) (requested by mrg in ticket #1263):

	bin/pax/options.c: revision 1.119
	usr.bin/config/scan.l: revision 1.32
	usr.bin/make/main.c: revision 1.274
	bin/pax/extern.h: revision 1.60
	usr.bin/config/defs.h: revision 1.106
	usr.bin/make/make.h: revision 1.105
	sbin/newfs_udf/udf_create.c: revision 1.27 (patch)
	sbin/newfs_udf/newfs_udf.h: revision 1.7 (patch)
	usr.bin/config/main.c: revision 1.100

Avoid depending on common symbols.

Merge changes from current as of 20200406

Avoid depending on common symbols.

Pull up the following, requested by christos in ticket #776:

	usr.bin/config/TODO                             up to 1.32
	usr.bin/config/defs.h                           up to 1.105
	usr.bin/config/files.c                          up to 1.37
	usr.bin/config/gram.y                           up to 1.55
	usr.bin/config/main.c                           up to 1.99
	usr.bin/config/scan.l                           up to 1.30
	usr.bin/config/sem.c                            up to 1.84
	usr.bin/config/util.c                           up to 1.21

config(1): fix issue with incorrect handling of elifdef statements.

Keep track where more objects are declared so that we can print where things
have been redefined.

Sync with HEAD

Sync with HEAD, resolve a few conflicts

yydebug is now defined only if YYDEBUG is

- make the level computation consistent
- keep going only if things changed.

use a reference count to avoid deleting psrefs still in use.

- Instead of checking the recursion level before we recurse, check in on
  function entry.
- Always decrement the level and reset levelparent on exit.

add more debugging, no functional change.

avoid creating infinite loops.

When deleting orphans detect parent<->child loops and break them.
"active" is not a boolean, use the right comparison.

Drop main() prototype.

Accept "-no" as a "no" that does not cause errors if the object deleted
does not exist.

*.o files don't need special handling at all now.  Makefile.kern.inc knows
*.o input files don't need to get compiled, but need to get linked.

After thought, revert "Generate *.c files under conf/".  Generate *.c files
under top build directory.  *.c files are never placed just under $S/.  Keep
this exclusiveness.

Fix build.

In `-S' mode, create symlinks from outside of $S to build directory, for
files that are placed outside of $S, so that `Makefile.kern.inc' can see all
files under either $S or build directory.

In `-S' mode, generate *.c files under conf/ subdirectory.  Register generated
.c files to the `files' list internally.

Experimental ``suffix rules + subdirectories'' build support (-S).

Prepare to build subdirectories.  Not enabled yet.

Allow redefinition of options (with only a warning message).  Removal
of non-included options was already only a warning.

This also affects redefinition and removal of file-system and makeoption
entries.

Reviewed and OKd by uebayasi@

Restore the old behavior of "maxusers" to allow the value to be overriden.
Problem reported by John D. Baker.

Define `makeoptions' values as parameters with "makeoptions_" prefix too.
C sources are encouraged to include relevant opt_*.h files rather than relying
on -DXXX passed via makefiles.

Revert MAXUSERS.  CVS is hard.

Fix previous.

Global paths looked up at output stage (mk*()) are relative to `srcdir'.
Ignore "prefix" by not calling sourcepath().

Add missed munmap(2) in extract_config

remove stray newlines from errors/warnings

Pull up following revision(s) (requested by mrg in ticket #572):
	usr.bin/config/Makefile: up to 1.10
	usr.bin/config/TODO: up to 1.14
	usr.bin/config/config.1: up to 1.17
	usr.bin/config/config.5: up to 1.25
	usr.bin/config/defs.h: up to 1.64
	usr.bin/config/files.c: up to 1.18
	usr.bin/config/gram.y: up to 1.46
	usr.bin/config/hash.c: up to 1.11
	usr.bin/config/lint.c: up to 1.15
	usr.bin/config/main.c: up to 1.74
	usr.bin/config/mkdevsw.c: up to 1.12
	usr.bin/config/mkheaders.c: up to 1.26
	usr.bin/config/mkioconf.c: up to 1.28
	usr.bin/config/mkmakefile.c: up to 1.37
	usr.bin/config/mkswap.c: up to 1.8
	usr.bin/config/pack.c: up to 1.9
	usr.bin/config/scan.l: up to 1.22
	usr.bin/config/sem.c: up to 1.71
	usr.bin/config/sem.h: up to 1.19
	usr.bin/config/util.c: up to 1.19
sync config(1) with HEAD.

appease gcc-4.5.4

config(1): Rename internal flag to enable modular build

To make -Wconversion happy, cast return value of tolower/toupper to
char.

config(1), config(5): Introduce "select"

o Introduce a new selection directive "select" to select an attribute (as a
  module) and its dependencies.
o Support "no select" too.
o Stop abusing "options" to select an attribute.
o Bump config(1) version.

- add RCSID's
- fix -Wconversion (except scanner)

Keep track of attribute (module) dependency using hash2.

Revert implicit attribute (module) declaration for options (flag/param).

Flag and param are to change contents of attributes (modules).  These don't
have code (*.[coS]).

Filesystem definition still defines an attribute (module) implicitly.

More debug messages.

After yyparse() is done, print not file but stage for debug.

Enable debug for tools.

Remove an unsed var.

Revert a mistakenly added, superflous attribute match test that caused some
valid options to get lost.

Select attributes for filesystem options too.

If an option is selected, select the matching (lowercased) attribute.  Handle
dependencies too.

Implicitly define attribute for options.

Implicitly define attribute for filesystem.

Steal -M to enable "modular" build.

Always select the fallback allattr.

Debug print where things are selected (by user).

Add debug print function.

Rebase to HEAD as of a few days ago.

Rebase.

Treat an undefined option as a warning instead of an error when undoing an
option.

Allows one to win with declarations like:
no options 	MSGBUFSIZE
options 	MSGBUFSIZE="128*1024"

Briefly discussed with cube@, lukem@ and martin@.

sync with head.

for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.

this commit was splitted into small chunks to avoid
a limitation of cvs.  ("Protocol error: too many arguments")

Sort options in usage.

Add two new options, -U and -D, that can be used to define "makeoptions"
on the config command line. While there, rename the undocumented (internal)
parser debug option from -D to -d.
Discussed on tech-toolchain.

go back to using file:line: from uwe.

make config errors look more like other programs: <file>,<line>:
instead of <file>:<line>:

sync with head

Don't support sysctl for the tools version of config. It is too complicated
to do so, and config -x is not used during the build.

make config -x look at the booted kernel first.

sync with head

Give option definitions their own data structure instead of using nvlists.
(and using messy hacks to make up for nvlists not holding quite the right
things)

Introduce type-safe wrappers around the hash tables. Use them for a
selected set of tables affected by the next nvlist cleanup in the
works.

Create a struct condexpr type to hold condition expressions, instead
of abusing struct nvlist to make trees.

(These are the a|b and a&b constructs.)

Create a new type struct attrlist to manage lists of attributes,
instead of using struct nvlist.

(struct nvlist holds lists (or trees!) of semi-arbitrary stuff with no
structure and almost no type safety; it should go away.)

When making the symlink for machine -> arch/foo/include
also make foo -> arch/foo/include.  This allows one to include <foo/bar.h>
include <machine/bar.h> which can be handy.

Some drivers want to include ioconf.h, so generate it if doing
"ioconf" config.

Add a highly experimental pseudo-root feature to be used in conjuction
with the also-experimental ioconf keyword.  pseudo-root allows to
specify a root at any point in the device tree without having
attachments from the actual root.

For example, instead of having a config file like this:
mainbus0 at root
bus_a? at mainbus0
bus_b? at bus_a*
device7 at bus_b?

You can have one like this:
pseudo-root bus_b*
device7 at bus_b?

This will produce the relevant ioconf.c glue for device number 7
only instead of the whole 9 yards from root.  Perhaps needless to
say, this can be used to generate snippets of config glue for
modules and, let's not deny that my main motivation for doing this,
rump components.

This is part 2/3 of my modifications to config (the last part is
autogenerating source file lists and component Makefiles).

No strong objection from cube (after a little pressuring ;), but
like he said, the implementation will most likely need some more
tweaking and may not work correctly under all pseudo-root uses yet.

reflect previous change in comment

Remove fs_foo.h support from deffs now that nothing uses it.

Fix off-by-one (config -x works again) and improve editing artifacts
(actually the whole "config -x must be used alone" change was made
unnecessary along the way.  cest la vie).

Introduce experimental support for ioconf-only configuration files.
This is done by giving the "ioconf" keyword in the config file.
As a result, config produces only ioconf.c and locators.h.  Currently,
only "monolithic" configurations with the device path starting from
root are supported.  Eventually, the goal is to support a local
root in the input file from any point along the device tree using
files.* in our kernel tree.  This will make autogenerating the
config glue for device modules possible instead of having to write
it by hand like is currently required (yes, it sounds simple to
implement, but ...).

reviewed by cube.
(the next part will demand major discussions with you, so prepare ;)

Sync with HEAD.

Third (and last) commit. See http://mail-index.netbsd.org/source-changes/2009/05/13/msg221222.html

Now that condmkopttab isn't a hash table anymore, don't initialise it with
ht_new()...  So actually rename it to condmkoptions to avoid confusion.

Reported build failure on amd64 (strange that I wouldn't get it on i386) on
current-users by Kurt Schreiner.

Actually allow a full expression for the condition for "makeoptions" in
files.*

Patch from Yorick Hardy.

Error out if one f the mkxxx() prints an error.

rename nv_int -> nv_num and make it long long, so that dev_t will fit when
we change it.

Don't complain about a missing 'file-system' directive. File system code
can be provided by modules.

Adjust previous; apb@ points out that _PATH_TMP is provided by compat_defs.h;
thus, this shouldn't need a paranoid fallback definition.
And, use _PATH_TMP also in the second place that was using a hardwired "/tmp".

Fix ridiculously small filename buffer for temporary file and resulting
truncation if $TMPDIR is set; also, fix an error path to not leave the
temporary file behind. From Gao Ya'nan in PR 39746.
While here, use _PATH_TMP instead of a hardwired "/tmp".

Sync with wrstuden-revivesa-base-2.

In find_declared_option, use the correct hash for file-systems.  That way,
information about dependencies are actually processed.

Remove the \n and tabs from the __COPYRIGHT() strings.
Tweak to use a consistent format.

Sync w/ -current. 34 merge conflicts to follow.

sync with head.

Disable use of pseudo-devices defined "defpseudo" with interface
attributes, but provide compatibility for older source trees (according
to the "version" in conf/files and other files.*.
reviewed by cube

Seperate pseudo-devs which don't use device_t et al. (the classical
ones, mostly network pseudo interfaces) and those which use autoconf
to attach instances dynamically, or to attach child devices.
Use a new keyword "defpseudodev" for the latter.
Issue a warning if interface attributes are used with "old" pseudodevs,
but let it work as before for now. This will be removed soon.
approved by cube

sync with HEAD

convert __attribute__s to applicable cdefs.h macros

Don't pollute fsopttab with duplicate options for the sake of a test that
has probably been gone for a very long time.  Produces identical output.

- rename {x,}error -> cfg{x,}error and {x,}warn -> cfg{x,}warn so that we
  can use err(3) and warn(3) to display errors instead of using inconsistent
  fprintf's.
- remove emalloc/estrdup etc. We have them in libutil.

Add new syntaxic sugar to provide a value in lint (i.e., config -L)
configurations for defparams.  It will be used _only_ by config -L.

This will greatly help automating tests with lint configurations,
hopefully.

One %s is enough to print one string.

Introduce a new option to config(1):  -L.  What it does is takes a regular
configuration file (although it is meant to be used mostly with
std.${ARCH}), and prints out a configuration file that includes it and
select every single option and parameter, and define an instance for every
single possible attachment.  IOW, selects everything, into a would-be
"LINT" config.

The resulting config really isn't meant to be runnable, but should be
somewhat buildable on most archs.  It still needs adjustments because some
options are peculiar (e.g., ACPI_DSDT_FILE wants an existing file as its
value), so it's not yet possible to do "config -L; config; build" in an
automated way.

Make deffilesystem check all defined options, not just defopttab (which
ought to be empty nowadays).

Include <sys/cdefs.h> and use __used on config[] instead of the ifdef dance.
Prevents gcc4 from g/c'ing embedded config from VAX kernels.

Instead of trying to check the return value of every fprintf() and fputs()
call - which makes the code completely impossibly to follow, call fflush()
and ferror() just prior to calling fclose().
This has the advantage of actually detecting the any write errors, since
the output is block bufferred and will typically not happen during fprintf()
but only during the fclose() - where it is difficult to report.
I also singlilarly refuse to add (void) casts to every printf call in the
system - since it almost never makes any sense to look at the return value
(unless you want to know how many bytes were actually writtem).

Remove unused local variable.

Allow deffs to take dependencies like defflag and defopt

Now that this is part of tools, we don't need the extra build glue.

Sync with head.

Introduce two new statements:

    obsolete defflag <option> [, <option> [, ...]]
    obsolete defparam <option> [, <option> [, ...]]

The two statements actually do the same thing (there could be only one),
but it makes things less cryptic that way.  The optional ": deps" part of
a 'defflag' or 'defparam' still has to be dropped when it gets obsoleted.

When the user has 'options OBSOLETE_OPTION' in his configuration file, it
is ignored (that is, opt_*.h files are generated as if it wasn't there),
and the user gets a warning about it.

Bump version to 20060525.

When someone first uses that syntax in the tree, a "version 20060525"
statement should be added before its occurrence, preferably at the top
of sys/conf/files.

Suggested by Matt Thomas a few months ago.

s/vax/__vax__/

deal with the vax gcc that does not understand __attribute__ used.

gcc-4.0 needs attribute used. Variables with attribute unused get removed.

Close file on error.  CID 176.

The loop detection code could not detect the negation of an instance that
made a device its own parent.  Add a test that checks that and stop looping
in that special case (after all, everything is already being handled by the
parent instance).

Reported by Jukka Salmi on current-user.

Invert the meaning of a comment to match reality.  Pointed out by uwe@.

Stop walking the tree when two conditions are met:  we've seen the device
already (one of its instances has been changed), and we have made no change
on any of the instances.

Previously, it stopped as soon as it detected the device had been seen.
While all the instances of the device at stake were eventually seen, the
same wasn't true for its children...

Fixes hpcmips's GENERIC.

- Make sure to try aliases of removed device instances when walking
  deaddevitab.
- Record the position in the config file of device instances so it is
  possible to tell if a device instance was declared before or after its
  parent's removal.

  E.g.:

     child* at parent?
     no parent

   will have the child instance ignored as an explicit orphan, while

     no parent
     child* at parent?

   will error out because now the child instance is a real orphan.

  That let the POSTPONED_ORPHAN regression test pass.

Don't return immediately when detecting that a devbase has already been
seen:  aliases might have to be activated, too.  Fixes GENERIC of alpha
and amiga.

o  Keep track of negated devices in deaddevitab
o  Rework do_kill_orphans() to use that information and mark explicitely
   orphaned devices (i.e., the ones whose missing ancestor has been
   negated)
o  Make a distinction between erroneous orphans and explicit orphans.
   Error out on the former, ignore the later (but print a warning when -v
   is used)

Yes, now config(1) will actually stop if you comment out a parent.  That
should help people still hoping adjustkernel is relevant these days :)

Rework the way orphan device instances are handled.  To achieve that, keep
track of instances attaching at root, and walk down the tree of active
device instances.  Then, all instances that are not marked active are
found as orphans.

Doing it that way allows us to simply ignore orphan devices, instead of
warning about them and still keep them in the configuration.  Now, orphaned
instances are considered as never having existed.

In the end, this allows 'no <device> at <attachment>' to be much more
efficient, as the user doesn't have to negate all descendents of the
instance s/he actually wants to negate.  Warnings are still emitted,
though.

While there, make official a side-effect of the previous lack of action
against orphaned instances:  config(1) used to warn about instances that
attach at a numbered device when no instance of that device with that
number existed, even though there was a starred instance of the device.

E.g. (provided by Alan Barrett):

    pciide* at pci? dev ? function ? flags 0x0000
    wdc0    at isa? port 0x1f0 irq 14 flags 0x00
    wdc1    at isa? port 0x170 irq 15 flags 0x00
    atabus* at ata?
    wd0     at atabus0 drive 0

With this commit, config(1) will no longer warn about 'wd0 at atabus0'.

config and genassym are not sysadmin tools, they are development tools.
As such, they don't belong in /usr/sbin, but rather /usr/bin.  Move them
there.