Skip to content

Commit

Permalink
Update package licenses.
Browse files Browse the repository at this point in the history
  • Loading branch information
fasaxc committed Feb 24, 2020
1 parent 1093a9e commit 7c83981
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 3 deletions.
23 changes: 22 additions & 1 deletion debian/copyright
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Upstream-Name: calico
Source: http://github.com/projectcalico/felix

Files: *
Copyright: 2014-2019 Tigera, Inc
Copyright: 2014-2020 Tigera, Inc
License: Apache-2
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -19,3 +19,24 @@ License: Apache-2
.
On Debian-based systems the full text of the Apache version 2.0 license
can be found in `/usr/share/common-licenses/Apache-2.0'

Files: bpf-gpl/*
Copyright: 2020 Tigera, Inc
License: GPL-2
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.
.
On Debian-based systems the full text of the GPL version 2.0 license
can be found in `/usr/share/common-licenses/GPL-2'

2 changes: 1 addition & 1 deletion debian/rules
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/make -f

# Uncomment this to turn on verbose mode.
export DH_VERBOSE=1
#export DH_VERBOSE=1

%:
dh $@ --with systemd
Expand Down
3 changes: 2 additions & 1 deletion rpm/felix.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ Name: felix
Summary: Project Calico virtual networking for cloud data centers
Version: -- filled in by 'make rpm' when building packages --
Release: -- filled in by 'make rpm' when building packages --
License: Apache-2
# All code is Apache 2.0 except files in bpf-gpl which are GPL-2.
License: ASL 2.0 and GPLv2
URL: http://projectcalico.org
Source0: felix-%{version}.tar.gz
Source1: calico-felix.logrotate
Expand Down

0 comments on commit 7c83981

Please sign in to comment.