Update to 2.0.1.
- Remove patch no longer needed.
This commit is contained in:
parent
d12c6a9d47
commit
8c91a3ec1f
18
.gitignore
vendored
18
.gitignore
vendored
@ -1,17 +1 @@
|
|||||||
lxc-0.7.2.tar.gz
|
/lxc-*.tar.gz
|
||||||
/lxc-0.7.4.1.tar.gz
|
|
||||||
/lxc-0.7.4.2.tar.gz
|
|
||||||
/lxc-0.7.5.tar.gz
|
|
||||||
/lxc-0.8.0.tar.gz
|
|
||||||
/lxc-0.9.0.tar.gz
|
|
||||||
/lxc-1.0.3.tar.gz
|
|
||||||
/lxc-1.0.4.tar.gz
|
|
||||||
/lxc-1.0.5.tar.gz
|
|
||||||
/lxc-e75a5c5c76c649435bd9171d5ea457fe727f5388.tar.gz
|
|
||||||
/lxc-1.1.0.tar.gz
|
|
||||||
/lxc-1.1.1.tar.gz
|
|
||||||
/lxc-1.1.2.tar.gz
|
|
||||||
/lxc-1.1.3.tar.gz
|
|
||||||
/lxc-1.1.4.tar.gz
|
|
||||||
/lxc-1.1.5.tar.gz
|
|
||||||
/lxc-2.0.0.tar.gz
|
|
||||||
|
@ -1,11 +0,0 @@
|
|||||||
diff -up lxc-1.1.4/config/init/systemd/lxc.service.in.orig lxc-1.1.4/config/init/systemd/lxc.service.in
|
|
||||||
--- lxc-1.1.4/config/init/systemd/lxc.service.in.orig 2015-10-06 16:18:16.000000000 +0200
|
|
||||||
+++ lxc-1.1.4/config/init/systemd/lxc.service.in 2015-10-21 16:33:41.193477243 +0200
|
|
||||||
@@ -1,6 +1,6 @@
|
|
||||||
[Unit]
|
|
||||||
Description=LXC Container Initialization and Autoboot Code
|
|
||||||
-After=syslog.target network.target lxc-net.service
|
|
||||||
+After=syslog.target network-online.target lxc-net.service
|
|
||||||
Wants=lxc-net.service
|
|
||||||
|
|
||||||
[Service]
|
|
@ -1,8 +1,7 @@
|
|||||||
diff --git a/config/init/sysvinit/lxc-containers.in b/config/init/sysvinit/lxc-containers.in
|
diff -up lxc-2.0.1/config/init/sysvinit/lxc-containers.in.orig lxc-2.0.1/config/init/sysvinit/lxc-containers.in
|
||||||
index bc93322..06ca8f4 100644
|
--- lxc-2.0.1/config/init/sysvinit/lxc-containers.in.orig 2016-05-18 20:40:05.308604928 +0200
|
||||||
--- a/config/init/sysvinit/lxc-containers.in
|
+++ lxc-2.0.1/config/init/sysvinit/lxc-containers.in 2016-05-18 20:42:15.855301108 +0200
|
||||||
+++ b/config/init/sysvinit/lxc-containers.in
|
@@ -2,7 +2,7 @@
|
||||||
@@ -2,13 +2,15 @@
|
|
||||||
#
|
#
|
||||||
# lxc Start/Stop LXC autoboot containers
|
# lxc Start/Stop LXC autoboot containers
|
||||||
#
|
#
|
||||||
@ -11,21 +10,21 @@ index bc93322..06ca8f4 100644
|
|||||||
# description: Starts/Stops all LXC containers configured for autostart.
|
# description: Starts/Stops all LXC containers configured for autostart.
|
||||||
#
|
#
|
||||||
### BEGIN INIT INFO
|
### BEGIN INIT INFO
|
||||||
# Provides: lxc
|
@@ -11,8 +11,8 @@
|
||||||
|
# Required-Stop: $syslog $remote_fs
|
||||||
|
# Should-Start:
|
||||||
|
# Should-Stop:
|
||||||
-# Default-Start: 2 3 4 5
|
-# Default-Start: 2 3 4 5
|
||||||
-# Default-Stop: 0 1 6
|
-# Default-Stop: 0 1 6
|
||||||
+# Required-Start: $local_fs $network
|
|
||||||
+# Required-Stop: $local_fs $network
|
|
||||||
+# Default-Start:
|
+# Default-Start:
|
||||||
+# Default-Stop:
|
+# Default-Stop:
|
||||||
# Short-Description: Bring up/down LXC autostart containers
|
# Short-Description: Bring up/down LXC autostart containers
|
||||||
# Description: Bring up/down LXC autostart containers
|
# Description: Bring up/down LXC autostart containers
|
||||||
### END INIT INFO
|
### END INIT INFO
|
||||||
diff --git a/config/init/sysvinit/lxc-net.in b/config/init/sysvinit/lxc-net.in
|
diff -up lxc-2.0.1/config/init/sysvinit/lxc-net.in.orig lxc-2.0.1/config/init/sysvinit/lxc-net.in
|
||||||
index f6892c1..362469c 100644
|
--- lxc-2.0.1/config/init/sysvinit/lxc-net.in.orig 2016-05-18 20:40:05.308604928 +0200
|
||||||
--- a/config/init/sysvinit/lxc-net.in
|
+++ lxc-2.0.1/config/init/sysvinit/lxc-net.in 2016-05-18 20:42:29.560164233 +0200
|
||||||
+++ b/config/init/sysvinit/lxc-net.in
|
@@ -2,7 +2,7 @@
|
||||||
@@ -2,13 +2,15 @@
|
|
||||||
#
|
#
|
||||||
# lxc-net Start/Stop LXC Networking
|
# lxc-net Start/Stop LXC Networking
|
||||||
#
|
#
|
||||||
@ -34,11 +33,12 @@ index f6892c1..362469c 100644
|
|||||||
# description: Starts/Stops LXC Network Bridge
|
# description: Starts/Stops LXC Network Bridge
|
||||||
#
|
#
|
||||||
### BEGIN INIT INFO
|
### BEGIN INIT INFO
|
||||||
# Provides: lxc-net
|
@@ -11,8 +11,8 @@
|
||||||
|
# Required-Stop: $syslog $remote_fs
|
||||||
|
# Should-Start:
|
||||||
|
# Should-Stop:
|
||||||
-# Default-Start: 2 3 4 5
|
-# Default-Start: 2 3 4 5
|
||||||
-# Default-Stop: 1
|
-# Default-Stop: 1
|
||||||
+# Required-Start: $local_fs $network
|
|
||||||
+# Required-Stop: $local_fs $network
|
|
||||||
+# Default-Start:
|
+# Default-Start:
|
||||||
+# Default-Stop:
|
+# Default-Stop:
|
||||||
# Short-Description: Bring up/down LXC Network Bridge
|
# Short-Description: Bring up/down LXC Network Bridge
|
11
lxc.spec
11
lxc.spec
@ -34,7 +34,7 @@
|
|||||||
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
||||||
|
|
||||||
Name: lxc
|
Name: lxc
|
||||||
Version: 2.0.0
|
Version: 2.0.1
|
||||||
Release: %{?prerel:0.}1%{?prerel:.%{prerel}}%{?dist}
|
Release: %{?prerel:0.}1%{?prerel:.%{prerel}}%{?dist}
|
||||||
Summary: Linux Resource Containers
|
Summary: Linux Resource Containers
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
@ -45,8 +45,7 @@ Source0: https://github.com/lxc/lxc/archive/%{commit}/%{name}-%{commit}.t
|
|||||||
%else
|
%else
|
||||||
Source0: http://linuxcontainers.org/downloads/%{name}-%{version}.tar.gz
|
Source0: http://linuxcontainers.org/downloads/%{name}-%{version}.tar.gz
|
||||||
%endif
|
%endif
|
||||||
Patch0: lxc-1.1.0-fix-init.patch
|
Patch0: lxc-2.0.1-fix-init.patch
|
||||||
Patch1: lxc-1.1.4-fix-bootorder.patch
|
|
||||||
Patch2: lxc-2.0.0-remove-werror.patch
|
Patch2: lxc-2.0.0-remove-werror.patch
|
||||||
BuildRequires: docbook-utils
|
BuildRequires: docbook-utils
|
||||||
BuildRequires: docbook2X
|
BuildRequires: docbook2X
|
||||||
@ -180,8 +179,6 @@ This package contains documentation for %{name}.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{?!prerel:%{version}}%{?prerel:%{commit}}
|
%setup -q -n %{name}-%{?!prerel:%{version}}%{?prerel:%{commit}}
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
# see rhbz#1263612
|
|
||||||
%patch1 -p1
|
|
||||||
# -Wall with -Werror doesn't work well
|
# -Wall with -Werror doesn't work well
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
|
|
||||||
@ -382,6 +379,10 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jun 3 2016 Thomas Moschny <thomas.moschny@gmx.de> - 2.0.1-1
|
||||||
|
- Update to 2.0.1.
|
||||||
|
- Remove patch no longer needed.
|
||||||
|
|
||||||
* Wed Apr 20 2016 Thomas Moschny <thomas.moschny@gmx.de> - 2.0.0-1
|
* Wed Apr 20 2016 Thomas Moschny <thomas.moschny@gmx.de> - 2.0.0-1
|
||||||
- Update to 2.0.0.
|
- Update to 2.0.0.
|
||||||
- Obsolete the -extra subpackage.
|
- Obsolete the -extra subpackage.
|
||||||
|
Loading…
Reference in New Issue
Block a user