git: cfcf4ea70de9 - stable/14 - Address module reproducibility issues

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Eric Joyner <erj_at_FreeBSD.org>
Date: Wed, 30 Oct 2024 20:57:22 UTC
The branch stable/14 has been updated by erj:

URL: https://cgit.FreeBSD.org/src/commit/?id=cfcf4ea70de9637f8498cd4590bc9100e4deb323

commit cfcf4ea70de9637f8498cd4590bc9100e4deb323
Author:     Dan McGregor <dan.mcgregor@usask.ca>
AuthorDate: 2024-05-09 23:37:52 +0000
Commit:     Eric Joyner <erj@FreeBSD.org>
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 <dan.mcgregor@usask.ca>
    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 <bsd.kmod.mk>
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 <bsd.kmod.mk>
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 <bsd.kmod.mk>
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 <bsd.kmod.mk>
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 <bsd.kmod.mk>
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 <bsd.kmod.mk>
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 <bsd.kmod.mk>