mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-21 14:31:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1181 from marineam/rkt

Browse Source 
rkt: add rocket conflict dependency
This commit is contained in:
Michael Marineau 2015-04-04 17:29:17 -07:00
commit da5146d89f
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-0.5.3.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-0.5.3-r1.ebuild vendored
View File

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

@ -29,7 +29,7 @@ IUSE=""
DEPEND=">=dev-lang/go-1.3 DEPEND=">=dev-lang/go-1.3
app-arch/cpio app-arch/cpio
sys-fs/squashfs-tools" sys-fs/squashfs-tools"
RDEPEND="" RDEPEND="!app-emulation/rocket"
src_unpack() { src_unpack() {
local cache="${S}/stage1/rootfs/usr_from_coreos/cache" local cache="${S}/stage1/rootfs/usr_from_coreos/cache"