Implement Ubuntu 24 Container/Debian Packages

Author: AndrewQuijano

.gitattributes

@@ -1,3 +1,3 @@
 # Explicitly enforce LF for specific files, if these are in CRLF it breaks the Debian package...
 panda/debian/control eol=lf
-pnada/debian/triggers eol=lf
+panda/debian/triggers eol=lf

.github/workflows/publish_docker.yml

@@ -11,7 +11,7 @@ env:
 
 jobs:
   get_version:
-    if: github.repository  == 'panda-re/panda' && github.ref == 'refs/heads/dev'
+    if: github.repository == 'panda-re/panda' && github.ref == 'refs/heads/dev'
     runs-on: panda-arc
     outputs:
       v-version: ${{ steps.version.outputs.v-version }}
@@ -111,7 +111,7 @@ jobs:
       matrix:
         ubuntu_version:
           - 22.04
-
+          - 24.04
     steps:
       - name: Install git
         run: sudo apt-get -qq update -y && sudo apt-get -qq install git curl jq -y
@@ -137,7 +137,12 @@ jobs:
           echo "Fetching certificate from registry"
           openssl s_client -showcerts -connect ${{ secrets.PANDA_ARC_REGISTRY }}:443 < /dev/null 2>/dev/null | openssl x509 -outform PEM | sudo tee /usr/local/share/ca-certificates/harbor.crt > /dev/null
           sudo update-ca-certificates
