diff mbox

[SRU,Jammy,1/1] UBUNTU: [Config] CONFIG_SPEAKUP=m

Message ID 20220405071410.38255-2-matthew.ruffell@canonical.com
State New
Headers show

Commit Message

Matthew Ruffell April 5, 2022, 7:14 a.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/1967702

The speakup screen reader which provides accessibility features for
blind system administrators requires the speakup kernel modules
to function.

To enable the speakup modules, CONFIG_ACCESSIBILITY must be set to
'y'. This is omitted on s390x.

CONFIG_SPEAKUP has been present in the Ubuntu kernel for an
extended period of time. Recently it keeps being disabled, notably
during the transition from drivers/staging/ to
drivers/accessibility/ between 5.8 and 5.11, and the recent patch
to re-enable on Hirsute and Impish's kernels not being applied to
ubuntu-unstable, which is why Jammy never picked it up. See the
old bug LP #1942459 for more.

Signed-off-by: Matthew Ruffell <matthew.ruffell@canonical.com>
---
 debian.master/config/amd64/config.common.amd64 |  1 +
 debian.master/config/annotations               | 18 ++++++++++++++++--
 debian.master/config/arm64/config.common.arm64 |  1 +
 debian.master/config/armhf/config.common.armhf |  1 +
 debian.master/config/config.common.ubuntu      | 14 +++++++++++++-
 .../config/ppc64el/config.common.ppc64el       |  1 +
 debian.master/config/s390x/config.common.s390x |  1 +
 7 files changed, 34 insertions(+), 3 deletions(-)
diff mbox

Patch

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index c045fcb816e6..e09ad9cba3f0 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -3,6 +3,7 @@ 
 #
 CONFIG_6LOWPAN=m
 CONFIG_AC97_BUS=m
+CONFIG_ACCESSIBILITY=y
 CONFIG_ACPI_DEBUG=y
 CONFIG_ACPI_DEBUGGER=y
 # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 15759fa435bd..ecf26931eb52 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -515,13 +515,27 @@  CONFIG_TEE                                      policy<{'amd64': 'm', 'arm64': '
 CONFIG_UNISYS_VISORBUS                          policy<{'amd64': 'm'}>
 
 # Menu: Device Drivers >> Accessibility support
-CONFIG_ACCESSIBILITY                            policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>
+CONFIG_ACCESSIBILITY                            policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'n'}>
 #
-CONFIG_ACCESSIBILITY                            flag<REVIEW>
+CONFIG_ACCESSIBILITY                            mark<ENFORCED> note<LP: #1967702>
 
 # Menu: Device Drivers >> Accessibility support >> Speakup console speech
 
 # Menu: Device Drivers >> Accessibility support >> Speakup console speech >> Speakup core
+CONFIG_SPEAKUP                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': '-'}>
+CONFIG_SPEAKUP_SYNTH_ACNTSA                     policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': '-'}>
+CONFIG_SPEAKUP_SYNTH_APOLLO                     policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': '-'}>
+CONFIG_SPEAKUP_SYNTH_AUDPTR                     policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': '-'}>
+CONFIG_SPEAKUP_SYNTH_BNS                        policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': '-'}>
+CONFIG_SPEAKUP_SYNTH_DECEXT                     policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': '-'}>
+CONFIG_SPEAKUP_SYNTH_DECTLK                     policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': '-'}>
+CONFIG_SPEAKUP_SYNTH_DUMMY                      policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': '-'}>
+CONFIG_SPEAKUP_SYNTH_LTLK                       policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': '-'}>
+CONFIG_SPEAKUP_SYNTH_SOFT                       policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': '-'}>
+CONFIG_SPEAKUP_SYNTH_SPKOUT                     policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': '-'}>
+CONFIG_SPEAKUP_SYNTH_TXPRT                      policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': '-'}>
+#
+CONFIG_SPEAKUP                                  mark<ENFORCED> note<LP: #1967702>
 
 # Menu: Device Drivers >> Android
 CONFIG_ANDROID                                  policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'n'}>
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 85871d992714..bba54e304631 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -3,6 +3,7 @@ 
 #
 CONFIG_6LOWPAN=m
 CONFIG_AC97_BUS=m
+CONFIG_ACCESSIBILITY=y
 # CONFIG_ACPI_DEBUG is not set
 # CONFIG_ACPI_DEBUGGER is not set
 CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index eee868930bb7..0c1becd14ac7 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -3,6 +3,7 @@ 
 #
 CONFIG_6LOWPAN=m
 CONFIG_AC97_BUS=y
+CONFIG_ACCESSIBILITY=y
 CONFIG_AD525X_DPOT=m
 CONFIG_ADFS_FS=m
 CONFIG_AFFS_FS=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 0fffe06795c0..75e168e6d398 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -33,9 +33,9 @@  CONFIG_9P_FS=m
 CONFIG_9P_FSCACHE=y
 CONFIG_9P_FS_POSIX_ACL=y
 CONFIG_9P_FS_SECURITY=y
+# CONFIG_A11Y_BRAILLE_CONSOLE is not set
 CONFIG_AAEON_IWMI_WDT=m
 CONFIG_ABP060MG=m
-# CONFIG_ACCESSIBILITY is not set
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
 CONFIG_ACERHDF=m
@@ -10625,6 +10625,18 @@  CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSE_IRQ=y
 CONFIG_SPARX5_SWITCH=m
+CONFIG_SPEAKUP=m
+CONFIG_SPEAKUP_SYNTH_ACNTSA=m
+CONFIG_SPEAKUP_SYNTH_APOLLO=m
+CONFIG_SPEAKUP_SYNTH_AUDPTR=m
+CONFIG_SPEAKUP_SYNTH_BNS=m
+CONFIG_SPEAKUP_SYNTH_DECEXT=m
+CONFIG_SPEAKUP_SYNTH_DECTLK=m
+CONFIG_SPEAKUP_SYNTH_DUMMY=m
+CONFIG_SPEAKUP_SYNTH_LTLK=m
+CONFIG_SPEAKUP_SYNTH_SOFT=m
+CONFIG_SPEAKUP_SYNTH_SPKOUT=m
+CONFIG_SPEAKUP_SYNTH_TXPRT=m
 CONFIG_SPI_ALTERA=m
 CONFIG_SPI_ALTERA_CORE=m
 CONFIG_SPI_ALTERA_DFL=m
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index a6f33a530c25..399d8e2b81f5 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -3,6 +3,7 @@ 
 #
 CONFIG_6LOWPAN=m
 CONFIG_AC97_BUS=m
+CONFIG_ACCESSIBILITY=y
 CONFIG_AD525X_DPOT=m
 CONFIG_ADFS_FS=m
 CONFIG_AFFS_FS=m
diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index c91f2c92e493..7bec8565614e 100644
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -2,6 +2,7 @@ 
 # Config options for config.common.s390x automatically generated by splitconfig.pl
 #
 # CONFIG_6LOWPAN is not set
+# CONFIG_ACCESSIBILITY is not set
 # CONFIG_AD525X_DPOT is not set
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set