[update] : Supported channel kernel config

Author: Hayao0819

build.sh

@@ -589,8 +589,9 @@ prepare_build() {
 
 
     # Check kernel for each channel
-    if [[ -f "${channel_dir}/kernel_list-${arch}" ]] && [[ -z $(cat "${channel_dir}/kernel_list-${arch}" | grep -h -v ^'#' | grep -x "${kernel}" 2> /dev/null) ]]; then
-        msg_error "This kernel is currently not supported on this channel." "1"
+    #if [[ -f "${channel_dir}/kernel_list-${arch}" ]] && [[ -z $(cat "${channel_dir}/kernel_list-${arch}" | grep -h -v ^'#' | grep -x "${kernel}" 2> /dev/null) ]]; then
+    if [[ ! "$(bash "${script_path}/tools/kernel.sh" -c "${channel_name}" -a "${arch}" -s check "${channel_name}")" = "correct" ]]; then
+        msg_error "This kernel is currently not supported on this channel or architecture" "1"
     fi
 
     # Unmount
@@ -1245,7 +1246,7 @@ make_iso() {
 # Parse files
 parse_files() {
     eval $(bash "${script_path}/tools/locale.sh" -s -a "${arch}" get "${locale_name}")
-    eval $(bash "${script_path}/tools/kernel.sh" -s -a "${arch}" get "${kernel}")
+    eval $(bash "${script_path}/tools/kernel.sh" -s -c "${channel_name}" -a "${arch}" get "${kernel}")
 }
 
 

tools/kernel.sh

@@ -87,7 +87,11 @@ get() {
     local _kernel_config_file _kernel_name_list _kernel_line _get_kernel_line _kernel_config_line
 
     # 選択されたカーネルの設定が描かれた行番号を取得
-    _kernel_config_file="${script_path}/system/kernel-${arch}"
+    if [[ -n "${channel}" ]] && [[ -f "${script_path}/channels/${channel}/kernel-${arch}" ]]; then
+        _kernel_config_file="${script_path}/channels/${channel}/kernel-${arch}"
+    else
+        _kernel_config_file="${script_path}/system/kernel-${arch}"
+    fi
     _kernel_name_list=($(cat "${_kernel_config_file}" | grep -h -v ^'#' | getclm 1))
     _get_kernel_line() {
         local _kernel _count=0