From nobody Mon Apr 29 14:31:59 2024 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 4VSm4H45hNz5JRTs; Mon, 29 Apr 2024 14:31:59 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VSm4H3dz3z4JYP; Mon, 29 Apr 2024 14:31:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714401119; 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=LEFMm6V1s+b/MTzSGvzdcA1aD0i6nz1gVtoaLuV4Tnc=; b=Nqz6XEFAs6jzYua1PMSHg7Xgryb8tpJeIdGFeR0Y3879yc3oEsFdUL/ol8XgzuyaAeloOO gNqeIbecive32vzOT5ofekoOxAmHh+NrZAHqAseuNoU10ThJfYsfbMVzfF4+07lIg7/uG9 hSb3beUV4jvlbB1gZxC7F7X2GkvFaL0o2ZotqKG9DIBS4eZngCfboogvBlQfTTI7ZhyHBt CQK3dkHrPM737TeTig/f9DWroCnB/i3YREqjPMjyw5GfClBd7ixxWXsNX9FEugEcmV/hRo 8nB+YIZ4Q/6tPzJRGMARvgk8n2lProhbXYNqQRIOMdOzByUx3BAKTDfVc4ElhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714401119; a=rsa-sha256; cv=none; b=yp1WmrfEA99rbRbn1AKpl3IkMmPPV8/ea4uLw4RCn0lWU9oLlUMbookeCBl6O6o42fKJg0 Ll7rqIVLng7vv/dcWzScrX8TZ/R1AnlhJbUzkGZA6zTOy6j0YxgOPvhiA6e2K3FBaMnyae ie/bsrocIa6oZ+8wRT2CJWusrkdlsd8pj1uYXrMoV93dOppcbrCcvhobQ5uuBh+IobtoZ5 7c6lO9jNorDemUgvoQKtXgeAXfvMfRAjfeIWnRgjfkhbZkxifKLrgBsQB/VLwVGPS+7G6d Pka4YdFTx4zLNl5iYS602CTL5RFto/mNUXTtfbomQ35qgnRQNRUyXubgJ+PjsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714401119; 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=LEFMm6V1s+b/MTzSGvzdcA1aD0i6nz1gVtoaLuV4Tnc=; b=uEuXYV4ctxiHiKYiLRYZsw1eltfherYx8eBza+6IATL7pgBr6JJZ5OFNVYX7lnFSJgRu5n yAGrwwH1eRzdDCzQ0Ino5J1gyYCfLQYIT9pyUqp19YY4hmsFqsj0JA5V5255X4wKeTEaKf u7+rS3l2MDIZOpcku4u9MRTKXqQtibyjvcF6ficKVXy9ORXm9+mfaR5eC7LszIXGada9SH GL+7szWUsCf9mq1/VPMOWF1rb/7I1YQI/cmMK1F6oXHDgh7gBNGQFnMoyPrT02HverbhGn t17fs63vpdQIL6vfGsDxdwko39l4Tp7rNAPowUKqroK3B7gVisOthAiHdVAnvw== 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 4VSm4H3FHdz1C8C; Mon, 29 Apr 2024 14:31:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43TEVxl7075902; Mon, 29 Apr 2024 14:31:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43TEVxD7075899; Mon, 29 Apr 2024 14:31:59 GMT (envelope-from git) Date: Mon, 29 Apr 2024 14:31:59 GMT Message-Id: <202404291431.43TEVxD7075899@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: e05b6502f9ca - main - package: fix dependency generation 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e05b6502f9ca36860236644884f12eff8e3243c4 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e05b6502f9ca36860236644884f12eff8e3243c4 commit e05b6502f9ca36860236644884f12eff8e3243c4 Author: Lexi Winter AuthorDate: 2024-04-29 14:30:46 +0000 Commit: Warner Losh CommitDate: 2024-04-29 14:31:36 +0000 package: fix dependency generation A bug in release/packages/generate-ucl.sh causes package dependencies (other than shlib depends) to not be generated correctly, meaning packages are missing their dependencies. generate-ucl.sh creates the UCL file by: 1. copying ${uclsource} (template.ucl) to ${uclfile} 2. appending dependencies to ${uclfile} 3. calling generate-ucl.lua on ${uclsource} to create ${uclfile} This breaks because the dependencies added in step 2 are overwritten in step 3. Fix this by calling generate-ucl.lua with ${uclfile} as both the input and output file, so anything we added to ${uclfile} is preserved. Reviewed by: des, imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1203 --- release/packages/generate-ucl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh index 6549e201e022..27adddad96c0 100755 --- a/release/packages/generate-ucl.sh +++ b/release/packages/generate-ucl.sh @@ -156,7 +156,7 @@ EOF PKG_WWW "${PKG_WWW}" \ PKG_MAINTAINER "${PKG_MAINTAINER}" \ UCLFILES "${srctree}/release/packages/" \ - ${uclsource} ${uclfile} + ${uclfile} ${uclfile} return 0 }