| Message ID | 20200117182238.23657-1-kamal@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [SRU,eoan] UBUNTU: [Config]: fix s390x SOUNDWIRE annotation | expand |
On 1/17/20 10:22 AM, Kamal Mostafa wrote: > BugLink: https://bugs.launchpad.net/bugs/1855685 > > Fix s390x build broken by annotations enforcement in commit > "UBUNTU: [config]: SOUNDWIRE=m" > > Ignore: yes > Signed-off-by: Kamal Mostafa <kamal@canonical.com> > --- > debian.master/config/annotations | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/debian.master/config/annotations b/debian.master/config/annotations > index bfb28c0ed1b3..b84a4bf10c99 100644 > --- a/debian.master/config/annotations > +++ b/debian.master/config/annotations > @@ -8258,7 +8258,7 @@ CONFIG_HDMI_LPE_AUDIO policy<{'amd64': 'm', 'i386': 'm > > # Menu: Device Drivers >> SoundWire support > CONFIG_SOUNDWIRE mark<ENFORCED> note<LP:1855685> > -CONFIG_SOUNDWIRE policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}> > +CONFIG_SOUNDWIRE policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': '-'}> > CONFIG_SOUNDWIRE_INTEL policy<{'amd64': 'm', 'i386': 'm'}> > > # Menu: Device Drivers >> Staging drivers > Before: check-config: FAIL (- != m): CONFIG_SOUNDWIRE mark<ENFORCED> note<LP:1855685> policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}> check-config: 111/112 checks passed -- exit 1 *** ERROR: 1 config-check failures detected After: check-config: /home/canonical/canonical/kernel/ubuntu/eoan/linux/debian.master/config/annotations loading annotations check-config: 112/112 checks passed -- exit 0 Works great! Tested-by: Connor Kuehl <connor.kuehl@canonical.com> Acked-by: Connor Kuehl <connor.kuehl@canonical.com>
via IRC: Acked-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com> Applied to eoan/master-next. -Kamal On Fri, Jan 17, 2020 at 10:22:38AM -0800, Kamal Mostafa wrote: > BugLink: https://bugs.launchpad.net/bugs/1855685 > > Fix s390x build broken by annotations enforcement in commit > "UBUNTU: [config]: SOUNDWIRE=m" > > Ignore: yes > Signed-off-by: Kamal Mostafa <kamal@canonical.com> > --- > debian.master/config/annotations | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/debian.master/config/annotations b/debian.master/config/annotations > index bfb28c0ed1b3..b84a4bf10c99 100644 > --- a/debian.master/config/annotations > +++ b/debian.master/config/annotations > @@ -8258,7 +8258,7 @@ CONFIG_HDMI_LPE_AUDIO policy<{'amd64': 'm', 'i386': 'm > > # Menu: Device Drivers >> SoundWire support > CONFIG_SOUNDWIRE mark<ENFORCED> note<LP:1855685> > -CONFIG_SOUNDWIRE policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}> > +CONFIG_SOUNDWIRE policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': '-'}> > CONFIG_SOUNDWIRE_INTEL policy<{'amd64': 'm', 'i386': 'm'}> > > # Menu: Device Drivers >> Staging drivers > -- > 2.17.1 >
diff --git a/debian.master/config/annotations b/debian.master/config/annotations index bfb28c0ed1b3..b84a4bf10c99 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -8258,7 +8258,7 @@ CONFIG_HDMI_LPE_AUDIO policy<{'amd64': 'm', 'i386': 'm # Menu: Device Drivers >> SoundWire support CONFIG_SOUNDWIRE mark<ENFORCED> note<LP:1855685> -CONFIG_SOUNDWIRE policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}> +CONFIG_SOUNDWIRE policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': '-'}> CONFIG_SOUNDWIRE_INTEL policy<{'amd64': 'm', 'i386': 'm'}> # Menu: Device Drivers >> Staging drivers
BugLink: https://bugs.launchpad.net/bugs/1855685 Fix s390x build broken by annotations enforcement in commit "UBUNTU: [config]: SOUNDWIRE=m" Ignore: yes Signed-off-by: Kamal Mostafa <kamal@canonical.com> --- debian.master/config/annotations | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)