Finish updating python installs needed for panda

Author: AndrewQuijano

.github/workflows/parallel_tests.yml

@@ -20,9 +20,9 @@ on:
 jobs:
 
   test_installer: # test install_ubuntu.sh
-    runs-on: panda-arc # Note 22.04 would work, but it requires docker > 20.10.7 which is not on our CI box (yet)
+    runs-on: panda-arc
     container:
-      image: ubuntu:20.04
+      image: ubuntu:22.04
     steps:
     - name: Update
       run: apt-get -qq update -y
@@ -31,9 +31,9 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
-        python-version: 3.9
+        python-version: '3.10'
     - name: Install Python dev headers
-      run: apt-get -qq install -y libpython3.9-dev
+      run: apt-get -qq install -y libpython3.10-dev
     - uses: actions/checkout@v4 # Clones to $GITHUB_WORKSPACE. NOTE: this requires git > 2.18 (not on ubuntu 18.04 by default) to get .git directory
     - name: Lint PyPANDA with flake8
       run: |

Dockerfile

@@ -1,9 +1,8 @@
 ARG BASE_IMAGE="ubuntu:20.04"
 ARG TARGET_LIST="x86_64-softmmu,i386-softmmu,arm-softmmu,aarch64-softmmu,ppc-softmmu,mips-softmmu,mipsel-softmmu,mips64-softmmu,mips64el-softmmu"
-ARG LIBOSI_VERSION="v0.1.7"
 
 ### BASE IMAGE
-FROM $BASE_IMAGE as base
+FROM $BASE_IMAGE AS base
 ARG BASE_IMAGE
 
 # Copy dependencies lists into container. We copy them all and then do a mv because
@@ -16,22 +15,19 @@ RUN mv /tmp/$(echo "$BASE_IMAGE" | sed 's/:/_/g')_build.txt /tmp/build_dep.txt &
 # Base image just needs runtime dependencies
 RUN [ -e /tmp/base_dep.txt ] && \
     apt-get -qq update && \
-    DEBIAN_FRONTEND=noninteractive apt-get -qq install -y --no-install-recommends curl $(cat /tmp/base_dep.txt | grep -o '^[^#]*') && \
+    DEBIAN_FRONTEND=noninteractive apt-get -qq install -y --no-install-recommends curl jq $(cat /tmp/base_dep.txt | grep -o '^[^#]*') && \
     apt-get clean
 
 ### BUILD IMAGE - STAGE 2
 FROM base AS builder
 ARG BASE_IMAGE
 ARG TARGET_LIST
-ARG LIBOSI_VERSION
 
 RUN [ -e /tmp/build_dep.txt ] && \
     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
 
 # Then install capstone from source
@@ -43,13 +39,19 @@ RUN cd /tmp && \
 ENV PATH="/root/.cargo/bin:${PATH}"
 
 # install libosi
