On 05/07/2018 04:07 PM, Tom Rini wrote: > As per the emails I had sent before on this subject, I've converted our > SPDX tags to Linux Kernel style. What this means, to quote from the > kernel's Documentation/process/license-rules.rst file is: > 2. Style: > > The SPDX license identifier is added in form of a comment. The comment > style depends on the file type:: > > C source: // SPDX-License-Identifier: <SPDX License Expression> > C header: /* SPDX-License-Identifier: <SPDX License Expression> */ > ASM: /* SPDX-License-Identifier: <SPDX License Expression> */ > scripts: # SPDX-License-Identifier: <SPDX License Expression> > .rst: .. SPDX-License-Identifier: <SPDX License Expression> > .dts{i}: // SPDX-License-Identifier: <SPDX License Expression> > > Where, yes, the C source comments are not our usual style. But I believe > that cross-project consistency is important and will further help us when > we fixup some of our from Linux but un-tagged-currently files. I'm posting > these patches currently for posterity as I will be pushing them both > shortly (they have build tested the world successfully). I'm also not > going to approve 1/2 to the ML as it's huge and I frankly expect Google to > tell me I can't send it. The commit log is: > > commit 83d290c56fab2d38cd1ab4c4cc7099559c1d5046 > Author: Tom Rini <tr...@konsulko.com> > Date: Sun May 6 17:58:06 2018 -0400 > > SPDX: Convert all of our single license tags to Linux Kernel style > > When U-Boot started using SPDX tags we were among the early adopters and > there weren't a lot of other examples to borrow from. So we picked the > area of the file that usually had a full license text and replaced it > with an appropriate SPDX-License-Identifier: entry. Since then, the > Linux Kernel has adopted SPDX tags and they place it as the very first > line in a file (except where shebangs are used, then it's second line) > and with slightly different comment styles than us. > > In part due to community overlap, in part due to better tag visibility > and in part for other minor reasons, switch over to that style. > > This commit changes all instances where we have a single declared > license in the tag as both the before and after are identical in tag > contents. There's also a few places where I found we did not have a tag > and have introduced one. > > Signed-off-by: Tom Rini <tr...@konsulko.com> > > And I think the above summarizes things well. I am posting 2/2 for > posterity as it contains no functional changes but to repeat what the > commit log says, we go from "LICENSE-A LICENSE-B" to "LICENSE-A OR > LICENSE-B" which allows for useful expressions to be made. >
Hello Tom, thanks for picking up this tedious task. Unfortunately you missed some files, e.g. include/efi_driver.h:6: * SPDX-License-Identifier: GPL-2.0+ include/efi_loader.h:6: * SPDX-License-Identifier: GPL-2.0+ include/asm-generic/pe.h:9: * SPDX-License-Identifier: GPL-2.0+ include/pe.h:8: * SPDX-License-Identifier: GPL-2.0+ include/charset.h:6: * SPDX-License-Identifier: GPL-2.0+ include/efi_selftest.h:6: * SPDX-License-Identifier: GPL-2.0+ lib/efi_driver/efi_uclass.c:6: * SPDX-License-Identifier: GPL-2.0+ lib/efi_driver/efi_block_device.c:6: * SPDX-License-Identifier: GPL-2.0+ lib/efi_selftest/efi_miniapp_file_image_return.h:6: * SPDX-License-Identifier: GPL-2.0+ lib/efi_selftest/efi_selftest_disk_image.h:6: * SPDX-License-Identifier: GPL-2.0+ lib/efi_selftest/efi_miniapp_file_image_exit.h:6: * SPDX-License-Identifier: GPL-2.0+ lib/charset.c:6: * SPDX-License-Identifier: GPL-2.0+ lib/efi_loader/efi_device_path_utilities.c:6: * SPDX-License-Identifier: GPL-2.0+ lib/efi_loader/efi_image_loader.c:8: * SPDX-License-Identifier: GPL-2.0+ lib/efi_loader/efi_variable.c:6: * SPDX-License-Identifier: GPL-2.0+ lib/efi_loader/efi_bootmgr.c:6: * SPDX-License-Identifier: GPL-2.0+ lib/efi_loader/efi_net.c:6: * SPDX-License-Identifier: GPL-2.0+ lib/efi_loader/efi_gop.c:6: * SPDX-License-Identifier: GPL-2.0+ lib/efi_loader/efi_smbios.c:6: * SPDX-License-Identifier: GPL-2.0+ lib/efi_loader/efi_console.c:6: * SPDX-License-Identifier: GPL-2.0+ lib/efi_loader/efi_disk.c:6: * SPDX-License-Identifier: GPL-2.0+ lib/efi_loader/efi_watchdog.c:6: * SPDX-License-Identifier: GPL-2.0+ lib/efi_loader/efi_memory.c:6: * SPDX-License-Identifier: GPL-2.0+ lib/efi_loader/efi_boottime.c:6: * SPDX-License-Identifier: GPL-2.0+ lib/efi_loader/efi_file.c:6: * SPDX-License-Identifier: GPL-2.0+ lib/efi_loader/efi_runtime.c:6: * SPDX-License-Identifier: GPL-2.0+ lib/efi_loader/efi_device_path_to_text.c:6: * SPDX-License-Identifier: GPL-2.0+ arch/arm/mach-rmobile/include/mach/ehci-rmobile.h:5: * SPDX-License-Identifier: GPL-2.0 arch/arm/thumb1/include/asm/proc-armv/system.h:11: * SPDX-License-Identifier: GPL-2.0+ cmd/bootefi.c:6: * SPDX-License-Identifier: GPL-2.0+ drivers/net/vsc9953.c:4: * SPDX-License-Identifier: GPL-2.0+ drivers/usb/host/ehci-rmobile.c:7: * SPDX-License-Identifier: GPL-2.0 Best regards Heinrich _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot