From nobody Sat Sep 27 04:10:01 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 4cYYrV0Wpqz68gqc; Sat, 27 Sep 2025 04:10:02 +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 4cYYrT6sTZz3x7W; Sat, 27 Sep 2025 04:10:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758946202; 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=tsD6i8GF0a7lQg39h/x5Fd54CF2TJcDR+4eCss7DCR8=; b=EycOrH3dY+gSc74hTV3VbILlOu16f1e6xFcr4w2KLo2T0PCyeCKh0xBNxFNFtx0j5QC3G5 OJlr8idjUcO6zMfaSpu82SZFBM/4QV/BMS3/3FwHQVmjeFGxAXemab3vWZgDh142YkAg2M aS2clksNSMYPST+VwTOnP6QRDZ8PvKkhlrIHSRBVWRIiAogfNYSnQgrpqt/QkdYjgYOwAq yVnPltM4ex3MxYob3Rsyf7llqhuIsLBgkUd1M+Z+avH7VbMSg4tP8F2xqXFuHf7IXdv0Ya 4IlsndKWfQkbT3ah+VZZj3iSE7qni/d1i+g/4hK7n3018U/hivzW6ysR13NGyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758946202; 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=tsD6i8GF0a7lQg39h/x5Fd54CF2TJcDR+4eCss7DCR8=; b=hJAKL7dV4s50HB8h4smeM7eQdBUH+Z6BV2v3cm0vImNerNr2dB54HIAe8VlTUWlcCJCjl7 sxEg7IgZ00dLPMwzYSzvsEUJenuHJRNhsDuPdF5yLVhKXi+1mU2AdJeiU7m+r/P/WSZpDd ktOgOXX9N8lAcUizIp7RquWbZ370qJcJrjCmDGUhOjNzKOw4FiWDREL5U0ORFwjr7hTSsX ElpbzSAmm89rXcLP6A9umWp40hEf93MQ3wrsSPWEDhOl3RCVF6Jj9Cr8J2qeqgF5EnV0gq 9sDxbnbgCWDbKRKBjwUO50HcVyhGm1+eDLSq9uP6eLdCn6xq3t+/KmG07WAsJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758946202; a=rsa-sha256; cv=none; b=LCaMNztceRuVLEbmPbpaH/G9t1+nzD+XPLjBpeqO5tobNXo9BX7Lb0iPees58O1wRwtHYO VusSOSt2zTPHdHEBmcqkSoyIWyouGzNs96FXn6eR+9FQa01744yrR1nZEM2z55IJMWUxer J4KySGoMYukHNHtx2m62YHk58upVI5vZmDmudnsASYNbn514K2SRzEipTzluFp/XcIb9a7 /E7F5VSJ/mE1WJwcMURsN1pwPLVyV9cx5yMEtxP6yLkVsV+XK2IqaBWNU1WXg/kOxzfH8g Uv5lMc5QGbpYcqd5WJjnFL37xq+dasMwKg58KEXU/424kyLawxJs61T6ioUt/Q== 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 4cYYrT68Yzz2sK; Sat, 27 Sep 2025 04:10:01 +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 58R4A1oG024504; Sat, 27 Sep 2025 04:10:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58R4A1S4024499; Sat, 27 Sep 2025 04:10:01 GMT (envelope-from git) Date: Sat, 27 Sep 2025 04:10:01 GMT Message-Id: <202509270410.58R4A1S4024499@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: d2b670b27f37 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: d2b670b27f37df65d0db11182ed5a0873f6ad8e6 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=d2b670b27f37df65d0db11182ed5a0873f6ad8e6 commit d2b670b27f37df65d0db11182ed5a0873f6ad8e6 Author: Colin Percival AuthorDate: 2025-09-27 01:23:20 +0000 Commit: Colin Percival CommitDate: 2025-09-27 04:09:37 +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 (cherry picked from commit 523fece9d11e5d084c1d20d10d05971f5354d343) --- 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 73ab2b7cb250..425223747148 100644 --- a/release/Makefile +++ b/release/Makefile @@ -133,7 +133,7 @@ CLEANFILES+= ${I}.xz .if defined(WITH_DVD) && !empty(WITH_DVD) CLEANFILES+= pkg-stage .endif -CLEANDIRS= dist pkgdb pkgbase-repo pkgbase-repo-conf ftp disc1 disc1-disc1 disc1-memstick bootonly bootonly-bootonly bootonly-memstick dvd +CLEANDIRS= dist pkgdb-dvd pkgdb-disc1 pkgbase-repo pkgbase-repo-conf ftp disc1 disc1-disc1 disc1-memstick bootonly bootonly-bootonly bootonly-memstick dvd beforeclean: chflags -R noschg . .include @@ -220,7 +220,7 @@ disc1: ${PKGBASE_REPO} ${.CURDIR}/scripts/pkgbase-stage.lua disc \ ${.OBJDIR}/pkgbase-repo/${PKG_ABI}/latest \ ${.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 | \ @@ -318,7 +318,7 @@ dvd: ${PKGBASE_REPO} ${.CURDIR}/scripts/pkgbase-stage.lua dvd \ ${.OBJDIR}/pkgbase-repo/${PKG_ABI}/latest \ ${.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 6845e0079b05..56cb2dc758ec 100755 --- a/release/scripts/pkgbase-stage.lua +++ b/release/scripts/pkgbase-stage.lua @@ -89,6 +89,8 @@ 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]) assert(os.execute("mkdir -p pkgbase-repo-conf")) local f = assert(io.open("pkgbase-repo-conf/FreeBSD-base.conf", "w")) @@ -102,7 +104,7 @@ local function main() 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 ./pkgbase-repo-conf " + "-o INSTALL_AS_USER=1 -o PKG_DBDIR=" .. PKGDB .. " -R ./pkgbase-repo-conf " assert(os.execute(pkg .. "update"))