Skip to content

Commit

Permalink
targetcli: Change copyright to Apache License 2.0
Browse files Browse the repository at this point in the history
This patch converts rtslib code copyright from AGPL to the
permissive Apache License 2.0.

It also update copyright owner to Datera, Inc.

Signed-off-by: Nicholas Bellinger <nab@risingtidesystems.com>
Signed-off-by: Andy Grover <agrover@redhat.com>
  • Loading branch information
Nicholas Bellinger authored and Andy Grover committed Jul 23, 2013
1 parent 9ef711f commit 95b0c55
Show file tree
Hide file tree
Showing 13 changed files with 269 additions and 765 deletions.
833 changes: 174 additions & 659 deletions COPYING

Large diffs are not rendered by default.

15 changes: 0 additions & 15 deletions Makefile
@@ -1,18 +1,3 @@
# This file is part of targetcli.
# Copyright (c) 2011 by RisingTide Systems LLC
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, version 3 (AGPLv3).
#
# 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 Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

NAME = targetcli
GIT_BRANCH = $$(git branch | grep \* | tr -d \*)
VERSION = $$(basename $$(git describe --tags | tr - .))
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -8,7 +8,7 @@ SCSI target, present in 3.x Linux kernel versions.

targetcli-fb development
------------------------
targetcli-fb is licensed under the Affero GPLv3. Contributions are welcome.
targetcli-fb is licensed under the Apache 2.0 license. Contributions are welcome.

* Mailing list: [targetcli-fb-devel](https://lists.fedorahosted.org/mailman/listinfo/targetcli-fb-devel)
* Source repo: [GitHub](https://github.com/agrover/targetcli-fb)
Expand Down
20 changes: 10 additions & 10 deletions debian/README.Debian
@@ -1,13 +1,13 @@
Copyright (c) 2011 by RisingTide Systems LLC
Copyright (c) 2011-2013 by Datera, Inc

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation, version 3 (AGPLv3).
Licensed under the Apache License, Version 2.0 (the "License"); you may
not use this file except in compliance with the License. You may obtain
a copy of the License at

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 Affero General Public License for more details.
http://www.apache.org/licenses/LICENSE-2.0

You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
License for the specific language governing permissions and limitations
under the License.
16 changes: 11 additions & 5 deletions debian/copyright
Expand Up @@ -4,11 +4,17 @@ on Thu Nov 19 12:00:01 UTC 2009. It is currently maintained by Jerome Martin

Upstream Author: Jerome Martin <jxm@risingtidesystems.com>

Copyright:
This file is part of ConfigShell.
Copyright (c) 2011-2013 by Datera, Inc

Copyright (c) 2009-2010 by RisingTide Systems LLC.
Licensed under the Apache License, Version 2.0 (the "License"); you may
not use this file except in compliance with the License. You may obtain
a copy of the License at

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation, version 3 (AGPLv3).
http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
License for the specific language governing permissions and limitations
under the License.
4 changes: 2 additions & 2 deletions rpm/targetcli.spec.tmpl
@@ -1,7 +1,7 @@
%define oname targetcli

Name: targetcli
License: AGPLv3
License: Apache License 2.0
Group: Applications/System
Summary: RisingTide Systems generic SCSI target CLI shell.
Version: VERSION
Expand All @@ -12,7 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-rpmroot
BuildArch: noarch
BuildRequires: python-devel, python-rtslib, python-configshell
Requires: python-rtslib, python-configshell
Vendor: RisingTide Systems
Vendor: Datera, Inc.

%description
RisingTide Systems generic SCSI target CLI shell.
Expand Down
24 changes: 11 additions & 13 deletions scripts/targetcli
Expand Up @@ -3,21 +3,19 @@
Starts the targetcli CLI shell.
This file is part of targetcli.
Copyright (c) 2011 by RisingTide Systems LLC
Copyright (c) 2011-2013 by Datera, Inc
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation, version 3 (AGPLv3).
Licensed under the Apache License, Version 2.0 (the "License"); you may
not use this file except in compliance with the License. You may obtain
a copy of the License at
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 Affero General Public License for more details.
http://www.apache.org/licenses/LICENSE-2.0
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Copyright (c) 2011 by RisingTide Systems LLC.
All rights reserved.
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
License for the specific language governing permissions and limitations
under the License.
'''

from os import getuid
Expand Down Expand Up @@ -75,7 +73,7 @@ def main():
sys.exit(0)

shell.con.display("targetcli shell version %s\n"
"Copyright 2011 by RisingTide Systems LLC and others.\n"
"Copyright 2011-2013 by Datera, Inc and others.\n"
"For help on commands, type 'help'.\n"
% targetcli_version)
if not is_root:
Expand Down
20 changes: 10 additions & 10 deletions setup.py
@@ -1,19 +1,19 @@
#! /usr/bin/env python
'''
This file is part of targetcli.
Copyright (c) 2011 by RisingTide Systems LLC
Copyright (c) 2011-2013 by Datera, Inc
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation, version 3 (AGPLv3).
Licensed under the Apache License, Version 2.0 (the "License"); you may
not use this file except in compliance with the License. You may obtain
a copy of the License at
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 Affero General Public License for more details.
http://www.apache.org/licenses/LICENSE-2.0
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
License for the specific language governing permissions and limitations
under the License.
'''

import re
Expand Down
20 changes: 10 additions & 10 deletions targetcli/__init__.py
@@ -1,18 +1,18 @@
'''
This file is part of targetcli.
Copyright (c) 2011 by RisingTide Systems LLC
Copyright (c) 2011-2013 by Datera, Inc
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation, version 3 (AGPLv3).
Licensed under the Apache License, Version 2.0 (the "License"); you may
not use this file except in compliance with the License. You may obtain
a copy of the License at
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 Affero General Public License for more details.
http://www.apache.org/licenses/LICENSE-2.0
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
License for the specific language governing permissions and limitations
under the License.
'''

from ui_root import UIRoot
Expand Down
20 changes: 10 additions & 10 deletions targetcli/ui_backstore.py
Expand Up @@ -2,19 +2,19 @@
Implements the targetcli backstores related UI.
This file is part of targetcli.
Copyright (c) 2011 by RisingTide Systems LLC
Copyright (c) 2011-2013 by Datera, Inc
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation, version 3 (AGPLv3).
Licensed under the Apache License, Version 2.0 (the "License"); you may
not use this file except in compliance with the License. You may obtain
a copy of the License at
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 Affero General Public License for more details.
http://www.apache.org/licenses/LICENSE-2.0
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
License for the specific language governing permissions and limitations
under the License.
'''

from ui_node import UINode, UIRTSLibNode
Expand Down
20 changes: 10 additions & 10 deletions targetcli/ui_node.py
Expand Up @@ -2,19 +2,19 @@
Implements the targetcli base UI node.
This file is part of targetcli.
Copyright (c) 2011 by RisingTide Systems LLC
Copyright (c) 2011-2013 by Datera, Inc
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation, version 3 (AGPLv3).
Licensed under the Apache License, Version 2.0 (the "License"); you may
not use this file except in compliance with the License. You may obtain
a copy of the License at
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 Affero General Public License for more details.
http://www.apache.org/licenses/LICENSE-2.0
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
License for the specific language governing permissions and limitations
under the License.
'''

from configshell import ConfigNode, ExecutionError
Expand Down
20 changes: 10 additions & 10 deletions targetcli/ui_root.py
Expand Up @@ -2,19 +2,19 @@
Implements the targetcli root UI.
This file is part of targetcli.
Copyright (c) 2011 by RisingTide Systems LLC
Copyright (c) 2011-2013 by Datera, Inc
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation, version 3 (AGPLv3).
Licensed under the Apache License, Version 2.0 (the "License"); you may
not use this file except in compliance with the License. You may obtain
a copy of the License at
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 Affero General Public License for more details.
http://www.apache.org/licenses/LICENSE-2.0
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
License for the specific language governing permissions and limitations
under the License.
'''

from rtslib import RTSRoot
Expand Down
20 changes: 10 additions & 10 deletions targetcli/ui_target.py
Expand Up @@ -2,19 +2,19 @@
Implements the targetcli target related UI.
This file is part of targetcli.
Copyright (c) 2011 by RisingTide Systems LLC
Copyright (c) 2011-2013 by Datera, Inc
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation, version 3 (AGPLv3).
Licensed under the Apache License, Version 2.0 (the "License"); you may
not use this file except in compliance with the License. You may obtain
a copy of the License at
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 Affero General Public License for more details.
http://www.apache.org/licenses/LICENSE-2.0
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
License for the specific language governing permissions and limitations
under the License.
'''

from ui_node import UINode, UIRTSLibNode
Expand Down

0 comments on commit 95b0c55

Please sign in to comment.