From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Michael Tretter <m.tretter@pengutronix.de>
Subject: Re: [ptxdist] [APPLIED] igt-gpu-tools: avoid installing all files in targetinstall
Date: Thu, 7 Dec 2023 12:10:02 +0100 [thread overview]
Message-ID: <20231207111002.1329237-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20231204144934.426001-2-m.tretter@pengutronix.de>
Thanks, applied as 6e88952a025cf75e8a3238e93bcf12605b3b6ef1.
Michael
[sent from post-receive hook]
On Thu, 07 Dec 2023 12:10:02 +0100, Michael Tretter <m.tretter@pengutronix.de> wrote:
> The igt-gpu-tools installed all files by using install_tree during
> targetinstall. That resulted in the installation in a lot of
> platform-dependent tools and tests to be installed.
>
> Avoid this by explicitly installing the tools and tests depending on the
> package configuration.
>
> As code_cov_parse_info is a Perl script, add Perl as a runtime
> dependency if the tests are enabled.
>
> Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
> Message-Id: <20231204144934.426001-2-m.tretter@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/igt-gpu-tools.in b/rules/igt-gpu-tools.in
> index 10849c296cdb..24ba18c23621 100644
> --- a/rules/igt-gpu-tools.in
> +++ b/rules/igt-gpu-tools.in
> @@ -17,6 +17,7 @@ menuconfig IGT_GPU_TOOLS
> select UDEV_LIBUDEV
> select ZLIB
> select JSON_C if IGT_GPU_TOOLS_TEST_RUNNER
> + select PERL if IGT_GPU_TOOLS_TESTS && RUNTIME
> prompt "igt-gpu-tools "
> help
> igt-gpu-tools is a package of tools for debugging the Intel
> @@ -38,6 +39,10 @@ config IGT_GPU_TOOLS_NOUVEAU
> bool
> default LIBDRM_NOUVEAU
>
> +config IGT_GPU_TOOLS_FREEDRENO
> + bool
> + default LIBDRM_FREEDRENO
> +
> config IGT_GPU_TOOLS_TESTS
> bool
> prompt "build and install tests"
> diff --git a/rules/igt-gpu-tools.make b/rules/igt-gpu-tools.make
> index 734db1d07e8c..891ea5486cb7 100644
> --- a/rules/igt-gpu-tools.make
> +++ b/rules/igt-gpu-tools.make
> @@ -86,10 +86,79 @@ $(STATEDIR)/igt-gpu-tools.targetinstall:
> @$(call install_fixup, igt-gpu-tools,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
> @$(call install_fixup, igt-gpu-tools,DESCRIPTION,missing)
>
> - @$(call install_tree, igt-gpu-tools, 0, 0, -, /usr/lib)
> - @$(call install_tree, igt-gpu-tools, 0, 0, -, /usr/bin)
> - @$(call install_tree, igt-gpu-tools, 0, 0, -, /usr/share/igt-gpu-tools)
> + @$(call install_lib, igt-gpu-tools, 0, 0, 0644, libigt)
> +
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/amd_hdmi_compliance)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/dpcd_reg)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/gputop)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/lsgpu)
> +
> +ifdef PTXCONF_IGT_GPU_TOOLS_INTEL
> + @$(call install_lib, igt-gpu-tools, 0, 0, 0644, libi915_perf)
> +
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/i915-perf-configs)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/i915-perf-control)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/i915-perf-reader)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/i915-perf-recorder)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/intel_audio_dump)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/intel_backlight)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/intel_bios_dumper)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/intel_display_crc)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/intel_display_poller)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/intel_dp_compliance)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/intel_dump_decode)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/intel_error_decode)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/intel_firmware_decode)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/intel_forcewaked)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/intel_framebuffer_dump)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/intel_gem_info)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/intel-gfx-fw-info)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/intel_gpu_abrt)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/intel_gpu_frequency)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/intel_gpu_time)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/intel_gpu_top)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/intel_gtt)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/intel_guc_logger)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/intel_gvtg_test)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/intel_infoframes)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/intel_l3_parity)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/intel_lid)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/intel_opregion_decode)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/intel_panel_fitter)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/intel_perf_counters)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/intel_pm_rpm)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/intel_reg)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/intel_reg_checker)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/intel_residency)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/intel_stepping)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/intel_vbt_decode)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/intel_watermark)
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/xe_reg)
> +
> + @$(call install_tree, igt-gpu-tools, 0, 0, -, /usr/share/igt-gpu-tools/registers)
> +endif
> +
> +ifdef PTXCONF_IGT_GPU_TOOLS_FREEDRENO
> + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/msm_dp_compliance)
> +endif
> +
> +ifdef PTXCONF_IGT_GPU_TOOLS_TESTS
> + $(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/code_cov_capture)
> + $(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/code_cov_gather_on_build)
> + $(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/code_cov_gather_on_test)
> + $(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/code_cov_gen_report)
> + $(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/code_cov_parse_info)
> +
> @$(call install_tree, igt-gpu-tools, 0, 0, -, /usr/libexec/igt-gpu-tools)
> + @$(call install_glob, igt-gpu-tools, 0, 0, -, /usr/share/igt-gpu-tools, *.png,)
> +endif
> +
> +ifdef PTXCONF_IGT_GPU_TOOLS_TEST_RUNNER
> + $(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/igt_comms_decoder)
> + $(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/igt_results)
> + $(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/igt_resume)
> + $(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/igt_runner)
> +endif
>
> @$(call install_finish, igt-gpu-tools)
>
next prev parent reply other threads:[~2023-12-07 11:11 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-04 14:49 [ptxdist] [PATCH 1/2] igt-gpu-tools: limit blacklisting of BINDNOW to x86 Michael Tretter
2023-12-04 14:49 ` [ptxdist] [PATCH 2/2] igt-gpu-tools: avoid installing all files in targetinstall Michael Tretter
2023-12-07 11:10 ` Michael Olbrich [this message]
2023-12-07 11:10 ` [ptxdist] [APPLIED] igt-gpu-tools: limit blacklisting of BINDNOW to x86 Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231207111002.1329237-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=m.tretter@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox