[artful] UBUNTU: [Debian] Don't depend on initramfs-tools

Submitted by Marcelo Cerri on Aug. 8, 2017, 7:16 p.m.

Details

Message ID 1502219771-14143-5-git-send-email-marcelo.cerri@canonical.com
State New
Headers show

Commit Message

Marcelo Cerri Aug. 8, 2017, 7:16 p.m.
BugLink: http://bugs.launchpad.net/bugs/1700972

Allow images to be created without the need of an initrd and also allow
users to run without an initrd if they want to.

Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
---
 debian.master/control.d/flavour-control.stub | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Seth Forshee Aug. 10, 2017, 3:45 p.m.
On Tue, Aug 08, 2017 at 04:16:06PM -0300, Marcelo Henrique Cerri wrote:
> BugLink: http://bugs.launchpad.net/bugs/1700972
> 
> Allow images to be created without the need of an initrd and also allow
> users to run without an initrd if they want to.
> 
> Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
> ---
>  debian.master/control.d/flavour-control.stub | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/debian.master/control.d/flavour-control.stub b/debian.master/control.d/flavour-control.stub
> index 6318ad236538..b85b6cd001a2 100644
> --- a/debian.master/control.d/flavour-control.stub
> +++ b/debian.master/control.d/flavour-control.stub
> @@ -27,8 +27,8 @@ Architecture: ARCH
>  Section: kernel
>  Priority: optional
>  Provides: linux-image, fuse-module, =PROVIDES=${linux:rprovides}
> -Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools | linux-initramfs-tool, kmod
> -Recommends: BOOTLOADER
> +Depends: ${misc:Depends}, ${shlibs:Depends}, kmod
> +Recommends: BOOTLOADER, initramfs-tools | linux-initramfs-tool
>  Breaks: flash-kernel (<< 3.0~rc.4ubuntu64) [arm64]
>  Suggests: fdutils, SRCPKGNAME-doc-PKGVER | SRCPKGNAME-source-PKGVER, SRCPKGNAME-tools, linux-headers-PKGVER-ABINUM-FLAVOUR
>  Description: Linux kernel image for version PKGVER on DESC

This one seems to be missing the changes to the control scripts.
Seth Forshee Aug. 10, 2017, 3:47 p.m.
On Thu, Aug 10, 2017 at 10:45:31AM -0500, Seth Forshee wrote:
> On Tue, Aug 08, 2017 at 04:16:06PM -0300, Marcelo Henrique Cerri wrote:
> > BugLink: http://bugs.launchpad.net/bugs/1700972
> > 
> > Allow images to be created without the need of an initrd and also allow
> > users to run without an initrd if they want to.
> > 
> > Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
> > ---
> >  debian.master/control.d/flavour-control.stub | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/debian.master/control.d/flavour-control.stub b/debian.master/control.d/flavour-control.stub
> > index 6318ad236538..b85b6cd001a2 100644
> > --- a/debian.master/control.d/flavour-control.stub
> > +++ b/debian.master/control.d/flavour-control.stub
> > @@ -27,8 +27,8 @@ Architecture: ARCH
> >  Section: kernel
> >  Priority: optional
> >  Provides: linux-image, fuse-module, =PROVIDES=${linux:rprovides}
> > -Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools | linux-initramfs-tool, kmod
> > -Recommends: BOOTLOADER
> > +Depends: ${misc:Depends}, ${shlibs:Depends}, kmod
> > +Recommends: BOOTLOADER, initramfs-tools | linux-initramfs-tool
> >  Breaks: flash-kernel (<< 3.0~rc.4ubuntu64) [arm64]
> >  Suggests: fdutils, SRCPKGNAME-doc-PKGVER | SRCPKGNAME-source-PKGVER, SRCPKGNAME-tools, linux-headers-PKGVER-ABINUM-FLAVOUR
> >  Description: Linux kernel image for version PKGVER on DESC
> 
> This one seems to be missing the changes to the control scripts.

The patch for zesty applies just fine though, I assume there weren't any
different changes needed for artful?
Marcelo Cerri Aug. 10, 2017, 6:25 p.m.
No. They are the same. I did a mistake when generating the patches.
Seth Forshee Aug. 11, 2017, 12:34 p.m.
On Thu, Aug 10, 2017 at 03:25:50PM -0300, Marcelo Henrique Cerri wrote:
> No. They are the same. I did a mistake when generating the patches.

Applied to artful, using the patch for zesty. I've confirmed that the
error building linux-signed is now fixed. Thanks!

Patch hide | download patch | download mbox

diff --git a/debian.master/control.d/flavour-control.stub b/debian.master/control.d/flavour-control.stub
index 6318ad236538..b85b6cd001a2 100644
--- a/debian.master/control.d/flavour-control.stub
+++ b/debian.master/control.d/flavour-control.stub
@@ -27,8 +27,8 @@  Architecture: ARCH
 Section: kernel
 Priority: optional
 Provides: linux-image, fuse-module, =PROVIDES=${linux:rprovides}
-Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools | linux-initramfs-tool, kmod
-Recommends: BOOTLOADER
+Depends: ${misc:Depends}, ${shlibs:Depends}, kmod
+Recommends: BOOTLOADER, initramfs-tools | linux-initramfs-tool
 Breaks: flash-kernel (<< 3.0~rc.4ubuntu64) [arm64]
 Suggests: fdutils, SRCPKGNAME-doc-PKGVER | SRCPKGNAME-source-PKGVER, SRCPKGNAME-tools, linux-headers-PKGVER-ABINUM-FLAVOUR
 Description: Linux kernel image for version PKGVER on DESC