[Unstable/Lunar,5/5] UBUNTU: [Packaging] debian/rules: Add missing 'do_<foo>' variables to 'printenv'

Add all missing 'do_<foo>' variables to the output of the 'printenv'
target.

Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
---
 debian/rules.d/1-maintainer.mk | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

On Fri, Jan 13, 2023 at 10:45:37AM +0100, Juerg Haefliger wrote:
> Add all missing 'do_<foo>' variables to the output of the 'printenv'
> target.
> 
> Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
> ---
>  debian/rules.d/1-maintainer.mk | 14 ++++++++++++--
>  1 file changed, 12 insertions(+), 2 deletions(-)
> 
> diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk
> index f9aa57ab79ca..4d327ec3c478 100644
> --- a/debian/rules.d/1-maintainer.mk
> +++ b/debian/rules.d/1-maintainer.mk
> @@ -85,12 +85,16 @@ printenv:
>  	@echo " sipl_signed              = $(sipl_signed)"
>  	@echo
>  	@echo "do_skip_checks            = $(do_skip_checks)"
> +	@echo "do_enforce_all            = $(do_enforce_all)"
>  	@echo "do_full_build             = $(do_full_build)"
> +	@echo "do_mainline_build         = $(do_mainline_build)"
>  	@echo "do_dbgsym_package         = $(do_dbgsym_package)"
> +	@echo "do_dtbs                   = $(do_dtbs)"
>  	@echo "do_doc_package            = $(do_doc_package)"
>  	@echo "do_doc_package_content    = $(do_doc_package_content)"
>  	@echo "do_source_package         = $(do_source_package)"
>  	@echo "do_source_package_content = $(do_source_package_content)"
> +	@echo "do_extras_package         = $(do_extras_package)"
>  	@echo "do_libc_dev_package       = $(do_libc_dev_package)"
>  	@echo "do_flavour_image_package  = $(do_flavour_image_package)"
>  	@echo "do_flavour_header_package = $(do_flavour_header_package)"
> @@ -98,15 +102,21 @@ printenv:
>  	@echo "do_full_source            = $(do_full_source)"
>  	@echo "do_odm_drivers            = $(do_odm_drivers)"
>  	@echo "do_tools                  = $(do_tools)"
> +	@echo "do_tools_common           = $(do_tools_common)"
>  	@echo "do_any_tools              = $(do_any_tools)"
>  	@echo "do_linux_tools            = $(do_linux_tools)"
> +	@echo " do_tools_acpidbg         = $(do_tools_acpidbg)"
> +	@echo " do_tools_bpftool         = $(do_tools_bpftool)"
>  	@echo " do_tools_cpupower        = $(do_tools_cpupower)"
> +	@echo " do_tools_host            = $(do_tools_host)"
>  	@echo " do_tools_perf            = $(do_tools_perf)"
> -	@echo " do_tools_bpftool         = $(do_tools_bpftool)"
> +	@echo " do_tools_perf_jvmti      = $(do_tools_perf_jvmti)"
> +	@echo " do_tools_usbip           = $(do_tools_usbip)"
>  	@echo " do_tools_x86             = $(do_tools_x86)"
> -	@echo " do_tools_host            = $(do_tools_host)"
>  	@echo "do_cloud_tools            = $(do_cloud_tools)"
>  	@echo " do_tools_hyperv          = $(do_tools_hyperv)"
> +	@echo "do_dkms_wireguard         = $(do_dkms_wireguard)"
> +	@echo " do_wireguard_disable     = $(do_wireguard_disable)"

Maybe we should just get rid of the wireguard variables now that it's
all upstream and we don't need the dkms anymore.

