Manjaro Linux: export MAKEFLAGS from /etc/bash.bashrc

takano32 · Jul 11, 2023 · 1c90c08 · 1c90c08
1 parent d629bee
commit 1c90c08
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/manjarolinux/Dockerfile b/manjarolinux/Dockerfile
@@ -15,6 +15,7 @@ RUN mkdir /home/takano32
 RUN chown -R takano32.takano32 /build-kernel /home/takano32
 RUN echo "takano32 ALL=(ALL:ALL) NOPASSWD: ALL" > /etc/sudoers.d/takano32
 ENV SUDO="sudo -u takano32"
+RUN echo 'export MAKEFLAGS="-j 8"' >> /etc/bash.bashrc
 
 COPY ./manjarolinux/entrypoint.sh /
 RUN chmod 755 /entrypoint.sh

diff --git a/manjarolinux/entrypoint.sh b/manjarolinux/entrypoint.sh
@@ -4,6 +4,7 @@ set -eux
 BUILD_DIR=/build-kernel/build
 SUDO="sudo -u takano32"
 
+rm -rf $BUILD_DIR/* || :
 mkdir -p $BUILD_DIR
 chown -R takano32:takano32 $BUILD_DIR
 cd $BUILD_DIR
@@ -17,10 +18,7 @@ $SUDO git config --global http.postBuffer 524288000
 while :; do $SUDO makepkg -o --skippgpcheck && break || sleep 5; done
 
 # `makepkg` in `$BUILD_DIR/linux`
-JOBS=$(getconf _NPROCESSORS_ONLN)
-JOBS=$(expr "$JOBS" + "$JOBS")
-MAKEFLAGS="-j $JOBS"
-$SUDO bash -c "MAKEFLAGS=""$MAKEFLAGS"" makepkg --skippgpcheck"
+$SUDO makepkg --skippgpcheck
 
 cd $BUILD_DIR
 mv linux/src/archlinux-linux/Documentation/output ../htmldocs