Merge branch 'dev' into dev-stable

Hayao0819 · Hayao0819 · commit 51dcbab60437 · 2021-07-18T01:56:06.000+09:00
diff --git a/build.sh b/build.sh
@@ -840,7 +840,7 @@ make_efi() {
     sed "s|%ARCH%|${arch}|g;" "${script_path}/efiboot/${_use_config_name}/loader.conf" > "${isofs_dir}/loader/loader.conf"
 
     readarray -t _efi_config_list < <(find "${script_path}/efiboot/${_use_config_name}/" -mindepth 1 -maxdepth 1 -type f -name "archiso-usb*.conf" -printf "%f\n" | grep -v "rescue")
-    [[ "${norescue_entry}" = false ]] && readarray -t _efi_config_list < <(find "${script_path}/efiboot/${_use_config_name}/" -mindepth 1 -maxdepth 1 -type f  -name "archiso-usb*rescue*.conf" -printf "%f\n")
+    [[ "${norescue_entry}" = false ]] && readarray -t _efi_config_list < <(find "${script_path}/efiboot/${_use_config_name}/" -mindepth 1 -maxdepth 1 -type f  -name "archiso-usb*.conf" -printf "%f\n")
 
     for _efi_config in "${_efi_config_list[@]}"; do
         sed "s|%ARCHISO_LABEL%|${iso_label}|g;
@@ -897,7 +897,7 @@ make_efiboot() {
     find "${isofs_dir}/loader/entries/" -maxdepth 1 -mindepth 1 -name "uefi-shell*" -type f -printf "%p\0" | xargs -0 -I{} cp {} "${build_dir}/efiboot/loader/entries/"
 
     readarray -t _efi_config_list < <(find "${script_path}/efiboot/${_use_config_name}/" -mindepth 1 -maxdepth 1 -type f -name "archiso-cd*.conf" -printf "%f\n" | grep -v "rescue")
-    [[ "${norescue_entry}" = false ]] && readarray -t _efi_config_list < <(find "${script_path}/efiboot/${_use_config_name}/" -mindepth 1 -maxdepth 1 -type f  -name "archiso-cd*rescue*.conf" -printf "%f\n")
+    [[ "${norescue_entry}" = false ]] && readarray -t _efi_config_list < <(find "${script_path}/efiboot/${_use_config_name}/" -mindepth 1 -maxdepth 1 -type f  -name "archiso-cd*.conf" -printf "%f\n")
 
     for _efi_config in "${_efi_config_list[@]}"; do
         sed "s|%ARCHISO_LABEL%|${iso_label}|g;
diff --git a/channels/releng/airootfs.any/etc/systemd/system/pacman-init.service b/channels/releng/airootfs.any/etc/systemd/system/pacman-init.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Initializes Pacman keyring
-Wants=haveged.service
-After=haveged.service
+#Wants=haveged.service
+#After=haveged.service
 Requires=etc-pacman.d-gnupg.mount
 After=etc-pacman.d-gnupg.mount
 
diff --git a/efiboot/nosplash/archiso-cd-rescue-nogui.conf b/efiboot/nosplash/archiso-cd-rescue-nogui.conf
@@ -5,6 +5,6 @@
 # (c) 2019-2021 Fascode Network.
 #
 
-title   %OS_NAME% archiso %ARCH% UEFI CD without GUI
+title   %OS_NAME% %ARCH% UEFI CD without GUI
 efi   /EFI/alteriso/%ARCH%/%KERNEL_FILENAME%.efi
 options initrd=/EFI/alteriso/intel-ucode.img initrd=/EFI/alteriso/amd-ucode.img initrd=/EFI/alteriso/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% arch=%ARCH% systemd.unit=multi-user.target nomodeset
diff --git a/efiboot/nosplash/archiso-cd-rescue-safegui.conf b/efiboot/nosplash/archiso-cd-rescue-safegui.conf
@@ -5,6 +5,6 @@
 # (c) 2019-2021 Fascode Network.
 #
 
-title   %OS_NAME% archiso %ARCH% UEFI CD with safe graphics
+title   %OS_NAME% %ARCH% UEFI CD with safe graphics
 efi   /EFI/alteriso/%ARCH%/%KERNEL_FILENAME%.efi 
 options initrd=/EFI/alteriso/intel-ucode.img initrd=/EFI/alteriso/amd-ucode.img initrd=/EFI/alteriso/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% arch=%ARCH% nomodeset
diff --git a/efiboot/nosplash/archiso-cd.conf b/efiboot/nosplash/archiso-cd.conf
@@ -5,6 +5,6 @@
 # (c) 2019-2021 Fascode Network.
 #
 
-title   %OS_NAME% archiso %ARCH% UEFI CD
+title   %OS_NAME% %ARCH% UEFI CD
 efi   /EFI/alteriso/%ARCH%/%KERNEL_FILENAME%.efi
 options initrd=/EFI/alteriso/intel-ucode.img initrd=/EFI/alteriso/amd-ucode.img initrd=/EFI/alteriso/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% arch=%ARCH%
diff --git a/efiboot/nosplash/archiso-usb-rescue-nogui.conf b/efiboot/nosplash/archiso-usb-rescue-nogui.conf
@@ -5,6 +5,6 @@
 # (c) 2019-2021 Fascode Network.
 #
 
-title   %OS_NAME% archiso %ARCH% UEFI USB without GUI
+title   %OS_NAME% %ARCH% UEFI USB without GUI
 efi   /%INSTALL_DIR%/boot/%ARCH%/%KERNEL_FILENAME% 
 options initrd=/%INSTALL_DIR%/boot/intel-ucode.img initrd=/%INSTALL_DIR%/boot/amd-ucode.img initrd=/%INSTALL_DIR%/boot/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% systemd.unit=multi-user.target nomodeset
diff --git a/efiboot/nosplash/archiso-usb-rescue-safegui.conf b/efiboot/nosplash/archiso-usb-rescue-safegui.conf
@@ -5,6 +5,6 @@
 # (c) 2019-2021 Fascode Network.
 #
 
-title   %OS_NAME% archiso %ARCH% UEFI USB with safe graphics
+title   %OS_NAME% %ARCH% UEFI USB with safe graphics
 efi   /%INSTALL_DIR%/boot/%ARCH%/%KERNEL_FILENAME%
 options initrd=/%INSTALL_DIR%/boot/intel-ucode.img initrd=/%INSTALL_DIR%/boot/amd-ucode.img initrd=/%INSTALL_DIR%/boot/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% nomodeset
diff --git a/efiboot/nosplash/archiso-usb.conf b/efiboot/nosplash/archiso-usb.conf
@@ -5,6 +5,6 @@
 # (c) 2019-2021 Fascode Network.
 #
 
-title   %OS_NAME% archiso %ARCH% UEFI USB
+title   %OS_NAME% %ARCH% UEFI USB
 efi   /%INSTALL_DIR%/boot/%ARCH%/%KERNEL_FILENAME%
 options initrd=/%INSTALL_DIR%/boot/intel-ucode.img initrd=/%INSTALL_DIR%/boot/amd-ucode.img initrd=/%INSTALL_DIR%/boot/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
diff --git a/efiboot/splash/archiso-cd-nosplash.conf b/efiboot/splash/archiso-cd-nosplash.conf
@@ -5,6 +5,6 @@
 # (c) 2019-2021 Fascode Network.
 #
 
-title   %OS_NAME% archiso %ARCH% UEFI CD without boot splash
+title   %OS_NAME% %ARCH% UEFI CD without boot splash
 efi   /EFI/alteriso/%ARCH%/%KERNEL_FILENAME%.efi 
 options initrd=/EFI/alteriso/intel-ucode.img initrd=/EFI/alteriso/amd-ucode.img initrd=/EFI/alteriso/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% arch=%ARCH%
diff --git a/efiboot/splash/archiso-cd-rescue-nogui.conf b/efiboot/splash/archiso-cd-rescue-nogui.conf
@@ -5,6 +5,6 @@
 # (c) 2019-2021 Fascode Network.
 #
 
-title   %OS_NAME% archiso %ARCH% UEFI CD without GUI
+title   %OS_NAME% %ARCH% UEFI CD without GUI
 efi   /EFI/alteriso/%ARCH%/%KERNEL_FILENAME%.efi
 options initrd=/EFI/alteriso/intel-ucode.img initrd=/EFI/alteriso/amd-ucode.img initrd=/EFI/alteriso/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% arch=%ARCH% systemd.unit=multi-user.target nomodeset
diff --git a/efiboot/splash/archiso-cd-rescue-safegui.conf b/efiboot/splash/archiso-cd-rescue-safegui.conf
@@ -5,6 +5,6 @@
 # (c) 2019-2021 Fascode Network.
 #
 
-title   %OS_NAME% archiso %ARCH% UEFI CD with safe graphics
+title   %OS_NAME% %ARCH% UEFI CD with safe graphics
 efi   /EFI/alteriso/%ARCH%/%KERNEL_FILENAME%.efi
 options initrd=/EFI/alteriso/intel-ucode.img initrd=/EFI/alteriso/amd-ucode.img initrd=/EFI/alteriso/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% arch=%ARCH% nomodeset
diff --git a/efiboot/splash/archiso-cd.conf b/efiboot/splash/archiso-cd.conf
@@ -5,6 +5,6 @@
 # (c) 2019-2021 Fascode Network.
 #
 
-title   %OS_NAME% archiso %ARCH% UEFI CD
+title   %OS_NAME% %ARCH% UEFI CD
 efi   /EFI/alteriso/%ARCH%/%KERNEL_FILENAME%.efi
 options initrd=/EFI/alteriso/intel-ucode.img initrd=/EFI/alteriso/amd-ucode.img initrd=/EFI/alteriso/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% arch=%ARCH% quiet splash loglevel=3
diff --git a/efiboot/splash/archiso-usb-nosplash.conf b/efiboot/splash/archiso-usb-nosplash.conf
@@ -5,6 +5,6 @@
 # (c) 2019-2021 Fascode Network.
 #
 
-title   %OS_NAME% archiso %ARCH% UEFI USB without boot splash
+title   %OS_NAME% %ARCH% UEFI USB without boot splash
 efi   /%INSTALL_DIR%/boot/%ARCH%/%KERNEL_FILENAME%
 options initrd=/%INSTALL_DIR%/boot/intel-ucode.img initrd=/%INSTALL_DIR%/boot/amd-ucode.img initrd=/%INSTALL_DIR%/boot/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
diff --git a/efiboot/splash/archiso-usb-rescue-nogui.conf b/efiboot/splash/archiso-usb-rescue-nogui.conf
@@ -5,6 +5,6 @@
 # (c) 2019-2021 Fascode Network.
 #
 
-title   %OS_NAME% archiso %ARCH% UEFI USB without GUI
+title   %OS_NAME% %ARCH% UEFI USB without GUI
 efi   /%INSTALL_DIR%/boot/%ARCH%/%KERNEL_FILENAME%
 options initrd=/%INSTALL_DIR%/boot/intel-ucode.img initrd=/%INSTALL_DIR%/boot/amd-ucode.img initrd=/%INSTALL_DIR%/boot/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% systemd.unit=multi-user.target nomodeset
diff --git a/efiboot/splash/archiso-usb-rescue-safegui.conf b/efiboot/splash/archiso-usb-rescue-safegui.conf
@@ -5,6 +5,6 @@
 # (c) 2019-2021 Fascode Network.
 #
 
-title   %OS_NAME% archiso %ARCH% UEFI USB with safe graphics
+title   %OS_NAME% %ARCH% UEFI USB with safe graphics
 efi   /%INSTALL_DIR%/boot/%ARCH%/%KERNEL_FILENAME%
 options initrd=/%INSTALL_DIR%/boot/intel-ucode.img initrd=/%INSTALL_DIR%/boot/amd-ucode.img initrd=/%INSTALL_DIR%/boot/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% nomodeset
diff --git a/efiboot/splash/archiso-usb.conf b/efiboot/splash/archiso-usb.conf
@@ -5,6 +5,6 @@
 # (c) 2019-2021 Fascode Network.
 #
 
-title   %OS_NAME% archiso %ARCH% UEFI USB
+title   %OS_NAME% %ARCH% UEFI USB
 efi   /%INSTALL_DIR%/boot/%ARCH%/%KERNEL_FILENAME%
 options initrd=/%INSTALL_DIR%/boot/intel-ucode.img initrd=/%INSTALL_DIR%/boot/amd-ucode.img initrd=/%INSTALL_DIR%/boot/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3
diff --git a/modules/share-extra/packages.i686/media.i686 b/modules/share-extra/packages.i686/media.i686
@@ -14,6 +14,7 @@
 pavucontrol
 pipewire
 pipewire-alsa
+pipewire-jack
 pipewire-pulse
 
 
diff --git a/modules/share-extra/packages.x86_64/media.x86_64 b/modules/share-extra/packages.x86_64/media.x86_64
@@ -14,6 +14,7 @@
 pavucontrol
 pipewire
 pipewire-alsa
+pipewire-jack
 pipewire-pulse
 
 
diff --git a/modules/share-extra/packages_aur.i686/pipewire.i686 b/modules/share-extra/packages_aur.i686/pipewire.i686
@@ -8,4 +8,5 @@
 # (c) 2019-2021 Fascode Network.
 #
 
+pipewire-jack-dropin
 pipewire-enable-bluez5
diff --git a/modules/share-extra/packages_aur.x86_64/pipewire.x86_64 b/modules/share-extra/packages_aur.x86_64/pipewire.x86_64
@@ -8,4 +8,5 @@
 # (c) 2019-2021 Fascode Network.
 #
 
+pipewire-jack-dropin
 pipewire-enable-bluez5
diff --git a/modules/share/airootfs.any/etc/systemd/system/pacman-init.service b/modules/share/airootfs.any/etc/systemd/system/pacman-init.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Initializes Pacman keyring
-Wants=haveged.service
-After=haveged.service
+#Wants=haveged.service
+#After=haveged.service
 Requires=etc-pacman.d-gnupg.mount
 After=etc-pacman.d-gnupg.mount
 
diff --git a/modules/share/airootfs.i486/etc/systemd/system/pacman-init.service b/modules/share/airootfs.i486/etc/systemd/system/pacman-init.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Initializes Pacman keyring
-Wants=haveged.service
-After=haveged.service
+#Wants=haveged.service
+#After=haveged.service
 Requires=etc-pacman.d-gnupg.mount
 After=etc-pacman.d-gnupg.mount
 
diff --git a/modules/share/airootfs.i686/etc/systemd/system/pacman-init.service b/modules/share/airootfs.i686/etc/systemd/system/pacman-init.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Initializes Pacman keyring
-Wants=haveged.service
-After=haveged.service
+#Wants=haveged.service
+#After=haveged.service
 Requires=etc-pacman.d-gnupg.mount
 After=etc-pacman.d-gnupg.mount
 
diff --git a/modules/share/airootfs.x86_64/etc/systemd/system/pacman-init.service b/modules/share/airootfs.x86_64/etc/systemd/system/pacman-init.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Initializes Pacman keyring
-Wants=haveged.service
-After=haveged.service
+#Wants=haveged.service
+#After=haveged.service
 Requires=etc-pacman.d-gnupg.mount
 After=etc-pacman.d-gnupg.mount
 
diff --git a/modules/share/packages.i486/base.i486 b/modules/share/packages.i486/base.i486
@@ -12,7 +12,7 @@
 base-devel
 
 bash
-haveged
+#haveged
 intel-ucode
 amd-ucode
 mkinitcpio-nfs-utils
diff --git a/modules/share/packages.i686/base.i686 b/modules/share/packages.i686/base.i686
@@ -12,7 +12,7 @@
 base-devel
 
 bash
-haveged
+#haveged
 intel-ucode
 amd-ucode
 mkinitcpio-nfs-utils
diff --git a/modules/share/packages.x86_64/base.x86_64 b/modules/share/packages.x86_64/base.x86_64
@@ -12,7 +12,7 @@
 base-devel
 
 bash
-haveged
+#haveged
 intel-ucode
 amd-ucode
 mkinitcpio-nfs-utils

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,6 @@`
`5`	`5`	`# (c) 2019-2021 Fascode Network.`
`6`	`6`	`#`
`7`	`7`
`8`		`-title %OS_NAME% archiso %ARCH% UEFI CD without GUI`
	`8`	`+title %OS_NAME% %ARCH% UEFI CD without GUI`
`9`	`9`	`efi /EFI/alteriso/%ARCH%/%KERNEL_FILENAME%.efi`
`10`	`10`	`options initrd=/EFI/alteriso/intel-ucode.img initrd=/EFI/alteriso/amd-ucode.img initrd=/EFI/alteriso/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% arch=%ARCH% systemd.unit=multi-user.target nomodeset`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,6 @@`
`5`	`5`	`# (c) 2019-2021 Fascode Network.`
`6`	`6`	`#`
`7`	`7`
`8`		`-title %OS_NAME% archiso %ARCH% UEFI USB without GUI`
	`8`	`+title %OS_NAME% %ARCH% UEFI USB without GUI`
`9`	`9`	`efi /%INSTALL_DIR%/boot/%ARCH%/%KERNEL_FILENAME%`
`10`	`10`	`options initrd=/%INSTALL_DIR%/boot/intel-ucode.img initrd=/%INSTALL_DIR%/boot/amd-ucode.img initrd=/%INSTALL_DIR%/boot/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% systemd.unit=multi-user.target nomodeset`