build.sh: use AIRGAP and DASHARO_SDK to keep backward compatibility

Signed-off-by: Piotr Król <[email protected]>

Author: pietrushnic

build.sh

@@ -226,37 +226,46 @@ function build_odroid_h4 {
   DEFCONFIG="configs/config.hardkernel_odroid_h4"
   FW_VERSION=$(cat ${DEFCONFIG} | grep CONFIG_LOCALVERSION | cut -d '=' -f 2 | tr -d '"')
 
-  # Without following sequence workspce would be created by docker with root
-  # privilidges and build will fail.
-  # Target directory
-  TARGET_DIR="payloads/external/edk2/workspace/Dasharo"
-  mkdir -p "$TARGET_DIR"
-  chown -R $(id -u):$(id -g) "$TARGET_DIR"
-  chmod -R 755 "$TARGET_DIR"
-
   # checkout several submodules needed by these boards (some others are checked
   # out by coreboot's Makefile)
   git submodule update --init --force --checkout \
       3rdparty/dasharo-blobs
 
-  # do not do distclean, because it removes all downloaded artifacts
   docker run --rm -t -u $UID -v $PWD:/home/coreboot/coreboot \
     -v $HOME/.ssh:/home/coreboot/.ssh \
-    --network none \
-    ${EDK2_REPO_PATH:+-v $EDK2_REPO_PATH:/home/coreboot/coreboot/payloads/external/edk2/workspace/Dasharo} \
     -w /home/coreboot/coreboot ${DASHARO_SDK} \
-    /bin/bash -c "make clean"
+    /bin/bash -c "make distclean"
 
   cp $DEFCONFIG .config
 
   echo "Building Dasharo compatbile with Hardkernel ODROID H4 (version $FW_VERSION)"
 
-  docker run --rm -t -u $UID -v $PWD:/home/coreboot/coreboot \
-    -v $HOME/.ssh:/home/coreboot/.ssh \
-    --network none \
-    ${EDK2_REPO_PATH:+-v $EDK2_REPO_PATH:/home/coreboot/coreboot/payloads/external/edk2/workspace/Dasharo} \
-    -w /home/coreboot/coreboot ${DASHARO_SDK} \
-    /bin/bash -c "make olddefconfig && make -j$(nproc)"
+  if [ -z ${AIRGAP} ]; then
+
+    # In this situation we assume that provided repository is ready to be used
+    # and nothing should be downloaded during build process.
+
+    # Without following sequence workspce would be created by docker with root
+    # privilidges and build will fail.
+    # Target directory
+    TARGET_DIR="payloads/external/edk2/workspace/Dasharo"
+    mkdir -p "$TARGET_DIR"
+    chown -R $(id -u):$(id -g) "$TARGET_DIR"
+    chmod -R 755 "$TARGET_DIR"
+
+    docker run --rm -t -u $UID -v $PWD:/home/coreboot/coreboot \
+      -v $HOME/.ssh:/home/coreboot/.ssh \
+      --network none \
+      ${EDK2_REPO_PATH:+-v $EDK2_REPO_PATH:/home/coreboot/coreboot/payloads/external/edk2/workspace/Dasharo} \
+      -e BUILD_TIMELESS=${BUILD_TIMELESS}
+      -w /home/coreboot/coreboot ${DASHARO_SDK} \
+      /bin/bash -c "echo $BUILD_TIMELESS && make olddefconfig && make -j$(nproc)"
+  else
+    docker run --rm -t -u $UID -v $PWD:/home/coreboot/coreboot \
+      -v $HOME/.ssh:/home/coreboot/.ssh \
+      -w /home/coreboot/coreboot ${DASHARO_SDK} \
+      /bin/bash -c "make olddefconfig && make -j$(nproc)"
+  fi
 
   cp build/coreboot.rom hardkernel_odroid_h4_${FW_VERSION}.rom
   if [ $? -eq 0 ]; then
@@ -272,37 +281,46 @@ function build_odroid_h4_btg {
   DEFCONFIG="configs/config.hardkernel_odroid_h4_btg"
   FW_VERSION=$(cat ${DEFCONFIG} | grep CONFIG_LOCALVERSION | cut -d '=' -f 2 | tr -d '"')
 
-  # Without following sequence workspce would be created by docker with root
-  # privilidges and build will fail.
-  # Target directory
-  TARGET_DIR="payloads/external/edk2/workspace/Dasharo"
-  mkdir -p "$TARGET_DIR"
-  chown -R $(id -u):$(id -g) "$TARGET_DIR"
-  chmod -R 755 "$TARGET_DIR"
-
   # checkout several submodules needed by these boards (some others are checked
   # out by coreboot's Makefile)
   git submodule update --init --force --checkout \
       3rdparty/dasharo-blobs
 
-  # do not do distclean, because it removes all downloaded artifacts
   docker run --rm -t -u $UID -v $PWD:/home/coreboot/coreboot \
     -v $HOME/.ssh:/home/coreboot/.ssh \
-    --network none \
-    ${EDK2_REPO_PATH:+-v $EDK2_REPO_PATH:/home/coreboot/coreboot/payloads/external/edk2/workspace/Dasharo} \
     -w /home/coreboot/coreboot ${DASHARO_SDK} \
-    /bin/bash -c "make clean"
+    /bin/bash -c "make distclean"
 
   cp $DEFCONFIG .config
 
   echo "Building Dasharo compatbile with Hardkernel ODROID H4 (version $FW_VERSION)"
 
-  docker run --rm -t -u $UID -v $PWD:/home/coreboot/coreboot \
-    -v $HOME/.ssh:/home/coreboot/.ssh \
-    --network none \
-    ${EDK2_REPO_PATH:+-v $EDK2_REPO_PATH:/home/coreboot/coreboot/payloads/external/edk2/workspace/Dasharo} \
-    -w /home/coreboot/coreboot ${DASHARO_SDK} \
-    /bin/bash -c "make olddefconfig && make -j$(nproc)"
+  if [ -z ${AIRGAP} ]; then
+
+    # In this situation we assume that provided repository is ready to be used
+    # and nothing should be downloaded during build process.
+
+    # Without following sequence workspce would be created by docker with root
+    # privilidges and build will fail.
+    # Target directory
+    TARGET_DIR="payloads/external/edk2/workspace/Dasharo"
+    mkdir -p "$TARGET_DIR"
+    chown -R $(id -u):$(id -g) "$TARGET_DIR"
+    chmod -R 755 "$TARGET_DIR"
+
+    docker run --rm -t -u $UID -v $PWD:/home/coreboot/coreboot \
+      -v $HOME/.ssh:/home/coreboot/.ssh \
+      --network none \
+      ${EDK2_REPO_PATH:+-v $EDK2_REPO_PATH:/home/coreboot/coreboot/payloads/external/edk2/workspace/Dasharo} \
+      -e BUILD_TIMELESS=${BUILD_TIMELESS}
+      -w /home/coreboot/coreboot ${DASHARO_SDK} \
+      /bin/bash -c "echo $BUILD_TIMELESS && make olddefconfig && make -j$(nproc)"
+  else
+    docker run --rm -t -u $UID -v $PWD:/home/coreboot/coreboot \
+      -v $HOME/.ssh:/home/coreboot/.ssh \
+      -w /home/coreboot/coreboot ${DASHARO_SDK} \
+      /bin/bash -c "make olddefconfig && make -j$(nproc)"
+  fi
 
   cp build/coreboot.rom hardkernel_odroid_h4_${FW_VERSION}.rom
   if [ $? -eq 0 ]; then