mbox

LP#1571156: vbox: resync with 5.0.18-dfsg-2build1 V2

Message ID 20160422160758.GF2896@brain
State New
Headers show

Pull-request

git://git.launchpad.net/~apw/ubuntu/+source/linux/+git/pull lp1571156

Message

Andy Whitcroft April 22, 2016, 4:07 p.m. UTC
We have had a major update to virtualbox, update the kernel components
to match.  Pull request below.  This is fairly substantial looking but
I am assured by our upstream we need it.

Proposing for SRU to xenial.

-apw

The following changes since commit 440128a3858ff1513c29e1429445d483985f3bd9:

  UBUNTU: Ubuntu-4.4.0-21.37 (2016-04-18 12:18:48 -0600)

are available in the git repository at:

  git://git.launchpad.net/~apw/ubuntu/+source/linux/+git/pull lp1571156

for you to fetch changes up to 53d977ab76c9ed671f6905ea9fa41797794655f3:

  UBUNTU: ubuntu: vbox -- update to 5.0.18-dfsg-2build1 (2016-04-22 16:45:17 +0100)

----------------------------------------------------------------
Andy Whitcroft (1):
      UBUNTU: ubuntu: vbox -- update to 5.0.18-dfsg-2build1

 ubuntu/vbox/BOM                                  |    4 +-
 ubuntu/vbox/dkms.conf                            |    2 +-
 ubuntu/vbox/include/VBox/HGSMI/HGSMI.h           |  264 +++
 ubuntu/vbox/include/VBox/HGSMI/HGSMIChSetup.h    |   77 +
 ubuntu/vbox/include/VBox/HGSMI/HGSMIChannels.h   |   64 +
 ubuntu/vbox/include/VBox/HGSMI/HGSMIDefs.h       |  123 ++
 ubuntu/vbox/include/VBox/HGSMI/HGSMIMemAlloc.h   |  100 ++
 ubuntu/vbox/include/VBox/Hardware/VBoxVideoVBE.h |   87 +
 ubuntu/vbox/include/VBox/VBoxGuestLib.h          |   83 +-
 ubuntu/vbox/include/VBox/VBoxVideo.h             | 2016 ++++++++++++++++++++++
 ubuntu/vbox/include/VBox/VBoxVideoGuest.h        |  347 ++++
 ubuntu/vbox/include/iprt/assert.h                |   26 +-
 ubuntu/vbox/include/iprt/ctype.h                 |    2 +
 ubuntu/vbox/include/iprt/err.h                   |    2 +
 ubuntu/vbox/include/iprt/mangling.h              |    3 +
 ubuntu/vbox/include/iprt/utf16.h                 |   98 ++
 ubuntu/vbox/include/the-linux-kernel.h           |  429 +++++
 ubuntu/vbox/r0drv/linux/memobj-r0drv-linux.c     |   59 +-
 ubuntu/vbox/vboxguest/revision-generated.h       |    2 +-
 ubuntu/vbox/vboxguest/version-generated.h        |    6 +-
 ubuntu/vbox/vboxsf/regops.c                      |    4 +
 ubuntu/vbox/vboxsf/version-generated.h           |    6 +-
 ubuntu/vbox/vboxvideo/HGSMIBase.c                |  694 ++++++++
 ubuntu/vbox/vboxvideo/HGSMICommon.c              |  433 +++++
 ubuntu/vbox/vboxvideo/HGSMIMemAlloc.c            |  661 +++++++
 ubuntu/vbox/vboxvideo/Makefile                   |   25 +-
 ubuntu/vbox/vboxvideo/Modesetting.c              |  380 ++++
 ubuntu/vbox/vboxvideo/VBVABase.c                 |  389 +++++
 ubuntu/vbox/vboxvideo/heapoffset.c               |  928 ++++++++++
 ubuntu/vbox/vboxvideo/r0drv                      |    1 +
 ubuntu/vbox/vboxvideo/vbox_drv.c                 |  300 ++++
 ubuntu/vbox/vboxvideo/vbox_drv.h                 |  312 ++++
 ubuntu/vbox/vboxvideo/vbox_dummy.c               |   32 +
 ubuntu/vbox/vboxvideo/vbox_fb.c                  |  454 +++++
 ubuntu/vbox/vboxvideo/vbox_irq.c                 |  187 ++
 ubuntu/vbox/vboxvideo/vbox_main.c                |  566 ++++++
 ubuntu/vbox/vboxvideo/vbox_mode.c                |  801 +++++++++
 ubuntu/vbox/vboxvideo/vbox_ttm.c                 |  501 ++++++
 ubuntu/vbox/vboxvideo/vboxvideo_drm.c            |  200 ---
 ubuntu/vbox/vboxvideo/vboxvideo_drm.h            |   71 -
 ubuntu/vbox/vboxvideo/version-generated.h        |    6 +-
 41 files changed, 10403 insertions(+), 342 deletions(-)
 create mode 100644 ubuntu/vbox/include/VBox/HGSMI/HGSMI.h
 create mode 100644 ubuntu/vbox/include/VBox/HGSMI/HGSMIChSetup.h
 create mode 100644 ubuntu/vbox/include/VBox/HGSMI/HGSMIChannels.h
 create mode 100644 ubuntu/vbox/include/VBox/HGSMI/HGSMIDefs.h
 create mode 100644 ubuntu/vbox/include/VBox/HGSMI/HGSMIMemAlloc.h
 create mode 100644 ubuntu/vbox/include/VBox/Hardware/VBoxVideoVBE.h
 create mode 100644 ubuntu/vbox/include/VBox/VBoxVideo.h
 create mode 100644 ubuntu/vbox/include/VBox/VBoxVideoGuest.h
 create mode 100644 ubuntu/vbox/include/the-linux-kernel.h
 create mode 100644 ubuntu/vbox/vboxvideo/HGSMIBase.c
 create mode 100644 ubuntu/vbox/vboxvideo/HGSMICommon.c
 create mode 100644 ubuntu/vbox/vboxvideo/HGSMIMemAlloc.c
 create mode 100644 ubuntu/vbox/vboxvideo/Modesetting.c
 create mode 100644 ubuntu/vbox/vboxvideo/VBVABase.c
 create mode 100644 ubuntu/vbox/vboxvideo/heapoffset.c
 create mode 120000 ubuntu/vbox/vboxvideo/r0drv
 create mode 100644 ubuntu/vbox/vboxvideo/vbox_drv.c
 create mode 100644 ubuntu/vbox/vboxvideo/vbox_drv.h
 create mode 100644 ubuntu/vbox/vboxvideo/vbox_dummy.c
 create mode 100644 ubuntu/vbox/vboxvideo/vbox_fb.c
 create mode 100644 ubuntu/vbox/vboxvideo/vbox_irq.c
 create mode 100644 ubuntu/vbox/vboxvideo/vbox_main.c
 create mode 100644 ubuntu/vbox/vboxvideo/vbox_mode.c
 create mode 100644 ubuntu/vbox/vboxvideo/vbox_ttm.c
 delete mode 100644 ubuntu/vbox/vboxvideo/vboxvideo_drm.c
 delete mode 100644 ubuntu/vbox/vboxvideo/vboxvideo_drm.h

