Fix machine build templates (#95393)

2023-06-27 18:00:12 +02:00 · 2023-06-27 18:00:12 +02:00 · 5c4d010b90
parent 8bbb396048
commit 5c4d010b90
20 changed files with 40 additions and 60 deletions
--- a/machine/generic-x86-64
+++ b/machine/generic-x86-64
@ -1,8 +1,7 @@
 ARG \
-    BUILD_FROM \
-    BUILD_VERSION
+    BUILD_FROM

-FROM $BUILD_FROM:$BUILD_VERSION
+FROM $BUILD_FROM

 RUN apk --no-cache add \
    libva-intel-driver
--- a/machine/intel-nuc
+++ b/machine/intel-nuc
@ -1,8 +1,7 @@
 ARG \
-    BUILD_FROM \
-    BUILD_VERSION
+    BUILD_FROM

-FROM $BUILD_FROM:$BUILD_VERSION
+FROM $BUILD_FROM

 # NOTE: intel-nuc will be replaced by generic-x86-64. Make sure to apply
 # changes in generic-x86-64 as well.
--- a/machine/khadas-vim3
+++ b/machine/khadas-vim3
@ -1,5 +1,4 @@
 ARG \
-    BUILD_FROM \
-    BUILD_VERSION
+    BUILD_FROM

-FROM $BUILD_FROM:$BUILD_VERSION
+FROM $BUILD_FROM
--- a/machine/odroid-c2
+++ b/machine/odroid-c2
@ -1,5 +1,4 @@
 ARG \
-    BUILD_FROM \
-    BUILD_VERSION
+    BUILD_FROM

-FROM $BUILD_FROM:$BUILD_VERSION
+FROM $BUILD_FROM
--- a/machine/odroid-c4
+++ b/machine/odroid-c4
@ -1,5 +1,4 @@
 ARG \
-    BUILD_FROM \
-    BUILD_VERSION
+    BUILD_FROM

-FROM $BUILD_FROM:$BUILD_VERSION
+FROM $BUILD_FROM
--- a/machine/odroid-m1
+++ b/machine/odroid-m1
@ -1,5 +1,4 @@
 ARG \
-    BUILD_FROM \
-    BUILD_VERSION
+    BUILD_FROM

-FROM $BUILD_FROM:$BUILD_VERSION
+FROM $BUILD_FROM
--- a/machine/odroid-n2
+++ b/machine/odroid-n2
@ -1,5 +1,4 @@
 ARG \
-    BUILD_FROM \
-    BUILD_VERSION
+    BUILD_FROM

-FROM $BUILD_FROM:$BUILD_VERSION
+FROM $BUILD_FROM
--- a/machine/odroid-xu
+++ b/machine/odroid-xu
@ -1,5 +1,4 @@
 ARG \
-    BUILD_FROM \
-    BUILD_VERSION
+    BUILD_FROM

-FROM $BUILD_FROM:$BUILD_VERSION
+FROM $BUILD_FROM
--- a/machine/qemuarm
+++ b/machine/qemuarm
@ -1,5 +1,4 @@
 ARG \
-    BUILD_FROM \
-    BUILD_VERSION
+    BUILD_FROM

-FROM $BUILD_FROM:$BUILD_VERSION
+FROM $BUILD_FROM
--- a/machine/qemuarm-64
+++ b/machine/qemuarm-64
@ -1,5 +1,4 @@
 ARG \
-    BUILD_FROM \
-    BUILD_VERSION
+    BUILD_FROM

-FROM $BUILD_FROM:$BUILD_VERSION
+FROM $BUILD_FROM
--- a/machine/qemux86
+++ b/machine/qemux86
@ -1,5 +1,4 @@
 ARG \
-    BUILD_FROM \
-    BUILD_VERSION
+    BUILD_FROM

-FROM $BUILD_FROM:$BUILD_VERSION
+FROM $BUILD_FROM
--- a/machine/qemux86-64
+++ b/machine/qemux86-64
@ -1,5 +1,4 @@
 ARG \
-    BUILD_FROM \
-    BUILD_VERSION
+    BUILD_FROM

-FROM $BUILD_FROM:$BUILD_VERSION
+FROM $BUILD_FROM
--- a/machine/raspberrypi
+++ b/machine/raspberrypi
@ -1,8 +1,7 @@
 ARG \
-    BUILD_FROM \
-    BUILD_VERSION
+    BUILD_FROM

-FROM $BUILD_FROM:$BUILD_VERSION
+FROM $BUILD_FROM

 RUN apk --no-cache add \
        raspberrypi \
--- a/machine/raspberrypi2
+++ b/machine/raspberrypi2
@ -1,8 +1,7 @@
 ARG \
-    BUILD_FROM \
-    BUILD_VERSION
+    BUILD_FROM

-FROM $BUILD_FROM:$BUILD_VERSION
+FROM $BUILD_FROM

 RUN apk --no-cache add \
        raspberrypi \
--- a/machine/raspberrypi3
+++ b/machine/raspberrypi3
@ -1,8 +1,7 @@
 ARG \
-    BUILD_FROM \
-    BUILD_VERSION
+    BUILD_FROM

-FROM $BUILD_FROM:$BUILD_VERSION
+FROM $BUILD_FROM

 RUN apk --no-cache add \
        raspberrypi \
--- a/machine/raspberrypi3-64
+++ b/machine/raspberrypi3-64
@ -1,8 +1,7 @@
 ARG \
-    BUILD_FROM \
-    BUILD_VERSION
+    BUILD_FROM

-FROM $BUILD_FROM:$BUILD_VERSION
+FROM $BUILD_FROM

 RUN apk --no-cache add \
        raspberrypi \
--- a/machine/raspberrypi4
+++ b/machine/raspberrypi4
@ -1,8 +1,7 @@
 ARG \
-    BUILD_FROM \
-    BUILD_VERSION
+    BUILD_FROM

-FROM $BUILD_FROM:$BUILD_VERSION
+FROM $BUILD_FROM

 RUN apk --no-cache add \
        raspberrypi \
--- a/machine/raspberrypi4-64
+++ b/machine/raspberrypi4-64
@ -1,8 +1,7 @@
 ARG \
-    BUILD_FROM \
-    BUILD_VERSION
+    BUILD_FROM

-FROM $BUILD_FROM:$BUILD_VERSION
+FROM $BUILD_FROM

 RUN apk --no-cache add \
        raspberrypi \
--- a/machine/tinker
+++ b/machine/tinker
@ -1,5 +1,4 @@
 ARG \
-    BUILD_FROM \
-    BUILD_VERSION
+    BUILD_FROM

-FROM $BUILD_FROM:$BUILD_VERSION
+FROM $BUILD_FROM
--- a/machine/yellow
+++ b/machine/yellow
@ -1,8 +1,7 @@
 ARG \
-    BUILD_FROM \
-    BUILD_VERSION
+    BUILD_FROM

-FROM $BUILD_FROM:$BUILD_VERSION
+FROM $BUILD_FROM

 RUN apk --no-cache add \
        raspberrypi \