Skip to content

GitLab

Commit 13c4240b authored by James T. Lee's avatar James T. Lee
Browse files

Move all of make.conf into buildah build-args

parent 5c2c21b3
Pipeline #178 passed with stage
in 26 minutes and 23 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
.gitlab-ci.yml
View file @ 13c4240b
...@@ -17,7 +17,9 @@ default: ...@@ -17,7 +17,9 @@ default:
--build-arg CFLAGS="-march=haswell -O2 -pipe -ggdb" --build-arg CFLAGS="-march=haswell -O2 -pipe -ggdb"
--build-arg CXXFLAGS="-march=haswell -O2 -pipe -ggdb" --build-arg CXXFLAGS="-march=haswell -O2 -pipe -ggdb"
--build-arg CPU_FLAGS_X86="aes avx avx2 fma3 mmx mmxext popcnt sse sse2 sse3 sse4_1 sse4_2 ssse3" --build-arg CPU_FLAGS_X86="aes avx avx2 fma3 mmx mmxext popcnt sse sse2 sse3 sse4_1 sse4_2 ssse3"
--build-arg DISTDIR="/nest/portage/distfiles"
--build-arg EMERGE_DEFAULT_OPTS="--jobs=${JOBS} --usepkg" --build-arg EMERGE_DEFAULT_OPTS="--jobs=${JOBS} --usepkg"
--build-arg FEATURES="buildpkg splitdebug"
--build-arg MAKEOPTS="-j${JOBS}" --build-arg MAKEOPTS="-j${JOBS}"
--build-arg PKGDIR="/nest/portage/packages/amd64-server.haswell" --build-arg PKGDIR="/nest/portage/packages/amd64-server.haswell"
--build-arg PROFILE="amd64-server" --build-arg PROFILE="amd64-server"
......
Containerfile
View file @ 13c4240b
...@@ -5,7 +5,9 @@ FROM nest/gentoo/stage3:amd64-systemd ...@@ -5,7 +5,9 @@ FROM nest/gentoo/stage3:amd64-systemd
ARG CFLAGS ARG CFLAGS
ARG CXXFLAGS ARG CXXFLAGS
ARG CPU_FLAGS_X86 ARG CPU_FLAGS_X86
ARG DISTDIR
ARG EMERGE_DEFAULT_OPTS ARG EMERGE_DEFAULT_OPTS
ARG FEATURES
ARG MAKEOPTS ARG MAKEOPTS
ARG PKGDIR ARG PKGDIR
ARG PROFILE ARG PROFILE
......
portage/make.conf deleted 100644 → 0
View file @ 5c2c21b3
DISTDIR="/nest/portage/distfiles"
FEATURES="buildpkg splitdebug"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment