Skip to content

Commit

Permalink
Remove duplicate pip installs, centalize all dependancy information
Browse files Browse the repository at this point in the history
  • Loading branch information
AndrewQuijano committed Dec 10, 2024
1 parent cc88392 commit 49fb311
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
4 changes: 0 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ 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
Expand Down Expand Up @@ -91,7 +88,6 @@ RUN make -C /panda/build install && \
# Install pypanda
RUN cd /panda/panda/python/core && \
PRETEND_VERSION=$(cat /tmp/savedversion) python3 setup.py 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 && \
PRETEND_VERSION=$(cat /tmp/savedversion) python3 setup.py bdist_wheel
Expand Down
5 changes: 4 additions & 1 deletion panda/dependencies/ubuntu_18.04_base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,14 @@ unzip
# pyperipheral (only needed for armel)
libpython3-dev

# pypanda dependencies
# panda python dependencies
genisoimage
libffi-dev
python3-protobuf
python3-colorama
python3-capstone
python3-pycparser
python3-cffi

# apt-rdepends qemu-system-common
acl
Expand Down
5 changes: 4 additions & 1 deletion panda/dependencies/ubuntu_20.04_base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,14 @@ wget
# pyperipheral (only needed for armel)
libpython3-dev

# pypanda dependencies
# panda python dependencies
genisoimage
libffi-dev
python3-protobuf
python3-colorama
python3-capstone
python3-pycparser
python3-cffi

# Not sure what this one is needed for
liblzo2-2
Expand Down
5 changes: 4 additions & 1 deletion panda/dependencies/ubuntu_22.04_base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,14 @@ wget
# pyperipheral (only needed for armel)
libpython3-dev

# pypanda dependencies
# panda python dependencies
genisoimage
libffi-dev
python3-protobuf
python3-colorama
python3-capstone
python3-pycparser
python3-cffi

# Not sure what this one is needed for
liblzo2-2
Expand Down
5 changes: 0 additions & 5 deletions panda/scripts/install_ubuntu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,6 @@ if [[ !$(dpkg -l | grep -q libosi) ]]; then
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

Expand Down

0 comments on commit 49fb311

Please sign in to comment.