----- End forwarded message -----

Comments

Brad Figg April 22, 2016, 4:11 p.m. UTC | #1
On Fri, Apr 22, 2016 at 05:07:58PM +0100, Andy Whitcroft wrote:
> We have had a major update to virtualbox, update the kernel components
> to match.  Pull request below.  This is fairly substantial looking but
> I am assured by our upstream we need it.
> 
> Proposing for SRU to xenial.
> 
> -apw
> 
> The following changes since commit 440128a3858ff1513c29e1429445d483985f3bd9:
> 
>   UBUNTU: Ubuntu-4.4.0-21.37 (2016-04-18 12:18:48 -0600)
> 
> are available in the git repository at:
> 
>   git://git.launchpad.net/~apw/ubuntu/+source/linux/+git/pull lp1571156
> 
> for you to fetch changes up to 53d977ab76c9ed671f6905ea9fa41797794655f3:
> 
>   UBUNTU: ubuntu: vbox -- update to 5.0.18-dfsg-2build1 (2016-04-22 16:45:17 +0100)
> 
> ----------------------------------------------------------------
> Andy Whitcroft (1):
>       UBUNTU: ubuntu: vbox -- update to 5.0.18-dfsg-2build1
> 
>  ubuntu/vbox/BOM                                  |    4 +-
>  ubuntu/vbox/dkms.conf                            |    2 +-
>  ubuntu/vbox/include/VBox/HGSMI/HGSMI.h           |  264 +++
>  ubuntu/vbox/include/VBox/HGSMI/HGSMIChSetup.h    |   77 +
>  ubuntu/vbox/include/VBox/HGSMI/HGSMIChannels.h   |   64 +
>  ubuntu/vbox/include/VBox/HGSMI/HGSMIDefs.h       |  123 ++
>  ubuntu/vbox/include/VBox/HGSMI/HGSMIMemAlloc.h   |  100 ++
>  ubuntu/vbox/include/VBox/Hardware/VBoxVideoVBE.h |   87 +
>  ubuntu/vbox/include/VBox/VBoxGuestLib.h          |   83 +-
>  ubuntu/vbox/include/VBox/VBoxVideo.h             | 2016 ++++++++++++++++++++++
>  ubuntu/vbox/include/VBox/VBoxVideoGuest.h        |  347 ++++
>  ubuntu/vbox/include/iprt/assert.h                |   26 +-
>  ubuntu/vbox/include/iprt/ctype.h                 |    2 +
>  ubuntu/vbox/include/iprt/err.h                   |    2 +
>  ubuntu/vbox/include/iprt/mangling.h              |    3 +
>  ubuntu/vbox/include/iprt/utf16.h                 |   98 ++
>  ubuntu/vbox/include/the-linux-kernel.h           |  429 +++++
>  ubuntu/vbox/r0drv/linux/memobj-r0drv-linux.c     |   59 +-
>  ubuntu/vbox/vboxguest/revision-generated.h       |    2 +-
>  ubuntu/vbox/vboxguest/version-generated.h        |    6 +-
>  ubuntu/vbox/vboxsf/regops.c                      |    4 +
>  ubuntu/vbox/vboxsf/version-generated.h           |    6 +-
>  ubuntu/vbox/vboxvideo/HGSMIBase.c                |  694 ++++++++
>  ubuntu/vbox/vboxvideo/HGSMICommon.c              |  433 +++++
>  ubuntu/vbox/vboxvideo/HGSMIMemAlloc.c            |  661 +++++++
>  ubuntu/vbox/vboxvideo/Makefile                   |   25 +-
>  ubuntu/vbox/vboxvideo/Modesetting.c              |  380 ++++
>  ubuntu/vbox/vboxvideo/VBVABase.c                 |  389 +++++
>  ubuntu/vbox/vboxvideo/heapoffset.c               |  928 ++++++++++
>  ubuntu/vbox/vboxvideo/r0drv                      |    1 +
>  ubuntu/vbox/vboxvideo/vbox_drv.c                 |  300 ++++
>  ubuntu/vbox/vboxvideo/vbox_drv.h                 |  312 ++++
>  ubuntu/vbox/vboxvideo/vbox_dummy.c               |   32 +
>  ubuntu/vbox/vboxvideo/vbox_fb.c                  |  454 +++++
>  ubuntu/vbox/vboxvideo/vbox_irq.c                 |  187 ++
>  ubuntu/vbox/vboxvideo/vbox_main.c                |  566 ++++++
>  ubuntu/vbox/vboxvideo/vbox_mode.c                |  801 +++++++++
>  ubuntu/vbox/vboxvideo/vbox_ttm.c                 |  501 ++++++
>  ubuntu/vbox/vboxvideo/vboxvideo_drm.c            |  200 ---
>  ubuntu/vbox/vboxvideo/vboxvideo_drm.h            |   71 -
>  ubuntu/vbox/vboxvideo/version-generated.h        |    6 +-
>  41 files changed, 10403 insertions(+), 342 deletions(-)
>  create mode 100644 ubuntu/vbox/include/VBox/HGSMI/HGSMI.h
>  create mode 100644 ubuntu/vbox/include/VBox/HGSMI/HGSMIChSetup.h
>  create mode 100644 ubuntu/vbox/include/VBox/HGSMI/HGSMIChannels.h
>  create mode 100644 ubuntu/vbox/include/VBox/HGSMI/HGSMIDefs.h
>  create mode 100644 ubuntu/vbox/include/VBox/HGSMI/HGSMIMemAlloc.h
>  create mode 100644 ubuntu/vbox/include/VBox/Hardware/VBoxVideoVBE.h
>  create mode 100644 ubuntu/vbox/include/VBox/VBoxVideo.h
>  create mode 100644 ubuntu/vbox/include/VBox/VBoxVideoGuest.h
>  create mode 100644 ubuntu/vbox/include/the-linux-kernel.h
>  create mode 100644 ubuntu/vbox/vboxvideo/HGSMIBase.c
>  create mode 100644 ubuntu/vbox/vboxvideo/HGSMICommon.c
>  create mode 100644 ubuntu/vbox/vboxvideo/HGSMIMemAlloc.c
>  create mode 100644 ubuntu/vbox/vboxvideo/Modesetting.c
>  create mode 100644 ubuntu/vbox/vboxvideo/VBVABase.c
>  create mode 100644 ubuntu/vbox/vboxvideo/heapoffset.c
>  create mode 120000 ubuntu/vbox/vboxvideo/r0drv
>  create mode 100644 ubuntu/vbox/vboxvideo/vbox_drv.c
>  create mode 100644 ubuntu/vbox/vboxvideo/vbox_drv.h
>  create mode 100644 ubuntu/vbox/vboxvideo/vbox_dummy.c
>  create mode 100644 ubuntu/vbox/vboxvideo/vbox_fb.c
>  create mode 100644 ubuntu/vbox/vboxvideo/vbox_irq.c
>  create mode 100644 ubuntu/vbox/vboxvideo/vbox_main.c
>  create mode 100644 ubuntu/vbox/vboxvideo/vbox_mode.c
>  create mode 100644 ubuntu/vbox/vboxvideo/vbox_ttm.c
>  delete mode 100644 ubuntu/vbox/vboxvideo/vboxvideo_drm.c
>  delete mode 100644 ubuntu/vbox/vboxvideo/vboxvideo_drm.h
> 
> ----- End forwarded message -----
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team

