From nobody Sat Sep 27 04:08:10 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cYYpM1qhDz68ghZ; Sat, 27 Sep 2025 04:08:11 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cYYpM0x9Bz3wnJ; Sat, 27 Sep 2025 04:08:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758946091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/slHvjb+qCAUD5i3qLrWdPTIjy8BIOKntey29AHoB/o=; b=WnvqzoB68Bi2D1OHl5zeTCpcbU88EypxAW94TvpoyJzWy/tHG+7ueWtS3ta017lZ7FJoCj UnmUsYbCBgDyq9xA5erUyjUugAzOXTLczFqJWQYIdg8Bu+zBxkAC02J7KzST6L2ZyKF7ad e0AAzIWFfff39+eq+R7zOjE27S+bdfS1E+ZLLNz69CBIlohS6/wTzhHFJwX11dtKCWXeOy 7VfYKx5HcMCwSgToSjoQ+R9WgV50lZedVxWoHB+yRVdAn6CwLeOAqAP8zbTaXwcdVMr3BX qd1JfB2ycOlQPzRDARLi6XSx26XTTCmfFpZdSRM6Fc7atAAYYjHjJtObR/TuJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758946091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/slHvjb+qCAUD5i3qLrWdPTIjy8BIOKntey29AHoB/o=; b=UJX1mNDPYodX9u9qCvm97QBxC9X7uwrQj0S/gyuIywNQ+0jGBHEeSgkjzWTj/mkaNICUgA fg1+HavmQA6aOdHYxf1PJgufcfZYw7aeF1mrxJTelxYv5mmzU5cXMOsvib3pzAZgNLF6qz zbH7Z7wWnSSAyT7pNDMe8aoIUCLa2A0sYGDgRkrBQ4ooCOSHVa6ctWMjMYnh5GseBdWIEr 4BINWpL6SulqMklAHyfiPRkVgtQVi306DuSQYc826cWFtfZHFSFgxdJ/+2ZzIIgkAtBDdV ZNcGTONSgiDj2O1IrX3AsJxNnYnQg2x2D8S8w7N5A0rKWjea/xfD3N5R2btQ3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758946091; a=rsa-sha256; cv=none; b=vZBnfB6l4pfuSMsKtM7TE8W6M0AnYDdXm73UM4BCbIdR6L/3AJ8bk56QdPX3viycTgU0oa u64R6QgnyEBgacS+XLVcvrfLV/1VKR24HyEUZ8BDVAPGw0t8Q8E/2+e5lJpSCdIGdcyxt1 vQVFmg6+QBh4JdoZjKdqrIlCDGMgNboJJSBU8SFNZqkSaNRYwD7xT5j/gKC6ctx6GRpzU+ h36nAC9W2wDSzD+3OR4lZ5wKJoLXaZpF15kw6r7IFmLLpdRBpBeYZ2zxQkgN6FErReqVPf fz2nc2xKy9OiAVc/z9scTc3mY5srWAqh6yci8vdw7Ezj6GtEngxLUgvcozrdPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cYYpM0P5cz2hc; Sat, 27 Sep 2025 04:08:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58R48Anc021892; Sat, 27 Sep 2025 04:08:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58R48Aub021889; Sat, 27 Sep 2025 04:08:10 GMT (envelope-from git) Date: Sat, 27 Sep 2025 04:08:10 GMT Message-Id: <202509270408.58R48Aub021889@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 523fece9d11e - main - pkgbase-stage: Use unique PKG_DBDIR List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 523fece9d11e5d084c1d20d10d05971f5354d343 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=523fece9d11e5d084c1d20d10d05971f5354d343 commit 523fece9d11e5d084c1d20d10d05971f5354d343 Author: Colin Percival AuthorDate: 2025-09-27 01:23:20 +0000 Commit: Colin Percival CommitDate: 2025-09-27 04:08:00 +0000 pkgbase-stage: Use unique PKG_DBDIR Prior to this commit, pkgbase-stage.lua used a hard-coded PKG_DBDIR "./pkgdb"; unfortunately this creates a race condition if we start building disc1.iso and dvd1.iso at the same time pkg: sqlite error while executing CREATE TABLE licenses [...] in file pkgdb.c:2330: table licenses already exists since pkg checks to see if the pkgdb is initialized and initializes it if not. Use separate pkgdb-disc1 and pkgdb-dvd directories. MFC after: 1 minute Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D52755 --- release/Makefile | 6 +++--- release/scripts/pkgbase-stage.lua | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/release/Makefile b/release/Makefile index d131a36157d7..82617c1f4dd7 100644 --- a/release/Makefile +++ b/release/Makefile @@ -134,7 +134,7 @@ CLEANFILES+= ${I}.xz .if defined(WITH_DVD) && !empty(WITH_DVD) CLEANFILES+= pkg-stage .endif -CLEANDIRS= dist pkgdb pkgbase-repo pkgbase-repo-dir ftp disc1 disc1-disc1 disc1-memstick bootonly bootonly-bootonly bootonly-memstick dvd +CLEANDIRS= dist pkgdb-dvd pkgdb-disc1 pkgbase-repo pkgbase-repo-dir ftp disc1 disc1-disc1 disc1-memstick bootonly bootonly-bootonly bootonly-memstick dvd beforeclean: chflags -R noschg . .include @@ -229,7 +229,7 @@ disc1: ${PKGBASE_REPO_DIR} ${.CURDIR}/scripts/pkgbase-stage.lua disc \ ${.OBJDIR}/pkgbase-repo-dir \ ${.TARGET}/usr/freebsd-packages/offline \ - "${_ALL_libcompats}" ${PKG_ABI} + "${_ALL_libcompats}" ${PKG_ABI} ${.OBJDIR}/pkgdb-disc1 cp ${.CURDIR}/scripts/FreeBSD-base-offline.conf \ ${.TARGET}/usr/freebsd-packages/repos/ mtree -c -p ${.TARGET}/usr/freebsd-packages | \ @@ -329,7 +329,7 @@ dvd: ${PKGBASE_REPO_DIR} ${.CURDIR}/scripts/pkgbase-stage.lua dvd \ ${.OBJDIR}/pkgbase-repo-dir \ ${.TARGET}/usr/freebsd-packages/offline \ - "${_ALL_libcompats}" ${PKG_ABI} + "${_ALL_libcompats}" ${PKG_ABI} ${.OBJDIR}/pkgdb-dvd cp ${.CURDIR}/scripts/FreeBSD-base-offline.conf \ ${.TARGET}/usr/freebsd-packages/repos/ mtree -c -p ${.TARGET}/usr/freebsd-packages | \ diff --git a/release/scripts/pkgbase-stage.lua b/release/scripts/pkgbase-stage.lua index 80de4ec80d20..efc4f8af0cbf 100755 --- a/release/scripts/pkgbase-stage.lua +++ b/release/scripts/pkgbase-stage.lua @@ -89,10 +89,12 @@ local function main() local all_libcompats = assert(arg[4]) -- ABI of repository local ABI = assert(arg[5]) + -- pkgdb to use + local PKGDB = assert(arg[6]) local pkg = "pkg -o ASSUME_ALWAYS_YES=yes -o IGNORE_OSVERSION=yes " .. "-o ABI=" .. ABI .. " " .. - "-o INSTALL_AS_USER=1 -o PKG_DBDIR=./pkgdb -R " .. repo_dir .. " " + "-o INSTALL_AS_USER=1 -o PKG_DBDIR=" .. PKGDB .. " -R " .. repo_dir .. " " assert(os.execute(pkg .. "update"))