Merge branch 'memtest86+' into dev

Hayao0819 · Hayao0819 · commit 26176239d614 · 2021-01-23T20:33:53.000+09:00
diff --git a/build.sh b/build.sh
@@ -466,6 +466,7 @@ prepare_rebuild() {
 
     _write_rebuild_file "\n# Channel Info"
     _save_var build_pacman_conf defaultconfig include_extra defaultusername customized_username customized_password customized_kernel
+    _save_var memtest86
 
     _write_rebuild_file "\n# mkalteriso Info"
     _save_var mkalteriso shmkalteriso mkalteriso_option tarball
@@ -612,6 +613,9 @@ make_packages_repo() {
     if [[ "${debug}" = true ]]; then
         _pkglist_args+=" -d"
     fi
+    if [[ "${memtest86}" = true ]]; then
+        _pkglist_args+=" -m"
+    fi
     local _pkglist=($("${tools_dir}/pkglist.sh" ${_pkglist_args}))
 
     # Create a list of packages to be finally installed as packages.list directly under the working directory.
@@ -636,6 +640,9 @@ make_packages_aur() {
     if [[ "${debug}" = true ]]; then
         _pkglist_args+=" -d"
     fi
+    if [[ "${memtest86}" = true ]]; then
+        _pkglist_args+=" -m"
+    fi
     local _pkglist_aur=($("${tools_dir}/pkglist.sh" ${_pkglist_args}))
 
     # Create a list of packages to be finally installed as packages.list directly under the working directory.
@@ -862,10 +869,19 @@ make_syslinux() {
         cp "${script_path}/syslinux/splash.png" "${isofs_dir}/${install_dir}/boot/syslinux"
     fi
 
-    # Remove rescue config
+    # remove config
+    local _remove_config
+    function _remove_config() {
+        remove "${isofs_dir}/${install_dir}/boot/syslinux/${1}"
+        sed -i "s|$(cat "${isofs_dir}/${install_dir}/boot/syslinux/archiso_sys_load.cfg" | grep "${1}")||g" "${isofs_dir}/${install_dir}/boot/syslinux/archiso_sys_load.cfg" 
+    }
+
     if [[ "${norescue_entry}" = true ]]; then
-        remove "${isofs_dir}/${install_dir}/boot/syslinux/archiso_sys_rescue.cfg"
-        sed -i "s|$(cat "${isofs_dir}/${install_dir}/boot/syslinux/archiso_sys_load.cfg" | grep "archiso_sys_rescue")||g" "${isofs_dir}/${install_dir}/boot/syslinux/archiso_sys_load.cfg" 
+        _remove_config archiso_sys_rescue.cfg
+    fi
+
+    if [[ "${memtest86}" = false ]]; then
+        _remove_config memtest86.cfg
     fi
 
     # copy files
diff --git a/channels/share/packages.i486/exclude b/channels/share/packages.i486/exclude
@@ -12,5 +12,3 @@
 # because they are automatically detected
 # and installed by the build script.
 #
-
-memtest86+
diff --git a/channels/share/packages.i486/memtest86/memtest86+.i486 b/channels/share/packages.i486/memtest86/memtest86+.i486
@@ -0,0 +1,11 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+
+memtest86+
diff --git a/channels/share/packages.i686/exclude b/channels/share/packages.i686/exclude
@@ -12,5 +12,3 @@
 # because they are automatically detected
 # and installed by the build script.
 #
-
-memtest86+
diff --git a/channels/share/packages.i686/memtest86/memtest86+.i686 b/channels/share/packages.i686/memtest86/memtest86+.i686
@@ -0,0 +1,11 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+
+memtest86+
diff --git a/channels/share/packages.x86_64/exclude b/channels/share/packages.x86_64/exclude
@@ -12,5 +12,3 @@
 # because they are automatically detected
 # and installed by the build script.
 #
-
-memtest86+
diff --git a/channels/share/packages.x86_64/memtest86/memtest86+.x86_64 b/channels/share/packages.x86_64/memtest86/memtest86+.x86_64
@@ -0,0 +1,11 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+
+memtest86+
diff --git a/default.conf b/default.conf
@@ -162,6 +162,9 @@ password="alter"
 # and the appropriate configuration files in /etc/skel.
 usershell="/bin/bash"
 
+# Install memtest86
+memtest86=true
+
 
 #-- language config --#
 
diff --git a/syslinux/archiso_sys_load.cfg b/syslinux/archiso_sys_load.cfg
@@ -13,4 +13,6 @@ INCLUDE boot/syslinux/archiso_sys.cfg
 
 INCLUDE boot/syslinux/archiso_sys_rescue.cfg
 
+INCLUDE boot/syslinux/memtest86.cfg
+
 INCLUDE boot/syslinux/archiso_tail.cfg
diff --git a/syslinux/archiso_tail.cfg b/syslinux/archiso_tail.cfg
@@ -14,11 +14,6 @@ MENU LABEL Boot existing OS
 COM32 boot/syslinux/chain.c32
 APPEND hd0 0
 
-# http://www.memtest.org/
-# LABEL memtest
-# MENU LABEL Run Memtest86+ (RAM test)
-# LINUX boot/memtest
-
 # http://hdt-project.org/
 LABEL hdt
 TEXT HELP
diff --git a/syslinux/memtest86.cfg b/syslinux/memtest86.cfg
@@ -0,0 +1,11 @@
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+
+# http://www.memtest.org/
+LABEL memtest
+MENU LABEL Run Memtest86+ (RAM test)
+LINUX /%INSTALL_DIR%/boot/memtest
diff --git a/tools/pkglist.sh b/tools/pkglist.sh
@@ -12,16 +12,13 @@ pkgdir_name="packages"
 extra=false
 line=false
 debug=false
+memtest86=false
 
 arch=""
 channel_dir=""
 kernel=""
 locale_name=""
 
-#arch="x86_64"
-#channel_dir="${script_path}/channels/xfce"
-#kernel="zen"
-#locale_name="en"
 
 _help() {
     echo "usage ${0} [options] [command]"
@@ -36,6 +33,7 @@ _help() {
     echo "    -e | --extra              Include extra packages"
     echo "    -k | --kernel [kernel]    Specify the kernel"
     echo "    -l | --locale [locale]    Specify the locale"
+    echo "    -m | --memtest86          Enable memtest86 package"
     echo "    -h | --help               This help message"
     echo "         --aur                AUR packages"
     echo "         --line               Line break the output"
@@ -65,8 +63,8 @@ msg_debug() {
 
 # Parse options
 ARGUMENT="${@}"
-opt_short="a:bc:dek:l:h"
-opt_long="arch:,boot-splash,channel:,debug,extra,kernel:,locale:,aur,help,line"
+opt_short="a:bc:dek:l:mh"
+opt_long="arch:,boot-splash,channel:,debug,extra,kernel:,locale:,memtest86,aur,help,line"
 OPT=$(getopt -o ${opt_short} -l ${opt_long} -- ${ARGUMENT})
 [[ ${?} != 0 ]] && exit 1
 
@@ -103,6 +101,10 @@ while true; do
             locale_name="${2}"
             shift 2
             ;;
+        -m | --memtest86)
+            memtest86=true
+            shift 1
+            ;;
         --aur)
             aur=true
             shift 1
@@ -197,6 +199,19 @@ if [[ "${extra}" = true ]]; then
     )
 fi
 
+# memtest86 package list
+if [[ "${memtest86}" = true ]]; then
+    _loadfilelist+=(
+        $(ls ${share_dir}/${pkgdir_name}.${arch}/memtest86/*.${arch} 2> /dev/null)
+        $(ls ${channel_dir}/${pkgdir_name}.${arch}/memtest86/*.${arch} 2> /dev/null)
+    )
+
+    if [[ "${extra}" = true ]]; then
+        _loadfilelist+=(
+            $(ls ${extra_dir}/${pkgdir_name}.${arch}/memtest86/*.${arch} 2> /dev/null)
+        )
+    fi
+fi
 
 #-- Read package list --#
 # Read the file and remove comments starting with # and add it to the list of packages to install.

Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,3 @@`
`12`	`12`	`# because they are automatically detected`
`13`	`13`	`# and installed by the build script.`
`14`	`14`	`#`
`15`		`-`
`16`		`-memtest86+`