Compare commits

...

10 Commits

Author SHA1 Message Date
Erwin Ried
c80ea840d7 Version bump 2020-05-20 14:50:44 +02:00
Erwin Ried
6e590d0764 Fixing python in the dockerfiles
For some misterious reason it broke...
2020-05-20 14:48:44 +02:00
Erwin Ried
9f72e62db7 For some reason bzip2 is required now 2020-05-20 13:39:14 +02:00
Erwin Ried
f3bf8dbd2f Merge pull request #33 from furrtek/master
Sync
2020-05-20 12:52:34 +02:00
Erwin Ried
739218116d Adding phase field (extracted from @jamesshao8 repo) (#357) 2020-05-20 12:34:20 +02:00
Erwin Ried
bdeab6428b Update capture_app.cpp (#356) 2020-05-20 12:32:42 +02:00
Erwin Ried
619fa00967 Merge pull request #32 from ydixken/master
python-pip not available in repositories
2020-05-15 09:30:48 +02:00
Yannick M. Dixken
9f0b8852f6 fixed the invokation of python for get-pip.py 2020-05-15 01:08:23 +02:00
Yannick M. Dixken
e87a088842 fixed the docker build process by installing pip manually 2020-05-15 00:40:24 +02:00
Yannick M. Dixken
4c60aed563 fixed the docker build process by installing pip manually 2020-05-15 00:31:20 +02:00
3 changed files with 23 additions and 5 deletions

View File

@@ -14,10 +14,20 @@ COPY ./ /havocsrc
#Fetch dependencies from APT
RUN apt-get update && \
apt-get install -y tar wget dfu-util cmake python python-pip && \
apt-get install -y tar wget dfu-util cmake python bzip2 curl && \
apt-get -qy autoremove
#Install current pip from PyPa
RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
python get-pip.py
#Fetch additional dependencies from Python 2.x pip
RUN pip install pyyaml
RUN ln -s /usr/bin/python3 /usr/bin/python && \
ln -s /usr/bin/pip3 /usr/bin/pip
ENV LANG C.UTF-8
ENV LC_ALL C.UTF-8
#Grab the GNU ARM toolchain from arm.com
#Then extract contents to /opt/build/armbin/

View File

@@ -11,10 +11,20 @@ WORKDIR /havoc/firmware
# Fetch dependencies from APT
RUN apt-get update && \
apt-get install -y git tar wget dfu-util cmake python3 python-pip ccache && \
apt-get install -y git tar wget dfu-util cmake python3 ccache bzip2 curl && \
apt-get -qy autoremove
#Install current pip from PyPa
RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
python3 get-pip.py
#Fetch additional dependencies from Python 3.x pip
RUN pip install pyyaml
RUN ln -s /usr/bin/python3 /usr/bin/python && \
ln -s /usr/bin/pip3 /usr/bin/pip
ENV LANG C.UTF-8
ENV LC_ALL C.UTF-8
# Grab the GNU ARM toolchain from arm.com
# Then extract contents to /opt/build/armbin/

View File

@@ -54,8 +54,6 @@ enum modal_t {
ABORT
};
//#define VERSION_STRING "v1.0.0"; // TODO: Move somewhere else
class NavigationView : public View {
public:
std::function<void(const View&)> on_view_changed { };
@@ -111,7 +109,7 @@ public:
void set_title(const std::string new_value);
private:
static constexpr auto default_title = "MAYHEM v1.0.0"; // TODO: Move the version somewhere
static constexpr auto default_title = "MAYHEM v1.0.1"; // TODO: Move the version somewhere
NavigationView& nav_;