Skip to content

Commit e404c50

Browse files
author
Mark Stemm
authored
Change license apache2 (#1233)
* Change license in COPYING, c/c++ code Replace the commented license notice in c/c++ userspace code with the apache 2 license, and change the top level COPYING license to apache 2. Still need to change other code e.g. lua, shell scripts, as well as changing the license for the driver. * Change lua code from gpl to apache license Change lua code that had a clear gpl comment block at the beginning of the file to apache 2. This doesn't yet cover all files, but the exceptions will be handled next. * Update scripts to use apache 2.0 license. * Update chisels COPYING to Apache 2 license. * Change copyright for Luca-written files He was a sysdig employee at the time. * Add apache copyright to files that didn't have one For files that had no copyright notice, add the apache copyright notice. * Use correct copyright years. * Change Brendan Gregg chisels to apache 2 license We obtained his permission to change the license to apache 2.0. * Add dba sysdig to copyright notices * Change driver license to dual MIT + GPL In the driver directory, include both the MIT and GPLv2 licenses. In each file, add a notice that the code is dual licensed under both MIT and GPLv2. Update the README to note that the driver is dual-licensed while the userspace programs are apache 2 licensed. * Update remaining chisels to use apache license We got permission from the author via email. * Change new .c files to apache license Were recently added and picked up during rebase.
1 parent 4f433df commit e404c50

File tree

343 files changed

+5365
-2901
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

343 files changed

+5365
-2901
lines changed
Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
11
#!/bin/bash
2+
#
3+
# Copyright (C) 2013-2018 Draios Inc dba Sysdig.
4+
#
5+
# This file is part of sysdig .
6+
#
7+
# Licensed under the Apache License, Version 2.0 (the "License");
8+
# you may not use this file except in compliance with the License.
9+
# You may obtain a copy of the License at
10+
#
11+
# http://www.apache.org/licenses/LICENSE-2.0
12+
#
13+
# Unless required by applicable law or agreed to in writing, software
14+
# distributed under the License is distributed on an "AS IS" BASIS,
15+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
# See the License for the specific language governing permissions and
17+
# limitations under the License.
18+
#
19+
220
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
3-
sudo apt-get update
21+
sudo apt-get update

.travis-scripts/linux/build.sh

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
11
#!/bin/bash
2+
#
3+
# Copyright (C) 2013-2018 Draios Inc dba Sysdig.
4+
#
5+
# This file is part of sysdig .
6+
#
7+
# Licensed under the Apache License, Version 2.0 (the "License");
8+
# you may not use this file except in compliance with the License.
9+
# You may obtain a copy of the License at
10+
#
11+
# http://www.apache.org/licenses/LICENSE-2.0
12+
#
13+
# Unless required by applicable law or agreed to in writing, software
14+
# distributed under the License is distributed on an "AS IS" BASIS,
15+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
# See the License for the specific language governing permissions and
17+
# limitations under the License.
18+
#
219
set -e
320
export CC="gcc-4.8"
421
export CXX="g++-4.8"

.travis-scripts/linux/install.sh

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
11
#!/bin/bash
2+
#
3+
# Copyright (C) 2013-2018 Draios Inc dba Sysdig.
4+
#
5+
# This file is part of sysdig .
6+
#
7+
# Licensed under the Apache License, Version 2.0 (the "License");
8+
# you may not use this file except in compliance with the License.
9+
# You may obtain a copy of the License at
10+
#
11+
# http://www.apache.org/licenses/LICENSE-2.0
12+
#
13+
# Unless required by applicable law or agreed to in writing, software
14+
# distributed under the License is distributed on an "AS IS" BASIS,
15+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
# See the License for the specific language governing permissions and
17+
# limitations under the License.
18+
#
219
sudo apt-get --force-yes install g++-4.8
320
sudo apt-get install rpm linux-headers-$(uname -r) libelf-dev
421
sudo apt-get purge cmake
Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,19 @@
11
#!/bin/bash
2-
brew update
2+
#
3+
# Copyright (C) 2013-2018 Draios Inc dba Sysdig.
4+
#
5+
# This file is part of sysdig .
6+
#
7+
# Licensed under the Apache License, Version 2.0 (the "License");
8+
# you may not use this file except in compliance with the License.
9+
# You may obtain a copy of the License at
10+
#
11+
# http://www.apache.org/licenses/LICENSE-2.0
12+
#
13+
# Unless required by applicable law or agreed to in writing, software
14+
# distributed under the License is distributed on an "AS IS" BASIS,
15+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
# See the License for the specific language governing permissions and
17+
# limitations under the License.
18+
#
19+
brew update

.travis-scripts/osx/build.sh

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,24 @@
11
#!/bin/bash
2+
#
3+
# Copyright (C) 2013-2018 Draios Inc dba Sysdig.
4+
#
5+
# This file is part of sysdig .
6+
#
7+
# Licensed under the Apache License, Version 2.0 (the "License");
8+
# you may not use this file except in compliance with the License.
9+
# You may obtain a copy of the License at
10+
#
11+
# http://www.apache.org/licenses/LICENSE-2.0
12+
#
13+
# Unless required by applicable law or agreed to in writing, software
14+
# distributed under the License is distributed on an "AS IS" BASIS,
15+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
# See the License for the specific language governing permissions and
17+
# limitations under the License.
18+
#
219
set -e
320
mkdir build
421
cd build
522
cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DUSE_BUNDLED_LUAJIT=OFF -DUSE_BUNDLED_ZLIB=OFF
623
make install
7-
../test/sysdig_trace_regression.sh $(which sysdig) ./userspace/sysdig/chisels $TRAVIS_BRANCH
24+
../test/sysdig_trace_regression.sh $(which sysdig) ./userspace/sysdig/chisels $TRAVIS_BRANCH

.travis-scripts/osx/install.sh

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
11
#!/bin/bash
2+
#
3+
# Copyright (C) 2013-2018 Draios Inc dba Sysdig.
4+
#
5+
# This file is part of sysdig .
6+
#
7+
# Licensed under the Apache License, Version 2.0 (the "License");
8+
# you may not use this file except in compliance with the License.
9+
# You may obtain a copy of the License at
10+
#
11+
# http://www.apache.org/licenses/LICENSE-2.0
12+
#
13+
# Unless required by applicable law or agreed to in writing, software
14+
# distributed under the License is distributed on an "AS IS" BASIS,
15+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
# See the License for the specific language governing permissions and
17+
# limitations under the License.
18+
#
219
function install_if_not_present(){
320
brew ls | grep ${1}
421
if [[ ${?} -ne 0 ]]; then
@@ -9,4 +26,4 @@ function install_if_not_present(){
926
}
1027
install_if_not_present "cmake"
1128
install_if_not_present "luajit"
12-
install_if_not_present "coreutils"
29+
install_if_not_present "coreutils"

.travis.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
#
2+
# Copyright (C) 2013-2018 Draios Inc dba Sysdig.
3+
#
4+
# This file is part of sysdig .
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
118
language: c
219
os:
320
- linux

CMakeCPackOptions.cmake

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
#
2+
# Copyright (C) 2013-2018 Draios Inc dba Sysdig.
3+
#
4+
# This file is part of sysdig .
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
118
if(CPACK_GENERATOR MATCHES "TGZ")
219
set(CPACK_SET_DESTDIR "ON")
320
set(CPACK_STRIP_FILES "OFF")

CMakeLists.txt

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
#
2+
# Copyright (C) 2013-2018 Draios Inc dba Sysdig.
3+
#
4+
# This file is part of sysdig .
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
118

219
# Prior to doing anything, we make sure that we aren't trying to
320
# run cmake in-tree. (see Issue 71: https://github.com/draios/sysdig/issues/71)
@@ -407,7 +424,7 @@ set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "http://www.sysdig.org")
407424
set(CPACK_DEBIAN_PACKAGE_DEPENDS "dkms (>= 2.1.0.0)")
408425
set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_BINARY_DIR}/scripts/debian/postinst;${CMAKE_BINARY_DIR}/scripts/debian/prerm")
409426

410-
set(CPACK_RPM_PACKAGE_LICENSE "GPLv2")
427+
set(CPACK_RPM_PACKAGE_LICENSE "Apache v2.0")
411428
set(CPACK_RPM_PACKAGE_URL "http://www.sysdig.org")
412429
set(CPACK_RPM_PACKAGE_REQUIRES "dkms, gcc, make, kernel-devel, perl")
413430
set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${PROJECT_SOURCE_DIR}/scripts/rpm/postinstall")

0 commit comments

Comments
 (0)