From a08509c8679aeb2b1a43ca18a36f3b8ef9c96192 Mon Sep 17 00:00:00 2001
From: Raboneko <119771935+raboneko@users.noreply.github.com>
Date: Sun, 9 Feb 2025 02:12:01 -0800
Subject: [PATCH] Fix: Move CUDA to NVIDIA subrepo, fixed an HCL that had
 improper labelling (#3251) (#3252)

(cherry picked from commit e7c819334889239040e71496d319f5184381e47f)

Co-authored-by: Gilver <rockgrub@disroot.org>
---
 anda/lib/nvidia/compat-nvidia-repo/anda.hcl | 3 +++
 anda/lib/nvidia/cuda-cccl/anda.hcl          | 3 +++
 anda/lib/nvidia/cuda-cudart/anda.hcl        | 3 +++
 anda/lib/nvidia/cuda-cudnn/anda.hcl         | 3 +++
 anda/lib/nvidia/cuda-cuobjdump/anda.hcl     | 3 +++
 anda/lib/nvidia/cuda-cupti/anda.hcl         | 3 +++
 anda/lib/nvidia/cuda-cuxxfilt/anda.hcl      | 3 +++
 anda/lib/nvidia/cuda-gcc/anda.hcl           | 1 +
 anda/lib/nvidia/cuda-gdb/anda.hcl           | 3 +++
 anda/lib/nvidia/cuda-nvdisasm/anda.hcl      | 3 +++
 anda/lib/nvidia/cuda-nvml/anda.hcl          | 3 +++
 anda/lib/nvidia/cuda-nvprof/anda.hcl        | 6 ++++--
 anda/lib/nvidia/cuda-nvprune/anda.hcl       | 3 +++
 anda/lib/nvidia/cuda-nvrtc/anda.hcl         | 3 +++
 anda/lib/nvidia/cuda-nvtx/anda.hcl          | 3 +++
 anda/lib/nvidia/cuda-profiler/anda.hcl      | 3 +++
 anda/lib/nvidia/cuda-sanitizer/anda.hcl     | 1 +
 anda/lib/nvidia/cuda/anda.hcl               | 3 +++
 anda/lib/nvidia/libcublas/anda.hcl          | 3 +++
 anda/lib/nvidia/libcudla/anda.hcl           | 3 +++
 anda/lib/nvidia/libcufft/anda.hcl           | 3 +++
 anda/lib/nvidia/libcurand/anda.hcl          | 3 +++
 anda/lib/nvidia/libcusparse/anda.hcl        | 3 +++
 anda/lib/nvidia/libcusparselt/anda.hcl      | 3 +++
 anda/lib/nvidia/libnpp/anda.hcl             | 3 +++
 anda/lib/nvidia/libnvfatbin/anda.hcl        | 3 +++
 anda/lib/nvidia/libnvjpeg/anda.hcl          | 3 +++
 27 files changed, 78 insertions(+), 2 deletions(-)

diff --git a/anda/lib/nvidia/compat-nvidia-repo/anda.hcl b/anda/lib/nvidia/compat-nvidia-repo/anda.hcl
index 597e5a7b8b..0cfec17863 100644
--- a/anda/lib/nvidia/compat-nvidia-repo/anda.hcl
+++ b/anda/lib/nvidia/compat-nvidia-repo/anda.hcl
@@ -3,4 +3,7 @@ project pkg {
         rpm {
 		spec = "compat-nvidia-repo.spec"
 	}
+	labels {
+	   subrepo = "nvidia"
+    }
 }
diff --git a/anda/lib/nvidia/cuda-cccl/anda.hcl b/anda/lib/nvidia/cuda-cccl/anda.hcl
index 97bc5e28e1..105fd9c168 100644
--- a/anda/lib/nvidia/cuda-cccl/anda.hcl
+++ b/anda/lib/nvidia/cuda-cccl/anda.hcl
@@ -2,4 +2,7 @@ project pkg {
     rpm {
         spec = "cuda-cccl.spec"
     }
+    labels {
+	    subrepo = "nvidia"
+    }
 }
diff --git a/anda/lib/nvidia/cuda-cudart/anda.hcl b/anda/lib/nvidia/cuda-cudart/anda.hcl
index d031eef9dc..221343b01c 100644
--- a/anda/lib/nvidia/cuda-cudart/anda.hcl
+++ b/anda/lib/nvidia/cuda-cudart/anda.hcl
@@ -2,4 +2,7 @@ project pkg {
     rpm {
         spec = "cuda-cudart.spec"
     }
+    labels {
+	    subrepo = "nvidia"
+    }
 }
diff --git a/anda/lib/nvidia/cuda-cudnn/anda.hcl b/anda/lib/nvidia/cuda-cudnn/anda.hcl
index be265f0d92..476e1144e0 100644
--- a/anda/lib/nvidia/cuda-cudnn/anda.hcl
+++ b/anda/lib/nvidia/cuda-cudnn/anda.hcl
@@ -2,4 +2,7 @@ project pkg {
     rpm {
         spec = "cuda-cudnn.spec"
     }
+    labels {
+	    subrepo = "nvidia"
+    }
 }
diff --git a/anda/lib/nvidia/cuda-cuobjdump/anda.hcl b/anda/lib/nvidia/cuda-cuobjdump/anda.hcl
index 17d8bacb42..ce0c06c838 100644
--- a/anda/lib/nvidia/cuda-cuobjdump/anda.hcl
+++ b/anda/lib/nvidia/cuda-cuobjdump/anda.hcl
@@ -2,4 +2,7 @@ project pkg {
     rpm {
         spec = "cuda-cuobjdump.spec"
     }
+    labels {
+	    subrepo = "nvidia"
+    }
 }
diff --git a/anda/lib/nvidia/cuda-cupti/anda.hcl b/anda/lib/nvidia/cuda-cupti/anda.hcl
index 202648971d..524b27fb9f 100644
--- a/anda/lib/nvidia/cuda-cupti/anda.hcl
+++ b/anda/lib/nvidia/cuda-cupti/anda.hcl
@@ -2,4 +2,7 @@ project pkg {
     rpm {
         spec = "cuda-cupti.spec"
     }
+    labels {
+	    subrepo = "nvidia"
+    }
 }
diff --git a/anda/lib/nvidia/cuda-cuxxfilt/anda.hcl b/anda/lib/nvidia/cuda-cuxxfilt/anda.hcl
index 5ccab73ec3..a152d49d81 100644
--- a/anda/lib/nvidia/cuda-cuxxfilt/anda.hcl
+++ b/anda/lib/nvidia/cuda-cuxxfilt/anda.hcl
@@ -2,4 +2,7 @@ project pkg {
     rpm {
         spec = "cuda-cuxxfilt.spec"
     }
+    labels {
+	    subrepo = "nvidia"
+    }
 }
diff --git a/anda/lib/nvidia/cuda-gcc/anda.hcl b/anda/lib/nvidia/cuda-gcc/anda.hcl
index 48ea127f9d..b7ae3ad50a 100644
--- a/anda/lib/nvidia/cuda-gcc/anda.hcl
+++ b/anda/lib/nvidia/cuda-gcc/anda.hcl
@@ -5,5 +5,6 @@ project pkg {
 	}
     labels {
         updbranch = 1
+        subrepo = "nvidia"
     }
 }
