From patchwork Tue Apr 5 07:14:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Ruffell X-Patchwork-Id: 1613272 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=UYE5Iadk; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KXf641T3nz9sFq for ; Tue, 5 Apr 2022 17:14:34 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1nbdOT-0007P0-3j; Tue, 05 Apr 2022 07:14:25 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nbdOQ-0007OL-Sv for kernel-team@lists.ubuntu.com; Tue, 05 Apr 2022 07:14:22 +0000 Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 9F2C53F172 for ; Tue, 5 Apr 2022 07:14:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1649142862; bh=2upjIz/OuSHn2GGsGNY/MHzCIq1ufrUW2z30n9psmCc=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=UYE5Iadk4cLbz69u85B5IMDeKZ3yCzwC1E7MJ66CeA8C1uvE4ONvR5vJwMXVpH4My t663j5gBRU29aeoNmit8xWHIMLfcq7pz6Gs2O/yS8ibw2LMYeYh82kBjbjNBLDOIFz sleO89gcxLkAcbsGXCPjYBrrsUUKFagFcWbATLADZVkgyYw26iy7uR6mRnpbzxLSkO 1Nf7KP3IZgUFJFQx9oPR/6+WbZYRvdzaBWnfkSQPi7pAbvjR4/kX1wtSLI35hSgEcw 5xNMbqWerUIsfAyn6EaaRe9LLmK/rnuyVPgHUpjgS41o1hUHtie8sVczYnGnahAONv R5fqj92caA8YA== Received: by mail-pf1-f200.google.com with SMTP id y26-20020aa793da000000b004fb7c6f5d10so7389619pff.1 for ; Tue, 05 Apr 2022 00:14:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2upjIz/OuSHn2GGsGNY/MHzCIq1ufrUW2z30n9psmCc=; b=ms1vYXn4iX2sFl879YzN5T1CqNGS1BA+klnt2MUC7qUl9A6bqo+uEdIKh/z3ge7CA9 EGz/zYAn4l97KSZJ5KrOUETlgePTdCsl4LPheVcSWgsteocEatzgAUtZq/7h5LzORiKG 27m7iiuQ6N5hq8k6zO6tUaYqas9Djg4sh3AeJ1SUWaqRdpCUrHwCtA3l2BO6n7E1JCEu B851rRcbZPSV7QyhfZbmz8vXAxkSnQkhJf+r4/qYvLheDpomG2+KI+XKdUbQ9MNbJQXs Xrm2Q8ddEMSbhWuxMoPCY1a8upERisRUVlojR3Ndv7xvalwg6CZwPECJNuIF/X6u2wPm MWtg== X-Gm-Message-State: AOAM533Kx41TpyyorMESdz0mS6n8Xkj1vS3kGiHpfwgQ74e8FIuaACB3 KtuYzWU04GzCpnsvc7StPXnW2eri3TLXnwHjnAhHBE2synG1W+r8tMITKR0VLmtOAg5V2HTXPRn DaiRUiq5mTURnKC4+R38+ZyXTrLF6uhznulyQ3+t7IQ== X-Received: by 2002:a17:90a:ce8b:b0:1c7:7567:9f7e with SMTP id g11-20020a17090ace8b00b001c775679f7emr2551454pju.10.1649142860424; Tue, 05 Apr 2022 00:14:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx13UR1XyVrsm4AfBR5iI4ZZ1mjt8G6irQjyGDEIuGX9FX7MaZLMFrMWJkU2QPynMAPMFzhEg== X-Received: by 2002:a17:90a:ce8b:b0:1c7:7567:9f7e with SMTP id g11-20020a17090ace8b00b001c775679f7emr2551431pju.10.1649142860005; Tue, 05 Apr 2022 00:14:20 -0700 (PDT) Received: from desktop.. (125-239-17-100-fibre.sparkbb.co.nz. [125.239.17.100]) by smtp.gmail.com with ESMTPSA id mn22-20020a17090b189600b001ca86a1e41dsm1270329pjb.52.2022.04.05.00.14.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Apr 2022 00:14:19 -0700 (PDT) From: Matthew Ruffell To: kernel-team@lists.ubuntu.com Subject: [SRU][Jammy][PATCH 1/1] UBUNTU: [Config] CONFIG_SPEAKUP=m Date: Tue, 5 Apr 2022 19:14:09 +1200 Message-Id: <20220405071410.38255-2-matthew.ruffell@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220405071410.38255-1-matthew.ruffell@canonical.com> References: <20220405071410.38255-1-matthew.ruffell@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" 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 --- 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 --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 +CONFIG_ACCESSIBILITY mark note # 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 note # 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