| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
/etc/os-release is now a symbolic link to a generated file. Make
mergemaster cope with symbolic links generically. I'm no longer
a big mergemaster user, so this has only been lightly tested
by me, though Kimura-san has ran it through its paces.
Submitted by: Yasushiro KIMURA-san
PR: 242212
MFC After: 2 weeks
Notes:
svn path=/head/; revision=367810
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Describe "diff installed new" as "Displaying differences between
installed and new." Previously mergemaster described them in the
opposite order.
PR: 249214
Reported by: Yuri Victorovich
MFC after: 2 weeks
Notes:
svn path=/head/; revision=367042
|
|
|
|
|
|
|
|
| |
X-MFC-With: r355379
MFC after: 2 weeks
Notes:
svn path=/head/; revision=355381
|
|
|
|
|
|
|
|
|
|
| |
This is mostly targetting the 'installconfig' phase of 'distribution'
which does a full tree walk.
MFC after: 2 weeks
Notes:
svn path=/head/; revision=355379
|
|
|
|
|
|
|
|
|
|
| |
r352950 introduced improper case fall-through for shell scripts. Fix it with
a pipe.
Reported by: lwhsu, David Wolfskill
Notes:
svn path=/head/; revision=353002
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This commit add support for certctl in mergemaster and etcupdate. Both will
either rehash or prompt for rehash as new certificates are
trusted/blacklisted.
This work was done primarily by allanjude@, with minor contributions by
myself.
No objection from: secteam
Differential Revision: https://reviews.freebsd.org/D17389
Notes:
svn path=/head/; revision=352950
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Use the .PATH mechanism instead so keep installing them from lib/libc/gen
While here revert 347961 and 347893 which are no longer needed
Discussed with: manu
Tested by: manu
ok manu@
Notes:
svn path=/head/; revision=348185
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Check the legacy directory and use it instead if present.
Install these first if using beinstall.
UPDATING entry to follow.
Approved by: allanjude (mentor, in person)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D20279
Notes:
svn path=/head/; revision=347893
|
|
|
|
|
|
|
|
|
|
| |
Suggested by: Daniel Ebdrup
Reviewed by: bcr
Approved by: bcr (doc), krion (mentor, implicit), mat (mentor, implicit)
Differential Revision: https://reviews.freebsd.org/D18350
Notes:
svn path=/head/; revision=341012
|
|
|
|
|
|
|
|
|
|
|
| |
If we can't find a Makefile.inc1 in the specified / default SOURCEDIR, and
there's a Makefile.inc1 in the current directory, offer the user the choice
of using . for SOURCEDIR.
Differential Revsion: https://reviews.freebsd.org/D16709
Notes:
svn path=/head/; revision=338114
|
|
|
|
|
|
|
|
|
|
|
|
| |
Finally, a pager for the nineties.
MFC after: Never
Relnotes: Yes
Differential Revision: https://reviews.freebsd.org/D13465
Poll: https://reviews.freebsd.org/V7
Notes:
svn path=/head/; revision=337497
|
|
|
|
|
|
|
|
| |
- Primarily http -> https
- Primarily FreeBSD project URLs
Notes:
svn path=/head/; revision=325096
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
-p only handles updating /etc/master.passwd and /etc/group . No more,
no less.
Also, mergemaster (and no other portions of the vanilla FreeBSD build
process) should be messing with __MAKECONF or SRCCONF as part of the
installworld or distribution process. Don't insinuate that mergemaster
does that as it's a false claim.
MFC after: 1 week
Sponsored by: Dell EMC Isilon
Notes:
svn path=/head/; revision=314830
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
New .meta files will be created without filemon data, but any future build
that wants filemon data will force a rebuild due to the missing data
due to use of bmake's .MAKE.MODE=missing-filemon=yes feature.
Reported by: np
Sponsored by: EMC / Isilon Storage Division
MFC after: 3 days
Notes:
svn path=/head/; revision=302674
|
|
|
|
|
|
|
|
|
| |
the mention of it and reword this a bit to remove 'you'.
MFC after: 3 days
Notes:
svn path=/head/; revision=288381
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Off by default, build behaves normally.
WITH_META_MODE we get auto objdir creation, the ability to
start build from anywhere in the tree.
Still need to add real targets under targets/ to build packages.
Differential Revision: D2796
Reviewed by: brooks imp
Notes:
svn path=/head/; revision=284345
|
| |
| |
| |
| | |
Notes:
svn path=/projects/bmake/; revision=284172
|
| |\
| |/
|/|
| | |
Notes:
svn path=/projects/bmake/; revision=270164
|
| |\
| | |
| | |
| | | |
Notes:
svn path=/projects/bmake/; revision=265044
|
| |\ \
| | | |
| | | |
| | | | |
Notes:
svn path=/projects/bmake/; revision=255477
|
| |\ \ \
| | | | |
| | | | |
| | | | | |
Notes:
svn path=/projects/bmake/; revision=255263
|
| | | | |
| | | | |
| | | | |
| | | | | |
Notes:
svn path=/projects/bmake/; revision=246868
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | | |
Notes:
svn path=/projects/bmake/; revision=246555
|
| |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | | |
Notes:
svn path=/projects/bmake/; revision=242545
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Requested by: Simon Gerraty <sjg@juniper.net>
Notes:
svn path=/projects/bmake/; revision=239572
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This includes:
o All directories named *ia64*
o All files named *ia64*
o All ia64-specific code guarded by __ia64__
o All ia64-specific makefile logic
o Mention of ia64 in comments and documentation
This excludes:
o Everything under contrib/
o Everything under crypto/
o sys/xen/interface
o sys/sys/elf_common.h
Discussed at: BSDcan
Notes:
svn path=/head/; revision=268351
|
| |_|_|_|_|/
|/| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
PR: 191174
Submitted by: Franco Fichtner <franco@lastsummer.de>
Notes:
svn path=/head/; revision=267668
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
compare.
Because of the change to find in SVN r253886, the entire temproot would be
deleted if it became empty, leading to a confusing message "*** FATAL ERROR:
The temproot directory ${TEMPROOT} has disappeared!"
Note that mergemaster does not do anything useful in this situation anyway
(e.g. put IGNORE_FILES="/etc/group /etc/master.passwd" in
/etc/mergemaster.rc and run mergemaster -p).
As noted in that commit, add -mindepth 1.
PR: bin/188485
Submitted by: David Boyd
MFC after: 1 week
Notes:
svn path=/head/; revision=264480
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
present during new installs. Update etcupdate and mergemaster to
ignore the generated file.
Tested by: gjb (release build)
MFC after: 1 month
Notes:
svn path=/head/; revision=261031
|
| |_|_|_|/
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
nmtree.
The mtree output used by mergemaster in this case was clearly not meant for
computer consumption and an approach based on -f <file1> -f <file2> would
probalby be a better idea, but this is a minimal change.
MFC after: 3 days
X-MFC-with: r258437
Notes:
svn path=/head/; revision=258456
|
| |_|_|/
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
mergemaster(8) runs.
MFC after: 3 days
Approved by: re (kib)
Notes:
svn path=/head/; revision=255428
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
He is no longer involved with the FreeBSD project.
While here: remove "no known bugs" and related. This isn't present in other manual pages.
PR: docs/179914
Notes:
svn path=/head/; revision=252174
|
| | | |
| | | |
| | | |
| | | | |
Notes:
svn path=/head/; revision=250916
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Reviewed by: dim, brooks
MFC after: 3 days
Notes:
svn path=/head/; revision=250463
|
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
mergemaster. This allows bootstrap verions of tools to be used.
Add a note to UPDATING about this change.
Discussed with: jhb
Sponsored by: DARPA, AFRL
MFC after: 5 days
Notes:
svn path=/head/; revision=249906
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
in all configurations.
Reviewed by: mjg
Approved by: cperciva
MFC after: 2 weeks
Notes:
svn path=/head/; revision=243892
|
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
the absolute path to PAGER if mergemaster can not find
the one already set.
Reviewed by: mjg
Approved by: cperciva
MFC after: 2 weeks
Notes:
svn path=/head/; revision=243891
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
| |
For -p:
The localtime update should have been excluded in the first place
The make.conf comparison has been OBE for some time now, and there
is no src.conf equivalent to share/examples/make.conf, so remove
the whole thing.
Update copyright
Notes:
svn path=/head/; revision=241218
|
|
|
|
|
|
|
|
| |
PR: bin/162891
Submitted by: Helge Oldach <src-mergemaster-nov11@oldach.net>
Notes:
svn path=/head/; revision=228122
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
pwd_mkdb, etc. updates at the end of the comparison.
2. Add an update to the end to handle /etc/localtime, if it exists.
If /var/db/zoneinfo exists, automatically update /etc/localtime,
which should (hopefully) be safe to do. If not, prompt the user
to run tzsetup.
3. Update run_it_now(), the function that handles input for the updates,
to make sure that we got a valid answer, and to handle the --run-updates
option if supplied.
Notes:
svn path=/head/; revision=227013
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In -p mode install the group file with the same permissions as normally
done in etc/Makefile.
Update the copyright.
Requested by: peter [1]
Approved by: re (kib)
Notes:
svn path=/head/; revision=224726
|
|
|
|
|
|
|
| |
They have no effect when coming in pairs, or before .Bl/.Bd
Notes:
svn path=/head/; revision=213573
|
|
|
|
| |
Notes:
svn path=/head/; revision=208088
|
|
|
|
|
|
|
|
|
| |
Approved by: dougb, imp (mentor)
Reviewed by: ume
MFC after: 2 weeks
Notes:
svn path=/head/; revision=207612
|
|
|
|
|
|
|
|
|
|
|
| |
and enforce this in the code. Apparently a lot of users mistakenly
combine -a with these flags and are then mystified that no changes
were made.
While I'm here, fix a trailing space in mergemaster.8
Notes:
svn path=/head/; revision=205145
|
|
|
|
|
|
|
|
|
|
| |
of MTREEDB with DESTDIR.
PR: bin/143089
Submitted by: Anton Yuzhaninov <citrin@citrin.ru>
Notes:
svn path=/head/; revision=202817
|
|
|
|
| |
Notes:
svn path=/head/; revision=202386
|
|
|
|
| |
Notes:
svn path=/head/; revision=202340
|
|
|
|
|
|
|
| |
compat shim as advertised. This change should not be MFC'ed.
Notes:
svn path=/head/; revision=202339
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Update delete_temproot() to include the error message if it fails,
and clean up the places where it's called.
If there are no files left in temproot when the comparison is done
delete it without prompting. This should make "automated" runs of
mergemaster without -a a little easier.
Document the new behavior in the man page.
Notes:
svn path=/head/; revision=201765
|