aboutsummaryrefslogtreecommitdiff
path: root/etc/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* packages: Rename unbound to local-unboundLexi Winter2025-10-151-1/+1
| | | | | | | | | | | | | This more accurately reflects its purpose, and its contents, since everything in the package is prefixed with "local-". While here, add a message on upgrade about regenerating the config. MFC after: 3 seconds Requested by: des Reviewed by: des Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53056
* etc, ypserv: Fix symlink creation for pkgbaseLexi Winter2025-10-021-8/+15
| | | | | | | | | | | | | | | | | | The Makefile logic for /etc/aliases, /var/yp/Makefile and /etc/unbound tries to avoid creating the symlink if it already exists in the target, but this breaks with pkgbase since the symlink won't be installed (and therefore won't be added to METALOG) if building with an existing worldstage, meaning it's missing from the generated package. Change the logic to forcibly install the symlink if NO_ROOT is defined, but keep the existing logic for non-package builds to avoid trashing the user's custom symlinks on non-pkgbase installworld. MFC after: 3 seconds Reported by: cperciva Reviewed by: cperciva, emaste Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D52834
* etc: Avoid duplicate gss files installationEd Maste2025-06-171-6/+0
| | | | | | | | | | | | | | | | | | | | From Cirrus-CI su user -c "/usr/libexec/flua tools/pkgbase/metalog_reader.lua \ -c /usr/obj/$(pwd -P)/${TARGET}.${TARGET_ARCH}/worldstage/METALOG" error: ./etc/gss/mech file repeated with same meta: line 2127,40175 error: ./etc/gss/qop file repeated with same meta: line 2128,40176 Prior to 1b735665f45a the Heimdal versions were installed via distribution: ${_+_}cd ${.CURDIR}/gss; ${MAKE} install 1b735665f45a added a conditional for MK_MITKRB5 but also added gss or gss-krb5 to SUBDIRS, causing these files to be installed twice. Fixes: 1b735665f45a ("etc/gss: Add MIT GSS glue") Event: Kitchener-Waterloo Hackathon 202506 Sponsored by: The FreeBSD Foundation
* etc/gss: Add MIT GSS glueCy Schubert2025-06-161-0/+10
| | | | | | | | | | | The MIT GSS uses different library names. And MIT KRB5 supports more OIDs than our ancient Heimdal does. The intention is to remove etc/gss when Heimdal is finally retired and rename etc/gss-krb5 to etc/gss. Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D50812
* etc: add config tag to /root/.k5loginLexi Winter2025-04-231-1/+1
| | | | | | | | | this prevents the file being overwritten every time FreeBSD-runtime is upgraded. Reviewed by: des Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D49907
* mtree: TESTSBASE directory always starts with a /Jose Luis Duran2025-01-241-1/+1
| | | | | | | | | | | Remove the extra forward slash ("/"), otherwise the mtree specification file will have the double slash and will not be parsed by makefs when attempting to build NanoBSD with NO_ROOT privileges. Fixes: 07670b30fa43 ("Create /usr/tests *.debug file directory hierarchy") Reviewed by: emaste Approved by: emaste (mentor) Differential Revision: https://reviews.freebsd.org/D47722
* Remove residual blank line at start of MakefileWarner Losh2024-07-151-1/+0
| | | | | | | This is a residual of the $FreeBSD$ removal. MFC After: 3 days (though I'll just run the command on the branches) Sponsored by: Netflix
* Don't package /var/db/locate.databaseMatthew Seaman2024-05-281-4/+0
| | | | | | | | | | | | | | | | | | | | | ... or install an empty file. The locate database is a mutable working file, and unsuitable to be managed by pkg(8). locate(1) copes gracefully with the absence of this file. Running /etc/periodic/weekly/310.locate will create the locate database with the correct ownership and permissions. Having the locate.database file as part of the FreeBSD-runtime package means it gets zeroed if ever that package gets updated, which is excessive, given that updating packages will typically only change a relatively small number of the _filenames_ on the system -- unlike the file contents. Plus it always causes it to flag as modified when verifying checksums, but /var/db/locate.database is expected to be modified by the user. MFC after: 1 week Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D45384
* pkgbase: separate /etc/mail/aliases from the sendmail packageBaptiste Daroussin2024-03-201-3/+7
| | | | | | | move /etc/aliases and /etc/mail/aliases into the runtime package this file is used by both sendmail and dma. While here mark this file as a config file so 3way merge is performed
* Proactively remove /usr/lib/kgdb file that became a directoryDimitry Andric2024-02-171-0/+1
| | | | | | | | | | | | | | | This was already handled in ObsoleteFiles.inc (see the 20201215 entry), but some people never run "make delete-old", or want to upgrade directly from a revision that still had the file to the most recent revision. They would then encounter a failure during installworld, similar to: install: /usr/libexec/kgdb exists but is not a directory Therefore, clean it up in the distrib-cleanup phase, similar to the earlier instances of libc++ header files that became a directory. MFC after: 3 days
* etc: Set DISTBASE during distribute for sub-makesJessica Clarke2024-01-301-2/+3
| | | | | | | | | | | | This is normally done by bsd.subdir.mk in its default distribute target, but since etc overrides it we don't get that behaviour. Currently it's not needed, but share/man's makedb (recursed into by etc's afterinstall) will need it in the following commit. Technically this is only needed for install, but do this for distribution too for completeness and consistency. Reviewed by: brooks, emaste Differential Revision: https://reviews.freebsd.org/D43675
* Proactively remove libc++ __tuple header file that became a directoryDimitry Andric2023-12-131-0/+1
| | | | | | | | | | | | | | | | | This was already handled in ObsoleteFiles.inc (see the 20230622 entry), but some people never run "make delete-old", or want to upgrade directly from a revision that still had libc++ 15 to the most recent revision. They would then encounter a failure during installworld, similar to: install: target directory `/usr/include/c++/v1/__tuple/' does not exist Therefore, clean it up in the distrib-cleanup phase, similar to the earlier instance of the libc++ __string header file that became a directory. PR: 273753 MFC after: 1 month
* misc: Remove ancient SCCS tags.Warner Losh2023-11-271-1/+0
| | | | | | | | | | | Remove ancient SCCS tags from the tree, automated scripting, with two minor fixup to keep things compiling. All the common forms in the tree were removed with a perl script. This is for the misfits that have only a few: COPYRIGHT, gnu, tools, rescue, and etc. Sponsored by: Netflix
* Remove $FreeBSD$: one-line sh patternWarner Losh2023-08-161-1/+0
| | | | Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/
* etc: Automatically generate BSD.lib${libcompat}.dist listsJessica Clarke2023-07-271-3/+7
| | | | | | | Note that each libcompat still has its own file that must exist. Reviewed by: brooks, jhb Differential Revision: https://reviews.freebsd.org/D41182
* etc: Don't create stray directories in NO_ROOT distrib-dirsJessica Clarke2023-06-081-1/+0
| | | | | | | | | | The loop above is responsible for creating the actual directories, whilst this one is just responsible for creating the corresponding METALOG. Since DESTDIR already includes DISTBASE, this results in creating a second set of roots (one per MTREES entry) within DISTBASE whenever DISTBASE is non-empty, such as base/base, base/base/var, base/base/usr, etc. in the distributeworld case. This is purely cosmetic though as they won't appear in the METALOG.
* rc.d: Generate machine-id from hostid_saveTijl Coosemans2023-03-091-2/+0
| | | | | | | | | | | | | | | | rc.d/hostid_save saves a UUID generated by rc.d/hostid in /etc/hostid. Store the same UUID, without hyphens, in /etc/machine-id. The hypĥens are removed with a shell function because hostid_save runs before file systems are mounted so other tools may not be available yet. This eliminates some duplication between hostid and machine-id and for virtual machines machine-id now contains the UUID configured in the hypervisor like it does on Linux. Reviewed by: delphij Discussed with: bapt MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D38811
* Merge llvm-project main llvmorg-15-init-17485-ga3e38b4a206bDimitry Andric2023-02-081-6/+4
| | | | | | | | This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvmorg-15-init-17485-ga3e38b4a206b. PR: 265425 MFC after: 2 weeks
* Add new rc: machine_id to generate /etc/machine-idTobias C. Berner2022-12-231-0/+2
| | | | | | | | | | | | | | | | | | | | | This new default-enabled rc will generate a /etc/machine-id file if it does not exist, and pre-fill it with a newly generated UUID of version 4 [2]. The file is generated in /var/db/machine-id and symlinked to /etc/machine-id to allow for read-only root partitions. This file is amongst other things used by libraries like GLib. Bump FreeBSD version 1400076 to be able to easily add support for older version of FreeBSD via a package. [1] Linux machine-id(5): https://www.man7.org/linux/man-pages/man5/machine-id.5.html [2] f176fe8e7f638e585afcd2f4dd52a522c4648f63 Approved by: bapt MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D37722
* Fix mergemaster(8) breakage in the 6ad780caa.Maxim Sobolev2022-09-131-0/+1
| | | | | | | | | | Split out termcap.small generation into its own Makefile under etc/termcap, so it's properly executed by the underlying command: make 'SUBDIR_OVERRIDE=etc' everything Reported by: gbe MFC after: 1 month
* etc: Fix distrib-dirs to not rely on a BSDismJessica Clarke2022-07-151-1/+1
| | | | | | | | | FreeBSD and macOS have a test that treats == as an alias for =, but Linux tends to use GNU coreutils (when not a builtin) which does not. Use the standard syntax instead for compatibility. Obtained from: CheriBSD Differential Revision: https://reviews.freebsd.org/D35811
* libsoft: Remove support for installing libsoftWarner Losh2022-01-071-4/+0
| | | | | | Remove the infrasturcture needed to create the libsoft directories. Sponsored by: Netflix
* pkgbase: Put the last sendmail files in the sendmail packageEmmanuel Vadot2021-06-191-2/+2
| | | | | Differential Revision: https://reviews.freebsd.org/D30757 Sponsored by: Diablotin Systems
* pkgbase: resolve mailer.conf conflict WITHOUT_SENDMAILKyle Evans2020-06-021-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When WITHOUT_SENDMAIL is set, we end up with two different mailer.conf that conflict, and hilarity ensues. There's currently three different places that we might install mailer.conf: - ^/etc/Makefile (package=runtime, contingent on MK_MAIL != no) - ^/libexec/dma/dmagent/Makefile (package=dma, contingent on MK_SENDMAIL != no) - ^/usr.sbin/mailwrapper/Makefile (package=utilities, contingent on not-installed) The mailwrapper installation will effectively never happen because the ^/etc one will first. This patch simplifies the whole situation; remove the ^/etc/Makefile version and install it primarily in mailwrapper if MK_MAILWRAPPER != "no". The scenarios covered in mailwrapper are: - sendmail(8) is installed, dma(8) may or may not be installed - neither sendmail(8) nor dma(8) is installed In the first scenario, sendmail(8) is dominant so we can go ahead and install the version in ^/etc/mail. In the unlisted scenario, sendmail(8) is not installed but dma(8) is, we'll let ^/libexec/dma/dmagent do the installation. In the second listed scenario, we still want to install an example mailer.conf so just install the base sendmail(8) version. Reviewed by: bapt MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D24924 Notes: svn path=/head/; revision=361720
* Normalize deployment tools usage and definitions by putting into one placeMaxim Sobolev2020-04-071-3/+1
| | | | | | | | | | | | instead of sprinkling them out over many disjoint files. This is a follow-up to achieve the same goal in an incomplete rev.348521. Approved by: imp MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D20520 Notes: svn path=/head/; revision=359685
* pkgbase: Move device.hints from the runtime to the bootloader packageEmmanuel Vadot2020-03-241-1/+1
| | | | | | | | | | | | | | | | | Also mark it as config file so if a user changes this file pkg will attempt to merge the new file upon an update. device.hints is neither related to runtime or loader but it make more sense to have it in loader in case some user delete /boot/ and wants to recreate it, now only two packages are required FreeBSD-bootloader and the kernel package. While here change where we override the package for files installed in /boot, this allow us to keep other tags (such as config). Reported by: pizzamig Reviewed by: bapt pizzamig emaste Differential Revision: https://reviews.freebsd.org/D24159 Notes: svn path=/head/; revision=359265
* Tag NLS aliases with pkgbase packageEd Maste2020-01-241-1/+2
| | | | | | | | | | | | | POSIX and en_US.US_ASCII are aliases (symlinks) to the C locale. They were not previously tagged with a pkgbase pacakge. Add the tag so that they are handled correctly on pkgbase-installed/updated systems. [This is r356990 reapplied with a corrected commit message.] Discussed with: manu Notes: svn path=/head/; revision=357080
* revert r356990 to reapply with correct commit messageEd Maste2020-01-241-2/+1
| | | | | | | Requested by: rgrimes Notes: svn path=/head/; revision=357079
* Tag NLS aliases with package=runtimeEd Maste2020-01-221-1/+2
| | | | | | | | | | | POSIX and en_US.US_ASCII are aliases (symlinks) to the C locale. They were not previously tagged with a pkgbase pacakge. Add the tag so that they are handled correctly on pkgbase-installed/updated systems. Discussed with: manu Notes: svn path=/head/; revision=356990
* Tag os-release symlink with package=runtimeKyle Evans2020-01-221-1/+1
| | | | | | | This ensures it gets into pkgbase-(installed/updated) systems. Notes: svn path=/head/; revision=356985
* Create /etc/os-release file.Warner Losh2019-11-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | Each boot, regenerate /var/run/os-release based on the currently running system. Create a /etc/os-release symlink pointing to this file (so that this doesn't create a new reason /etc can not be mounted read-only). This is compatible with what other systems do and is what the sysutil/os-release port attempted to do, but in an incomplete way. Linux, Solaris and DragonFly all implement this natively as well. The complete standard can be found at https://www.freedesktop.org/software/systemd/man/os-release.html Moving this to the base solves both the non-standard location problem with the port, as well as the lack of update of this file on system update. Bump __FreeBSD_version to 1300060 PR: 238953 Differential Revision: https://reviews.freebsd.org/D22271 Notes: svn path=/head/; revision=354922
* pkgbase: Add some tags to files installed in distribution targetEmmanuel Vadot2019-06-121-6/+10
| | | | | | | | | | | | | | Add the MK_MAIL dependant file to the runtime package as well as the MK_KERBEROS ones the empty locate database, the FreeBSD copyright file and the GENERIC.hints. Tag the unbound link from /etc to /var to belong in the unbound package. Reviewed by: bapt MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D20607 Notes: svn path=/head/; revision=348983
* Put back MTREE_CMD here for now. Doh, not my day, perhaps.Maxim Sobolev2019-06-031-0/+2
| | | | | | | Reported by: markj, mav Notes: svn path=/head/; revision=348589
* Leave mtree hardcoded for now. Reverting partially 348521 and alsoMaxim Sobolev2019-06-031-2/+0
| | | | | | | | | | the followup stopgap change, because I don't think it's a correct. I still need to figure out where to stick it in. In cannot be in Makefile.inc1 and it cannot be in etc/Makefile from the looks of it to avoid chicken-and-egg problem. Notes: svn path=/head/; revision=348532
* Fix several places where tool name has been hardcoded:Maxim Sobolev2019-06-021-0/+1
| | | | | | | | | | | | | | | | | install -> ${INSTALL} mtree -> ${MTREE_CMD} services_mkdb -> ${SERVICES_MKDB_CMD} cap_mkdb -> ${CAP_MKDB_CMD} pwd_mkdb -> ${PWD_MKDB_CMD} kldxref -> ${KLDXREF_CMD} If you do custom FreeBSD builds you may want to override those in some cases. Sponsored by: Sippy Software, Inc. Notes: svn path=/head/; revision=348521
* pkgbase: Move login.access to usb.bin/loginEmmanuel Vadot2019-05-221-12/+0
| | | | | | | | | | Also remove the etc-examples target as we don't have any files to handle here. Reviewed by: bapt Notes: svn path=/head/; revision=348102
* pkgbase: Move termcap.small to share/termcapEmmanuel Vadot2019-05-221-1/+1
| | | | | | | Reviewed by: bapt Notes: svn path=/head/; revision=348101
* pkgbase: Move rc.sendmail to libexec/rcEmmanuel Vadot2019-05-221-4/+0
| | | | | | | Reviewed by: bapt Notes: svn path=/head/; revision=348100
* pkgbase: Move rc.bsdextended to libexec/rcEmmanuel Vadot2019-05-221-1/+0
| | | | | | | Reviewed by: bapt Notes: svn path=/head/; revision=348099
* pkgbase: Move rc.firewall to libexec/rcEmmanuel Vadot2019-05-221-1/+0
| | | | | | | | | Put it with all the other rc files Reviewed by: bapt Notes: svn path=/head/; revision=348098
* Move master.passwd and group to lib/libc/gen/Brad Davis2019-05-161-16/+1
| | | | | | | | | | | libc was picked as the destination location for these because of the syscalls that use these files as the lowest level place they are referenced. Approved by: will (mentor), rgrimes, manu Differential Revision: https://reviews.freebsd.org/D16728 Notes: svn path=/head/; revision=347638
* Revert r347356 and r347371Emmanuel Vadot2019-05-131-12/+7
| | | | | | | | | | | passwd related files need to be tagged as config file so pkg update will attempt merging them when we install a new package. We should use CONFS for that. Revert for now until I come up with a better version of this patch as it breaks pkgbase for users. Notes: svn path=/head/; revision=347522
* etc/Makefile: Remove empty newlineEmmanuel Vadot2019-05-081-1/+0
| | | | | | | | | | | | This was commited accidently in r347356 and cause distribution with NO_ROOT set to fail. Reported by: ci, kib MFC after: 2 weeks X-MFC-With: r347356 Notes: svn path=/head/; revision=347371
* pkgbase: Deal with the last etc filesEmmanuel Vadot2019-05-081-7/+13
| | | | | | | | | | | | | Add tags=package=runtime for password related files. Add tags=package=sendmail for rc.sendmail Add tags=package=ipfw for rc.firewall Reviewed by: bapt MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D20173 Notes: svn path=/head/; revision=347356
* Simplify NLS alias handling by using native make(1) multi variable for loopsBaptiste Daroussin2018-11-041-5/+5
| | | | Notes: svn path=/head/; revision=340114
* Fix bad copy/pasteBaptiste Daroussin2018-11-041-2/+2
| | | | Notes: svn path=/head/; revision=340113
* Simplify a bit distrib-dirs targetBaptiste Daroussin2018-11-041-28/+22
| | | | | | | | Reviewed by: bdrewery Differential Revision: https://reviews.freebsd.org/D3915 Notes: svn path=/head/; revision=340112
* Move hosts.allow to lib/libwrap/Brad Davis2018-09-221-1/+0
| | | | | | | | | | This leverages CONFS to handle the install. Approved by: re (blanket, pkgbase), bapt (mentor) Differential Revision: https://reviews.freebsd.org/D17240 Notes: svn path=/head/; revision=338887
* Move the openssl.cnf install to secure/usr.bin/openssl/Brad Davis2018-09-201-8/+0
| | | | | | | | | | This leverages CONFS to do the install Approved by: re (pkgbase, blanket), bapt (mentor) Differential Revision: https://reviews.freebsd.org/D17245 Notes: svn path=/head/; revision=338825
* Move nsmb.conf to lib/libsmb/Brad Davis2018-09-201-2/+2
| | | | | | | | | | This leverages CONFS to do the install Approved by: re (pkgbase, blanket), bapt (mentor) Differential Revision: https://reviews.freebsd.org/D17243 Notes: svn path=/head/; revision=338824
generated by cgit v1.3 (git 2.53.0) at 2026-10-20 19:13:48 +0000