Build faster, include modules

.github/workflows/build-docker.yaml

@@ -26,6 +26,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           lfs: true
+          submodules: true
       # Uses the `docker/login-action` action to log in to the Container registry registry using the account and password that will publish the packages. Once published, the packages are scoped to the account defined here.
       - name: Log in to the Container registry
         uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
@@ -55,18 +56,8 @@ jobs:
           ACTIONS_RUNTIME_TOKEN: ''
         with:
           context: .
-          # push: true
-          load: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-
-      - name: Push Docker image
-        uses: docker/build-push-action@v5
-        env:
-          #Hack for gitea/github weirdness.
-          ACTIONS_RUNTIME_TOKEN: ''
-        with:
-          context: .
+          platforms: linux/arm64
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+

Dockerfile

@@ -1,5 +1,8 @@
 from --platform=linux/amd64 git.spirirobotics.com/spiri/tx2-flashing-tool:main as kernel-build
 
+RUN apt-get update
+RUN apt-get install -y ripgrep
+
 ADD ./source/gcc-linaro-7.3.1-2018.05-x86_64_aarch64-linux-gnu.tar.xz /opt/gcc-linaro-7.3.1/
 ENV CROSS_COMPILE /opt/gcc-linaro-7.3.1/gcc-linaro-7.3.1-2018.05-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu-
 
@@ -16,13 +19,18 @@ RUN mkdir -p /jetson/Linux_for_Tegra/builds/build_tx2/build
 
 WORKDIR /jetson/Linux_for_Tegra/builds/build_tx2/
 RUN make -C $KERNEL_LOCATION ARCH=arm64 O=$PWD/build/ tegra_defconfig
-RUN make -C $KERNEL_LOCATION ARCH=arm64 O=$PWD/build/ CROSS_COMPILE=${CROSS_COMPILE} -j8 --output-sync=target zImage dtbs modules
+RUN nice make -C $KERNEL_LOCATION ARCH=arm64 O=$PWD/build/ CROSS_COMPILE=${CROSS_COMPILE} -j$(nproc --ignore 2) --output-sync=target zImage dtbs modules
+
+#Fail if we're missing either of these kenel module
+RUN rg mt9m021 build/arch/arm64/boot/Image
+RUN rg eg25-g build/arch/arm64/boot/Image
 
 RUN mkdir -p /build/boot/
 RUN mkdir -p /build/lib/modules/
 
-from --platform=linux/arm64 scratch
+FROM --platform=linux/arm64 scratch
 
-COPY --from=kernel-build /jetson/Linux_for_Tegra/builds/build_tx2/build/arch/arm64/boot/Image /boot/spiriImage
-COPY --from=kernel-build /jetson/Linux_for_Tegra/builds/build_tx2/build/arch/arm64/boot/dts/tegra186-tx2-spiri-revF+.dtb /boot/
-COPY ./extlinux.conf /boot/extlinux/extlinux.conf
+COPY --from=kernel-build /jetson/Linux_for_Tegra/builds/build_tx2/build/arch/arm64/boot/Image /build/boot/spiriImage
+COPY --from=kernel-build /jetson/Linux_for_Tegra/builds/build_tx2/build/arch/arm64/boot/dts/tegra186-tx2-spiri-revF+.dtb /build/boot/
+COPY --from=kernel-build /jetson/Linux_for_Tegra/builds/build_tx2/build/build/drivers/ /build/lib/modules
+COPY ./extlinux.conf /build/boot/extlinux/extlinux.conf

source/Jetpack

@@ -1 +1 @@
-Subproject commit 9b2b3723a7856dc7df272d748325d678d56010ff
+Subproject commit 5603a23850a73063f58aef99d11c3d346d38a07f