mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-01 03:41:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

rkt: fix conflict with older actool package

Browse Source
This commit is contained in:
Michael Marineau 2015-07-22 18:00:22 -07:00
parent 006235d13f
commit 301d285297
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild vendored
View File

@ -47,6 +47,7 @@ DEPEND=">=dev-lang/go-1.4.1
app-shells/bash app-shells/bash
)" )"
RDEPEND="!app-emulation/rocket RDEPEND="!app-emulation/rocket
actool? ( !app-emulation/actool )
rkt_stage1_host? ( rkt_stage1_host? (
>=sys-apps/systemd-220 >=sys-apps/systemd-220
app-shells/bash app-shells/bash

0
sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r258.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r259.ebuild vendored
View File

3
sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild vendored
View File

@ -95,8 +95,7 @@ RDEPEND="${RDEPEND}
)" )"
RDEPEND="${RDEPEND} RDEPEND="${RDEPEND}
app-emulation/actool app-emulation/rkt[actool]
app-emulation/rkt
app-emulation/xenstore app-emulation/xenstore
amd64? ( app-emulation/xenserver-pv-version ) amd64? ( app-emulation/xenserver-pv-version )
sys-apps/findutils sys-apps/findutils