-
+      # Remove the leading v from the version string and set it as an environment variable
+      - name: Extract PACKAGE_VERSION without 'v'
+        run: |
+          VERSION=${{ needs.get_version.outputs.v-version }}
+          VERSION=${VERSION#v}
+          echo "RELEASE_VERSION=$VERSION" >> $GITHUB_ENV      
       - name: Log in to Rehosting Arc Registry
         uses: docker/login-action@v3
         with:
@@ -161,22 +166,24 @@ jobs:
             type=registry,ref=${{secrets.PANDA_ARC_REGISTRY}}/pandare/panda:packagecache,mode=max
           build-args: |
             REGISTRY=${{ secrets.PANDA_ARC_REGISTRY }}/proxy
+            BASE_IMAGE=ubuntu:${{ matrix.ubuntu_version }}
+            PACKAGE_VERSION=${{ env.RELEASE_VERSION }}
 
       - name: Build package
         working-directory: panda/debian
         run: |
           docker run --rm -v $(pwd):/out packager bash -c "cp /*.whl /pandare.deb /out"
           mv pandare.deb pandare_${{ matrix.ubuntu_version }}.deb
       - name: Upload deb packages as artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: pandare_${{ matrix.ubuntu_version }}
           path: panda/debian/pandare*.deb
           if-no-files-found: error
 
       - name: Upload whl package as artifact
         if: ${{ matrix.ubuntu_version == env.PANDA_CONTAINER_UBUNTU_VERSION }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: pypanda
           path: panda/debian/pandare*.whl

Dockerfile

@@ -1,6 +1,5 @@
 #syntax=docker/dockerfile:1.17-labs
 ARG REGISTRY="docker.io"
-ARG UBUNTU_MAJOR_VERSION="22"
 ARG BASE_IMAGE="ubuntu:22.04"
 ARG TARGET_LIST="x86_64-softmmu,i386-softmmu,arm-softmmu,aarch64-softmmu,ppc-softmmu,mips-softmmu,mipsel-softmmu,mips64-softmmu,mips64el-softmmu"
 ARG CAPSTONE_VERSION="5.0.5"
@@ -26,10 +25,20 @@ COPY ./panda/dependencies/${BASE_IMAGE/:/_}_build.txt /tmp/build_dep.txt
 RUN apt-get -qq update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends $(cat /tmp/build_dep.txt | grep -o '^[^#]*') && \
     apt-get clean && \
-    python3 -m pip install --upgrade --no-cache-dir pip && \
-    python3 -m pip install --upgrade --no-cache-dir "cffi>1.14.3" && \
-    python3 -m pip install --upgrade --no-cache-dir "capstone" && \
-    curl https://sh.rustup.rs -sSf | sh -s -- -y --profile minimal
+    curl https://sh.rustup.rs -sSf | sh -s -- -y --profile minimal && \
+    UBUNTU_VERSION=$(lsb_release -rs) && \
+    if dpkg --compare-versions "$UBUNTU_VERSION" ge "23.04"; then \
+        python3 -m pip install --upgrade --no-cache-dir "cffi>1.14.3" --break-system-packages && \
+        python3 -m pip install --upgrade --no-cache-dir "capstone" --break-system-packages; \
+        python3 -m pip install setuptools_scm --break-system-packages && \
+        python3 -m pip install build --break-system-packages; \
+    else \
+        python3 -m pip install --upgrade --no-cache-dir pip && \
+        python3 -m pip install --upgrade --no-cache-dir "cffi>1.14.3" && \
+        python3 -m pip install --upgrade --no-cache-dir "capstone"; \
+        python3 -m pip install setuptools_scm && \
+        python3 -m pip install build; \
+    fi
 
 # Then install capstone debian package
 RUN cd /tmp && \
@@ -67,13 +76,13 @@ COPY .git /panda/
 RUN git -C /panda submodule update --init dtc && \
     git -C /panda rev-parse HEAD > /usr/local/panda_commit_hash && \
     mkdir  /panda/build && cd /panda/build && \
-    python3 -m pip install setuptools_scm && \
-    python3 -m pip install build && \
     python3 -m setuptools_scm -r .. --strip-dev 2>/dev/null >/tmp/savedversion && \
     /panda/configure \
         --target-list="${TARGET_LIST}" \
         --prefix=/usr/local \
         --disable-numa \
+        --extra-cflags=-Wno-error \
+        --extra-cxxflags=-Wno-error \
         --enable-llvm && \
     rm -rf /panda/.git
 
@@ -105,7 +114,12 @@ RUN  make -C /panda/build install && \
 RUN cd /panda/panda/python/core && \
     python3 create_panda_datatypes.py --install && \
     PRETEND_VERSION=$(cat /tmp/savedversion) python3 -m build --wheel . && \
-    PRETEND_VERSION=$(cat /tmp/savedversion) pip install .
+    UBUNTU_VERSION=$(lsb_release -rs) && \
+    if dpkg --compare-versions "$UBUNTU_VERSION" ge "23.04"; then \
+        python3 -m pip install dist/*.whl --break-system-packages; \
+    else \
+        python3 -m pip install dist/*.whl; \
+    fi
 
 # BUG: PANDA sometimes fails to generate all the necessary files for PyPANDA. This is a temporary fix to detect and fail when this occurs
 RUN ls -alt $(pip show pandare | grep Location: | awk '{print $2}')/pandare/autogen/
@@ -153,6 +167,7 @@ RUN ldconfig && \
 
 
 FROM base AS packager
+ARG PACKAGE_VERSION
 
 # Install necessary tools for packaging
 RUN apt-get -qq update && \
@@ -180,7 +195,6 @@ RUN cd /package-root && \
     find . -type f ! -path './DEBIAN/*' -exec md5sum {} + | sed 's| \./| |' > /package-root/DEBIAN/md5sums
 
 # Update control file with the correct version, and place installed size
-ARG PACKAGE_VERSION
 RUN INSTALLED_SIZE=$(du -sk /package-root | cut -f1) && \
     sed -i "s/^Installed-Size:.*/Installed-Size: ${INSTALLED_SIZE}/" /package-root/DEBIAN/control
 RUN sed -i "s/^Version:.*/Version: ${PACKAGE_VERSION}/" /package-root/DEBIAN/control

panda/debian/Dockerfile

@@ -2,6 +2,7 @@
 # Note that libcapstone >= v4.1 is also required, but that's not available in apt
 git
 libdwarf1
+dwarfdump
 libjsoncpp-dev
 libllvm14
 libprotobuf-c-dev
@@ -14,6 +15,9 @@ python3
 python3-pip
 wget
 
+# Get Ubuntu Version
+lsb-release
+
 # pyperipheral (only needed for armel)
 libpython3-dev
 

panda/dependencies/ubuntu_22.04_base.txt

@@ -2,6 +2,7 @@
 # Note that libcapstone >= v4.1 is also required, but that's not available in apt
 git
 libdwarf-dev
+dwarfdump
 libjsoncpp-dev
 libllvm14t64
 libprotobuf-c-dev
@@ -14,6 +15,9 @@ python3
 python3-pip
 wget
 
+# Get Ubuntu Version
+lsb-release
+
 # pyperipheral (only needed for armel)
 libpython3-dev