From nobody Wed Oct 30 20:57:22 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 4Xdzw320k2z5c1yx; Wed, 30 Oct 2024 20:57:23 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xdzw31Mypz4pkh; Wed, 30 Oct 2024 20:57:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730321843; 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=KzGoQT6GdsJsfxHhTrj1RsNhO823dMUCxhGpdCzSR5Y=; b=TRrS9LKdu5P3Z3RcG1xN8Ybd7TmptBTcLjXloG+xbISTc36hGDqll84p53tm/mWm0M4bx8 Ok3T8xW76CUuwwUYx+mCUfM1ZuZd0fD9AbobB4oLmehIdRxgSvyFxaZYtDjX5+eB3p6cVm Pwkp6qEKfPPB6QTyRlZjn/EUgyw9ifF1o11kYqtQHvSJgzdBn3J9ByNY8LR3cavbe0XVPT v17TNRGvoPLGnX+lBjoISfYsI8UtP6PUwe/fNpuwZH7jM7xyOT8Ub2Rhb1XhdVAzp9si7U 2cJ2sAfFr+bFAvPLVW2m5yZAMwhTWucOk4g92C1BfDck0PDO6edEhRW480R30Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730321843; 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=KzGoQT6GdsJsfxHhTrj1RsNhO823dMUCxhGpdCzSR5Y=; b=XsSvvAkvMBFfqQ8fpFvBJBaCCUGO69Cba/feBipaZjgoSmY9OS11zMgfhUJvUC8u7PkQvR JN9w8BX8NRksY7HKisD/sYoa0Sr7qpyvui81mKFGB9klHkkqyJheGuaiJGEi77pofuNKxz B5Z+YpJT3M4qe1NUTIupBidQf3lAjEe4+8b4OPhPsmyituzqRdZjCNQKhCft0M8H5KIf4E NFgNA5AgILeu4+c3J62lgj35iF4ZkurIPTdr0emq3rx5mR+eNo/dIsNMjDVqDxDSnorUNX vtAS8rnMazx48UjzkgEGNpjrp/GhOPiDEqq8nMteMhyYN/RvVtBo3kiUdBUROQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730321843; a=rsa-sha256; cv=none; b=eeJOvaIdaNU/agnys+/P/EBfsySdizx4nRTW2xeHuBl5gy0v7+4PdxAUbGMB3PE8rqecGP 60HarMzbBrsZs9rSkv4EX1TPZOoaAMJWGSeX3iPHpUGkNeD0eg2+YBcB/9aKS2l/6cQPVT k4Wm8um7vx9VfaOHRFzcdx5vTE/cc3bnNfbVLpcpmFRT8Js1Zc6SKEWNSiZ52RlNQT+JXl dYOOL2fDX4tEwVDNRqqBkjVoYhkh9hpP4A2IJAnHGO1AJ/x8wLm0yi6AuWk6YPzfR9YXnb NQOczqtLQCU9k0XjX8wKvzqu1KRzWmp0QDvuuaTs3Xj+Dw4BWy8/gmJgZzrkMQ== 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 4Xdzw30nmXz1Md9; Wed, 30 Oct 2024 20:57:23 +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 49UKvN2C033404; Wed, 30 Oct 2024 20:57:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49UKvM3h033401; Wed, 30 Oct 2024 20:57:22 GMT (envelope-from git) Date: Wed, 30 Oct 2024 20:57:22 GMT Message-Id: <202410302057.49UKvM3h033401@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eric Joyner Subject: git: cfcf4ea70de9 - stable/14 - Address module reproducibility issues 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: erj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cfcf4ea70de9637f8498cd4590bc9100e4deb323 Auto-Submitted: auto-generated The branch stable/14 has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=cfcf4ea70de9637f8498cd4590bc9100e4deb323 commit cfcf4ea70de9637f8498cd4590bc9100e4deb323 Author: Dan McGregor AuthorDate: 2024-05-09 23:37:52 +0000 Commit: Eric Joyner CommitDate: 2024-10-30 20:51:34 +0000 Address module reproducibility issues Use .PATH & bare filename. This prevents the real source path from being included in the built object, which improves reproducibility. Signed-off-by: Dan McGregor Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1211 (cherry picked from commit 8c2f6c3be0125142d3c1782e4b0ee0634c584b9e) --- sys/modules/ice_ddp/Makefile | 4 +++- sys/modules/qatfw/qat_200xx/Makefile | 2 +- sys/modules/qatfw/qat_4xxx/Makefile | 2 +- sys/modules/qatfw/qat_c3xxx/Makefile | 2 +- sys/modules/qatfw/qat_c4xxx/Makefile | 2 +- sys/modules/qatfw/qat_c62x/Makefile | 2 +- sys/modules/qatfw/qat_dh895xcc/Makefile | 2 +- 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/sys/modules/ice_ddp/Makefile b/sys/modules/ice_ddp/Makefile index 7329f0897325..e0ef344a8283 100644 --- a/sys/modules/ice_ddp/Makefile +++ b/sys/modules/ice_ddp/Makefile @@ -1,5 +1,7 @@ +.PATH: ${SRCTOP}/sys/contrib/dev/ice + KMOD= ice_ddp -FIRMWS= ${SRCTOP}/sys/contrib/dev/ice/ice-1.3.36.0.pkg:ice_ddp:0x01032400 +FIRMWS= ice-1.3.36.0.pkg:ice_ddp:0x01032400 .include diff --git a/sys/modules/qatfw/qat_200xx/Makefile b/sys/modules/qatfw/qat_200xx/Makefile index ce80b75f78fd..97ec5080f1c8 100644 --- a/sys/modules/qatfw/qat_200xx/Makefile +++ b/sys/modules/qatfw/qat_200xx/Makefile @@ -4,6 +4,6 @@ KMOD= qat_200xx_fw -FIRMWS= ${SRCTOP}/sys/contrib/dev/qat/qat_200xx.bin:qat_200xx_fw:111 ${SRCTOP}/sys/contrib/dev/qat/qat_200xx_mmp.bin:qat_200xx_mmp_fw:111 +FIRMWS= qat_200xx.bin:qat_200xx_fw:111 qat_200xx_mmp.bin:qat_200xx_mmp_fw:111 .include diff --git a/sys/modules/qatfw/qat_4xxx/Makefile b/sys/modules/qatfw/qat_4xxx/Makefile index e4d3ed495f8a..fb7171bcaf45 100644 --- a/sys/modules/qatfw/qat_4xxx/Makefile +++ b/sys/modules/qatfw/qat_4xxx/Makefile @@ -4,6 +4,6 @@ KMOD= qat_4xxx_fw -FIRMWS= ${SRCTOP}/sys/contrib/dev/qat/qat_4xxx.bin:qat_4xxx_fw:111 ${SRCTOP}/sys/contrib/dev/qat/qat_4xxx_mmp.bin:qat_4xxx_mmp_fw:111 +FIRMWS= qat_4xxx.bin:qat_4xxx_fw:111 qat_4xxx_mmp.bin:qat_4xxx_mmp_fw:111 .include diff --git a/sys/modules/qatfw/qat_c3xxx/Makefile b/sys/modules/qatfw/qat_c3xxx/Makefile index e0759fe3a99b..e5c8c0741fa2 100644 --- a/sys/modules/qatfw/qat_c3xxx/Makefile +++ b/sys/modules/qatfw/qat_c3xxx/Makefile @@ -4,6 +4,6 @@ KMOD= qat_c3xxx_fw -FIRMWS= ${SRCTOP}/sys/contrib/dev/qat/qat_c3xxx.bin:qat_c3xxx_fw:111 ${SRCTOP}/sys/contrib/dev/qat/qat_c3xxx_mmp.bin:qat_c3xxx_mmp_fw:111 +FIRMWS= qat_c3xxx.bin:qat_c3xxx_fw:111 qat_c3xxx_mmp.bin:qat_c3xxx_mmp_fw:111 .include diff --git a/sys/modules/qatfw/qat_c4xxx/Makefile b/sys/modules/qatfw/qat_c4xxx/Makefile index 7e859dcbd989..8b4e0cda6746 100644 --- a/sys/modules/qatfw/qat_c4xxx/Makefile +++ b/sys/modules/qatfw/qat_c4xxx/Makefile @@ -4,6 +4,6 @@ KMOD= qat_c4xxx_fw -FIRMWS= ${SRCTOP}/sys/contrib/dev/qat/qat_c4xxx.bin:qat_c4xxx_fw:111 ${SRCTOP}/sys/contrib/dev/qat/qat_c4xxx_mmp.bin:qat_c4xxx_mmp_fw:111 +FIRMWS= qat_c4xxx.bin:qat_c4xxx_fw:111 qat_c4xxx_mmp.bin:qat_c4xxx_mmp_fw:111 .include diff --git a/sys/modules/qatfw/qat_c62x/Makefile b/sys/modules/qatfw/qat_c62x/Makefile index ac1636b81e56..0385653bc7ff 100644 --- a/sys/modules/qatfw/qat_c62x/Makefile +++ b/sys/modules/qatfw/qat_c62x/Makefile @@ -4,6 +4,6 @@ KMOD= qat_c62x_fw -FIRMWS= ${SRCTOP}/sys/contrib/dev/qat/qat_c62x.bin:qat_c62x_fw:111 ${SRCTOP}/sys/contrib/dev/qat/qat_c62x_mmp.bin:qat_c62x_mmp_fw:111 +FIRMWS= qat_c62x.bin:qat_c62x_fw:111 qat_c62x_mmp.bin:qat_c62x_mmp_fw:111 .include diff --git a/sys/modules/qatfw/qat_dh895xcc/Makefile b/sys/modules/qatfw/qat_dh895xcc/Makefile index 7a377c088081..d277e3dc02f7 100644 --- a/sys/modules/qatfw/qat_dh895xcc/Makefile +++ b/sys/modules/qatfw/qat_dh895xcc/Makefile @@ -4,6 +4,6 @@ KMOD= qat_dh895xcc_fw -FIRMWS= ${SRCTOP}/sys/contrib/dev/qat/qat_895xcc.bin:qat_dh895xcc_fw:111 ${SRCTOP}/sys/contrib/dev/qat/qat_895xcc_mmp.bin:qat_dh895xcc_mmp_fw:111 +FIRMWS= qat_895xcc.bin:qat_dh895xcc_fw:111 qat_895xcc_mmp.bin:qat_dh895xcc_mmp_fw:111 .include