diff --git a/anda/lib/nvidia/cuda-gdb/anda.hcl b/anda/lib/nvidia/cuda-gdb/anda.hcl
index 65c43c0d63..96834799fb 100644
--- a/anda/lib/nvidia/cuda-gdb/anda.hcl
+++ b/anda/lib/nvidia/cuda-gdb/anda.hcl
@@ -2,4 +2,7 @@ project pkg {
     rpm {
         spec = "cuda-gdb.spec"
     }
+    labels {
+	    subrepo = "nvidia"
+    }
 }
diff --git a/anda/lib/nvidia/cuda-nvdisasm/anda.hcl b/anda/lib/nvidia/cuda-nvdisasm/anda.hcl
index cfe2024ba1..0d1a673f66 100644
--- a/anda/lib/nvidia/cuda-nvdisasm/anda.hcl
+++ b/anda/lib/nvidia/cuda-nvdisasm/anda.hcl
@@ -2,4 +2,7 @@ project pkg {
     rpm {
         spec = "cuda-nvdisasm.spec"
     }
+    labels {
+	    subrepo = "nvidia"
+    }
 }
diff --git a/anda/lib/nvidia/cuda-nvml/anda.hcl b/anda/lib/nvidia/cuda-nvml/anda.hcl
index 2ede4543f2..34840180f2 100644
--- a/anda/lib/nvidia/cuda-nvml/anda.hcl
+++ b/anda/lib/nvidia/cuda-nvml/anda.hcl
@@ -2,4 +2,7 @@ project pkg {
     rpm {
         spec = "cuda-nvml.spec"
     }
+    labels {
+	    subrepo = "nvidia"
+    }
 }
