Merge pull request #8 from ddaymn/bullseye

Rebase of rpi-distro and photonvision changes, fixes Pi 4 image

Author: mcm001

.editorconfig

@@ -0,0 +1,5 @@
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8

.github/workflows/build-docker.yml

@@ -15,15 +15,19 @@ jobs:
   # This workflow contains a single job called "build"
   build:
     # The type of runner that the job will run on
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
     - uses: actions/checkout@v1
 
     - name: APT update
-      run: sudo apt update
+      run: |
+        sudo apt update
+        sudo apt install binfmt-support
+        sudo apt install qemu qemu-user-static
+        sudo update-binfmts --enable
 
     # Build image with docker
     - name: Run build-docker.sh
@@ -37,7 +41,7 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         name: built-image
-        path: ./deploy/image_*PhotonVision.zip
+        path: ./deploy/image_*PhotonVision.img.xz
         if-no-files-found: error
 
     - name: Upload debug artifacts

.gitignore

@@ -6,3 +6,4 @@ SKIP_IMAGES
 .pc
 *-pc
 apt-cacher-ng/
+/apt-cacher-ng

Dockerfile

@@ -1,13 +1,14 @@
-FROM debian:buster
+ARG BASE_IMAGE=debian:bullseye
+FROM ${BASE_IMAGE}
 
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get -y update && \
     apt-get -y install --no-install-recommends \
         git vim parted \
         quilt coreutils qemu-user-static debootstrap zerofree zip dosfstools \
-        bsdtar libcap2-bin rsync grep udev xz-utils curl xxd file kmod bc\
-        binfmt-support ca-certificates \
+        libarchive-tools libcap2-bin rsync grep udev xz-utils curl xxd file kmod bc\
+        binfmt-support ca-certificates qemu-utils kpartx fdisk gpg pigz\
     && rm -rf /var/lib/apt/lists/*
 
 COPY . /pi-gen/