From patchwork Fri Apr 2 11:44:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 1461652 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::13e; helo=mail-lf1-x13e.google.com; envelope-from=swupdate+bncbcxploxj6ikrbnuhtsbqmgqepxjdh5a@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20161025 header.b=XDq0UpCs; dkim-atps=neutral Received: from mail-lf1-x13e.google.com (mail-lf1-x13e.google.com [IPv6:2a00:1450:4864:20::13e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FBdX05w7zz9sSC for ; Fri, 2 Apr 2021 22:45:02 +1100 (AEDT) Received: by mail-lf1-x13e.google.com with SMTP id i31sf3447125lfv.5 for ; Fri, 02 Apr 2021 04:45:02 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1617363895; cv=pass; d=google.com; s=arc-20160816; b=TD1ifIWIFivVI8cmfrH1UBmUgNkGk0jrnJvD1N9KIjn4+gdkl4xGlqHmczGS8Dz8gK fiPJADCjacCn2o5nCMJBgWmoO0wrww+jbQcHp9aQwjNjFcyOFP0kRdy01+yQQMFDc8T0 u0xCPmw9+HqvNFixKxl/4jy5w9x8bEIwNrbM5SiWAq0tfgzH49Jcee41gV6HSCa5v5hv zIS1GvNqTDOQj8xp+QRfa9m/3zdYvVFoI/yhUB20VpxTafwNrQVAWjnHFbOWGjsgqGYb zjHyLNRK1aIULshgYZysU+dMvalQf/rc0voask8hSr8XhJIGSsgJoO1Sja5AKnwA62JB C7Vg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=lkdzsu3Lui5Pw77wcgJ2qhjQ0Tr//WlsdqUNizb1HdE=; b=UDBT0vKOQBXY/Pxl6rRbl01Xi+sMZIJVl+MPsElU/LTqi0EYc5DkYE6tsosLLP7CUT 4US2xHhlEooq/0PK5Fn2MjZyNgtjGD1WEdAoWp1JP1nw2Pf+K4PZCkpMucrYRy9SBlxn 9qAAVCg+4lG8ZAiXhdCii/Tp16PXwGtyJs47Of0tQpkVVtXayJum4gPEswUKavU4MPJg cuuYZ1AFAJv12y+WPsnOxL8csC+1BG8KUEtmrRXo5CEP0aGckbvutlhyfRAMIXyLTcq7 FCvFw/BtkuhwlS5xDTpkLU9GAkDcHnkqDnbQ7IGDXWPHC2dlSYaVszOMrr8x2HvsZ69f M12w== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.10 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=lkdzsu3Lui5Pw77wcgJ2qhjQ0Tr//WlsdqUNizb1HdE=; b=XDq0UpCsgDStkHe2RwK62tMei6Cgv773dooAb9s8bI9zs9ojWBZnGrwLwEn5d0nG/m mNcAZtcqJf5btdoB1E5imEx4h3c7rBih6T4cxaK8ULvUNz6ObMpxL3JMS24dv4rYAn8/ 7zMI6SfsmoZl9XLXoz7Y4iJXLFGmSo2kbn/XYu/6zGx5C7A0XfAaacfESVyGgssYMzES yEkgYcWMQfnl1dzReU3wYt6dMz6XuJlYoDMgUwUsYKwD0wUDQYTs57JZVC0PMLq5pT+R sNQTBrcRVLVyQj25Ffi7htZLDFxfgrQIqrBGzHsmV01HIKsOMsm45ValtlV9xI5aoVse SMuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=lkdzsu3Lui5Pw77wcgJ2qhjQ0Tr//WlsdqUNizb1HdE=; b=CJPjqUsFRtiup7yCSOBO3CbQGru3edH6HikHNH8TbL5khh5vdWDpIm/LmLmHK97c/g Vvztg1Ej+2HmcvTMrhO7TQ3A8TA332+Zlny3IEXQnWvopEs3nuClQr9V4ULeLgRw8ese 3WocKUxbQS4fzHLofWz34rGlsSsCvL2wdzOAPkr6jwL9dNLdCppORT3ntWwPEQRGz7Nk UNxNCGLwJOIbkEEjJWOBO3mnF2rjaMy8oiAgYx7lfzhjVOVcjZ2ghmekAz47ufNOFQHd 2+kl5iH1efL47xTI8w79e9e7t6Fxit32R3s8oMYb1aIVZGQlBCamvZ49L0C8j99nWBpH 77Gw== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM531JIEAbQayUrocsr6vm1gu8Mx1NfjqXwRueLnxU19VkPmzsECQ2 6PYVzjdMGU9RSEG/zJ8QsRs= X-Google-Smtp-Source: ABdhPJwjobobkjyE9ufI8Et42pHo/a7seyD1hYGr7ExUIOTkzhWaDU9CxALBurqFLaXBX3WTlHEiLw== X-Received: by 2002:ac2:4acf:: with SMTP id m15mr8890711lfp.290.1617363895139; Fri, 02 Apr 2021 04:44:55 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:ac2:58f8:: with SMTP id v24ls738325lfo.2.gmail; Fri, 02 Apr 2021 04:44:53 -0700 (PDT) X-Received: by 2002:ac2:4255:: with SMTP id m21mr8330877lfl.383.1617363893672; Fri, 02 Apr 2021 04:44:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617363893; cv=none; d=google.com; s=arc-20160816; b=zrMvcYHitgXICvLP5mMQQQVgDAJJLPcslhNQphkr8288UlN0wltVsU8MbejfGQl7n5 deMyfb9THHc7aPooA29iTzVAcbOz9SrKWXTowxtvjC6oLXn9i7vpL2kKAhGnQHOqNbOO oUw8hueVpYzvAW+7uclIzhsMw5xSIlcEsZXnKAVXgYwsWJy+FDNWn/RrNEmSFr4cHMhL kjKnboCXqWVJqDNfE+QUEcLVT3mNR1yewfSZyUIHXK7KfVc0qYrNmRO+TOFjsDQCEvSx YbtM0kivk/JilbrGVXxe4z7AfQJpQbvLSzH8xCHOKvI2T0lF/PfAYrcUumERYD3KqUpb z9tA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=W+YQ1CKLaH7rcuYIX+FDrNr3fjqhQ6+wvd/P58Lu1uI=; b=D1ErZVwmUgyTSOv0awfdr0hvKtkYV1d2k954DbrHQukcUjgvamovxn97P9XOmsV0uz qrdB5suJmvHxzp5GVvFy6QR1FuSrTbe/SHvSL82PRoZr0s6bmfZ7ISpWdRvZ8ICmUSFi i2sFKdMyp+Nr4EA3wIS4cl79X2NI0xEGrx0jL3Vy9akJPeHpOm5JwzuBJPKCgXX0F/gn le62TpTfnUG63Q3oqcEQg9qRW7mwyp97fXYpEs3OW6ZeD3O9aiUzfJRwTHiHX2MUAnVL XyuAgmHXapo+czh7alIKxh+bx1wHfDOeUCie/hfQbN52q2vzHx/LlCo5L06PKJpGoPqq ysYQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.10 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de Received: from mail-out.m-online.net (mail-out.m-online.net. [212.18.0.10]) by gmr-mx.google.com with ESMTPS id f7si542311lfa.0.2021.04.02.04.44.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Apr 2021 04:44:53 -0700 (PDT) Received-SPF: neutral (google.com: 212.18.0.10 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) client-ip=212.18.0.10; Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4FBdWn022hz1s0fW; Fri, 2 Apr 2021 13:44:53 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4FBdWm6tXpz1qqkV; Fri, 2 Apr 2021 13:44:52 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id PQ52pAoRxmzK; Fri, 2 Apr 2021 13:44:48 +0200 (CEST) Received: from babic.homelinux.org (host-88-217-136-221.customer.m-online.net [88.217.136.221]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS; Fri, 2 Apr 2021 13:44:48 +0200 (CEST) Received: from localhost (mail.babic.homelinux.org [127.0.0.1]) by babic.homelinux.org (Postfix) with ESMTP id CBB36454078A; Fri, 2 Apr 2021 13:44:47 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at babic.homelinux.org Received: from babic.homelinux.org ([127.0.0.1]) by localhost (mail.babic.homelinux.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Quk79-o_i9CT; Fri, 2 Apr 2021 13:44:43 +0200 (CEST) Received: from paperino.fritz.box (paperino.fritz.box [192.168.178.48]) by babic.homelinux.org (Postfix) with ESMTP id E1EC44540776; Fri, 2 Apr 2021 13:44:42 +0200 (CEST) From: Stefano Babic To: swupdate@googlegroups.com Cc: Stefano Babic Subject: [swupdate] [PATCH V2] Fix SPDX inside the project Date: Fri, 2 Apr 2021 13:44:40 +0200 Message-Id: <20210402114440.235058-1-sbabic@denx.de> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Original-Sender: sbabic@denx.de X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 212.18.0.10 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , SWUpdate is licensed under GPLv2. Single files (if not imported from other projects) should be set to this license. Replace GPL-2.0-or-later with GPL-2.0-only, as it should be. Fix some erroneous SPDX identifier and sync them with https://spdx.org/licenses/. Signed-off-by: Stefano Babic --- Changes in V2: - drop GPL-2.0-or-later in documentation - drop erroneous double license explanation in licensing.rst bindings/Makefile | 2 +- bootloader/Makefile | 2 +- bootloader/ebg.c | 2 +- bootloader/grub.c | 2 +- bootloader/grub.h | 2 +- bootloader/none.c | 2 +- bootloader/uboot.c | 2 +- core/Makefile | 2 +- core/artifacts_versions.c | 2 +- core/cpio_utils.c | 2 +- core/handler.c | 2 +- core/install_from_file.c | 2 +- core/installer.c | 2 +- core/network_thread.c | 2 +- core/notifier.c | 2 +- core/parser.c | 2 +- core/parsing_library.c | 2 +- core/pctl.c | 2 +- core/progress_thread.c | 2 +- core/state.c | 2 +- core/stream_interface.c | 2 +- core/swupdate.c | 2 +- core/swupdate_dict.c | 2 +- core/syslog.c | 2 +- core/util.c | 2 +- corelib/Makefile | 2 +- corelib/channel_curl.c | 2 +- corelib/downloader.c | 2 +- corelib/lua_interface.c | 2 +- corelib/mtd-interface.c | 2 +- corelib/parsing_library_libconfig.c | 2 +- corelib/parsing_library_libjson.c | 2 +- corelib/swupdate_cms_verify.c | 2 +- corelib/swupdate_decrypt.c | 2 +- corelib/swupdate_decrypt_pkcs11.c | 2 +- corelib/swupdate_rsa_verify.c | 2 +- corelib/swupdate_rsa_verify_mbedtls.c | 2 +- corelib/swupdate_settings.c | 2 +- corelib/swupdate_verify_private.h | 2 +- corelib/verify_signature.c | 2 +- doc/source/licensing.rst | 6 ++---- examples/client/swupdate-client.py | 2 +- fatfs/diskio.c | 2 +- fatfs/fat_fs.c | 2 +- handlers/Makefile | 2 +- handlers/archive_handler.c | 2 +- handlers/boot_handler.c | 2 +- handlers/diskpart_handler.c | 2 +- handlers/dummy_handler.c | 2 +- handlers/lua_scripthandler.c | 2 +- handlers/raw_handler.c | 2 +- handlers/rdiff_handler.c | 2 +- handlers/readback_handler.c | 2 +- handlers/remote_handler.c | 2 +- handlers/shell_scripthandler.c | 2 +- handlers/swuforward-ws.c | 2 +- handlers/swuforward_handler.c | 2 +- handlers/swuforward_handler.h | 2 +- handlers/ubivol_handler.c | 2 +- handlers/ucfw_handler.c | 2 +- handlers/uniqueuuid_handler.c | 2 +- include/bootloader.h | 2 +- include/channel.h | 2 +- include/channel_curl.h | 2 +- include/channel_op_res.h | 2 +- include/compat.h | 2 +- include/cpiohdr.h | 2 +- include/download_interface.h | 2 +- include/fatfs_interface.h | 2 +- include/flash.h | 2 +- include/globals.h | 2 +- include/handler.h | 2 +- include/installer.h | 2 +- include/installer_priv.h | 2 +- include/lua_util.h | 2 +- include/mongoose_interface.h | 2 +- include/network_interface.h | 2 +- include/parselib.h | 2 +- include/parsers.h | 2 +- include/pctl.h | 2 +- include/progress.h | 2 +- include/sslapi.h | 2 +- include/state.h | 2 +- include/suricatta/server.h | 2 +- include/suricatta/suricatta.h | 2 +- include/swupdate.h | 2 +- include/swupdate_dict.h | 2 +- include/swupdate_settings.h | 2 +- include/util.h | 2 +- ipc/Makefile | 2 +- mongoose/mongoose.c | 2 +- mongoose/mongoose_interface.c | 2 +- parser/Makefile | 2 +- parser/parse_external.c | 2 +- parser/parser.c | 2 +- suricatta/Makefile | 2 +- suricatta/common.c | 2 +- suricatta/server_general.c | 2 +- suricatta/server_general.h | 2 +- suricatta/server_hawkbit.c | 2 +- suricatta/server_hawkbit.h | 2 +- suricatta/suricatta.c | 2 +- suricatta/suricatta_private.h | 2 +- tools/Makefile | 2 +- tools/swupdate-client.c | 2 +- tools/swupdate-hawkbitcfg.c | 2 +- tools/swupdate-progress.c | 2 +- tools/swupdate-sendtohawkbit.c | 2 +- tools/swupdate-sysrestart.c | 2 +- 109 files changed, 110 insertions(+), 112 deletions(-) diff --git a/bindings/Makefile b/bindings/Makefile index 4152340..2a44012 100644 --- a/bindings/Makefile +++ b/bindings/Makefile @@ -1,6 +1,6 @@ # Copyright (C) 2014-2018 Stefano Babic # -# SPDX-License-Identifier: GPL-2.0-or-later +# SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_LUA) += auxiliar.o lua_swupdate.o lua_compat_shared.o EXTRA_CFLAGS += -fPIC diff --git a/bootloader/Makefile b/bootloader/Makefile index de3a8cb..ff56387 100644 --- a/bootloader/Makefile +++ b/bootloader/Makefile @@ -1,6 +1,6 @@ # Copyright (C) 2014-2018 Stefano Babic # -# SPDX-License-Identifier: GPL-2.0-or-later +# SPDX-License-Identifier: GPL-2.0-only # lib-$(CONFIG_UBOOT) += uboot.o lib-$(CONFIG_BOOTLOADER_NONE) += none.o diff --git a/bootloader/ebg.c b/bootloader/ebg.c index 98107aa..2aa9010 100644 --- a/bootloader/ebg.c +++ b/bootloader/ebg.c @@ -3,7 +3,7 @@ * Author: Andreas Reichel * Copyright (C) 2018, Siemens AG * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/bootloader/grub.c b/bootloader/grub.c index 4224ac9..0dbdc55 100644 --- a/bootloader/grub.c +++ b/bootloader/grub.c @@ -2,7 +2,7 @@ * Author: Maciej Pijanowski maciej.pijanowski@3mdeb.com * Copyright (C) 2017, 3mdeb * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include "bootloader.h" diff --git a/bootloader/grub.h b/bootloader/grub.h index df49ba6..387b8cd 100644 --- a/bootloader/grub.h +++ b/bootloader/grub.h @@ -2,7 +2,7 @@ * Author: Maciej Pijanowski, maciej.pijanowski@3mdeb.com * Copyright (C) 2017, 3mdeb * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #ifndef _GRUBENV_H diff --git a/bootloader/none.c b/bootloader/none.c index ffd7959..67d01e0 100644 --- a/bootloader/none.c +++ b/bootloader/none.c @@ -2,7 +2,7 @@ * (C) Copyright 2017 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/bootloader/uboot.c b/bootloader/uboot.c index d5aa630..86d368b 100644 --- a/bootloader/uboot.c +++ b/bootloader/uboot.c @@ -2,7 +2,7 @@ * (C) Copyright 2017 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/core/Makefile b/core/Makefile index 0ad6f22..fa30e6e 100644 --- a/core/Makefile +++ b/core/Makefile @@ -6,7 +6,7 @@ # # Copyright (C) 1999-2005 by Erik Andersen # -# SPDX-License-Identifier: GPL-2.0-or-later +# SPDX-License-Identifier: GPL-2.0-only obj-y += swupdate.o \ cpio_utils.o \ diff --git a/core/artifacts_versions.c b/core/artifacts_versions.c index 90b5b32..4331258 100644 --- a/core/artifacts_versions.c +++ b/core/artifacts_versions.c @@ -2,7 +2,7 @@ * (C) Copyright 2016 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/core/cpio_utils.c b/core/cpio_utils.c index 84e9c83..1cbe54b 100644 --- a/core/cpio_utils.c +++ b/core/cpio_utils.c @@ -2,7 +2,7 @@ * (C) Copyright 2012 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/core/handler.c b/core/handler.c index 747ef34..fdf178b 100644 --- a/core/handler.c +++ b/core/handler.c @@ -3,7 +3,7 @@ * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * on behalf of ifm electronic GmbH * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/core/install_from_file.c b/core/install_from_file.c index 806a5b3..680f6d5 100644 --- a/core/install_from_file.c +++ b/core/install_from_file.c @@ -2,7 +2,7 @@ * (C) Copyright 2020 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include #include diff --git a/core/installer.c b/core/installer.c index c3094df..5e4cbe5 100644 --- a/core/installer.c +++ b/core/installer.c @@ -3,7 +3,7 @@ * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * on behalf of ifm electronic GmbH * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/core/network_thread.c b/core/network_thread.c index 168ae5d..dbfdf08 100644 --- a/core/network_thread.c +++ b/core/network_thread.c @@ -3,7 +3,7 @@ * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * on behalf of ifm electronic GmbH * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/core/notifier.c b/core/notifier.c index 68447f2..c078891 100644 --- a/core/notifier.c +++ b/core/notifier.c @@ -2,7 +2,7 @@ * (C) Copyright 2013-2016 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/core/parser.c b/core/parser.c index 1f83d44..1855d98 100644 --- a/core/parser.c +++ b/core/parser.c @@ -2,7 +2,7 @@ * (C) Copyright 2013 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/core/parsing_library.c b/core/parsing_library.c index be1471b..3e2ebaa 100644 --- a/core/parsing_library.c +++ b/core/parsing_library.c @@ -1,7 +1,7 @@ /* (C) Copyright 2016 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/core/pctl.c b/core/pctl.c index ec21bbd..517be2d 100644 --- a/core/pctl.c +++ b/core/pctl.c @@ -2,7 +2,7 @@ * (C) Copyright 2016 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/core/progress_thread.c b/core/progress_thread.c index 1d4facd..aaca3d5 100644 --- a/core/progress_thread.c +++ b/core/progress_thread.c @@ -2,7 +2,7 @@ * (C) Copyright 2016 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/core/state.c b/core/state.c index 14905fe..2ec01f5 100644 --- a/core/state.c +++ b/core/state.c @@ -2,7 +2,7 @@ * Author: Christian Storm * Copyright (C) 2016, Siemens AG * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/core/stream_interface.c b/core/stream_interface.c index 6d83dc4..0631abd 100644 --- a/core/stream_interface.c +++ b/core/stream_interface.c @@ -3,7 +3,7 @@ * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * on behalf of ifm electronic GmbH * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/core/swupdate.c b/core/swupdate.c index 03a7e4b..2d11465 100644 --- a/core/swupdate.c +++ b/core/swupdate.c @@ -2,7 +2,7 @@ * (C) Copyright 2012-2016 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/core/swupdate_dict.c b/core/swupdate_dict.c index 5970c55..263e23b 100644 --- a/core/swupdate_dict.c +++ b/core/swupdate_dict.c @@ -5,7 +5,7 @@ * Copyright (C) 2018 Weidmüller Interface GmbH & Co. KG * Stefan Herbrechtsmeier * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/core/syslog.c b/core/syslog.c index a7aa6af..82a3af5 100644 --- a/core/syslog.c +++ b/core/syslog.c @@ -2,7 +2,7 @@ * (C) Copyright 2016 * Denis Osterland, Diehl Connectivity Solutions GmbH, Denis.Osterland@diehl.com. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include #include diff --git a/core/util.c b/core/util.c index ba4ab56..7d7673a 100644 --- a/core/util.c +++ b/core/util.c @@ -2,7 +2,7 @@ * (C) Copyright 2013 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/corelib/Makefile b/corelib/Makefile index 526dad5..037e72f 100644 --- a/corelib/Makefile +++ b/corelib/Makefile @@ -1,6 +1,6 @@ # Copyright (C) 2014-2018 Stefano Babic # -# SPDX-License-Identifier: GPL-2.0-or-later +# SPDX-License-Identifier: GPL-2.0-only lib-$(CONFIG_DOWNLOAD) += downloader.o lib-$(CONFIG_MTD) += mtd-interface.o diff --git a/corelib/channel_curl.c b/corelib/channel_curl.c index f734be3..d2c1ab0 100644 --- a/corelib/channel_curl.c +++ b/corelib/channel_curl.c @@ -2,7 +2,7 @@ * Author: Christian Storm * Copyright (C) 2016, Siemens AG * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/corelib/downloader.c b/corelib/downloader.c index 785c1f7..6d6a132 100644 --- a/corelib/downloader.c +++ b/corelib/downloader.c @@ -2,7 +2,7 @@ * (C) Copyright 2015 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/corelib/lua_interface.c b/corelib/lua_interface.c index e4e4e9f..86e95bd 100644 --- a/corelib/lua_interface.c +++ b/corelib/lua_interface.c @@ -3,7 +3,7 @@ * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * on behalf of ifm electronic GmbH * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/corelib/mtd-interface.c b/corelib/mtd-interface.c index 616faef..1e6267e 100644 --- a/corelib/mtd-interface.c +++ b/corelib/mtd-interface.c @@ -2,7 +2,7 @@ * (C) Copyright 2014 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/corelib/parsing_library_libconfig.c b/corelib/parsing_library_libconfig.c index 42685c1..c662576 100644 --- a/corelib/parsing_library_libconfig.c +++ b/corelib/parsing_library_libconfig.c @@ -1,7 +1,7 @@ /* (C) Copyright 2016 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/corelib/parsing_library_libjson.c b/corelib/parsing_library_libjson.c index 0322a4f..4d208d4 100644 --- a/corelib/parsing_library_libjson.c +++ b/corelib/parsing_library_libjson.c @@ -1,7 +1,7 @@ /* (C) Copyright 2016 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/corelib/swupdate_cms_verify.c b/corelib/swupdate_cms_verify.c index 774a904..5ec3878 100644 --- a/corelib/swupdate_cms_verify.c +++ b/corelib/swupdate_cms_verify.c @@ -2,7 +2,7 @@ * (C) Copyright 2019 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only * * Code mostly taken from openssl examples */ diff --git a/corelib/swupdate_decrypt.c b/corelib/swupdate_decrypt.c index a177ba9..b3a4d0a 100644 --- a/corelib/swupdate_decrypt.c +++ b/corelib/swupdate_decrypt.c @@ -2,7 +2,7 @@ * (C) Copyright 2016 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only * * Code mostly taken from openssl examples * diff --git a/corelib/swupdate_decrypt_pkcs11.c b/corelib/swupdate_decrypt_pkcs11.c index b527bee..f947982 100644 --- a/corelib/swupdate_decrypt_pkcs11.c +++ b/corelib/swupdate_decrypt_pkcs11.c @@ -2,7 +2,7 @@ * (C) Copyright 2020, Linutronix GmbH * Author: Bastian Germann * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/corelib/swupdate_rsa_verify.c b/corelib/swupdate_rsa_verify.c index dd96f9a..9a73cd3 100644 --- a/corelib/swupdate_rsa_verify.c +++ b/corelib/swupdate_rsa_verify.c @@ -2,7 +2,7 @@ * (C) Copyright 2019 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only * * Code mostly taken from openssl examples */ diff --git a/corelib/swupdate_rsa_verify_mbedtls.c b/corelib/swupdate_rsa_verify_mbedtls.c index 288884f..10f2511 100644 --- a/corelib/swupdate_rsa_verify_mbedtls.c +++ b/corelib/swupdate_rsa_verify_mbedtls.c @@ -2,7 +2,7 @@ * (C) Copyright 2019 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/corelib/swupdate_settings.c b/corelib/swupdate_settings.c index b358340..49cd234 100644 --- a/corelib/swupdate_settings.c +++ b/corelib/swupdate_settings.c @@ -2,7 +2,7 @@ * (C) Copyright 2016 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ /* diff --git a/corelib/swupdate_verify_private.h b/corelib/swupdate_verify_private.h index c81a92c..db2c4c7 100644 --- a/corelib/swupdate_verify_private.h +++ b/corelib/swupdate_verify_private.h @@ -2,7 +2,7 @@ * (C) Copyright 2019 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #ifndef _SWUPDATE_VERIFY_H diff --git a/corelib/verify_signature.c b/corelib/verify_signature.c index 26ff502..d91a0bf 100644 --- a/corelib/verify_signature.c +++ b/corelib/verify_signature.c @@ -2,7 +2,7 @@ * (C) Copyright 2016 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only * * Code mostly taken from openssl examples */ diff --git a/doc/source/licensing.rst b/doc/source/licensing.rst index fe84c67..10abcca 100644 --- a/doc/source/licensing.rst +++ b/doc/source/licensing.rst @@ -18,7 +18,7 @@ replaced by a single line: :: - SPDX-License-Identifier: GPL-2.0+ + SPDX-License-Identifier: GPL-2.0-only Ideally, the license terms of all files in the source tree should be defined by such License Identifiers; in no case a file can contain @@ -30,7 +30,7 @@ used under the terms of either of these licenses, i. e. with :: - SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause + SPDX-License-Identifier: GPL-2.0-only you can choose between GPL-2.0+ and BSD-3-Clause licensing. @@ -46,8 +46,6 @@ We use the SPDX_ Unique License Identifiers (SPDX-Identifiers_) +=================================================+==================+==============+ | GNU General Public License v2.0_ only | GPL-2.0-only | Y | +-------------------------------------------------+------------------+--------------+ - | GNU General Public License v2.0_ or later | GPL-2.0-or-later | Y | - +-------------------------------------------------+------------------+--------------+ | GNU Lesser General Public License v2.1_ or later| LGPL-2.1-or-later| Y | +-------------------------------------------------+------------------+--------------+ | BSD 2-Clause_ License | BSD-2-Clause | Y | diff --git a/examples/client/swupdate-client.py b/examples/client/swupdate-client.py index 6cd64fa..ae31ec9 100755 --- a/examples/client/swupdate-client.py +++ b/examples/client/swupdate-client.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # Copyright (c) 2018 Stefano Babic # -# SPDX-License-Identifier: GPL-2.0-or-later +# SPDX-License-Identifier: GPL-2.0-only # import asyncio diff --git a/fatfs/diskio.c b/fatfs/diskio.c index 479aec9..39445be 100644 --- a/fatfs/diskio.c +++ b/fatfs/diskio.c @@ -2,7 +2,7 @@ * Copyright (C) 2021 Weidmueller Interface GmbH & Co. KG * Roland Gaudig * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/fatfs/fat_fs.c b/fatfs/fat_fs.c index 942e96e..86eb1a7 100644 --- a/fatfs/fat_fs.c +++ b/fatfs/fat_fs.c @@ -2,7 +2,7 @@ * Copyright (C) 2021 Weidmueller Interface GmbH & Co. KG * Roland Gaudig * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/handlers/Makefile b/handlers/Makefile index 1449139..1f61f60 100644 --- a/handlers/Makefile +++ b/handlers/Makefile @@ -1,6 +1,6 @@ # Copyright (C) 2014-2018 Stefano Babic # -# SPDX-License-Identifier: GPL-2.0-or-later +# SPDX-License-Identifier: GPL-2.0-only # # Note: the handlers are inserted automatically # via a GCC constructor. To work, the linker should diff --git a/handlers/archive_handler.c b/handlers/archive_handler.c index 6c03ca3..bd7395c 100644 --- a/handlers/archive_handler.c +++ b/handlers/archive_handler.c @@ -2,7 +2,7 @@ * (C) Copyright 2015 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/handlers/boot_handler.c b/handlers/boot_handler.c index 58a60e1..4e14135 100644 --- a/handlers/boot_handler.c +++ b/handlers/boot_handler.c @@ -2,7 +2,7 @@ * (C) Copyright 2013 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/handlers/diskpart_handler.c b/handlers/diskpart_handler.c index 10d3110..ad9ddfc 100644 --- a/handlers/diskpart_handler.c +++ b/handlers/diskpart_handler.c @@ -2,7 +2,7 @@ * (C) Copyright 2019 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/handlers/dummy_handler.c b/handlers/dummy_handler.c index 98a1962..c17b55d 100644 --- a/handlers/dummy_handler.c +++ b/handlers/dummy_handler.c @@ -3,7 +3,7 @@ * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * on behalf of ifm electronic GmbH * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/handlers/lua_scripthandler.c b/handlers/lua_scripthandler.c index 1d0a655..cc47f53 100644 --- a/handlers/lua_scripthandler.c +++ b/handlers/lua_scripthandler.c @@ -3,7 +3,7 @@ * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * on behalf of ifm electronic GmbH * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/handlers/raw_handler.c b/handlers/raw_handler.c index 1007e8b..b62c2a4 100644 --- a/handlers/raw_handler.c +++ b/handlers/raw_handler.c @@ -3,7 +3,7 @@ * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * on behalf of ifm electronic GmbH * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/handlers/rdiff_handler.c b/handlers/rdiff_handler.c index 8d76df2..bd8ff21 100644 --- a/handlers/rdiff_handler.c +++ b/handlers/rdiff_handler.c @@ -2,7 +2,7 @@ * Author: Christian Storm * Copyright (C) 2018, Siemens AG * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/handlers/readback_handler.c b/handlers/readback_handler.c index 9dc99fc..792a764 100644 --- a/handlers/readback_handler.c +++ b/handlers/readback_handler.c @@ -1,7 +1,7 @@ /* * SPDX-FileCopyrightText: 2020 Bosch Sicherheitssysteme GmbH * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/handlers/remote_handler.c b/handlers/remote_handler.c index 275859f..2e2a517 100644 --- a/handlers/remote_handler.c +++ b/handlers/remote_handler.c @@ -2,7 +2,7 @@ * (C) Copyright 2016 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/handlers/shell_scripthandler.c b/handlers/shell_scripthandler.c index fc6ff06..9591350 100644 --- a/handlers/shell_scripthandler.c +++ b/handlers/shell_scripthandler.c @@ -3,7 +3,7 @@ * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * on behalf of ifm electronic GmbH * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/handlers/swuforward-ws.c b/handlers/swuforward-ws.c index 28ebba7..eea0edc 100644 --- a/handlers/swuforward-ws.c +++ b/handlers/swuforward-ws.c @@ -2,7 +2,7 @@ * (C) Copyright 2019 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ /* diff --git a/handlers/swuforward_handler.c b/handlers/swuforward_handler.c index 94bfd9b..c9df541 100644 --- a/handlers/swuforward_handler.c +++ b/handlers/swuforward_handler.c @@ -2,7 +2,7 @@ * (C) Copyright 2017 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ /* diff --git a/handlers/swuforward_handler.h b/handlers/swuforward_handler.h index 865fabf..12ad3b6 100644 --- a/handlers/swuforward_handler.h +++ b/handlers/swuforward_handler.h @@ -2,7 +2,7 @@ * (C) Copyright 2017-2019 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #ifndef _SWUFORWARD_HANDLER_H diff --git a/handlers/ubivol_handler.c b/handlers/ubivol_handler.c index 4730b8c..503e9e0 100644 --- a/handlers/ubivol_handler.c +++ b/handlers/ubivol_handler.c @@ -2,7 +2,7 @@ * (C) Copyright 2013 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/handlers/ucfw_handler.c b/handlers/ucfw_handler.c index 19a778e..b4aedcf 100644 --- a/handlers/ucfw_handler.c +++ b/handlers/ucfw_handler.c @@ -2,7 +2,7 @@ * (C) Copyright 2018 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ /* diff --git a/handlers/uniqueuuid_handler.c b/handlers/uniqueuuid_handler.c index fadc8fa..3ffb8f1 100644 --- a/handlers/uniqueuuid_handler.c +++ b/handlers/uniqueuuid_handler.c @@ -2,7 +2,7 @@ * (C) Copyright 2020 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ /* diff --git a/include/bootloader.h b/include/bootloader.h index 3981bd1..7bf5fa3 100644 --- a/include/bootloader.h +++ b/include/bootloader.h @@ -2,7 +2,7 @@ * (C) Copyright 2017 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #ifndef _BOOTLOADER_INTERFACE_H diff --git a/include/channel.h b/include/channel.h index b0ead67..d44b810 100644 --- a/include/channel.h +++ b/include/channel.h @@ -2,7 +2,7 @@ * Author: Christian Storm * Copyright (C) 2016, Siemens AG * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #pragma once diff --git a/include/channel_curl.h b/include/channel_curl.h index 26b925c..67cc971 100644 --- a/include/channel_curl.h +++ b/include/channel_curl.h @@ -2,7 +2,7 @@ * Author: Christian Storm * Copyright (C) 2016, Siemens AG * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #pragma once diff --git a/include/channel_op_res.h b/include/channel_op_res.h index 2014e3c..7c883b9 100644 --- a/include/channel_op_res.h +++ b/include/channel_op_res.h @@ -5,7 +5,7 @@ * Author: Christian Storm * Copyright (C) 2016, Siemens AG * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #pragma once diff --git a/include/compat.h b/include/compat.h index c1038fe..da7bc29 100644 --- a/include/compat.h +++ b/include/compat.h @@ -2,7 +2,7 @@ * Author: Christian Storm * Copyright (C) 2018, Siemens AG * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #pragma once diff --git a/include/cpiohdr.h b/include/cpiohdr.h index aa1c9b1..21b8578 100644 --- a/include/cpiohdr.h +++ b/include/cpiohdr.h @@ -2,7 +2,7 @@ * (C) Copyright 2016 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ /* diff --git a/include/download_interface.h b/include/download_interface.h index 4bc8089..09fed45 100644 --- a/include/download_interface.h +++ b/include/download_interface.h @@ -2,7 +2,7 @@ * (C) Copyright 2016 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ diff --git a/include/fatfs_interface.h b/include/fatfs_interface.h index a5d8ef7..0cefb94 100644 --- a/include/fatfs_interface.h +++ b/include/fatfs_interface.h @@ -2,7 +2,7 @@ * Copyright (C) 2021 Weidmueller Interface GmbH & Co. KG * Roland Gaudig * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #ifndef _FATFS_INTERFACE_H diff --git a/include/flash.h b/include/flash.h index d3c1860..3894845 100644 --- a/include/flash.h +++ b/include/flash.h @@ -2,7 +2,7 @@ * (C) Copyright 2014 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ diff --git a/include/globals.h b/include/globals.h index f797f4f..9e49c94 100644 --- a/include/globals.h +++ b/include/globals.h @@ -2,7 +2,7 @@ * (C) Copyright 2014 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #ifndef _GLOBALS_H diff --git a/include/handler.h b/include/handler.h index 74c94dc..a060623 100644 --- a/include/handler.h +++ b/include/handler.h @@ -3,7 +3,7 @@ * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * on behalf of ifm electronic GmbH * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ diff --git a/include/installer.h b/include/installer.h index 9e7fb16..80aa442 100644 --- a/include/installer.h +++ b/include/installer.h @@ -2,7 +2,7 @@ * (C) Copyright 2013 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ diff --git a/include/installer_priv.h b/include/installer_priv.h index fc02255..901dbf4 100644 --- a/include/installer_priv.h +++ b/include/installer_priv.h @@ -2,7 +2,7 @@ * (C) Copyright 2020 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #ifndef _INSTALLER_PRIV_H diff --git a/include/lua_util.h b/include/lua_util.h index 088ad2e..81da802 100644 --- a/include/lua_util.h +++ b/include/lua_util.h @@ -3,7 +3,7 @@ * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * on behalf of ifm electronic GmbH * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #ifndef _LUA_UTIL_H diff --git a/include/mongoose_interface.h b/include/mongoose_interface.h index 1596cfa..845f7cb 100644 --- a/include/mongoose_interface.h +++ b/include/mongoose_interface.h @@ -2,7 +2,7 @@ * (C) Copyright 2012-2014 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #ifndef _MONGOOSE_INTERFACE_H diff --git a/include/network_interface.h b/include/network_interface.h index e67a8b2..4451877 100644 --- a/include/network_interface.h +++ b/include/network_interface.h @@ -3,7 +3,7 @@ * Stefano Babic, DENX Software Engineering, sbabic@denx.de * on behalf of ifm electronic GmbH * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #ifndef _NETWORK_INTERFACE_H diff --git a/include/parselib.h b/include/parselib.h index 84a51e2..66ea2b5 100644 --- a/include/parselib.h +++ b/include/parselib.h @@ -2,7 +2,7 @@ * (C) Copyright 2016 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #ifndef _PARSE_LIBRARY_H diff --git a/include/parsers.h b/include/parsers.h index 598ad92..e13f3b0 100644 --- a/include/parsers.h +++ b/include/parsers.h @@ -2,7 +2,7 @@ * (C) Copyright 2008-2013 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #ifndef _RECOVERY_PARSERS_H diff --git a/include/pctl.h b/include/pctl.h index 84cf549..8767864 100644 --- a/include/pctl.h +++ b/include/pctl.h @@ -2,7 +2,7 @@ * (C) Copyright 2016 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #ifndef _SWUPDATE_PCTL_H diff --git a/include/progress.h b/include/progress.h index 9297cf9..b5a81df 100644 --- a/include/progress.h +++ b/include/progress.h @@ -2,7 +2,7 @@ * (C) Copyright 2016 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #ifndef _INSTALL_PROGRESS_H diff --git a/include/sslapi.h b/include/sslapi.h index 12f9e54..1fa15b0 100644 --- a/include/sslapi.h +++ b/include/sslapi.h @@ -2,7 +2,7 @@ * (C) Copyright 2016 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #ifndef _SWUPDATE_SSL_H diff --git a/include/state.h b/include/state.h index 5814653..a74ee72 100644 --- a/include/state.h +++ b/include/state.h @@ -2,7 +2,7 @@ * Author: Christian Storm * Copyright (C) 2016, Siemens AG * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #pragma once diff --git a/include/suricatta/server.h b/include/suricatta/server.h index 03cb03e..07981df 100644 --- a/include/suricatta/server.h +++ b/include/suricatta/server.h @@ -2,7 +2,7 @@ * Author: Christian Storm * Copyright (C) 2016, Siemens AG * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #pragma once diff --git a/include/suricatta/suricatta.h b/include/suricatta/suricatta.h index 0efbfba..c7c1582 100644 --- a/include/suricatta/suricatta.h +++ b/include/suricatta/suricatta.h @@ -2,7 +2,7 @@ * Author: Christian Storm * Copyright (C) 2016, Siemens AG * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #pragma once diff --git a/include/swupdate.h b/include/swupdate.h index f2a2056..4cce892 100644 --- a/include/swupdate.h +++ b/include/swupdate.h @@ -2,7 +2,7 @@ * (C) Copyright 2012-2014 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #ifndef _SWUPDATE_H diff --git a/include/swupdate_dict.h b/include/swupdate_dict.h index 1c988b1..0e94989 100644 --- a/include/swupdate_dict.h +++ b/include/swupdate_dict.h @@ -2,7 +2,7 @@ * (C) Copyright 2016 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #ifndef _SWDICT_H diff --git a/include/swupdate_settings.h b/include/swupdate_settings.h index 06e40d5..108b9fb 100644 --- a/include/swupdate_settings.h +++ b/include/swupdate_settings.h @@ -2,7 +2,7 @@ * (C) Copyright 2016 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #ifndef _SWUPDATE_SETTINGS_H diff --git a/include/util.h b/include/util.h index 369cb25..52e9360 100644 --- a/include/util.h +++ b/include/util.h @@ -2,7 +2,7 @@ * (C) Copyright 2012-2016 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #ifndef _UTIL_H diff --git a/ipc/Makefile b/ipc/Makefile index f634dce..71a1f42 100644 --- a/ipc/Makefile +++ b/ipc/Makefile @@ -1,6 +1,6 @@ # Copyright (C) 2014-2018 Stefano Babic # -# SPDX-License-Identifier: GPL-2.0-or-later +# SPDX-License-Identifier: GPL-2.0-only obj-y += network_ipc.o network_ipc-if.o progress_ipc.o EXTRA_CFLAGS += -fPIC diff --git a/mongoose/mongoose.c b/mongoose/mongoose.c index aa23471..03bfad3 100644 --- a/mongoose/mongoose.c +++ b/mongoose/mongoose.c @@ -3,7 +3,7 @@ * Copyright (c) 2013-2020 Cesanta Software Limited * All rights reserved * - * SPDX-License-Identifier: GPL-2.0 + * SPDX-License-Identifier: GPL-2.0-only * * This software is dual-licensed: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as diff --git a/mongoose/mongoose_interface.c b/mongoose/mongoose_interface.c index 1b03c55..5dc99f1 100644 --- a/mongoose/mongoose_interface.c +++ b/mongoose/mongoose_interface.c @@ -7,7 +7,7 @@ * * Copyright (c) 2004-2013 Sergey Lyubka * - * SPDX-License-Identifier: MIT AND GPL-2.0-or-later + * SPDX-License-Identifier: MIT AND GPL-2.0-only */ #define _XOPEN_SOURCE 600 // For PATH_MAX on linux diff --git a/parser/Makefile b/parser/Makefile index 5150c3c..1af0a49 100644 --- a/parser/Makefile +++ b/parser/Makefile @@ -1,4 +1,4 @@ # Copyright (C) 2014-2018 Stefano Babic # -# SPDX-License-Identifier: GPL-2.0-or-later +# SPDX-License-Identifier: GPL-2.0-only lib-y += parser.o parse_external.o diff --git a/parser/parse_external.c b/parser/parse_external.c index 802a76c..6240c46 100644 --- a/parser/parse_external.c +++ b/parser/parse_external.c @@ -3,7 +3,7 @@ * Stefano Babic, DENX Software Engineering, sbabic@denx.de * on behalf of ifm electronic GmbH * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ diff --git a/parser/parser.c b/parser/parser.c index 44b3926..feb3100 100644 --- a/parser/parser.c +++ b/parser/parser.c @@ -2,7 +2,7 @@ * (C) Copyright 2015-2016 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/suricatta/Makefile b/suricatta/Makefile index e20f75a..b06d171 100644 --- a/suricatta/Makefile +++ b/suricatta/Makefile @@ -1,6 +1,6 @@ # Copyright (C) 2014-2018 Stefano Babic # -# SPDX-License-Identifier: GPL-2.0-or-later +# SPDX-License-Identifier: GPL-2.0-only lib-$(CONFIG_SURICATTA) += suricatta.o common.o ifneq ($(CONFIG_SURICATTA_HAWKBIT),) lib-$(CONFIG_SURICATTA) += server_hawkbit.o diff --git a/suricatta/common.c b/suricatta/common.c index bf2bcd2..e5a3db2 100644 --- a/suricatta/common.c +++ b/suricatta/common.c @@ -2,7 +2,7 @@ * (C) Copyright 2018 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include #include diff --git a/suricatta/server_general.c b/suricatta/server_general.c index fa025a3..1d11ada 100644 --- a/suricatta/server_general.c +++ b/suricatta/server_general.c @@ -2,7 +2,7 @@ * (C) Copyright 2018 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ /* diff --git a/suricatta/server_general.h b/suricatta/server_general.h index 70822bd..69345a1 100644 --- a/suricatta/server_general.h +++ b/suricatta/server_general.h @@ -2,7 +2,7 @@ * (C) Copyright 2018 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #pragma once diff --git a/suricatta/server_hawkbit.c b/suricatta/server_hawkbit.c index ed4c800..b1372a8 100644 --- a/suricatta/server_hawkbit.c +++ b/suricatta/server_hawkbit.c @@ -2,7 +2,7 @@ * Author: Christian Storm * Copyright (C) 2016, Siemens AG * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/suricatta/server_hawkbit.h b/suricatta/server_hawkbit.h index eb00161..2d18a05 100644 --- a/suricatta/server_hawkbit.h +++ b/suricatta/server_hawkbit.h @@ -2,7 +2,7 @@ * Author: Christian Storm * Copyright (C) 2016, Siemens AG * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #pragma once diff --git a/suricatta/suricatta.c b/suricatta/suricatta.c index c828452..c7dfa65 100644 --- a/suricatta/suricatta.c +++ b/suricatta/suricatta.c @@ -2,7 +2,7 @@ * Author: Christian Storm * Copyright (C) 2016, Siemens AG * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/suricatta/suricatta_private.h b/suricatta/suricatta_private.h index 59f4d16..25f9e7f 100644 --- a/suricatta/suricatta_private.h +++ b/suricatta/suricatta_private.h @@ -2,7 +2,7 @@ * (C) Copyright 2018 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #pragma once diff --git a/tools/Makefile b/tools/Makefile index 206b0eb..013022b 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -6,7 +6,7 @@ # # Copyright (C) 1999-2005 by Erik Andersen # -# SPDX-License-Identifier: GPL-2.0-or-later +# SPDX-License-Identifier: GPL-2.0-only lib-y += \ swupdate-client.o \ diff --git a/tools/swupdate-client.c b/tools/swupdate-client.c index 94f712b..22e55de 100644 --- a/tools/swupdate-client.c +++ b/tools/swupdate-client.c @@ -2,7 +2,7 @@ * (C) Copyright 2015 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ /* diff --git a/tools/swupdate-hawkbitcfg.c b/tools/swupdate-hawkbitcfg.c index 2e5a332..6d5fd43 100644 --- a/tools/swupdate-hawkbitcfg.c +++ b/tools/swupdate-hawkbitcfg.c @@ -2,7 +2,7 @@ * (C) Copyright 2017 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ /* diff --git a/tools/swupdate-progress.c b/tools/swupdate-progress.c index 754d56f..e3f010b 100644 --- a/tools/swupdate-progress.c +++ b/tools/swupdate-progress.c @@ -2,7 +2,7 @@ * (C) Copyright 2016 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include diff --git a/tools/swupdate-sendtohawkbit.c b/tools/swupdate-sendtohawkbit.c index 3701fb9..06a85ea 100644 --- a/tools/swupdate-sendtohawkbit.c +++ b/tools/swupdate-sendtohawkbit.c @@ -2,7 +2,7 @@ * (C) Copyright 2017 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ /* diff --git a/tools/swupdate-sysrestart.c b/tools/swupdate-sysrestart.c index 9a9a4ff..c62e306 100644 --- a/tools/swupdate-sysrestart.c +++ b/tools/swupdate-sysrestart.c @@ -2,7 +2,7 @@ * (C) Copyright 2016 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-only */ #include