diff --git a/anda/lib/nvidia/cuda-nvprof/anda.hcl b/anda/lib/nvidia/cuda-nvprof/anda.hcl
index 5cb745d7b2..66df69c112 100644
--- a/anda/lib/nvidia/cuda-nvprof/anda.hcl
+++ b/anda/lib/nvidia/cuda-nvprof/anda.hcl
@@ -1,7 +1,9 @@
 project pkg {
+        arches = ["x86_64"]
     rpm {
         spec = "cuda-nvprof.spec"
     }
-
-    arches = ["x86_64"]
+    labels {
+	    subrepo = "nvidia"
+    }
 }
diff --git a/anda/lib/nvidia/cuda-nvprune/anda.hcl b/anda/lib/nvidia/cuda-nvprune/anda.hcl
index 0b76991f27..04a7d9e659 100644
--- a/anda/lib/nvidia/cuda-nvprune/anda.hcl
+++ b/anda/lib/nvidia/cuda-nvprune/anda.hcl
@@ -2,4 +2,7 @@ project pkg {
     rpm {
         spec = "cuda-nvprune.spec"
     }
+    labels {
+	    subrepo = "nvidia"
+    }
 }
diff --git a/anda/lib/nvidia/cuda-nvrtc/anda.hcl b/anda/lib/nvidia/cuda-nvrtc/anda.hcl
index d942a62812..cfeecbc51e 100644
--- a/anda/lib/nvidia/cuda-nvrtc/anda.hcl
+++ b/anda/lib/nvidia/cuda-nvrtc/anda.hcl
@@ -2,4 +2,7 @@ project pkg {
     rpm {
         spec = "cuda-nvrtc.spec"
     }
+    labels {
+	    subrepo = "nvidia"
+    }
 }
diff --git a/anda/lib/nvidia/cuda-nvtx/anda.hcl b/anda/lib/nvidia/cuda-nvtx/anda.hcl
index d35439e909..70c2c3b44e 100644
--- a/anda/lib/nvidia/cuda-nvtx/anda.hcl
+++ b/anda/lib/nvidia/cuda-nvtx/anda.hcl
@@ -2,4 +2,7 @@ project pkg {
     rpm {
         spec = "cuda-nvtx.spec"
     }
+    labels {
+	    subrepo = "nvidia"
+    }
 }
diff --git a/anda/lib/nvidia/cuda-profiler/anda.hcl b/anda/lib/nvidia/cuda-profiler/anda.hcl
index 5f9b0df7eb..bf19f1bca8 100644
--- a/anda/lib/nvidia/cuda-profiler/anda.hcl
+++ b/anda/lib/nvidia/cuda-profiler/anda.hcl
@@ -2,6 +2,9 @@ project pkg {
    arches = ["x86_64", "aarch64", "i386"]
     rpm {
         spec = "cuda-profiler.spec"
+    }
+    labels {
         mock = 1
+	    subrepo = "nvidia"
     }
 }
diff --git a/anda/lib/nvidia/cuda-sanitizer/anda.hcl b/anda/lib/nvidia/cuda-sanitizer/anda.hcl
index c1b7e60b30..e459b62748 100644
--- a/anda/lib/nvidia/cuda-sanitizer/anda.hcl
+++ b/anda/lib/nvidia/cuda-sanitizer/anda.hcl
@@ -5,5 +5,6 @@ project pkg {
     }
     labels {
         mock = 1
+        subrepo = "nvidia"
     }
 }
diff --git a/anda/lib/nvidia/cuda/anda.hcl b/anda/lib/nvidia/cuda/anda.hcl
index daf3c9d6ed..4a81a369b2 100644
--- a/anda/lib/nvidia/cuda/anda.hcl
+++ b/anda/lib/nvidia/cuda/anda.hcl
@@ -2,4 +2,7 @@ project pkg {
     rpm {
 	spec = "cuda.spec"
 	}
+	labels {
+	   subrepo = "nvidia"
+    }
 }
diff --git a/anda/lib/nvidia/libcublas/anda.hcl b/anda/lib/nvidia/libcublas/anda.hcl
index ac72d9af4e..ea293241ed 100644
--- a/anda/lib/nvidia/libcublas/anda.hcl
+++ b/anda/lib/nvidia/libcublas/anda.hcl
@@ -2,4 +2,7 @@ project pkg {
     rpm {
         spec = "libcublas.spec"
     }
+    labels {
+	    subrepo = "nvidia"
+    }
 }
