Date   

[meta-security][PATCH 5/7] sssd: update to latest ltm 1.16.5

Armin Kuster
 

fix musl support

Signed-off-by: Armin Kuster <akuster808@...>
---
...defines-which-otherwise-are-availabl.patch | 32 +++++++++++++++++++
.../sssd/{sssd_1.16.4.bb => sssd_1.16.5.bb} | 8 +++--
2 files changed, 37 insertions(+), 3 deletions(-)
create mode 100644 recipes-security/sssd/files/0002-Provide-missing-defines-which-otherwise-are-availabl.patch
rename recipes-security/sssd/{sssd_1.16.4.bb => sssd_1.16.5.bb} (94%)

diff --git a/recipes-security/sssd/files/0002-Provide-missing-defines-which-otherwise-are-availabl.patch b/recipes-security/sssd/files/0002-Provide-missing-defines-which-otherwise-are-availabl.patch
new file mode 100644
index 0000000..1a22332
--- /dev/null
+++ b/recipes-security/sssd/files/0002-Provide-missing-defines-which-otherwise-are-availabl.patch
@@ -0,0 +1,32 @@
+From 37a0999e5a9f54e1c61a02a7fbab6fcd04738b3c Mon Sep 17 00:00:00 2001
+From: Armin Kuster <akuster808@...>
+Date: Thu, 8 Oct 2020 05:54:13 -0700
+Subject: [PATCH] Provide missing defines which otherwise are available on
+ glibc system headers
+
+Signed-off-by: Armin Kuster <akuster808@...>
+
+Upsteam-Status: Pending
+
+---
+ src/util/util.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/util/util.h b/src/util/util.h
+index 8a754dbfd..6e55b4bdc 100644
+--- a/src/util/util.h
++++ b/src/util/util.h
+@@ -76,6 +76,10 @@
+ #define MAX(a, b) (((a) > (b)) ? (a) : (b))
+ #endif
+
++#ifndef ALLPERMS
++# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)/* 07777 */
++#endif
++
+ #define SSSD_MAIN_OPTS SSSD_DEBUG_OPTS
+
+ #define SSSD_SERVER_OPTS(uid, gid) \
+--
+2.17.1
+
diff --git a/recipes-security/sssd/sssd_1.16.4.bb b/recipes-security/sssd/sssd_1.16.5.bb
similarity index 94%
rename from recipes-security/sssd/sssd_1.16.4.bb
rename to recipes-security/sssd/sssd_1.16.5.bb
index e54fa98..9784ec7 100644
--- a/recipes-security/sssd/sssd_1.16.4.bb
+++ b/recipes-security/sssd/sssd_1.16.5.bb
@@ -6,7 +6,9 @@ LICENSE = "GPLv3+"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"

DEPENDS = "openldap cyrus-sasl libtdb ding-libs libpam c-ares krb5 autoconf-archive"
-DEPENDS += "libldb dbus libtalloc libpcre glib-2.0 popt e2fsprogs libtevent"
+DEPENDS_append = " libldb dbus libtalloc libpcre glib-2.0 popt e2fsprogs libtevent"
+
+DEPENDS_append_libc-musl = " musl-nscd"

# If no crypto has been selected, default to DEPEND on nss, since that's what
# sssd will pick if no active choice is made during configure
@@ -19,10 +21,10 @@ SRC_URI = "https://releases.pagure.org/SSSD/${BPN}/${BP}.tar.gz \
file://fix-ldblibdir.patch \
file://0001-build-Don-t-use-AC_CHECK_FILE-when-building-manpages.patch \
file://0001-nss-Collision-with-external-nss-symbol.patch \
+ file://0002-Provide-missing-defines-which-otherwise-are-availabl.patch \
"

-SRC_URI[md5sum] = "757bbb6f15409d8d075f4f06cb678d50"
-SRC_URI[sha256sum] = "6bb212cd6b75b918e945c24e7c3f95a486fb54d7f7d489a9334cfa1a1f3bf959"
+SRC_URI[sha256sum] = "2e1a7bf036b583f686d35164f2d79bdf4857b98f51fe8b0d17aa0fa756e4d0c0"

inherit autotools pkgconfig gettext python3-dir features_check systemd

--
2.17.1


[meta-security][PATCH 4/7] libest: fix musl build.

Armin Kuster
 

fixes
est.c:38:10: fatal error: execinfo.h: No such file or directory
| 38 | #include <execinfo.h>
| | ^~~~~~~~~~~~

Signed-off-by: Armin Kuster <akuster808@...>
---
recipes-security/libest/libest_3.2.0.bb | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/recipes-security/libest/libest_3.2.0.bb b/recipes-security/libest/libest_3.2.0.bb
index 36ff5ca..f993bd6 100644
--- a/recipes-security/libest/libest_3.2.0.bb
+++ b/recipes-security/libest/libest_3.2.0.bb
@@ -10,11 +10,15 @@ SRC_URI = "git://github.com/cisco/libest"

DEPENDS = "openssl"

+#fatal error: execinfo.h: No such file or directory
+DEPENDS_append_libc-musl = " libexecinfo"
+
inherit autotools-brokensep

EXTRA_OECONF = "--disable-pthreads --with-ssl-dir=${STAGING_LIBDIR}"

CFLAGS += "-fcommon"
+LDFLAGS_append_libc-musl = " -lexecinfo"

S = "${WORKDIR}/git"

--
2.17.1


[meta-security][PATCH 3/7] ecryptfs-utils: fix musl build

Armin Kuster
 

Signed-off-by: Armin Kuster <akuster808@...>
---
.../ecryptfs-utils/ecryptfs-utils_111.bb | 1 +
.../files/define_musl_sword_type.patch | 15 +++++++++++++++
2 files changed, 16 insertions(+)
create mode 100644 recipes-security/ecryptfs-utils/files/define_musl_sword_type.patch

diff --git a/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb b/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb
index d8cd06f..4a99b5a 100644
--- a/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb
+++ b/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb
@@ -16,6 +16,7 @@ SRC_URI = "\
file://ecryptfs-utils-CVE-2016-6224.patch \
file://0001-avoid-race-condition.patch \
file://ecryptfs.service \
+ file://define_musl_sword_type.patch \
"

