From 0ef64bdb40c54681e8dd5ab8df42ac88e4ab1d4a Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 16 Aug 2010 20:14:46 +0200 Subject: *: make GNU licensing statement forms more regular This change retains "or later" state! No licensing _changes_ here, only form is adjusted (article, space between "GPL" and "v2" and so on). Signed-off-by: Denys Vlasenko --- util-linux/Kbuild.src | 2 +- util-linux/acpid.c | 2 +- util-linux/blkid.c | 2 +- util-linux/dmesg.c | 2 +- util-linux/fbset.c | 2 +- util-linux/fdformat.c | 2 +- util-linux/fdisk.c | 2 +- util-linux/fdisk_aix.c | 2 +- util-linux/fdisk_sgi.c | 2 +- util-linux/fdisk_sun.c | 2 +- util-linux/findfs.c | 2 +- util-linux/freeramdisk.c | 2 +- util-linux/fsck_minix.c | 2 +- util-linux/getopt.c | 2 +- util-linux/hexdump.c | 2 +- util-linux/hwclock.c | 2 +- util-linux/ipcrm.c | 2 +- util-linux/ipcs.c | 2 +- util-linux/losetup.c | 2 +- util-linux/lspci.c | 2 +- util-linux/lsusb.c | 2 +- util-linux/mdev.c | 2 +- util-linux/mkfs_ext2.c | 2 +- util-linux/mkfs_minix.c | 2 +- util-linux/mkfs_reiser.c | 2 +- util-linux/mkfs_vfat.c | 2 +- util-linux/mkswap.c | 2 +- util-linux/more.c | 2 +- util-linux/mount.c | 4 ++-- util-linux/pivot_root.c | 2 +- util-linux/rdate.c | 2 +- util-linux/rdev.c | 2 +- util-linux/readprofile.c | 2 +- util-linux/rev.c | 2 +- util-linux/rtcwake.c | 2 +- util-linux/script.c | 2 +- util-linux/scriptreplay.c | 2 +- util-linux/setarch.c | 2 +- util-linux/swaponoff.c | 2 +- util-linux/switch_root.c | 2 +- util-linux/umount.c | 2 +- util-linux/volume_id/Kbuild.src | 2 +- util-linux/volume_id/get_devname.c | 2 +- 43 files changed, 44 insertions(+), 44 deletions(-) (limited to 'util-linux') diff --git a/util-linux/Kbuild.src b/util-linux/Kbuild.src index afc0db50e..c06d911ec 100644 --- a/util-linux/Kbuild.src +++ b/util-linux/Kbuild.src @@ -2,7 +2,7 @@ # # Copyright (C) 1999-2005 by Erik Andersen # -# Licensed under the GPL v2, see the file LICENSE in this tarball. +# Licensed under GPLv2, see file LICENSE in this source tree. lib-y:= diff --git a/util-linux/acpid.c b/util-linux/acpid.c index 11a9f624a..c3b3c8b0b 100644 --- a/util-linux/acpid.c +++ b/util-linux/acpid.c @@ -4,7 +4,7 @@ * * Copyright (C) 2008 by Vladimir Dronnikov * - * Licensed under GPLv2, see file LICENSE in this tarball for details. + * Licensed under GPLv2, see file LICENSE in this source tree. */ #include "libbb.h" diff --git a/util-linux/blkid.c b/util-linux/blkid.c index ec699d167..4ce44b144 100644 --- a/util-linux/blkid.c +++ b/util-linux/blkid.c @@ -4,7 +4,7 @@ * * Copyright (C) 2008 Denys Vlasenko. * - * Licensed under GPLv2, see file LICENSE in this tarball for details. + * Licensed under GPLv2, see file LICENSE in this source tree. */ #include "libbb.h" diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c index b0dc592d2..06a03d3fb 100644 --- a/util-linux/dmesg.c +++ b/util-linux/dmesg.c @@ -6,7 +6,7 @@ * Copyright 2006 Rob Landley * Copyright 2006 Bernhard Reutner-Fischer * - * Licensed under GPLv2, see file LICENSE in this tarball for details. + * Licensed under GPLv2, see file LICENSE in this source tree. */ #include #include "libbb.h" diff --git a/util-linux/fbset.c b/util-linux/fbset.c index 2769a371a..07c8f55d1 100644 --- a/util-linux/fbset.c +++ b/util-linux/fbset.c @@ -4,7 +4,7 @@ * * Copyright (C) 1999 by Randolph Chung * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. * * This is a from-scratch implementation of fbset; but the de facto fbset * implementation was a good reference. fbset (original) is released under diff --git a/util-linux/fdformat.c b/util-linux/fdformat.c index 3831ab44e..f5c386c46 100644 --- a/util-linux/fdformat.c +++ b/util-linux/fdformat.c @@ -2,7 +2,7 @@ /* fdformat.c - Low-level formats a floppy disk - Werner Almesberger * 5 July 2003 -- modified for Busybox by Erik Andersen * - * Licensed under GPLv2, see file LICENSE in this tarball for details. + * Licensed under GPLv2, see file LICENSE in this source tree. */ #include "libbb.h" diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c index fc02000e5..b6417a355 100644 --- a/util-linux/fdisk.c +++ b/util-linux/fdisk.c @@ -4,7 +4,7 @@ * Copyright (C) 1992 A. V. Le Blanc (LeBlanc@mcc.ac.uk) * Copyright (C) 2001,2002 Vladimir Oleynik (initial bb port) * - * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ #ifndef _LARGEFILE64_SOURCE diff --git a/util-linux/fdisk_aix.c b/util-linux/fdisk_aix.c index 2a0ab1744..ee5df50e5 100644 --- a/util-linux/fdisk_aix.c +++ b/util-linux/fdisk_aix.c @@ -2,7 +2,7 @@ /* * Copyright (C) Andreas Neuper, Sep 1998. * - * Licensed under GPLv2, see file LICENSE in this tarball for details. + * Licensed under GPLv2, see file LICENSE in this source tree. */ typedef struct { diff --git a/util-linux/fdisk_sgi.c b/util-linux/fdisk_sgi.c index 0e3cff50c..785fc661b 100644 --- a/util-linux/fdisk_sgi.c +++ b/util-linux/fdisk_sgi.c @@ -1,7 +1,7 @@ /* * Copyright (C) Andreas Neuper, Sep 1998. * - * Licensed under GPLv2, see file LICENSE in this tarball for details. + * Licensed under GPLv2, see file LICENSE in this source tree. */ #if ENABLE_FEATURE_SGI_LABEL diff --git a/util-linux/fdisk_sun.c b/util-linux/fdisk_sun.c index 463082f6a..6b7940c54 100644 --- a/util-linux/fdisk_sun.c +++ b/util-linux/fdisk_sun.c @@ -9,7 +9,7 @@ * Sat Mar 20 EST 1999 Arnaldo Carvalho de Melo * Internationalization * - * Licensed under GPLv2, see file LICENSE in this tarball for details. + * Licensed under GPLv2, see file LICENSE in this source tree. */ #if ENABLE_FEATURE_SUN_LABEL diff --git a/util-linux/findfs.c b/util-linux/findfs.c index 1e9c68752..e1ec41f1b 100644 --- a/util-linux/findfs.c +++ b/util-linux/findfs.c @@ -5,7 +5,7 @@ * Copyright (C) 2006 by Jason Schoon * Some portions cribbed from e2fsprogs, util-linux, dosfstools * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ #include "libbb.h" diff --git a/util-linux/freeramdisk.c b/util-linux/freeramdisk.c index 4949056a6..7ad443086 100644 --- a/util-linux/freeramdisk.c +++ b/util-linux/freeramdisk.c @@ -6,7 +6,7 @@ * Adjusted a bit by Erik Andersen * Unified with fdflush by Tito Ragusa * - * Licensed under GPLv2, see file LICENSE in this tarball for details. + * Licensed under GPLv2, see file LICENSE in this source tree. */ #include #include "libbb.h" diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c index 970f5f79f..e02e05fa4 100644 --- a/util-linux/fsck_minix.c +++ b/util-linux/fsck_minix.c @@ -4,7 +4,7 @@ * * (C) 1991, 1992 Linus Torvalds. * - * Licensed under GPLv2, see file LICENSE in this tarball for details. + * Licensed under GPLv2, see file LICENSE in this source tree. */ /* diff --git a/util-linux/getopt.c b/util-linux/getopt.c index adb96751f..7c498538f 100644 --- a/util-linux/getopt.c +++ b/util-linux/getopt.c @@ -3,7 +3,7 @@ * getopt.c - Enhanced implementation of BSD getopt(1) * Copyright (c) 1997, 1998, 1999, 2000 Frodo Looijaard * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* diff --git a/util-linux/hexdump.c b/util-linux/hexdump.c index 3db91113d..8c4d521ab 100644 --- a/util-linux/hexdump.c +++ b/util-linux/hexdump.c @@ -6,7 +6,7 @@ * Copyright (c) 1989 * The Regents of the University of California. All rights reserved. * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ #include "libbb.h" diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c index 3da2e23c3..922dd0578 100644 --- a/util-linux/hwclock.c +++ b/util-linux/hwclock.c @@ -4,7 +4,7 @@ * * Copyright (C) 2002 Robert Griebl * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ #include "libbb.h" diff --git a/util-linux/ipcrm.c b/util-linux/ipcrm.c index 8b0b226d3..6360c706f 100644 --- a/util-linux/ipcrm.c +++ b/util-linux/ipcrm.c @@ -5,7 +5,7 @@ * 01 Sept 2004 - Rodney Radford * Adapted for busybox from util-linux-2.12a. * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ #include "libbb.h" diff --git a/util-linux/ipcs.c b/util-linux/ipcs.c index c1103b093..14df65280 100644 --- a/util-linux/ipcs.c +++ b/util-linux/ipcs.c @@ -5,7 +5,7 @@ * 01 Sept 2004 - Rodney Radford * Adapted for busybox from util-linux-2.12a. * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* X/OPEN tells us to use for semctl() */ diff --git a/util-linux/losetup.c b/util-linux/losetup.c index 3873be399..776f784f5 100644 --- a/util-linux/losetup.c +++ b/util-linux/losetup.c @@ -4,7 +4,7 @@ * * Copyright (C) 2002 Matt Kraai. * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ #include "libbb.h" diff --git a/util-linux/lspci.c b/util-linux/lspci.c index 514c3a4e0..46e93b04d 100644 --- a/util-linux/lspci.c +++ b/util-linux/lspci.c @@ -4,7 +4,7 @@ * * Copyright (C) 2009 Malek Degachi * - * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ #include "libbb.h" diff --git a/util-linux/lsusb.c b/util-linux/lsusb.c index 23b03495f..6f9b54daa 100644 --- a/util-linux/lsusb.c +++ b/util-linux/lsusb.c @@ -4,7 +4,7 @@ * * Copyright (C) 2009 Malek Degachi * - * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ #include "libbb.h" diff --git a/util-linux/mdev.c b/util-linux/mdev.c index cd6c1a89d..a970f91f2 100644 --- a/util-linux/mdev.c +++ b/util-linux/mdev.c @@ -5,7 +5,7 @@ * Copyright 2005 Rob Landley * Copyright 2005 Frank Sorenson * - * Licensed under GPL version 2, see file LICENSE in this tarball for details. + * Licensed under GPLv2, see file LICENSE in this source tree. */ #include "libbb.h" #include "xregex.h" diff --git a/util-linux/mkfs_ext2.c b/util-linux/mkfs_ext2.c index 14feb9288..1c2b3b2e2 100644 --- a/util-linux/mkfs_ext2.c +++ b/util-linux/mkfs_ext2.c @@ -5,7 +5,7 @@ * * Busybox'ed (2009) by Vladimir Dronnikov * - * Licensed under GPLv2, see file LICENSE in this tarball for details. + * Licensed under GPLv2, see file LICENSE in this source tree. */ #include "libbb.h" #include diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c index abfb94226..9e826aef3 100644 --- a/util-linux/mkfs_minix.c +++ b/util-linux/mkfs_minix.c @@ -4,7 +4,7 @@ * * (C) 1991 Linus Torvalds. * - * Licensed under GPLv2, see file LICENSE in this tarball for details. + * Licensed under GPLv2, see file LICENSE in this source tree. */ /* diff --git a/util-linux/mkfs_reiser.c b/util-linux/mkfs_reiser.c index f9a0ca82a..6e172d6d3 100644 --- a/util-linux/mkfs_reiser.c +++ b/util-linux/mkfs_reiser.c @@ -4,7 +4,7 @@ * * Busybox'ed (2009) by Vladimir Dronnikov * - * Licensed under GPLv2, see file LICENSE in this tarball for details. + * Licensed under GPLv2, see file LICENSE in this source tree. */ #include "libbb.h" #include diff --git a/util-linux/mkfs_vfat.c b/util-linux/mkfs_vfat.c index c57cd9d5a..211e67e97 100644 --- a/util-linux/mkfs_vfat.c +++ b/util-linux/mkfs_vfat.c @@ -5,7 +5,7 @@ * * Busybox'ed (2009) by Vladimir Dronnikov * - * Licensed under GPLv2, see file LICENSE in this tarball for details. + * Licensed under GPLv2, see file LICENSE in this source tree. */ #include "libbb.h" diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c index 7e32d91ed..3f736faba 100644 --- a/util-linux/mkswap.c +++ b/util-linux/mkswap.c @@ -3,7 +3,7 @@ * * Copyright 2006 Rob Landley * - * Licensed under GPL version 2, see file LICENSE in this tarball for details. + * Licensed under GPLv2, see file LICENSE in this source tree. */ #include "libbb.h" diff --git a/util-linux/more.c b/util-linux/more.c index 00a427a6f..1fd6f9ee8 100644 --- a/util-linux/more.c +++ b/util-linux/more.c @@ -11,7 +11,7 @@ * * Termios corrects by Vladimir Oleynik * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ #include "libbb.h" diff --git a/util-linux/mount.c b/util-linux/mount.c index aa17872da..5e85f9986 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c @@ -6,7 +6,7 @@ * Copyright (C) 1999-2004 by Erik Andersen * Copyright (C) 2005-2006 by Rob Landley * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ // Design notes: There is no spec for mount. Remind me to write one. // @@ -532,7 +532,7 @@ static int mount_it_now(struct mntent *mp, long vfsflags, char *filteropts) * Linux NFS mount * Copyright (C) 1993 Rick Sladkey * - * Licensed under GPLv2, see file LICENSE in this tarball for details. + * Licensed under GPLv2, see file LICENSE in this source tree. * * Wed Feb 8 12:51:48 1995, biro@yggdrasil.com (Ross Biro): allow all port * numbers to be specified on the command line. diff --git a/util-linux/pivot_root.c b/util-linux/pivot_root.c index 28af00cc1..ac52a7aed 100644 --- a/util-linux/pivot_root.c +++ b/util-linux/pivot_root.c @@ -6,7 +6,7 @@ * pivot_root syscall stubbed by Erik Andersen, so it will compile * regardless of the kernel being used. * - * Licensed under GPL version 2, see file LICENSE in this tarball for details. + * Licensed under GPLv2, see file LICENSE in this source tree. */ #include "libbb.h" diff --git a/util-linux/rdate.c b/util-linux/rdate.c index f5df2f794..2c3de74bc 100644 --- a/util-linux/rdate.c +++ b/util-linux/rdate.c @@ -5,7 +5,7 @@ * * by Sterling Huxley * - * Licensed under GPL v2 or later, see file LICENSE for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ #include "libbb.h" diff --git a/util-linux/rdev.c b/util-linux/rdev.c index 33abd39dc..2fbb4d377 100644 --- a/util-linux/rdev.c +++ b/util-linux/rdev.c @@ -5,7 +5,7 @@ * Copyright (c) 2008 Nuovation System Designs, LLC * Grant Erickson * - * Licensed under GPLv2, see file LICENSE in this tarball for details. + * Licensed under GPLv2, see file LICENSE in this source tree. * */ diff --git a/util-linux/readprofile.c b/util-linux/readprofile.c index 219654496..00b3382d8 100644 --- a/util-linux/readprofile.c +++ b/util-linux/readprofile.c @@ -4,7 +4,7 @@ * * Copyright (C) 1994,1996 Alessandro Rubini (rubini@ipvvis.unipv.it) * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* diff --git a/util-linux/rev.c b/util-linux/rev.c index 8d5ac2f2d..e1e004437 100644 --- a/util-linux/rev.c +++ b/util-linux/rev.c @@ -3,7 +3,7 @@ * * Copyright (C) 2010 Marek Polacek * - * Licensed under GPLv2, see file LICENSE in this tarball for details. + * Licensed under GPLv2, see file LICENSE in this source tree. */ //applet:IF_REV(APPLET(rev, _BB_DIR_BIN, _BB_SUID_DROP)) diff --git a/util-linux/rtcwake.c b/util-linux/rtcwake.c index b16376655..26e5b4724 100644 --- a/util-linux/rtcwake.c +++ b/util-linux/rtcwake.c @@ -3,7 +3,7 @@ * * This version was taken from util-linux and scrubbed down for busybox. * - * Licensed under GPLv2, see file LICENSE in this tarball for details. + * Licensed under GPLv2, see file LICENSE in this source tree. * * This uses cross-platform Linux interfaces to enter a system sleep state, * and leave it no later than a specified time. It uses any RTC framework diff --git a/util-linux/script.c b/util-linux/script.c index ba90b065d..0860bb083 100644 --- a/util-linux/script.c +++ b/util-linux/script.c @@ -8,7 +8,7 @@ * Copyright (c) 1980 * The Regents of the University of California. All rights reserved. * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ #include "libbb.h" diff --git a/util-linux/scriptreplay.c b/util-linux/scriptreplay.c index c87e44dfb..6eaba43fa 100644 --- a/util-linux/scriptreplay.c +++ b/util-linux/scriptreplay.c @@ -4,7 +4,7 @@ * * pascal.bellard@ads-lu.com * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. * */ #include "libbb.h" diff --git a/util-linux/setarch.c b/util-linux/setarch.c index 776caf909..7d5dc247c 100644 --- a/util-linux/setarch.c +++ b/util-linux/setarch.c @@ -4,7 +4,7 @@ * * Copyright 2002 Andi Kleen, SuSE Labs. * - * Licensed under GPL v2 or later, see file LICENSE for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ #include diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c index f2f52fb88..e2c060f30 100644 --- a/util-linux/swaponoff.c +++ b/util-linux/swaponoff.c @@ -4,7 +4,7 @@ * * Copyright (C) 1999-2004 by Erik Andersen * - * Licensed under the GPL version 2, see the file LICENSE in this tarball. + * Licensed under GPLv2, see file LICENSE in this source tree. */ #include "libbb.h" diff --git a/util-linux/switch_root.c b/util-linux/switch_root.c index e2da119de..d471437fd 100644 --- a/util-linux/switch_root.c +++ b/util-linux/switch_root.c @@ -3,7 +3,7 @@ * * Switch from rootfs to another filesystem as the root of the mount tree. * - * Licensed under GPL version 2, see file LICENSE in this tarball for details. + * Licensed under GPLv2, see file LICENSE in this source tree. */ #include #include diff --git a/util-linux/umount.c b/util-linux/umount.c index a19f86c3a..7ba46eeb0 100644 --- a/util-linux/umount.c +++ b/util-linux/umount.c @@ -5,7 +5,7 @@ * Copyright (C) 1999-2004 by Erik Andersen * Copyright (C) 2005 by Rob Landley * - * Licensed under GPL version 2, see file LICENSE in this tarball for details. + * Licensed under GPLv2, see file LICENSE in this source tree. */ #include #include diff --git a/util-linux/volume_id/Kbuild.src b/util-linux/volume_id/Kbuild.src index 8af3ccd81..70da65482 100644 --- a/util-linux/volume_id/Kbuild.src +++ b/util-linux/volume_id/Kbuild.src @@ -2,7 +2,7 @@ # # Copyright (C) 1999-2005 by Erik Andersen # -# Licensed under the GPL v2, see the file LICENSE in this tarball. +# Licensed under GPLv2, see file LICENSE in this source tree. lib-y:= diff --git a/util-linux/volume_id/get_devname.c b/util-linux/volume_id/get_devname.c index 4d9f9ecd0..bf32e6a8c 100644 --- a/util-linux/volume_id/get_devname.c +++ b/util-linux/volume_id/get_devname.c @@ -5,7 +5,7 @@ * Copyright (C) 2006 by Jason Schoon * Some portions cribbed from e2fsprogs, util-linux, dosfstools * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ #include /* BLKGETSIZE64 */ #if !defined(BLKGETSIZE64) -- cgit v1.2.3