toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restoring the RPM build process for Oracle Linux 6 and updating the docker-engine.spec

Browse Source 
file to require the Unbreakable Enterprise Kernel Release 4 on both Oracle Linux 6
and Oracle Linux 7.

The UEK R4 provides the required kernel functionality for VxLAN support
required by Docker 1.9 and user namespace support required for 1.10+.

The build of Docker on Oracle Linux 6 requires some manipulation of the build
environment so that the CGO compiler uses the UEK R4 headers instead of the old
default kernel headers.

Signed-off-by: Avi Miller <avi.miller@oracle.com>
Upstream-commit: 28f52bd06a24705bd6958ac505b6b6f36e877547
Component: engine
This commit is contained in:
Avi Miller
2016-01-08 08:09:47 +11:00
parent 3e3964af2f
commit 3293844ab5
4 changed files with 63 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/hack/make/.build-rpm/docker-engine.spec
+4 -4
View File
@@ -47,9 +47,9 @@ Requires: xz
# Resolves: rhbz#1165615
Requires: device-mapper-libs >= 1.02.90-1
%endif
%if 0%{?oraclelinux} == 6
# Require Oracle Unbreakable Enterprise Kernel R3 and newer device-mapper
Requires: kernel-uek >= 3.8
%if 0%{?oraclelinux} >= 6
# Require Oracle Unbreakable Enterprise Kernel R4 and newer device-mapper
Requires: kernel-uek >= 4.1
Requires: device-mapper >= 1.02.90-2
%endif
@@ -105,7 +105,7 @@ for deploying and scaling web apps, databases, and backend services without
depending on a particular stack or provider.
%prep
%if 0%{?centos} <= 6
%if 0%{?centos} <= 6 || 0%{oraclelinux} <=6
%setup -n %{name}
%else
%autosetup -n %{name}