SRC_URI[md5sum] = "83513228984f671930752c3518cac6fd"
diff --git a/recipes-security/ecryptfs-utils/files/define_musl_sword_type.patch b/recipes-security/ecryptfs-utils/files/define_musl_sword_type.patch
new file mode 100644
index 0000000..3b29be0
--- /dev/null
+++ b/recipes-security/ecryptfs-utils/files/define_musl_sword_type.patch
@@ -0,0 +1,15 @@
+Index: ecryptfs-utils-111/src/utils/mount.ecryptfs_private.c
+===================================================================
+--- ecryptfs-utils-111.orig/src/utils/mount.ecryptfs_private.c
++++ ecryptfs-utils-111/src/utils/mount.ecryptfs_private.c
+@@ -45,6 +45,10 @@
+ #include <values.h>
+ #include "../include/ecryptfs.h"
+
++#ifndef __SWORD_TYPE
++typedef __typeof__( ((struct statfs *)0)->f_type ) __SWORD_TYPE;
++#endif
++
+ /* Perhaps a future version of this program will allow these to be configurable
+ * by the system administrator (or user?) at run time. For now, these are set
+ * to reasonable values to reduce the burden of input validation.
--
2.17.1


[meta-security][PATCH 2/7] gitlab-ci: add qemux86 and qemuarm64 musl builds

Armin Kuster
 

Signed-off-by: Armin Kuster <akuster808@...>
---
.gitlab-ci.yml | 9 +++++++++
kas/qemuarm64-musl.yml | 10 ++++++++++
kas/qemux86-musl.yml | 10 ++++++++++
3 files changed, 29 insertions(+)
create mode 100644 kas/qemuarm64-musl.yml
create mode 100644 kas/qemux86-musl.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0be5741..50bfe4f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -126,6 +126,15 @@ qemux86-64-multi:
script:
- kas build --target security-build-image kas/$CI_JOB_NAME.yml

+qemux86-musl:
+ extends: .build
+ script:
+ - kas build --target security-build-image kas/$CI_JOB_NAME.yml
+
+qemuarm64-musl:
+ extends: .build
+ script:
+ - kas build --target security-build-image kas/$CI_JOB_NAME.yml

qemux86-test:
extends: .build
diff --git a/kas/qemuarm64-musl.yml b/kas/qemuarm64-musl.yml
new file mode 100644
index 0000000..b353eb4
--- /dev/null
+++ b/kas/qemuarm64-musl.yml
@@ -0,0 +1,10 @@
+header:
+ version: 8
+ includes:
+ - kas-security-base.yml
+
+local_conf_header:
+ musl: |
+ TCLIBC = "musl"
+
+machine: qemuarm64
diff --git a/kas/qemux86-musl.yml b/kas/qemux86-musl.yml
new file mode 100644
index 0000000..61d9572
--- /dev/null
+++ b/kas/qemux86-musl.yml
@@ -0,0 +1,10 @@
+header:
+ version: 8
+ includes:
+ - kas-security-base.yml
+
+local_conf_header:
+ musl: |
+ TCLIBC = "musl"
+
+machine: qemux86
--
2.17.1


[meta-security][PATCH 1/7] apparmor: fix build for on musl

Armin Kuster
 

Signed-off-by: Armin Kuster <akuster808@...>
---
recipes-mac/AppArmor/apparmor_3.0.bb | 11 +++++-
...-aa_status-Fix-build-issue-with-musl.patch | 31 ++++++++++++++++
...or-add-missing-include-for-socklen_t.patch | 36 ++++++++++++++++++
...dont-force-host-cpp-to-detect-reallo.patch | 37 +++++++++++++++++++
...aa_features_new_from_file-to-public-.patch | 37 +++++++++++++++++++
...-add-_aa_asprintf-to-private-symbols.patch | 34 +++++++++++++++++
6 files changed, 185 insertions(+), 1 deletion(-)
create mode 100644 recipes-mac/AppArmor/files/0001-aa_status-Fix-build-issue-with-musl.patch
create mode 100644 recipes-mac/AppArmor/files/0001-libapparmor-add-missing-include-for-socklen_t.patch
create mode 100644 recipes-mac/AppArmor/files/0001-parser-Makefile-dont-force-host-cpp-to-detect-reallo.patch
create mode 100644 recipes-mac/AppArmor/files/0002-libapparmor-add-aa_features_new_from_file-to-public-.patch
create mode 100644 recipes-mac/AppArmor/files/0003-libapparmor-add-_aa_asprintf-to-private-symbols.patch

diff --git a/recipes-mac/AppArmor/apparmor_3.0.bb b/recipes-mac/AppArmor/apparmor_3.0.bb
index 9c98199..35e95a0 100644
--- a/recipes-mac/AppArmor/apparmor_3.0.bb
+++ b/recipes-mac/AppArmor/apparmor_3.0.bb
@@ -25,6 +25,11 @@ SRC_URI = " \
file://run-ptest \
file://0001-apparmor-fix-manpage-order.patch \
file://0001-Revert-profiles-Update-make-check-to-select-tools-ba.patch \
+ file://0001-libapparmor-add-missing-include-for-socklen_t.patch \
+ file://0002-libapparmor-add-aa_features_new_from_file-to-public-.patch \
+ file://0003-libapparmor-add-_aa_asprintf-to-private-symbols.patch \
+ file://0001-aa_status-Fix-build-issue-with-musl.patch \
+ file://0001-parser-Makefile-dont-force-host-cpp-to-detect-reallo.patch \
"

SRCREV = "5d51483bfecf556183558644dc8958135397a7e2"
@@ -175,8 +180,12 @@ PACKAGES += "mod-${PN}"
FILES_${PN} += "/lib/apparmor/ /lib/security/ ${sysconfdir}/apparmor ${PYTHON_SITEPACKAGES_DIR}"
FILES_mod-${PN} = "${libdir}/apache2/modules/*"

+DEPENDS_append_libc-musl = " fts "
+RDEPENDS_${PN}_libc-musl += "musl-utils"
+RDEPENDS_${PN}_libc-glibc += "glibc-utils"
+
# Add coreutils and findutils only if sysvinit scripts are in use
-RDEPENDS_${PN} += "glibc-utils ${@["coreutils findutils", ""][(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'systemd')]} ${@bb.utils.contains('PACKAGECONFIG','python','python3-core python3-modules','', d)}"
+RDEPENDS_${PN} += "${@["coreutils findutils", ""][(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'systemd')]} ${@bb.utils.contains('PACKAGECONFIG','python','python3-core python3-modules','', d)}"
RDEPENDS_${PN}_remove += "${@bb.utils.contains('PACKAGECONFIG','perl','','perl', d)}"
RDEPENDS_${PN}-ptest += "perl coreutils dbus-lib bash"

diff --git a/recipes-mac/AppArmor/files/0001-aa_status-Fix-build-issue-with-musl.patch b/recipes-mac/AppArmor/files/0001-aa_status-Fix-build-issue-with-musl.patch
new file mode 100644
index 0000000..239562a
--- /dev/null
+++ b/recipes-mac/AppArmor/files/0001-aa_status-Fix-build-issue-with-musl.patch
@@ -0,0 +1,31 @@
+From 2bf15cc68f31c9f41962bb60a669ab2b453a039b Mon Sep 17 00:00:00 2001
+From: Armin Kuster <akuster808@...>
+Date: Wed, 7 Oct 2020 08:27:11 -0700
+Subject: [PATCH] aa_status: Fix build issue with musl
+
+add limits.h
+
+aa_status.c:269:22: error: 'PATH_MAX' undeclared (first use in this function); did you mean 'AF_MAX'?
+| 269 | real_exe = calloc(PATH_MAX + 1, sizeof(char));
+
+Upstream-Status: Pending
+Signed-off-by: Armin Kuster <akuster808@...>
+---
+ binutils/aa_status.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/binutils/aa_status.c b/binutils/aa_status.c
+index 78b03409..41f1954e 100644
+--- a/binutils/aa_status.c
++++ b/binutils/aa_status.c
+@@ -10,6 +10,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <limits.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/wait.h>
+--
+2.17.1
+
diff --git a/recipes-mac/AppArmor/files/0001-libapparmor-add-missing-include-for-socklen_t.patch b/recipes-mac/AppArmor/files/0001-libapparmor-add-missing-include-for-socklen_t.patch
new file mode 100644
index 0000000..2a56d8b
--- /dev/null
+++ b/recipes-mac/AppArmor/files/0001-libapparmor-add-missing-include-for-socklen_t.patch
@@ -0,0 +1,36 @@
+From 47263a3a74d7973e7a54b17db6aa903701468ffd Mon Sep 17 00:00:00 2001
+From: Patrick Steinhardt <ps@...>
+Date: Sat, 3 Oct 2020 20:37:55 +0200
+Subject: [PATCH] libapparmor: add missing include for `socklen_t`
+
+While `include/sys/apparmor.h` makes use of `socklen_t`, it doesn't
+include the `<sys/socket.h>` header to make its declaration available.
+While this works on systems using glibc via transitive includes, it
+breaks compilation on musl libc.
+
+Fix the issue by including the header.
+
+Signed-off-by: Patrick Steinhardt <ps@...>
+
+Upstream-Status: Backport
+Signed-off-by: Armin Kuster <akuster808@...>
+
+---
+ libraries/libapparmor/include/sys/apparmor.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libraries/libapparmor/include/sys/apparmor.h b/libraries/libapparmor/include/sys/apparmor.h
+index 32892d06..d70eff94 100644
+--- a/libraries/libapparmor/include/sys/apparmor.h
++++ b/libraries/libapparmor/include/sys/apparmor.h
+@@ -21,6 +21,7 @@
+ #include <stdbool.h>
+ #include <stdint.h>
+ #include <unistd.h>
++#include <sys/socket.h>
+ #include <sys/types.h>
+
+ #ifdef __cplusplus
+--
+2.17.1
+
diff --git a/recipes-mac/AppArmor/files/0001-parser-Makefile-dont-force-host-cpp-to-detect-reallo.patch b/recipes-mac/AppArmor/files/0001-parser-Makefile-dont-force-host-cpp-to-detect-reallo.patch
new file mode 100644
index 0000000..9f7ad3c
--- /dev/null
+++ b/recipes-mac/AppArmor/files/0001-parser-Makefile-dont-force-host-cpp-to-detect-reallo.patch
@@ -0,0 +1,37 @@
+From 965bb9c3e464f756b258a7c259a92bce3cde74e7 Mon Sep 17 00:00:00 2001
+From: Armin Kuster <akuster@...>
+Date: Wed, 7 Oct 2020 20:50:38 -0700
+Subject: [PATCH] parser/Makefile: dont force host cpp to detect reallocarray
+
+In cross build environments, using the hosts cpp gives incorrect
+detection of reallocarray. Change cpp to a variable.
+
+fixes:
+parser_misc.c: In function 'int capable_add_cap(const char*, int, unsigned int, capability_flags)':
+| parser_misc.c:297:37: error: 'reallocarray' was not declared in this scope
+| 297 | tmp = (struct capability_table *) reallocarray(cap_table, sizeof(struct capability_table), cap_table_size+1);
+
+Signed-off-by: Armin Kuster <akuster808@...>
+
+Upstream-Status: Pending
+
+---
+ parser/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/parser/Makefile b/parser/Makefile
+index acef3d77..8250ac45 100644
+--- a/parser/Makefile
++++ b/parser/Makefile
+@@ -54,7 +54,7 @@ endif
+ CPPFLAGS += -D_GNU_SOURCE
+
+ STDLIB_INCLUDE:="\#include <stdlib.h>"
+-HAVE_REALLOCARRAY:=$(shell echo $(STDLIB_INCLUDE) | cpp ${CPPFLAGS} | grep -q reallocarray && echo true)
++HAVE_REALLOCARRAY:=$(shell echo $(STDLIB_INCLUDE) | ${CPP} ${CPPFLAGS} | grep -q reallocarray && echo true)
+
+ WARNINGS = -Wall
+ CXX_WARNINGS = ${WARNINGS} ${EXTRA_WARNINGS}
+--
+2.17.1
+
diff --git a/recipes-mac/AppArmor/files/0002-libapparmor-add-aa_features_new_from_file-to-public-.patch b/recipes-mac/AppArmor/files/0002-libapparmor-add-aa_features_new_from_file-to-public-.patch
new file mode 100644
index 0000000..333f40f
--- /dev/null
+++ b/recipes-mac/AppArmor/files/0002-libapparmor-add-aa_features_new_from_file-to-public-.patch
@@ -0,0 +1,37 @@
+From c9255a03436e6a91bd4e410601da8d43a341ffc2 Mon Sep 17 00:00:00 2001
+From: Patrick Steinhardt <ps@...>
+Date: Sat, 3 Oct 2020 20:58:45 +0200
+Subject: [PATCH] libapparmor: add `aa_features_new_from_file` to public
+ symbols
+
+With AppArmor release 3.0, a new function `aa_features_new_from_file`
+was added, but not added to the list of public symbols. As a result,
+it's not possible to make use of this function when linking against
+libapparmor.so.
+
+Fix the issue by adding it to the symbol map.
+
+Signed-off-by: Patrick Steinhardt <ps@...>
+
+Upstream-Status: Backport
+Signed-off-by: Armin Kuster <akuster808@...>
+
+---
+ libraries/libapparmor/src/libapparmor.map | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libraries/libapparmor/src/libapparmor.map b/libraries/libapparmor/src/libapparmor.map
+index bbff51f5..1579509a 100644
+--- a/libraries/libapparmor/src/libapparmor.map
++++ b/libraries/libapparmor/src/libapparmor.map
+@@ -117,6 +117,7 @@ APPARMOR_2.13.1 {
+
+ APPARMOR_3.0 {
+ global:
++ aa_features_new_from_file;
+ aa_features_write_to_fd;
+ aa_features_value;
+ local:
+--
+2.17.1
+
diff --git a/recipes-mac/AppArmor/files/0003-libapparmor-add-_aa_asprintf-to-private-symbols.patch b/recipes-mac/AppArmor/files/0003-libapparmor-add-_aa_asprintf-to-private-symbols.patch
new file mode 100644
index 0000000..543c7a1
--- /dev/null
+++ b/recipes-mac/AppArmor/files/0003-libapparmor-add-_aa_asprintf-to-private-symbols.patch
@@ -0,0 +1,34 @@
+From 9a8fee6bf1c79c261374d928b838b5eb9244ee9b Mon Sep 17 00:00:00 2001
+From: Patrick Steinhardt <ps@...>
+Date: Sat, 3 Oct 2020 21:04:57 +0200
+Subject: [PATCH] libapparmor: add _aa_asprintf to private symbols
+
+While `_aa_asprintf` is supposed to be of private visibility, it's used
+by apparmor_parser and thus required to be visible when linking. This
+commit thus adds it to the list of private symbols to make it available
+for linking in apparmor_parser.
+
+Signed-off-by: Patrick Steinhardt <ps@...>
+
+Upstream-Status: Backport
+Signed-off-by: Armin Kuster <akuster808@...>
+
+---
+ libraries/libapparmor/src/libapparmor.map | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libraries/libapparmor/src/libapparmor.map b/libraries/libapparmor/src/libapparmor.map
+index 1579509a..41e541ac 100644
+--- a/libraries/libapparmor/src/libapparmor.map
++++ b/libraries/libapparmor/src/libapparmor.map
+@@ -127,6 +127,7 @@ APPARMOR_3.0 {
+ PRIVATE {
+ global:
+ _aa_is_blacklisted;
++ _aa_asprintf;
+ _aa_autofree;
+ _aa_autoclose;
+ _aa_autofclose;
+--
+2.17.1
+
--
2.17.1


Re: [layerindex-web][PATCH] Add SPDX license headers to layerindex-web source files

 

On Fri, 9 Oct 2020 at 05:04, Meh Mbeh Ida Delphine <idadelm@...> wrote:

Added SPDX identifiers to all .py files except those in migrations directory.

Fixes: [YOCTO #13527]

Signed-off-by: Meh Mbeh Ida Delphine <idadelm@...>
---
__init__.py | 1 +
docker/settings.py | 2 ++
dockersetup.py | 2 ++
layerindex/__init__.py | 5 +++++
layerindex/admin.py | 2 ++
layerindex/auth_forms.py | 2 ++
layerindex/auth_views.py | 2 ++
layerindex/bulkchange.py | 2 ++
layerindex/context_processors.py | 2 ++
layerindex/forms.py | 2 ++
layerindex/layerconfparse.py | 1 +
layerindex/middleware.py | 2 ++
layerindex/models.py | 2 ++
layerindex/querysethelper.py | 8 ++++++++
layerindex/recipedesc.py | 2 ++
layerindex/recipeparse.py | 2 ++
layerindex/restperm.py | 6 ++++++
layerindex/restviews.py | 2 ++
layerindex/securityquestions.py | 8 ++++++++
layerindex/tasks.py | 2 ++
layerindex/templatetags/__init__.py | 5 +++++
layerindex/templatetags/extrafilters.py | 6 ++++++
layerindex/tools/fedora-fetch.py | 2 ++
layerindex/tools/fixup_duplicates.py | 2 ++
layerindex/tools/github-fetch.py | 2 ++
layerindex/tools/import_classic.py | 2 ++
layerindex/tools/import_classic_wiki.py | 2 ++
layerindex/tools/import_layer.py | 2 ++
layerindex/tools/import_layers.py | 2 ++
layerindex/tools/import_otherdistro.py | 2 ++
layerindex/tools/import_project.py | 2 ++
layerindex/tools/import_wiki_layers.py | 2 ++
layerindex/tools/site_name.py | 2 ++
layerindex/tools/update_classic_status.py | 2 ++
layerindex/tools/webapi-test.py | 2 ++
layerindex/update.py | 2 ++
layerindex/update_layer.py | 2 ++
layerindex/urls.py | 2 ++
layerindex/urls_branch.py | 2 ++
layerindex/utils.py | 2 ++
layerindex/views.py | 2 ++
manage.py | 2 ++
password_validation.py | 5 +++++
pytest.ini | 5 +++++
rrs/__init__.py | 5 +++++
rrs/admin.py | 2 ++
rrs/apps.py | 6 ++++++
rrs/context_processors.py | 2 ++
rrs/models.py | 2 ++
rrs/tools/common.py | 2 ++
rrs/tools/dump_upgrades.py | 2 ++
rrs/tools/historytool.py | 2 ++
rrs/tools/rrs_distros.py | 2 ++
rrs/tools/rrs_maintainer_history.py | 2 ++
rrs/tools/rrs_upgrade_history.py | 2 ++
rrs/tools/rrs_upstream_email.py | 2 ++
rrs/tools/rrs_upstream_history.py | 2 ++
rrs/tools/upgrade_history_internal.py | 2 ++
rrs/urls.py | 8 ++++++++
rrs/views.py | 8 ++++++++
rrs/wsgi.py | 6 ++++++
settings.py | 2 ++
tests/test_update.py | 2 ++
urls.py | 2 ++
wsgi.py | 5 +++++
65 files changed, 186 insertions(+)

diff --git a/__init__.py b/__init__.py
index e69de29..d589fc3 100644
--- a/__init__.py
+++ b/__init__.py
@@ -0,0 +1 @@
+# SPDX-License-Identifier: MIT
\ No newline at end of file
diff --git a/docker/settings.py b/docker/settings.py
index fb7d376..7330ab9 100644
--- a/docker/settings.py
+++ b/docker/settings.py
@@ -2,6 +2,8 @@
#
# Based on settings.py from the Django project template
# Copyright (c) Django Software Foundation and individual contributors.
+#
+# SPDX-License-Identifier: MIT

import os

diff --git a/dockersetup.py b/dockersetup.py
index 3cc8b2d..e45a846 100755
--- a/dockersetup.py
+++ b/dockersetup.py
@@ -6,6 +6,8 @@
# Author: Amber Elliot <amber.n.elliot@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

# This script will make a cluster of 5 containers:
#
diff --git a/layerindex/__init__.py b/layerindex/__init__.py
index e69de29..83d0f2f 100644
--- a/layerindex/__init__.py
+++ b/layerindex/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2014 Intel Corporation
+#
+# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT
\ No newline at end of file
It looks like your editor is not adding a final newline in some of
these files. Most editors should have a setting to ensure a final
newline is included in each file, if you can't find this you can also
manually add a final newline where needed.

diff --git a/layerindex/admin.py b/layerindex/admin.py
index 9ef781d..9ed6102 100644
--- a/layerindex/admin.py
+++ b/layerindex/admin.py
@@ -3,6 +3,8 @@
# Copyright (C) 2013 Intel Corporation
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

from layerindex.models import *
from django.contrib import admin
diff --git a/layerindex/auth_forms.py b/layerindex/auth_forms.py
index fc3d2d1..7af48f9 100644
--- a/layerindex/auth_forms.py
+++ b/layerindex/auth_forms.py
@@ -3,6 +3,8 @@
# Copyright (C) 2018 Intel Corporation
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

from captcha.fields import CaptchaField
from django import forms
diff --git a/layerindex/auth_views.py b/layerindex/auth_views.py
index 152f171..08e0334 100644
--- a/layerindex/auth_views.py
+++ b/layerindex/auth_views.py
@@ -3,6 +3,8 @@
# Copyright (C) 2018 Intel Corporation
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

from django.contrib import messages
from django.contrib.auth import logout
diff --git a/layerindex/bulkchange.py b/layerindex/bulkchange.py
index 3d1ee2b..6382053 100644
--- a/layerindex/bulkchange.py
+++ b/layerindex/bulkchange.py
@@ -5,6 +5,8 @@
# Copyright (C) 2013, 2016, 2018 Intel Corporation
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

import sys
import os
diff --git a/layerindex/context_processors.py b/layerindex/context_processors.py
index 3352e63..2cc0380 100644
--- a/layerindex/context_processors.py
+++ b/layerindex/context_processors.py
@@ -3,6 +3,8 @@
# Copyright (C) 2013, 2018 Intel Corporation
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

from layerindex.models import Branch, LayerItem, SiteNotice
from django.contrib.sites.models import Site
diff --git a/layerindex/forms.py b/layerindex/forms.py
index 4061d4b..9615859 100644
--- a/layerindex/forms.py
+++ b/layerindex/forms.py
@@ -3,6 +3,8 @@
# Copyright (C) 2013, 2016-2019 Intel Corporation
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

import re
from collections import OrderedDict
diff --git a/layerindex/layerconfparse.py b/layerindex/layerconfparse.py
index a812140..84ec005 100644
--- a/layerindex/layerconfparse.py
+++ b/layerindex/layerconfparse.py
@@ -5,6 +5,7 @@
#
# Licensed under the MIT license, see COPYING.MIT for details
#
+# SPDX-License-Identifier: MIT

import sys
import os
diff --git a/layerindex/middleware.py b/layerindex/middleware.py
index afe34a3..527cc8b 100644
--- a/layerindex/middleware.py
+++ b/layerindex/middleware.py
@@ -3,6 +3,8 @@
# Copyright (C) 2019 Intel Corporation
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

from django.utils.deprecation import MiddlewareMixin
from django.http import HttpResponseRedirect
diff --git a/layerindex/models.py b/layerindex/models.py
index 99c68e1..329cc33 100644
--- a/layerindex/models.py
+++ b/layerindex/models.py
@@ -3,6 +3,8 @@
# Copyright (C) 2013-2018 Intel Corporation
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

from django.db import models
from datetime import datetime
diff --git a/layerindex/querysethelper.py b/layerindex/querysethelper.py
index 5a856ee..fb26a17 100644
--- a/layerindex/querysethelper.py
+++ b/layerindex/querysethelper.py
@@ -1,3 +1,11 @@
+# layerindex-web - queryset helper definitions
+#
+# Copyright (C) 2013-2018 Intel Corporation
+#
+# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT
+
import operator
import functools
from django.db.models import Q, CharField
diff --git a/layerindex/recipedesc.py b/layerindex/recipedesc.py
index 26280ee..be47f6e 100644
--- a/layerindex/recipedesc.py
+++ b/layerindex/recipedesc.py
@@ -4,6 +4,8 @@
#
# Copyright (C) 2012 Intel Corporation
# Author: Paul Eggleton <paul.eggleton@...>
+#
+# SPDX-License-Identifier: MIT

import sys
import os.path
diff --git a/layerindex/recipeparse.py b/layerindex/recipeparse.py
index 35867ad..62c08e9 100644
--- a/layerindex/recipeparse.py
+++ b/layerindex/recipeparse.py
@@ -4,6 +4,8 @@
# Author: Paul Eggleton <paul.eggleton@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

import sys
import os
diff --git a/layerindex/restperm.py b/layerindex/restperm.py
index fb9f715..5d74c66 100644
--- a/layerindex/restperm.py
+++ b/layerindex/restperm.py
@@ -1,3 +1,9 @@
+# Copyright (C) 2013-2018 Intel Corporation
+#
+# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT
+
from rest_framework import permissions

class ReadOnlyPermission(permissions.BasePermission):
diff --git a/layerindex/restviews.py b/layerindex/restviews.py
index 7de4cd7..91779f5 100644
--- a/layerindex/restviews.py
+++ b/layerindex/restviews.py
@@ -3,6 +3,8 @@
# Copyright (C) 2014, 2016-2019 Intel Corporation
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

from layerindex.models import Branch, LayerItem, LayerMaintainer, YPCompatibleVersion, LayerNote, LayerBranch, LayerDependency, Recipe, Machine, Distro, BBClass, Source, Patch, PackageConfig, StaticBuildDep, DynamicBuildDep, RecipeFileDependency, BBAppend, IncFile
from rest_framework import viewsets, serializers, pagination
diff --git a/layerindex/securityquestions.py b/layerindex/securityquestions.py
index a6a0e1c..1883b11 100644
--- a/layerindex/securityquestions.py
+++ b/layerindex/securityquestions.py
@@ -1,3 +1,11 @@
+# layerindex-web - Security Questions
+#
+# Copyright (C) 2013-2018 Intel Corporation
+#
+# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT
+
security_questions = ["What was the name of your first pet?",
"What was the last name of your third grade teacher?",
"What is your favorite pizza topping?",
diff --git a/layerindex/tasks.py b/layerindex/tasks.py
index ae62b91..da85539 100644
--- a/layerindex/tasks.py
+++ b/layerindex/tasks.py
@@ -4,6 +4,8 @@
# Author: Paul Eggleton <paul.eggleton@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

from celery import Celery
from django.core.mail import EmailMessage
diff --git a/layerindex/templatetags/__init__.py b/layerindex/templatetags/__init__.py
index e69de29..c88e412 100644
--- a/layerindex/templatetags/__init__.py
+++ b/layerindex/templatetags/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2017, 2018 Intel Corporation
+#
+# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT
\ No newline at end of file
diff --git a/layerindex/templatetags/extrafilters.py b/layerindex/templatetags/extrafilters.py
index d79f9a1..2a9e764 100644
--- a/layerindex/templatetags/extrafilters.py
+++ b/layerindex/templatetags/extrafilters.py
@@ -1,3 +1,9 @@
+# Copyright (C) 2017, 2018 Intel Corporation
+#
+# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT
+
from django import template
from .. import utils

diff --git a/layerindex/tools/fedora-fetch.py b/layerindex/tools/fedora-fetch.py
index 492082a..a16fc80 100755
--- a/layerindex/tools/fedora-fetch.py
+++ b/layerindex/tools/fedora-fetch.py
@@ -5,6 +5,8 @@
# Copyright (C) 2017, 2018 Intel Corporation
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

import sys
import os
diff --git a/layerindex/tools/fixup_duplicates.py b/layerindex/tools/fixup_duplicates.py
index 5abe2c2..6c60959 100644
--- a/layerindex/tools/fixup_duplicates.py
+++ b/layerindex/tools/fixup_duplicates.py
@@ -6,6 +6,8 @@
# Author: Paul Eggleton <paul.eggleton@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT


import sys
diff --git a/layerindex/tools/github-fetch.py b/layerindex/tools/github-fetch.py
index 11c977a..0dbe509 100755
--- a/layerindex/tools/github-fetch.py
+++ b/layerindex/tools/github-fetch.py
@@ -5,6 +5,8 @@
# Copyright (C) 2017 Intel Corporation
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

import sys
import os
diff --git a/layerindex/tools/import_classic.py b/layerindex/tools/import_classic.py
index fca054c..0216221 100755
--- a/layerindex/tools/import_classic.py
+++ b/layerindex/tools/import_classic.py
@@ -6,6 +6,8 @@
# Author: Paul Eggleton <paul.eggleton@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT


import sys
diff --git a/layerindex/tools/import_classic_wiki.py b/layerindex/tools/import_classic_wiki.py
index bfebcd9..aa33b7a 100755
--- a/layerindex/tools/import_classic_wiki.py
+++ b/layerindex/tools/import_classic_wiki.py
@@ -7,6 +7,8 @@
# Author: Paul Eggleton <paul.eggleton@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

import sys
import os.path
diff --git a/layerindex/tools/import_layer.py b/layerindex/tools/import_layer.py
index ace58e5..dfe887c 100755
--- a/layerindex/tools/import_layer.py
+++ b/layerindex/tools/import_layer.py
@@ -6,6 +6,8 @@
# Author: Paul Eggleton <paul.eggleton@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT


import sys
diff --git a/layerindex/tools/import_layers.py b/layerindex/tools/import_layers.py
index 3548568..57b0f86 100755
--- a/layerindex/tools/import_layers.py
+++ b/layerindex/tools/import_layers.py
@@ -6,6 +6,8 @@
# Author: Paul Eggleton <paul.eggleton@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT


import sys
diff --git a/layerindex/tools/import_otherdistro.py b/layerindex/tools/import_otherdistro.py
index 46eeeca..0c6640f 100755
--- a/layerindex/tools/import_otherdistro.py
+++ b/layerindex/tools/import_otherdistro.py
@@ -6,6 +6,8 @@
# Author: Paul Eggleton <paul.eggleton@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT


import sys
diff --git a/layerindex/tools/import_project.py b/layerindex/tools/import_project.py
index 27a0de3..44cf6cc 100755
--- a/layerindex/tools/import_project.py
+++ b/layerindex/tools/import_project.py
@@ -9,6 +9,8 @@
# Author: Liam R. Howlett <liam.howlett@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

from urllib.parse import urlparse
import logging
diff --git a/layerindex/tools/import_wiki_layers.py b/layerindex/tools/import_wiki_layers.py
index 71f26ea..707d90e 100755
--- a/layerindex/tools/import_wiki_layers.py
+++ b/layerindex/tools/import_wiki_layers.py
@@ -6,6 +6,8 @@
# Author: Paul Eggleton <paul.eggleton@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT


import sys
diff --git a/layerindex/tools/site_name.py b/layerindex/tools/site_name.py
index 836a0c1..e1cff02 100755
--- a/layerindex/tools/site_name.py
+++ b/layerindex/tools/site_name.py
@@ -6,6 +6,8 @@
# Author: Paul Eggleton <paul.eggleton@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

import sys
import os
diff --git a/layerindex/tools/update_classic_status.py b/layerindex/tools/update_classic_status.py
index 4edfc75..0bcf2e7 100755
--- a/layerindex/tools/update_classic_status.py
+++ b/layerindex/tools/update_classic_status.py
@@ -6,6 +6,8 @@
# Author: Paul Eggleton <paul.eggleton@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

import sys
import os
diff --git a/layerindex/tools/webapi-test.py b/layerindex/tools/webapi-test.py
index 20fc36b..562fbe2 100755
--- a/layerindex/tools/webapi-test.py
+++ b/layerindex/tools/webapi-test.py
@@ -5,6 +5,8 @@
# Copyright (C) 2019 Intel Corporation
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

import sys
import os
diff --git a/layerindex/update.py b/layerindex/update.py
index e2aa96e..5a2642b 100755
--- a/layerindex/update.py
+++ b/layerindex/update.py
@@ -6,6 +6,8 @@
# Author: Paul Eggleton <paul.eggleton@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT


import sys
diff --git a/layerindex/update_layer.py b/layerindex/update_layer.py
index 1e5950c..42f99be 100644
--- a/layerindex/update_layer.py
+++ b/layerindex/update_layer.py
@@ -6,6 +6,8 @@
# Author: Paul Eggleton <paul.eggleton@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT


import sys
diff --git a/layerindex/urls.py b/layerindex/urls.py
index ab2d028..7264b11 100644
--- a/layerindex/urls.py
+++ b/layerindex/urls.py
@@ -3,6 +3,8 @@
# Copyright (C) 2013, 2018 Intel Corporation
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

from django.conf.urls import *
from django.views.generic import TemplateView, DetailView, ListView, RedirectView
diff --git a/layerindex/urls_branch.py b/layerindex/urls_branch.py
index 9756f90..86b8b77 100644
--- a/layerindex/urls_branch.py
+++ b/layerindex/urls_branch.py
@@ -3,6 +3,8 @@
# Copyright (C) 2013-2016 Intel Corporation
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

from django.conf.urls import *
from django.views.defaults import page_not_found
diff --git a/layerindex/utils.py b/layerindex/utils.py
index 2a1689b..9e28668 100644
--- a/layerindex/utils.py
+++ b/layerindex/utils.py
@@ -4,6 +4,8 @@
# Author: Paul Eggleton <paul.eggleton@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

import sys
import os
diff --git a/layerindex/views.py b/layerindex/views.py
index 83adb6a..91b3280 100644
--- a/layerindex/views.py
+++ b/layerindex/views.py
@@ -3,6 +3,8 @@
# Copyright (C) 2013-2018 Intel Corporation
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

import os
import sys
diff --git a/manage.py b/manage.py
index a815fa3..0c073ac 100755
--- a/manage.py
+++ b/manage.py
@@ -6,6 +6,8 @@
#
# Copyright (c) Django Software Foundation and individual contributors.
# All rights reserved.
+#
+# SPDX-License-Identifier: MIT

import os
import sys
diff --git a/password_validation.py b/password_validation.py
index 8669250..8c2fbbe 100644
--- a/password_validation.py
+++ b/password_validation.py
@@ -1,3 +1,8 @@
+# Copyright (c) Django Software Foundation and individual contributors.
+# All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+
from django.core.exceptions import ValidationError
from django.utils.translation import ugettext as _

diff --git a/pytest.ini b/pytest.ini
index c067b05..a8d7834 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,3 +1,8 @@
+# Copyright (c) Django Software Foundation and individual contributors.
+# All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+
[pytest]
DJANGO_SETTINGS_MODULE = settings
norecursedirs = .git layers
diff --git a/rrs/__init__.py b/rrs/__init__.py
index 3eab2fe..e2e9143 100644
--- a/rrs/__init__.py
+++ b/rrs/__init__.py
@@ -1,2 +1,7 @@
+# Copyright (C) 2014 Intel Corporation
+#
+# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

default_app_config = 'rrs.apps.RecipeReportingSystemConfig'
diff --git a/rrs/admin.py b/rrs/admin.py
index a4712f2..402279f 100644
--- a/rrs/admin.py
+++ b/rrs/admin.py
@@ -3,6 +3,8 @@
# Copyright (C) 2014 Intel Corporation
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

from django.utils.functional import curry

diff --git a/rrs/apps.py b/rrs/apps.py
index ea25060..1230718 100644
--- a/rrs/apps.py
+++ b/rrs/apps.py
@@ -1,3 +1,9 @@
+# Copyright (C) 2014 Intel Corporation
+#
+# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT
+
from django.apps import AppConfig


diff --git a/rrs/context_processors.py b/rrs/context_processors.py
index 0d79bd1..52e2c30 100644
--- a/rrs/context_processors.py
+++ b/rrs/context_processors.py
@@ -3,6 +3,8 @@
# Copyright (C) 2014 Intel Corporation
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

import settings
from django.contrib.sites.models import Site
diff --git a/rrs/models.py b/rrs/models.py
index ba7e63c..f1bb527 100644
--- a/rrs/models.py
+++ b/rrs/models.py
@@ -3,6 +3,8 @@
# Copyright (C) 2014 Intel Corporation
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

import sys
import os
diff --git a/rrs/tools/common.py b/rrs/tools/common.py
index 6149792..1ce5dd5 100644
--- a/rrs/tools/common.py
+++ b/rrs/tools/common.py
@@ -4,6 +4,8 @@
# Author: Anibal Limon <anibal.limon@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

import sys
import os
diff --git a/rrs/tools/dump_upgrades.py b/rrs/tools/dump_upgrades.py
index 011b91e..982f5a3 100755
--- a/rrs/tools/dump_upgrades.py
+++ b/rrs/tools/dump_upgrades.py
@@ -5,6 +5,8 @@
# Author: Paul Eggleton <paul.eggleton@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT


import sys
diff --git a/rrs/tools/historytool.py b/rrs/tools/historytool.py
index 06456d1..9f03ade 100755
--- a/rrs/tools/historytool.py
+++ b/rrs/tools/historytool.py
@@ -6,6 +6,8 @@
# Author: Paul Eggleton <paul.eggleton@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT


import sys
diff --git a/rrs/tools/rrs_distros.py b/rrs/tools/rrs_distros.py
index e803328..e4c6045 100755
--- a/rrs/tools/rrs_distros.py
+++ b/rrs/tools/rrs_distros.py
@@ -6,6 +6,8 @@
# Author: Anibal Limon <anibal.limon@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

import sys
import os.path
diff --git a/rrs/tools/rrs_maintainer_history.py b/rrs/tools/rrs_maintainer_history.py
index b5cc510..15e1d17 100755
--- a/rrs/tools/rrs_maintainer_history.py
+++ b/rrs/tools/rrs_maintainer_history.py
@@ -6,6 +6,8 @@
# Author: Anibal Limon <anibal.limon@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

import sys
import os.path
diff --git a/rrs/tools/rrs_upgrade_history.py b/rrs/tools/rrs_upgrade_history.py
index 5070cc2..9b74a05 100755
--- a/rrs/tools/rrs_upgrade_history.py
+++ b/rrs/tools/rrs_upgrade_history.py
@@ -9,6 +9,8 @@
# Paul Eggleton <paul.eggleton@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

import sys
import os.path
diff --git a/rrs/tools/rrs_upstream_email.py b/rrs/tools/rrs_upstream_email.py
index 0c3dbe2..8a6b188 100755
--- a/rrs/tools/rrs_upstream_email.py
+++ b/rrs/tools/rrs_upstream_email.py
@@ -7,6 +7,8 @@
# Author: Aníbal Limón <anibal.limon@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

import sys
import os.path
diff --git a/rrs/tools/rrs_upstream_history.py b/rrs/tools/rrs_upstream_history.py
index 4451c15..7dbf64c 100755
--- a/rrs/tools/rrs_upstream_history.py
+++ b/rrs/tools/rrs_upstream_history.py
@@ -6,6 +6,8 @@
# Author: Anibal Limon <anibal.limon@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

import sys
import os.path
diff --git a/rrs/tools/upgrade_history_internal.py b/rrs/tools/upgrade_history_internal.py
index f48ea71..e3a96d9 100644
--- a/rrs/tools/upgrade_history_internal.py
+++ b/rrs/tools/upgrade_history_internal.py
@@ -7,6 +7,8 @@
# Paul Eggleton <paul.eggleton@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT


import sys
diff --git a/rrs/urls.py b/rrs/urls.py
index 30d86b7..63426a9 100644
--- a/rrs/urls.py
+++ b/rrs/urls.py
@@ -1,3 +1,11 @@
+# rrs-web - URLS
+#
+# Copyright (C) 2014 Intel Corporation
+#
+# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT
+
from django.conf.urls import include, url

from rrs.models import Release, Milestone
diff --git a/rrs/views.py b/rrs/views.py
index 9c36a48..68fc4f9 100644
--- a/rrs/views.py
+++ b/rrs/views.py
@@ -1,3 +1,11 @@
+# rrs-web - views
+#
+# Copyright (C) 2014 Intel Corporation
+#
+# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT
+
import urllib

import csv
diff --git a/rrs/wsgi.py b/rrs/wsgi.py
index 1d7e7b7..c25232e 100644
--- a/rrs/wsgi.py
+++ b/rrs/wsgi.py
@@ -1,3 +1,9 @@
+# Copyright (C) 2014 Intel Corporation
+#
+# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT
+
import os

os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
diff --git a/settings.py b/settings.py
index 525a0c1..1dd6ebc 100644
--- a/settings.py
+++ b/settings.py
@@ -2,6 +2,8 @@
#
# Based on settings.py from the Django project template
# Copyright (c) Django Software Foundation and individual contributors.
+#
+# SPDX-License-Identifier: MIT

import os

diff --git a/tests/test_update.py b/tests/test_update.py
index e00775d..588b2ed 100644
--- a/tests/test_update.py
+++ b/tests/test_update.py
@@ -3,6 +3,8 @@
# Copyright (C) 2018 Intel Corporation
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

# NOTE: requires pytest-django. Run using "pytest" from the root
# of the repository (add -s to avoid suppressing the output of commands
diff --git a/urls.py b/urls.py
index 67d64b2..76f2f73 100644
--- a/urls.py
+++ b/urls.py
@@ -4,6 +4,8 @@
#
# Copyright (c) Django Software Foundation and individual contributors.
# All rights reserved.
+#
+# SPDX-License-Identifier: MIT

from django.conf.urls import include, url
from django.urls import reverse_lazy
diff --git a/wsgi.py b/wsgi.py
index 99f0915..b0d82ac 100644
--- a/wsgi.py
+++ b/wsgi.py
@@ -1,3 +1,8 @@
+# Copyright (c) Django Software Foundation and individual contributors.
+# All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+
import os, sys
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
sys.path.append('/var/www/html/layerindex')
--
2.17.1




--
Paul Barker
Konsulko Group


[layerindex-web][PATCH] Add SPDX license headers to layerindex-web source files

Meh Mbeh Ida Delphine <idadelm@...>
 

Added SPDX identifiers to all .py files except those in migrations directory.

Fixes: [YOCTO #13527]

Signed-off-by: Meh Mbeh Ida Delphine <idadelm@...>
---
__init__.py | 1 +
docker/settings.py | 2 ++
dockersetup.py | 2 ++
layerindex/__init__.py | 5 +++++
layerindex/admin.py | 2 ++
layerindex/auth_forms.py | 2 ++
layerindex/auth_views.py | 2 ++
layerindex/bulkchange.py | 2 ++
layerindex/context_processors.py | 2 ++
layerindex/forms.py | 2 ++
layerindex/layerconfparse.py | 1 +
layerindex/middleware.py | 2 ++
layerindex/models.py | 2 ++
layerindex/querysethelper.py | 8 ++++++++
layerindex/recipedesc.py | 2 ++
layerindex/recipeparse.py | 2 ++
layerindex/restperm.py | 6 ++++++
layerindex/restviews.py | 2 ++
layerindex/securityquestions.py | 8 ++++++++
layerindex/tasks.py | 2 ++
layerindex/templatetags/__init__.py | 5 +++++
layerindex/templatetags/extrafilters.py | 6 ++++++
layerindex/tools/fedora-fetch.py | 2 ++
layerindex/tools/fixup_duplicates.py | 2 ++
layerindex/tools/github-fetch.py | 2 ++
layerindex/tools/import_classic.py | 2 ++
layerindex/tools/import_classic_wiki.py | 2 ++
layerindex/tools/import_layer.py | 2 ++
layerindex/tools/import_layers.py | 2 ++
layerindex/tools/import_otherdistro.py | 2 ++
layerindex/tools/import_project.py | 2 ++
layerindex/tools/import_wiki_layers.py | 2 ++
layerindex/tools/site_name.py | 2 ++
layerindex/tools/update_classic_status.py | 2 ++
layerindex/tools/webapi-test.py | 2 ++
layerindex/update.py | 2 ++
layerindex/update_layer.py | 2 ++
layerindex/urls.py | 2 ++
layerindex/urls_branch.py | 2 ++
layerindex/utils.py | 2 ++
layerindex/views.py | 2 ++
manage.py | 2 ++
password_validation.py | 5 +++++
pytest.ini | 5 +++++
rrs/__init__.py | 5 +++++
rrs/admin.py | 2 ++
rrs/apps.py | 6 ++++++
rrs/context_processors.py | 2 ++
rrs/models.py | 2 ++
rrs/tools/common.py | 2 ++
rrs/tools/dump_upgrades.py | 2 ++
rrs/tools/historytool.py | 2 ++
rrs/tools/rrs_distros.py | 2 ++
rrs/tools/rrs_maintainer_history.py | 2 ++
rrs/tools/rrs_upgrade_history.py | 2 ++
rrs/tools/rrs_upstream_email.py | 2 ++
rrs/tools/rrs_upstream_history.py | 2 ++
rrs/tools/upgrade_history_internal.py | 2 ++
rrs/urls.py | 8 ++++++++
rrs/views.py | 8 ++++++++
rrs/wsgi.py | 6 ++++++
settings.py | 2 ++
tests/test_update.py | 2 ++
urls.py | 2 ++
wsgi.py | 5 +++++
65 files changed, 186 insertions(+)

diff --git a/__init__.py b/__init__.py
index e69de29..d589fc3 100644
--- a/__init__.py
+++ b/__init__.py
@@ -0,0 +1 @@
+# SPDX-License-Identifier: MIT
\ No newline at end of file
diff --git a/docker/settings.py b/docker/settings.py
index fb7d376..7330ab9 100644
--- a/docker/settings.py
+++ b/docker/settings.py
@@ -2,6 +2,8 @@
#
# Based on settings.py from the Django project template
# Copyright (c) Django Software Foundation and individual contributors.
+#
+# SPDX-License-Identifier: MIT

import os

diff --git a/dockersetup.py b/dockersetup.py
index 3cc8b2d..e45a846 100755
--- a/dockersetup.py
+++ b/dockersetup.py
@@ -6,6 +6,8 @@
# Author: Amber Elliot <amber.n.elliot@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

# This script will make a cluster of 5 containers:
#
diff --git a/layerindex/__init__.py b/layerindex/__init__.py
index e69de29..83d0f2f 100644
--- a/layerindex/__init__.py
+++ b/layerindex/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2014 Intel Corporation
+#
+# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT
\ No newline at end of file
diff --git a/layerindex/admin.py b/layerindex/admin.py
index 9ef781d..9ed6102 100644
--- a/layerindex/admin.py
+++ b/layerindex/admin.py
@@ -3,6 +3,8 @@
# Copyright (C) 2013 Intel Corporation
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

from layerindex.models import *
from django.contrib import admin
diff --git a/layerindex/auth_forms.py b/layerindex/auth_forms.py
index fc3d2d1..7af48f9 100644
--- a/layerindex/auth_forms.py
+++ b/layerindex/auth_forms.py
@@ -3,6 +3,8 @@
# Copyright (C) 2018 Intel Corporation
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

from captcha.fields import CaptchaField
from django import forms
diff --git a/layerindex/auth_views.py b/layerindex/auth_views.py
index 152f171..08e0334 100644
--- a/layerindex/auth_views.py
+++ b/layerindex/auth_views.py
@@ -3,6 +3,8 @@
# Copyright (C) 2018 Intel Corporation
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

from django.contrib import messages
from django.contrib.auth import logout
diff --git a/layerindex/bulkchange.py b/layerindex/bulkchange.py
index 3d1ee2b..6382053 100644
--- a/layerindex/bulkchange.py
+++ b/layerindex/bulkchange.py
@@ -5,6 +5,8 @@
# Copyright (C) 2013, 2016, 2018 Intel Corporation
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

import sys
import os
diff --git a/layerindex/context_processors.py b/layerindex/context_processors.py
index 3352e63..2cc0380 100644
--- a/layerindex/context_processors.py
+++ b/layerindex/context_processors.py
@@ -3,6 +3,8 @@
# Copyright (C) 2013, 2018 Intel Corporation
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

from layerindex.models import Branch, LayerItem, SiteNotice
from django.contrib.sites.models import Site
diff --git a/layerindex/forms.py b/layerindex/forms.py
index 4061d4b..9615859 100644
--- a/layerindex/forms.py
+++ b/layerindex/forms.py
@@ -3,6 +3,8 @@
# Copyright (C) 2013, 2016-2019 Intel Corporation
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

import re
from collections import OrderedDict
diff --git a/layerindex/layerconfparse.py b/layerindex/layerconfparse.py
index a812140..84ec005 100644
--- a/layerindex/layerconfparse.py
+++ b/layerindex/layerconfparse.py
@@ -5,6 +5,7 @@
#
# Licensed under the MIT license, see COPYING.MIT for details
#
+# SPDX-License-Identifier: MIT

import sys
import os
diff --git a/layerindex/middleware.py b/layerindex/middleware.py
index afe34a3..527cc8b 100644
--- a/layerindex/middleware.py
+++ b/layerindex/middleware.py
@@ -3,6 +3,8 @@
# Copyright (C) 2019 Intel Corporation
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

from django.utils.deprecation import MiddlewareMixin
from django.http import HttpResponseRedirect
diff --git a/layerindex/models.py b/layerindex/models.py
index 99c68e1..329cc33 100644
--- a/layerindex/models.py
+++ b/layerindex/models.py
@@ -3,6 +3,8 @@
# Copyright (C) 2013-2018 Intel Corporation
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

from django.db import models
from datetime import datetime
diff --git a/layerindex/querysethelper.py b/layerindex/querysethelper.py
index 5a856ee..fb26a17 100644
--- a/layerindex/querysethelper.py
+++ b/layerindex/querysethelper.py
@@ -1,3 +1,11 @@
+# layerindex-web - queryset helper definitions
+#
+# Copyright (C) 2013-2018 Intel Corporation
+#
+# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT
+
import operator
import functools
from django.db.models import Q, CharField
diff --git a/layerindex/recipedesc.py b/layerindex/recipedesc.py
index 26280ee..be47f6e 100644
--- a/layerindex/recipedesc.py
+++ b/layerindex/recipedesc.py
@@ -4,6 +4,8 @@
#
# Copyright (C) 2012 Intel Corporation
# Author: Paul Eggleton <paul.eggleton@...>
+#
+# SPDX-License-Identifier: MIT

import sys
import os.path
diff --git a/layerindex/recipeparse.py b/layerindex/recipeparse.py
index 35867ad..62c08e9 100644
--- a/layerindex/recipeparse.py
+++ b/layerindex/recipeparse.py
@@ -4,6 +4,8 @@
# Author: Paul Eggleton <paul.eggleton@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

import sys
import os
diff --git a/layerindex/restperm.py b/layerindex/restperm.py
index fb9f715..5d74c66 100644
--- a/layerindex/restperm.py
+++ b/layerindex/restperm.py
@@ -1,3 +1,9 @@
+# Copyright (C) 2013-2018 Intel Corporation
+#
+# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT
+
from rest_framework import permissions

class ReadOnlyPermission(permissions.BasePermission):
diff --git a/layerindex/restviews.py b/layerindex/restviews.py
index 7de4cd7..91779f5 100644
--- a/layerindex/restviews.py
+++ b/layerindex/restviews.py
@@ -3,6 +3,8 @@
# Copyright (C) 2014, 2016-2019 Intel Corporation
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

from layerindex.models import Branch, LayerItem, LayerMaintainer, YPCompatibleVersion, LayerNote, LayerBranch, LayerDependency, Recipe, Machine, Distro, BBClass, Source, Patch, PackageConfig, StaticBuildDep, DynamicBuildDep, RecipeFileDependency, BBAppend, IncFile
from rest_framework import viewsets, serializers, pagination
diff --git a/layerindex/securityquestions.py b/layerindex/securityquestions.py
index a6a0e1c..1883b11 100644
--- a/layerindex/securityquestions.py
+++ b/layerindex/securityquestions.py
@@ -1,3 +1,11 @@
+# layerindex-web - Security Questions
+#
+# Copyright (C) 2013-2018 Intel Corporation
+#
+# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT
+
security_questions = ["What was the name of your first pet?",
"What was the last name of your third grade teacher?",
"What is your favorite pizza topping?",
diff --git a/layerindex/tasks.py b/layerindex/tasks.py
index ae62b91..da85539 100644
--- a/layerindex/tasks.py
+++ b/layerindex/tasks.py
@@ -4,6 +4,8 @@
# Author: Paul Eggleton <paul.eggleton@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

from celery import Celery
from django.core.mail import EmailMessage
diff --git a/layerindex/templatetags/__init__.py b/layerindex/templatetags/__init__.py
index e69de29..c88e412 100644
--- a/layerindex/templatetags/__init__.py
+++ b/layerindex/templatetags/__init__.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2017, 2018 Intel Corporation
+#
+# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT
\ No newline at end of file
diff --git a/layerindex/templatetags/extrafilters.py b/layerindex/templatetags/extrafilters.py
index d79f9a1..2a9e764 100644
--- a/layerindex/templatetags/extrafilters.py
+++ b/layerindex/templatetags/extrafilters.py
@@ -1,3 +1,9 @@
+# Copyright (C) 2017, 2018 Intel Corporation
+#
+# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT
+
from django import template
from .. import utils

diff --git a/layerindex/tools/fedora-fetch.py b/layerindex/tools/fedora-fetch.py
index 492082a..a16fc80 100755
--- a/layerindex/tools/fedora-fetch.py
+++ b/layerindex/tools/fedora-fetch.py
@@ -5,6 +5,8 @@
# Copyright (C) 2017, 2018 Intel Corporation
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

import sys
import os
diff --git a/layerindex/tools/fixup_duplicates.py b/layerindex/tools/fixup_duplicates.py
index 5abe2c2..6c60959 100644
--- a/layerindex/tools/fixup_duplicates.py
+++ b/layerindex/tools/fixup_duplicates.py
@@ -6,6 +6,8 @@
# Author: Paul Eggleton <paul.eggleton@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT


import sys
diff --git a/layerindex/tools/github-fetch.py b/layerindex/tools/github-fetch.py
index 11c977a..0dbe509 100755
--- a/layerindex/tools/github-fetch.py
+++ b/layerindex/tools/github-fetch.py
@@ -5,6 +5,8 @@
# Copyright (C) 2017 Intel Corporation
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

import sys
import os
diff --git a/layerindex/tools/import_classic.py b/layerindex/tools/import_classic.py
index fca054c..0216221 100755
--- a/layerindex/tools/import_classic.py
+++ b/layerindex/tools/import_classic.py
@@ -6,6 +6,8 @@
# Author: Paul Eggleton <paul.eggleton@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT


import sys
diff --git a/layerindex/tools/import_classic_wiki.py b/layerindex/tools/import_classic_wiki.py
index bfebcd9..aa33b7a 100755
--- a/layerindex/tools/import_classic_wiki.py
+++ b/layerindex/tools/import_classic_wiki.py
@@ -7,6 +7,8 @@
# Author: Paul Eggleton <paul.eggleton@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

import sys
import os.path
diff --git a/layerindex/tools/import_layer.py b/layerindex/tools/import_layer.py
index ace58e5..dfe887c 100755
--- a/layerindex/tools/import_layer.py
+++ b/layerindex/tools/import_layer.py
@@ -6,6 +6,8 @@
# Author: Paul Eggleton <paul.eggleton@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT


import sys
diff --git a/layerindex/tools/import_layers.py b/layerindex/tools/import_layers.py
index 3548568..57b0f86 100755
--- a/layerindex/tools/import_layers.py
+++ b/layerindex/tools/import_layers.py
@@ -6,6 +6,8 @@
# Author: Paul Eggleton <paul.eggleton@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT


import sys
diff --git a/layerindex/tools/import_otherdistro.py b/layerindex/tools/import_otherdistro.py
index 46eeeca..0c6640f 100755
--- a/layerindex/tools/import_otherdistro.py
+++ b/layerindex/tools/import_otherdistro.py
@@ -6,6 +6,8 @@
# Author: Paul Eggleton <paul.eggleton@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT


import sys
diff --git a/layerindex/tools/import_project.py b/layerindex/tools/import_project.py
index 27a0de3..44cf6cc 100755
--- a/layerindex/tools/import_project.py
+++ b/layerindex/tools/import_project.py
@@ -9,6 +9,8 @@
# Author: Liam R. Howlett <liam.howlett@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

from urllib.parse import urlparse
import logging
diff --git a/layerindex/tools/import_wiki_layers.py b/layerindex/tools/import_wiki_layers.py
index 71f26ea..707d90e 100755
--- a/layerindex/tools/import_wiki_layers.py
+++ b/layerindex/tools/import_wiki_layers.py
@@ -6,6 +6,8 @@
# Author: Paul Eggleton <paul.eggleton@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT


import sys
diff --git a/layerindex/tools/site_name.py b/layerindex/tools/site_name.py
index 836a0c1..e1cff02 100755
--- a/layerindex/tools/site_name.py
+++ b/layerindex/tools/site_name.py
@@ -6,6 +6,8 @@
# Author: Paul Eggleton <paul.eggleton@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

import sys
import os
diff --git a/layerindex/tools/update_classic_status.py b/layerindex/tools/update_classic_status.py
index 4edfc75..0bcf2e7 100755
--- a/layerindex/tools/update_classic_status.py
+++ b/layerindex/tools/update_classic_status.py
@@ -6,6 +6,8 @@
# Author: Paul Eggleton <paul.eggleton@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

import sys
import os
diff --git a/layerindex/tools/webapi-test.py b/layerindex/tools/webapi-test.py
index 20fc36b..562fbe2 100755
--- a/layerindex/tools/webapi-test.py
+++ b/layerindex/tools/webapi-test.py
@@ -5,6 +5,8 @@
# Copyright (C) 2019 Intel Corporation
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

import sys
import os
diff --git a/layerindex/update.py b/layerindex/update.py
index e2aa96e..5a2642b 100755
--- a/layerindex/update.py
+++ b/layerindex/update.py
@@ -6,6 +6,8 @@
# Author: Paul Eggleton <paul.eggleton@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT


import sys
diff --git a/layerindex/update_layer.py b/layerindex/update_layer.py
index 1e5950c..42f99be 100644
--- a/layerindex/update_layer.py
+++ b/layerindex/update_layer.py
@@ -6,6 +6,8 @@
# Author: Paul Eggleton <paul.eggleton@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT


import sys
diff --git a/layerindex/urls.py b/layerindex/urls.py
index ab2d028..7264b11 100644
--- a/layerindex/urls.py
+++ b/layerindex/urls.py
@@ -3,6 +3,8 @@
# Copyright (C) 2013, 2018 Intel Corporation
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

from django.conf.urls import *
from django.views.generic import TemplateView, DetailView, ListView, RedirectView
diff --git a/layerindex/urls_branch.py b/layerindex/urls_branch.py
index 9756f90..86b8b77 100644
--- a/layerindex/urls_branch.py
+++ b/layerindex/urls_branch.py
@@ -3,6 +3,8 @@
# Copyright (C) 2013-2016 Intel Corporation
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

from django.conf.urls import *
from django.views.defaults import page_not_found
diff --git a/layerindex/utils.py b/layerindex/utils.py
index 2a1689b..9e28668 100644
--- a/layerindex/utils.py
+++ b/layerindex/utils.py
@@ -4,6 +4,8 @@
# Author: Paul Eggleton <paul.eggleton@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

import sys
import os
diff --git a/layerindex/views.py b/layerindex/views.py
index 83adb6a..91b3280 100644
--- a/layerindex/views.py
+++ b/layerindex/views.py
@@ -3,6 +3,8 @@
# Copyright (C) 2013-2018 Intel Corporation
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

import os
import sys
diff --git a/manage.py b/manage.py
index a815fa3..0c073ac 100755
--- a/manage.py
+++ b/manage.py
@@ -6,6 +6,8 @@
#
# Copyright (c) Django Software Foundation and individual contributors.
# All rights reserved.
+#
+# SPDX-License-Identifier: MIT

import os
import sys
diff --git a/password_validation.py b/password_validation.py
index 8669250..8c2fbbe 100644
--- a/password_validation.py
+++ b/password_validation.py
@@ -1,3 +1,8 @@
+# Copyright (c) Django Software Foundation and individual contributors.
+# All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+
from django.core.exceptions import ValidationError
from django.utils.translation import ugettext as _

diff --git a/pytest.ini b/pytest.ini
index c067b05..a8d7834 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,3 +1,8 @@
+# Copyright (c) Django Software Foundation and individual contributors.
+# All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+
[pytest]
DJANGO_SETTINGS_MODULE = settings
norecursedirs = .git layers
diff --git a/rrs/__init__.py b/rrs/__init__.py
index 3eab2fe..e2e9143 100644
--- a/rrs/__init__.py
+++ b/rrs/__init__.py
@@ -1,2 +1,7 @@
+# Copyright (C) 2014 Intel Corporation
+#
+# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

default_app_config = 'rrs.apps.RecipeReportingSystemConfig'
diff --git a/rrs/admin.py b/rrs/admin.py
index a4712f2..402279f 100644
--- a/rrs/admin.py
+++ b/rrs/admin.py
@@ -3,6 +3,8 @@
# Copyright (C) 2014 Intel Corporation
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

from django.utils.functional import curry

diff --git a/rrs/apps.py b/rrs/apps.py
index ea25060..1230718 100644
--- a/rrs/apps.py
+++ b/rrs/apps.py
@@ -1,3 +1,9 @@
+# Copyright (C) 2014 Intel Corporation
+#
+# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT
+
from django.apps import AppConfig


diff --git a/rrs/context_processors.py b/rrs/context_processors.py
index 0d79bd1..52e2c30 100644
--- a/rrs/context_processors.py
+++ b/rrs/context_processors.py
@@ -3,6 +3,8 @@
# Copyright (C) 2014 Intel Corporation
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

import settings
from django.contrib.sites.models import Site
diff --git a/rrs/models.py b/rrs/models.py
index ba7e63c..f1bb527 100644
--- a/rrs/models.py
+++ b/rrs/models.py
@@ -3,6 +3,8 @@
# Copyright (C) 2014 Intel Corporation
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

import sys
import os
diff --git a/rrs/tools/common.py b/rrs/tools/common.py
index 6149792..1ce5dd5 100644
--- a/rrs/tools/common.py
+++ b/rrs/tools/common.py
@@ -4,6 +4,8 @@
# Author: Anibal Limon <anibal.limon@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

import sys
import os
diff --git a/rrs/tools/dump_upgrades.py b/rrs/tools/dump_upgrades.py
index 011b91e..982f5a3 100755
--- a/rrs/tools/dump_upgrades.py
+++ b/rrs/tools/dump_upgrades.py
@@ -5,6 +5,8 @@
# Author: Paul Eggleton <paul.eggleton@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT


import sys
diff --git a/rrs/tools/historytool.py b/rrs/tools/historytool.py
index 06456d1..9f03ade 100755
--- a/rrs/tools/historytool.py
+++ b/rrs/tools/historytool.py
@@ -6,6 +6,8 @@
# Author: Paul Eggleton <paul.eggleton@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT


import sys
diff --git a/rrs/tools/rrs_distros.py b/rrs/tools/rrs_distros.py
index e803328..e4c6045 100755
--- a/rrs/tools/rrs_distros.py
+++ b/rrs/tools/rrs_distros.py
@@ -6,6 +6,8 @@
# Author: Anibal Limon <anibal.limon@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

import sys
import os.path
diff --git a/rrs/tools/rrs_maintainer_history.py b/rrs/tools/rrs_maintainer_history.py
index b5cc510..15e1d17 100755
--- a/rrs/tools/rrs_maintainer_history.py
+++ b/rrs/tools/rrs_maintainer_history.py
@@ -6,6 +6,8 @@
# Author: Anibal Limon <anibal.limon@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

import sys
import os.path
diff --git a/rrs/tools/rrs_upgrade_history.py b/rrs/tools/rrs_upgrade_history.py
index 5070cc2..9b74a05 100755
--- a/rrs/tools/rrs_upgrade_history.py
+++ b/rrs/tools/rrs_upgrade_history.py
@@ -9,6 +9,8 @@
# Paul Eggleton <paul.eggleton@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

import sys
import os.path
diff --git a/rrs/tools/rrs_upstream_email.py b/rrs/tools/rrs_upstream_email.py
index 0c3dbe2..8a6b188 100755
--- a/rrs/tools/rrs_upstream_email.py
+++ b/rrs/tools/rrs_upstream_email.py
@@ -7,6 +7,8 @@
# Author: Aníbal Limón <anibal.limon@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

import sys
import os.path
diff --git a/rrs/tools/rrs_upstream_history.py b/rrs/tools/rrs_upstream_history.py
index 4451c15..7dbf64c 100755
--- a/rrs/tools/rrs_upstream_history.py
+++ b/rrs/tools/rrs_upstream_history.py
@@ -6,6 +6,8 @@
# Author: Anibal Limon <anibal.limon@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

import sys
import os.path
diff --git a/rrs/tools/upgrade_history_internal.py b/rrs/tools/upgrade_history_internal.py
index f48ea71..e3a96d9 100644
--- a/rrs/tools/upgrade_history_internal.py
+++ b/rrs/tools/upgrade_history_internal.py
@@ -7,6 +7,8 @@
# Paul Eggleton <paul.eggleton@...>
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT


import sys
diff --git a/rrs/urls.py b/rrs/urls.py
index 30d86b7..63426a9 100644
--- a/rrs/urls.py
+++ b/rrs/urls.py
@@ -1,3 +1,11 @@
+# rrs-web - URLS
+#
+# Copyright (C) 2014 Intel Corporation
+#
+# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT
+
from django.conf.urls import include, url

from rrs.models import Release, Milestone
diff --git a/rrs/views.py b/rrs/views.py
index 9c36a48..68fc4f9 100644
--- a/rrs/views.py
+++ b/rrs/views.py
@@ -1,3 +1,11 @@
+# rrs-web - views
+#
+# Copyright (C) 2014 Intel Corporation
+#
+# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT
+
import urllib

import csv
diff --git a/rrs/wsgi.py b/rrs/wsgi.py
index 1d7e7b7..c25232e 100644
--- a/rrs/wsgi.py
+++ b/rrs/wsgi.py
@@ -1,3 +1,9 @@
+# Copyright (C) 2014 Intel Corporation
+#
+# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT
+
import os

os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
diff --git a/settings.py b/settings.py
index 525a0c1..1dd6ebc 100644
--- a/settings.py
+++ b/settings.py
@@ -2,6 +2,8 @@
#
# Based on settings.py from the Django project template
# Copyright (c) Django Software Foundation and individual contributors.
+#
+# SPDX-License-Identifier: MIT

import os

diff --git a/tests/test_update.py b/tests/test_update.py
index e00775d..588b2ed 100644
--- a/tests/test_update.py
+++ b/tests/test_update.py
@@ -3,6 +3,8 @@
# Copyright (C) 2018 Intel Corporation
#
# Licensed under the MIT license, see COPYING.MIT for details
+#
+# SPDX-License-Identifier: MIT

# NOTE: requires pytest-django. Run using "pytest" from the root
# of the repository (add -s to avoid suppressing the output of commands
diff --git a/urls.py b/urls.py
index 67d64b2..76f2f73 100644
--- a/urls.py
+++ b/urls.py
@@ -4,6 +4,8 @@
#
# Copyright (c) Django Software Foundation and individual contributors.
# All rights reserved.
+#
+# SPDX-License-Identifier: MIT

from django.conf.urls import include, url
from django.urls import reverse_lazy
diff --git a/wsgi.py b/wsgi.py
index 99f0915..b0d82ac 100644
--- a/wsgi.py
+++ b/wsgi.py
@@ -1,3 +1,8 @@
+# Copyright (c) Django Software Foundation and individual contributors.
+# All rights reserved.
+#
+# SPDX-License-Identifier: MIT
+
import os, sys
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
sys.path.append('/var/www/html/layerindex')
--
2.17.1


[prelink-cross][PATCH v4] Add SPDX license headers to all source files

Meh Mbeh Ida Delphine <idadelm@...>
 

Added SPDX headers in all source files except src/makecrc.c since it is not copyrighted.
Skipped Makefile.am as well.
Also cleared redundant license text.
Updated README file with correct email addresses.

Fixes: [YOCTO #13529]

Signed-off-by: Meh Mbeh Ida Delphine <idadelm@...>
---

Changes in V4:
* Add [YOCTO #13529] tag to git commit log instead of subject line
* Updated the README file with right email addresses

Changes in V3:
* Address review comments
* Change subject line to reflect what the patch is trying to do

Changes in V2:
* Address review comments

README | 4 ++--
src/arch-alpha.c | 15 ++-------------
src/arch-arm.c | 15 ++-------------
src/arch-cris.c | 15 ++-------------
src/arch-i386.c | 15 ++-------------
src/arch-ia64.c | 15 ++-------------
src/arch-mips.c | 16 ++--------------
src/arch-ppc.c | 15 ++-------------
src/arch-ppc64.c | 15 ++-------------
src/arch-s390.c | 15 ++-------------
src/arch-s390x.c | 15 ++-------------
src/arch-sh.c | 15 ++-------------
src/arch-sparc.c | 16 +++-------------
src/arch-sparc64.c | 15 ++-------------
src/arch-x86_64.c | 15 ++-------------
src/cache.c | 15 ++-------------
src/canonicalize.c | 16 ++--------------
src/checksum.c | 15 ++-------------
src/conflict.c | 15 ++-------------
src/crc32.c | 15 ++-------------
src/cxx.c | 15 ++-------------
src/data.c | 15 ++-------------
src/doit.c | 15 ++-------------
src/dso.c | 15 ++-------------
src/dwarf2.c | 15 ++-------------
src/dwarf2.h | 15 ++-------------
src/exec.c | 15 ++-------------
src/execle_open.c | 15 ++-------------
src/execstack.c | 15 ++-------------
src/fptr.c | 15 ++-------------
src/fptr.h | 15 ++-------------
src/gather.c | 15 ++-------------
src/get.c | 15 ++-------------
src/hashtab.c | 17 ++---------------
src/hashtab.h | 16 +++-------------
src/layout.c | 15 ++-------------
src/layout.h | 15 ++-------------
src/main.c | 15 ++-------------
src/md5.c | 16 ++--------------
src/md5.h | 15 ++-------------
src/mdebug.c | 15 ++-------------
src/prelink.c | 15 ++-------------
src/prelink.h | 15 ++-------------
src/prelinktab.h | 15 ++-------------
src/reloc-info.c | 15 ++-------------
src/reloc-info.h | 15 ++-------------
src/reloc.c | 15 ++-------------
src/reloc.h | 15 ++-------------
src/sha.c | 4 ++++
src/sha.h | 4 ++++
src/space.c | 15 ++-------------
src/space.h | 15 ++-------------
src/stabs.c | 15 ++-------------
src/undo.c | 15 ++-------------
src/undoall.c | 15 ++-------------
src/verify.c | 15 ++-------------
56 files changed, 118 insertions(+), 696 deletions(-)

diff --git a/README b/README
index 2d8893b..5f91fab 100644
--- a/README
+++ b/README
@@ -13,8 +13,8 @@ Patch submission
When submitting patches to the cross-prelink project, please do the
following:

-To: mark.hatle@...
-Cc: yocto@...
+To: mark.hatle@...
+Cc: yocto@...

Subject: [prelink-cross] ....

diff --git a/src/arch-alpha.c b/src/arch-alpha.c
index 7802a3e..bc5c192 100644
--- a/src/arch-alpha.c
+++ b/src/arch-alpha.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-arm.c b/src/arch-arm.c
index eec7c57..b5ea886 100644
--- a/src/arch-arm.c
+++ b/src/arch-arm.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2004, 2009, 2011, 2013 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-cris.c b/src/arch-cris.c
index 3272779..634bf9f 100644
--- a/src/arch-cris.c
+++ b/src/arch-cris.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2004, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-i386.c b/src/arch-i386.c
index a1e0fcc..5a0b2ca 100644
--- a/src/arch-i386.c
+++ b/src/arch-i386.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2009, 2011 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-ia64.c b/src/arch-ia64.c
index 6039115..56196de 100644
--- a/src/arch-ia64.c
+++ b/src/arch-ia64.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-mips.c b/src/arch-mips.c
index 02c608f..2875ec3 100644
--- a/src/arch-mips.c
+++ b/src/arch-mips.c
@@ -2,20 +2,8 @@
Written by Richard Sandiford <richard@...>, 2006
Updated by Maciej W. Rozycki <macro@...>, 2008.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/
/* GENERAL NOTES

The psABI defines R_MIPS_REL32 as A - EA + S, where the value of EA
diff --git a/src/arch-ppc.c b/src/arch-ppc.c
index e22e5d5..e296d79 100644
--- a/src/arch-ppc.c
+++ b/src/arch-ppc.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009, 2011 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-ppc64.c b/src/arch-ppc64.c
index a764b99..3f2c375 100644
--- a/src/arch-ppc64.c
+++ b/src/arch-ppc64.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2002, 2003, 2004, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2002.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-s390.c b/src/arch-s390.c
index e5fe130..1a65f5c 100644
--- a/src/arch-s390.c
+++ b/src/arch-s390.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2009, 2010, 2013 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-s390x.c b/src/arch-s390x.c
index e4d82f7..926cfa2 100644
--- a/src/arch-s390x.c
+++ b/src/arch-s390x.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2009, 2013 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-sh.c b/src/arch-sh.c
index 1b11312..a852266 100644
--- a/src/arch-sh.c
+++ b/src/arch-sh.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-sparc.c b/src/arch-sparc.c
index e016a79..41b297d 100644
--- a/src/arch-sparc.c
+++ b/src/arch-sparc.c
@@ -1,19 +1,9 @@
/* Copyright (C) 2001, 2002, 2004, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+/*
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-sparc64.c b/src/arch-sparc64.c
index aee4601..c6a1027 100644
--- a/src/arch-sparc64.c
+++ b/src/arch-sparc64.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2004, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-x86_64.c b/src/arch-x86_64.c
index 2f6c551..249661a 100644
--- a/src/arch-x86_64.c
+++ b/src/arch-x86_64.c
@@ -3,19 +3,8 @@
Copyright (C) 2011 Wind River Systems, Inc.
x32 support by Mark Hatle <mark.hatle@...>

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/cache.c b/src/cache.c
index 1cc3217..b476581 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2006, 2013 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/canonicalize.c b/src/canonicalize.c
index 79df44e..e94ec06 100644
--- a/src/canonicalize.c
+++ b/src/canonicalize.c
@@ -2,20 +2,8 @@
Copyright (C) 1996-2002, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.

- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <assert.h>
#include <stdlib.h>
diff --git a/src/checksum.c b/src/checksum.c
index 20a23a0..5c80fc5 100644
--- a/src/checksum.c
+++ b/src/checksum.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/conflict.c b/src/conflict.c
index 5613ace..83713c5 100644
--- a/src/conflict.c
+++ b/src/conflict.c
@@ -3,19 +3,8 @@
Written by Jakub Jelinek <jakub@...>, 2001.
Updated by Maciej W. Rozycki <macro@...>, 2008.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/crc32.c b/src/crc32.c
index f36abb5..81e990b 100644
--- a/src/crc32.c
+++ b/src/crc32.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <stdint.h>
diff --git a/src/cxx.c b/src/cxx.c
index 4391ebe..4b911a9 100644
--- a/src/cxx.c
+++ b/src/cxx.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2007, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <alloca.h>
diff --git a/src/data.c b/src/data.c
index 751f96f..d648744 100644
--- a/src/data.c
+++ b/src/data.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include "prelink.h"
diff --git a/src/doit.c b/src/doit.c
index 3784866..42e6819 100644
--- a/src/doit.c
+++ b/src/doit.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2003, 2004, 2005, 2007 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <alloca.h>
diff --git a/src/dso.c b/src/dso.c
index 949abf9..9cce846 100644
--- a/src/dso.c
+++ b/src/dso.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2010 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/dwarf2.c b/src/dwarf2.c
index b9588b1..d230bb7 100644
--- a/src/dwarf2.c
+++ b/src/dwarf2.c
@@ -2,19 +2,8 @@
Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/dwarf2.h b/src/dwarf2.h
index b0c80b6..888f2c7 100644
--- a/src/dwarf2.h
+++ b/src/dwarf2.h
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2009, 2010, 2011, 2012 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#define DW_TAG_padding 0x00
#define DW_TAG_array_type 0x01
diff --git a/src/exec.c b/src/exec.c
index ca7fd14..431690e 100644
--- a/src/exec.c
+++ b/src/exec.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/execle_open.c b/src/execle_open.c
index 2ee5cbc..0d4bef5 100644
--- a/src/execle_open.c
+++ b/src/execle_open.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <errno.h>
diff --git a/src/execstack.c b/src/execstack.c
index 97fb453..fe044c5 100644
--- a/src/execstack.c
+++ b/src/execstack.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2003, 2005, 2010 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2003.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <errno.h>
diff --git a/src/fptr.c b/src/fptr.c
index cfe3aed..65a2804 100644
--- a/src/fptr.c
+++ b/src/fptr.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2007 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/fptr.h b/src/fptr.h
index 36ef7c6..c4ce3f7 100644
--- a/src/fptr.h
+++ b/src/fptr.h
@@ -1,19 +1,8 @@
/* Copyright (C) 2001 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef FPTR_H
#define FPTR_H
diff --git a/src/gather.c b/src/gather.c
index 277f1b5..0d1e7c4 100644
--- a/src/gather.c
+++ b/src/gather.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/get.c b/src/get.c
index 0659962..bb58b1e 100644
--- a/src/get.c
+++ b/src/get.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/hashtab.c b/src/hashtab.c
index fa27446..7dc389d 100644
--- a/src/hashtab.c
+++ b/src/hashtab.c
@@ -2,21 +2,8 @@
Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
Contributed by Vladimir Makarov (vmakarov@...).

-This file is part of the libiberty library.
-Libiberty is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-Libiberty 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
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with libiberty; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

/* This package implements basic hash table functionality. It is possible
to search for an entry, create an entry and destroy an entry.
diff --git a/src/hashtab.h b/src/hashtab.h
index 31e63e0..d3f297f 100644
--- a/src/hashtab.h
+++ b/src/hashtab.h
@@ -2,19 +2,8 @@
Copyright (C) 1999, 2000 Free Software Foundation, Inc.
Contributed by Vladimir Makarov (vmakarov@...).

-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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

/* This package implements basic hash table functionality. It is possible
to search for an entry, create an entry and destroy an entry.
@@ -29,6 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
expanded by creation of new hash table and transferring elements from
the old table to the new table. */

+
#ifndef __HASHTAB_H__
#define __HASHTAB_H__

diff --git a/src/layout.c b/src/layout.c
index 859ab66..29be7a3 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2006, 2011 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <alloca.h>
diff --git a/src/layout.h b/src/layout.h
index f481d22..1b10bc0 100644
--- a/src/layout.h
+++ b/src/layout.h
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2004, 2006 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef LAYOUT_H
#define LAYOUT_H
diff --git a/src/main.c b/src/main.c
index 6ba89d5..39e44ad 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2010, 2011 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <errno.h>
diff --git a/src/md5.c b/src/md5.c
index 0d2fdef..19a8e0b 100644
--- a/src/md5.c
+++ b/src/md5.c
@@ -4,21 +4,9 @@
NOTE: The canonical source of this file is maintained with the GNU C
Library. Bugs can be reported to bug-glibc@....

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-
-/* Written by Ulrich Drepper <drepper@...>, 1995. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <sys/types.h>
#include <stdlib.h>
diff --git a/src/md5.h b/src/md5.h
index 55f6195..eb0b85e 100644
--- a/src/md5.h
+++ b/src/md5.h
@@ -4,19 +4,8 @@
NOTE: The canonical source of this file is maintained with the GNU C
Library. Bugs can be reported to bug-glibc@....

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef _MD5_H
#define _MD5_H 1
diff --git a/src/mdebug.c b/src/mdebug.c
index 4c22d2f..eb6d1b5 100644
--- a/src/mdebug.c
+++ b/src/mdebug.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/prelink.c b/src/prelink.c
index 64c4fea..bf774c9 100644
--- a/src/prelink.c
+++ b/src/prelink.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/prelink.h b/src/prelink.h
index 39c4390..4c4c243 100644
--- a/src/prelink.h
+++ b/src/prelink.h
@@ -4,19 +4,8 @@
Written by Jakub Jelinek <jakub@...>, 2001.
Updated by Maciej W. Rozycki <macro@...>, 2008.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef PRELINK_H
#define PRELINK_H
diff --git a/src/prelinktab.h b/src/prelinktab.h
index f41c79c..a404292 100644
--- a/src/prelinktab.h
+++ b/src/prelinktab.h
@@ -1,19 +1,8 @@
/* Copyright (C) 2001 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef PRELINKTAB_H
#define PRELINKTAB_H
diff --git a/src/reloc-info.c b/src/reloc-info.c
index 4ce333c..d51cfc1 100644
--- a/src/reloc-info.c
+++ b/src/reloc-info.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2008 CodeSourcery
Written by Maciej W. Rozycki <macro@...>, 2008.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>

diff --git a/src/reloc-info.h b/src/reloc-info.h
index a8f8b7c..592a92c 100644
--- a/src/reloc-info.h
+++ b/src/reloc-info.h
@@ -1,19 +1,8 @@
/* Copyright (C) 2008 CodeSourcery
Written by Maciej W. Rozycki <macro@...>, 2008.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef RELOC_INFO_H
#define RELOC_INFO_H
diff --git a/src/reloc.c b/src/reloc.c
index deb0abe..9883dc7 100644
--- a/src/reloc.c
+++ b/src/reloc.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2005 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/reloc.h b/src/reloc.h
index a2ceff9..ee91f7e 100644
--- a/src/reloc.h
+++ b/src/reloc.h
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef RELOC_H
#define RELOC_H
diff --git a/src/sha.c b/src/sha.c
index cfbc956..f979bc4 100644
--- a/src/sha.c
+++ b/src/sha.c
@@ -1,3 +1,7 @@
+/*
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/
+
/* sha.c - Functions to compute the SHA1 hash (message-digest) of files
or blocks of memory. Complies to the NIST specification FIPS-180-1.

diff --git a/src/sha.h b/src/sha.h
index 13583e3..810072b 100644
--- a/src/sha.h
+++ b/src/sha.h
@@ -1,3 +1,7 @@
+/*
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/
+
/* sha.h - Declaration of functions and datatypes for SHA1 sum computing
library functions.

diff --git a/src/space.c b/src/space.c
index 4bd4760..8223daf 100644
--- a/src/space.c
+++ b/src/space.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2006, 2007 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/space.h b/src/space.h
index 5c9f725..59d087c 100644
--- a/src/space.h
+++ b/src/space.h
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2004 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef SPACE_H
#define SPACE_H
diff --git a/src/stabs.c b/src/stabs.c
index c0a5a6a..fd0ca28 100644
--- a/src/stabs.c
+++ b/src/stabs.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2005, 2006 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/undo.c b/src/undo.c
index 4c38dab..e6cfae3 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2005, 2010 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/undoall.c b/src/undoall.c
index 55d2a0b..44a0b4e 100644
--- a/src/undoall.c
+++ b/src/undoall.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2002, 2005 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2002.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <alloca.h>
diff --git a/src/verify.c b/src/verify.c
index 7f530c0..991794a 100644
--- a/src/verify.c
+++ b/src/verify.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2002, 2003, 2006, 2007, 2010 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2002.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
--
2.17.1


Re: [YOCTO#13529][prelink-cross v3] Add SPDX license headers to all source files

Meh Mbeh Ida Delphine <idadelm@...>
 

Got it, thanks! 

On Fri, Oct 9, 2020 at 3:59 AM Tim Orling <ticotimo@...> wrote:
Thank you so much for the revision.

I was not clear enough in what I said earlier and we had not captured it in the wiki either. Richard and I have updated the wiki.

What I was thinking, but did not clearly say is:

You should use "Add SPDX license headers to all source files" as the git shortlog (the first line of the text you type in when you do git commit -s). I believe you did this already.

Second, the [YOCTO #13529] tag goes into the git commit message itself, not the subject line of  send-email. I did not explain that well.

So here is explicitly what is the best practice:

$ git commit -s (or at this point $ git commit --amend)
In the editor enter:

Add SPDX license headers to all source files

Added SPDX headers in all source files except src/makecrc.c since it is not copyrighted.
Skipped Makefile.am as well.
Also cleared redundant license text.

Fixes: [YOCTO #13529]

Signed-off-by: Meh Mbeh Ida Delphine <idadelm@...>


Then send the patch:

$ git send-email --to=yocto@... --subject-prefix="prelink-cross][PATCH v4" --cc mark.hatle@... -M -1 --annotate

NOTE: the repository has two errors in the README (which you could optionally fix in v4).
(1) Mark Hatle is no longer at Wind River so the email needs to change
(2) The Yocto Project mailing list URL has changed to "yocto@..."

The -M part makes the email be formatted properly with regard to whitespace so it can be merged cleanly. The -1 part means "one commit". So if your contribution is 3 patches, it would be -3. The --annotate part of that command line will drop you into an editor. Since this is a revision of a prior patch, we want to add the changes underneath the --- This makes it easy to review, but does not put transient, ephemeral text into the permanent git history:

Add SPDX license headers to all source files

Added SPDX headers in all source files except src/makecrc.c since it is not copyrighted.
Skipped Makefile.am as well.
Also cleared redundant license text.

Fixes: [YOCTO #13529]

Signed-off-by: Meh Mbeh Ida Delphine <idadelm@...>
---
Changes in V4:
  * Add [YOCTO #13529] tag to git commit log instead of subject line

Changes in V3:
  * Address review comments
  * Change subject line to reflect what the patch is trying to do

Changes in V2:

 src/arch-alpha.c   | 15 ++-------------

<snip>



On Thu, Oct 8, 2020 at 11:23 AM Meh Mbeh Ida Delphine <idadelm@...> wrote:
Fixed bug #13529
Added SPDX headers in all source files except src/makecrc.c since it is not copyrighted.
Skipped Makefile.am as well.
Also cleared redundant license text.

Signed-off-by: Meh Mbeh Ida Delphine <idadelm@...>
---


Re: [YOCTO#13529][prelink-cross v3] Add SPDX license headers to all source files

Tim Orling
 

Thank you so much for the revision.

I was not clear enough in what I said earlier and we had not captured it in the wiki either. Richard and I have updated the wiki.

What I was thinking, but did not clearly say is:

You should use "Add SPDX license headers to all source files" as the git shortlog (the first line of the text you type in when you do git commit -s). I believe you did this already.

Second, the [YOCTO #13529] tag goes into the git commit message itself, not the subject line of  send-email. I did not explain that well.

So here is explicitly what is the best practice:

$ git commit -s (or at this point $ git commit --amend)
In the editor enter:

Add SPDX license headers to all source files

Added SPDX headers in all source files except src/makecrc.c since it is not copyrighted.
Skipped Makefile.am as well.
Also cleared redundant license text.

Fixes: [YOCTO #13529]

Signed-off-by: Meh Mbeh Ida Delphine <idadelm@...>


Then send the patch:

$ git send-email --to=yocto@... --subject-prefix="prelink-cross][PATCH v4" --cc mark.hatle@... -M -1 --annotate

NOTE: the repository has two errors in the README (which you could optionally fix in v4).
(1) Mark Hatle is no longer at Wind River so the email needs to change
(2) The Yocto Project mailing list URL has changed to "yocto@..."

The -M part makes the email be formatted properly with regard to whitespace so it can be merged cleanly. The -1 part means "one commit". So if your contribution is 3 patches, it would be -3. The --annotate part of that command line will drop you into an editor. Since this is a revision of a prior patch, we want to add the changes underneath the --- This makes it easy to review, but does not put transient, ephemeral text into the permanent git history:

Add SPDX license headers to all source files

Added SPDX headers in all source files except src/makecrc.c since it is not copyrighted.
Skipped Makefile.am as well.
Also cleared redundant license text.

Fixes: [YOCTO #13529]

Signed-off-by: Meh Mbeh Ida Delphine <idadelm@...>
---
Changes in V4:
  * Add [YOCTO #13529] tag to git commit log instead of subject line

Changes in V3:
  * Address review comments
  * Change subject line to reflect what the patch is trying to do

Changes in V2:

 src/arch-alpha.c   | 15 ++-------------

<snip>



On Thu, Oct 8, 2020 at 11:23 AM Meh Mbeh Ida Delphine <idadelm@...> wrote:
Fixed bug #13529
Added SPDX headers in all source files except src/makecrc.c since it is not copyrighted.
Skipped Makefile.am as well.
Also cleared redundant license text.

Signed-off-by: Meh Mbeh Ida Delphine <idadelm@...>
---


Bug 10699 - Ensure consistency in repository URLs #yocto #python

akhilathota499@...
 

Hi,
I would like to work on #10699 -- Ensure consistency in repository URLs bug. Kindly help me to move forward by providing more information on this issue(like where I can find more URL's mentioned in the request) and kindly assign it to me.


Re: Introduction #yocto #python

Khem Raj
 

Welcome to this amazing community Akhila

On Thu, Oct 8, 2020 at 11:51 AM <akhilathota499@...> wrote:

Hello Team,
I am Akhila, outreachy applicant and I'm new to opensource projects. I'm excited to contribute to yocto project. I hope you guys would help me with this.


Introduction #yocto #python

akhilathota499@...
 

Hello Team, 
I am Akhila, outreachy applicant and I'm new to opensource projects. I'm excited to contribute to yocto project. I hope you guys would help me with this.  


[YOCTO#13529][prelink-cross v3] Add SPDX license headers to all source files

Meh Mbeh Ida Delphine <idadelm@...>
 

Fixed bug #13529
Added SPDX headers in all source files except src/makecrc.c since it is not copyrighted.
Skipped Makefile.am as well.
Also cleared redundant license text.

Signed-off-by: Meh Mbeh Ida Delphine <idadelm@...>
---
src/arch-alpha.c | 15 ++-------------
src/arch-arm.c | 15 ++-------------
src/arch-cris.c | 15 ++-------------
src/arch-i386.c | 15 ++-------------
src/arch-ia64.c | 15 ++-------------
src/arch-mips.c | 16 ++--------------
src/arch-ppc.c | 15 ++-------------
src/arch-ppc64.c | 15 ++-------------
src/arch-s390.c | 15 ++-------------
src/arch-s390x.c | 15 ++-------------
src/arch-sh.c | 15 ++-------------
src/arch-sparc.c | 16 +++-------------
src/arch-sparc64.c | 15 ++-------------
src/arch-x86_64.c | 15 ++-------------
src/cache.c | 15 ++-------------
src/canonicalize.c | 16 ++--------------
src/checksum.c | 15 ++-------------
src/conflict.c | 15 ++-------------
src/crc32.c | 15 ++-------------
src/cxx.c | 15 ++-------------
src/data.c | 15 ++-------------
src/doit.c | 15 ++-------------
src/dso.c | 15 ++-------------
src/dwarf2.c | 15 ++-------------
src/dwarf2.h | 15 ++-------------
src/exec.c | 15 ++-------------
src/execle_open.c | 15 ++-------------
src/execstack.c | 15 ++-------------
src/fptr.c | 15 ++-------------
src/fptr.h | 15 ++-------------
src/gather.c | 15 ++-------------
src/get.c | 15 ++-------------
src/hashtab.c | 17 ++---------------
src/hashtab.h | 16 +++-------------
src/layout.c | 15 ++-------------
src/layout.h | 15 ++-------------
src/main.c | 15 ++-------------
src/md5.c | 16 ++--------------
src/md5.h | 15 ++-------------
src/mdebug.c | 15 ++-------------
src/prelink.c | 15 ++-------------
src/prelink.h | 15 ++-------------
src/prelinktab.h | 15 ++-------------
src/reloc-info.c | 15 ++-------------
src/reloc-info.h | 15 ++-------------
src/reloc.c | 15 ++-------------
src/reloc.h | 15 ++-------------
src/sha.c | 4 ++++
src/sha.h | 4 ++++
src/space.c | 15 ++-------------
src/space.h | 15 ++-------------
src/stabs.c | 15 ++-------------
src/undo.c | 15 ++-------------
src/undoall.c | 15 ++-------------
src/verify.c | 15 ++-------------
55 files changed, 116 insertions(+), 694 deletions(-)

diff --git a/src/arch-alpha.c b/src/arch-alpha.c
index 7802a3e..bc5c192 100644
--- a/src/arch-alpha.c
+++ b/src/arch-alpha.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-arm.c b/src/arch-arm.c
index eec7c57..b5ea886 100644
--- a/src/arch-arm.c
+++ b/src/arch-arm.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2004, 2009, 2011, 2013 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-cris.c b/src/arch-cris.c
index 3272779..634bf9f 100644
--- a/src/arch-cris.c
+++ b/src/arch-cris.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2004, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-i386.c b/src/arch-i386.c
index a1e0fcc..5a0b2ca 100644
--- a/src/arch-i386.c
+++ b/src/arch-i386.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2009, 2011 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-ia64.c b/src/arch-ia64.c
index 6039115..56196de 100644
--- a/src/arch-ia64.c
+++ b/src/arch-ia64.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-mips.c b/src/arch-mips.c
index 02c608f..2875ec3 100644
--- a/src/arch-mips.c
+++ b/src/arch-mips.c
@@ -2,20 +2,8 @@
Written by Richard Sandiford <richard@...>, 2006
Updated by Maciej W. Rozycki <macro@...>, 2008.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/
/* GENERAL NOTES

The psABI defines R_MIPS_REL32 as A - EA + S, where the value of EA
diff --git a/src/arch-ppc.c b/src/arch-ppc.c
index e22e5d5..e296d79 100644
--- a/src/arch-ppc.c
+++ b/src/arch-ppc.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009, 2011 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-ppc64.c b/src/arch-ppc64.c
index a764b99..3f2c375 100644
--- a/src/arch-ppc64.c
+++ b/src/arch-ppc64.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2002, 2003, 2004, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2002.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-s390.c b/src/arch-s390.c
index e5fe130..1a65f5c 100644
--- a/src/arch-s390.c
+++ b/src/arch-s390.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2009, 2010, 2013 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-s390x.c b/src/arch-s390x.c
index e4d82f7..926cfa2 100644
--- a/src/arch-s390x.c
+++ b/src/arch-s390x.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2009, 2013 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-sh.c b/src/arch-sh.c
index 1b11312..a852266 100644
--- a/src/arch-sh.c
+++ b/src/arch-sh.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-sparc.c b/src/arch-sparc.c
index e016a79..41b297d 100644
--- a/src/arch-sparc.c
+++ b/src/arch-sparc.c
@@ -1,19 +1,9 @@
/* Copyright (C) 2001, 2002, 2004, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+/*
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-sparc64.c b/src/arch-sparc64.c
index aee4601..c6a1027 100644
--- a/src/arch-sparc64.c
+++ b/src/arch-sparc64.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2004, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-x86_64.c b/src/arch-x86_64.c
index 2f6c551..249661a 100644
--- a/src/arch-x86_64.c
+++ b/src/arch-x86_64.c
@@ -3,19 +3,8 @@
Copyright (C) 2011 Wind River Systems, Inc.
x32 support by Mark Hatle <mark.hatle@...>

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/cache.c b/src/cache.c
index 1cc3217..b476581 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2006, 2013 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/canonicalize.c b/src/canonicalize.c
index 79df44e..e94ec06 100644
--- a/src/canonicalize.c
+++ b/src/canonicalize.c
@@ -2,20 +2,8 @@
Copyright (C) 1996-2002, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.

- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <assert.h>
#include <stdlib.h>
diff --git a/src/checksum.c b/src/checksum.c
index 20a23a0..5c80fc5 100644
--- a/src/checksum.c
+++ b/src/checksum.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/conflict.c b/src/conflict.c
index 5613ace..83713c5 100644
--- a/src/conflict.c
+++ b/src/conflict.c
@@ -3,19 +3,8 @@
Written by Jakub Jelinek <jakub@...>, 2001.
Updated by Maciej W. Rozycki <macro@...>, 2008.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/crc32.c b/src/crc32.c
index f36abb5..81e990b 100644
--- a/src/crc32.c
+++ b/src/crc32.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <stdint.h>
diff --git a/src/cxx.c b/src/cxx.c
index 4391ebe..4b911a9 100644
--- a/src/cxx.c
+++ b/src/cxx.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2007, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <alloca.h>
diff --git a/src/data.c b/src/data.c
index 751f96f..d648744 100644
--- a/src/data.c
+++ b/src/data.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include "prelink.h"
diff --git a/src/doit.c b/src/doit.c
index 3784866..42e6819 100644
--- a/src/doit.c
+++ b/src/doit.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2003, 2004, 2005, 2007 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <alloca.h>
diff --git a/src/dso.c b/src/dso.c
index 949abf9..9cce846 100644
--- a/src/dso.c
+++ b/src/dso.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2010 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/dwarf2.c b/src/dwarf2.c
index b9588b1..d230bb7 100644
--- a/src/dwarf2.c
+++ b/src/dwarf2.c
@@ -2,19 +2,8 @@
Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/dwarf2.h b/src/dwarf2.h
index b0c80b6..888f2c7 100644
--- a/src/dwarf2.h
+++ b/src/dwarf2.h
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2009, 2010, 2011, 2012 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#define DW_TAG_padding 0x00
#define DW_TAG_array_type 0x01
diff --git a/src/exec.c b/src/exec.c
index ca7fd14..431690e 100644
--- a/src/exec.c
+++ b/src/exec.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/execle_open.c b/src/execle_open.c
index 2ee5cbc..0d4bef5 100644
--- a/src/execle_open.c
+++ b/src/execle_open.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <errno.h>
diff --git a/src/execstack.c b/src/execstack.c
index 97fb453..fe044c5 100644
--- a/src/execstack.c
+++ b/src/execstack.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2003, 2005, 2010 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2003.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <errno.h>
diff --git a/src/fptr.c b/src/fptr.c
index cfe3aed..65a2804 100644
--- a/src/fptr.c
+++ b/src/fptr.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2007 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/fptr.h b/src/fptr.h
index 36ef7c6..c4ce3f7 100644
--- a/src/fptr.h
+++ b/src/fptr.h
@@ -1,19 +1,8 @@
/* Copyright (C) 2001 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef FPTR_H
#define FPTR_H
diff --git a/src/gather.c b/src/gather.c
index 277f1b5..0d1e7c4 100644
--- a/src/gather.c
+++ b/src/gather.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/get.c b/src/get.c
index 0659962..bb58b1e 100644
--- a/src/get.c
+++ b/src/get.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/hashtab.c b/src/hashtab.c
index fa27446..7dc389d 100644
--- a/src/hashtab.c
+++ b/src/hashtab.c
@@ -2,21 +2,8 @@
Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
Contributed by Vladimir Makarov (vmakarov@...).

-This file is part of the libiberty library.
-Libiberty is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-Libiberty 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
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with libiberty; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

/* This package implements basic hash table functionality. It is possible
to search for an entry, create an entry and destroy an entry.
diff --git a/src/hashtab.h b/src/hashtab.h
index 31e63e0..d3f297f 100644
--- a/src/hashtab.h
+++ b/src/hashtab.h
@@ -2,19 +2,8 @@
Copyright (C) 1999, 2000 Free Software Foundation, Inc.
Contributed by Vladimir Makarov (vmakarov@...).

-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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

/* This package implements basic hash table functionality. It is possible
to search for an entry, create an entry and destroy an entry.
@@ -29,6 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
expanded by creation of new hash table and transferring elements from
the old table to the new table. */

