Skip to content

Commit 3fdac29

Browse files
3XX03XX0
committed
Add optional support for libelf from the elfutils project
1 parent b56e800 commit 3fdac29

File tree

10 files changed

+988
-39
lines changed

10 files changed

+988
-39
lines changed

‎COPYING

Lines changed: 674 additions & 0 deletions
Large diffs are not rendered by default.

‎COPYING.LESSER

Lines changed: 165 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
GNU LESSER GENERAL PUBLIC LICENSE
2+
Version 3, 29 June 2007
3+
4+
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
5+
Everyone is permitted to copy and distribute verbatim copies
6+
of this license document, but changing it is not allowed.
7+
8+
9+
This version of the GNU Lesser General Public License incorporates
10+
the terms and conditions of version 3 of the GNU General Public
11+
License, supplemented by the additional permissions listed below.
12+
13+
0. Additional Definitions.
14+
15+
As used herein, "this License" refers to version 3 of the GNU Lesser
16+
General Public License, and the "GNU GPL" refers to version 3 of the GNU
17+
General Public License.
18+
19+
"The Library" refers to a covered work governed by this License,
20+
other than an Application or a Combined Work as defined below.
21+
22+
An "Application" is any work that makes use of an interface provided
23+
by the Library, but which is not otherwise based on the Library.
24+
Defining a subclass of a class defined by the Library is deemed a mode
25+
of using an interface provided by the Library.
26+
27+
A "Combined Work" is a work produced by combining or linking an
28+
Application with the Library. The particular version of the Library
29+
with which the Combined Work was made is also called the "Linked
30+
Version".
31+
32+
The "Minimal Corresponding Source" for a Combined Work means the
33+
Corresponding Source for the Combined Work, excluding any source code
34+
for portions of the Combined Work that, considered in isolation, are
35+
based on the Application, and not on the Linked Version.
36+
37+
The "Corresponding Application Code" for a Combined Work means the
38+
object code and/or source code for the Application, including any data
39+
and utility programs needed for reproducing the Combined Work from the
40+
Application, but excluding the System Libraries of the Combined Work.
41+
42+
1. Exception to Section 3 of the GNU GPL.
43+
44+
You may convey a covered work under sections 3 and 4 of this License
45+
without being bound by section 3 of the GNU GPL.
46+
47+
2. Conveying Modified Versions.
48+
49+
If you modify a copy of the Library, and, in your modifications, a
50+
facility refers to a function or data to be supplied by an Application
51+
that uses the facility (other than as an argument passed when the
52+
facility is invoked), then you may convey a copy of the modified
53+
version:
54+
55+
a) under this License, provided that you make a good faith effort to
56+
ensure that, in the event an Application does not supply the
57+
function or data, the facility still operates, and performs
58+
whatever part of its purpose remains meaningful, or
59+
60+
b) under the GNU GPL, with none of the additional permissions of
61+
this License applicable to that copy.
62+
63+
3. Object Code Incorporating Material from Library Header Files.
64+
65+
The object code form of an Application may incorporate material from
66+
a header file that is part of the Library. You may convey such object
67+
code under terms of your choice, provided that, if the incorporated
68+
material is not limited to numerical parameters, data structure
69+
layouts and accessors, or small macros, inline functions and templates
70+
(ten or fewer lines in length), you do both of the following:
71+
72+
a) Give prominent notice with each copy of the object code that the
73+
Library is used in it and that the Library and its use are
74+
covered by this License.
75+
76+
b) Accompany the object code with a copy of the GNU GPL and this license
77+
document.
78+
79+
4. Combined Works.
80+
81+
You may convey a Combined Work under terms of your choice that,
82+
taken together, effectively do not restrict modification of the
83+
portions of the Library contained in the Combined Work and reverse
84+
engineering for debugging such modifications, if you also do each of
85+
the following:
86+
87+
a) Give prominent notice with each copy of the Combined Work that
88+
the Library is used in it and that the Library and its use are
89+
covered by this License.
90+
91+
b) Accompany the Combined Work with a copy of the GNU GPL and this license
92+
document.
93+
94+
c) For a Combined Work that displays copyright notices during
95+
execution, include the copyright notice for the Library among
96+
these notices, as well as a reference directing the user to the
97+
copies of the GNU GPL and this license document.
98+
99+
d) Do one of the following:
100+
101+
0) Convey the Minimal Corresponding Source under the terms of this
102+
License, and the Corresponding Application Code in a form
103+
suitable for, and under terms that permit, the user to
104+
recombine or relink the Application with a modified version of
105+
the Linked Version to produce a modified Combined Work, in the
106+
manner specified by section 6 of the GNU GPL for conveying
107+
Corresponding Source.
108+
109+
1) Use a suitable shared library mechanism for linking with the
110+
Library. A suitable mechanism is one that (a) uses at run time
111+
a copy of the Library already present on the user's computer
112+
system, and (b) will operate properly with a modified version
113+
of the Library that is interface-compatible with the Linked
114+
Version.
115+
116+
e) Provide Installation Information, but only if you would otherwise
117+
be required to provide such information under section 6 of the
118+
GNU GPL, and only to the extent that such information is
119+
necessary to install and execute a modified version of the
120+
Combined Work produced by recombining or relinking the
121+
Application with a modified version of the Linked Version. (If
122+
you use option 4d0, the Installation Information must accompany
123+
the Minimal Corresponding Source and Corresponding Application
124+
Code. If you use option 4d1, you must provide the Installation
125+
Information in the manner specified by section 6 of the GNU GPL
126+
for conveying Corresponding Source.)
127+
128+
5. Combined Libraries.
129+
130+
You may place library facilities that are a work based on the
131+
Library side by side in a single library together with other library
132+
facilities that are not Applications and are not covered by this
133+
License, and convey such a combined library under terms of your
134+
choice, if you do both of the following:
135+
136+
a) Accompany the combined library with a copy of the same work based
137+
on the Library, uncombined with any other library facilities,
138+
conveyed under the terms of this License.
139+
140+
b) Give prominent notice with the combined library that part of it
141+
is a work based on the Library, and explaining where to find the
142+
accompanying uncombined form of the same work.
143+
144+
6. Revised Versions of the GNU Lesser General Public License.
145+
146+
The Free Software Foundation may publish revised and/or new versions
147+
of the GNU Lesser General Public License from time to time. Such new
148+
versions will be similar in spirit to the present version, but may
149+
differ in detail to address new problems or concerns.
150+
151+
Each version is given a distinguishing version number. If the
152+
Library as you received it specifies that a certain numbered version
153+
of the GNU Lesser General Public License "or any later version"
154+
applies to it, you have the option of following the terms and
155+
conditions either of that published version or of any later version
156+
published by the Free Software Foundation. If the Library as you
157+
received it does not specify a version number of the GNU Lesser
158+
General Public License, you may choose any version of the GNU Lesser
159+
General Public License ever published by the Free Software Foundation.
160+
161+
If the Library as you received it specifies that a proxy can decide
162+
whether future versions of the GNU Lesser General Public License shall
163+
apply, that proxy's public statement of acceptance of any version is
164+
permanent authorization for you to choose that version for the
165+
Library.

‎Makefile

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
##### Global variables #####
99

10+
WITH_LIBELF ?= 0
1011
WITH_TIRPC ?= 0
1112
WITH_SECCOMP ?= 1
1213

@@ -16,6 +17,7 @@ export prefix = /usr/local
1617
export exec_prefix = $(prefix)
1718
export bindir = $(exec_prefix)/bin
1819
export libdir = $(exec_prefix)/lib
20+
export docdir = $(prefix)/share/doc
1921
export libdbgdir = $(prefix)/lib/debug$(libdir)
2022
export includedir = $(prefix)/include
2123
export pkgconfdir = $(libdir)/pkgconfig
@@ -48,7 +50,12 @@ ifeq ($(COMPILER),)
4850
$(error Invalid compiler)
4951
endif
5052

51-
##### Source definitions #####
53+
##### File definitions #####
54+
55+
DOC_FILES := $(CURDIR)/NOTICE \
56+
$(CURDIR)/LICENSE \
57+
$(CURDIR)/COPYING \
58+
$(CURDIR)/COPYING.LESSER
5259

5360
BUILD_DEFS := $(SRCS_DIR)/build.h
5461

@@ -131,8 +138,14 @@ LDLIBS := $(LDLIBS)
131138
LIB_CPPFLAGS = -DNV_LINUX -isystem $(CUDA_DIR)/include -isystem $(DEPS_DIR)$(includedir) -include $(BUILD_DEFS)
132139
LIB_CFLAGS = -fPIC
133140
LIB_LDFLAGS = -L$(DEPS_DIR)$(libdir) -shared -Wl,-soname=$(LIB_SONAME)
134-
LIB_LDLIBS_STATIC = -l:libelf.a -l:libnvidia-modprobe-utils.a
141+
LIB_LDLIBS_STATIC = -l:libnvidia-modprobe-utils.a
135142
LIB_LDLIBS_SHARED = -ldl -lcap
143+
ifeq ($(WITH_LIBELF), 1)
144+
LIB_CPPFLAGS += -DWITH_LIBELF
145+
LIB_LDLIBS_SHARED += -lelf
146+
else
147+
LIB_LDLIBS_STATIC += -l:libelf.a
148+
endif
136149
ifeq ($(WITH_TIRPC), 1)
137150
LIB_CPPFLAGS += -isystem $(DEPS_DIR)$(includedir)/tirpc -DWITH_TIRPC
138151
LIB_LDLIBS_STATIC += -l:libtirpc.a
@@ -222,14 +235,16 @@ static: $(LIB_STATIC)($(LIB_STATIC_OBJ))
222235
deps: export DESTDIR:=$(DEPS_DIR)
223236
deps: $(LIB_RPC_SRCS) $(BUILD_DEFS)
224237
$(MKDIR) -p $(DEPS_DIR)
225-
$(MAKE) -f $(MAKE_DIR)/elftoolchain.mk install
226238
$(MAKE) -f $(MAKE_DIR)/nvidia-modprobe.mk install
239+
ifeq ($(WITH_LIBELF), 0)
240+
$(MAKE) -f $(MAKE_DIR)/elftoolchain.mk install
241+
endif
227242
ifeq ($(WITH_TIRPC), 1)
228243
$(MAKE) -f $(MAKE_DIR)/libtirpc.mk install
229244
endif
230245

