History log of /freebsd-10-stable/usr.sbin/etcupdate/
Revision Date Author Comments
(<<< Hide modified files)
(Show modified files >>>)
313488 09-Feb-2017 ngie

MFC r289172,r290254:

r289172:

Refactor the test/ Makefiles after recent changes to bsd.test.mk (r289158) and
netbsd-tests.test.mk (r289151)

- Eliminate explicit OBJTOP/SRCTOP setting
- Convert all ad hoc NetBSD test integration over to netbsd-tests.test.mk
- Remove unnecessary TESTSDIR setting
- Use SRCTOP where possible for clarity

r290254:

Remove unused variable (SRCDIR)


/freebsd-10-stable/bin/cat/tests/Makefile
/freebsd-10-stable/bin/date/tests/Makefile
/freebsd-10-stable/bin/expr/tests/Makefile
/freebsd-10-stable/bin/ls/tests/Makefile
/freebsd-10-stable/bin/mv/tests/Makefile
/freebsd-10-stable/bin/pax/tests/Makefile
/freebsd-10-stable/bin/pkill/tests/Makefile
/freebsd-10-stable/bin/sh/tests/Makefile
/freebsd-10-stable/bin/sleep/tests/Makefile
/freebsd-10-stable/bin/test/tests/Makefile
/freebsd-10-stable/bin/tests/Makefile
/freebsd-10-stable/cddl/lib/tests/Makefile
/freebsd-10-stable/cddl/sbin/tests/Makefile
/freebsd-10-stable/cddl/tests/Makefile
/freebsd-10-stable/cddl/usr.bin/tests/Makefile
/freebsd-10-stable/cddl/usr.sbin/dtrace/tests/Makefile
/freebsd-10-stable/cddl/usr.sbin/tests/Makefile
/freebsd-10-stable/gnu/lib/tests/Makefile
/freebsd-10-stable/gnu/tests/Makefile
/freebsd-10-stable/gnu/usr.bin/diff/tests/Makefile
/freebsd-10-stable/gnu/usr.bin/tests/Makefile
/freebsd-10-stable/lib/atf/libatf-c++/tests/Makefile
/freebsd-10-stable/lib/atf/libatf-c++/tests/detail/Makefile
/freebsd-10-stable/lib/atf/libatf-c/tests/Makefile
/freebsd-10-stable/lib/atf/libatf-c/tests/detail/Makefile
/freebsd-10-stable/lib/atf/tests/Makefile
/freebsd-10-stable/lib/atf/tests/test-programs/Makefile
/freebsd-10-stable/lib/libc/tests/Makefile
/freebsd-10-stable/lib/libc/tests/Makefile.netbsd-tests
/freebsd-10-stable/lib/libc/tests/c063/Makefile
/freebsd-10-stable/lib/libc/tests/db/Makefile
/freebsd-10-stable/lib/libc/tests/gen/Makefile
/freebsd-10-stable/lib/libc/tests/gen/execve/Makefile
/freebsd-10-stable/lib/libc/tests/gen/posix_spawn/Makefile
/freebsd-10-stable/lib/libc/tests/hash/Makefile
/freebsd-10-stable/lib/libc/tests/inet/Makefile
/freebsd-10-stable/lib/libc/tests/locale/Makefile
/freebsd-10-stable/lib/libc/tests/net/Makefile
/freebsd-10-stable/lib/libc/tests/net/getaddrinfo/Makefile
/freebsd-10-stable/lib/libc/tests/regex/Makefile
/freebsd-10-stable/lib/libc/tests/rpc/Makefile
/freebsd-10-stable/lib/libc/tests/setjmp/Makefile
/freebsd-10-stable/lib/libc/tests/ssp/Makefile
/freebsd-10-stable/lib/libc/tests/stdio/Makefile
/freebsd-10-stable/lib/libc/tests/stdlib/Makefile
/freebsd-10-stable/lib/libc/tests/string/Makefile
/freebsd-10-stable/lib/libc/tests/sys/Makefile
/freebsd-10-stable/lib/libc/tests/termios/Makefile
/freebsd-10-stable/lib/libc/tests/time/Makefile
/freebsd-10-stable/lib/libc/tests/tls/Makefile
/freebsd-10-stable/lib/libc/tests/tls/dso/Makefile
/freebsd-10-stable/lib/libc/tests/ttyio/Makefile
/freebsd-10-stable/lib/libcrypt/tests/Makefile
/freebsd-10-stable/lib/libmp/tests/Makefile
/freebsd-10-stable/lib/libnv/tests/Makefile
/freebsd-10-stable/lib/libpam/libpam/tests/Makefile
/freebsd-10-stable/lib/librt/tests/Makefile
/freebsd-10-stable/lib/libthr/tests/Makefile
/freebsd-10-stable/lib/libthr/tests/dlopen/Makefile
/freebsd-10-stable/lib/libthr/tests/dlopen/dso/Makefile
/freebsd-10-stable/lib/libutil/tests/Makefile
/freebsd-10-stable/lib/msun/tests/Makefile
/freebsd-10-stable/lib/tests/Makefile
/freebsd-10-stable/libexec/atf/atf-check/tests/Makefile
/freebsd-10-stable/libexec/atf/atf-sh/tests/Makefile
/freebsd-10-stable/libexec/atf/tests/Makefile
/freebsd-10-stable/libexec/tests/Makefile
/freebsd-10-stable/sbin/devd/tests/Makefile
/freebsd-10-stable/sbin/dhclient/tests/Makefile
/freebsd-10-stable/sbin/growfs/tests/Makefile
/freebsd-10-stable/sbin/mdconfig/tests/Makefile
/freebsd-10-stable/sbin/tests/Makefile
/freebsd-10-stable/secure/lib/tests/Makefile
/freebsd-10-stable/secure/libexec/tests/Makefile
/freebsd-10-stable/secure/tests/Makefile
/freebsd-10-stable/secure/usr.bin/tests/Makefile
/freebsd-10-stable/secure/usr.sbin/tests/Makefile
/freebsd-10-stable/share/examples/tests/Makefile
/freebsd-10-stable/share/tests/Makefile
/freebsd-10-stable/tests/etc/Makefile
/freebsd-10-stable/tests/sys/mqueue/Makefile
/freebsd-10-stable/tests/sys/pjdfstest/tests/Makefile
/freebsd-10-stable/usr.bin/apply/tests/Makefile
/freebsd-10-stable/usr.bin/basename/tests/Makefile
/freebsd-10-stable/usr.bin/calendar/tests/Makefile
/freebsd-10-stable/usr.bin/cmp/tests/Makefile
/freebsd-10-stable/usr.bin/col/tests/Makefile
/freebsd-10-stable/usr.bin/comm/tests/Makefile
/freebsd-10-stable/usr.bin/cut/tests/Makefile
/freebsd-10-stable/usr.bin/dirname/tests/Makefile
/freebsd-10-stable/usr.bin/file2c/tests/Makefile
/freebsd-10-stable/usr.bin/grep/tests/Makefile
/freebsd-10-stable/usr.bin/gzip/tests/Makefile
/freebsd-10-stable/usr.bin/join/tests/Makefile
/freebsd-10-stable/usr.bin/jot/tests/Makefile
/freebsd-10-stable/usr.bin/lastcomm/tests/Makefile
/freebsd-10-stable/usr.bin/m4/tests/Makefile
/freebsd-10-stable/usr.bin/ncal/tests/Makefile
/freebsd-10-stable/usr.bin/printf/tests/Makefile
/freebsd-10-stable/usr.bin/sed/tests/Makefile
/freebsd-10-stable/usr.bin/tests/Makefile
/freebsd-10-stable/usr.bin/truncate/tests/Makefile
/freebsd-10-stable/usr.bin/uudecode/tests/Makefile
/freebsd-10-stable/usr.bin/uuencode/tests/Makefile
/freebsd-10-stable/usr.bin/xargs/tests/Makefile
/freebsd-10-stable/usr.bin/yacc/tests/Makefile
tests/Makefile
/freebsd-10-stable/usr.sbin/fstyp/tests/Makefile
/freebsd-10-stable/usr.sbin/newsyslog/tests/Makefile
/freebsd-10-stable/usr.sbin/nmtree/tests/Makefile
/freebsd-10-stable/usr.sbin/pw/tests/Makefile
/freebsd-10-stable/usr.sbin/sa/tests/Makefile
/freebsd-10-stable/usr.sbin/tests/Makefile
288505 02-Oct-2015 bdrewery