+
#ifndef __HASHTAB_H__
#define __HASHTAB_H__

diff --git a/src/layout.c b/src/layout.c
index 859ab66..29be7a3 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2006, 2011 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <alloca.h>
diff --git a/src/layout.h b/src/layout.h
index f481d22..1b10bc0 100644
--- a/src/layout.h
+++ b/src/layout.h
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2004, 2006 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef LAYOUT_H
#define LAYOUT_H
diff --git a/src/main.c b/src/main.c
index 6ba89d5..39e44ad 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2010, 2011 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <errno.h>
diff --git a/src/md5.c b/src/md5.c
index 0d2fdef..19a8e0b 100644
--- a/src/md5.c
+++ b/src/md5.c
@@ -4,21 +4,9 @@
NOTE: The canonical source of this file is maintained with the GNU C
Library. Bugs can be reported to bug-glibc@....

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-
-/* Written by Ulrich Drepper <drepper@...>, 1995. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <sys/types.h>
#include <stdlib.h>
diff --git a/src/md5.h b/src/md5.h
index 55f6195..eb0b85e 100644
--- a/src/md5.h
+++ b/src/md5.h
@@ -4,19 +4,8 @@
NOTE: The canonical source of this file is maintained with the GNU C
Library. Bugs can be reported to bug-glibc@....

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef _MD5_H
#define _MD5_H 1
diff --git a/src/mdebug.c b/src/mdebug.c
index 4c22d2f..eb6d1b5 100644
--- a/src/mdebug.c
+++ b/src/mdebug.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/prelink.c b/src/prelink.c
index 64c4fea..bf774c9 100644
--- a/src/prelink.c
+++ b/src/prelink.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/prelink.h b/src/prelink.h
index 39c4390..4c4c243 100644
--- a/src/prelink.h
+++ b/src/prelink.h
@@ -4,19 +4,8 @@
Written by Jakub Jelinek <jakub@...>, 2001.
Updated by Maciej W. Rozycki <macro@...>, 2008.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef PRELINK_H
#define PRELINK_H
diff --git a/src/prelinktab.h b/src/prelinktab.h
index f41c79c..a404292 100644
--- a/src/prelinktab.h
+++ b/src/prelinktab.h
@@ -1,19 +1,8 @@
/* Copyright (C) 2001 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef PRELINKTAB_H
#define PRELINKTAB_H
diff --git a/src/reloc-info.c b/src/reloc-info.c
index 4ce333c..d51cfc1 100644
--- a/src/reloc-info.c
+++ b/src/reloc-info.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2008 CodeSourcery
Written by Maciej W. Rozycki <macro@...>, 2008.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>

diff --git a/src/reloc-info.h b/src/reloc-info.h
index a8f8b7c..592a92c 100644
--- a/src/reloc-info.h
+++ b/src/reloc-info.h
@@ -1,19 +1,8 @@
/* Copyright (C) 2008 CodeSourcery
Written by Maciej W. Rozycki <macro@...>, 2008.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef RELOC_INFO_H
#define RELOC_INFO_H
diff --git a/src/reloc.c b/src/reloc.c
index deb0abe..9883dc7 100644
--- a/src/reloc.c
+++ b/src/reloc.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2005 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/reloc.h b/src/reloc.h
index a2ceff9..ee91f7e 100644
--- a/src/reloc.h
+++ b/src/reloc.h
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef RELOC_H
#define RELOC_H
diff --git a/src/sha.c b/src/sha.c
index cfbc956..f979bc4 100644
--- a/src/sha.c
+++ b/src/sha.c
@@ -1,3 +1,7 @@
+/*
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/
+
/* sha.c - Functions to compute the SHA1 hash (message-digest) of files
or blocks of memory. Complies to the NIST specification FIPS-180-1.

diff --git a/src/sha.h b/src/sha.h
index 13583e3..810072b 100644
--- a/src/sha.h
+++ b/src/sha.h
@@ -1,3 +1,7 @@
+/*
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/
+
/* sha.h - Declaration of functions and datatypes for SHA1 sum computing
library functions.

diff --git a/src/space.c b/src/space.c
index 4bd4760..8223daf 100644
--- a/src/space.c
+++ b/src/space.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2006, 2007 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/space.h b/src/space.h
index 5c9f725..59d087c 100644
--- a/src/space.h
+++ b/src/space.h
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2004 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef SPACE_H
#define SPACE_H
diff --git a/src/stabs.c b/src/stabs.c
index c0a5a6a..fd0ca28 100644
--- a/src/stabs.c
+++ b/src/stabs.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2005, 2006 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/undo.c b/src/undo.c
index 4c38dab..e6cfae3 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2005, 2010 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/undoall.c b/src/undoall.c
index 55d2a0b..44a0b4e 100644
--- a/src/undoall.c
+++ b/src/undoall.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2002, 2005 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2002.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <alloca.h>
diff --git a/src/verify.c b/src/verify.c
index 7f530c0..991794a 100644
--- a/src/verify.c
+++ b/src/verify.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2002, 2003, 2006, 2007, 2010 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2002.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
--
2.17.1


Re: [prelink-cross v2] Fixed bug #13529

Meh Mbeh Ida Delphine <idadelm@...>
 

Awesome, thanks for the feedback. 

On Thu, Oct 8, 2020 at 6:29 PM Tim Orling <ticotimo@...> wrote:
Hi Ida! Thank you so much for the patch.

Just a few things to help you along:
OpenEmbedded and Yocto Project are tightly coupled, so that is why these references are coming from openembedded.
(1) the subject line should be descriptive of what the change is, so it would be better to say "[prelink-cross] Add SPDX license headers to all source files"
This is because it will be permanent git history and we want to be able to rapidly scan the "shortlog" that you would see with "git log --oneline" and know immediately what was done in a given commit
(2) In the body of the commit message (after the first line) you can put in more detail when it is appropriate, for instance you could mention the files that did not have a license and you skipped them, etc.
This is a way for us to communicate the thought process we followed, or the steps we did to reproduce the problem, or any other communication that might be helpful
(3) We have a convention to use [YOCTO#13529] to show that the patch fixes a bug from the Yocto Project Bugzilla.
This is to make it possible for automated capturing of the "tags" that tell us which commits addressed which bugs.
(4) One last thing, when sending follow-up patches (v2, v3, etc.), we ask to put what changed from v1 to v2 to v3 underneath the --- in the git log. You can make this easy by adding --annotate to the git send-email command and it will give you and opportunity to edit the log before you send the patch.

Some of this is tribal knowledge and perhaps not captured in the wiki and we should improve that. Or put it into the Yocto Project documentation...but it should be captured somewhere :)

--Tim




On Thu, Oct 8, 2020 at 9:38 AM Meh Mbeh Ida Delphine <idadelm@...> wrote:
Signed-off-by: Meh Mbeh Ida Delphine <idadelm@...>
---

^^^ anything underneath the --- will not show up in the commit log, so this is where we put things that are effemeral, such as "Changes since v2"
 
 src/arch-alpha.c   | 15 ++-------------

<snip>


Re: [prelink-cross v2] Fixed bug #13529

Tim Orling
 

Hi Ida! Thank you so much for the patch.

Just a few things to help you along:
OpenEmbedded and Yocto Project are tightly coupled, so that is why these references are coming from openembedded.
(1) the subject line should be descriptive of what the change is, so it would be better to say "[prelink-cross] Add SPDX license headers to all source files"
This is because it will be permanent git history and we want to be able to rapidly scan the "shortlog" that you would see with "git log --oneline" and know immediately what was done in a given commit
(2) In the body of the commit message (after the first line) you can put in more detail when it is appropriate, for instance you could mention the files that did not have a license and you skipped them, etc.
This is a way for us to communicate the thought process we followed, or the steps we did to reproduce the problem, or any other communication that might be helpful
(3) We have a convention to use [YOCTO#13529] to show that the patch fixes a bug from the Yocto Project Bugzilla.
This is to make it possible for automated capturing of the "tags" that tell us which commits addressed which bugs.
(4) One last thing, when sending follow-up patches (v2, v3, etc.), we ask to put what changed from v1 to v2 to v3 underneath the --- in the git log. You can make this easy by adding --annotate to the git send-email command and it will give you and opportunity to edit the log before you send the patch.

Some of this is tribal knowledge and perhaps not captured in the wiki and we should improve that. Or put it into the Yocto Project documentation...but it should be captured somewhere :)

--Tim




On Thu, Oct 8, 2020 at 9:38 AM Meh Mbeh Ida Delphine <idadelm@...> wrote:
Signed-off-by: Meh Mbeh Ida Delphine <idadelm@...>
---

^^^ anything underneath the --- will not show up in the commit log, so this is where we put things that are effemeral, such as "Changes since v2"
 
 src/arch-alpha.c   | 15 ++-------------

<snip>


Re: Perl populate sysroot fails (yocto 2.0.3)

Varangu-Booth, Valen
 

Perfect! Thanks for your help.

I had to add both
do_populate_sysroot[depends] += "perl:do_populate_sysroot"
AND
do_populate_sysroot_setscene[depends] += "perl:do_populate_sysroot_setscene"

and now things are working great!


[prelink-cross v2] Fixed bug #13529

Meh Mbeh Ida Delphine <idadelm@...>
 

Signed-off-by: Meh Mbeh Ida Delphine <idadelm@...>
---
src/arch-alpha.c | 15 ++-------------
src/arch-arm.c | 15 ++-------------
src/arch-cris.c | 15 ++-------------
src/arch-i386.c | 15 ++-------------
src/arch-ia64.c | 15 ++-------------
src/arch-mips.c | 16 ++--------------
src/arch-ppc.c | 15 ++-------------
src/arch-ppc64.c | 15 ++-------------
src/arch-s390.c | 15 ++-------------
src/arch-s390x.c | 15 ++-------------
src/arch-sh.c | 15 ++-------------
src/arch-sparc.c | 16 +++-------------
src/arch-sparc64.c | 15 ++-------------
src/arch-x86_64.c | 15 ++-------------
src/cache.c | 15 ++-------------
src/canonicalize.c | 16 ++--------------
src/checksum.c | 15 ++-------------
src/conflict.c | 15 ++-------------
src/crc32.c | 15 ++-------------
src/cxx.c | 15 ++-------------
src/data.c | 15 ++-------------
src/doit.c | 15 ++-------------
src/dso.c | 15 ++-------------
src/dwarf2.c | 15 ++-------------
src/dwarf2.h | 15 ++-------------
src/exec.c | 15 ++-------------
src/execle_open.c | 15 ++-------------
src/execstack.c | 15 ++-------------
src/fptr.c | 15 ++-------------
src/fptr.h | 15 ++-------------
src/gather.c | 15 ++-------------
src/get.c | 15 ++-------------
src/hashtab.c | 17 ++---------------
src/hashtab.h | 16 +++-------------
src/layout.c | 15 ++-------------
src/layout.h | 15 ++-------------
src/main.c | 15 ++-------------
src/md5.c | 16 ++--------------
src/md5.h | 15 ++-------------
src/mdebug.c | 15 ++-------------
src/prelink.c | 15 ++-------------
src/prelink.h | 15 ++-------------
src/prelinktab.h | 15 ++-------------
src/reloc-info.c | 15 ++-------------
src/reloc-info.h | 15 ++-------------
src/reloc.c | 15 ++-------------
src/reloc.h | 15 ++-------------
src/sha.c | 4 ++++
src/sha.h | 4 ++++
src/space.c | 15 ++-------------
src/space.h | 15 ++-------------
src/stabs.c | 15 ++-------------
src/undo.c | 15 ++-------------
src/undoall.c | 15 ++-------------
src/verify.c | 15 ++-------------
55 files changed, 116 insertions(+), 694 deletions(-)

diff --git a/src/arch-alpha.c b/src/arch-alpha.c
index 7802a3e..bc5c192 100644
--- a/src/arch-alpha.c
+++ b/src/arch-alpha.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-arm.c b/src/arch-arm.c
index eec7c57..b5ea886 100644
--- a/src/arch-arm.c
+++ b/src/arch-arm.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2004, 2009, 2011, 2013 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-cris.c b/src/arch-cris.c
index 3272779..634bf9f 100644
--- a/src/arch-cris.c
+++ b/src/arch-cris.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2004, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-i386.c b/src/arch-i386.c
index a1e0fcc..5a0b2ca 100644
--- a/src/arch-i386.c
+++ b/src/arch-i386.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2009, 2011 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-ia64.c b/src/arch-ia64.c
index 6039115..56196de 100644
--- a/src/arch-ia64.c
+++ b/src/arch-ia64.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-mips.c b/src/arch-mips.c
index 02c608f..2875ec3 100644
--- a/src/arch-mips.c
+++ b/src/arch-mips.c
@@ -2,20 +2,8 @@
Written by Richard Sandiford <richard@...>, 2006
Updated by Maciej W. Rozycki <macro@...>, 2008.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/
/* GENERAL NOTES

The psABI defines R_MIPS_REL32 as A - EA + S, where the value of EA
diff --git a/src/arch-ppc.c b/src/arch-ppc.c
index e22e5d5..e296d79 100644
--- a/src/arch-ppc.c
+++ b/src/arch-ppc.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009, 2011 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-ppc64.c b/src/arch-ppc64.c
index a764b99..3f2c375 100644
--- a/src/arch-ppc64.c
+++ b/src/arch-ppc64.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2002, 2003, 2004, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2002.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-s390.c b/src/arch-s390.c
index e5fe130..1a65f5c 100644
--- a/src/arch-s390.c
+++ b/src/arch-s390.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2009, 2010, 2013 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-s390x.c b/src/arch-s390x.c
index e4d82f7..926cfa2 100644
--- a/src/arch-s390x.c
+++ b/src/arch-s390x.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2009, 2013 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-sh.c b/src/arch-sh.c
index 1b11312..a852266 100644
--- a/src/arch-sh.c
+++ b/src/arch-sh.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-sparc.c b/src/arch-sparc.c
index e016a79..41b297d 100644
--- a/src/arch-sparc.c
+++ b/src/arch-sparc.c
@@ -1,19 +1,9 @@
/* Copyright (C) 2001, 2002, 2004, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+/*
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-sparc64.c b/src/arch-sparc64.c
index aee4601..c6a1027 100644
--- a/src/arch-sparc64.c
+++ b/src/arch-sparc64.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2004, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-x86_64.c b/src/arch-x86_64.c
index 2f6c551..249661a 100644
--- a/src/arch-x86_64.c
+++ b/src/arch-x86_64.c
@@ -3,19 +3,8 @@
Copyright (C) 2011 Wind River Systems, Inc.
x32 support by Mark Hatle <mark.hatle@...>

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/cache.c b/src/cache.c
index 1cc3217..b476581 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2006, 2013 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/canonicalize.c b/src/canonicalize.c
index 79df44e..e94ec06 100644
--- a/src/canonicalize.c
+++ b/src/canonicalize.c
@@ -2,20 +2,8 @@
Copyright (C) 1996-2002, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.

- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <assert.h>
#include <stdlib.h>
diff --git a/src/checksum.c b/src/checksum.c
index 20a23a0..5c80fc5 100644
--- a/src/checksum.c
+++ b/src/checksum.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/conflict.c b/src/conflict.c
index 5613ace..83713c5 100644
--- a/src/conflict.c
+++ b/src/conflict.c
@@ -3,19 +3,8 @@
Written by Jakub Jelinek <jakub@...>, 2001.
Updated by Maciej W. Rozycki <macro@...>, 2008.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/crc32.c b/src/crc32.c
index f36abb5..81e990b 100644
--- a/src/crc32.c
+++ b/src/crc32.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <stdint.h>
diff --git a/src/cxx.c b/src/cxx.c
index 4391ebe..4b911a9 100644
--- a/src/cxx.c
+++ b/src/cxx.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2007, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <alloca.h>
diff --git a/src/data.c b/src/data.c
index 751f96f..d648744 100644
--- a/src/data.c
+++ b/src/data.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include "prelink.h"
diff --git a/src/doit.c b/src/doit.c
index 3784866..42e6819 100644
--- a/src/doit.c
+++ b/src/doit.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2003, 2004, 2005, 2007 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <alloca.h>
diff --git a/src/dso.c b/src/dso.c
index 949abf9..9cce846 100644
--- a/src/dso.c
+++ b/src/dso.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2010 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/dwarf2.c b/src/dwarf2.c
index b9588b1..d230bb7 100644
--- a/src/dwarf2.c
+++ b/src/dwarf2.c
@@ -2,19 +2,8 @@
Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/dwarf2.h b/src/dwarf2.h
index b0c80b6..888f2c7 100644
--- a/src/dwarf2.h
+++ b/src/dwarf2.h
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2009, 2010, 2011, 2012 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#define DW_TAG_padding 0x00
#define DW_TAG_array_type 0x01
diff --git a/src/exec.c b/src/exec.c
index ca7fd14..431690e 100644
--- a/src/exec.c
+++ b/src/exec.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/execle_open.c b/src/execle_open.c
index 2ee5cbc..0d4bef5 100644
--- a/src/execle_open.c
+++ b/src/execle_open.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <errno.h>
diff --git a/src/execstack.c b/src/execstack.c
index 97fb453..fe044c5 100644
--- a/src/execstack.c
+++ b/src/execstack.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2003, 2005, 2010 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2003.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <errno.h>
diff --git a/src/fptr.c b/src/fptr.c
index cfe3aed..65a2804 100644
--- a/src/fptr.c
+++ b/src/fptr.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2007 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/fptr.h b/src/fptr.h
index 36ef7c6..c4ce3f7 100644
--- a/src/fptr.h
+++ b/src/fptr.h
@@ -1,19 +1,8 @@
/* Copyright (C) 2001 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef FPTR_H
#define FPTR_H
diff --git a/src/gather.c b/src/gather.c
index 277f1b5..0d1e7c4 100644
--- a/src/gather.c
+++ b/src/gather.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/get.c b/src/get.c
index 0659962..bb58b1e 100644
--- a/src/get.c
+++ b/src/get.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/hashtab.c b/src/hashtab.c
index fa27446..7dc389d 100644
--- a/src/hashtab.c
+++ b/src/hashtab.c
@@ -2,21 +2,8 @@
Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
Contributed by Vladimir Makarov (vmakarov@...).

-This file is part of the libiberty library.
-Libiberty is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-Libiberty 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
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with libiberty; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

/* This package implements basic hash table functionality. It is possible
to search for an entry, create an entry and destroy an entry.
diff --git a/src/hashtab.h b/src/hashtab.h
index 31e63e0..d3f297f 100644
--- a/src/hashtab.h
+++ b/src/hashtab.h
@@ -2,19 +2,8 @@
Copyright (C) 1999, 2000 Free Software Foundation, Inc.
Contributed by Vladimir Makarov (vmakarov@...).

-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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

/* This package implements basic hash table functionality. It is possible
to search for an entry, create an entry and destroy an entry.
@@ -29,6 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
expanded by creation of new hash table and transferring elements from
the old table to the new table. */

