jaby
/
jabyengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Support for podman #9

Merged
jaby merged 25 commits from feature/jb/potman into main 2025-01-08 21:22:17 +00:00
Conversation 0 Commits 25 Files Changed 30 +8 -9
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 38bc7eab06 - Show all commits

3
podman/Dockerfile
View File

@ -1,6 +1,7 @@
FROM "ubuntu:24.04"
WORKDIR /usr
WORKDIR /usr/scripts
cody marked this conversation as resolved
cody commented 2025-01-08 19:35:33 +00:00
Review
Copy Link

Potentially not needed?

Potentially not needed?
ADD ["scripts/make_gcc.sh", "/usr/scripts"]
WORKDIR /usr
cody marked this conversation as resolved Outdated
cody commented 2025-01-08 19:35:17 +00:00
Outdated
Review
Copy Link

For temporary working spaces to compile programs it would be preferable to use /tmp or $HOME instead of /usr to conform to normal *NIX conventions.

For temporary working spaces to compile programs it would be preferable to use `/tmp` or `$HOME` instead of `/usr` to conform to normal *NIX conventions.
RUN apt update && /usr/scripts/make_gcc.sh
WORKDIR /usr/scripts

14
podman/scripts/make_gcc.sh
View File

@ -21,12 +21,12 @@ if [ $? -ne 0 ]; then
exit 1
fi
echo "<<< Make binutils >>>"
make
make -j$(nproc)
if [ $? -ne 0 ]; then
exit 1
fi
echo "<<< Install binutils >>>"
make install
make -j$(nproc) install
if [ $? -ne 0 ]; then
exit 1
fi
@ -38,7 +38,7 @@ git clone --recurse-submodules git://gcc.gnu.org/git/gcc.git
cd gcc
echo "<<< checkout gcc $GCC_VERSION >>>"
git checkout releases/$GCC_VERSION
git checkout "releases/gcc-$GCC_VERSION"
mkdir -p build
cd build
@ -49,19 +49,17 @@ if [ $? -ne 0 ]; then
fi
echo "<<< Make gcc >>>"
make all-gcc
make -j$(nproc) all-gcc
if [ $? -ne 0 ]; then
exit 1
fi
echo "<<< Install gcc >>>"
make install-gcc
make -j$(nproc) install-gcc
if [ $? -ne 0 ]; then
exit 1
fi
echo "<<< Delete GCC folder >>>"
cd /usr
rm -fr psx-gcc
# TODO: Remove gcc files after everything
rm -fr psx-gcc