Merge branch 'pipewire' into dev

Author: Hayao0819

build.sh

@@ -22,6 +22,7 @@ module_dir="${script_path}/modules"
 customized_username=false
 customized_password=false
 customized_kernel=false
+pkglist_args=""
 DEFAULT_ARGUMENT=""
 alteriso_version="3.1"
 
@@ -514,6 +515,14 @@ prepare_build() {
         msg_error "${channel_name} channel does not support current architecture (${arch})." "1"
     fi
 
+    # Set argument of pkglist.sh
+    pkglist_args=("-a" "${arch}" "-k" "${kernel}" "-c" "${channel_dir}" "-l" "${locale_name}")
+    if [[ "${boot_splash}"   = true ]]; then pkglist_args+=("-b"); fi
+    if [[ "${debug}"         = true ]]; then pkglist_args+=("-d"); fi
+    if [[ "${memtest86}"     = true ]]; then pkglist_args+=("-m"); fi
+    if (( "${#additional_exclude_pkg[@]}" >= 1 )); then pkglist_args+=("-e" "${additional_exclude_pkg[*]}"); fi
+    pkglist_args+=("${modules[*]}")
+
     # Unmount
     umount_chroot
 }
@@ -553,15 +562,7 @@ make_basefs() {
 
 # Additional packages (airootfs)
 make_packages_repo() {
-    local _pkg _pkglist_args="-a ${arch} -k ${kernel} -c ${channel_dir} -l ${locale_name}"
-
-    # get pkglist
-    if [[ "${boot_splash}"   = true ]]; then _pkglist_args+=" -b"; fi
-    if [[ "${debug}"         = true ]]; then _pkglist_args+=" -d"; fi
-    if [[ "${memtest86}"     = true ]]; then _pkglist_args+=" -m"; fi
-    _pkglist_args+=" ${modules[*]}"
-
-    local _pkglist=($("${tools_dir}/pkglist.sh" ${_pkglist_args}))
+    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.
     echo -e "# The list of packages that is installed in live cd.\n#\n\n" > "${work_dir}/packages.list"
@@ -572,20 +573,10 @@ make_packages_repo() {
 }
 
 make_packages_aur() {
-    local _pkg _pkglist_args="--aur -a ${arch} -k ${kernel} -c ${channel_dir} -l ${locale_name}"
-
-    # get pkglist
-    # get pkglist
-    if [[ "${boot_splash}"   = true ]]; then _pkglist_args+=" -b"; fi
-    if [[ "${debug}"         = true ]]; then _pkglist_args+=" -d"; fi
-    if [[ "${memtest86}"     = true ]]; then _pkglist_args+=" -m"; fi
-    _pkglist_args+=" ${modules[*]}"
-
-    local _pkglist_aur=($("${tools_dir}/pkglist.sh" ${_pkglist_args}))
+    local _pkglist_aur=($("${tools_dir}/pkglist.sh" --aur "${pkglist_args[@]}"))
 
     # Create a list of packages to be finally installed as packages.list directly under the working directory.
     echo -e "\n\n# AUR packages.\n#\n\n" >> "${work_dir}/packages.list"
-    #for _pkg in ${_pkglist_aur[@]}; do echo ${_pkg} >> "${work_dir}/packages.list"; done
     printf "%s\n" "${_pkglist_aur[@]}" >> "${work_dir}/packages.list"
 
     # prepare for yay

default.conf

@@ -267,6 +267,14 @@ msgdebug=false
 # $ git rev-parse --short HEAD
 gitversion=false
 
+# Additional list of packages to exclude from channel
+# Works the same as an exclude file
+# Use this array for debugging only
+# This setting cannot be changed by an argument.
+additional_exclude_pkg=(
+    
+)
+
 
 # List of packages required for build
 # The following packages are checked to see if they are installed before running build.sh

modules/share-extra/airootfs.any/root/customize_airootfs_share-extra.sh

@@ -31,6 +31,22 @@ usermod -aG autologin ${username}
 _systemd_service enable systemd-timesyncd.service
 
 
+# Pipewire
+# Do not use _systemd_service because pipewire services are not system but user
+# Use flag "--user --global"
+# https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/923
+for _service in "pipewire.service" "pipewire-pulse.service"; do
+    if systemctl --user --global cat "${_service}" 1> /dev/null 2>&1; then
+        systemctl --user --global enable "${_service}"
+    fi
+done
+
+# Enable bluetooth support for pipewire
+if [[ -f "/etc/pipewire/media-session.d/media-session.conf" ]]; then
+    sed -i "s|#bluez5|bluez5 |g" "/etc/pipewire/media-session.d/media-session.conf"
+fi
+
+
 # Update system datebase
 if type -p dconf 1>/dev/null 2>/dev/null; then
     dconf update

modules/share-extra/packages.i686/media.i686

@@ -12,7 +12,8 @@
 
 #-- audio --#
 pavucontrol
-pulseaudio
+pipewire
+pipewire-alsa
 
 
 #-- bluetooth --#

modules/share-extra/packages.x86_64/media.x86_64

@@ -12,7 +12,8 @@
 
 #-- audio --#
 pavucontrol
-pulseaudio
+pipewire
+pipewire-alsa
 
 
 #-- bluetooth --#

…share-extra/packages_aur.i686/media.i686 …re-extra/packages_aur.i686/pipewire.i686modules/share-extra/packages_aur.i686/media.i686 renamed to modules/share-extra/packages_aur.i686/pipewire.i686 modules/share-extra/packages_aur.i686/media.i686 renamed to modules/share-extra/packages_aur.i686/pipewire.i686

@@ -8,4 +8,4 @@
 # (c) 2019-2021 Fascode Network.
 #
 
-pulseaudio-modules-bt
+pipewire-enable-bluez5

…e-extra/packages_aur.x86_64/media.x86_64 …xtra/packages_aur.x86_64/pipewire.x86_64modules/share-extra/packages_aur.x86_64/media.x86_64 renamed to modules/share-extra/packages_aur.x86_64/pipewire.x86_64 modules/share-extra/packages_aur.x86_64/media.x86_64 renamed to modules/share-extra/packages_aur.x86_64/pipewire.x86_64

@@ -8,4 +8,4 @@
 # (c) 2019-2021 Fascode Network.
 #
 
-pulseaudio-modules-bt
+pipewire-enable-bluez5

system/aur.sh

@@ -62,7 +62,7 @@ ls "/usr/share/pacman/keyrings/"*".gpg" | sed "s|.gpg||g" | xargs | pacman-key -
 
 # Build and install
 chmod +s /usr/bin/sudo
-for _pkg in "pamac-aur" "${@}"; do
+for _pkg in "${@}"; do
     yes | sudo -u aurbuild \
         yay -Sy \
             --mflags "-AcC" \

system/initcpio/archiso_shutdown

@@ -0,0 +1,39 @@
+#!/bin/ash
+
+# /oldroot depends on things inside /oldroot/run/archiso...
+mkdir /oldrun
+mount -n --move /oldroot/run /oldrun
+
+# Unmount all mounts now.
+umount "$(mount | awk '$3 ~/^\/oldroot/ {print $3}' | sort -r)"
+
+# Remove all dm-snapshot devices.
+dmsetup remove_all
+
+# Remove all loopback devices.
+for _lup in $(grep ^/dev/loop /oldrun/archiso/used_block_devices | tac); do
+    if ! losetup -d -- "${_lup}" 2> /dev/null; then
+        umount -d -- "${_lup}"
+    fi
+done
+
+# Unmount the space used to store *.cow.
+umount /oldrun/archiso/cowspace
+
+# Unmount boot device if needed (no copytoram=y used)
+if [ ! -d /oldrun/archiso/copytoram ]; then
+    if [ -d /oldrun/archiso/img_dev ]; then
+        umount /oldrun/archiso/img_dev
+    else
+        umount /oldrun/archiso/bootmnt
+    fi
+fi
+
+# reboot / poweroff / halt, depending on the argument passed by init
+# if something invalid is passed, we halt
+case "$1" in
+  reboot|poweroff|halt) "$1" -f ;;
+  *) halt -f;;
+esac
+
+# vim: set ft=sh:

tools/pkglist.sh

@@ -13,6 +13,8 @@ line=false
 debug=false
 memtest86=false
 
+additional_exclude_pkg=()
+
 arch=""
 channel_dir=""
 kernel=""
@@ -29,6 +31,7 @@ _help() {
     echo "    -b | --boot-splash        Enable boot splash"
     echo "    -c | --channel [dir]      Specify the channel directory"
     echo "    -d | --debug              Enable debug message"
+    echo "    -e | --exclude [pkgs]     List of packages to be additionally excluded"
     echo "    -k | --kernel [kernel]    Specify the kernel"
     echo "    -l | --locale [locale]    Specify the locale"
     echo "    -m | --memtest86          Enable memtest86 package"
@@ -70,15 +73,15 @@ msg_debug() {
 
 
 # Parse options
-ARGUMENT="${@}"
-OPTS="a:bc:dk:l:mh"
-OPTL="arch:,boot-splash,channel:,debug,kernel:,locale:,memtest86,aur,help,line"
-if ! OPT=$(getopt -o ${OPTS} -l ${OPTL} -- ${ARGUMENT}); then
+ARGUMENT=("${@}")
+OPTS="a:bc:de:k:l:mh"
+OPTL="arch:,boot-splash,channel:,debug,exclude:,kernel:,locale:,memtest86,aur,help,line"
+if ! OPT=$(getopt -o ${OPTS} -l ${OPTL} -- "${ARGUMENT[@]}"); then
     exit 1
 fi
 
 eval set -- "${OPT}"
-unset OPT OPTS OPTL
+unset OPT OPTS OPTL ARGUMENT
 
 while true; do
     case "${1}" in
@@ -98,6 +101,10 @@ while true; do
             debug=true
             shift 1
             ;;
+        -e | --exclude)
+            additional_exclude_pkg=(${2})
+            shift 2
+            ;;
         -k | --kernel)
             kernel="${2}"
             shift 2
@@ -206,6 +213,12 @@ for _file in ${_excludefile[@]}; do
     fi
 done
 
+#-- additional_exclude_pkg のパッケージを_excludelistに追加 --#
+if (( "${#additional_exclude_pkg[@]}" >= 1 )); then
+    _excludelist+=(${additional_exclude_pkg[@]})
+    msg_debug "Additional excluded packages: ${additional_exclude_pkg[*]}"
+fi
+
 #-- excludeに記述されたパッケージを除外 --#
 # _pkglistを_subpkglistにコピーしexcludeのパッケージを除外し再代入
 _subpkglist=(${_pkglist[@]})