Clever vid/pid settings?

.gitea/build.sh

@@ -16,24 +16,19 @@ while read vid pid variant; do
   log Building $vid $pid $product
   log
 
-  ## This is bananas.
   rm -rf build/
   mkdir -p build/cache/
-  cp -rL /usr/share/arduino /usr/share/arduino-builder build/ || true # there's a cyclic symlink that causes failure
-
-  sed -i "
-    /leonardo.build.vid/ s/=.*/=$vid/
-    /leonardo.build.pid/ s/=.*/=$pid/
-    /leonardo.build.usb_product/ s/=.*/=\"Mockband $variant\"/
-  " build/arduino/hardware/arduino/avr/boards.txt
-  grep 'leonardo.build' build/arduino/hardware/arduino/avr/boards.txt
 
   arduino-builder \
-    -fqbn arduino:avr:leonardo \
     -build-path $(pwd)/build/ \
     -build-cache $(pwd)/build/cache/ \
-    -hardware build/arduino/hardware \
-    -tools build/arduino/tools \
+    -fqbn arduino:avr:leonardo \
+    -hardware /usr/share/arduino/hardware \
+    -tools /usr/share/arduino/tools \
+    -prefs=build.vid=$vid \
+    -prefs=build.pid=$pid \
+    -prefs=build.usb_product="Mockband $variant" \
+    -prefs=build.extra_flags="{build.usb_flags} -DCDC_DISABLED" \
     -compile MockBand.ino
 
   mv build/MockBand.ino.hex out/MockBand.$variant.hex