Merge branch 'menuconfig' into dev

Author: Hayao0819

.gitignore

@@ -26,3 +26,5 @@ menuconfig-script/kernel_choice_*
 /out/
 out
 /pacman-*.conf
+.config
+menuconfig-script/channels_menuconfig-*

Makefile

@@ -28,11 +28,13 @@ menuconfig/build/mconf::
 	@mkdir -p menuconfig/build
 	(cd menuconfig/build ; cmake -GNinja .. ; ninja -j4 )
 
-menuconfig:menuconfig/build/mconf menuconfig-script/kernel_choice
+menuconfig:menuconfig/build/mconf menuconfig-script/kernel_choice menuconfig-script/channel_choice
 	@menuconfig/build/mconf menuconfig-script/rootconf
 
 menuconfig-script/kernel_choice:system/kernel-x86_64 system/kernel-i686
 	@${CURRENT_DIR}/tools/kernel-choice-conf-gen.sh
+menuconfig-script/channel_choice:
+	@${CURRENT_DIR}/tools/channel-choice-conf-gen.sh
 
 build_option:
 	@if [ ! -f .config ]; then make menuconfig ; fi

docs/jp/BUILD.md

@@ -42,6 +42,12 @@ sudo pacman -S --needed curl dosfstools git libburn libisofs lz4 lzo make pyalpm
 make menuconfig
 ```
 
+設定が完了したら以下のコマンドでビルドできます
+
+```bash
+sudo make build
+```
+
 ### GUIを使用する
 GUIで設定を行ってビルドできます。GUIには`python-gobject`が必須です。  
 

menuconfig-script/rootconf

@@ -113,18 +113,26 @@ menu "Live環境の設定"
 		config CUSTOM_PASSWD
 			string "パスワード"
 	endif
-	choice
-		prompt "チャンネル"
-		default CHANNEL_XFCE
-		help
-			"使用するチャンネルを選択します。"
-		config CHANNEL_XFCE
-			bool "Xfce"
-		config CHANNEL_PLASMA
-			bool "Kde Plasma"
-		config CHANNEL_LXDE
-			bool "lxde"
-	endchoice
+	if X64_BUILD
+		choice
+			prompt "チャンネル"
+			source channels_menuconfig-x86_64
+		endchoice
+	endif
+	if I686_BUILD
+		choice
+			prompt "チャンネル"
+			source channels_menuconfig-i686
+		endchoice
+	endif
 	config IMAGE_OWNER
 		string "イメージファイルの所有者名"
 endmenu
+menu "その他ビルド設定"
+	config USE_CUSTOM_WORK
+		bool "カスタムワークディレクトリを使用する"
+	if USE_CUSTOM_WORK
+		config CUSTOM_WORKDIR
+			string "ワークディレクトリ"
+	endif
+endmenu

tools/channel-choice-conf-gen.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+script_path="$( cd -P "$( dirname "$(readlink -f "$0")" )" && cd .. && pwd )"
+arch_list=(
+    "x86_64"
+    "i686"
+)
+
+#cd "${script_path}"
+for arch in "${arch_list[@]}"; do
+    rm -rf "${script_path}/menuconfig-script/channels_menuconfig-${arch}"
+    for channel in $(bash "${script_path}/tools/channel.sh" -a "${arch}" show ); do
+        echo "config CHANNEL_N_A_M_E_${channel}" >> "${script_path}/menuconfig-script/channels_menuconfig-${arch}"
+        echo -e "\tbool ${channel}" >> "${script_path}/menuconfig-script/channels_menuconfig-${arch}"
+    done
+done

tools/menuconf-to-alterconf.sh

@@ -58,7 +58,13 @@ if [[ "${CONFIG_USE_CUSTOM_PASSWD}" = "y" ]]; then
     buf=`grep CONFIG_CUSTOM_PASSWD .config | sed -e 's/CONFIG_CUSTOM_PASSWD/password/g' `
     eval "${buf}"
 fi
-buf=`grep CONFIG_CHANNEL_ .config | sed -e 's/=y//g' | sed -e 's/CONFIG_CHANNEL_/channel=/g'`
+buf=`grep CONFIG_USE_CUSTOM_WORK .config`
+eval "${buf}"
+if [[ "${CONFIG_USE_CUSTOM_WORK}" = "y" ]]; then
+    buf=`grep CONFIG_CUSTOM_WORKDIR .config | sed -e 's/CONFIG_CUSTOM_WORKDIR/workdir/g' `
+    eval "${buf}"
+fi
+buf=`grep CONFIG_CHANNEL_N_A_M_E_ .config | sed -e 's/=y//g' | sed -e 's/CONFIG_CHANNEL_N_A_M_E_/channel=/g'`
 eval "${buf,,}"
 if [[ $USE_CUSTOM_LANG = "true" ]]; then
     buf=`grep CONFIG_CUSTOM_LANGUAGE .config | sed -e 's/CONFIG_CUSTOM_LANGUAGE/language/g' `
@@ -74,6 +80,7 @@ echo build option :
     [[ -n "${username}"    ]] && echo "           Username : ${username}"
     [[ -n "${password}"    ]] && echo "           Password : ${password}"
     [[ -n "${channel}"     ]] && echo "            Channel : ${channel}"
+    [[ -n "${workdir}"     ]] && echo "               Work : ${workdir}"
 
 if [[ "${USE_CUSTOM_LANG}" = "true" ]]; then
     argument="${argument} -l ${language}"
@@ -96,5 +103,8 @@ fi
 if [[ -n "${out_dir}" ]]; then
     argument="${argument} -o '${out_dir}'"
 fi
+if [[ -n "${workdir}" ]]; then
+    argument="${argument} -w '${workdir}'"
+fi
 argument="-a ${build_arch}  --noconfirm  ${argument} ${channel}"
 echo "${argument}" > "${1}"