+
#ifndef __HASHTAB_H__
#define __HASHTAB_H__

diff --git a/src/layout.c b/src/layout.c
index 859ab66..29be7a3 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2006, 2011 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <alloca.h>
diff --git a/src/layout.h b/src/layout.h
index f481d22..1b10bc0 100644
--- a/src/layout.h
+++ b/src/layout.h
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2004, 2006 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef LAYOUT_H
#define LAYOUT_H
diff --git a/src/main.c b/src/main.c
index 6ba89d5..39e44ad 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2010, 2011 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <errno.h>
diff --git a/src/md5.c b/src/md5.c
index 0d2fdef..19a8e0b 100644
--- a/src/md5.c
+++ b/src/md5.c
@@ -4,21 +4,9 @@
NOTE: The canonical source of this file is maintained with the GNU C
Library. Bugs can be reported to bug-glibc@....

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-
-/* Written by Ulrich Drepper <drepper@...>, 1995. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <sys/types.h>
#include <stdlib.h>
diff --git a/src/md5.h b/src/md5.h
index 55f6195..eb0b85e 100644
--- a/src/md5.h
+++ b/src/md5.h
@@ -4,19 +4,8 @@
NOTE: The canonical source of this file is maintained with the GNU C
Library. Bugs can be reported to bug-glibc@....

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef _MD5_H
#define _MD5_H 1
diff --git a/src/mdebug.c b/src/mdebug.c
index 4c22d2f..eb6d1b5 100644
--- a/src/mdebug.c
+++ b/src/mdebug.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/prelink.c b/src/prelink.c
index 64c4fea..bf774c9 100644
--- a/src/prelink.c
+++ b/src/prelink.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/prelink.h b/src/prelink.h
index 39c4390..4c4c243 100644
--- a/src/prelink.h
+++ b/src/prelink.h
@@ -4,19 +4,8 @@
Written by Jakub Jelinek <jakub@...>, 2001.
Updated by Maciej W. Rozycki <macro@...>, 2008.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef PRELINK_H
#define PRELINK_H
diff --git a/src/prelinktab.h b/src/prelinktab.h
index f41c79c..a404292 100644
--- a/src/prelinktab.h
+++ b/src/prelinktab.h
@@ -1,19 +1,8 @@
/* Copyright (C) 2001 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef PRELINKTAB_H
#define PRELINKTAB_H
diff --git a/src/reloc-info.c b/src/reloc-info.c
index 4ce333c..d51cfc1 100644
--- a/src/reloc-info.c
+++ b/src/reloc-info.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2008 CodeSourcery
Written by Maciej W. Rozycki <macro@...>, 2008.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>

diff --git a/src/reloc-info.h b/src/reloc-info.h
index a8f8b7c..592a92c 100644
--- a/src/reloc-info.h
+++ b/src/reloc-info.h
@@ -1,19 +1,8 @@
/* Copyright (C) 2008 CodeSourcery
Written by Maciej W. Rozycki <macro@...>, 2008.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef RELOC_INFO_H
#define RELOC_INFO_H
diff --git a/src/reloc.c b/src/reloc.c
index deb0abe..9883dc7 100644
--- a/src/reloc.c
+++ b/src/reloc.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2005 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/reloc.h b/src/reloc.h
index a2ceff9..ee91f7e 100644
--- a/src/reloc.h
+++ b/src/reloc.h
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef RELOC_H
#define RELOC_H
diff --git a/src/sha.c b/src/sha.c
index cfbc956..f979bc4 100644
--- a/src/sha.c
+++ b/src/sha.c
@@ -1,3 +1,7 @@
+/*
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/
+
/* sha.c - Functions to compute the SHA1 hash (message-digest) of files
or blocks of memory. Complies to the NIST specification FIPS-180-1.

diff --git a/src/sha.h b/src/sha.h
index 13583e3..810072b 100644
--- a/src/sha.h
+++ b/src/sha.h
@@ -1,3 +1,7 @@
+/*
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/
+
/* sha.h - Declaration of functions and datatypes for SHA1 sum computing
library functions.

diff --git a/src/space.c b/src/space.c
index 4bd4760..8223daf 100644
--- a/src/space.c
+++ b/src/space.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2006, 2007 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/space.h b/src/space.h
index 5c9f725..59d087c 100644
--- a/src/space.h
+++ b/src/space.h
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2004 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef SPACE_H
#define SPACE_H
diff --git a/src/stabs.c b/src/stabs.c
index c0a5a6a..fd0ca28 100644
--- a/src/stabs.c
+++ b/src/stabs.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2005, 2006 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/undo.c b/src/undo.c
index 4c38dab..e6cfae3 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2005, 2010 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/undoall.c b/src/undoall.c
index 55d2a0b..44a0b4e 100644
--- a/src/undoall.c
+++ b/src/undoall.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2002, 2005 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2002.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <alloca.h>
diff --git a/src/verify.c b/src/verify.c
index 7f530c0..991794a 100644
--- a/src/verify.c
+++ b/src/verify.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2002, 2003, 2006, 2007, 2010 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2002.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
--
2.17.1


Re: Introdyction #yocto

Alexandru Vaduva
 

Good luck Tanya ;)

Enjoy the experience!

 

From: yocto@... [mailto:yocto@...] On Behalf Of tanyachawla0412@...
Sent: Thursday, October 8, 2020 7:18 PM
To: yocto@...
Subject: [yocto] Introdyction #yocto

 

Hi, I am Tanya. I am an Outreachy intern. Looking forward to contribute to the project and interact with everyone and learn about open source. 


[prelink-cross v2] Reverted to previous commit and added the SPDX identifiers

Meh Mbeh Ida Delphine <idadelm@...>
 

Signed-off-by: Meh Mbeh Ida Delphine <idadelm@...>
---
src/arch-alpha.c | 15 ++-------------
src/arch-arm.c | 15 ++-------------
src/arch-cris.c | 15 ++-------------
src/arch-i386.c | 15 ++-------------
src/arch-ia64.c | 15 ++-------------
src/arch-mips.c | 18 ++++--------------
src/arch-ppc.c | 15 ++-------------
src/arch-ppc64.c | 15 ++-------------
src/arch-s390.c | 15 ++-------------
src/arch-s390x.c | 15 ++-------------
src/arch-sh.c | 15 ++-------------
src/arch-sparc.c | 16 +++-------------
src/arch-sparc64.c | 15 ++-------------
src/arch-x86_64.c | 15 ++-------------
src/cache.c | 15 ++-------------
src/canonicalize.c | 16 ++--------------
src/checksum.c | 15 ++-------------
src/conflict.c | 15 ++-------------
src/crc32.c | 15 ++-------------
src/cxx.c | 15 ++-------------
src/data.c | 15 ++-------------
src/doit.c | 15 ++-------------
src/dso.c | 15 ++-------------
src/dwarf2.c | 15 ++-------------
src/dwarf2.h | 15 ++-------------
src/exec.c | 15 ++-------------
src/execle_open.c | 15 ++-------------
src/execstack.c | 15 ++-------------
src/fptr.c | 15 ++-------------
src/fptr.h | 15 ++-------------
src/gather.c | 15 ++-------------
src/get.c | 15 ++-------------
src/hashtab.c | 21 +++++----------------
src/hashtab.h | 19 +++++--------------
src/layout.c | 15 ++-------------
src/layout.h | 15 ++-------------
src/main.c | 15 ++-------------
src/md5.c | 16 ++--------------
src/md5.h | 15 ++-------------
src/mdebug.c | 15 ++-------------
src/prelink.c | 15 ++-------------
src/prelink.h | 15 ++-------------
src/prelinktab.h | 15 ++-------------
src/reloc-info.c | 15 ++-------------
src/reloc-info.h | 15 ++-------------
src/reloc.c | 15 ++-------------
src/reloc.h | 15 ++-------------
src/sha.c | 4 ++++
src/sha.h | 4 ++++
src/space.c | 15 ++-------------
src/space.h | 15 ++-------------
src/stabs.c | 15 ++-------------
src/undo.c | 15 ++-------------
src/undoall.c | 15 ++-------------
src/verify.c | 15 ++-------------
55 files changed, 123 insertions(+), 696 deletions(-)

diff --git a/src/arch-alpha.c b/src/arch-alpha.c
index 7802a3e..bc5c192 100644
--- a/src/arch-alpha.c
+++ b/src/arch-alpha.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-arm.c b/src/arch-arm.c
index eec7c57..b5ea886 100644
--- a/src/arch-arm.c
+++ b/src/arch-arm.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2004, 2009, 2011, 2013 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-cris.c b/src/arch-cris.c
index 3272779..634bf9f 100644
--- a/src/arch-cris.c
+++ b/src/arch-cris.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2004, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-i386.c b/src/arch-i386.c
index a1e0fcc..5a0b2ca 100644
--- a/src/arch-i386.c
+++ b/src/arch-i386.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2009, 2011 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-ia64.c b/src/arch-ia64.c
index 6039115..56196de 100644
--- a/src/arch-ia64.c
+++ b/src/arch-ia64.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-mips.c b/src/arch-mips.c
index 02c608f..9431759 100644
--- a/src/arch-mips.c
+++ b/src/arch-mips.c
@@ -2,20 +2,6 @@
Written by Richard Sandiford <richard@...>, 2006
Updated by Maciej W. Rozycki <macro@...>, 2008.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-
/* GENERAL NOTES

The psABI defines R_MIPS_REL32 as A - EA + S, where the value of EA
@@ -78,6 +64,10 @@
for type E would either be a no-op (if the GOT entry already contains
st_value) or would lose the address of the lazy binding stub. */

