FreeBSD source tree https://cgit-dev.freebsd.org/src/atom?h=stable%2F14 2024-03-27T08:31:47Z 2024-03-27T08:31:47Z Baptiste Daroussin bapt@FreeBSD.org 2024-01-31T12:42:16Z urn:sha1:099bd9e6ab8fd563587ccff84f33349a193f208e Rework how ucl manifest are generated leveraging ucl features and flua now the ucl generation is done via a lua script which uses libucl to ingest the template and use variables as defined in its command line. the template will include only if it exist a ucl file named after the package name which will complement the template or overwrite what was defined in the template if defined in this specific ucl file this allows to overwrite license, but add script only to the packages who actually needs them. As a results the post install scripts are now only added to the right package and not also added to the subpackages like -man or -dev Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44374 (cherry picked from commit f8e46fd61e055fcc767c2038d867f58c38e43ec3) 2023-08-16T17:55:03Z Warner Losh imp@FreeBSD.org 2023-08-16T17:55:03Z urn:sha1:d0b2dbfa0ecf2bbc9709efc5e20baf8e4b44bbbf Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/ 2020-08-11T08:42:24Z Emmanuel Vadot manu@FreeBSD.org 2020-08-11T08:42:24Z urn:sha1:82087d4b689e2478d2dcc00408d4c7f471cd88f1 This is useful for downstream users to customize the packages. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D26019 2020-08-06T16:11:30Z Emmanuel Vadot manu@FreeBSD.org 2020-08-06T16:11:30Z urn:sha1:1931aa942f90a34dbb4518f9f97f0a17ab880735 This is not needed and we don't do that for other packages. 2018-03-14T14:45:57Z Kyle Evans kevans@FreeBSD.org 2018-03-14T14:45:57Z urn:sha1:fb6d3be5db866009b5a1b5e438203521328b7219 kernel.ucl uses a hardcoded boot/kernel for kldxref, which is the incorrect directory when we're installing extra kernels that aren't the "default" kernel (placed at boot/kernel). Fix this by instead using a new %KERNELDIR% that we now replace in Makefile.inc1 with "kernel" for the default kernel and "kernel.${_kernel}" for these extra kernels so that, e.g. /boot/kernel.SHIVA, will get properly kldxref'd upon update and avoid outdated linker.hints. Reviewed by: gjb MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D14689 2017-08-15T15:13:33Z Glen Barber gjb@FreeBSD.org 2017-08-15T15:13:33Z urn:sha1:53d1eddd44d1b7d350a9f6974d0f5a8de148a9fb Disconnect the dependency on the kernel package from the runtime package. There are a number of problems here: 1) The runtime package installed into a chroot or a jail would include the kernel package, changing the behavior of how jails work now [1]; 2) As result of (1), it is possible a binary may incorrectly resolve kernel symbols [2]; in addition, it is possible there will be unexpected fallout with 32-bit jails on a 64-bit host kernel [2]. Noticed by: brd [1] Discussed with: kib [2] MFC after: 3 days MFC note: record-only to wipe from the merge tracker Sponsored by: The FreeBSD Foundation 2017-08-11T19:21:40Z Glen Barber gjb@FreeBSD.org 2017-08-11T19:21:40Z urn:sha1:ebd2eeb3f84b9a1885b904e1ddd70470b45687e0 svnversion metadata to the runtime and kernel packages. Instead of traversing src/sys, as is done by newvers.sh for uname(1), a full tree walk is done to prevent userland and/or modifications from not being reflected in a modified tree (M). MFC after: 5 days Sponsored by: The FreeBSD Foundation 2017-08-10T13:32:04Z Glen Barber gjb@FreeBSD.org 2017-08-10T13:32:04Z urn:sha1:268db560d58918e5287f01aa929a9e26a275ce05 Use PPID and PID to kill off the pre-install and parent pkg(8) processes unless 'Y' or 'y' are entered at the prompt if the user wants to proceed with upgrading the kernel and userland at the same time. This restores some of the logic and intent of r322327, with the caveat of printing "child process terminated unexpectedly." MFC after: 5 days MFC with: r322327, r322352 Sponsored by: The FreeBSD Foundation 2017-08-10T12:30:34Z Glen Barber gjb@FreeBSD.org 2017-08-10T12:30:34Z urn:sha1:65fbf6644d387e01e81ba5ad8484d12be359969a It appears I misunderstand process forking and signal handling in how the pre-/post-install scripts are executed internally by pkg(8). In some cases (not all), ^C when prompted to cancel the kernel package update will stop the pre-install script from executing, but allow pkg(8) to continue extracting the package when it is not the intent. In order to keep somewhat of an anti-footshooting measure in place, print the recommendation to install the kernel package first if ASSUME_ALWAYS_YES is false and TERM is set, then sleep for 5 seconds to allow the user to see the message. MFC after: 5 days MFC with: r322327 X-MFC-Note: Maybe not until I am happy with this.. Sponsored by: The FreeBSD Foundation 2017-08-09T19:16:54Z Glen Barber gjb@FreeBSD.org 2017-08-09T19:16:54Z urn:sha1:16398a1141de7696775b88cba9d14c780faf1d42 The idea here is that, provided upstream pkg(8) maintainers accept the proposed change, the kernel.ucl will contain a post-install script causing pkg(8) to emit a message informing to reboot the system after the kernel is upgraded using 'pkg upgrade', so the new userland is installed on the running new kernel. At present, this functionality does not exist in pkg(8), but will help ensure the upgrade path follows that from UPDATING. To work around this for now, evaluate ASSUME_ALWAYS_YES, and prompt the user if they wish to proceed if not set to true. Since there is a kernel dependency, and a non-GENERIC kernel may be in use, update Makefile.inc1 to replace '%KERNCONF%' in the runtime.ucl with the first-built kernel set either via command line or in make.conf(5). MFC after: 5 days Sponsored by: The FreeBSD Foundation