diff options
author | David P <megver83@parabola.nu> | 2020-11-03 14:14:40 -0300 |
---|---|---|
committer | David P <megver83@parabola.nu> | 2020-11-05 19:58:07 -0300 |
commit | 6ce377c73ecb7d5e62a7546132b7ab70d771f5d2 (patch) | |
tree | 0d09d0328f2f716d0204893d780171cc36bea705 /configs/talkingparabola/airootfs/usr | |
parent | cd1f2f1951ee54554169c9bf38e41692c6286c22 (diff) |
sync with archiso v49v49
Imported changes:
cc169d7 (HEAD -> master, origin/master, origin/HEAD) configs/releng/packages.x86_64: add fatresize, gpart and tmux
40ae3ba (tag: v49) Set syslinux bootloader timeout to 15s
ee6c5fa Set bootloader timeouts to 15s
9f16862 Configure the image type and image creation options using profiles (#54)
e369ade fix a typo, add myself in AUTHORS.rst
e748a77 Add accessibility support based on option flag
8bb3e8c Fix linter errors in livecd-sound
6a39300 implement accessibility support in archiso
6820f2c Add modconf to HOOKS array in mkinitcpio.conf
3caa30f configs/releng/packages.x86_64: add squashfs-tools and udftools
1bd944e Remove build.sh support from profiles and mkarchiso
bff3676 (origin/issues/38) Add documentation about how to create profiles
Extra changes:
* remove talkingparabola profile, it's no longer required
TODO:
* add braille support in OpenRC profiles
Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'configs/talkingparabola/airootfs/usr')
-rwxr-xr-x | configs/talkingparabola/airootfs/usr/bin/livecd-alsa-unmuter | 12 | ||||
-rwxr-xr-x | configs/talkingparabola/airootfs/usr/bin/pick-a-card | 57 | ||||
-rwxr-xr-x | configs/talkingparabola/airootfs/usr/bin/talk-to-me | 10 | ||||
-rwxr-xr-x | configs/talkingparabola/airootfs/usr/local/bin/Installation_guide | 5 | ||||
-rwxr-xr-x | configs/talkingparabola/airootfs/usr/local/bin/choose-mirror | 28 | ||||
-rw-r--r-- | configs/talkingparabola/airootfs/usr/share/livecd-sound/asound.conf.in | 3 | ||||
-rw-r--r-- | configs/talkingparabola/airootfs/usr/share/livecd-sound/functions | 199 | ||||
-rw-r--r-- | configs/talkingparabola/airootfs/usr/share/livecd-sound/sounds/beep.wav | bin | 192080 -> 0 bytes | |||
-rw-r--r-- | configs/talkingparabola/airootfs/usr/share/livecd-sound/sounds/pick-a-card.wav | bin | 121460 -> 0 bytes |
9 files changed, 0 insertions, 314 deletions
diff --git a/configs/talkingparabola/airootfs/usr/bin/livecd-alsa-unmuter b/configs/talkingparabola/airootfs/usr/bin/livecd-alsa-unmuter deleted file mode 100755 index 2a0d814..0000000 --- a/configs/talkingparabola/airootfs/usr/bin/livecd-alsa-unmuter +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -# -# SPDX-License-Identifier: GPL-3.0-or-later - -# Properly initialize the sound card so that we have audio at boot. -# This script is released under the GNU General Public License. - -# shellcheck disable=SC1091 -source /usr/share/livecd-sound/functions - -preinit_levels all -sanify_levels all diff --git a/configs/talkingparabola/airootfs/usr/bin/pick-a-card b/configs/talkingparabola/airootfs/usr/bin/pick-a-card deleted file mode 100755 index 10f2f79..0000000 --- a/configs/talkingparabola/airootfs/usr/bin/pick-a-card +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash -# -# SPDX-License-Identifier: GPL-3.0-or-later - -# If there are multiple usable sound cards, prompt the user to choose one, -# using auditory feedback. -# This script is released under the GNU General Public License. - -# shellcheck disable=SC1091 -source /usr/share/livecd-sound/functions - -nwords() { - echo $# -} - -is_numeric() { - local str=$1 - expr "$str" : '[[:digit:]]\+$' > /dev/null 2>&1 -} - -set_default_card() { - local card=$1 - sed -e "s/%card%/$card/g" < /usr/share/livecd-sound/asound.conf.in \ - > /etc/asound.conf -} - -play_on_card() { - local card=$1 file=$2 - aplay "-Dplughw:$card,0" "$file" -} - -set -f -usable_cards="$(list_non_pcsp_cards)" -num_usable_cards=$(nwords "$usable_cards") - -if [ "$num_usable_cards" -eq 1 ]; then - exit 0 -fi - -for card in $usable_cards; do - if ! is_numeric "$card"; then - continue - fi - play_on_card "$card" /usr/share/livecd-sound/sounds/pick-a-card.wav& -done -wait -sleep 1 -for card in $usable_cards; do - if ! is_numeric "$card"; then - continue - fi - play_on_card "$card" /usr/share/livecd-sound/sounds/beep.wav - if read -rt 10; then - set_default_card "$card" - break - fi -done diff --git a/configs/talkingparabola/airootfs/usr/bin/talk-to-me b/configs/talkingparabola/airootfs/usr/bin/talk-to-me deleted file mode 100755 index 73998d8..0000000 --- a/configs/talkingparabola/airootfs/usr/bin/talk-to-me +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -started_flag=/run/speech-is-running -if [ -f $started_flag ]; then - exit 0 -fi -systemctl stop espeakup -sleep 5 -pick-a-card -systemctl start espeakup -touch $started_flag diff --git a/configs/talkingparabola/airootfs/usr/local/bin/Installation_guide b/configs/talkingparabola/airootfs/usr/local/bin/Installation_guide deleted file mode 100755 index 876fbd2..0000000 --- a/configs/talkingparabola/airootfs/usr/local/bin/Installation_guide +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -# -# SPDX-License-Identifier: GPL-3.0-or-later - -exec lynx 'https://wiki.parabola.nu/Installation_Guide' diff --git a/configs/talkingparabola/airootfs/usr/local/bin/choose-mirror b/configs/talkingparabola/airootfs/usr/local/bin/choose-mirror deleted file mode 100755 index e8f8254..0000000 --- a/configs/talkingparabola/airootfs/usr/local/bin/choose-mirror +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -# -# SPDX-License-Identifier: GPL-3.0-or-later - -get_cmdline() { - local param - for param in $(< /proc/cmdline); do - case "${param}" in - $1=*) echo "${param##*=}"; - return 0 - ;; - esac - done -} - -mirror=$(get_cmdline mirror) -[[ $mirror = auto ]] && mirror=$(get_cmdline parabolaiso_http_srv) -[[ $mirror ]] || exit 0 - -mv /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.orig -cat >/etc/pacman.d/mirrorlist << EOF -# -# Parabola GNU/Linux-libre repository mirrorlist -# Generated by parabolaiso -# - -Server = ${mirror%%/}/\$repo/os/\$arch -EOF diff --git a/configs/talkingparabola/airootfs/usr/share/livecd-sound/asound.conf.in b/configs/talkingparabola/airootfs/usr/share/livecd-sound/asound.conf.in deleted file mode 100644 index 3f9c7aa..0000000 --- a/configs/talkingparabola/airootfs/usr/share/livecd-sound/asound.conf.in +++ /dev/null @@ -1,3 +0,0 @@ -Defaults node -defaults.ctl.card %card%; -defaults.pcm.card %card%; diff --git a/configs/talkingparabola/airootfs/usr/share/livecd-sound/functions b/configs/talkingparabola/airootfs/usr/share/livecd-sound/functions deleted file mode 100644 index e517795..0000000 --- a/configs/talkingparabola/airootfs/usr/share/livecd-sound/functions +++ /dev/null @@ -1,199 +0,0 @@ -# Functions for setting up sound on the live CD. -# This library is released under the GNU General Public License, -# and it incorporates code from the /etc/init.d/alsa-utils included with -# Ubuntu 8.04. Proper credit also goes to Debian. - -# Start code copied from Debian / Ubuntu: - -bugout () { - printf "/etc/rc.d/livecdsound: programming error" - stat_fail -} - -echo_card_indices() -{ - if [ -f /proc/asound/cards ] ; then - sed -n -e's/^[[:space:]]*\([0-7]\)[[:space:]].*/\1/p' /proc/asound/cards - fi -} - -filter_amixer_output() -{ - sed \ - -e '/Unable to find simple control/d' \ - -e '/Unknown playback setup/d' \ - -e '/^$/d' -} - -# The following functions try to set many controls. -# No card has all the controls and so some of the attempts are bound to fail. -# Because of this, the functions can't return useful status values. - -# $1 <control> -# $2 <level> -# $CARDOPT -unmute_and_set_level() -{ - { [ "$2" ] && [ "$CARDOPT" ] ; } || bugout - amixer $CARDOPT -q set "$1" "$2" unmute 2>&1 | filter_amixer_output || : - return 0 -} - -# $1 <control> -# $CARDOPT -mute_and_zero_level() -{ - { [ "$1" ] && [ "$CARDOPT" ] ; } || bugout - amixer $CARDOPT -q set "$1" "0%" mute 2>&1 | filter_amixer_output || : - return 0 -} - -# $1 <control> -# $2 "on" | "off" -# $CARDOPT -switch_control() -{ - { [ "$2" ] && [ "$CARDOPT" ] ; } || bugout - amixer $CARDOPT -q set "$1" "$2" 2>&1 | filter_amixer_output || : - return 0 -} - -# $1 <card ID> -sanify_levels_on_card() -{ - CARDOPT="-c $1" - - unmute_and_set_level "Front" "80%" - unmute_and_set_level "Master" "80%" - unmute_and_set_level "Master Mono" "80%" - unmute_and_set_level "Master Digital" "80%" # E.g., cs4237B - unmute_and_set_level "Playback" "80%" - unmute_and_set_level "Headphone" "100%" - unmute_and_set_level "PCM" "80%" - unmute_and_set_level "PCM,1" "80%" # E.g., ess1969 - unmute_and_set_level "DAC" "80%" # E.g., envy24, cs46xx - unmute_and_set_level "DAC,0" "80%" # E.g., envy24 - unmute_and_set_level "DAC,1" "80%" # E.g., envy24 - unmute_and_set_level "Synth" "80%" - unmute_and_set_level "CD" "80%" - unmute_and_set_level "PC Speaker" "100%" - - mute_and_zero_level "Mic" - mute_and_zero_level "IEC958" # Ubuntu #19648 - - # Intel P4P800-MX - switch_control "Master Playback Switch" on - switch_control "Master Surround" on - - # Trident/YMFPCI/emu10k1: - unmute_and_set_level "Wave" "80%" - unmute_and_set_level "Music" "80%" - unmute_and_set_level "AC97" "80%" - - # DRC: - unmute_and_set_level "Dynamic Range Compression" "80%" - - # Required for HDA Intel (hda-intel): - unmute_and_set_level "Front" "80%" - - # Required for SB Live 7.1/24-bit (ca0106): - unmute_and_set_level "Analog Front" "80%" - - # Required at least for Via 823x hardware on DFI K8M800-MLVF Motherboard - switch_control "IEC958 Capture Monitor" off - - # Required for hardware allowing toggles for AC97 through IEC958, - # valid values are 0, 1, 2, 3. Needs to be set to 0 for PCM1. - unmute_and_set_level "IEC958 Playback AC97-SPSA" "0" - - # Required for newer Via hardware - unmute_and_set_level "VIA DXS,0" "80%" - unmute_and_set_level "VIA DXS,1" "80%" - unmute_and_set_level "VIA DXS,2" "80%" - unmute_and_set_level "VIA DXS,3" "80%" - - # Required on some notebooks with ICH4: - switch_control "Headphone Jack Sense" off - switch_control "Line Jack Sense" off - - # Some machines need one or more of these to be on; - # others need one or more of these to be off: - # - # switch_control "External Amplifier" on - switch_control "Audigy Analog/Digital Output Jack" on - switch_control "SB Live Analog/Digital Output Jack" on - - # D1984 -- Thinkpad T61/X61 - switch_control "Speaker" on - switch_control "Headphone" on - - # HDA-Intel w/ "Digital" capture mixer (See Ubuntu #193823) - unmute_and_set_level "Digital" "80%" - - return 0 -} - -# $1 <card ID> | "all" -sanify_levels() -{ - TTSDML_RETURNSTATUS=0 - case "$1" in - all) - for CARD in $(echo_card_indices) ; do - sanify_levels_on_card "$CARD" || TTSDML_RETURNSTATUS=1 - done - ;; - *) - sanify_levels_on_card "$1" || TTSDML_RETURNSTATUS=1 - ;; - esac - return $TTSDML_RETURNSTATUS -} - -# $1 <card ID> -preinit_levels_on_card() -{ - CARDOPT="-c $1" - - # Silly dance to activate internal speakers by default on PowerMac - # Snapper and Tumbler - id=`cat /proc/asound/card$1/id 2>/dev/null` - if [ "$id" = "Snapper" -o "$id" = "Tumbler" ]; then - switch_control "Auto Mute" off - switch_control "PC Speaker" off - switch_control "Auto Mute" on - fi -} - -# $1 <card ID> | "all" -preinit_levels() -{ - TTSDML_RETURNSTATUS=0 - case "$1" in - all) - for CARD in $(echo_card_indices) ; do - preinit_levels_on_card "$CARD" || TTSDML_RETURNSTATUS=1 - done - ;; - *) - preinit_levels_on_card "$1" || TTSDML_RETURNSTATUS=1 - ;; - esac - return $TTSDML_RETURNSTATUS -} - -# End copied code. - -# List all cards that *should* be usable for PCM audio. In my experience, -# the console speaker (handled by the pcsp driver) isn't a suitable playback -# device, so we'll exclude it. -list_non_pcsp_cards() -{ - for card in $(echo_card_indices); do - local cardfile="/proc/asound/card${card}/id" - if [ -r "$cardfile" -a -f "$cardfile" ] && \ - [ "$(cat "$cardfile")" != pcsp ]; then - echo "$card" - fi - done -} diff --git a/configs/talkingparabola/airootfs/usr/share/livecd-sound/sounds/beep.wav b/configs/talkingparabola/airootfs/usr/share/livecd-sound/sounds/beep.wav Binary files differdeleted file mode 100644 index 495f90b..0000000 --- a/configs/talkingparabola/airootfs/usr/share/livecd-sound/sounds/beep.wav +++ /dev/null diff --git a/configs/talkingparabola/airootfs/usr/share/livecd-sound/sounds/pick-a-card.wav b/configs/talkingparabola/airootfs/usr/share/livecd-sound/sounds/pick-a-card.wav Binary files differdeleted file mode 100644 index 7343935..0000000 --- a/configs/talkingparabola/airootfs/usr/share/livecd-sound/sounds/pick-a-card.wav +++ /dev/null |