+/*
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/
+
#include <config.h>
#include <assert.h>
#include <errno.h>
diff --git a/src/arch-ppc.c b/src/arch-ppc.c
index e22e5d5..e296d79 100644
--- a/src/arch-ppc.c
+++ b/src/arch-ppc.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009, 2011 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-ppc64.c b/src/arch-ppc64.c
index a764b99..3f2c375 100644
--- a/src/arch-ppc64.c
+++ b/src/arch-ppc64.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2002, 2003, 2004, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2002.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-s390.c b/src/arch-s390.c
index e5fe130..1a65f5c 100644
--- a/src/arch-s390.c
+++ b/src/arch-s390.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2009, 2010, 2013 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-s390x.c b/src/arch-s390x.c
index e4d82f7..926cfa2 100644
--- a/src/arch-s390x.c
+++ b/src/arch-s390x.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2009, 2013 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-sh.c b/src/arch-sh.c
index 1b11312..a852266 100644
--- a/src/arch-sh.c
+++ b/src/arch-sh.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-sparc.c b/src/arch-sparc.c
index e016a79..41b297d 100644
--- a/src/arch-sparc.c
+++ b/src/arch-sparc.c
@@ -1,19 +1,9 @@
/* Copyright (C) 2001, 2002, 2004, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+/*
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-sparc64.c b/src/arch-sparc64.c
index aee4601..c6a1027 100644
--- a/src/arch-sparc64.c
+++ b/src/arch-sparc64.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2004, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-x86_64.c b/src/arch-x86_64.c
index 2f6c551..249661a 100644
--- a/src/arch-x86_64.c
+++ b/src/arch-x86_64.c
@@ -3,19 +3,8 @@
Copyright (C) 2011 Wind River Systems, Inc.
x32 support by Mark Hatle <mark.hatle@...>

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/cache.c b/src/cache.c
index 1cc3217..b476581 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2006, 2013 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/canonicalize.c b/src/canonicalize.c
index 79df44e..e94ec06 100644
--- a/src/canonicalize.c
+++ b/src/canonicalize.c
@@ -2,20 +2,8 @@
Copyright (C) 1996-2002, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.

- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <assert.h>
#include <stdlib.h>
diff --git a/src/checksum.c b/src/checksum.c
index 20a23a0..5c80fc5 100644
--- a/src/checksum.c
+++ b/src/checksum.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/conflict.c b/src/conflict.c
index 5613ace..83713c5 100644
--- a/src/conflict.c
+++ b/src/conflict.c
@@ -3,19 +3,8 @@
Written by Jakub Jelinek <jakub@...>, 2001.
Updated by Maciej W. Rozycki <macro@...>, 2008.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/crc32.c b/src/crc32.c
index f36abb5..81e990b 100644
--- a/src/crc32.c
+++ b/src/crc32.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <stdint.h>
diff --git a/src/cxx.c b/src/cxx.c
index 4391ebe..4b911a9 100644
--- a/src/cxx.c
+++ b/src/cxx.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2007, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <alloca.h>
diff --git a/src/data.c b/src/data.c
index 751f96f..d648744 100644
--- a/src/data.c
+++ b/src/data.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include "prelink.h"
diff --git a/src/doit.c b/src/doit.c
index 3784866..42e6819 100644
--- a/src/doit.c
+++ b/src/doit.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2003, 2004, 2005, 2007 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <alloca.h>
diff --git a/src/dso.c b/src/dso.c
index 949abf9..9cce846 100644
--- a/src/dso.c
+++ b/src/dso.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2010 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/dwarf2.c b/src/dwarf2.c
index b9588b1..d230bb7 100644
--- a/src/dwarf2.c
+++ b/src/dwarf2.c
@@ -2,19 +2,8 @@
Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/dwarf2.h b/src/dwarf2.h
index b0c80b6..888f2c7 100644
--- a/src/dwarf2.h
+++ b/src/dwarf2.h
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2009, 2010, 2011, 2012 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#define DW_TAG_padding 0x00
#define DW_TAG_array_type 0x01
diff --git a/src/exec.c b/src/exec.c
index ca7fd14..431690e 100644
--- a/src/exec.c
+++ b/src/exec.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/execle_open.c b/src/execle_open.c
index 2ee5cbc..0d4bef5 100644
--- a/src/execle_open.c
+++ b/src/execle_open.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <errno.h>
diff --git a/src/execstack.c b/src/execstack.c
index 97fb453..fe044c5 100644
--- a/src/execstack.c
+++ b/src/execstack.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2003, 2005, 2010 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2003.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <errno.h>
diff --git a/src/fptr.c b/src/fptr.c
index cfe3aed..65a2804 100644
--- a/src/fptr.c
+++ b/src/fptr.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2007 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/fptr.h b/src/fptr.h
index 36ef7c6..c4ce3f7 100644
--- a/src/fptr.h
+++ b/src/fptr.h
@@ -1,19 +1,8 @@
/* Copyright (C) 2001 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef FPTR_H
#define FPTR_H
diff --git a/src/gather.c b/src/gather.c
index 277f1b5..0d1e7c4 100644
--- a/src/gather.c
+++ b/src/gather.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/get.c b/src/get.c
index 0659962..bb58b1e 100644
--- a/src/get.c
+++ b/src/get.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/hashtab.c b/src/hashtab.c
index fa27446..12e4f30 100644
--- a/src/hashtab.c
+++ b/src/hashtab.c
@@ -1,22 +1,7 @@
/* An expandable hash tables datatype.
Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
Contributed by Vladimir Makarov (vmakarov@...).
-
-This file is part of the libiberty library.
-Libiberty is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-Libiberty 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
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with libiberty; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+*/

