[eoan] UBUNTU: [Packaging]: download virtualbox from sources
diff mbox series

Message ID 20191018200643.18948-1-cascardo@canonical.com
State New
Headers show
Series
  • [eoan] UBUNTU: [Packaging]: download virtualbox from sources
Related show

Commit Message

Thadeu Lima de Souza Cascardo Oct. 18, 2019, 8:06 p.m. UTC
BugLink: https://bugs.launchpad.net/bugs/1848788

dkms packages are gone from the archive when new versions are uploaded.
dkms-build grab them from the existing sources on the builder, which will
work when the expected versions are present on any of the configured
sources.

virtualbox, however, right now, only grabs it from the main archive,
preventing builds when they have been superseded. Fix it by giving the
relative pool address instead of the absolute URL for the archive.

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
---
 debian/rules.d/2-binary-arch.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Andrea Righi Oct. 21, 2019, 9:24 a.m. UTC | #1
On Fri, Oct 18, 2019 at 05:06:43PM -0300, Thadeu Lima de Souza Cascardo wrote:
> BugLink: https://bugs.launchpad.net/bugs/1848788
> 
> dkms packages are gone from the archive when new versions are uploaded.
> dkms-build grab them from the existing sources on the builder, which will
> work when the expected versions are present on any of the configured
> sources.
> 
> virtualbox, however, right now, only grabs it from the main archive,
> preventing builds when they have been superseded. Fix it by giving the
> relative pool address instead of the absolute URL for the archive.
> 
> Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
> ---
>  debian/rules.d/2-binary-arch.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
> index 85a357db4aec..82e4d80e469f 100644
> --- a/debian/rules.d/2-binary-arch.mk
> +++ b/debian/rules.d/2-binary-arch.mk
> @@ -402,7 +402,7 @@ ifeq ($(do_dkms_nvidia),true)
>  endif
>  
>  ifeq ($(do_extras_package),true)
> -	$(if $(filter true,$(do_dkms_vbox)),$(call build_dkms, $(mods_pkg_name)-$*, $(pkgdir_ex)/lib/modules/$(abi_release)-$*/kernel, "", virtualbox-guest, http://archive.ubuntu.com/ubuntu/pool/multiverse/v/virtualbox/virtualbox-guest-dkms_$(dkms_vbox_guest_version)_all.deb))
> +	$(if $(filter true,$(do_dkms_vbox)),$(call build_dkms, $(mods_pkg_name)-$*, $(pkgdir_ex)/lib/modules/$(abi_release)-$*/kernel, "", virtualbox-guest, pool/multiverse/v/virtualbox/virtualbox-guest-dkms_$(dkms_vbox_guest_version)_all.deb))
>  endif
>  
>  ifneq ($(skipdbg),true)

Makes sense to me.

Acked-by: Andrea Righi <andrea.righi@canonical.com>
Andy Whitcroft Oct. 21, 2019, 9:27 a.m. UTC | #2
On Fri, Oct 18, 2019 at 05:06:43PM -0300, Thadeu Lima de Souza Cascardo wrote:
> BugLink: https://bugs.launchpad.net/bugs/1848788
> 
> dkms packages are gone from the archive when new versions are uploaded.
> dkms-build grab them from the existing sources on the builder, which will
> work when the expected versions are present on any of the configured
> sources.
> 
> virtualbox, however, right now, only grabs it from the main archive,
> preventing builds when they have been superseded. Fix it by giving the
> relative pool address instead of the absolute URL for the archive.
> 
> Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
> ---
>  debian/rules.d/2-binary-arch.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
> index 85a357db4aec..82e4d80e469f 100644
> --- a/debian/rules.d/2-binary-arch.mk
> +++ b/debian/rules.d/2-binary-arch.mk
> @@ -402,7 +402,7 @@ ifeq ($(do_dkms_nvidia),true)
>  endif
>  
>  ifeq ($(do_extras_package),true)
> -	$(if $(filter true,$(do_dkms_vbox)),$(call build_dkms, $(mods_pkg_name)-$*, $(pkgdir_ex)/lib/modules/$(abi_release)-$*/kernel, "", virtualbox-guest, http://archive.ubuntu.com/ubuntu/pool/multiverse/v/virtualbox/virtualbox-guest-dkms_$(dkms_vbox_guest_version)_all.deb))
> +	$(if $(filter true,$(do_dkms_vbox)),$(call build_dkms, $(mods_pkg_name)-$*, $(pkgdir_ex)/lib/modules/$(abi_release)-$*/kernel, "", virtualbox-guest, pool/multiverse/v/virtualbox/virtualbox-guest-dkms_$(dkms_vbox_guest_version)_all.deb))
>  endif

Looks sensible.

Acked-by: Andy Whitcroft <apw@canonical.com>

-apw
Kleber Souza Oct. 21, 2019, 12:40 p.m. UTC | #3
On 10/18/19 10:06 PM, Thadeu Lima de Souza Cascardo wrote:
> BugLink: https://bugs.launchpad.net/bugs/1848788
> 
> dkms packages are gone from the archive when new versions are uploaded.
> dkms-build grab them from the existing sources on the builder, which will
> work when the expected versions are present on any of the configured
> sources.
> 
> virtualbox, however, right now, only grabs it from the main archive,
> preventing builds when they have been superseded. Fix it by giving the
> relative pool address instead of the absolute URL for the archive.
> 
> Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
> ---
>  debian/rules.d/2-binary-arch.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
> index 85a357db4aec..82e4d80e469f 100644
> --- a/debian/rules.d/2-binary-arch.mk
> +++ b/debian/rules.d/2-binary-arch.mk
> @@ -402,7 +402,7 @@ ifeq ($(do_dkms_nvidia),true)
>  endif
>  
>  ifeq ($(do_extras_package),true)
> -	$(if $(filter true,$(do_dkms_vbox)),$(call build_dkms, $(mods_pkg_name)-$*, $(pkgdir_ex)/lib/modules/$(abi_release)-$*/kernel, "", virtualbox-guest, http://archive.ubuntu.com/ubuntu/pool/multiverse/v/virtualbox/virtualbox-guest-dkms_$(dkms_vbox_guest_version)_all.deb))
> +	$(if $(filter true,$(do_dkms_vbox)),$(call build_dkms, $(mods_pkg_name)-$*, $(pkgdir_ex)/lib/modules/$(abi_release)-$*/kernel, "", virtualbox-guest, pool/multiverse/v/virtualbox/virtualbox-guest-dkms_$(dkms_vbox_guest_version)_all.deb))
>  endif
>  
>  ifneq ($(skipdbg),true)
> 

Applied to eoan/master-next branch.

Thanks,
Kleber
Thadeu Lima de Souza Cascardo Oct. 21, 2019, 5:03 p.m. UTC | #4
Applied to unstable master branch.

Patch
diff mbox series

diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index 85a357db4aec..82e4d80e469f 100644
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -402,7 +402,7 @@  ifeq ($(do_dkms_nvidia),true)
 endif
 
 ifeq ($(do_extras_package),true)
-	$(if $(filter true,$(do_dkms_vbox)),$(call build_dkms, $(mods_pkg_name)-$*, $(pkgdir_ex)/lib/modules/$(abi_release)-$*/kernel, "", virtualbox-guest, http://archive.ubuntu.com/ubuntu/pool/multiverse/v/virtualbox/virtualbox-guest-dkms_$(dkms_vbox_guest_version)_all.deb))
+	$(if $(filter true,$(do_dkms_vbox)),$(call build_dkms, $(mods_pkg_name)-$*, $(pkgdir_ex)/lib/modules/$(abi_release)-$*/kernel, "", virtualbox-guest, pool/multiverse/v/virtualbox/virtualbox-guest-dkms_$(dkms_vbox_guest_version)_all.deb))
 endif
 
 ifneq ($(skipdbg),true)