231246
install: all
232-
$(INSTALL) -d -m 755 $(addprefix $(DESTDIR),$(includedir) $(bindir) $(libdir) $(libdbgdir) $(pkgconfdir))
247+
$(INSTALL) -d -m 755 $(addprefix $(DESTDIR),$(includedir) $(bindir) $(libdir) $(docdir) $(libdbgdir) $(pkgconfdir))
233248
# Install header files
234249
$(INSTALL) -m 644 $(LIB_INCS) $(DESTDIR)$(includedir)
235250
# Install library files
@@ -243,6 +258,9 @@ install: all
243258
$(MAKE_DIR)/$(LIB_PKGCFG).in "$(strip $(VERSION))" "$(strip $(LIB_LDLIBS_SHARED))" > $(DESTDIR)$(pkgconfdir)/$(LIB_PKGCFG)
244259
# Install binary files
245260
$(INSTALL) -m 755 $(BIN_NAME) $(DESTDIR)$(bindir)
261+
# Install documentation files
262+
$(INSTALL) -d -m 755 $(DESTDIR)$(docdir)/$(LIB_NAME)-$(VERSION)
263+
$(INSTALL) -m 644 $(DOC_FILES) $(DESTDIR)$(docdir)/$(LIB_NAME)-$(VERSION)
246264

247265
uninstall:
248266
# Uninstall header files
@@ -255,6 +273,8 @@ uninstall:
255273
$(RM) $(DESTDIR)$(pkgconfdir)/$(LIB_PKGCFG)
256274
# Uninstall binary files
257275
$(RM) $(DESTDIR)$(bindir)/$(BIN_NAME)
276+
# Uninstall documentation files
277+
$(RM) -r $(DESTDIR)$(docdir)/$(LIB_NAME)-$(VERSION)
258278

259279
dist: DESTDIR:=$(DIST_DIR)/$(LIB_NAME)_$(VERSION)$(addprefix -,$(TAG))
260280
dist: install
@@ -263,8 +283,10 @@ dist: install
263283

264284
depsclean:
265285
$(RM) $(BUILD_DEFS)
266-
-$(MAKE) -f $(MAKE_DIR)/elftoolchain.mk clean
267286
-$(MAKE) -f $(MAKE_DIR)/nvidia-modprobe.mk clean
287+
ifeq ($(WITH_LIBELF), 0)
288+
-$(MAKE) -f $(MAKE_DIR)/elftoolchain.mk clean
289+
endif
268290
ifeq ($(WITH_TIRPC), 1)
269291
-$(MAKE) -f $(MAKE_DIR)/libtirpc.mk clean
270292
endif

