Merge branch 'alteriso-3-mainline' into alteriso-3-stable

Author: Hayao0819

allarch.sh

@@ -202,6 +202,7 @@ _usage () {
     echo " General options:"
     echo "    -b | --boot-splash           Enable boot splash"
     echo "    -e | --cleanup | --cleaning  Enable post-build cleaning"
+    echo "         --tarball               Build rootfs in tar.xz format"
     echo "    -h | --help                  This help message and exit"
     echo
     echo "    -c | --comp-type <comp_type> Set SquashFS compression type (gzip, lzma, lzo, xz, zstd)"
@@ -283,6 +284,7 @@ _usage () {
     echo "         --nochkver              NO check the version of the channel"
     echo "         --noloopmod             No check and load kernel module automatically"
     echo "         --nodepend              No check package dependencies before building"
+    echo "         --noiso                 No build iso image (Use with --tarball)"
     echo "         --shmkalteriso          Use the shell script version of mkalteriso"
     if [[ -n "${1:-}" ]]; then exit "${1}"; fi
 }
@@ -368,9 +370,9 @@ remove_work() {
 # Display channel list
 show_channel_list() {
     if [[ "${nochkver}" = true ]]; then
-        bash "${script_path}/tools/channel.sh" -v "${alteriso_version}" -n show
+        bash "${script_path}/tools/channel.sh" -m -v "${alteriso_version}" -n show
     else
-        bash "${script_path}/tools/channel.sh" -v "${alteriso_version}" show
+        bash "${script_path}/tools/channel.sh" -m -v "${alteriso_version}" show
     fi
 }
 
@@ -399,6 +401,9 @@ check_env() {
         msg_error "This kernel is currently not supported on this channel." "1"
     fi
 
+    # Show warning about allarch.sh
+    msg_info "Some features of build.sh are not available."
+
     # Check packages
     if [[ "${nodepend}" = false ]] && [[ "${arch}" = $(uname -m) ]] ; then
         local _installed_pkg=($(pacman -Q | awk '{print $1}')) _installed_ver=($(pacman -Q | awk '{print $2}')) _check_pkg _check_failed=false _pkg
@@ -426,7 +431,7 @@ check_env() {
                         # リモートとローカルのバージョンが一致しない場合
                         [[ "${debug}" = true ]] && echo -ne " $(pacman -Q ${1} | awk '{print $2}')\n"
                         msg_warn "${1} is not the latest package."
-                        msg_warn "Local: $(pacman -Q ${1} 2> /dev/null | awk '{print $2}') Latest: $(pacman -Sp --print-format '%v' --config ${build_pacman_conf} ${1} 2> /dev/null)"
+                        msg_warn "Local: $(pacman -Q ${1} 2> /dev/null | awk '{print $2}') Latest: ${__ver}"
                         return 0
                     fi
                 fi
@@ -587,6 +592,8 @@ prepare_build() {
     check_bool customized_username
     check_bool noloopmod
     check_bool nochname
+    check_bool tarball
+    check_bool noiso
     check_bool noaur
     check_bool customized_syslinux
 
@@ -1008,8 +1015,8 @@ make_syslinux() {
     # 一時ディレクトリに設定ファイルをコピー
     mkdir -p "${work_dir}/${arch}/syslinux/"
     cp -a "${script_path}/syslinux/"* "$work_dir/${arch}/syslinux/"
-    if [[ -d "${script_path}/channels/${channel_name}/syslinux.${arch}" ]] && [[ "${customized_syslinux}" = true ]]; then
-        cp -af "${script_path}/channels/${channel_name}/syslinux.${arch}/"* "$work_dir/${arch}/syslinux/"
+    if [[ -d "${script_path}/channels/${channel_name}/syslinux" ]] && [[ "${customized_syslinux}" = true ]]; then
+        cp -af "${script_path}/channels/${channel_name}/syslinux/"* "$work_dir/${arch}/syslinux/"
     fi
 
     # copy all syslinux config to work dir
@@ -1105,20 +1112,20 @@ make_efi() {
 
 # Prepare efiboot.img::/EFI for "El Torito" EFI boot mode
 make_efiboot() {
-    mkdir -p "${work_dir}/iso/EFI/archiso"
-    truncate -s 64M "${work_dir}/iso/EFI/archiso/efiboot.img"
-    mkfs.fat -n ARCHISO_EFI "${work_dir}/iso/EFI/archiso/efiboot.img"
+    mkdir -p "${work_dir}/iso/EFI/alteriso"
+    truncate -s 64M "${work_dir}/iso/EFI/alteriso/efiboot.img"
+    mkfs.fat -n ARCHISO_EFI "${work_dir}/iso/EFI/alteriso/efiboot.img"
 
     mkdir -p "${work_dir}/efiboot"
-    mount "${work_dir}/iso/EFI/archiso/efiboot.img" "${work_dir}/efiboot"
+    mount "${work_dir}/iso/EFI/alteriso/efiboot.img" "${work_dir}/efiboot"
 
-    mkdir -p "${work_dir}/efiboot/EFI/archiso"
+    mkdir -p "${work_dir}/efiboot/EFI/alteriso"
 
-    cp "${work_dir}/iso/${install_dir}/boot/x86_64/${kernel_filename}" "${work_dir}/efiboot/EFI/archiso/${kernel_filename}.efi"
-    cp "${work_dir}/iso/${install_dir}/boot/x86_64/archiso.img" "${work_dir}/efiboot/EFI/archiso/archiso.img"
+    cp "${work_dir}/iso/${install_dir}/boot/x86_64/${kernel_filename}" "${work_dir}/efiboot/EFI/alteriso/${kernel_filename}.efi"
+    cp "${work_dir}/iso/${install_dir}/boot/x86_64/archiso.img" "${work_dir}/efiboot/EFI/alteriso/archiso.img"
 
-    cp "${work_dir}/iso/${install_dir}/boot/intel_ucode.img" "${work_dir}/efiboot/EFI/archiso/intel_ucode.img"
-    cp "${work_dir}/iso/${install_dir}/boot/amd_ucode.img" "${work_dir}/efiboot/EFI/archiso/amd_ucode.img"
+    cp "${work_dir}/iso/${install_dir}/boot/intel_ucode.img" "${work_dir}/efiboot/EFI/alteriso/intel_ucode.img"
+    cp "${work_dir}/iso/${install_dir}/boot/amd_ucode.img" "${work_dir}/efiboot/EFI/alteriso/amd_ucode.img"
 
     mkdir -p "${work_dir}/efiboot/EFI/boot"
 
@@ -1149,6 +1156,33 @@ make_efiboot() {
     umount -d "${work_dir}/efiboot"
 }
 
+# Compress tarball
+make_tarball() {
+    cp -a -l -f "${work_dir}/${arch}/airootfs" "${work_dir}"
+
+    if [[ -f "${work_dir}/${arch}/airootfs/root/optimize_for_tarball.sh" ]]; then
+        chmod 755 "${work_dir}/${arch}/airootfs/root/optimize_for_tarball.sh"
+        # Execute optimize_for_tarball.sh.
+        ${mkalteriso} ${mkalteriso_option} \
+        -w "${work_dir}/${arch}" \
+        -C "${work_dir}/pacman-${arch}.conf" \
+        -D "${install_dir}" \
+        -r "/root/optimize_for_tarball.sh" \
+        run
+    fi
+
+    ARCHISO_GNUPG_FD=${gpg_key:+17} ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}" -C "${work_dir}/pacman-${arch}.conf" -D "${install_dir}" -r "mkinitcpio -p ${kernel_mkinitcpio_profile}" run
+
+    remove "${work_dir}/${arch}/airootfs/root/optimize_for_tarball.sh"
+
+    ${mkalteriso} ${mkalteriso_option} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" -A "${iso_application}" -o "${out_dir}" tarball "$(echo ${iso_filename} | sed 's/\.[^\.]*$//' | sed "s/dual/${arch}/g").tar.xz"
+
+    remove "${work_dir}/airootfs"
+    if [[ "${noiso}" = true ]]; then
+        msg_info "The password for the live user and root is ${password}."
+    fi
+}
+
 
 # Build airootfs filesystem image
 make_prepare() {
@@ -1256,7 +1290,7 @@ parse_files() {
 # Parse options
 ARGUMENT="${@}"
 _opt_short="bc:deg:hjk:l:o:p:rt:u:w:x"
-_opt_long="boot-splash,comp-type:,debug,cleaning,cleanup,gpgkey:,help,lang:,japanese,kernel:,out:,password:,comp-opts:,user:,work:,bash-debug,nocolor,noconfirm,nodepend,gitversion,shmkalteriso,msgdebug,noloopmod,noaur,nochkver,channellist,config:"
+_opt_long="boot-splash,comp-type:,debug,cleaning,cleanup,gpgkey:,help,lang:,japanese,kernel:,out:,password:,comp-opts:,user:,work:,bash-debug,nocolor,noconfirm,nodepend,gitversion,shmkalteriso,msgdebug,noloopmod,tarball,noiso,noaur,nochkver,channellist,config:"
 OPT=$(getopt -o ${_opt_short} -l ${_opt_long} -- ${DEFAULT_ARGUMENT} ${ARGUMENT})
 [[ ${?} != 0 ]] && exit 1
 
@@ -1293,7 +1327,7 @@ while :; do
             exit 0
             ;;
         -j | --japanese)
-            msg_error "This option is obsolete in AlterISO 3. To use Japanese, use \"-g ja\"." "1"
+            msg_error "This option is obsolete in AlterISO 3. To use Japanese, use \"-l ja\"." "1"
             ;;
         -k | --kernel)
             kernel="${2}"
@@ -1311,6 +1345,10 @@ while :; do
             password="${2}"
             shift 2
             ;;
+        -r | --tarball)
+            tarball=true
+            shift 1
+            ;;
         -t | --comp-opts)
             sfs_comp_opt="${2}"
             shift 2
@@ -1361,6 +1399,10 @@ while :; do
             noloopmod=true
             shift 1
             ;;
+        --noiso)
+            noiso=true
+            shift 1
+            ;;
         --noaur)
             noaur=true
             shift 1
@@ -1408,7 +1450,7 @@ set +eu
 [[ -n "${1}" ]] && channel_name="${1}"
 
 # Check for a valid channel name
-[[ "$(bash "${script_path}/tools/channel.sh" check "${channel_name}")" = false ]] && msg_error "Invalid channel ${channel_name}" "1"
+[[ "$(bash "${script_path}/tools/channel.sh" -m check "${channel_name}")" = false ]] && msg_error "Invalid channel ${channel_name}" "1"
 
 # Set for special channels
 if [[ -d "${script_path}/channels/${channel_name}.add" ]]; then
@@ -1452,14 +1494,19 @@ for arch in ${all_arch[@]}; do
     run_arch make_setup_mkinitcpio
     run_arch make_syslinux
     run_arch make_boot
-    run_arch make_prepare
+    [[ "${noiso}" = false ]] && run_arch make_prepare
 done
 run_once make_boot_extra
 run_once make_syslinux_loadfiles
 run_once make_isolinux
 run_once make_efi
 run_once make_efiboot
-run_once make_iso
+if [[ "${tarball}" = true ]]; then
+    for arch in ${all_arch[@]}; do
+        run_arch make_tarball
+    done
+fi
+[[ "${noiso}" = false ]] && run_once make_iso
 [[ "${cleaning}" = true ]] && remove_work
 
 exit 0

build.sh

@@ -601,7 +601,7 @@ prepare_build() {
                         # リモートとローカルのバージョンが一致しない場合
                         [[ "${debug}" = true ]] && echo -ne " $(pacman -Q ${1} | awk '{print $2}')\n"
                         msg_warn "${1} is not the latest package."
-                        msg_warn "Local: $(pacman -Q ${1} 2> /dev/null | awk '{print $2}') Latest: $(pacman -Sp --print-format '%v' --config ${build_pacman_conf} ${1} 2> /dev/null)"
+                        msg_warn "Local: $(pacman -Q ${1} 2> /dev/null | awk '{print $2}') Latest: ${__ver}"
                         return 0
                     fi
                 fi
@@ -1073,8 +1073,8 @@ make_syslinux() {
     # 一時ディレクトリに設定ファイルをコピー
     mkdir -p "${work_dir}/${arch}/syslinux/"
     cp -a "${script_path}/syslinux/"* "${work_dir}/${arch}/syslinux/"
-    if [[ -d "${script_path}/channels/${channel_name}/syslinux.${arch}" ]] && [[ "${customized_syslinux}" = true ]]; then
-        cp -af "${script_path}/channels/${channel_name}/syslinux.${arch}/"* "${work_dir}/${arch}/syslinux/"
+    if [[ -d "${script_path}/channels/${channel_name}/syslinux" ]] && [[ "${customized_syslinux}" = true ]]; then
+        cp -af "${script_path}/channels/${channel_name}/syslinux"* "${work_dir}/${arch}/syslinux/"
     fi
 
     # copy all syslinux config to work dir
@@ -1157,20 +1157,20 @@ make_efi() {
 
 # Prepare efiboot.img::/EFI for "El Torito" EFI boot mode
 make_efiboot() {
-    mkdir -p "${work_dir}/iso/EFI/archiso"
-    truncate -s 64M "${work_dir}/iso/EFI/archiso/efiboot.img"
-    mkfs.fat -n ARCHISO_EFI "${work_dir}/iso/EFI/archiso/efiboot.img"
+    mkdir -p "${work_dir}/iso/EFI/alteriso"
+    truncate -s 64M "${work_dir}/iso/EFI/alteriso/efiboot.img"
+    mkfs.fat -n ARCHISO_EFI "${work_dir}/iso/EFI/alteriso/efiboot.img"
 
     mkdir -p "${work_dir}/efiboot"
-    mount "${work_dir}/iso/EFI/archiso/efiboot.img" "${work_dir}/efiboot"
+    mount "${work_dir}/iso/EFI/alteriso/efiboot.img" "${work_dir}/efiboot"
 
-    mkdir -p "${work_dir}/efiboot/EFI/archiso"
+    mkdir -p "${work_dir}/efiboot/EFI/alteriso"
 
-    cp "${work_dir}/iso/${install_dir}/boot/${arch}/${kernel_filename}" "${work_dir}/efiboot/EFI/archiso/${kernel_filename}.efi"
-    cp "${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img" "${work_dir}/efiboot/EFI/archiso/archiso.img"
+    cp "${work_dir}/iso/${install_dir}/boot/${arch}/${kernel_filename}" "${work_dir}/efiboot/EFI/alteriso/${kernel_filename}.efi"
+    cp "${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img" "${work_dir}/efiboot/EFI/alteriso/archiso.img"
 
-    cp "${work_dir}/iso/${install_dir}/boot/intel_ucode.img" "${work_dir}/efiboot/EFI/archiso/intel_ucode.img"
-    cp "${work_dir}/iso/${install_dir}/boot/amd_ucode.img" "${work_dir}/efiboot/EFI/archiso/amd_ucode.img"
+    cp "${work_dir}/iso/${install_dir}/boot/intel_ucode.img" "${work_dir}/efiboot/EFI/alteriso/intel_ucode.img"
+    cp "${work_dir}/iso/${install_dir}/boot/amd_ucode.img" "${work_dir}/efiboot/EFI/alteriso/amd_ucode.img"
 
     mkdir -p "${work_dir}/efiboot/EFI/boot"
     #cp "${work_dir}/${arch}/airootfs/usr/lib/systemd/boot/efi/systemd-bootx64.efi" "${work_dir}/efiboot/EFI/boot/bootx64.efi"
@@ -1372,7 +1372,7 @@ while :; do
             exit 0
             ;;
         -j | --japanese)
-            msg_error "This option is obsolete in AlterISO 3. To use Japanese, use \"-g ja\"." "1"
+            msg_error "This option is obsolete in AlterISO 3. To use Japanese, use \"-l ja\"." "1"
             ;;
         -k | --kernel)
             kernel="${2}"

channels/i3/airootfs.any/etc/skel/.config/dunst/dunstrc

@@ -0,0 +1,57 @@
+# ---------------------------------------------
+#  Alter Linux i3wm edition
+#  dunst config file
+#
+#  Watasuke
+#  Twitter: @Watasuke102
+#  Email  : Watasuke102@gmail.com
+#
+#  (c) 2020 Fascode Network.
+# ---------------------------------------------
+
+[global]
+monitor         = 0
+follow          = mouse
+sort            = yes
+indicate_hidden = yes
+word_wrap       = yes # multi line
+
+# don't show URL and action
+show_indicators = no
+
+# format
+markup = full
+format = "<b>%a - %s</b>\n%b\n%p"
+
+# icon
+icon_path     = /usr/share/icons/Inverse-blue-dark/16/devices;/usr/share/icons/Inverse-blue-dark/16/status;/usr/share/icons/Inverse-blue-dark/32/status
+icon_position = left
+max_icon_size = 64
+
+# appearance
+padding            = 10
+horizontal_padding = 15
+separator_height   = 5
+transparency       = 10
+geometry           = "350x20-30+40"
+font               = Noto Sans 9
+
+[urgency_low]
+background = "#292929"
+foreground = "#ffffff"
+timeout    = 10
+
+[urgency_normal]
+background = "#292929"
+foreground = "#ffffff"
+timeout    = 10
+
+[urgency_critical]
+background = "#992929"
+foreground = "#ffffff"
+timeout    = 10
+
+# shortcut
+[shortcuts]
+close     = ctrl+space
+close_all = ctrl+shift+space

channels/i3/airootfs.any/etc/skel/.config/i3/config

@@ -12,9 +12,6 @@
 # ---------------------
 # Appearance
 
-# wallpaper
-exec_always --no-startup-id nitrogen --restore
-
 # font
 font pango:Noto Sans 9
 
@@ -31,13 +28,14 @@ for_window [class="^.*"] border pixel 2
 
 # automatic-startup
 exec_always --no-startup-id $HOME/.config/polybar/launch.sh
+exec_always --no-startup-id nitrogen --restore
+exec_always --no-startup-id dunst
 exec --no-startup-id /usr/lib/mate-polkit/polkit-mate-authentication-agent-1
 exec --no-startup-id xfce4-clipman
 exec --no-startup-id light-locker
 exec --no-startup-id dex -ae i3
 exec --no-startup-id nm-applet
 exec --no-startup-id compton
-exec --no-startup-id dunst
 exec --no-startup-id conky
 exec --no-startup-id fcitx
 
@@ -52,7 +50,7 @@ for_window [class="pavucontrol"] floating enable
 set $mod Mod4
 
 # start calamares (installer)
-bindsym $mod+i exec --no-startup-id sudo calamares
+bindsym $mod+i exec --no-startup-id sudo -E calamares
 
 # start a terminal
 bindsym $mod+Return exec --no-startup-id sakura

channels/i3/packages.i686/i3.i686

@@ -60,4 +60,5 @@ qt5-styleplugins
 
 # Theme
 adapta-gtk-theme
+adapta-gtk-theme-colorpack
 inverse-icon-theme-blue-git

channels/i3/packages.x86_64/i3.x86_64

@@ -60,4 +60,5 @@ qt5-styleplugins
 
 # Theme
 adapta-gtk-theme
+adapta-gtk-theme-colorpack
 inverse-icon-theme-blue-git

channels/releng/airootfs.any/root/customize_airootfs.sh

@@ -99,3 +99,8 @@ systemctl set-default multi-user.target
 
 remove /etc/arch-release
 touch /etc/arch-release
+
+rmeove "/etc/plymouth"
+remove "/usr/share/calamares"
+remove "/home/hayao/Git/alterlinux/channels/share/airootfs.any/etc/polkit-1/rules.d/01-nopasswork.rules"
+remove "/home/hayao/Git/alterlinux/channels/share/airootfs.any/etc/polkit-1/rules.d/10-enable-mount.rules"