Merge pull request #6458 from lrusak/alsa-distro

move ALSA_SUPPORT from project options to distro options
This commit is contained in:
Christian Hewitt 2022-05-09 07:16:55 +04:00 committed by GitHub
commit 35f9360595
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 8 additions and 28 deletions

View File

@ -226,6 +226,9 @@
# OEM packages for OEM's (yes / no) # OEM packages for OEM's (yes / no)
OEM_SUPPORT="no" OEM_SUPPORT="no"
# build and install ALSA Audio support (yes / no)
ALSA_SUPPORT="yes"
# additional packages to install: # additional packages to install:
# Space separated list is supported, # Space separated list is supported,
# e.g. ADDITIONAL_PACKAGES="PACKAGE1 PACKAGE2" # e.g. ADDITIONAL_PACKAGES="PACKAGE1 PACKAGE2"

View File

@ -135,9 +135,6 @@
# cron support (yes / no) # cron support (yes / no)
CRON_SUPPORT="no" CRON_SUPPORT="no"
# build and install ALSA Audio support (yes / no)
ALSA_SUPPORT="no"
# OpenGL(X) implementation to use (no / mesa) # OpenGL(X) implementation to use (no / mesa)
OPENGL="no" OPENGL="no"

View File

@ -31,9 +31,6 @@
# setup project defaults # setup project defaults
################################################################################ ################################################################################
# build and install ALSA Audio support (yes / no)
ALSA_SUPPORT="yes"
# OpenGL(X) implementation to use (no / mesa) # OpenGL(X) implementation to use (no / mesa)
OPENGL="no" OPENGL="no"

View File

@ -40,9 +40,6 @@
# setup project defaults # setup project defaults
################################################################################ ################################################################################
# build and install ALSA Audio support (yes / no)
ALSA_SUPPORT="yes"
# OpenGL(X) implementation to use (no / mesa) # OpenGL(X) implementation to use (no / mesa)
OPENGL="no" OPENGL="no"

View File

@ -46,9 +46,6 @@
# setup project defaults # setup project defaults
################################################################################ ################################################################################
# build and install ALSA Audio support (yes / no)
ALSA_SUPPORT="yes"
# additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware) # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
# Space separated list is supported, # Space separated list is supported,
# e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware" # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"

View File

@ -26,9 +26,6 @@
# setup project defaults # setup project defaults
################################################################################ ################################################################################
# build and install ALSA Audio support (yes / no)
ALSA_SUPPORT="yes"
# OpenGL(X) implementation to use (no / mesa) # OpenGL(X) implementation to use (no / mesa)
OPENGL="no" OPENGL="no"

View File

@ -54,9 +54,6 @@
# setup project defaults # setup project defaults
################################################################################ ################################################################################
# build and install ALSA Audio support (yes / no)
ALSA_SUPPORT="yes"
# OpenGL(X) implementation to use (no / Mesa) # OpenGL(X) implementation to use (no / Mesa)
OPENGL="no" OPENGL="no"

View File

@ -66,9 +66,6 @@
# setup project defaults # setup project defaults
################################################################################ ################################################################################
# build and install ALSA Audio support (yes / no)
ALSA_SUPPORT="yes"
# OpenGL(X) implementation to use (no / mesa) # OpenGL(X) implementation to use (no / mesa)
OPENGL="no" OPENGL="no"
@ -110,7 +107,11 @@
# for a list of additional drivers see packages/linux-drivers # for a list of additional drivers see packages/linux-drivers
# Space separated list is supported, # Space separated list is supported,
# e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2" # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS rpi-cirrus-config bcm2835-driver" ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS bcm2835-driver"
if [ "${ALSA_SUPPORT}" = "yes" ]; then
ADDITIONAL_DRIVERS+=" rpi-cirrus-config"
fi
# build and install driver addons (yes / no) # build and install driver addons (yes / no)
DRIVER_ADDONS_SUPPORT="no" DRIVER_ADDONS_SUPPORT="no"

View File

@ -35,9 +35,6 @@
# setup project defaults # setup project defaults
################################################################################ ################################################################################
# build and install ALSA Audio support (yes / no)
ALSA_SUPPORT="yes"
# OpenGL(X) implementation to use (no / mesa) # OpenGL(X) implementation to use (no / mesa)
OPENGL="no" OPENGL="no"

View File

@ -42,9 +42,6 @@
# setup project defaults # setup project defaults
################################################################################ ################################################################################
# build and install ALSA Audio support (yes / no)
ALSA_SUPPORT="yes"
# OpenGL(X) implementation to use (no / mesa) # OpenGL(X) implementation to use (no / mesa)
OPENGL="no" OPENGL="no"