From owner-svn-src-all@freebsd.org Tue Mar 24 01:07:03 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6B249275ADD; Tue, 24 Mar 2020 01:07:03 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48mY4R0d2kz3JGK; Tue, 24 Mar 2020 01:07:03 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9513B1F40F; Tue, 24 Mar 2020 01:07:02 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02O172MQ085881; Tue, 24 Mar 2020 01:07:02 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02O172Al085879; Tue, 24 Mar 2020 01:07:02 GMT (envelope-from manu@FreeBSD.org) Message-Id: <202003240107.02O172Al085879@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Tue, 24 Mar 2020 01:07:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r359265 - in head: etc release/scripts X-SVN-Group: head X-SVN-Commit-Author: manu X-SVN-Commit-Paths: in head: etc release/scripts X-SVN-Commit-Revision: 359265 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Mar 2020 01:07:03 -0000 Author: manu Date: Tue Mar 24 01:07:01 2020 New Revision: 359265 URL: https://svnweb.freebsd.org/changeset/base/359265 Log: pkgbase: Move device.hints from the runtime to the bootloader package 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 Modified: head/etc/Makefile head/release/scripts/mtree-to-plist.awk Modified: head/etc/Makefile ============================================================================== --- head/etc/Makefile Mon Mar 23 23:00:13 2020 (r359264) +++ head/etc/Makefile Tue Mar 24 01:07:01 2020 (r359265) @@ -93,7 +93,7 @@ distribution: .if ${MK_BOOT} != "no" .if exists(${SRCTOP}/sys/${MACHINE}/conf/GENERIC.hints) ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ - -T "package=runtime" \ + -T "package=bootloader,config" \ ${SRCTOP}/sys/${MACHINE}/conf/GENERIC.hints \ ${DESTDIR}/boot/device.hints .endif Modified: head/release/scripts/mtree-to-plist.awk ============================================================================== --- head/release/scripts/mtree-to-plist.awk Mon Mar 23 23:00:13 2020 (r359264) +++ head/release/scripts/mtree-to-plist.awk Tue Mar 24 01:07:01 2020 (r359265) @@ -28,9 +28,6 @@ tags=tags""_kernconf } } - if ($1 ~ /^\/boot\//) { - tags="package=bootloader" - } if (length(tags) == 0) next if (tags ~ /package=/) { @@ -39,6 +36,8 @@ for (i in a) { if (a[i] ~ /^package=/) { pkgname=a[i] + if ($1 ~ /^\/boot\//) + pkgname="bootloader" gsub(/package=/, "", pkgname) } else if (a[i] == "config") { type="config"