MFC r288380:

Document the post-merge actions of calling tzsetup(8) and services_mkdb(8)
added in r259134.

283927 02-Jun-2015 jhb

MFC 281887:
Reassign copyright statements on several files from Advanced
Computing Technologies LLC to Hudson River Trading LLC.


/freebsd-10-stable/lib/libc/gen/_once_stub.c
/freebsd-10-stable/lib/libc/include/compat.h
/freebsd-10-stable/lib/libc/stdio/open_memstream.3
/freebsd-10-stable/lib/libc/stdio/open_memstream.c
/freebsd-10-stable/lib/libc/stdio/open_wmemstream.c
/freebsd-10-stable/lib/libc/sys/closefrom.2
/freebsd-10-stable/lib/libc/sys/procctl.2
/freebsd-10-stable/share/man/man9/BUS_BIND_INTR.9
/freebsd-10-stable/share/man/man9/BUS_CHILD_DELETED.9
/freebsd-10-stable/share/man/man9/BUS_CHILD_DETACHED.9
/freebsd-10-stable/share/man/man9/BUS_DESCRIBE_INTR.9
/freebsd-10-stable/share/man/man9/BUS_NEW_PASS.9
/freebsd-10-stable/share/man/man9/VOP_ADVISE.9
/freebsd-10-stable/share/man/man9/VOP_ALLOCATE.9
/freebsd-10-stable/share/man/man9/bus_adjust_resource.9
/freebsd-10-stable/share/man/man9/bus_generic_new_pass.9
/freebsd-10-stable/share/man/man9/bus_set_pass.9
/freebsd-10-stable/share/man/man9/refcount.9
/freebsd-10-stable/share/man/man9/sglist.9
/freebsd-10-stable/share/man/man9/shm_map.9
/freebsd-10-stable/sys/amd64/include/vm.h
/freebsd-10-stable/sys/boot/i386/common/edd.h
/freebsd-10-stable/sys/dev/pci/pci_subr.c
/freebsd-10-stable/sys/i386/include/vm.h
/freebsd-10-stable/sys/sys/procctl.h
/freebsd-10-stable/sys/vm/sg_pager.c
/freebsd-10-stable/sys/x86/acpica/srat.c
/freebsd-10-stable/sys/x86/include/mca.h
/freebsd-10-stable/sys/x86/pci/qpi.c
/freebsd-10-stable/sys/x86/x86/mca.c
/freebsd-10-stable/tools/regression/lib/libc/stdio/test-open_memstream.c
/freebsd-10-stable/tools/regression/lib/libc/stdio/test-open_wmemstream.c
/freebsd-10-stable/tools/regression/netinet/arphold/arphold.c
/freebsd-10-stable/usr.bin/perror/perror.1
/freebsd-10-stable/usr.bin/perror/perror.c
/freebsd-10-stable/usr.bin/procstat/procstat_rusage.c
/freebsd-10-stable/usr.bin/protect/protect.1
/freebsd-10-stable/usr.bin/protect/protect.c
/freebsd-10-stable/usr.sbin/bhyve/ioapic.c
/freebsd-10-stable/usr.sbin/bhyve/ioapic.h
/freebsd-10-stable/usr.sbin/bhyve/pci_irq.c
/freebsd-10-stable/usr.sbin/bhyve/pci_irq.h
/freebsd-10-stable/usr.sbin/bhyve/pm.c
etcupdate.8
etcupdate.sh
tests/always_test.sh
tests/conflicts_test.sh
tests/fbsdid_test.sh
tests/ignore_test.sh
tests/preworld_test.sh
tests/tests_test.sh
tests/tzsetup_test.sh
/freebsd-10-stable/usr.sbin/pciconf/err.c
273998 03-Nov-2014 jhb

