From a16a6c8d985e8dd0caf85d137caa4a52e7262a34 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Tue, 29 Aug 2023 10:45:45 +0200 Subject: [PATCH 1/4] package/confd: properly declare license and group decls. Signed-off-by: Joachim Wiberg --- package/confd/confd.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/confd/confd.mk b/package/confd/confd.mk index f8733d2a9..8c2e171ca 100644 --- a/package/confd/confd.mk +++ b/package/confd/confd.mk @@ -5,10 +5,9 @@ ################################################################################ CONFD_VERSION = 1.0 -CONFD_LICENSE = BSD-3-Clause CONFD_SITE_METHOD = local CONFD_SITE = $(BR2_EXTERNAL_INFIX_PATH)/src/confd -CONFD_LICENSE = BSD-3 +CONFD_LICENSE = BSD-3-Clause CONFD_LICENSE_FILES = LICENSE CONFD_DEPENDENCIES = augeas jansson libite sysrepo libsrx CONFD_AUTORECONF = YES From 4b9475eaa84f6bdac0bbe35f128f2d7a01ab0e72 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Tue, 29 Aug 2023 10:46:42 +0200 Subject: [PATCH 2/4] src/statd: licensed under the same license as confd & libsrx Signed-off-by: Joachim Wiberg --- src/statd/LICENSE | 28 ++++++++++++++++++++++++++++ src/statd/statd.c | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 src/statd/LICENSE diff --git a/src/statd/LICENSE b/src/statd/LICENSE new file mode 100644 index 000000000..2554e9137 --- /dev/null +++ b/src/statd/LICENSE @@ -0,0 +1,28 @@ +Copyright (c) 2020 Denis Kalashnikov +Copyright (c) 2023 The KernelKit Authors +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +* Neither the name of copyright holders nor the names of + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/src/statd/statd.c b/src/statd/statd.c index 993552173..da9406139 100644 --- a/src/statd/statd.c +++ b/src/statd/statd.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ + #include #include #include From c1a8fc8544dd0f873c9ddeb75213c30875f97fc6 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Tue, 29 Aug 2023 10:47:28 +0200 Subject: [PATCH 3/4] package/statd: properly declare license and group decls. Correct license for package is the same as confd and libsrx. Signed-off-by: Joachim Wiberg --- package/statd/statd.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/statd/statd.mk b/package/statd/statd.mk index 781b20ff7..60e68d127 100644 --- a/package/statd/statd.mk +++ b/package/statd/statd.mk @@ -5,9 +5,10 @@ ################################################################################ STATD_VERSION = 1.0 -STATD_LICENSE = MIT STATD_SITE_METHOD = local STATD_SITE = $(BR2_EXTERNAL_INFIX_PATH)/src/statd +STATD_LICENSE = BSD-3-Clause +STATD_LICENSE_FILES = LICENSE STATD_DEPENDENCIES = sysrepo libev libsrx jansson define STATD_BUILD_CMDS From 6ef8d227914075510a04a4632a95ace4039adbc4 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Wed, 30 Aug 2023 08:49:53 +0200 Subject: [PATCH 4/4] package: set foo_REDISTRIBUTE = NO for local packages When running `make legal-info` Buildroot will collect source and licenses for all packages, which generates a few warnings for our local packages. Local packages are skipped. > The source code for packages that set _REDISTRIBUTE = NO will not > be saved. Patches that were applied are also saved, along with a file > named series that lists the patches in the order they were applied. Hence, setting 'foo_REDISTRIBUTE = NO' disables the warning, which seems like a good idea to reduce the number of unnecessary questions we might otherwise get. Signed-off-by: Joachim Wiberg --- package/confd/confd.mk | 1 + package/factory/factory.mk | 2 ++ package/klish-plugin-infix/klish-plugin-infix.mk | 1 + package/libsrx/libsrx.mk | 1 + package/net/net.mk | 1 + package/statd/statd.mk | 1 + 6 files changed, 7 insertions(+) diff --git a/package/confd/confd.mk b/package/confd/confd.mk index 8c2e171ca..577b9ae36 100644 --- a/package/confd/confd.mk +++ b/package/confd/confd.mk @@ -9,6 +9,7 @@ CONFD_SITE_METHOD = local CONFD_SITE = $(BR2_EXTERNAL_INFIX_PATH)/src/confd CONFD_LICENSE = BSD-3-Clause CONFD_LICENSE_FILES = LICENSE +CONFD_REDISTRIBUTE = NO CONFD_DEPENDENCIES = augeas jansson libite sysrepo libsrx CONFD_AUTORECONF = YES diff --git a/package/factory/factory.mk b/package/factory/factory.mk index 194f03a80..52bbb487e 100644 --- a/package/factory/factory.mk +++ b/package/factory/factory.mk @@ -3,11 +3,13 @@ # factory # ################################################################################ + FACTORY_VERSION = 1.0 FACTORY_LICENSE = MIT FACTORY_LICENSE_FILES = LICENSE FACTORY_SITE_METHOD = local FACTORY_SITE = $(BR2_EXTERNAL_INFIX_PATH)/src/factory +FACTORY_REDISTRIBUTE = NO define FACTORY_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ diff --git a/package/klish-plugin-infix/klish-plugin-infix.mk b/package/klish-plugin-infix/klish-plugin-infix.mk index 353ef9ccf..8cd03fdb4 100644 --- a/package/klish-plugin-infix/klish-plugin-infix.mk +++ b/package/klish-plugin-infix/klish-plugin-infix.mk @@ -9,6 +9,7 @@ KLISH_PLUGIN_INFIX_LICENSE = BSD-3-Clause KLISH_PLUGIN_INFIX_LICENSE_FILES = LICENSE KLISH_PLUGIN_INFIX_SITE_METHOD = local KLISH_PLUGIN_INFIX_SITE = $(BR2_EXTERNAL_INFIX_PATH)/src/klish-plugin-infix +KLISH_PLUGIN_INFIX_REDISTRIBUTE = NO KLISH_PLUGIN_INFIX_DEPENDENCIES = klish-plugin-sysrepo KLISH_PLUGIN_INFIX_AUTORECONF = YES diff --git a/package/libsrx/libsrx.mk b/package/libsrx/libsrx.mk index b42b078a5..1aa317f6c 100644 --- a/package/libsrx/libsrx.mk +++ b/package/libsrx/libsrx.mk @@ -10,6 +10,7 @@ LIBSRX_SITE = $(BR2_EXTERNAL_INFIX_PATH)/src/libsrx LIBSRX_LICENSE = BSD-3-Clause LIBSRX_LICENSE_FILES = LICENSE LIBSRX_INSTALL_STAGING = YES +LIBSRX_REDISTRIBUTE = NO LIBSRX_DEPENDENCIES = sysrepo LIBSRX_AUTORECONF = YES diff --git a/package/net/net.mk b/package/net/net.mk index d8bf2bdc1..d603793d7 100644 --- a/package/net/net.mk +++ b/package/net/net.mk @@ -9,6 +9,7 @@ NET_LICENSE = MIT NET_LICENSE_FILES = LICENSE NET_SITE_METHOD = local NET_SITE = $(BR2_EXTERNAL_INFIX_PATH)/src/net +NET_REDISTRIBUTE = NO NET_DEPENDENCIES = libite NET_AUTORECONF = YES diff --git a/package/statd/statd.mk b/package/statd/statd.mk index 60e68d127..81b2d947d 100644 --- a/package/statd/statd.mk +++ b/package/statd/statd.mk @@ -9,6 +9,7 @@ STATD_SITE_METHOD = local STATD_SITE = $(BR2_EXTERNAL_INFIX_PATH)/src/statd STATD_LICENSE = BSD-3-Clause STATD_LICENSE_FILES = LICENSE +STATD_REDISTRIBUTE = NO STATD_DEPENDENCIES = sysrepo libev libsrx jansson define STATD_BUILD_CMDS