/* This package implements basic hash table functionality. It is possible
to search for an entry, create an entry and destroy an entry.
@@ -31,6 +16,10 @@ Boston, MA 02111-1307, USA. */
expanded by creation of new hash table and transferring elements from
the old table to the new table. */

+/*
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/
+
#include <config.h>
#include <sys/types.h>
#include <stdlib.h>
diff --git a/src/hashtab.h b/src/hashtab.h
index 31e63e0..d412057 100644
--- a/src/hashtab.h
+++ b/src/hashtab.h
@@ -1,20 +1,7 @@
/* An expandable hash tables datatype.
Copyright (C) 1999, 2000 Free Software Foundation, Inc.
Contributed by Vladimir Makarov (vmakarov@...).
-
-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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ */

/* This package implements basic hash table functionality. It is possible
to search for an entry, create an entry and destroy an entry.
@@ -29,6 +16,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
expanded by creation of new hash table and transferring elements from
the old table to the new table. */

+/*
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/
+
#ifndef __HASHTAB_H__
#define __HASHTAB_H__

diff --git a/src/layout.c b/src/layout.c
index 859ab66..29be7a3 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2006, 2011 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <alloca.h>
diff --git a/src/layout.h b/src/layout.h
index f481d22..1b10bc0 100644
--- a/src/layout.h
+++ b/src/layout.h
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2004, 2006 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef LAYOUT_H
#define LAYOUT_H
diff --git a/src/main.c b/src/main.c
index 6ba89d5..39e44ad 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2010, 2011 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <errno.h>
diff --git a/src/md5.c b/src/md5.c
index 0d2fdef..19a8e0b 100644
--- a/src/md5.c
+++ b/src/md5.c
@@ -4,21 +4,9 @@
NOTE: The canonical source of this file is maintained with the GNU C
Library. Bugs can be reported to bug-glibc@....

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-
-/* Written by Ulrich Drepper <drepper@...>, 1995. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <sys/types.h>
#include <stdlib.h>
diff --git a/src/md5.h b/src/md5.h
index 55f6195..eb0b85e 100644
--- a/src/md5.h
+++ b/src/md5.h
@@ -4,19 +4,8 @@
NOTE: The canonical source of this file is maintained with the GNU C
Library. Bugs can be reported to bug-glibc@....

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef _MD5_H
#define _MD5_H 1
diff --git a/src/mdebug.c b/src/mdebug.c
index 4c22d2f..eb6d1b5 100644
--- a/src/mdebug.c
+++ b/src/mdebug.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/prelink.c b/src/prelink.c
index 64c4fea..bf774c9 100644
--- a/src/prelink.c
+++ b/src/prelink.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/prelink.h b/src/prelink.h
index 39c4390..4c4c243 100644
--- a/src/prelink.h
+++ b/src/prelink.h
@@ -4,19 +4,8 @@
Written by Jakub Jelinek <jakub@...>, 2001.
Updated by Maciej W. Rozycki <macro@...>, 2008.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef PRELINK_H
#define PRELINK_H
diff --git a/src/prelinktab.h b/src/prelinktab.h
index f41c79c..a404292 100644
--- a/src/prelinktab.h
+++ b/src/prelinktab.h
@@ -1,19 +1,8 @@
/* Copyright (C) 2001 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef PRELINKTAB_H
#define PRELINKTAB_H
diff --git a/src/reloc-info.c b/src/reloc-info.c
index 4ce333c..d51cfc1 100644
--- a/src/reloc-info.c
+++ b/src/reloc-info.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2008 CodeSourcery
Written by Maciej W. Rozycki <macro@...>, 2008.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>

diff --git a/src/reloc-info.h b/src/reloc-info.h
index a8f8b7c..592a92c 100644
--- a/src/reloc-info.h
+++ b/src/reloc-info.h
@@ -1,19 +1,8 @@
/* Copyright (C) 2008 CodeSourcery
Written by Maciej W. Rozycki <macro@...>, 2008.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef RELOC_INFO_H
#define RELOC_INFO_H
diff --git a/src/reloc.c b/src/reloc.c
index deb0abe..9883dc7 100644
--- a/src/reloc.c
+++ b/src/reloc.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2005 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/reloc.h b/src/reloc.h
index a2ceff9..ee91f7e 100644
--- a/src/reloc.h
+++ b/src/reloc.h
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef RELOC_H
#define RELOC_H
diff --git a/src/sha.c b/src/sha.c
index cfbc956..38e520c 100644
--- a/src/sha.c
+++ b/src/sha.c
@@ -8,6 +8,10 @@
NOTE: The canonical source of this file is maintained in GNU coreutils.
*/