MFC 273834:
Rework the EXAMPLES section to be a bit clearer.
- Add an example of using etcupdate diff.
- Create a subsection on bootstrapping that is below the simple
examples. This should make it clearer that 'etcupdate extract' is
a one-time operation and not part of the common workflow. It also
adds more suggestions on when bootstrapping is needed and additional
steps to make future merges simpler.

264996 27-Apr-2014 jmmv

MFC various moves of tools/regressions/ tests to the new infrastructure.

- r263220 Migrate tools/regression/sbin/ to the new tests layout.
- r263222 Add Makefile missed in r263220.
- r263226 Migrate tools/regression/{usr.bin/lastcomm,usr.sbin}/ to the new tests layout.
- r263227 Migrate most of tools/regression/usr.bin/ to the new tests layout.
- r263345 Expand tabs that sneaked in into spaces.
- r263346 Migrate tools/regression/usr.bin/make/ to the new tests layout.
- r263348 Add Makefiles missed in r263346.
- r263351 Migrate tools/regression/usr.bin/pkill/ to the new tests layout.
- r263388 Mark multi_test as requiring /usr/share/dict/words.
- r263814 Fix path to the run.pl script to let these tests run.
- r264742 Prevent building tests when bootstrapping make.

This is 'make tinderbox' clean.


