ACK: [PATCH][SRU][E] UBUNTU: [Debian] Fix conditional for setting zfs debug package path

Kamal Mostafa kamal at canonical.com
Mon Sep 30 16:29:18 UTC 2019


LGTM.

Acked-by: Kamal Mostafa <kamal at canonical.com>

 -Kamal

Acked-by: Kamal Mostafa <kamal at canonical.com>
On Mon, Sep 30, 2019 at 09:43:14AM -0500, Seth Forshee wrote:
> BugLink: https://bugs.launchpad.net/bugs/1840704
> 
> The conditional there now tests for skipdbg=false, which is not
> something our build scripts ever set this variable to. Therefore
> in practice the condition always evaluates to false, and
> dbgpkgdir_zfs is never set in real builds, only in test builds
> where the value of skipdbg has been overridden to be false.
> 
> Correct this to check for true, and swap the order of then-part
> and else-part accordingly.
> 
> Signed-off-by: Seth Forshee <seth.forshee at canonical.com>
> Acked-by: Andy Whitcroft <apw at canonical.com>
> ---
> This is a fix for a committed patch series that hasn't madie it to
> -proposed yet, so submitting under the same bug number as the
> original patches.
> 
>  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 00a67600ae91..85a357db4aec 100644
> --- a/debian/rules.d/2-binary-arch.mk
> +++ b/debian/rules.d/2-binary-arch.mk
> @@ -108,7 +108,7 @@ install-%: MODPUBKEY=$(builddir)/build-$*/certs/signing_key.x509
>  install-%: build_dir=$(builddir)/build-$*
>  install-%: dkms_dir=$(call dkms_dir_prefix,$(builddir)/build-$*)
>  install-%: enable_zfs = $(call custom_override,do_zfs,$*)
> -install-%: dbgpkgdir_zfs = $(if $(filter false,$(skipdbg)),$(dbgpkgdir)/usr/lib/debug/lib/modules/$(abi_release)-$*/kernel,"")
> +install-%: dbgpkgdir_zfs = $(if $(filter true,$(skipdbg)),"",$(dbgpkgdir)/usr/lib/debug/lib/modules/$(abi_release)-$*/kernel)
>  install-%: $(stampdir)/stamp-build-% install-headers
>  	@echo Debug: $@ kernel_file $(kernel_file) kernfile $(kernfile) install_file $(install_file) instfile $(instfile)
>  	dh_testdir
> -- 
> 2.20.1
> 
> 
> -- 
> kernel-team mailing list
> kernel-team at lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team



More information about the kernel-team mailing list