On Thu, Aug 15, 2024 at 8:07 AM Kevin Hao <haoke...@gmail.com> wrote:
>
> From: Kevin Hao <kexin....@windriver.com>
>
> The stable commit 3f83f52ae082 ("video: logo: Drop full path of the
> input filename in generated file") has dropped this whole comment line.
> Helge has provided the reasons why we should do this in:
> https://lore.kernel.org/all/dcd279e4-9463-4dfb-8aa7-9b9b31112...@gmx.de/
>
> Therefore, it would be best to also remove the linux-yocto specific
> modifications as well to stay aligned with upstream.
I'm taking a low footprint approach to this.
There's no build or runtime issues associated with the current
state that I've seen, so I'm going to leave it as is.
I was already aware of those commits and the logic
Cheers,
Bruce
>
> Signed-off-by: Kevin Hao <kexin....@windriver.com>
> ---
> Hi Bruce,
>
> Could you please merge this into v6.6/standard/base branch?
> ---
> drivers/video/logo/pnmtologo.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/drivers/video/logo/pnmtologo.c b/drivers/video/logo/pnmtologo.c
> index 7527be845443..87912cc35e92 100644
> --- a/drivers/video/logo/pnmtologo.c
> +++ b/drivers/video/logo/pnmtologo.c
> @@ -13,7 +13,7 @@
> #include <stdlib.h>
> #include <string.h>
> #include <unistd.h>
> -#include <libgen.h>
> +
>
> static const char *programname;
> static const char *filename;
> @@ -223,7 +223,6 @@ static inline int is_equal(struct color c1, struct color
> c2)
>
> static void write_header(void)
> {
> - char *filename_basename = basename(filename);
> /* open logo file */
> if (outputname) {
> out = fopen(outputname, "w");
> @@ -236,8 +235,6 @@ static void write_header(void)
> fputs("/*\n", out);
> fputs(" * DO NOT EDIT THIS FILE!\n", out);
> fputs(" *\n", out);
> - fprintf(out, " * It was automatically generated from %s\n",
> filename_basename);
> - fputs(" *\n", out);
> fprintf(out, " * Linux logo %s\n", logoname);
> fputs(" */\n\n", out);
> fputs("#include <linux/linux_logo.h>\n\n", out);
>
> ---
> base-commit: 43ea1c5e6eb3c62ff9bcb45b01728e1a5dff7c11
> change-id: 20240812-b4-v6-6-base-cfb1005b9e07
>
> Best regards,
> --
> Kevin Hao <haoke...@gmail.com>
>
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#14261):
https://lists.yoctoproject.org/g/linux-yocto/message/14261
Mute This Topic: https://lists.yoctoproject.org/mt/107912225/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
