summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomoaki AOKI <junchoon@dec.sakura.ne.jp>2025-05-12 01:30:31 -0700
committerKevin Bowling <kbowling@FreeBSD.org>2025-05-12 01:33:28 -0700
commit9506d5a4e7134abd57d5d001edb1a092c11d1291 (patch)
tree85c746b2ae24f37cf7ddfcd44bb60fd25ec791b0
parentnet-mgmt/victoria-logs: upgrade to 1.22.2 (diff)
x11/nvidia-driver, x11/linux-nvidia-libs: Split and distribute distinfo per-slave-ports
Currently, upgrades for legacy versions of x11/nvidia-driver and x11/linux-nvidia-libs are often delayed, due to the conflicts with master port and forgotton. This is usually because master and slave (legacy) ports shares distinfo, causing races between multiple upgrades, even upgrades for legacy ones are trivial. This update splits distinfo into master and each slave (legacy) ports to avoid races unless master Makefile(s) needs updates for to-be-upgraded slave ports. update-distinfo target is removed, you can use the standard 'make makesum' in each port now. Reviewed by: arrowd Differential Revision: https://reviews.freebsd.org/D50142
Diffstat
-rw-r--r--x11/linux-nvidia-libs-304/distinfo5
-rw-r--r--x11/linux-nvidia-libs-340/distinfo5
-rw-r--r--x11/linux-nvidia-libs-390/distinfo5
-rw-r--r--x11/linux-nvidia-libs-470/distinfo3
-rw-r--r--x11/linux-nvidia-libs/Makefile6
-rw-r--r--x11/linux-nvidia-libs/distinfo14
-rw-r--r--x11/nvidia-driver-304/distinfo5
-rw-r--r--x11/nvidia-driver-340/distinfo5
-rw-r--r--x11/nvidia-driver-390/distinfo5
-rw-r--r--x11/nvidia-driver-470/distinfo3
-rw-r--r--x11/nvidia-driver/Makefile6
-rw-r--r--x11/nvidia-driver/Makefile.common13
-rw-r--r--x11/nvidia-driver/distinfo14
13 files changed, 48 insertions, 41 deletions
diff --git a/x11/linux-nvidia-libs-304/distinfo b/x11/linux-nvidia-libs-304/distinfo
new file mode 100644
index 000000000000..6a3f205353ca
--- /dev/null
+++ b/x11/linux-nvidia-libs-304/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1745330825
+SHA256 (NVIDIA-Linux-x86_64-304.137.run) = eb1f56db3a2bea13e3ccde7b5ae14abe8cd6c6dbe69af4c71c68a623cc96e3e2
+SIZE (NVIDIA-Linux-x86_64-304.137.run) = 70087133
+SHA256 (NVIDIA-Linux-x86-304.137.run) = ca98379fc2090bdfe8b74113d6ac7bcc7eadbd86a489c3c4ec4cd5ba9f6064f8
+SIZE (NVIDIA-Linux-x86-304.137.run) = 41504115
diff --git a/x11/linux-nvidia-libs-340/distinfo b/x11/linux-nvidia-libs-340/distinfo
new file mode 100644
index 000000000000..5bed76394217
--- /dev/null
+++ b/x11/linux-nvidia-libs-340/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1745330825
+SHA256 (NVIDIA-Linux-x86_64-340.108.run) = c671d4f1b7c09bc1af079b98b447adb06d704b04f802f7045a611fa50133b71b
+SIZE (NVIDIA-Linux-x86_64-340.108.run) = 70165522
+SHA256 (NVIDIA-Linux-x86-340.108.run) = 2032aad612d9f3af1aecf979cfdfe423d79aa76929ef8bf8d3a403076f507cca
+SIZE (NVIDIA-Linux-x86-340.108.run) = 38902892
diff --git a/x11/linux-nvidia-libs-390/distinfo b/x11/linux-nvidia-libs-390/distinfo
new file mode 100644
index 000000000000..5efdd1127a47
--- /dev/null
+++ b/x11/linux-nvidia-libs-390/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1745330825
+SHA256 (NVIDIA-Linux-x86_64-390.157.run) = 5bebbca6e8fed5d6b9d81070fb9e351f18edc534952553cbdc71e8fd0b9b328a
+SIZE (NVIDIA-Linux-x86_64-390.157.run) = 85835541
+SHA256 (NVIDIA-Linux-x86-390.157.run) = 55d65e0a4539a9cb796200c5f1082fe263fb0951deaaf96a9cffeb8a80f70799
+SIZE (NVIDIA-Linux-x86-390.157.run) = 49417041
diff --git a/x11/linux-nvidia-libs-470/distinfo b/x11/linux-nvidia-libs-470/distinfo
new file mode 100644
index 000000000000..638b92465c70
--- /dev/null
+++ b/x11/linux-nvidia-libs-470/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1745330825
+SHA256 (NVIDIA-Linux-x86_64-470.256.02.run) = d6451862deb695bb0447f3b7cd6268f73e81168c10e2c10597ff3fa01349b1de
+SIZE (NVIDIA-Linux-x86_64-470.256.02.run) = 272850014
diff --git a/x11/linux-nvidia-libs/Makefile b/x11/linux-nvidia-libs/Makefile
index 3d0cba6ba83d..865043131384 100644
--- a/x11/linux-nvidia-libs/Makefile
+++ b/x11/linux-nvidia-libs/Makefile
@@ -16,6 +16,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
.include "${.CURDIR}/../nvidia-driver/Makefile.version"
.include "${.CURDIR}/../nvidia-driver/Makefile.common"
+# Choose proper distinfo file using PKGNAMESUFFIX for slave ports.
+# Kept for switching to centralized distinfo with suffixes.
+.ifdef PKGNAMESUFFIX
+DISTINFO_FILE= ${.CURDIR}/distinfo
+.endif
+
.if ${DISTVERSION:R} > 390
PORTSCOUT= limit:\.\d+$$ # ignore *-no-compat32 distfiles
.else
diff --git a/x11/linux-nvidia-libs/distinfo b/x11/linux-nvidia-libs/distinfo
index 64d1e1b7c892..ac2b63f695d8 100644
--- a/x11/linux-nvidia-libs/distinfo
+++ b/x11/linux-nvidia-libs/distinfo
@@ -1,17 +1,3 @@
TIMESTAMP = 1745330825
SHA256 (NVIDIA-Linux-x86_64-570.144.run) = c0b8d7ecf2e20b83767674bab8fee4d1323dc55580274d8e934635e8955f3be6
SIZE (NVIDIA-Linux-x86_64-570.144.run) = 375742470
-SHA256 (NVIDIA-Linux-x86_64-470.256.02.run) = d6451862deb695bb0447f3b7cd6268f73e81168c10e2c10597ff3fa01349b1de
-SIZE (NVIDIA-Linux-x86_64-470.256.02.run) = 272850014
-SHA256 (NVIDIA-Linux-x86_64-390.157.run) = 5bebbca6e8fed5d6b9d81070fb9e351f18edc534952553cbdc71e8fd0b9b328a
-SIZE (NVIDIA-Linux-x86_64-390.157.run) = 85835541
-SHA256 (NVIDIA-Linux-x86-390.157.run) = 55d65e0a4539a9cb796200c5f1082fe263fb0951deaaf96a9cffeb8a80f70799
-SIZE (NVIDIA-Linux-x86-390.157.run) = 49417041
-SHA256 (NVIDIA-Linux-x86_64-340.108.run) = c671d4f1b7c09bc1af079b98b447adb06d704b04f802f7045a611fa50133b71b
-SIZE (NVIDIA-Linux-x86_64-340.108.run) = 70165522
-SHA256 (NVIDIA-Linux-x86-340.108.run) = 2032aad612d9f3af1aecf979cfdfe423d79aa76929ef8bf8d3a403076f507cca
-SIZE (NVIDIA-Linux-x86-340.108.run) = 38902892
-SHA256 (NVIDIA-Linux-x86_64-304.137.run) = eb1f56db3a2bea13e3ccde7b5ae14abe8cd6c6dbe69af4c71c68a623cc96e3e2
-SIZE (NVIDIA-Linux-x86_64-304.137.run) = 70087133
-SHA256 (NVIDIA-Linux-x86-304.137.run) = ca98379fc2090bdfe8b74113d6ac7bcc7eadbd86a489c3c4ec4cd5ba9f6064f8
-SIZE (NVIDIA-Linux-x86-304.137.run) = 41504115
diff --git a/x11/nvidia-driver-304/distinfo b/x11/nvidia-driver-304/distinfo
new file mode 100644
index 000000000000..20b13a844320
--- /dev/null
+++ b/x11/nvidia-driver-304/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1745330770
+SHA256 (NVIDIA-FreeBSD-x86_64-304.137.tar.gz) = 231693189e1bdf5c1dd02315cde5ef9ed6c0854564314438f2f40f9788a34120
+SIZE (NVIDIA-FreeBSD-x86_64-304.137.tar.gz) = 36474676
+SHA256 (NVIDIA-FreeBSD-x86-304.137.tar.gz) = 5f874133853eacc5b9a10311cec22d3c4898db7f75b92bb6c12d5be5126516fb
+SIZE (NVIDIA-FreeBSD-x86-304.137.tar.gz) = 35399011
diff --git a/x11/nvidia-driver-340/distinfo b/x11/nvidia-driver-340/distinfo
new file mode 100644
index 000000000000..c0021333f8b8
--- /dev/null
+++ b/x11/nvidia-driver-340/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1745330770
+SHA256 (NVIDIA-FreeBSD-x86_64-340.108.tar.gz) = f58fc793995008fd07719e3d001b1ad4b3547cfbc7084aec769098daa02e336f
+SIZE (NVIDIA-FreeBSD-x86_64-340.108.tar.gz) = 61500286
+SHA256 (NVIDIA-FreeBSD-x86-340.108.tar.gz) = 87b8523fb29e2bf51c2daf555e6dc46bbc6e5fd76b07a2034d3a5485a7cf99bf
+SIZE (NVIDIA-FreeBSD-x86-340.108.tar.gz) = 60616768
diff --git a/x11/nvidia-driver-390/distinfo b/x11/nvidia-driver-390/distinfo
new file mode 100644
index 000000000000..d3ee532cfe8a
--- /dev/null
+++ b/x11/nvidia-driver-390/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1745330770
+SHA256 (NVIDIA-FreeBSD-x86_64-390.157.tar.gz) = 51db7d824e9f190a0bff792f520cab029a10c94aedf92ab267fb5916a2f272b0
+SIZE (NVIDIA-FreeBSD-x86_64-390.157.tar.gz) = 65337455
+SHA256 (NVIDIA-FreeBSD-x86-390.157.tar.gz) = 2553ea15568dea95714a8560075c84af8a797f290f2621fb6986d0d105bab247
+SIZE (NVIDIA-FreeBSD-x86-390.157.tar.gz) = 65983616
diff --git a/x11/nvidia-driver-470/distinfo b/x11/nvidia-driver-470/distinfo
new file mode 100644
index 000000000000..c77db45532f1
--- /dev/null
+++ b/x11/nvidia-driver-470/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1745330770
+SHA256 (NVIDIA-FreeBSD-x86_64-470.256.02.tar.xz) = 40d787fae82d653893b08afac4e0ec37a88f37154406bfb13d02bfc986881f5c
+SIZE (NVIDIA-FreeBSD-x86_64-470.256.02.tar.xz) = 99491020
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 629e1a69a5ac..32daf36722b1 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -33,6 +33,12 @@ LICENSE_FILE= ${WRKSRC}/doc/license.txt
# to end up depending on non existing libraries
NO_SHLIB_REQUIRES_GLOB=*:32
+# Choose proper distinfo file using PKGNAMESUFFIX for slave ports.
+# Kept for switching to centralized distinfo with suffixes.
+.ifdef PKGNAMESUFFIX
+DISTINFO_FILE= ${.CURDIR}/distinfo
+.endif
+
# Pull GNU sed(1) for "binary" patching of obj/libglvnd/libEGL.so.1 and
# obj/libEGL_nvidia.so.0 (see below)
.if ${NVVERSION} >= 410.057
diff --git a/x11/nvidia-driver/Makefile.common b/x11/nvidia-driver/Makefile.common
index 67b10e0f1eb8..1236ca04b803 100644
--- a/x11/nvidia-driver/Makefile.common
+++ b/x11/nvidia-driver/Makefile.common
@@ -26,16 +26,3 @@ NVVERSION= ${DISTVERSION:S/./.0/} # allow minor > 99
NVVERSION= ${DISTVERSION}
. endif
.endif
-
-# Target below can be used instead of standard `makesum' to correctly
-# update distinfo (i.e., keeping other driver version entries intact)
-.if ${.TARGETS:Mupdate-distinfo}
-DISTINFO_FILE= ${MASTERDIR}/distinfo.new
-.endif
-
-update-distinfo: makesum .SILENT
- ${REINPLACE_CMD} -e '/${ARCH_SUFX}-${NVVERSION:R}/s/^/~/' \
- ${MASTERDIR}/distinfo
- ${REINPLACE_CMD} -e '/^~SHA256/r ${DISTINFO_FILE}' -e '/^~/d' \
- ${MASTERDIR}/distinfo
- ${RM} ${DISTINFO_FILE} ${MASTERDIR}/distinfo.bak
diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
index 1e22644b8440..017416dc7813 100644
--- a/x11/nvidia-driver/distinfo
+++ b/x11/nvidia-driver/distinfo
@@ -1,17 +1,3 @@
TIMESTAMP = 1745330770
SHA256 (NVIDIA-FreeBSD-x86_64-570.144.tar.xz) = 7912c9f101b29fec10c434b1389b1403489fa3008fae67d1b76ef3d9f4b5388f
SIZE (NVIDIA-FreeBSD-x86_64-570.144.tar.xz) = 260506500
-SHA256 (NVIDIA-FreeBSD-x86_64-470.256.02.tar.xz) = 40d787fae82d653893b08afac4e0ec37a88f37154406bfb13d02bfc986881f5c
-SIZE (NVIDIA-FreeBSD-x86_64-470.256.02.tar.xz) = 99491020
-SHA256 (NVIDIA-FreeBSD-x86_64-390.157.tar.gz) = 51db7d824e9f190a0bff792f520cab029a10c94aedf92ab267fb5916a2f272b0
-SIZE (NVIDIA-FreeBSD-x86_64-390.157.tar.gz) = 65337455
-SHA256 (NVIDIA-FreeBSD-x86-390.157.tar.gz) = 2553ea15568dea95714a8560075c84af8a797f290f2621fb6986d0d105bab247
-SIZE (NVIDIA-FreeBSD-x86-390.157.tar.gz) = 65983616
-SHA256 (NVIDIA-FreeBSD-x86_64-340.108.tar.gz) = f58fc793995008fd07719e3d001b1ad4b3547cfbc7084aec769098daa02e336f
-SIZE (NVIDIA-FreeBSD-x86_64-340.108.tar.gz) = 61500286
-SHA256 (NVIDIA-FreeBSD-x86-340.108.tar.gz) = 87b8523fb29e2bf51c2daf555e6dc46bbc6e5fd76b07a2034d3a5485a7cf99bf
-SIZE (NVIDIA-FreeBSD-x86-340.108.tar.gz) = 60616768
-SHA256 (NVIDIA-FreeBSD-x86_64-304.137.tar.gz) = 231693189e1bdf5c1dd02315cde5ef9ed6c0854564314438f2f40f9788a34120
-SIZE (NVIDIA-FreeBSD-x86_64-304.137.tar.gz) = 36474676
-SHA256 (NVIDIA-FreeBSD-x86-304.137.tar.gz) = 5f874133853eacc5b9a10311cec22d3c4898db7f75b92bb6c12d5be5126516fb
-SIZE (NVIDIA-FreeBSD-x86-304.137.tar.gz) = 35399011
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-31 10:43:18 +0000