aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/mergemaster
Commit message (Collapse)AuthorAgeFilesLines
* Use full path to sysctl(8) since /sbin is not in PATH.Bryan Drewery2019-12-041-1/+1
| | | | | | | | X-MFC-With: r355379 MFC after: 2 weeks Notes: svn path=/head/; revision=355381
* Run make in parallel.Bryan Drewery2019-12-041-0/+1
| | | | | | | | | | 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
* Unbreak etcupdate(8) and mergemaster(8) after r352950Kyle Evans2019-10-021-2/+1
| | | | | | | | | | 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
* [3/3] etcupdate and mergemaster support for certctlKyle Evans2019-10-021-0/+21
| | | | | | | | | | | | | | | 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
* Move back group, master.passwd and shells to etc directoryBaptiste Daroussin2019-05-231-6/+3
| | | | | | | | | | | | | 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
* Fix mergemaster after r347638 and the master.passwd / group move.Brad Davis2019-05-161-3/+6
| | | | | | | | | | | | | | | 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
* Cross-reference mergemaster(8) & etcupdate(8).Mateusz Piotrowski2018-11-271-1/+2
| | | | | | | | | | 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
* mergemaster: better defaults for SOURCEDIRWarner Losh2018-08-201-0/+21
| | | | | | | | | | | 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
* Switch the default pager for most commands to lessAlan Somers2018-08-082-11/+11
| | | | | | | | | | | | 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
* Update several more URLsEitan Adler2017-10-291-1/+1
| | | | | | | | - Primarily http -> https - Primarily FreeBSD project URLs Notes: svn path=/head/; revision=325096
* mergemaster: fix description of -pEnji Cooper2017-03-071-4/+5
| | | | | | | | | | | | | | | | -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
* META_MODE: Don't require filemon(4) for mergemaster(8)/etcupdate(8)Bryan Drewery2016-07-121-1/+1
| | | | | | | | | | | | | 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
* All supported releases have the -m support from r186678, so removeBryan Drewery2015-09-291-7/+6
| | | | | | | | | the mention of it and reword this a bit to remove 'you'. MFC after: 3 days Notes: svn path=/head/; revision=288381
* Add META_MODE support.Simon J. Gerraty2015-06-131-0/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * dirdeps.mk now sets DEP_RELDIRSimon J. Gerraty2015-06-081-2/+0
| | | | | | | | Notes: svn path=/projects/bmake/; revision=284172
| * Merge head from 7/28Simon J. Gerraty2014-08-192-3/+3
| |\ | |/ |/| | | Notes: svn path=/projects/bmake/; revision=270164
| * Merge headSimon J. Gerraty2014-04-281-3/+10
| |\ | | | | | | | | | Notes: svn path=/projects/bmake/; revision=265044
| * \ Merge headSimon J. Gerraty2013-09-111-1/+1
| |\ \ | | | | | | | | | | | | Notes: svn path=/projects/bmake/; revision=255477
| * \ \ Merge from headSimon J. Gerraty2013-09-052-13/+5
| |\ \ \ | | | | | | | | | | | | | | | Notes: svn path=/projects/bmake/; revision=255263
| * | | | Updated dependenciesSimon J. Gerraty2013-02-161-2/+0
| | | | | | | | | | | | | | | | | | | | Notes: svn path=/projects/bmake/; revision=246868
| * | | | Sync with HEAD.David E. O'Brien2013-02-081-13/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Notes: svn path=/projects/bmake/; revision=246555
| * \ \ \ \ Sync from headSimon J. Gerraty2012-11-041-31/+37
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Notes: svn path=/projects/bmake/; revision=242545
| * | | | | | Sync FreeBSD's bmake branch with Juniper's internal bmake branch.Marcel Moolenaar2012-08-221-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Requested by: Simon Gerraty <sjg@juniper.net> Notes: svn path=/projects/bmake/; revision=239572
* | | | | | | Remove ia64.Marcel Moolenaar2014-07-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | use .Mt to mark up email addresses consistently (part2)Baptiste Daroussin2014-06-201-1/+1
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PR: 191174 Submitted by: Franco Fichtner <franco@lastsummer.de> Notes: svn path=/head/; revision=267668
* | | | | | mergemaster: Avoid "/var/tmp/temproot disappeared" if there is nothing toJilles Tjoelker2014-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Generate /var/db/services.db during 'make distribution' so that it isJohn Baldwin2014-01-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Fix mergemaster -U by forcing FreeBSD 9 compatiblity in mtree when mtree isBrooks Davis2013-11-221-1/+7
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Pass -n (do not emit comments) when saving mtree information for futureXin LI2013-09-091-1/+1
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mergemaster(8) runs. MFC after: 3 days Approved by: re (kib) Notes: svn path=/head/; revision=255428
* | | | Remove request to email suggestions and fixes to the author.Eitan Adler2013-06-241-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Don't mess with /etc/localtime if it is a symlink.Peter Wemm2013-05-221-1/+1
| | | | | | | | | | | | | | | | Notes: svn path=/head/; revision=250916
* | | | Permit relative paths with mergemaster -mEitan Adler2013-05-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed by: dim, brooks MFC after: 3 days Notes: svn path=/head/; revision=250463
* | | | Use the system MAKEOBJDIRPREFIX when running make targets inBrooks Davis2013-04-251-4/+3
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Remove pointless check for the existence of /usr/bin/less which existsEitan Adler2012-12-051-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in all configurations. Reviewed by: mjg Approved by: cperciva MFC after: 2 weeks Notes: svn path=/head/; revision=243892
* | | Add ability to mergemaster to permit the user to typeEitan Adler2012-12-051-0/+5
| |/ |/| | | | | | | | | | | | | | | | | | | | | 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
* | Remove references to CVS so that people will stop bringing it upDoug Barton2012-10-051-31/+37
|/ | | | | | | | | | | | | | 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
* If using DISTDIR we need to be sure to create a ${DESTDIR}/var/db/zoneinfoDoug Barton2011-11-291-2/+2
| | | | | | | | PR: bin/162891 Submitted by: Helge Oldach <src-mergemaster-nov11@oldach.net> Notes: svn path=/head/; revision=228122
* 1. Add a new option, --run-updates, to always or never run the newalises,Doug Barton2011-11-022-17/+63
| | | | | | | | | | | | | | | | 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
* Make clear that the -U option can be dangerous. [1]Doug Barton2011-08-092-6/+10
| | | | | | | | | | | | | | 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
* mdoc: drop redundant .Pp and .LP callsUlrich Spörlein2010-10-081-1/+0
| | | | | | | They have no effect when coming in pairs, or before .Bl/.Bd Notes: svn path=/head/; revision=213573
* Hide the creation and population of the temprootDoug Barton2010-05-141-5/+5
| | | | Notes: svn path=/head/; revision=208088
* Add support run services_mkdb(8).Norikatsu Shigemura2010-05-041-0/+14
| | | | | | | | | Approved by: dougb, imp (mentor) Reviewed by: ume MFC after: 2 weeks Notes: svn path=/head/; revision=207612
* Make it more clear in the docs that -a is not compatible with -iFU,Doug Barton2010-03-142-7/+22
| | | | | | | | | | | 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
* Make -U once again honor -D after my change to consolidate settingDoug Barton2010-01-221-5/+5
| | | | | | | | | | of MTREEDB with DESTDIR. PR: bin/143089 Submitted by: Anton Yuzhaninov <citrin@citrin.ru> Notes: svn path=/head/; revision=202817
* Use the newly brought %U macro.Ruslan Ermilov2010-01-151-1/+1
| | | | Notes: svn path=/head/; revision=202386
* Oops, deleted one line too many. Add back the null case for IGNORE_MOTDDoug Barton2010-01-151-0/+1
| | | | Notes: svn path=/head/; revision=202340
* Now that we've officially arrived at FreeBSD 9, remove the IGNORE_MOTDDoug Barton2010-01-151-5/+2
| | | | | | | compat shim as advertised. This change should not be MFC'ed. Notes: svn path=/head/; revision=202339
* Update copyright dateDoug Barton2010-01-082-24/+30
| | | | | | | | | | | | | | 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
* If we are using -p it does not make any sense to even create theDoug Barton2009-12-311-2/+2
| | | | | | | MTREENEW file since it will never be used. Notes: svn path=/head/; revision=201323
* It's not necessary to include both Op and Fl for command line optionsDoug Barton2009-12-301-9/+11
| | | | | | | | | included in the text, so use only the latter. Clarify that using -U doesn't make sense in combination with -a Notes: svn path=/head/; revision=201293
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-06 11:34:31 +0000