Just as lovely as V1
Andy Whitcroft April 22, 2016, 4:23 p.m. UTC | #2
On Fri, Apr 22, 2016 at 05:07:58PM +0100, Andy Whitcroft wrote:
> We have had a major update to virtualbox, update the kernel components
> to match.  Pull request below.  This is fairly substantial looking but
> I am assured by our upstream we need it.
> 
> Proposing for SRU to xenial.

This represents a resync of the internal copies of the vbox guest drivers
to match the xenial-release pocket version of virtualbox.  The changes
are as below.  The bits here have already been accepted for application
to the package by the release team, we are mearly syncing to that
version.  We could not do this before release as there was not time to
rebuild the kernel.

-apw

    virtualbox (5.0.18-dfsg-2build1) xenial; urgency=high

      * d/p/fix-guest-failure.patch
	- fix guest issue causing writes to the disk to fail.
	(lowering the version, to avoid a sync from unstable)

     -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 20 Apr 2016 11:04:27 +0200

    virtualbox (5.0.18-dfsg-2) unstable; urgency=medium

      [ Adam Conrad ]
      * Add MODULE_VERSION to the vboxvideo driver, so DKMS can find it.

     -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 19 Apr 2016 16:45:36 +0200

    virtualbox (5.0.18-dfsg-1) unstable; urgency=medium

      * New upstream release.
	- drop fix-grapphics.patch: upstream
      * Fix insecure VCS fields.
      * Upload to unstable.

     -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 14 Apr 2016 18:20:22 +0200

    virtualbox (5.0.16-dfsg-3) experimental; urgency=low

      * Build without xorg legacy with the backport of 5.0.17
	code (revision 106564)
      * Bump std-version to 3.9.8, no changes required.
      * Add vbox-img (LP: #1558521).
	- thanks sworddragon for the bug report!

     -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 08 Mar 2016 12:53:39 +0100
Kamal Mostafa April 22, 2016, 4:35 p.m. UTC | #3
ACK and I will insert:

Reference: https://launchpad.net/ubuntu/+source/virtualbox/5.0.18-dfsg-2build1

 -Kamal
Kamal Mostafa April 22, 2016, 6:13 p.m. UTC | #4

Kamal Mostafa April 22, 2016, 10:22 p.m. UTC | #5
This patch set breaks (already applied to xenial/master-next) breaks the
xenial packaging.  debuild -S -I -i   fails with:

dpkg-source: info: building linux using existing linux_4.4.0.orig.tar.gz
dpkg-source: info: building linux in linux_4.4.0-22.38.diff.gz
dpkg-source: error: cannot represent change to ubuntu/vbox/vboxvideo/r0drv:
dpkg-source: error:   new version is symlink to ../r0drv
dpkg-source: error:   old version is nonexistent

What say you, Andy?

 -Kamal


On Fri, Apr 22, 2016 at 05:07:58PM +0100, Andy Whitcroft wrote:
> We have had a major update to virtualbox, update the kernel components
> to match.  Pull request below.  This is fairly substantial looking but
> I am assured by our upstream we need it.
> 
> Proposing for SRU to xenial.
> 
> -apw
> 
> The following changes since commit 440128a3858ff1513c29e1429445d483985f3bd9:
> 
>   UBUNTU: Ubuntu-4.4.0-21.37 (2016-04-18 12:18:48 -0600)
> 
> are available in the git repository at:
> 
>   git://git.launchpad.net/~apw/ubuntu/+source/linux/+git/pull lp1571156
> 
> for you to fetch changes up to 53d977ab76c9ed671f6905ea9fa41797794655f3:
> 
>   UBUNTU: ubuntu: vbox -- update to 5.0.18-dfsg-2build1 (2016-04-22 16:45:17 +0100)
> 
> ----------------------------------------------------------------
> Andy Whitcroft (1):
>       UBUNTU: ubuntu: vbox -- update to 5.0.18-dfsg-2build1
> 
>  ubuntu/vbox/BOM                                  |    4 +-
>  ubuntu/vbox/dkms.conf                            |    2 +-
>  ubuntu/vbox/include/VBox/HGSMI/HGSMI.h           |  264 +++
>  ubuntu/vbox/include/VBox/HGSMI/HGSMIChSetup.h    |   77 +
>  ubuntu/vbox/include/VBox/HGSMI/HGSMIChannels.h   |   64 +
>  ubuntu/vbox/include/VBox/HGSMI/HGSMIDefs.h       |  123 ++
>  ubuntu/vbox/include/VBox/HGSMI/HGSMIMemAlloc.h   |  100 ++
>  ubuntu/vbox/include/VBox/Hardware/VBoxVideoVBE.h |   87 +
>  ubuntu/vbox/include/VBox/VBoxGuestLib.h          |   83 +-
>  ubuntu/vbox/include/VBox/VBoxVideo.h             | 2016 ++++++++++++++++++++++
>  ubuntu/vbox/include/VBox/VBoxVideoGuest.h        |  347 ++++
>  ubuntu/vbox/include/iprt/assert.h                |   26 +-
>  ubuntu/vbox/include/iprt/ctype.h                 |    2 +
>  ubuntu/vbox/include/iprt/err.h                   |    2 +
>  ubuntu/vbox/include/iprt/mangling.h              |    3 +
>  ubuntu/vbox/include/iprt/utf16.h                 |   98 ++
>  ubuntu/vbox/include/the-linux-kernel.h           |  429 +++++
>  ubuntu/vbox/r0drv/linux/memobj-r0drv-linux.c     |   59 +-
>  ubuntu/vbox/vboxguest/revision-generated.h       |    2 +-
>  ubuntu/vbox/vboxguest/version-generated.h        |    6 +-
>  ubuntu/vbox/vboxsf/regops.c                      |    4 +
>  ubuntu/vbox/vboxsf/version-generated.h           |    6 +-
>  ubuntu/vbox/vboxvideo/HGSMIBase.c                |  694 ++++++++
>  ubuntu/vbox/vboxvideo/HGSMICommon.c              |  433 +++++
>  ubuntu/vbox/vboxvideo/HGSMIMemAlloc.c            |  661 +++++++
>  ubuntu/vbox/vboxvideo/Makefile                   |   25 +-
>  ubuntu/vbox/vboxvideo/Modesetting.c              |  380 ++++
>  ubuntu/vbox/vboxvideo/VBVABase.c                 |  389 +++++
>  ubuntu/vbox/vboxvideo/heapoffset.c               |  928 ++++++++++
>  ubuntu/vbox/vboxvideo/r0drv                      |    1 +
>  ubuntu/vbox/vboxvideo/vbox_drv.c                 |  300 ++++
>  ubuntu/vbox/vboxvideo/vbox_drv.h                 |  312 ++++
>  ubuntu/vbox/vboxvideo/vbox_dummy.c               |   32 +
>  ubuntu/vbox/vboxvideo/vbox_fb.c                  |  454 +++++
>  ubuntu/vbox/vboxvideo/vbox_irq.c                 |  187 ++
>  ubuntu/vbox/vboxvideo/vbox_main.c                |  566 ++++++
>  ubuntu/vbox/vboxvideo/vbox_mode.c                |  801 +++++++++
>  ubuntu/vbox/vboxvideo/vbox_ttm.c                 |  501 ++++++
>  ubuntu/vbox/vboxvideo/vboxvideo_drm.c            |  200 ---
>  ubuntu/vbox/vboxvideo/vboxvideo_drm.h            |   71 -
>  ubuntu/vbox/vboxvideo/version-generated.h        |    6 +-
>  41 files changed, 10403 insertions(+), 342 deletions(-)
>  create mode 100644 ubuntu/vbox/include/VBox/HGSMI/HGSMI.h
>  create mode 100644 ubuntu/vbox/include/VBox/HGSMI/HGSMIChSetup.h
>  create mode 100644 ubuntu/vbox/include/VBox/HGSMI/HGSMIChannels.h
>  create mode 100644 ubuntu/vbox/include/VBox/HGSMI/HGSMIDefs.h
>  create mode 100644 ubuntu/vbox/include/VBox/HGSMI/HGSMIMemAlloc.h
>  create mode 100644 ubuntu/vbox/include/VBox/Hardware/VBoxVideoVBE.h
>  create mode 100644 ubuntu/vbox/include/VBox/VBoxVideo.h
>  create mode 100644 ubuntu/vbox/include/VBox/VBoxVideoGuest.h
>  create mode 100644 ubuntu/vbox/include/the-linux-kernel.h
>  create mode 100644 ubuntu/vbox/vboxvideo/HGSMIBase.c
>  create mode 100644 ubuntu/vbox/vboxvideo/HGSMICommon.c
>  create mode 100644 ubuntu/vbox/vboxvideo/HGSMIMemAlloc.c
>  create mode 100644 ubuntu/vbox/vboxvideo/Modesetting.c
>  create mode 100644 ubuntu/vbox/vboxvideo/VBVABase.c
>  create mode 100644 ubuntu/vbox/vboxvideo/heapoffset.c
>  create mode 120000 ubuntu/vbox/vboxvideo/r0drv
>  create mode 100644 ubuntu/vbox/vboxvideo/vbox_drv.c
>  create mode 100644 ubuntu/vbox/vboxvideo/vbox_drv.h
>  create mode 100644 ubuntu/vbox/vboxvideo/vbox_dummy.c
>  create mode 100644 ubuntu/vbox/vboxvideo/vbox_fb.c
>  create mode 100644 ubuntu/vbox/vboxvideo/vbox_irq.c
>  create mode 100644 ubuntu/vbox/vboxvideo/vbox_main.c
>  create mode 100644 ubuntu/vbox/vboxvideo/vbox_mode.c
>  create mode 100644 ubuntu/vbox/vboxvideo/vbox_ttm.c
>  delete mode 100644 ubuntu/vbox/vboxvideo/vboxvideo_drm.c
>  delete mode 100644 ubuntu/vbox/vboxvideo/vboxvideo_drm.h
> 
> ----- End forwarded message -----
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
Andy Whitcroft April 24, 2016, 11:35 a.m. UTC | #6
On Fri, Apr 22, 2016 at 03:22:45PM -0700, Kamal Mostafa wrote:
> This patch set breaks (already applied to xenial/master-next) breaks the
> xenial packaging.  debuild -S -I -i   fails with:
> 
> dpkg-source: info: building linux using existing linux_4.4.0.orig.tar.gz
> dpkg-source: info: building linux in linux_4.4.0-22.38.diff.gz
> dpkg-source: error: cannot represent change to ubuntu/vbox/vboxvideo/r0drv:
> dpkg-source: error:   new version is symlink to ../r0drv
> dpkg-source: error:   old version is nonexistent
> 
> What say you, Andy?

This is a simple change in link content in the tree.  When that happens
we have to rebuild the reconstruct file.  That is normally done as part
of "fdr insertchanges", but testing before then can trip these.  I
suspect it makes sense to include an "fdr autoreconstruct" in the update
proceedure, which I will do next time.

Separatly I have rebuilt the reconstruct and pushed it to the tip of
master-next.  It test built for me.  I would recommend we fold it into
the update commit and push it.

-apw
Andy Whitcroft April 24, 2016, 11:59 a.m. UTC | #7
On Sun, Apr 24, 2016 at 12:35:05PM +0100, Andy Whitcroft wrote:
> On Fri, Apr 22, 2016 at 03:22:45PM -0700, Kamal Mostafa wrote:
> > This patch set breaks (already applied to xenial/master-next) breaks the
> > xenial packaging.  debuild -S -I -i   fails with:
> > 
> > dpkg-source: info: building linux using existing linux_4.4.0.orig.tar.gz
> > dpkg-source: info: building linux in linux_4.4.0-22.38.diff.gz
> > dpkg-source: error: cannot represent change to ubuntu/vbox/vboxvideo/r0drv:
> > dpkg-source: error:   new version is symlink to ../r0drv
> > dpkg-source: error:   old version is nonexistent
> > 
> > What say you, Andy?
> 
> This is a simple change in link content in the tree.  When that happens
> we have to rebuild the reconstruct file.  That is normally done as part
> of "fdr insertchanges", but testing before then can trip these.  I
> suspect it makes sense to include an "fdr autoreconstruct" in the update
> proceedure, which I will do next time.
> 
> Separatly I have rebuilt the reconstruct and pushed it to the tip of
> master-next.  It test built for me.  I would recommend we fold it into
> the update commit and push it.

Ok I have also added this step to the update script.

-apw
Kamal Mostafa April 24, 2016, 3:51 p.m. UTC | #8
On Sun, Apr 24, 2016 at 12:35:05PM +0100, Andy Whitcroft wrote:
> On Fri, Apr 22, 2016 at 03:22:45PM -0700, Kamal Mostafa wrote:
> > This patch set breaks (already applied to xenial/master-next) breaks the
> > xenial packaging.  debuild -S -I -i   fails with:
> > 
> > dpkg-source: info: building linux using existing linux_4.4.0.orig.tar.gz
> > dpkg-source: info: building linux in linux_4.4.0-22.38.diff.gz
> > dpkg-source: error: cannot represent change to ubuntu/vbox/vboxvideo/r0drv:
> > dpkg-source: error:   new version is symlink to ../r0drv
> > dpkg-source: error:   old version is nonexistent
> > 
> > What say you, Andy?
> 
> This is a simple change in link content in the tree.  When that happens
> we have to rebuild the reconstruct file.  That is normally done as part
> of "fdr insertchanges", but testing before then can trip these.

But no, I wasn't testing this before "fdr insertchanges".  That failure
occured (still occurs!) *after* I ran insertchanges (which did indeed
insert an r0drv line into the reconstruct script -- the same line that
you added in b726fa4 -- but that does _not_ fix the failure!)
 

> I
> suspect it makes sense to include an "fdr autoreconstruct" in the update
> proceedure, which I will do next time.
> 
> Separatly I have rebuilt the reconstruct and pushed it to the tip of
> master-next.  It test built for me.  I would recommend we fold it into
> the update commit and push it.

The source package still still fails the same way for me.  Andy, note
that binary builds aren't the problem here (is that what you "test
built"?), its the source package build that fails:

[origin/master-next] d87ebd8 UBUNTU: [Packaging] vbox -- fix up reconstruct on update

$ git clean -fxd
$ fakeroot debian/rules clean
$ debuild -S -I -i

dpkg-source: info: building linux using existing linux_4.4.0.orig.tar.gz 
dpkg-source: info: building linux in linux_4.4.0-22.38.diff.gz 
dpkg-source: error: cannot represent change to ubuntu/vbox/vboxvideo/r0drv: 
dpkg-source: error:   new version is symlink to ../r0drv 
dpkg-source: error:   old version is nonexistent

(Running "fakeroot debian/rules insertchanges" before fdr clean makes no
difference).

 -Kamal
Kamal Mostafa April 24, 2016, 8:55 p.m. UTC | #9
On Sun, Apr 24, 2016 at 08:51:29AM -0700, Kamal Mostafa wrote:
> dpkg-source: info: building linux using existing linux_4.4.0.orig.tar.gz 
> dpkg-source: info: building linux in linux_4.4.0-22.38.diff.gz 
> dpkg-source: error: cannot represent change to ubuntu/vbox/vboxvideo/r0drv: 
> dpkg-source: error:   new version is symlink to ../r0drv 
> dpkg-source: error:   old version is nonexistent

This issue (https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1574362)
is now resolved by Andy's fix in Xenial:
14780f0 UBUNTU: [Packaging] autoreconstruct -- generate extend-diff-ignore for links

Thanks, Andy!

 -Kamal