Message ID | 20180430131130.5161-1-cascardo@canonical.com |
---|---|
State | New |
Headers | show |
Series | [Bionic] UBUNTU: Add linux-image-* Breaks on s390-tools (<< 2.3.0-0ubuntu3) | expand |
On Mon, Apr 30, 2018 at 10:11:30AM -0300, Thadeu Lima de Souza Cascardo wrote: > BugLink: https://bugs.launchpad.net/bugs/1766727 > > Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com> Acked-by: Seth Forshee <seth.forshee@canonical.com>
On 04/30/18 15:11, Thadeu Lima de Souza Cascardo wrote: > BugLink: https://bugs.launchpad.net/bugs/1766727 > > Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com> Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com> > --- > debian.master/control.d/flavour-control.stub | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/debian.master/control.d/flavour-control.stub b/debian.master/control.d/flavour-control.stub > index 835a859aa9bc..9484fe5d6673 100644 > --- a/debian.master/control.d/flavour-control.stub > +++ b/debian.master/control.d/flavour-control.stub > @@ -29,7 +29,7 @@ Priority: optional > Provides: linux-image, fuse-module, aufs-dkms, =PROVIDES=${linux:rprovides} > Depends: ${misc:Depends}, ${shlibs:Depends}, kmod, linux-base, linux-modules-PKGVER-ABINUM-FLAVOUR > Recommends: BOOTLOADER, initramfs-tools | linux-initramfs-tool > -Breaks: flash-kernel (<< 3.90ubuntu2) [arm64 armhf] > +Breaks: flash-kernel (<< 3.90ubuntu2) [arm64 armhf], s390-tools (<< 2.3.0-0ubuntu3) [s390x] > Conflicts: linux-image=SIGN-PEER-PKG=-PKGVER-ABINUM-FLAVOUR > Suggests: fdutils, SRCPKGNAME-doc-PKGVER | SRCPKGNAME-source-PKGVER, SRCPKGNAME-tools, linux-headers-PKGVER-ABINUM-FLAVOUR > Description: Linux kernel image for version PKGVER on DESC >
Applied to bionic master-next branch. Thanks. Cascardo. Applied-to: bionic/master-next
diff --git a/debian.master/control.d/flavour-control.stub b/debian.master/control.d/flavour-control.stub index 835a859aa9bc..9484fe5d6673 100644 --- a/debian.master/control.d/flavour-control.stub +++ b/debian.master/control.d/flavour-control.stub @@ -29,7 +29,7 @@ Priority: optional Provides: linux-image, fuse-module, aufs-dkms, =PROVIDES=${linux:rprovides} Depends: ${misc:Depends}, ${shlibs:Depends}, kmod, linux-base, linux-modules-PKGVER-ABINUM-FLAVOUR Recommends: BOOTLOADER, initramfs-tools | linux-initramfs-tool -Breaks: flash-kernel (<< 3.90ubuntu2) [arm64 armhf] +Breaks: flash-kernel (<< 3.90ubuntu2) [arm64 armhf], s390-tools (<< 2.3.0-0ubuntu3) [s390x] Conflicts: linux-image=SIGN-PEER-PKG=-PKGVER-ABINUM-FLAVOUR Suggests: fdutils, SRCPKGNAME-doc-PKGVER | SRCPKGNAME-source-PKGVER, SRCPKGNAME-tools, linux-headers-PKGVER-ABINUM-FLAVOUR Description: Linux kernel image for version PKGVER on DESC
BugLink: https://bugs.launchpad.net/bugs/1766727 Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com> --- debian.master/control.d/flavour-control.stub | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)