From: Yu Watanabe Date: Mon, 9 Nov 2020 04:25:50 +0000 (+0900) Subject: license: GPL-2.0+ -> GPL-2.0-or-later X-Git-Tag: v247-rc2~18^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F17548%2Fhead;p=thirdparty%2Fsystemd.git license: GPL-2.0+ -> GPL-2.0-or-later --- diff --git a/src/udev/ata_id/ata_id.c b/src/udev/ata_id/ata_id.c index b5e14922a25..ce0bf5d24be 100644 --- a/src/udev/ata_id/ata_id.c +++ b/src/udev/ata_id/ata_id.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * ata_id - reads product/serial number from ATA drives * diff --git a/src/udev/cdrom_id/cdrom_id.c b/src/udev/cdrom_id/cdrom_id.c index 13b947beb1b..804cc7c5aa5 100644 --- a/src/udev/cdrom_id/cdrom_id.c +++ b/src/udev/cdrom_id/cdrom_id.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * cdrom_id - optical drive and media information prober */ diff --git a/src/udev/mtd_probe/mtd_probe.c b/src/udev/mtd_probe/mtd_probe.c index f47b13378c5..df1f1c173a3 100644 --- a/src/udev/mtd_probe/mtd_probe.c +++ b/src/udev/mtd_probe/mtd_probe.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright © 2010 - Maxim Levitsky * diff --git a/src/udev/mtd_probe/mtd_probe.h b/src/udev/mtd_probe/mtd_probe.h index 1d8c93b7fd6..ae03a7d2f7e 100644 --- a/src/udev/mtd_probe/mtd_probe.h +++ b/src/udev/mtd_probe/mtd_probe.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once /* diff --git a/src/udev/mtd_probe/probe_smartmedia.c b/src/udev/mtd_probe/probe_smartmedia.c index f8e1b140f52..f4612ba4f9c 100644 --- a/src/udev/mtd_probe/probe_smartmedia.c +++ b/src/udev/mtd_probe/probe_smartmedia.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright © 2010 - Maxim Levitsky * diff --git a/src/udev/scsi_id/scsi.h b/src/udev/scsi_id/scsi.h index 208b3e72ab6..ee3e401b7a9 100644 --- a/src/udev/scsi_id/scsi.h +++ b/src/udev/scsi_id/scsi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once /* diff --git a/src/udev/scsi_id/scsi_id.c b/src/udev/scsi_id/scsi_id.c index 9c33a560a8c..57202564da5 100644 --- a/src/udev/scsi_id/scsi_id.c +++ b/src/udev/scsi_id/scsi_id.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright © IBM Corp. 2003 * Copyright © SUSE Linux Products GmbH, 2006 diff --git a/src/udev/scsi_id/scsi_id.h b/src/udev/scsi_id/scsi_id.h index 70e804fb75d..2fe64f45f25 100644 --- a/src/udev/scsi_id/scsi_id.h +++ b/src/udev/scsi_id/scsi_id.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once /* diff --git a/src/udev/scsi_id/scsi_serial.c b/src/udev/scsi_id/scsi_serial.c index 7f25824df3d..4fe725477f5 100644 --- a/src/udev/scsi_id/scsi_serial.c +++ b/src/udev/scsi_id/scsi_serial.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright © IBM Corp. 2003 * diff --git a/src/udev/udev-builtin-blkid.c b/src/udev/udev-builtin-blkid.c index 1df41dab36b..3f64548ad07 100644 --- a/src/udev/udev-builtin-blkid.c +++ b/src/udev/udev-builtin-blkid.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * probe disks for filesystems and partitions * diff --git a/src/udev/udev-builtin-input_id.c b/src/udev/udev-builtin-input_id.c index 81dd03e4c50..6a4911ca348 100644 --- a/src/udev/udev-builtin-input_id.c +++ b/src/udev/udev-builtin-input_id.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * expose input properties via udev * diff --git a/src/udev/udev-builtin-kmod.c b/src/udev/udev-builtin-kmod.c index b3daddcdd54..3be8bd56f46 100644 --- a/src/udev/udev-builtin-kmod.c +++ b/src/udev/udev-builtin-kmod.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * load kernel modules * diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c index 6c020ac0ed0..0da59e2c756 100644 --- a/src/udev/udev-builtin-path_id.c +++ b/src/udev/udev-builtin-path_id.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * compose persistent device path * diff --git a/src/udev/udev-builtin-uaccess.c b/src/udev/udev-builtin-uaccess.c index d552316eee0..cfdf130f127 100644 --- a/src/udev/udev-builtin-uaccess.c +++ b/src/udev/udev-builtin-uaccess.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * manage device node user ACL */ diff --git a/src/udev/udev-builtin-usb_id.c b/src/udev/udev-builtin-usb_id.c index 758b5ed7e21..fa554e740f3 100644 --- a/src/udev/udev-builtin-usb_id.c +++ b/src/udev/udev-builtin-usb_id.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * USB device properties and persistent device path * diff --git a/src/udev/udev-builtin.h b/src/udev/udev-builtin.h index 99af5055514..14d6406d2b1 100644 --- a/src/udev/udev-builtin.h +++ b/src/udev/udev-builtin.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once #include diff --git a/src/udev/udev-ctrl.h b/src/udev/udev-ctrl.h index 2c84a8b16d8..680fbf7bff1 100644 --- a/src/udev/udev-ctrl.h +++ b/src/udev/udev-ctrl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once #include "sd-event.h" diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c index ede8e3aef72..fd00a24e991 100644 --- a/src/udev/udev-event.c +++ b/src/udev/udev-event.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #include #include diff --git a/src/udev/udev-event.h b/src/udev/udev-event.h index a0193ffef35..864782822cd 100644 --- a/src/udev/udev-event.h +++ b/src/udev/udev-event.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once /* diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c index 2cc26d29fa6..9d4b7d91e8b 100644 --- a/src/udev/udev-node.c +++ b/src/udev/udev-node.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #include #include diff --git a/src/udev/udev-node.h b/src/udev/udev-node.h index 5ae816d66f1..84c7e4567fa 100644 --- a/src/udev/udev-node.h +++ b/src/udev/udev-node.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once #include diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c index e01d75580a8..ef6a0c112cb 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #include diff --git a/src/udev/udev-rules.h b/src/udev/udev-rules.h index cdb98e8cecc..3f40a5395ec 100644 --- a/src/udev/udev-rules.h +++ b/src/udev/udev-rules.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once #include "hashmap.h" diff --git a/src/udev/udev-watch.c b/src/udev/udev-watch.c index d87a43537cf..8656fb0076d 100644 --- a/src/udev/udev-watch.c +++ b/src/udev/udev-watch.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright © 2009 Canonical Ltd. * Copyright © 2009 Scott James Remnant diff --git a/src/udev/udev-watch.h b/src/udev/udev-watch.h index 24a136d2611..a15fa2767e8 100644 --- a/src/udev/udev-watch.h +++ b/src/udev/udev-watch.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once #include "sd-device.h" diff --git a/src/udev/udevadm-control.c b/src/udev/udevadm-control.c index 6096dcbe781..ef23a6c9f65 100644 --- a/src/udev/udevadm-control.c +++ b/src/udev/udevadm-control.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * 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 diff --git a/src/udev/udevadm-info.c b/src/udev/udevadm-info.c index 27e9a226cbf..5ff6256dfa5 100644 --- a/src/udev/udevadm-info.c +++ b/src/udev/udevadm-info.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #include #include diff --git a/src/udev/udevadm-monitor.c b/src/udev/udevadm-monitor.c index 52f27ed9416..cae7f1bbb85 100644 --- a/src/udev/udevadm-monitor.c +++ b/src/udev/udevadm-monitor.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #include #include diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c index 66c7103d783..2bd58535537 100644 --- a/src/udev/udevadm-settle.c +++ b/src/udev/udevadm-settle.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright © 2009 Canonical Ltd. * Copyright © 2009 Scott James Remnant diff --git a/src/udev/udevadm-test-builtin.c b/src/udev/udevadm-test-builtin.c index eb5d3e2b905..8995e5ccaeb 100644 --- a/src/udev/udevadm-test-builtin.c +++ b/src/udev/udevadm-test-builtin.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #include #include diff --git a/src/udev/udevadm-test.c b/src/udev/udevadm-test.c index 0d84b31ff02..a029622af9d 100644 --- a/src/udev/udevadm-test.c +++ b/src/udev/udevadm-test.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright © 2003-2004 Greg Kroah-Hartman */ diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c index a588d18fd11..5c74184c336 100644 --- a/src/udev/udevadm-trigger.c +++ b/src/udev/udevadm-trigger.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #include #include diff --git a/src/udev/udevadm-util.c b/src/udev/udevadm-util.c index bc21115ebdd..39d0c7eb3f1 100644 --- a/src/udev/udevadm-util.c +++ b/src/udev/udevadm-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #include diff --git a/src/udev/udevadm-util.h b/src/udev/udevadm-util.h index 59e89022a06..91587c5492a 100644 --- a/src/udev/udevadm-util.h +++ b/src/udev/udevadm-util.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once #include "sd-device.h" diff --git a/src/udev/udevadm.c b/src/udev/udevadm.c index e476f88f008..408e4a34676 100644 --- a/src/udev/udevadm.c +++ b/src/udev/udevadm.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #include #include diff --git a/src/udev/udevadm.h b/src/udev/udevadm.h index 86b24af086d..162bbb9a436 100644 --- a/src/udev/udevadm.h +++ b/src/udev/udevadm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once #include diff --git a/src/udev/udevd.c b/src/udev/udevd.c index 18079d363d8..b6544988c64 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright © 2004 Chris Friesen * Copyright © 2009 Canonical Ltd. diff --git a/src/udev/udevd.h b/src/udev/udevd.h index 848ffc245b4..583e8952255 100644 --- a/src/udev/udevd.h +++ b/src/udev/udevd.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once int run_udevd(int argc, char *argv[]); diff --git a/src/udev/v4l_id/v4l_id.c b/src/udev/v4l_id/v4l_id.c index 5de26b80623..932446b766d 100644 --- a/src/udev/v4l_id/v4l_id.c +++ b/src/udev/v4l_id/v4l_id.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2009 Filippo Argiolas *