+/*
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/
+
#include <sys/types.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/sha.h b/src/sha.h
index 13583e3..055b4a4 100644
--- a/src/sha.h
+++ b/src/sha.h
@@ -4,6 +4,10 @@
Copyright (C) 1999, Scott G. Miller
*/

+/*
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/
+
#ifndef _SHA_H
# define _SHA_H 1

diff --git a/src/space.c b/src/space.c
index 4bd4760..8223daf 100644
--- a/src/space.c
+++ b/src/space.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2006, 2007 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/space.h b/src/space.h
index 5c9f725..59d087c 100644
--- a/src/space.h
+++ b/src/space.h
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2004 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef SPACE_H
#define SPACE_H
diff --git a/src/stabs.c b/src/stabs.c
index c0a5a6a..fd0ca28 100644
--- a/src/stabs.c
+++ b/src/stabs.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2005, 2006 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/undo.c b/src/undo.c
index 4c38dab..e6cfae3 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2005, 2010 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2001.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/undoall.c b/src/undoall.c
index 55d2a0b..44a0b4e 100644
--- a/src/undoall.c
+++ b/src/undoall.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2002, 2005 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2002.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <alloca.h>
diff --git a/src/verify.c b/src/verify.c
index 7f530c0..991794a 100644
--- a/src/verify.c
+++ b/src/verify.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2002, 2003, 2006, 2007, 2010 Red Hat, Inc.
Written by Jakub Jelinek <jakub@...>, 2002.

- 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
--
2.17.1

6781 - 6800 of 57742