From: Stéphane Graber Date: Wed, 3 Apr 2024 00:42:09 +0000 (-0400) Subject: meson: Align SPDX license id X-Git-Tag: v6.0.0~1^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97f93be72ebf380f3966259410b70b1c966b0ff0;p=thirdparty%2Flxc.git meson: Align SPDX license id Signed-off-by: Stéphane Graber --- diff --git a/config/apparmor/abstractions/meson.build b/config/apparmor/abstractions/meson.build index 92e3afb69..b8a8e4033 100644 --- a/config/apparmor/abstractions/meson.build +++ b/config/apparmor/abstractions/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later +# SPDX-License-Identifier: LGPL-2.1+ if libapparmor.found() configure_file( diff --git a/config/apparmor/meson.build b/config/apparmor/meson.build index d378b4c0a..1f0d8c4f1 100644 --- a/config/apparmor/meson.build +++ b/config/apparmor/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later +# SPDX-License-Identifier: LGPL-2.1+ if libapparmor.found() configure_file( diff --git a/config/apparmor/profiles/meson.build b/config/apparmor/profiles/meson.build index c1d8d3337..1cefb0692 100644 --- a/config/apparmor/profiles/meson.build +++ b/config/apparmor/profiles/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later +# SPDX-License-Identifier: LGPL-2.1+ if libapparmor.found() configure_file( diff --git a/config/bash/meson.build b/config/bash/meson.build index 5dc5dcda0..6bb8447a6 100644 --- a/config/bash/meson.build +++ b/config/bash/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later +# SPDX-License-Identifier: LGPL-2.1+ bash_completion = configure_file( configuration: conf, diff --git a/config/etc/meson.build b/config/etc/meson.build index 04a044aee..28b4ebe0e 100644 --- a/config/etc/meson.build +++ b/config/etc/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later +# SPDX-License-Identifier: LGPL-2.1+ lxc_system_config = configure_file( configuration: dummy_config_data, diff --git a/config/init/common/meson.build b/config/init/common/meson.build index ac15c762e..c322c85e0 100644 --- a/config/init/common/meson.build +++ b/config/init/common/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later +# SPDX-License-Identifier: LGPL-2.1+ lxc_containers = configure_file( configuration: conf, diff --git a/config/init/systemd/meson.build b/config/init/systemd/meson.build index 741901016..2f950f391 100644 --- a/config/init/systemd/meson.build +++ b/config/init/systemd/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later +# SPDX-License-Identifier: LGPL-2.1+ lxc_apparmor_load = configure_file( configuration: dummy_config_data, diff --git a/config/init/sysvinit/meson.build b/config/init/sysvinit/meson.build index 91a45dd82..d1ca44a15 100644 --- a/config/init/sysvinit/meson.build +++ b/config/init/sysvinit/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later +# SPDX-License-Identifier: LGPL-2.1+ if 'sysvinit' in init_script configure_file( diff --git a/config/selinux/meson.build b/config/selinux/meson.build index 05ca35c9e..e0b2a2f42 100644 --- a/config/selinux/meson.build +++ b/config/selinux/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later +# SPDX-License-Identifier: LGPL-2.1+ lxc_selinux_if = configure_file( configuration: dummy_config_data, diff --git a/config/sysconfig/meson.build b/config/sysconfig/meson.build index 65981cc9d..4b6e2faef 100644 --- a/config/sysconfig/meson.build +++ b/config/sysconfig/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later +# SPDX-License-Identifier: LGPL-2.1+ if distrosysconfdir != '' configure_file( diff --git a/config/templates/common.conf.d/meson.build b/config/templates/common.conf.d/meson.build index 32acfc480..c577f372a 100644 --- a/config/templates/common.conf.d/meson.build +++ b/config/templates/common.conf.d/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later +# SPDX-License-Identifier: LGPL-2.1+ lxc_conf_common_readme = configure_file( configuration: dummy_config_data, diff --git a/config/templates/meson.build b/config/templates/meson.build index bed1cd4ea..55fa2f87e 100644 --- a/config/templates/meson.build +++ b/config/templates/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later +# SPDX-License-Identifier: LGPL-2.1+ lxc_conf_common_seccomp = configure_file( configuration: conf, diff --git a/config/yum/meson.build b/config/yum/meson.build index fa1abb159..92940f2ff 100644 --- a/config/yum/meson.build +++ b/config/yum/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later +# SPDX-License-Identifier: LGPL-2.1+ lxc_patch = configure_file( configuration: dummy_config_data, diff --git a/doc/examples/meson.build b/doc/examples/meson.build index 6b88cf80d..0a612bfbe 100644 --- a/doc/examples/meson.build +++ b/doc/examples/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later +# SPDX-License-Identifier: LGPL-2.1+ example_lxc_complex = configure_file( configuration: dummy_config_data, diff --git a/doc/ja/meson.build b/doc/ja/meson.build index bb8b3dce1..449aae967 100644 --- a/doc/ja/meson.build +++ b/doc/ja/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later +# SPDX-License-Identifier: LGPL-2.1+ if want_mans PAGES = [ diff --git a/doc/ko/meson.build b/doc/ko/meson.build index 55d66d94b..80db7a2d6 100644 --- a/doc/ko/meson.build +++ b/doc/ko/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later +# SPDX-License-Identifier: LGPL-2.1+ if want_mans PAGES = [ diff --git a/doc/meson.build b/doc/meson.build index edd7f81dd..2932314d9 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later +# SPDX-License-Identifier: LGPL-2.1+ if want_mans PAGES = [ diff --git a/doc/rootfs/meson.build b/doc/rootfs/meson.build index 2df1de80d..c2155e952 100644 --- a/doc/rootfs/meson.build +++ b/doc/rootfs/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later +# SPDX-License-Identifier: LGPL-2.1+ rootfs_readme = configure_file( configuration: dummy_config_data, diff --git a/hooks/meson.build b/hooks/meson.build index 225dfcdc2..b08b0a7f0 100644 --- a/hooks/meson.build +++ b/hooks/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later +# SPDX-License-Identifier: LGPL-2.1+ hooks_unmount_namespace_sources = files('unmount-namespace.c') if srcconf.get('IS_BIONIC') == 1 or srcconf.get('HAVE_HASMNTOPT') == 0 or srcconf.get('HAVE_SETMNTENT') == 0 or srcconf.get('HAVE_ENDMNTENT') == 0 diff --git a/meson.build b/meson.build index ab54052e8..0c143765a 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later +# SPDX-License-Identifier: LGPL-2.1+ # Project. project( diff --git a/src/include/meson.build b/src/include/meson.build index eb7238a4c..e4a8340bc 100644 --- a/src/include/meson.build +++ b/src/include/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later +# SPDX-License-Identifier: LGPL-2.1+ include_sources = files( 'bpf.h', diff --git a/src/lxc/cmd/meson.build b/src/lxc/cmd/meson.build index 3e85f44d5..3ed3670e4 100644 --- a/src/lxc/cmd/meson.build +++ b/src/lxc/cmd/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later +# SPDX-License-Identifier: LGPL-2.1+ cmd_common_sources = liblxc_ext_sources + include_sources diff --git a/src/lxc/meson.build b/src/lxc/meson.build index 930aa2bb7..dfb164558 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later +# SPDX-License-Identifier: LGPL-2.1+ liblxcfs_attach_file = configure_file( configuration: dummy_config_data, diff --git a/src/lxc/pam/meson.build b/src/lxc/pam/meson.build index 3151c43fc..24d44967c 100644 --- a/src/lxc/pam/meson.build +++ b/src/lxc/pam/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later +# SPDX-License-Identifier: LGPL-2.1+ pam_cgfs_sources = files( 'pam_cgfs.c', diff --git a/src/lxc/tools/include/meson.build b/src/lxc/tools/include/meson.build index 7555bc3aa..4e9f85aee 100644 --- a/src/lxc/tools/include/meson.build +++ b/src/lxc/tools/include/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later +# SPDX-License-Identifier: LGPL-2.1+ if srcconf.get('HAVE_GETSUBOPT') == 0 include_sources += files( diff --git a/src/lxc/tools/meson.build b/src/lxc/tools/meson.build index e12f615de..00a863d93 100644 --- a/src/lxc/tools/meson.build +++ b/src/lxc/tools/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later +# SPDX-License-Identifier: LGPL-2.1+ tools_common_sources = files('arguments.c', 'arguments.h') + include_sources + netns_ifaddrs_sources diff --git a/src/tests/meson.build b/src/tests/meson.build index 06dde5cc2..2b997b73f 100644 --- a/src/tests/meson.build +++ b/src/tests/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later +# SPDX-License-Identifier: LGPL-2.1+ tests_common_sources = liblxc_ext_sources + include_sources + netns_ifaddrs_sources diff --git a/templates/lxc-busybox.in b/templates/lxc-busybox.in index 6669e4d02..04fa96333 100755 --- a/templates/lxc-busybox.in +++ b/templates/lxc-busybox.in @@ -1,6 +1,6 @@ #!/bin/sh # -# SPDX-License-Identifier: LGPL-2.1-or-later +# SPDX-License-Identifier: LGPL-2.1+ # # Client script for LXC container images. diff --git a/templates/lxc-download.in b/templates/lxc-download.in index 0d9504cc5..328eb002e 100755 --- a/templates/lxc-download.in +++ b/templates/lxc-download.in @@ -1,6 +1,6 @@ #!/bin/sh # -# SPDX-License-Identifier: LGPL-2.1-or-later +# SPDX-License-Identifier: LGPL-2.1+ # # Client script for LXC container images. diff --git a/templates/lxc-local.in b/templates/lxc-local.in index 43cd6b1cc..4408ff50b 100755 --- a/templates/lxc-local.in +++ b/templates/lxc-local.in @@ -1,6 +1,6 @@ #!/bin/sh # -# SPDX-License-Identifier: LGPL-2.1-or-later +# SPDX-License-Identifier: LGPL-2.1+ # # Client script for LXC container images. diff --git a/templates/lxc-oci.in b/templates/lxc-oci.in index 2b4051ffa..8cdbd5f46 100755 --- a/templates/lxc-oci.in +++ b/templates/lxc-oci.in @@ -1,6 +1,6 @@ #!/bin/bash # -# SPDX-License-Identifier: LGPL-2.1-or-later +# SPDX-License-Identifier: LGPL-2.1+ # # Create application containers from OCI images diff --git a/templates/meson.build b/templates/meson.build index 83b43765f..629a7e016 100644 --- a/templates/meson.build +++ b/templates/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later +# SPDX-License-Identifier: LGPL-2.1+ template_scripts = configure_file( configuration: conf,