ACK: [SRU trusty/master-next 1/1] Revert "UBUNTU: [Packaging] skip cloud tools packaging when not building package"

Kleber Souza kleber.souza at canonical.com
Wed Mar 13 12:14:31 UTC 2019


On 3/13/19 1:09 PM, Andy Whitcroft wrote:
> This reverts commit 1147a790e33fbef16a83d8e6deb5e7dfc5c194f4.
>
> This is plain wrong.  We always build the linux-tools-common and
> linux-cloud-tools-common packages out of the primary linux package in any
> series.  That kernel must produce them in the indep phase even if the indep
> architecture does not produce cloud packages as all and any derivative may
> depend on them in any architecture including the indep build architecture.
> If a package is failing to build for lack of a control entry, and it is
> a master branch it needs the control entry adding not this disabling.
>
> I will also note thaat at this point the code this omits no longer
> contains any packaging steps, so this part of the change would now
> be ineffective.
>
> BugLink: http://bugs.launchpad.net/bugs/1819869
> Signed-off-by: Andy Whitcroft <apw at canonical.com>


Acked-by: Kleber Sacilotto de Souza <kleber.souza at canonical.com>

> ---
>  debian/rules.d/3-binary-indep.mk | 4 ----
>  1 file changed, 4 deletions(-)
>
> diff --git a/debian/rules.d/3-binary-indep.mk b/debian/rules.d/3-binary-indep.mk
> index 5488fd1e7ba0..b4c90e381390 100644
> --- a/debian/rules.d/3-binary-indep.mk
> +++ b/debian/rules.d/3-binary-indep.mk
> @@ -126,8 +126,6 @@ endif
>  	install -m644 $(CURDIR)/tools/power/x86/x86_energy_perf_policy/*.8 $(toolsman)/man8
>  	install -m644 $(CURDIR)/tools/power/x86/turbostat/*.8 $(toolsman)/man8
>  
> -ifeq ($(do_cloud_tools),true)
> -ifeq ($(do_tools_hyperv),true)
>  	install -d $(cloudsbin)
>  	install -m755 debian/tools/generic $(cloudsbin)/hv_kvp_daemon
>  	install -m755 debian/tools/generic $(cloudsbin)/hv_vss_daemon
> @@ -138,8 +136,6 @@ ifeq ($(do_tools_hyperv),true)
>  
>  	install -d $(cloudman)/man8
>  	install -m644 $(CURDIR)/tools/hv/*.8 $(cloudman)/man8
> -endif
> -endif
>  
>  endif
>  





More information about the kernel-team mailing list