| Message ID | 20260105-uboot-2025-10-fix-build-on-lts-v1-1-51997f7758a4@bootlin.com |
|---|---|
| State | New |
| Headers | show |
| Series | [2025.02.x] uboot: allow building versions >= 2025.10 | expand |
Hello, Adding Thomas Perale and Titouan Christophe in Cc, as LTS maintainers. On Mon, 05 Jan 2026 15:28:40 +0100 Luca Ceresoli <luca.ceresoli@bootlin.com> wrote: > With upstream commit a239b0b0b6db ("Add symlink from gpl-2.0.txt to > a COPYING file"), COPYING is now a symlink to Licenses/gpl-2.0.txt, > causing the install command in UBOOT_COPY_OLD_LICENSE_FILE to fail > because the source and destination refer to the same file. To avoid > this, copy the license file only if Licenses/gpl-2.0.txt does not > already exist. > > Link: https://gitlab.com/buildroot.org/buildroot/-/commit/128c26f2875dd60ed5fafe25f63b3da11bb79f60 > Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Reviewed-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> > This change was applied on master as part of commit 128c26f2875d > ("boot/uboot: bump to version 2025.10"). This commit is only taking the > line to allow to building a recent U-Boot on stable branches. > > To maintainers: I'm not sure whether I should set the original patch author > as the author of this patch, or add a Co-developed-by, or something > else. I'm fine with resending with such changes if they apply. I think what you did is good enough, as it's not a backport of Dario's patch, but really extracting a tiny bit of it. Thanks! Thomas
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 2796b0a31010..0d77340f85a4 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -307,7 +307,7 @@ endif # prior to u-boot 2013.10 the license info was in COPYING. Copy it so # legal-info finds it define UBOOT_COPY_OLD_LICENSE_FILE - if [ -f $(@D)/COPYING ]; then \ + if [ -f $(@D)/COPYING ] && [ ! -f $(@D)/Licenses/gpl-2.0.txt ]; then \ $(INSTALL) -m 0644 -D $(@D)/COPYING $(@D)/Licenses/gpl-2.0.txt; \ fi endef
With upstream commit a239b0b0b6db ("Add symlink from gpl-2.0.txt to a COPYING file"), COPYING is now a symlink to Licenses/gpl-2.0.txt, causing the install command in UBOOT_COPY_OLD_LICENSE_FILE to fail because the source and destination refer to the same file. To avoid this, copy the license file only if Licenses/gpl-2.0.txt does not already exist. Link: https://gitlab.com/buildroot.org/buildroot/-/commit/128c26f2875dd60ed5fafe25f63b3da11bb79f60 Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> --- This change was applied on master as part of commit 128c26f2875d ("boot/uboot: bump to version 2025.10"). This commit is only taking the line to allow to building a recent U-Boot on stable branches. To maintainers: I'm not sure whether I should set the original patch author as the author of this patch, or add a Co-developed-by, or something else. I'm fine with resending with such changes if they apply. --- boot/uboot/uboot.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- base-commit: e81d65de87f710d711fb204e2af4ac07d26feb20 change-id: 20260105-uboot-2025-10-fix-build-on-lts-5c186b4338f4 Best regards,