summaryrefslogtreecommitdiffstats
path: root/libmount
diff options
context:
space:
mode:
authorKarel Zak2018-08-16 15:43:53 +0200
committerKarel Zak2018-08-16 15:43:53 +0200
commit2c37ca7c4b766d08ed604eac17fea42e86916c2d (patch)
tree2e2574b90cc768b921006431bfa7c764bb4bcde2 /libmount
parentdocs: use SPDX license names (diff)
downloadkernel-qcow2-util-linux-2c37ca7c4b766d08ed604eac17fea42e86916c2d.tar.gz
kernel-qcow2-util-linux-2c37ca7c4b766d08ed604eac17fea42e86916c2d.tar.xz
kernel-qcow2-util-linux-2c37ca7c4b766d08ed604eac17fea42e86916c2d.zip
libmount: cleanup licenses sections in the files
* add SPDX-License-Identifier (see https://spdx.org/licenses/) * add "This file part of libmount from util-linux project." * use proper text for LGPL-2.1-or-later * use the same texts everywhere Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libmount')
-rw-r--r--libmount/mount.pc.in11
-rw-r--r--libmount/src/btrfs.c11
-rw-r--r--libmount/src/cache.c13
-rw-r--r--libmount/src/context.c11
-rw-r--r--libmount/src/context_loopdev.c11
-rw-r--r--libmount/src/context_mount.c11
-rw-r--r--libmount/src/context_umount.c11
-rw-r--r--libmount/src/fs.c11
-rw-r--r--libmount/src/init.c11
-rw-r--r--libmount/src/iter.c11
-rw-r--r--libmount/src/libmount.h.in7
-rw-r--r--libmount/src/libmount.sym14
-rw-r--r--libmount/src/lock.c11
-rw-r--r--libmount/src/monitor.c11
-rw-r--r--libmount/src/mountP.h12
-rw-r--r--libmount/src/optmap.c11
-rw-r--r--libmount/src/optstr.c11
-rw-r--r--libmount/src/tab.c12
-rw-r--r--libmount/src/tab_diff.c11
-rw-r--r--libmount/src/tab_parse.c12
-rw-r--r--libmount/src/tab_update.c11
-rw-r--r--libmount/src/test.c12
-rw-r--r--libmount/src/utils.c11
-rw-r--r--libmount/src/version.c11
24 files changed, 198 insertions, 71 deletions
diff --git a/libmount/mount.pc.in b/libmount/mount.pc.in
index 2c327978b..7371b23c1 100644
--- a/libmount/mount.pc.in
+++ b/libmount/mount.pc.in
@@ -1,3 +1,14 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# This file is part of libmount from util-linux project.
+#
+# Copyright (C) 2008-2018 Karel Zak <kzak@redhat.com>
+#
+# libmount 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.
+#
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@usrlib_execdir@
diff --git a/libmount/src/btrfs.c b/libmount/src/btrfs.c
index 71567e4ce..a831ce837 100644
--- a/libmount/src/btrfs.c
+++ b/libmount/src/btrfs.c
@@ -1,11 +1,16 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
/*
+ * This file is part of libmount from util-linux project.
+ *
* Copyright (C) 2016 David Sterba <dsterba@suse.cz>
* Copyright (C) 2016 Stanislav Brabec <sbrabec@suse.cz>
*
- * Based on kernel ctree.h, rbtree.h and btrfs-progs.
+ * libmount 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.
*
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
+ * Based on kernel ctree.h, rbtree.h and btrfs-progs.
*/
#include <dirent.h>
#include <sys/ioctl.h>
diff --git a/libmount/src/cache.c b/libmount/src/cache.c
index b52ca8098..659a72da5 100644
--- a/libmount/src/cache.c
+++ b/libmount/src/cache.c
@@ -1,8 +1,13 @@
-/*
- * Copyright (C) 2009-2011 Karel Zak <kzak@redhat.com>
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/**
+ * This file is part of libmount from util-linux project.
+ *
+ * Copyright (C) 2009-2018 Karel Zak <kzak@redhat.com>
*
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
+ * libmount 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.
*/
/**
diff --git a/libmount/src/context.c b/libmount/src/context.c
index ac3daaf4e..26ee1e437 100644
--- a/libmount/src/context.c
+++ b/libmount/src/context.c
@@ -1,8 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
/*
- * Copyright (C) 2010,2011,2012 Karel Zak <kzak@redhat.com>
+ * This file is part of libmount from util-linux project.
*
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
+ * Copyright (C) 2010-2018 Karel Zak <kzak@redhat.com>
+ *
+ * libmount 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.
*/
/**
diff --git a/libmount/src/context_loopdev.c b/libmount/src/context_loopdev.c
index 05ff71ae7..c5fc80d77 100644
--- a/libmount/src/context_loopdev.c
+++ b/libmount/src/context_loopdev.c
@@ -1,8 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
/*
- * Copyright (C) 2011 Karel Zak <kzak@redhat.com>
+ * This file is part of libmount from util-linux project.
*
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
+ * Copyright (C) 2011-2018 Karel Zak <kzak@redhat.com>
+ *
+ * libmount 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.
*/
/*
diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c
index bc3c993bc..f914c9b1b 100644
--- a/libmount/src/context_mount.c
+++ b/libmount/src/context_mount.c
@@ -1,8 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
/*
- * Copyright (C) 2010 Karel Zak <kzak@redhat.com>
+ * This file is part of libmount from util-linux project.
*
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
+ * Copyright (C) 2010-2018 Karel Zak <kzak@redhat.com>
+ *
+ * libmount 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.
*/
/**
diff --git a/libmount/src/context_umount.c b/libmount/src/context_umount.c
index 645fefb6a..d72f5ccd0 100644
--- a/libmount/src/context_umount.c
+++ b/libmount/src/context_umount.c
@@ -1,8 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
/*
- * Copyright (C) 2010 Karel Zak <kzak@redhat.com>
+ * This file is part of libmount from util-linux project.
*
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
+ * Copyright (C) 2010-2018 Karel Zak <kzak@redhat.com>
+ *
+ * libmount 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.
*/
/**
diff --git a/libmount/src/fs.c b/libmount/src/fs.c
index 98ce54d88..9971d6ae3 100644
--- a/libmount/src/fs.c
+++ b/libmount/src/fs.c
@@ -1,8 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
/*
- * Copyright (C) 2008-2009 Karel Zak <kzak@redhat.com>
+ * This file is part of libmount from util-linux project.
*
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
+ * Copyright (C) 2008-2018 Karel Zak <kzak@redhat.com>
+ *
+ * libmount 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.
*/
/**
diff --git a/libmount/src/init.c b/libmount/src/init.c
index 29be282d5..a22922229 100644
--- a/libmount/src/init.c
+++ b/libmount/src/init.c
@@ -1,8 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
/*
- * Copyright (C) 2008 Karel Zak <kzak@redhat.com>
+ * This file is part of libmount from util-linux project.
*
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
+ * Copyright (C) 2008-2018 Karel Zak <kzak@redhat.com>
+ *
+ * libmount 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.
*/
/**
diff --git a/libmount/src/iter.c b/libmount/src/iter.c
index 016f88e35..891e2c8af 100644
--- a/libmount/src/iter.c
+++ b/libmount/src/iter.c
@@ -1,8 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
/*
- * Copyright (C) 2009 Karel Zak <kzak@redhat.com>
+ * This file is part of libmount from util-linux project.
*
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
+ * Copyright (C) 2009-2018 Karel Zak <kzak@redhat.com>
+ *
+ * libmount 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.
*/
/**
diff --git a/libmount/src/libmount.h.in b/libmount/src/libmount.h.in
index 3a9440371..63ba3225f 100644
--- a/libmount/src/libmount.h.in
+++ b/libmount/src/libmount.h.in
@@ -1,7 +1,10 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
/*
- * mount.h - libmount API
+ * libmount.h - libmount API
*
- * Copyright (C) 2008-2009 Karel Zak <kzak@redhat.com>
+ * This file is part of libmount from util-linux project.
+ *
+ * Copyright (C) 2008-2018 Karel Zak <kzak@redhat.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/libmount/src/libmount.sym b/libmount/src/libmount.sym
index 1db14b2b7..ad7bd4786 100644
--- a/libmount/src/libmount.sym
+++ b/libmount/src/libmount.sym
@@ -1,10 +1,20 @@
/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
+ * This file is part of libmount from util-linux project.
+ *
+ * Copyright (C) 2011-2018 Karel Zak <kzak@redhat.com>
+ *
+ * libmount 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 symbol versioning ensures that a new application requiring symbol foo,
* can't run with old library.so not providing foo.
*
* Version info can't enforce this since we never change the SONAME.
- *
- * Copyright (C) 2011-2014 Karel Zak <kzak@redhat.com>
*/
MOUNT_2.19 {
global:
diff --git a/libmount/src/lock.c b/libmount/src/lock.c
index f9d0253fb..e6eefa13a 100644
--- a/libmount/src/lock.c
+++ b/libmount/src/lock.c
@@ -1,8 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
/*
- * Copyright (C) 2009 Karel Zak <kzak@redhat.com>
+ * This file is part of libmount from util-linux project.
*
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
+ * Copyright (C) 2009-2018 Karel Zak <kzak@redhat.com>
+ *
+ * libmount 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.
*/
/**
diff --git a/libmount/src/monitor.c b/libmount/src/monitor.c
index 61b95f6ca..2383a734a 100644
--- a/libmount/src/monitor.c
+++ b/libmount/src/monitor.c
@@ -1,8 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
/*
- * Copyright (C) 2014 Karel Zak <kzak@redhat.com>
+ * This file is part of libmount from util-linux project.
*
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
+ * Copyright (C) 2014-2018 Karel Zak <kzak@redhat.com>
+ *
+ * libmount 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.
*/
/**
diff --git a/libmount/src/mountP.h b/libmount/src/mountP.h
index 0c795121a..8f4fba7af 100644
--- a/libmount/src/mountP.h
+++ b/libmount/src/mountP.h
@@ -1,12 +1,16 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
/*
* mountP.h - private library header file
*
- * Copyright (C) 2008-2012 Karel Zak <kzak@redhat.com>
+ * This file is part of libmount from util-linux project.
*
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
+ * Copyright (C) 2008-2018 Karel Zak <kzak@redhat.com>
+ *
+ * libmount 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.
*/
-
#ifndef _LIBMOUNT_PRIVATE_H
#define _LIBMOUNT_PRIVATE_H
diff --git a/libmount/src/optmap.c b/libmount/src/optmap.c
index 0aa285f93..6136e27be 100644
--- a/libmount/src/optmap.c
+++ b/libmount/src/optmap.c
@@ -1,8 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
/*
- * Copyright (C) 2010 Karel Zak <kzak@redhat.com>
+ * This file is part of libmount from util-linux project.
*
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
+ * Copyright (C) 2010-2018 Karel Zak <kzak@redhat.com>
+ *
+ * libmount 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.
*/
/**
diff --git a/libmount/src/optstr.c b/libmount/src/optstr.c
index cc077ffd9..c0f438fe2 100644
--- a/libmount/src/optstr.c
+++ b/libmount/src/optstr.c
@@ -1,8 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
/*
- * Copyright (C) 2008,2009,2012 Karel Zak <kzak@redhat.com>
+ * This file is part of libmount from util-linux project.
*
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
+ * Copyright (C) 2009-2018 Karel Zak <kzak@redhat.com>
+ *
+ * libmount 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.
*/
/**
diff --git a/libmount/src/tab.c b/libmount/src/tab.c
index eb61dd33e..d80fb0579 100644
--- a/libmount/src/tab.c
+++ b/libmount/src/tab.c
@@ -1,8 +1,14 @@
+
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
/*
- * Copyright (C) 2008-2010 Karel Zak <kzak@redhat.com>
+ * This file is part of libmount from util-linux project.
+ *
+ * Copyright (C) 2008-2018 Karel Zak <kzak@redhat.com>
*
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
+ * libmount 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.
*/
/**
diff --git a/libmount/src/tab_diff.c b/libmount/src/tab_diff.c
index 7c898697e..70440bf8b 100644
--- a/libmount/src/tab_diff.c
+++ b/libmount/src/tab_diff.c
@@ -1,8 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
/*
- * Copyright (C) 2011 Karel Zak <kzak@redhat.com>
+ * This file is part of libmount from util-linux project.
*
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
+ * Copyright (C) 2011-2018 Karel Zak <kzak@redhat.com>
+ *
+ * libmount 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.
*/
/**
diff --git a/libmount/src/tab_parse.c b/libmount/src/tab_parse.c
index 89f7c4d30..45ca45966 100644
--- a/libmount/src/tab_parse.c
+++ b/libmount/src/tab_parse.c
@@ -1,10 +1,14 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
/*
- * Copyright (C) 2009 Karel Zak <kzak@redhat.com>
+ * This file is part of libmount from util-linux project.
*
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
+ * Copyright (C) 2009-2018 Karel Zak <kzak@redhat.com>
+ *
+ * libmount 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.
*/
-
#ifdef HAVE_SCANDIRAT
#ifndef __USE_GNU
#define __USE_GNU
diff --git a/libmount/src/tab_update.c b/libmount/src/tab_update.c
index b08ac18c1..b68553515 100644
--- a/libmount/src/tab_update.c
+++ b/libmount/src/tab_update.c
@@ -1,8 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
/*
- * Copyright (C) 2010 Karel Zak <kzak@redhat.com>
+ * This file is part of libmount from util-linux project.
*
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
+ * Copyright (C) 2011-2018 Karel Zak <kzak@redhat.com>
+ *
+ * libmount 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.
*/
/**
diff --git a/libmount/src/test.c b/libmount/src/test.c
index 2da00b40d..0e3388c80 100644
--- a/libmount/src/test.c
+++ b/libmount/src/test.c
@@ -1,8 +1,14 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
/*
- * Copyright (C) 2008-2009 Karel Zak <kzak@redhat.com>
+ * This file is part of libmount from util-linux project.
+ *
+ * Copyright (C) 2010-2018 Karel Zak <kzak@redhat.com>
+ *
+ * libmount 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.
*
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
*
* Routines for TEST_PROGRAMs
*/
diff --git a/libmount/src/utils.c b/libmount/src/utils.c
index c478e2f9e..034d3436f 100644
--- a/libmount/src/utils.c
+++ b/libmount/src/utils.c
@@ -1,8 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
/*
- * Copyright (C) 2008-2009 Karel Zak <kzak@redhat.com>
+ * This file is part of libmount from util-linux project.
*
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
+ * Copyright (C) 2008-2018 Karel Zak <kzak@redhat.com>
+ *
+ * libmount 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.
*/
/**
diff --git a/libmount/src/version.c b/libmount/src/version.c
index d3a981a48..a7f3a9b60 100644
--- a/libmount/src/version.c
+++ b/libmount/src/version.c
@@ -1,10 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
/*
- * version.c - Return the version of the libmount library
+ * This file is part of libmount from util-linux project.
*
- * Copyright (C) 2008 Karel Zak <kzak@redhat.com>
- * [Based on libblkid/version.c by Theodore Ts'o]
+ * Copyright (C) 2008-2018 Karel Zak <kzak@redhat.com>
*
- * See COPYING.libmount for the License of this software.
+ * libmount 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.
*/
/**