From 6036c3a11ac8bd3851980808add174b3e869a916 Mon Sep 17 00:00:00 2001 From: Albert Esteve Date: Wed, 7 Sep 2022 14:32:03 +0200 Subject: [PATCH] reuse: addheader GPL rest Add GPL copyright header to the rest of the project files not covered by other commits. Signed-off-by: Albert Esteve --- contrib/install-pkg.sh | 3 +++ contrib/shell_helper | 3 +++ doc/index.rst | 3 +++ init/systemd/vdsm-tmpfiles.d.conf.in | 3 +++ lib/vdsm/common/config.py.in | 22 +++------------------ lib/vdsm/common/constants.py.in | 21 ++------------------ lib/vdsm/common/dsaversion.py.in | 22 +++------------------ lib/vdsm/storage/lvm.env.in | 3 +++ lib/vdsm/storage/vdsm_lvm_rules.template.in | 21 +++++--------------- lib/vdsmclient/__init__.py | 21 ++------------------ tests/storage/storage.py | 3 +++ vdsm.spec.in | 3 +++ 12 files changed, 36 insertions(+), 92 deletions(-) diff --git a/contrib/install-pkg.sh b/contrib/install-pkg.sh index 652e17ec48..fc0ea9282e 100755 --- a/contrib/install-pkg.sh +++ b/contrib/install-pkg.sh @@ -1,5 +1,8 @@ #!/bin/sh -e +# SPDX-FileCopyrightText: Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + sudo dnf install -y \ autoconf \ automake \ diff --git a/contrib/shell_helper b/contrib/shell_helper index 48728979f6..0629f82952 100755 --- a/contrib/shell_helper +++ b/contrib/shell_helper @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + # Useful VDSM helpers for developers. It supplies a few shorthands for common # developer's daily tasks. This file can be imported to one's .bashrc or # .zshrc. diff --git a/doc/index.rst b/doc/index.rst index 94ee8fc05e..c8d9cd7583 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -1,3 +1,6 @@ +.. SPDX-FileCopyrightText: Red Hat, Inc. +.. SPDX-License-Identifier: GPL-2.0-or-later + .. Vdsm documentation master file, created by sphinx-quickstart on Thu Dec 24 14:07:47 2009. You can adapt this file completely to your liking, but it should at least diff --git a/init/systemd/vdsm-tmpfiles.d.conf.in b/init/systemd/vdsm-tmpfiles.d.conf.in index 5be818c517..96893eac42 100644 --- a/init/systemd/vdsm-tmpfiles.d.conf.in +++ b/init/systemd/vdsm-tmpfiles.d.conf.in @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + d @VDSMRUNDIR@ 755 @VDSMUSER@ @VDSMGROUP@ d @VDSMRUNDIR@/v2v 700 @VDSMUSER@ @VDSMGROUP@ d @VDSMRUNDIR@/payload 755 @VDSMUSER@ @VDSMGROUP@ diff --git a/lib/vdsm/common/config.py.in b/lib/vdsm/common/config.py.in index 8504d04ff3..5b6ac7e055 100644 --- a/lib/vdsm/common/config.py.in +++ b/lib/vdsm/common/config.py.in @@ -1,22 +1,6 @@ -# -# Copyright 2011-2022 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + """ This module creates vdsm configuration from a default vdsm configuration file under /etc/vdsm/vdsm.conf. It reads conf files from drop-in dirs and updates diff --git a/lib/vdsm/common/constants.py.in b/lib/vdsm/common/constants.py.in index 0be97b69b0..040a20fa1e 100644 --- a/lib/vdsm/common/constants.py.in +++ b/lib/vdsm/common/constants.py.in @@ -1,22 +1,5 @@ -# -# Copyright 2009-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/lib/vdsm/common/dsaversion.py.in b/lib/vdsm/common/dsaversion.py.in index db7a3da529..d285195893 100644 --- a/lib/vdsm/common/dsaversion.py.in +++ b/lib/vdsm/common/dsaversion.py.in @@ -1,22 +1,6 @@ -# -# Copyright 2007-2020 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + """ This module provides DSA software versioning information for python based components diff --git a/lib/vdsm/storage/lvm.env.in b/lib/vdsm/storage/lvm.env.in index 25f73cb4df..99964a3480 100644 --- a/lib/vdsm/storage/lvm.env.in +++ b/lib/vdsm/storage/lvm.env.in @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + # # source this into your shell to gain vdsm's view of lvm. # diff --git a/lib/vdsm/storage/vdsm_lvm_rules.template.in b/lib/vdsm/storage/vdsm_lvm_rules.template.in index e6a21c34b8..9a751e00c7 100644 --- a/lib/vdsm/storage/vdsm_lvm_rules.template.in +++ b/lib/vdsm/storage/vdsm_lvm_rules.template.in @@ -1,11 +1,6 @@ -# -# Copyright 2010-2014 Red Hat, Inc. and/or its affiliates. -# -# Licensed to you under the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. See the files README and -# LICENSE_GPL_v2 which accompany this distribution. -# +# SPDX-FileCopyrightText: Red Hat, Inc. and/or its affiliates. +# SPDX-License-Identifier: GPL-2.0-or-later + """ Generate vdsm lvm udev rule """ @@ -26,14 +21,8 @@ def write(fmt): write("""\ -# -# Copyright 2010 Red Hat, Inc. and/or its affiliates. -# -# Licensed to you under the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. See the files README and -# LICENSE_GPL_v2 which accompany this distribution. -# +# SPDX-FileCopyrightText: Red Hat, Inc. and/or its affiliates. +# SPDX-License-Identifier: GPL-2.0-or-later # Vdsm udev rules for lvm diff --git a/lib/vdsmclient/__init__.py b/lib/vdsmclient/__init__.py index 4b567633f1..818de0abc7 100644 --- a/lib/vdsmclient/__init__.py +++ b/lib/vdsmclient/__init__.py @@ -1,22 +1,5 @@ -# -# Copyright 2016 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# +# SPDX-FileCopyrightText: Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later from __future__ import absolute_import from __future__ import division diff --git a/tests/storage/storage.py b/tests/storage/storage.py index b45305ee75..6970a32a66 100644 --- a/tests/storage/storage.py +++ b/tests/storage/storage.py @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + """ userstorage configuration """ diff --git a/vdsm.spec.in b/vdsm.spec.in index ec22abf1f9..a97e236f84 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Red Hat, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later + # Packages names %global vdsm_name vdsm