‎NOTICE

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved.
2+
3+
This software is licensed under the terms of the "BSD 3-clause" license
4+
For details, refer to the LICENSE file located alongside this notice.
5+
6+
If this program is being compiled and dynamically linked against libelf from the
7+
elfutils package (usually characterized by the definition of the macro `WITH_LIBELF'),
8+
the following license notice covers the use of said library along with the terms from
9+
the COPYING and COPYING.LESSER files located alongside this notice:
10+
11+
elfutils is free software: you can redistribute it and/or modify
12+
it under the terms of the GNU Lesser General Public License as published by
13+
the Free Software Foundation, either version 3 of the License, or
14+
(at your option) any later version.
15+
16+
elfutils is distributed in the hope that it will be useful,
17+
but WITHOUT ANY WARRANTY; without even the implied warranty of
18+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19+
GNU Lesser General Public License for more details.
20+
21+
You should have received copies of the GNU General Public License and
22+
the GNU Lesser General Public License along with this program. If
23+
not, see <http://www.gnu.org/licenses/>.

‎README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ nvidia-smi -L
6868

6969
This project is released under the [BSD 3-clause license](https://github.com/NVIDIA/libnvidia-container/blob/master/LICENSE).
7070

71+
Additionally, this project can be dynamically linked with libelf from the elfutils package (https://sourceware.org/elfutils), in which case additional terms apply.\
72+
Refer to [NOTICE](https://github.com/NVIDIA/libnvidia-container/blob/master/NOTICE) for more information.
73+
7174
## Issues and Contributing
7275

7376
A signed copy of the [Contributor License Agreement](https://raw.githubusercontent.com/NVIDIA/libnvidia-container/master/CLA) needs to be provided to <a href="mailto:[email protected]">[email protected]</a> before any change can be accepted.

‎pkg/deb/copyright

Lines changed: 46 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,50 @@ Source: https://github.com/NVIDIA/libnvidia-container
55
Files: *
66
Copyright: 2017 NVIDIA CORPORATION <[email protected]>
77
License: BSD-3-Clause
8+
Redistribution and use in source and binary forms, with or without
9+
modification, are permitted provided that the following conditions
10+
are met:
11+
* Redistributions of source code must retain the above copyright
12+
notice, this list of conditions and the following disclaimer.
13+
* Redistributions in binary form must reproduce the above copyright
14+
notice, this list of conditions and the following disclaimer in the
15+
documentation and/or other materials provided with the distribution.
16+
* Neither the name of NVIDIA CORPORATION nor the names of its
17+
contributors may be used to endorse or promote products derived
18+
from this software without specific prior written permission.
19+
.
20+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
21+
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
23+
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
24+
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
25+
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
26+
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
27+
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
28+
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
29+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
30+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
831

9-
License: BSD-3-Clause
10-
Redistribution and use in source and binary forms, with or without
11-
modification, are permitted provided that the following conditions
12-
are met:
13-
* Redistributions of source code must retain the above copyright
14-
notice, this list of conditions and the following disclaimer.
15-
* Redistributions in binary form must reproduce the above copyright
16-
notice, this list of conditions and the following disclaimer in the
17-
documentation and/or other materials provided with the distribution.
18-
* Neither the name of NVIDIA CORPORATION nor the names of its
19-
contributors may be used to endorse or promote products derived
20-
from this software without specific prior written permission.
21-
22-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
23-
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
24-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
25-
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
26-
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
27-
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
28-
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
29-
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
30-
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
31-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
32-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
32+
Files: src/elftool.*
33+
Copyright: 2017 NVIDIA CORPORATION <[email protected]>
34+
Comment: If these files have been compiled and dynamically linked against libelf from the
35+
elfutils package (usually characterized by the definition of the macro `WITH_LIBELF'),
36+
the following license notice covers the use of said library.
37+
License: LGPL-3+
38+
elfutils is free software: you can redistribute it and/or modify
39+
it under the terms of the GNU Lesser General Public License as published by
40+
the Free Software Foundation, either version 3 of the License, or
41+
(at your option) any later version.
42+
.
43+
elfutils is distributed in the hope that it will be useful,
44+
but WITHOUT ANY WARRANTY; without even the implied warranty of
45+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
46+
GNU Lesser General Public License for more details.
47+
.
48+
You should have received copies of the GNU General Public License and
49+
the GNU Lesser General Public License along with this program. If
50+
not, see <http://www.gnu.org/licenses/>.
51+
.
52+
On Debian systems, the full text of the GNU General Public License and
53+
the GNU Lesser General Public License can be found in the files
54+
`/usr/share/common-licenses/GPL-3' and `/usr/share/common-licenses/LGPL-3'.

‎pkg/rpm/SPECS/libnvidia-container.spec

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ containers leveraging NVIDIA hardware. The implementation relies on several
1313
kernel subsystems and is designed to be agnostic of the container runtime.
1414

1515
%install
16-
DESTDIR=%{buildroot} %{__make} install prefix=%{_prefix} exec_prefix=%{_exec_prefix} bindir=%{_bindir} libdir=%{_libdir} includedir=%{_includedir}
17-
install -d -m 755 %{buildroot}%{_licensedir}/%{name}-%{version}
18-
install -m 644 LICENSE %{buildroot}%{_licensedir}/%{name}-%{version}
16+
DESTDIR=%{buildroot} %{__make} install prefix=%{_prefix} exec_prefix=%{_exec_prefix} bindir=%{_bindir} libdir=%{_libdir} includedir=%{_includedir} docdir=%{_licensedir}
1917

2018
%package -n %{name}%{_major}
2119
Summary: NVIDIA container runtime library

0 commit comments

Comments
 (0)