diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2016-03-05 22:41:16 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2016-03-05 22:41:16 -0800 |
| commit | 0399633683f4db02a4522660438577570735514f (patch) | |
| tree | d14b8f2980301556f9d1e46d8ed087148f1b598f | |
| parent | dev-ruby/oauth: add 0.5.1 (diff) | |
| download | gentoo-0399633683f4db02a4522660438577570735514f.tar.gz gentoo-0399633683f4db02a4522660438577570735514f.tar.bz2 gentoo-0399633683f4db02a4522660438577570735514f.zip | |
app-emulation/rkt: fix makefile dependencies to work in src_test
Package-Manager: portage-2.2.27
| -rw-r--r-- | app-emulation/rkt/rkt-1.1.0.ebuild | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/app-emulation/rkt/rkt-1.1.0.ebuild b/app-emulation/rkt/rkt-1.1.0.ebuild index 309c760b441c..5e3a55dd4b97 100644 --- a/app-emulation/rkt/rkt-1.1.0.ebuild +++ b/app-emulation/rkt/rkt-1.1.0.ebuild @@ -70,25 +70,27 @@ src_unpack() { src_prepare() { # disable git fetch of systemd - sed -e 's|^include makelib/git.mk$|'\ + sed -e 's~^include makelib/git.mk$~'\ 'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\ -'get_systemd_sources: $(UFS_SYSTEMDDIR)\n'\ +'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\ '\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\ '$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\ +'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\ 'else\n'\ '\t\0\n'\ -'endif|' -i stage1/usr_from_src/usr_from_src.mk || die +'endif~' -i stage1/usr_from_src/usr_from_src.mk || die # disable git fetch of kvmtool - sed -e 's|^include makelib/git.mk$|'\ + sed -e 's~^include makelib/git.mk$~'\ 'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\ '$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\ -'get_lkvm_sources: $(LKVM_TMPDIR)\n'\ +'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\ '\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\ '$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\ +'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\ 'else\n'\ '\t\0\n'\ -'endif|' -i stage1/usr_from_kvm/lkvm.mk || die +'endif~' -i stage1/usr_from_kvm/lkvm.mk || die # disable fetch of kernel sources sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \ |