From ed2849af3f76f53cf8d13421d1534fd7db7161f8 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Tue, 2 Mar 2010 20:05:28 -0500 Subject: [PATCH] Update licensing: lgplv2.1 for libs, gplv2 for programs Signed-off-by: Mathieu Desnoyers --- LICENSE | 13 +++++++++++++ liblttctl/liblttctl.c | 26 ++++++++++++++------------ liblttctl/lttctl.h | 32 +++++++++++++++++++------------- lttctl/ltt-armtap.sh | 16 ++++++++++++++++ lttctl/ltt-disarmtap.sh | 16 ++++++++++++++++ lttctl/lttctl.c | 20 ++++++++++++++++---- lttd/lttd.c | 17 +++++++++++++++-- 7 files changed, 109 insertions(+), 31 deletions(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 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 c88ece8..9b8a60b 100644 --- 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 - * + * Copyright (c) 2005-2010 Mathieu Desnoyers * - * 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 55a7b4c..e0c99ec 100644 --- a/liblttctl/lttctl.h +++ b/liblttctl/lttctl.h @@ -1,23 +1,29 @@ -/* libltt header file +/* + * lttctl.h * - * Copyright 2005- - * Mathieu Desnoyers + * 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 * - * 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 84f91d6..8b34e1a 100755 --- a/lttctl/ltt-armtap.sh +++ b/lttctl/ltt-armtap.sh @@ -1,3 +1,19 @@ +# Copyright 2009 - Mathieu Desnoyers +# +# 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 b41f70c..838d75d 100755 --- a/lttctl/ltt-disarmtap.sh +++ b/lttctl/ltt-disarmtap.sh @@ -1,3 +1,19 @@ +# Copyright 2009 - Mathieu Desnoyers +# +# 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 7380136..e563192 100644 --- 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 + * Small program that controls LTTng through liblttctl. * * Copyright 2008 FUJITSU * Zhao Lei * Gui Jianfeng + * Copyright 2009-2010 - Mathieu Desnoyers + * + * 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 773cb23..78c2c80 100644 --- a/lttd/lttd.c +++ b/lttd/lttd.c @@ -7,8 +7,21 @@ * * CPU hot-plugging is supported using inotify. * - * Copyright 2005 - - * Mathieu Desnoyers + * Copyright 2009-2010 - Mathieu Desnoyers + * + * 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 -- 2.34.1