-
Notifications
You must be signed in to change notification settings - Fork 2
changes to compile on linux with gcc v12 + Dockerfile #1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Conversation
Signed-off-by: CristiMacovei <[email protected]>
Signed-off-by: CristiMacovei <[email protected]>
razvand
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please improve the commit messages. Use instructions here.
Also, I would add / update the README file with instructions on using the Dockerfile.
Dockerfile
Outdated
| RUN apt update && apt upgrade -y | ||
|
|
||
| RUN apt install -y git cmake build-essential libz-dev libssl-dev libbz2-dev libpng-dev libusb-dev |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| RUN apt update && apt upgrade -y | |
| RUN apt install -y git cmake build-essential libz-dev libssl-dev libbz2-dev libpng-dev libusb-dev | |
| RUN set -xe; \ | |
| apt-get -yqq update; \ | |
| apt-get install -y git cmake build-essential libz-dev libssl-dev libbz2-dev libpng-dev libusb-dev \ | |
| ; |
This commit makes docker `COPY` from the local files, instead of pulling the codebase from git. In addition, good-practice changes have been added to the `Dockerfile`, such as replacing `apt` with `apt-get` and adding a newline to the end of the file. Signed-off-by: CristiMacovei <[email protected]>
Signed-off-by: CristiMacovei <[email protected]>
Signed-off-by: CristiMacovei <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Update your commit messages to follow the best practices in creating commits and commit descriptions.
That is:
- Use your full name for signing-off and for commit authorship:
Cristian Macovei <[email protected]>. - Start sentences with capital letters, e.g. use
Improveinstead ofimprove. - When you add a new file, do not use the verb
Add. Use the verbIntroduce. - Use capitalized words for names, e.g.
Gitinstead ofgit,GCCinstead ofGCC. - Add a detailed description for commit messages, e.g. the commit
add Docker pipeline(the first line should beIntroduce Docker pipeline- followed by an extended description). Same foradd Dockerfileandchanges to compile on linux with gcc v12(which should beUpdate code to build on Linux with GCC >= 12.
| You can also build your own image locally: | ||
|
|
||
| ```sh | ||
| xpwn $ docker build -t <container_name> . |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| xpwn $ docker build -t <container_name> . | |
| docker build -t <container_name> . |
| @@ -0,0 +1,27 @@ | |||
| # Docker usage instructions | |||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| # Docker usage instructions | |
| # Docker Usage Instructions |
|
|
||
| ### Setup | ||
|
|
||
| Container images are available on [the github container registry](https://github.com/orgs/malus-security/packages/container/package/xpwn) (and soon on the gitlab container registry). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| Container images are available on [the github container registry](https://github.com/orgs/malus-security/packages/container/package/xpwn) (and soon on the gitlab container registry). | |
| Container images are available on [the GitHub Container Registry](https://github.com/orgs/malus-security/packages/container/package/xpwn) (and soon on the GitLab Container Registry). |
Made changes to compile the project on linux targets using gcc version 12.2.
a variable named
debugwas defined in two places indfu-util/dfu-util/dfu.h: removed declaration ofdebugvariabledfu-util/sam7dfu.c: added extern declaration ofdebugdfu-util/main.ca variable named
endiannesswas already defined and redefined insideipsw-patch/main.candxpwn/src/xpwn.cppexternmodifier to the declaration