diff --git a/anda/lib/nvidia/libcudla/anda.hcl b/anda/lib/nvidia/libcudla/anda.hcl
index 82d9990d36..d88f879f40 100644
--- a/anda/lib/nvidia/libcudla/anda.hcl
+++ b/anda/lib/nvidia/libcudla/anda.hcl
@@ -3,4 +3,7 @@ project pkg {
     rpm {
         spec = "libcudla.spec"
     }
+    labels {
+	    subrepo = "nvidia"
+    }
 }
diff --git a/anda/lib/nvidia/libcufft/anda.hcl b/anda/lib/nvidia/libcufft/anda.hcl
index bc681a128e..a46203edb7 100644
--- a/anda/lib/nvidia/libcufft/anda.hcl
+++ b/anda/lib/nvidia/libcufft/anda.hcl
@@ -2,4 +2,7 @@ project pkg {
     rpm {
         spec = "libcufft.spec"
     }
+    labels {
+	    subrepo = "nvidia"
+    }
 }
diff --git a/anda/lib/nvidia/libcurand/anda.hcl b/anda/lib/nvidia/libcurand/anda.hcl
index 791eeace23..6ba63a679e 100644
--- a/anda/lib/nvidia/libcurand/anda.hcl
+++ b/anda/lib/nvidia/libcurand/anda.hcl
@@ -2,4 +2,7 @@ project pkg {
     rpm {
         spec = "libcurand.spec"
     }
+    labels {
+	    subrepo = "nvidia"
+    }
 }
diff --git a/anda/lib/nvidia/libcusparse/anda.hcl b/anda/lib/nvidia/libcusparse/anda.hcl
index 4961c9a272..fcf8d8b6b3 100644
--- a/anda/lib/nvidia/libcusparse/anda.hcl
+++ b/anda/lib/nvidia/libcusparse/anda.hcl
@@ -2,4 +2,7 @@ project pkg {
     rpm {
         spec = "libcusparse.spec"
     }
+    labels {
+	    subrepo = "nvidia"
+    }
 }
diff --git a/anda/lib/nvidia/libcusparselt/anda.hcl b/anda/lib/nvidia/libcusparselt/anda.hcl
index 76aa6bebaa..6f738351fb 100644
--- a/anda/lib/nvidia/libcusparselt/anda.hcl
+++ b/anda/lib/nvidia/libcusparselt/anda.hcl
@@ -2,4 +2,7 @@ project pkg {
     rpm {
         spec = "libcusparselt.spec"
     }
+    labels {
+	    subrepo = "nvidia"
+    }
 }
diff --git a/anda/lib/nvidia/libnpp/anda.hcl b/anda/lib/nvidia/libnpp/anda.hcl
index 0f6ad8ddf2..bdb71604c8 100644
--- a/anda/lib/nvidia/libnpp/anda.hcl
+++ b/anda/lib/nvidia/libnpp/anda.hcl
@@ -2,4 +2,7 @@ project pkg {
     rpm {
         spec = "libnpp.spec"
     }
+    labels {
+	    subrepo = "nvidia"
+    }
 }
diff --git a/anda/lib/nvidia/libnvfatbin/anda.hcl b/anda/lib/nvidia/libnvfatbin/anda.hcl
index 551109cf1f..0f221d477d 100644
--- a/anda/lib/nvidia/libnvfatbin/anda.hcl
+++ b/anda/lib/nvidia/libnvfatbin/anda.hcl
@@ -2,4 +2,7 @@ project pkg {
     rpm {
         spec = "libnvfatbin.spec"
     }
+    labels {
+	    subrepo = "nvidia"
+    }
 }
diff --git a/anda/lib/nvidia/libnvjpeg/anda.hcl b/anda/lib/nvidia/libnvjpeg/anda.hcl
index 54b8bbebb2..8881c1ea8e 100644
--- a/anda/lib/nvidia/libnvjpeg/anda.hcl
+++ b/anda/lib/nvidia/libnvjpeg/anda.hcl
@@ -2,4 +2,7 @@ project pkg {
     rpm {
         spec = "libnvjpeg.spec"
     }
+    labels {
+	    subrepo = "nvidia"
+    }
 }