[elbe-devel] [PATCH] init: fix xml to support jessie linux-base change

[Manuel Traut]

On 15:27 Fri 08 Feb     , Torben Hohn wrote:
> On Fri, Feb 08, 2019 at 03:10:57PM +0100, John Ogness wrote:
> > With commit 19a6a0cd6b59("init: bump initvm kernel version to
> > jessie-backports") linux-base from backports was added as a
> > dependency of the new kernel package. However, since then
> > linux-base was removed from backports and instead the security
> > package was updated from 3.5 to 4.5. This is quite unusual for
> > Debian and it broke elbe being able to create the initvm.
> > 
> > Remove the extra linux-base listing and add security as an apt
> > source so that the correct linux-base dependency can be found.
> > 
> > Signed-off-by: John Ogness <john.ogness at linutronix.de>
> 
> Reviewed-by: Torben Hohn <torben.hohn at linutronix.de>

Thanks for the patch & the review.

Applied to devel/elbe-3.0

> > ---
> >  elbepack/init/default-init.xml     | 9 ++++++++-
> >  examples/elbe-init-big-machine.xml | 9 ++++++++-
> >  2 files changed, 16 insertions(+), 2 deletions(-)
> > 
> > diff --git a/elbepack/init/default-init.xml b/elbepack/init/default-init.xml
> > index ba37db31..51e7beef 100644
> > --- a/elbepack/init/default-init.xml
> > +++ b/elbepack/init/default-init.xml
> > @@ -8,6 +8,14 @@
> >  			<url-list>
> >  				<url>
> >  					<binary>
> > +						http://security.debian.org/debian-security jessie/updates main
> > +					</binary>
> > +					<source>
> > +						http://security.debian.org/debian-security jessie/updates main
> > +					</source>
> > +				</url>
> > +				<url>
> > +					<binary>
> >  						http://debian.linutronix.de/elbe-testing jessie main
> >  					</binary>
> >  					<source>
> > @@ -44,7 +52,6 @@
> >  			<pkg pin="jessie-backports">debootstrap</pkg>
> >  			<pkg pin="jessie-backports">qemu-user-static</pkg>
> >  			<pkg pin="jessie-backports">linux-image-amd64</pkg>
> > -			<pkg pin="jessie-backports">linux-base</pkg>
> >  		</pkg-list>
> >  		<preseed>
> >  			<conf owner="pbuilder" key="pbuilder/mirrorsite" type="string" value="http://ftp.de.debian.org/debian"/>
> > diff --git a/examples/elbe-init-big-machine.xml b/examples/elbe-init-big-machine.xml
> > index fde5e5bf..7aa71d71 100644
> > --- a/examples/elbe-init-big-machine.xml
> > +++ b/examples/elbe-init-big-machine.xml
> > @@ -8,6 +8,14 @@
> >  			<url-list>
> >  				<url>
> >  					<binary>
> > +						http://security.debian.org/debian-security jessie/updates main
> > +					</binary>
> > +					<source>
> > +						http://security.debian.org/debian-security jessie/updates main
> > +					</source>
> > +				</url>
> > +				<url>
> > +					<binary>
> >  						http://debian.linutronix.de/elbe-testing jessie main
> >  					</binary>
> >  					<source>
> > @@ -44,7 +52,6 @@
> >  			<pkg pin="jessie-backports">debootstrap</pkg>
> >  			<pkg pin="jessie-backports">qemu-user-static</pkg>
> >  			<pkg pin="jessie-backports">linux-image-amd64</pkg>
> > -			<pkg pin="jessie-backports">linux-base</pkg>
> >  		</pkg-list>
> >  		<preseed>
> >  			<conf owner="pbuilder" key="pbuilder/mirrorsite" type="string" value="http://ftp.de.debian.org/debian"/>
> > -- 
> > 2.11.0
> > 
> 
> -- 
> Torben Hohn
> Linutronix GmbH | Bahnhofstrasse 3 | D-88690 Uhldingen-Mühlhofen
> Phone: +49 7556 25 999 18; Fax.: +49 7556 25 999 99
> 
> Hinweise zum Datenschutz finden Sie hier (Informations on data privacy 
> can be found here): https://linutronix.de/kontakt/Datenschutz.php
> 
> Linutronix GmbH | Firmensitz (Registered Office): Uhldingen-Mühlhofen | 
> Registergericht (Registration Court): Amtsgericht Freiburg i.Br., HRB700 
> 806 | Geschäftsführer (Managing Directors): Heinz Egger, Thomas Gleixner