-RUN cd /tmp && curl -LJO https://github.com/panda-re/libosi/releases/download/${LIBOSI_VERSION}/libosi_$(echo "$BASE_IMAGE" | awk -F':' '{print $2}').deb && dpkg -i /tmp/libosi_$(echo "$BASE_IMAGE" | awk -F':' '{print $2}').deb
+RUN cd /tmp && \
+    BASE_IMAGE_VERSION=$(echo "$BASE_IMAGE" | awk -F':' '{print $2}') && \
+    LIBOSI_VERSION=$(curl -s https://api.github.com/repos/panda-re/libosi/releases/latest | jq -r .tag_name) && \
+    curl -LJO https://github.com/panda-re/libosi/releases/download/${LIBOSI_VERSION}/libosi_${BASE_IMAGE_VERSION}.deb && \
+    dpkg -i /tmp/libosi_${BASE_IMAGE_VERSION}.deb && \
+    rm -rf /tmp/libosi_${BASE_IMAGE_VERSION}.deb
 
 # Build and install panda
 # Copy repo root directory to /panda, note we explicitly copy in .git directory
 # Note .dockerignore file keeps us from copying things we don't need
 COPY . /panda/
 COPY .git /panda/
+RUN python3 -m pip install -r /panda/panda/python/core/requirements.txt
 
 # Note we diable NUMA for docker builds because it causes make check to fail in docker
 RUN git -C /panda submodule update --init dtc && \
@@ -64,14 +66,13 @@ RUN git -C /panda submodule update --init dtc && \
         --disable-numa \
         --enable-llvm && \
     rm -rf /panda/.git
-    
 
 RUN PRETEND_VERSION=$(cat /tmp/savedversion) make -C /panda/build -j "$(nproc)"
 
 #### Develop setup: panda built + pypanda installed (in develop mode) - Stage 3
-FROM builder as developer
+FROM builder AS developer
 RUN cd /panda/panda/python/core && \
-    python3 create_panda_datatypes.py && \
+    python3 create_panda_datatypes.py --compile && \
     PRETEND_VERSION=$(cat /tmp/savedversion) pip install -e . && \
     ldconfig && \
     update-alternatives --install /usr/bin/python python /usr/bin/python3 10 && \
@@ -82,7 +83,7 @@ RUN cd /panda/panda/python/core && \
 WORKDIR /panda/
 
 #### Install PANDA + pypanda from builder - Stage 4
-FROM builder as installer
+FROM builder AS installer
 RUN  make -C /panda/build install && \
     rm -r /usr/local/lib/panda/*/cosi \
         /usr/local/lib/panda/*/cosi_strace \
@@ -93,20 +94,16 @@ RUN  make -C /panda/build install && \
 # Install pypanda
 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 .
-RUN python3 -m pip install --ignore-install pycparser && python3 -m pip install --force-reinstall --no-binary :all: cffi
-# Build a whl too
-RUN cd /panda/panda/python/core && \
-    python3 create_panda_datatypes.py --install && \
-    PRETEND_VERSION=$(cat /tmp/savedversion) python3 -m build --wheel .
 
 # 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/
 RUN bash -c "ls $(pip show pandare | grep Location: | awk '{print $2}')/pandare/autogen/panda_{aarch64_64,arm_32,mips64_64,mips_32,mipsel_32,ppc_32,ppc_64,x86_64_64,i386_32}.py"
 
 # this layer is used to strip shared objects and change python data to be
 # symlinks to the installed panda data directory
-FROM installer as cleanup
+FROM installer AS cleanup
 RUN find /usr/local/lib/panda -name "*.so" -exec strip {} \;
 RUN PKG=`pip show pandare | grep Location: | awk '{print $2}'`/pandare/data; \
     rm -rf $PKG/pc-bios && ln -s /usr/local/share/panda $PKG/pc-bios; \
@@ -121,24 +118,23 @@ RUN PKG=`pip show pandare | grep Location: | awk '{print $2}'`/pandare/data; \
     done
 
 ### Copy files for panda+pypanda from installer  - Stage 5
-FROM base as panda
+FROM base AS panda
 
 # Include dependency lists for packager
 COPY --from=base /tmp/base_dep.txt /tmp
 COPY --from=base /tmp/build_dep.txt /tmp
 
 # Copy panda + libcapstone.so* + libosi libraries
 COPY --from=cleanup /usr/local /usr/local
-COPY --from=cleanup /usr/lib/libcapstone* /usr/lib/
-COPY --from=cleanup /lib/libosi.so /lib/libiohal.so /lib/liboffset.so /lib/
+COPY --from=cleanup /usr/lib/libcapstone.so* /usr/lib/
+COPY --from=cleanup /usr/lib/libosi.so /usr/lib/libiohal.so /usr/lib/liboffset.so /usr/lib/
 
 # Workaround issue #901 - ensure LD_LIBRARY_PATH contains the panda plugins directories
 #ARG TARGET_LIST="x86_64-softmmu,i386-softmmu,arm-softmmu,ppc-softmmu,mips-softmmu,mipsel-softmmu"
 ENV LD_LIBRARY_PATH /usr/local/lib/python3.8/dist-packages/pandare/data/x86_64-softmmu/panda/plugins/:/usr/local/lib/python3.8/dist-packages/pandare/data/i386-softmmu/panda/plugins/:/usr/local/lib/python3.8/dist-packages/pandare/data/arm-softmmu/panda/plugins/:/usr/local/lib/python3.8/dist-packages/pandare/data/ppc-softmmu/panda/plugins/:/usr/local/lib/python3.8/dist-packages/pandare/data/mips-softmmu/panda/plugins/:/usr/local/lib/python3.8/dist-packages/pandare/data/mipsel-softmmu/panda/plugins/
 #PANDA_PATH is used by rust plugins
 ENV PANDA_PATH /usr/local/lib/python3.8/dist-packages/pandare/data
 
-
 # Ensure runtime dependencies are installed for our libpanda objects and panda plugins
 RUN ldconfig && \
     update-alternatives --install /usr/bin/python python /usr/bin/python3 10 && \

panda/debian/.gitignore

@@ -1 +1,2 @@
-panda.deb
+*.deb
+*.whl

panda/plugins/syscalls2/scripts/requirements2.txt

@@ -1,2 +1,2 @@
-Jinja2==3.1.2
+Jinja2>=3.1.4
 MarkupSafe==2.1.3

panda/python/core/.gitignore

@@ -8,3 +8,4 @@ data
 a
 __pycache__
 *.egg-info
+.eggs/

panda/python/core/create_panda_datatypes.py

@@ -690,14 +690,14 @@ def copy_objs():
                                           'and prep for PyPanda wheel installation')
     parser.add_argument('--install', '-i', dest='install', action='store_true',
                         help='If set, this means update pandare folder for installation')
