Merge branch 'makepkg.conf'

takano32 · Mar 10, 2024 · e6df553 · e6df553
2 parents daf4106 + bd16c18
commit e6df553
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/archlinux/entrypoint.sh b/archlinux/entrypoint.sh
@@ -20,7 +20,9 @@ while :; do $SUDO makepkg -o --skippgpcheck && break || sleep 5; done
 # `makepkg` in `$BUILD_DIR/linux`
 JOBS=$(getconf _NPROCESSORS_ONLN)
 JOBS=$(expr "$JOBS" + "$JOBS")
-$SUDO MAKEFLAGS="-j$JOBS" makepkg --skippgpcheck
+JOBS=$(expr "$JOBS" + "$JOBS")
+echo "MAKEFLAGS='-j$JOBS'" | tee -a /etc/makepkg.conf
+$SUDO makepkg --skippgpcheck
 
 cd $BUILD_DIR
 # mv linux/src/archlinux-linux/Documentation/output ../htmldocs

diff --git a/entrypoint.sh b/entrypoint.sh
@@ -86,6 +86,7 @@ unset IFS
 LOCALVERSION=-$(date +%Y%m%d)
 JOBS=$(getconf _NPROCESSORS_ONLN)
 JOBS=$(expr "$JOBS" + "$JOBS")
+JOBS=$(expr "$JOBS" + "$JOBS")
 time $MAKE $MAKE_OPTS -j $JOBS            O=/build-kernel/build/ LOCALVERSION=$LOCALVERSION
 time $MAKE $MAKE_OPTS -j $JOBS modules    O=/build-kernel/build/ LOCALVERSION=$LOCALVERSION
 IFS="|"

diff --git a/manjarolinux/entrypoint.sh b/manjarolinux/entrypoint.sh
@@ -20,7 +20,9 @@ while :; do $SUDO makepkg -o --skippgpcheck && break || sleep 5; done
 # `makepkg` in `$BUILD_DIR/linux`
 JOBS=$(getconf _NPROCESSORS_ONLN)
 JOBS=$(expr "$JOBS" + "$JOBS")
-$SUDO MAKEFLAGS="-j$JOBS" makepkg --skippgpcheck
+JOBS=$(expr "$JOBS" + "$JOBS")
+echo "MAKEFLAGS='-j$JOBS'" | tee -a /etc/makepkg.conf
+$SUDO makepkg --skippgpcheck
 
 cd $BUILD_DIR
 # mv linux/src/archlinux-linux/Documentation/output ../htmldocs