/freebsd-10-stable/Makefile
/freebsd-10-stable/bin/pkill/Makefile
/freebsd-10-stable/bin/pkill/tests
/freebsd-10-stable/etc/mtree/BSD.tests.dist
/freebsd-10-stable/sbin/Makefile
/freebsd-10-stable/sbin/dhclient/Makefile
/freebsd-10-stable/sbin/dhclient/tests
/freebsd-10-stable/sbin/growfs/Makefile
/freebsd-10-stable/sbin/growfs/tests
/freebsd-10-stable/sbin/mdconfig/Makefile
/freebsd-10-stable/sbin/mdconfig/tests
/freebsd-10-stable/sbin/mdconfig/tests/Makefile
/freebsd-10-stable/sbin/mdconfig/tests/legacy_test.sh
/freebsd-10-stable/sbin/tests
/freebsd-10-stable/tools/build/mk/OptionalObsoleteFiles.inc
/freebsd-10-stable/tools/regression/sbin
/freebsd-10-stable/tools/regression/usr.bin/Makefile
/freebsd-10-stable/tools/regression/usr.bin/apply
/freebsd-10-stable/tools/regression/usr.bin/calendar
/freebsd-10-stable/tools/regression/usr.bin/comm
/freebsd-10-stable/tools/regression/usr.bin/file2c
/freebsd-10-stable/tools/regression/usr.bin/join
/freebsd-10-stable/tools/regression/usr.bin/jot
/freebsd-10-stable/tools/regression/usr.bin/lastcomm
/freebsd-10-stable/tools/regression/usr.bin/m4
/freebsd-10-stable/tools/regression/usr.bin/make
/freebsd-10-stable/tools/regression/usr.bin/ncal
/freebsd-10-stable/tools/regression/usr.bin/pkill
/freebsd-10-stable/tools/regression/usr.bin/printf
/freebsd-10-stable/tools/regression/usr.bin/regress.m4
/freebsd-10-stable/tools/regression/usr.bin/sed
/freebsd-10-stable/tools/regression/usr.bin/tr
/freebsd-10-stable/tools/regression/usr.bin/uudecode
/freebsd-10-stable/tools/regression/usr.bin/uuencode
/freebsd-10-stable/tools/regression/usr.bin/xargs
/freebsd-10-stable/tools/regression/usr.bin/yacc
/freebsd-10-stable/tools/regression/usr.sbin
/freebsd-10-stable/usr.bin/apply/Makefile
/freebsd-10-stable/usr.bin/apply/tests
/freebsd-10-stable/usr.bin/calendar/Makefile
/freebsd-10-stable/usr.bin/calendar/tests
/freebsd-10-stable/usr.bin/comm/Makefile
/freebsd-10-stable/usr.bin/comm/tests
/freebsd-10-stable/usr.bin/file2c/Makefile
/freebsd-10-stable/usr.bin/file2c/tests
/freebsd-10-stable/usr.bin/join/Makefile
/freebsd-10-stable/usr.bin/join/tests
/freebsd-10-stable/usr.bin/jot/Makefile
/freebsd-10-stable/usr.bin/jot/tests
/freebsd-10-stable/usr.bin/lastcomm/Makefile
/freebsd-10-stable/usr.bin/lastcomm/tests
/freebsd-10-stable/usr.bin/m4/Makefile
/freebsd-10-stable/usr.bin/m4/tests
/freebsd-10-stable/usr.bin/make/Makefile
/freebsd-10-stable/usr.bin/make/tests
/freebsd-10-stable/usr.bin/make/tests/Makefile
/freebsd-10-stable/usr.bin/make/tests/archives/Makefile
/freebsd-10-stable/usr.bin/make/tests/archives/fmt_44bsd/Makefile
/freebsd-10-stable/usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile
/freebsd-10-stable/usr.bin/make/tests/archives/fmt_oldbsd/Makefile
/freebsd-10-stable/usr.bin/make/tests/basic/Makefile
/freebsd-10-stable/usr.bin/make/tests/basic/t0/Makefile
/freebsd-10-stable/usr.bin/make/tests/basic/t1/Makefile
/freebsd-10-stable/usr.bin/make/tests/basic/t2/Makefile
/freebsd-10-stable/usr.bin/make/tests/basic/t3/Makefile
/freebsd-10-stable/usr.bin/make/tests/execution/Makefile
/freebsd-10-stable/usr.bin/make/tests/execution/ellipsis/Makefile
/freebsd-10-stable/usr.bin/make/tests/execution/empty/Makefile
/freebsd-10-stable/usr.bin/make/tests/execution/joberr/Makefile
/freebsd-10-stable/usr.bin/make/tests/execution/plus/Makefile
/freebsd-10-stable/usr.bin/make/tests/shell/Makefile
/freebsd-10-stable/usr.bin/make/tests/shell/builtin/Makefile
/freebsd-10-stable/usr.bin/make/tests/shell/meta/Makefile
/freebsd-10-stable/usr.bin/make/tests/shell/path/Makefile
/freebsd-10-stable/usr.bin/make/tests/shell/path_select/Makefile
/freebsd-10-stable/usr.bin/make/tests/shell/replace/Makefile
/freebsd-10-stable/usr.bin/make/tests/shell/select/Makefile
/freebsd-10-stable/usr.bin/make/tests/suffixes/Makefile
/freebsd-10-stable/usr.bin/make/tests/suffixes/basic/Makefile
/freebsd-10-stable/usr.bin/make/tests/suffixes/src_wild1/Makefile
/freebsd-10-stable/usr.bin/make/tests/suffixes/src_wild2/Makefile
/freebsd-10-stable/usr.bin/make/tests/syntax/Makefile
/freebsd-10-stable/usr.bin/make/tests/syntax/directive-t0/Makefile
/freebsd-10-stable/usr.bin/make/tests/syntax/enl/Makefile
/freebsd-10-stable/usr.bin/make/tests/syntax/funny-targets/Makefile
/freebsd-10-stable/usr.bin/make/tests/syntax/semi/Makefile
/freebsd-10-stable/usr.bin/make/tests/sysmk/Makefile
/freebsd-10-stable/usr.bin/make/tests/sysmk/t0/2/1/Makefile
/freebsd-10-stable/usr.bin/make/tests/sysmk/t0/2/Makefile
/freebsd-10-stable/usr.bin/make/tests/sysmk/t0/Makefile
/freebsd-10-stable/usr.bin/make/tests/sysmk/t0/mk/Makefile
/freebsd-10-stable/usr.bin/make/tests/sysmk/t1/2/1/Makefile
/freebsd-10-stable/usr.bin/make/tests/sysmk/t1/2/Makefile
/freebsd-10-stable/usr.bin/make/tests/sysmk/t1/Makefile
/freebsd-10-stable/usr.bin/make/tests/sysmk/t1/mk/Makefile
/freebsd-10-stable/usr.bin/make/tests/sysmk/t2/2/1/Makefile
/freebsd-10-stable/usr.bin/make/tests/sysmk/t2/2/Makefile
/freebsd-10-stable/usr.bin/make/tests/sysmk/t2/Makefile
/freebsd-10-stable/usr.bin/make/tests/sysmk/t2/mk/Makefile
/freebsd-10-stable/usr.bin/make/tests/variables/Makefile
/freebsd-10-stable/usr.bin/make/tests/variables/modifier_M/Makefile
/freebsd-10-stable/usr.bin/make/tests/variables/modifier_t/Makefile
/freebsd-10-stable/usr.bin/make/tests/variables/opt_V/Makefile
/freebsd-10-stable/usr.bin/make/tests/variables/t0/Makefile
/freebsd-10-stable/usr.bin/ncal/Makefile
/freebsd-10-stable/usr.bin/ncal/tests
/freebsd-10-stable/usr.bin/printf/Makefile
/freebsd-10-stable/usr.bin/printf/tests
/freebsd-10-stable/usr.bin/sed/Makefile
/freebsd-10-stable/usr.bin/sed/tests
/freebsd-10-stable/usr.bin/sed/tests/Makefile
/freebsd-10-stable/usr.bin/tests/Makefile
/freebsd-10-stable/usr.bin/tests/regress.m4
/freebsd-10-stable/usr.bin/tr/Makefile
/freebsd-10-stable/usr.bin/tr/tests
/freebsd-10-stable/usr.bin/uudecode/Makefile
/freebsd-10-stable/usr.bin/uudecode/tests
/freebsd-10-stable/usr.bin/uuencode/Makefile
/freebsd-10-stable/usr.bin/uuencode/tests
/freebsd-10-stable/usr.bin/xargs/Makefile
/freebsd-10-stable/usr.bin/xargs/tests
/freebsd-10-stable/usr.bin/yacc/Makefile
/freebsd-10-stable/usr.bin/yacc/tests
/freebsd-10-stable/usr.sbin/Makefile
Makefile
tests
/freebsd-10-stable/usr.sbin/newsyslog/Makefile
/freebsd-10-stable/usr.sbin/newsyslog/tests
/freebsd-10-stable/usr.sbin/sa/Makefile
/freebsd-10-stable/usr.sbin/sa/tests
/freebsd-10-stable/usr.sbin/tests
259960 27-Dec-2013 jhb

