Update licensing: lgplv2.1 for libs, gplv2 for programs

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/LICENSE b/LICENSE
new file mode 100644 (file)
index 0000000..010e8b9
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,13 @@
+LTTng control package licensing
+Mathieu Desnoyers
+March 2, 2010
+
+* LGPLv2.1
+
+All libraries (liblttctl only at the moment) are LGPLv2.1. The library headers
+are distributed under LGPLv2.1, but can be included in non-GPL code to allow
+linking with the library.
+
+* GPLv2
+
+Covers all shell scripts and programs.

diff --git a/liblttctl/liblttctl.c b/liblttctl/liblttctl.c
index c88ece8d89468971e5b31dfdd5e0308fadd8b6aa..9b8a60b8300618d41bb64e3caec10ed25daf2441 100644 (file)
--- a/liblttctl/liblttctl.c
+++ b/liblttctl/liblttctl.c
@@ -1,23 +1,25 @@
-/* libltt
+/*
+ * liblttctl
  *
- * Linux Trace Toolkit Netlink Control Library
+ * Linux Trace Toolkit Control Library
  *
  * Controls the ltt-control kernel module through debugfs.
  *
- * Copyright 2005 -
- *     Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
- *
+ * Copyright (c) 2005-2010 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * 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 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.
  *
- * This program is distributed in the hope that it will be useful,
+ * This 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 General Public License for more details.
+ * 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 this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifdef HAVE_CONFIG_H

diff --git a/liblttctl/lttctl.h b/liblttctl/lttctl.h
index 55a7b4cfd6a3330e9d32fa634178d754993a0e62..e0c99ec8d474cb2cb5c21854630f295725bea422 100644 (file)
--- a/liblttctl/lttctl.h
+++ b/liblttctl/lttctl.h
@@ -1,23 +1,29 @@
-/* libltt header file
+/*
+ * lttctl.h
  *
- * Copyright 2005-
- *              Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
+ * Linux Trace Toolkit Control Library Header File
  *
+ * Controls the ltt-control kernel module through debugfs.
  *
- * 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.
+ * Copyright (c) 2005-2010 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This program is distributed in the hope that it will be useful,
+ * This 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.
+ *
+ * This 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 General Public License for more details.
+ * 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 this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef _LIBLTT_H
-#define _LIBLTT_H
+#ifndef _LTTCTL_H
+#define _LTTCTL_H
 
 int lttctl_init(void);
 int lttctl_destroy(void);
@@ -41,4 +47,4 @@ int lttctl_set_channel_switch_timer(const char *name, const char *channel,
 /* Helper functions */
 int getdebugfsmntdir(char *mntdir);
 
-#endif /*_LIBLTT_H */
+#endif /*_LTTCTL_H */

diff --git a/lttctl/ltt-armtap.sh b/lttctl/ltt-armtap.sh
index 84f91d669b7f8c855d6b02ef8673e3f4864a9d6a..8b34e1a96435a3482d2954c6bf1d39b87914584d 100755 (executable)
--- a/lttctl/ltt-armtap.sh
+++ b/lttctl/ltt-armtap.sh
@@ -1,3 +1,19 @@
+# Copyright 2009 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
 # This script will enable the system-wide tap on the given list of events passed
 # as parameter, and stop the tap at each other "normal rate" events.
 

diff --git a/lttctl/ltt-disarmtap.sh b/lttctl/ltt-disarmtap.sh
index b41f70c00547b17a1a5302e05bee44b42ece510a..838d75d9bbc6681a432e839448e2b5db5fe8b49b 100755 (executable)
--- a/lttctl/ltt-disarmtap.sh
+++ b/lttctl/ltt-disarmtap.sh
@@ -1,3 +1,19 @@
+# Copyright 2009 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
 # This script will disable the system-wide tap on the given list of events
 # passed as parameter, and stop the tap at each other "normal rate" events.
 

diff --git a/lttctl/lttctl.c b/lttctl/lttctl.c
index 7380136fc6eefcbe1e0c4bb3da3e81e80815a438..e5631928053c4930b57f5ae35b9754a7070b5a85 100644 (file)
--- a/lttctl/lttctl.c
+++ b/lttctl/lttctl.c
@@ -2,14 +2,26 @@
  *
  * Linux Trace Toolkit Control
  *
- * Small program that controls LTT through libltt.
- *
- * Copyright 2005 -
- *     Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
+ * Small program that controls LTTng through liblttctl.
  *
  * Copyright 2008 FUJITSU
  *     Zhao Lei <zhaolei@cn.fujitsu.com>
  *     Gui Jianfeng <guijianfeng@cn.fujitsu.com>
+ * Copyright 2009-2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifdef HAVE_CONFIG_H

diff --git a/lttd/lttd.c b/lttd/lttd.c
index 773cb234108350df3ac15ef1b5f1e4e7e5f97c22..78c2c8071a2e3f73032efbb4eee027db274736ab 100644 (file)
--- a/lttd/lttd.c
+++ b/lttd/lttd.c
@@ -7,8 +7,21 @@
  *
  * CPU hot-plugging is supported using inotify.
  *
- * Copyright 2005 -
- *     Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
+ * Copyright 2009-2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifdef HAVE_CONFIG_H