Attachment 255143 Details for Bug 269884 – let host's ports-mgmt/pkg do all the work

[patch] let host's ports-mgmt/pkg do all the work

0001a-nanoBSD-use-build-system-s-pkg-8-to-install-packages.patch (text/plain), 2.86 KB, created by embhd on 2024-11-13 18:12:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: embhd

Created: 2024-11-13 18:12:06 UTC

Size: 2.86 KB

patch

obsolete

>From 1a0f3e40290bd8211e27f90725f4eae9a3fbd40e Mon Sep 17 00:00:00 2001
>From: Michael <embhd@posteo.de>
>Date: Fri, 1 Dec 2023 19:58:29 +0100
>Subject: [PATCH 1/4] nanoBSD: use build system's pkg(8) to install packages
>
>Also, allow the NANO_PACKAGE_DIR to be linked ("find -L") in /usr/src/tools/tools/nanobsd.
>---
> tools/tools/nanobsd/defaults.sh | 24 +++++++-----------------
> 1 file changed, 7 insertions(+), 17 deletions(-)
>
>diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh
>index d9de03fe72d..b4f1f3466a3 100755
>--- a/tools/tools/nanobsd/defaults.sh
>+++ b/tools/tools/nanobsd/defaults.sh
>@@ -276,16 +276,6 @@ tgt_dir2symlink ( ) (
> 	fi
> )
> 
>-# run in the world chroot, errors fatal
>-CR ( ) {
>-	chroot "${NANO_WORLDDIR}" /bin/sh -exc "$*"
>-}
>-
>-# run in the world chroot, errors not fatal
>-CR0 ( ) {
>-	chroot "${NANO_WORLDDIR}" /bin/sh -c "$*" || true
>-}
>-
> clean_build ( ) (
> 	pprint 2 "Clean and create object directory (${MAKEOBJDIRPREFIX})"
> 
>@@ -498,7 +488,7 @@ run_late_customize ( ) (
> # a user's cfg file would override this.
> #
> fixup_before_diskimage ( ) (
>-	# Run the deduplication script that takes the matalog journal and
>+	# Run the deduplication script that takes the metalog journal and
> 	# combines multiple entries for the same file (see source for
> 	# details). We take the extra step of removing the size keywords. This
> 	# script, and many of the user scripts, copies, appeneds and otherwise
>@@ -739,7 +729,7 @@ cust_install_files ( ) (
> 	find . -print | grep -Ev '/(CVS|\.svn|\.hg|\.git)/' | cpio ${CPIO_SYMLINK} -Ldumpv ${NANO_WORLDDIR}
> 
> 	if [ -n "${NANO_CUST_FILES_MTREE}" -a -f ${NANO_CUST_FILES_MTREE} ]; then
>-		CR "mtree -eiU -p /" <${NANO_CUST_FILES_MTREE}
>+		chroot "${NANO_WORLDDIR}" /bin/sh -exc "mtree -eiU -p / <${NANO_CUST_FILES_MTREE}"
> 	fi
> )
> 
>@@ -749,7 +739,7 @@ cust_install_files ( ) (
> cust_pkgng ( ) (
> 	mkdir -p ${NANO_WORLDDIR}/usr/local/etc
> 	local PKG_CONF="${NANO_WORLDDIR}/usr/local/etc/pkg.conf"
>-	local PKGCMD="env BATCH=YES ASSUME_ALWAYS_YES=YES PKG_DBDIR=${NANO_PKG_META_BASE}/pkg SIGNATURE_TYPE=none /usr/sbin/pkg"
>+	local PKGCMD="env BATCH=YES ASSUME_ALWAYS_YES=YES PKG_DBDIR=${NANO_PKG_META_BASE}/pkg SIGNATURE_TYPE=none pkg -c ${NANO_WORLDDIR}"
> 
> 	# Ensure pkg.conf points pkg to where the package meta data lives.
> 	touch ${PKG_CONF}
>@@ -782,7 +772,7 @@ cust_pkgng ( ) (
> 	trap "umount ${NANO_WORLDDIR}/dev; umount ${NANO_WORLDDIR}/_.p ; rm -xrf ${NANO_WORLDDIR}/_.p" 1 2 15 EXIT
> 
> 	# Install pkg-* package
>-	CR "${PKGCMD} add /_.p/${_NANO_PKG_PACKAGE}"
>+	${PKGCMD} add /_.p/${_NANO_PKG_PACKAGE}
> 
> 	(
> 		# Expand any glob characters in pacakge list
>@@ -797,11 +787,11 @@ cust_pkgng ( ) (
> 
> 		# Install packages
> 		for _PKG in $_PKGS; do
>-			CR "${PKGCMD} add /_.p/${_PKG}"
>+			${PKGCMD} add /_.p/${_PKG}
> 		done
> 	)
> 
>-	CR0 "${PKGCMD} info"
>+	${PKGCMD} info || true
> 
> 	trap - 1 2 15 EXIT
> 	umount ${NANO_WORLDDIR}/dev
>-- 
>2.44.0
>

Actions: View | Diff

Attachments on bug 269884: 240489 | 244655 | 255143