MFC 258063,258064,258066,258097,258185,259134:
- Add an -s option to the regression tests that specifies a path to an
alternate etcupdate.sh script to test. This allows a non-installed
version of the script to be tested more easily.
- Add a pre-world mode of updating similar to the -p option that can be
passed to mergemaster.
- Fix a couple of issues with -F:
- Fix ALWAYS_INSTALL to take precedence over the FreeBSD ID checks.
- Fix the -F option in the case that the only upstream change is a
change in the FreeBSD ID and the local file is removed.
- Refresh /etc/localtime after each update using tzsetup -r.
- Regenerate /var/db/services.db when /etc/services changes.

256281 10-Oct-2013 gjb

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation


238428 13-Jul-2012 joel

Add HISTORY section.


238426 13-Jul-2012 joel

Minor mdoc, spelling and end of line whitespace fixes.


238423 13-Jul-2012 jhb

The etcupdate utility is a tool for managing updates to files that are
not updated as part of `make installworld' such as files in /etc. It
manages updates by doing a three-way merge of changes made to these files
against the local versions. It is also designed to minimize the amount
of user intervention with the goal of simplifying upgrades for clusters
of machines.

The primary difference from mergemaster is that etcupdate requires less
manual work. The primary difference from etcmerge is that etcupdate
updates files in-place similar to mergemaster rather than building a
separate /etc tree.

Requested by: obrien, kib, theraven, joeld (among others)