Merge branch 'stable'

Author: Hayao0819

.github/PULL_REQUEST_TEMPLATE/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,18 @@
+# Overview
+
+- Description of this Pull Request
+
+# What I want the members to see
+
+- Please make a list of key points that you would like to see reviewed (and if the logic is complex, please provide additional explanations)
+
+# Members who would like to share this Pull Request
+
+- Please use @mention function
+- @member1
+- @member2... (If more than one, please add them)
+
+# Relevant Issue (optional)
+
+- Links to issues
+- (If more than one, please add them.)

.github/PULL_REQUEST_TEMPLATE/PULL_REQUEST_TEMPLATE_JP.md

@@ -0,0 +1,18 @@
+# 概要
+
+- このPull Requestの説明
+
+# メンバーに見てほしいところ
+
+- 重点的にレビューして欲しいところをリストアップして下さい (複雑なロジックであれば補足説明もお願いします)
+
+# このPull Requestを共有しておきたいメンバー
+
+- @mention機能を使用して下さい
+- @member1
+- @member2... (複数の場合書き足してください)
+
+# 関連するIssue (任意)
+
+- Githubのissueのリンク
+- (複数の場合書き足してください)

.vscode/launch.json

@@ -0,0 +1,15 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "bashdb",
+            "request": "launch",
+            "name": "Bash-Debug (select script from list of sh files)",
+            "cwd": "${workspaceFolder}",
+            "program": "${command:SelectScriptName}",
+            "showDebugOutput": true,
+            "terminalKind": "debugConsole",
+            "args": []
+        }
+    ]
+}

Dockerfile

@@ -1,9 +1,9 @@
 FROM archlinux:latest
-RUN echo 'Server = https://mirrors.cat.net/archlinux/$repo/os/$arch' > /etc/pacman.d/mirrorlist
+RUN echo 'Server = http://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch' > /etc/pacman.d/mirrorlist
 RUN pacman -Syyu --noconfirm
-RUN pacman -S git archiso arch-install-scripts --noconfirm
+RUN pacman -S git archiso arch-install-scripts sudo --noconfirm
 RUN git clone https://github.com/SereneTeam/alterlinux.git alterlinux/
 WORKDIR /alterlinux
-RUN git checkout dev-stable
+RUN git checkout dev
 RUN ./keyring.sh -ca
 CMD ["./build.sh", "-b"]

Makefile

@@ -1,23 +1,46 @@
 BUILD_SCRIPT = build.sh
-SHARE_OPTION = -b -c "zstd" -u "alter" -p "alter"
-DEBUG_OPTION = -t '-Xcompression-level 1' -x
+KERNEL       = zen
+SHARE_OPTION = -b -c "zstd" -u "alter" -p "alter" -k "${KERNEL}"
+DEBUG_OPTION = -t '-Xcompression-level 1' -x -d
+ARCH_x86_64  = -a x86_64
+ARCH_i686    = -a i686
 
 
-xfce:
-	@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} xfce
-	@make cleanup
+full:
+	@sudo ./fullbuild.sh
+	@make clean
 
-plasma:
-	@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} plasma
-	@make cleanup
+xfce-64:
+	@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_x86_64} xfce
+	@make clean
 
-xfce-test:
-	@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${DEBUG_OPTION} xfce
-	@make cleanup
+plasma-64:
+	@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_x86_64} plasma
+	@make clean
 
-plasma-test:
-	@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${DEBUG_OPTION} plasma
-	@make cleanup
+releng-64:
+	@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_x86_64} releng
+	@make clean
 
-cleanup:
-	@[[ -d ./work ]] && sudo rm -rf ./work
+lxde-64:
+	@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_x86_64} lxde
+	@make clean
+
+xfce-32:
+	@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_i686} xfce
+	@make clean
+
+plasma-32:
+	@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_i686} plasma
+	@make clean
+
+releng-32:
+	@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_i686} releng
+	@make clean
+
+lxde-32:
+	@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_i686} lxde
+	@make clean
+
+clean:
+	@sudo ./${BUILD_SCRIPT} clean