| Message ID | 20210910115100.22147-2-tim.gardner@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | UBUNTU: [Config] CONFIG_SPEAKUP=m | expand |
This one is for Hirsute.
Acked-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
On 10.09.21 13:50, Tim Gardner wrote: > BugLink: https://bugs.launchpad.net/bugs/1942459 > > In order to enable the SPEAKUP accessibility modules, CONFIG_ACCESSIBILITY > must be set to 'y'. Note that nothing is changed for s390x. > > CONFIG_SPEAKUP was enabled (as a module) on 5.8 and earlier kernels. It > moved from drivers/staging/ to drivers/accessibility/ between 5.8 and 5.11, > which would explain how it ended up being disabled on 5.11 and later. > > Signed-off-by: Tim Gardner <tim.gardner@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com> > --- > debian.master/config/amd64/config.common.amd64 | 1 + > debian.master/config/annotations | 6 ++++-- > debian.master/config/arm64/config.common.arm64 | 1 + > debian.master/config/armhf/config.common.armhf | 1 + > debian.master/config/config.common.ubuntu | 14 +++++++++++++- > debian.master/config/ppc64el/config.common.ppc64el | 1 + > debian.master/config/s390x/config.common.s390x | 1 + > 7 files changed, 22 insertions(+), 3 deletions(-) > > diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 > index 2f503fec3b34..10aa63218db3 100644 > --- a/debian.master/config/amd64/config.common.amd64 > +++ b/debian.master/config/amd64/config.common.amd64 > @@ -4,6 +4,7 @@ > CONFIG_6LOWPAN=m > CONFIG_ABX500_CORE=y > 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 892413decddb..a9d2fe935c82 100644 > --- a/debian.master/config/annotations > +++ b/debian.master/config/annotations > @@ -520,9 +520,11 @@ CONFIG_UNISYS_VISORBUS policy<{'amd64': 'm'}> > CONFIG_IDE policy<{'amd64': 'n', 'armhf': 'n', 'ppc64el': 'n'}> > > # 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_SPEAKUP policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': '-'}> > # > -CONFIG_ACCESSIBILITY flag<REVIEW> > +CONFIG_ACCESSIBILITY mark<ENFORCED> note<LP: #1942459> > +CONFIG_SPEAKUP mark<ENFORCED> note<LP: #1942459> > > # Menu: Device Drivers >> Accessibility support >> Speakup console speech > > diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 > index 5c178756be3a..2e8dfabcb4b9 100644 > --- a/debian.master/config/arm64/config.common.arm64 > +++ b/debian.master/config/arm64/config.common.arm64 > @@ -4,6 +4,7 @@ > CONFIG_6LOWPAN=m > CONFIG_ABX500_CORE=y > 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 adb26b427cfa..189b1485b371 100644 > --- a/debian.master/config/armhf/config.common.armhf > +++ b/debian.master/config/armhf/config.common.armhf > @@ -4,6 +4,7 @@ > CONFIG_6LOWPAN=m > CONFIG_ABX500_CORE=y > 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 2bd6818df676..8d4d85c80218 100644 > --- a/debian.master/config/config.common.ubuntu > +++ b/debian.master/config/config.common.ubuntu > @@ -33,11 +33,11 @@ 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_AB3100_CORE=y > CONFIG_AB3100_OTP=m > CONFIG_ABP060MG=m > -# CONFIG_ACCESSIBILITY is not set > CONFIG_ACENIC=m > # CONFIG_ACENIC_OMIT_TIGON_I is not set > CONFIG_ACERHDF=m > @@ -10277,6 +10277,18 @@ CONFIG_SPARSEMEM_STATIC=y > CONFIG_SPARSEMEM_VMEMMAP=y > CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y > CONFIG_SPARSE_IRQ=y > +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_AMD=m > CONFIG_SPI_ARMADA_3700=m > diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el > index 540c8bf66fe8..b162f7c37a7f 100644 > --- a/debian.master/config/ppc64el/config.common.ppc64el > +++ b/debian.master/config/ppc64el/config.common.ppc64el > @@ -4,6 +4,7 @@ > CONFIG_6LOWPAN=m > CONFIG_ABX500_CORE=y > 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 c39f1fe82811..e1bcaa479614 100644 > --- a/debian.master/config/s390x/config.common.s390x > +++ b/debian.master/config/s390x/config.common.s390x > @@ -3,6 +3,7 @@ > # > # CONFIG_6LOWPAN is not set > # CONFIG_ABX500_CORE 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 >
On 10.09.21 13:50, Tim Gardner wrote: > BugLink: https://bugs.launchpad.net/bugs/1942459 > > In order to enable the SPEAKUP accessibility modules, CONFIG_ACCESSIBILITY > must be set to 'y'. Note that nothing is changed for s390x. > > CONFIG_SPEAKUP was enabled (as a module) on 5.8 and earlier kernels. It > moved from drivers/staging/ to drivers/accessibility/ between 5.8 and 5.11, > which would explain how it ended up being disabled on 5.11 and later. > > Signed-off-by: Tim Gardner <tim.gardner@canonical.com> > --- > debian.master/config/amd64/config.common.amd64 | 1 + > debian.master/config/annotations | 6 ++++-- > debian.master/config/arm64/config.common.arm64 | 1 + > debian.master/config/armhf/config.common.armhf | 1 + > debian.master/config/config.common.ubuntu | 14 +++++++++++++- > debian.master/config/ppc64el/config.common.ppc64el | 1 + > debian.master/config/s390x/config.common.s390x | 1 + > 7 files changed, 22 insertions(+), 3 deletions(-) > > diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 > index 2f503fec3b34..10aa63218db3 100644 > --- a/debian.master/config/amd64/config.common.amd64 > +++ b/debian.master/config/amd64/config.common.amd64 > @@ -4,6 +4,7 @@ > CONFIG_6LOWPAN=m > CONFIG_ABX500_CORE=y > 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 892413decddb..a9d2fe935c82 100644 > --- a/debian.master/config/annotations > +++ b/debian.master/config/annotations > @@ -520,9 +520,11 @@ CONFIG_UNISYS_VISORBUS policy<{'amd64': 'm'}> > CONFIG_IDE policy<{'amd64': 'n', 'armhf': 'n', 'ppc64el': 'n'}> > > # 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_SPEAKUP policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': '-'}> > # > -CONFIG_ACCESSIBILITY flag<REVIEW> > +CONFIG_ACCESSIBILITY mark<ENFORCED> note<LP: #1942459> > +CONFIG_SPEAKUP mark<ENFORCED> note<LP: #1942459> > > # Menu: Device Drivers >> Accessibility support >> Speakup console speech > > diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 > index 5c178756be3a..2e8dfabcb4b9 100644 > --- a/debian.master/config/arm64/config.common.arm64 > +++ b/debian.master/config/arm64/config.common.arm64 > @@ -4,6 +4,7 @@ > CONFIG_6LOWPAN=m > CONFIG_ABX500_CORE=y > 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 adb26b427cfa..189b1485b371 100644 > --- a/debian.master/config/armhf/config.common.armhf > +++ b/debian.master/config/armhf/config.common.armhf > @@ -4,6 +4,7 @@ > CONFIG_6LOWPAN=m > CONFIG_ABX500_CORE=y > 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 2bd6818df676..8d4d85c80218 100644 > --- a/debian.master/config/config.common.ubuntu > +++ b/debian.master/config/config.common.ubuntu > @@ -33,11 +33,11 @@ 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_AB3100_CORE=y > CONFIG_AB3100_OTP=m > CONFIG_ABP060MG=m > -# CONFIG_ACCESSIBILITY is not set > CONFIG_ACENIC=m > # CONFIG_ACENIC_OMIT_TIGON_I is not set > CONFIG_ACERHDF=m > @@ -10277,6 +10277,18 @@ CONFIG_SPARSEMEM_STATIC=y > CONFIG_SPARSEMEM_VMEMMAP=y > CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y > CONFIG_SPARSE_IRQ=y > +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_AMD=m > CONFIG_SPI_ARMADA_3700=m > diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el > index 540c8bf66fe8..b162f7c37a7f 100644 > --- a/debian.master/config/ppc64el/config.common.ppc64el > +++ b/debian.master/config/ppc64el/config.common.ppc64el > @@ -4,6 +4,7 @@ > CONFIG_6LOWPAN=m > CONFIG_ABX500_CORE=y > 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 c39f1fe82811..e1bcaa479614 100644 > --- a/debian.master/config/s390x/config.common.s390x > +++ b/debian.master/config/s390x/config.common.s390x > @@ -3,6 +3,7 @@ > # > # CONFIG_6LOWPAN is not set > # CONFIG_ABX500_CORE 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 > Applied to hirsute:linux/master-next. Thanks. -Stefan
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 2f503fec3b34..10aa63218db3 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -4,6 +4,7 @@ CONFIG_6LOWPAN=m CONFIG_ABX500_CORE=y 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 892413decddb..a9d2fe935c82 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -520,9 +520,11 @@ CONFIG_UNISYS_VISORBUS policy<{'amd64': 'm'}> CONFIG_IDE policy<{'amd64': 'n', 'armhf': 'n', 'ppc64el': 'n'}> # 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_SPEAKUP policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': '-'}> # -CONFIG_ACCESSIBILITY flag<REVIEW> +CONFIG_ACCESSIBILITY mark<ENFORCED> note<LP: #1942459> +CONFIG_SPEAKUP mark<ENFORCED> note<LP: #1942459> # Menu: Device Drivers >> Accessibility support >> Speakup console speech diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index 5c178756be3a..2e8dfabcb4b9 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -4,6 +4,7 @@ CONFIG_6LOWPAN=m CONFIG_ABX500_CORE=y 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 adb26b427cfa..189b1485b371 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -4,6 +4,7 @@ CONFIG_6LOWPAN=m CONFIG_ABX500_CORE=y 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 2bd6818df676..8d4d85c80218 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -33,11 +33,11 @@ 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_AB3100_CORE=y CONFIG_AB3100_OTP=m CONFIG_ABP060MG=m -# CONFIG_ACCESSIBILITY is not set CONFIG_ACENIC=m # CONFIG_ACENIC_OMIT_TIGON_I is not set CONFIG_ACERHDF=m @@ -10277,6 +10277,18 @@ CONFIG_SPARSEMEM_STATIC=y CONFIG_SPARSEMEM_VMEMMAP=y CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y CONFIG_SPARSE_IRQ=y +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_AMD=m CONFIG_SPI_ARMADA_3700=m diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index 540c8bf66fe8..b162f7c37a7f 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -4,6 +4,7 @@ CONFIG_6LOWPAN=m CONFIG_ABX500_CORE=y 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 c39f1fe82811..e1bcaa479614 100644 --- a/debian.master/config/s390x/config.common.s390x +++ b/debian.master/config/s390x/config.common.s390x @@ -3,6 +3,7 @@ # # CONFIG_6LOWPAN is not set # CONFIG_ABX500_CORE 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
BugLink: https://bugs.launchpad.net/bugs/1942459 In order to enable the SPEAKUP accessibility modules, CONFIG_ACCESSIBILITY must be set to 'y'. Note that nothing is changed for s390x. CONFIG_SPEAKUP was enabled (as a module) on 5.8 and earlier kernels. It moved from drivers/staging/ to drivers/accessibility/ between 5.8 and 5.11, which would explain how it ended up being disabled on 5.11 and later. Signed-off-by: Tim Gardner <tim.gardner@canonical.com> --- debian.master/config/amd64/config.common.amd64 | 1 + debian.master/config/annotations | 6 ++++-- debian.master/config/arm64/config.common.arm64 | 1 + debian.master/config/armhf/config.common.armhf | 1 + debian.master/config/config.common.ubuntu | 14 +++++++++++++- debian.master/config/ppc64el/config.common.ppc64el | 1 + debian.master/config/s390x/config.common.s390x | 1 + 7 files changed, 22 insertions(+), 3 deletions(-)