Moreover, this patch and patch 2/5 don't apply cleanly to the latest
lunar/unstable (it's easy to fix the conflicts, but I just wanted to let
you know to make sure that we're using the same source code).

Thanks,
-Andrea

On Mon, Jan 16, 2023 at 07:23:17AM +0100, Andrea Righi wrote:
> On Fri, Jan 13, 2023 at 10:45:37AM +0100, Juerg Haefliger wrote:
> > Add all missing 'do_<foo>' variables to the output of the 'printenv'
> > target.
> > 
> > Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
> > ---
> >  debian/rules.d/1-maintainer.mk | 14 ++++++++++++--
> >  1 file changed, 12 insertions(+), 2 deletions(-)
> > 
> > diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk
> > index f9aa57ab79ca..4d327ec3c478 100644
> > --- a/debian/rules.d/1-maintainer.mk
> > +++ b/debian/rules.d/1-maintainer.mk
> > @@ -85,12 +85,16 @@ printenv:
> >  	@echo " sipl_signed              = $(sipl_signed)"
> >  	@echo
> >  	@echo "do_skip_checks            = $(do_skip_checks)"
> > +	@echo "do_enforce_all            = $(do_enforce_all)"
> >  	@echo "do_full_build             = $(do_full_build)"
> > +	@echo "do_mainline_build         = $(do_mainline_build)"
> >  	@echo "do_dbgsym_package         = $(do_dbgsym_package)"
> > +	@echo "do_dtbs                   = $(do_dtbs)"
> >  	@echo "do_doc_package            = $(do_doc_package)"
> >  	@echo "do_doc_package_content    = $(do_doc_package_content)"
> >  	@echo "do_source_package         = $(do_source_package)"
> >  	@echo "do_source_package_content = $(do_source_package_content)"
> > +	@echo "do_extras_package         = $(do_extras_package)"
> >  	@echo "do_libc_dev_package       = $(do_libc_dev_package)"
> >  	@echo "do_flavour_image_package  = $(do_flavour_image_package)"
> >  	@echo "do_flavour_header_package = $(do_flavour_header_package)"
> > @@ -98,15 +102,21 @@ printenv:
> >  	@echo "do_full_source            = $(do_full_source)"
> >  	@echo "do_odm_drivers            = $(do_odm_drivers)"
> >  	@echo "do_tools                  = $(do_tools)"
> > +	@echo "do_tools_common           = $(do_tools_common)"
> >  	@echo "do_any_tools              = $(do_any_tools)"
> >  	@echo "do_linux_tools            = $(do_linux_tools)"
> > +	@echo " do_tools_acpidbg         = $(do_tools_acpidbg)"
> > +	@echo " do_tools_bpftool         = $(do_tools_bpftool)"
> >  	@echo " do_tools_cpupower        = $(do_tools_cpupower)"
> > +	@echo " do_tools_host            = $(do_tools_host)"
> >  	@echo " do_tools_perf            = $(do_tools_perf)"
> > -	@echo " do_tools_bpftool         = $(do_tools_bpftool)"
> > +	@echo " do_tools_perf_jvmti      = $(do_tools_perf_jvmti)"
> > +	@echo " do_tools_usbip           = $(do_tools_usbip)"
> >  	@echo " do_tools_x86             = $(do_tools_x86)"
> > -	@echo " do_tools_host            = $(do_tools_host)"
> >  	@echo "do_cloud_tools            = $(do_cloud_tools)"
> >  	@echo " do_tools_hyperv          = $(do_tools_hyperv)"
> > +	@echo "do_dkms_wireguard         = $(do_dkms_wireguard)"
> > +	@echo " do_wireguard_disable     = $(do_wireguard_disable)"
> 
> Maybe we should just get rid of the wireguard variables now that it's
> all upstream and we don't need the dkms anymore.
> 
> Moreover, this patch and patch 2/5 don't apply cleanly to the latest
> lunar/unstable (it's easy to fix the conflicts, but I just wanted to let
> you know to make sure that we're using the same source code).

Oh I see... probably the fact that they don't apply it's because I'm
missing a bunch of other cleanup patches that you sent to the mailing
list, alright, I'll process them in order, then probably everything will
apply cleanly.

-Andrea