-    parser.add_argument('--recompile', '-r', dest='recompile', action='store_true',
-                        help='If set, recompile the headers with cffi')
+    parser.add_argument('--compile', '-c', dest='compile', action='store_true',
+                        help='If set, compile the headers with cffi')
     args = parser.parse_args()
     """
     Install as a local module (not to system) by
         1) Creating datatype files for local-use
         2) Running regular setup tools logic
     """
-    main()
+    main(args.compile)
     if args.install:
         copy_objs()

panda/python/core/pyproject.toml

@@ -34,7 +34,8 @@ requires-python = ">=3.6"
 dependencies = [
     "cffi>=1.14.3",
     "protobuf>=4.25.1",
-    "colorama"
+    "colorama",
+    "capstone==5.0.3"
 ]
 
 [tool.setuptools_scm]

panda/python/core/requirements.txt

@@ -1,3 +1,4 @@
 cffi>=1.14.3
 protobuf>=4.25.1
+capstone==5.0.3
 colorama

panda/scripts/install_ubuntu.sh

@@ -25,7 +25,7 @@ lsb_release --help &>/dev/null || $SUDO apt-get update -qq && $SUDO apt-get -qq
 git --help &>/dev/null || $SUDO apt-get -qq update && $SUDO apt-get -qq install -y --no-install-recommends git
 
 # some globals
-LIBOSI_VERSION="0.1.7"
+LIBOSI_VERSION="v0.1.9"
 UBUNTU_VERSION=$(lsb_release -r | awk '{print $2}')
 PANDA_GIT="https://github.com/panda-re/panda.git"
 
@@ -120,17 +120,12 @@ fi
 # if the windows introspection library is not installed, clone and install
 if [[ !$(dpkg -l | grep -q libosi) ]]; then
   pushd /tmp
-  curl -LJO https://github.com/panda-re/libosi/releases/download/v${LIBOSI_VERSION}/libosi_${UBUNTU_VERSION}.deb 
+  curl -LJO https://github.com/panda-re/libosi/releases/download/${LIBOSI_VERSION}/libosi_${UBUNTU_VERSION}.deb
   $SUDO dpkg -i /tmp/libosi_${UBUNTU_VERSION}.deb
   rm -rf /tmp/libosi_${UBUNTU_VERSION}.deb
   popd
 fi
 
-# PyPANDA needs CFFI from pip (the version in apt is too old)
-# Install system-wide since PyPANDA install will also be system-wide
-$SUDO python3 -m pip install pip
-$SUDO python3 -m pip install "cffi>1.14.3"
-
 progress "Trying to update DTC submodule"
 git submodule update --init dtc || true
 
@@ -139,6 +134,11 @@ if [ -d "build" ]; then
   rm -rf "build"
 fi
 
+# PyPANDA needs CFFI from pip (the version in apt is too old)
+# Install system-wide since PyPANDA install will also be system-wide
+python3 -m pip install --upgrade --no-cache-dir pip
+$SUDO python3 -m pip install -r ./panda/python/core/requirements.txt
+
 progress "Building PANDA..."
 mkdir build
 pushd build
@@ -147,7 +147,7 @@ pushd build
 progress "PANDA is built and ready to use in panda/build/[arch]-softmmu/panda-system-[arch]."
 
 cd ../panda/python/core
-python3 create_panda_datatypes.py --install
+python3 create_panda_datatypes.py --compile --install
 $SUDO python3 -m pip install .
 python3 -c "import pandare; panda = pandare.Panda(generic='i386')" # Make sure it worked
 progress "Pypanda successfully installed"