Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
lxc
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
lxc
Commits
ce951132
Commit
ce951132
authored
Jan 23, 2013
by
Dwight Engen
Committed by
Stéphane Graber
Jan 23, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
include python files in make dist and rpm
Signed-off-by:
Dwight Engen
<
dwight.engen@oracle.com
>
Acked-by:
Stéphane Graber
<
stgraber@ubuntu.com
>
parent
e6cde741
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
4 deletions
+22
-4
Makefile.am
Makefile.am
+5
-1
lxc.spec.in
lxc.spec.in
+14
-1
Makefile.am
src/lxc/Makefile.am
+1
-0
Makefile.am
src/python-lxc/Makefile.am
+2
-0
Makefile.am
templates/Makefile.am
+0
-2
No files found.
Makefile.am
View file @
ce951132
...
@@ -6,6 +6,10 @@ SUBDIRS = config src templates doc
...
@@ -6,6 +6,10 @@ SUBDIRS = config src templates doc
DIST_SUBDIRS
=
config src templates doc
DIST_SUBDIRS
=
config src templates doc
EXTRA_DIST
=
autogen.sh lxc.spec CONTRIBUTING MAINTAINERS ChangeLog
EXTRA_DIST
=
autogen.sh lxc.spec CONTRIBUTING MAINTAINERS ChangeLog
if
ENABLE_PYTHON
RPMARGS
=
--with
python
endif
pcdatadir
=
$(libdir)
/pkgconfig
pcdatadir
=
$(libdir)
/pkgconfig
pcdata_DATA
=
lxc.pc
pcdata_DATA
=
lxc.pc
...
@@ -17,4 +21,4 @@ ChangeLog::
...
@@ -17,4 +21,4 @@ ChangeLog::
@
touch
ChangeLog
@
touch
ChangeLog
rpm
:
dist
rpm
:
dist
rpmbuild
--clean
-ta
${
distdir
}
.tar.gz
rpmbuild
--clean
-ta
${
distdir
}
.tar.gz
$(RPMARGS)
lxc.spec.in
View file @
ce951132
...
@@ -32,6 +32,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
...
@@ -32,6 +32,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: libcap openssl rsync
Requires: libcap openssl rsync
BuildRequires: libcap libcap-devel docbook2X
BuildRequires: libcap libcap-devel docbook2X
%define with_python %{?_with_python: 1} %{?!_with_python: 0}
%if %{with_python}
Requires: python3
BuildRequires: python3-devel
%endif
%description
%description
The package "%{name}" provides the command lines to create and manage
The package "%{name}" provides the command lines to create and manage
...
@@ -62,7 +68,11 @@ development of the linux containers.
...
@@ -62,7 +68,11 @@ development of the linux containers.
%prep
%prep
%setup
%setup
%build
%build
PATH=$PATH:/usr/sbin:/sbin %configure $args --disable-rpath
PATH=$PATH:/usr/sbin:/sbin %configure $args \
%if %{with_python}
--enable-python \
%endif
--disable-rpath
make %{?_smp_mflags}
make %{?_smp_mflags}
%install
%install
...
@@ -97,6 +107,9 @@ rm -rf %{buildroot}
...
@@ -97,6 +107,9 @@ rm -rf %{buildroot}
%defattr(-,root,root)
%defattr(-,root,root)
%{_libdir}/*.so.*
%{_libdir}/*.so.*
%{_libdir}/%{name}
%{_libdir}/%{name}
%if %{with_python}
%{_libdir}/python*
%endif
%{_localstatedir}/*
%{_localstatedir}/*
%attr(4555,root,root) %{_libexecdir}/%{name}/lxc-init
%attr(4555,root,root) %{_libexecdir}/%{name}/lxc-init
...
...
src/lxc/Makefile.am
View file @
ce951132
...
@@ -125,6 +125,7 @@ bin_SCRIPTS = \
...
@@ -125,6 +125,7 @@ bin_SCRIPTS = \
lxc-destroy
lxc-destroy
if
ENABLE_PYTHON
if
ENABLE_PYTHON
EXTRA_DIST
=
lxc-device lxc-ls
bin_SCRIPTS
+=
lxc-device
bin_SCRIPTS
+=
lxc-device
bin_SCRIPTS
+=
lxc-ls
bin_SCRIPTS
+=
lxc-ls
bin_SCRIPTS
+=
lxc-start-ephemeral
bin_SCRIPTS
+=
lxc-start-ephemeral
...
...
src/python-lxc/Makefile.am
View file @
ce951132
if
ENABLE_PYTHON
if
ENABLE_PYTHON
EXTRA_DIST
=
setup.py lxc.c
if
HAVE_DEBIAN
if
HAVE_DEBIAN
DISTSETUPOPTS
=
--install-layout
=
deb
DISTSETUPOPTS
=
--install-layout
=
deb
else
else
...
...
templates/Makefile.am
View file @
ce951132
EXTRA_DIST
=
lxc-ubuntu
templatesdir
=
@LXCTEMPLATEDIR@
templatesdir
=
@LXCTEMPLATEDIR@
templates_SCRIPTS
=
\
templates_SCRIPTS
=
\
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment