| 1 |
commit: 0399633683f4db02a4522660438577570735514f |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Mar 6 06:41:16 2016 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Mar 6 06:41:16 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03996336 |
| 7 |
|
| 8 |
app-emulation/rkt: fix makefile dependencies to work in src_test |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.27 |
| 11 |
|
| 12 |
app-emulation/rkt/rkt-1.1.0.ebuild | 14 ++++++++------ |
| 13 |
1 file changed, 8 insertions(+), 6 deletions(-) |
| 14 |
|
| 15 |
diff --git a/app-emulation/rkt/rkt-1.1.0.ebuild b/app-emulation/rkt/rkt-1.1.0.ebuild |
| 16 |
index 309c760..5e3a55d 100644 |
| 17 |
--- a/app-emulation/rkt/rkt-1.1.0.ebuild |
| 18 |
+++ b/app-emulation/rkt/rkt-1.1.0.ebuild |
| 19 |
@@ -70,25 +70,27 @@ src_unpack() { |
| 20 |
|
| 21 |
src_prepare() { |
| 22 |
# disable git fetch of systemd |
| 23 |
- sed -e 's|^include makelib/git.mk$|'\ |
| 24 |
+ sed -e 's~^include makelib/git.mk$~'\ |
| 25 |
'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\ |
| 26 |
-'get_systemd_sources: $(UFS_SYSTEMDDIR)\n'\ |
| 27 |
+'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\ |
| 28 |
'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\ |
| 29 |
'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\ |
| 30 |
+'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\ |
| 31 |
'else\n'\ |
| 32 |
'\t\0\n'\ |
| 33 |
-'endif|' -i stage1/usr_from_src/usr_from_src.mk || die |
| 34 |
+'endif~' -i stage1/usr_from_src/usr_from_src.mk || die |
| 35 |
|
| 36 |
# disable git fetch of kvmtool |
| 37 |
- sed -e 's|^include makelib/git.mk$|'\ |
| 38 |
+ sed -e 's~^include makelib/git.mk$~'\ |
| 39 |
'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\ |
| 40 |
'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\ |
| 41 |
-'get_lkvm_sources: $(LKVM_TMPDIR)\n'\ |
| 42 |
+'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\ |
| 43 |
'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\ |
| 44 |
'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\ |
| 45 |
+'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\ |
| 46 |
'else\n'\ |
| 47 |
'\t\0\n'\ |
| 48 |
-'endif|' -i stage1/usr_from_kvm/lkvm.mk || die |
| 49 |
+'endif~' -i stage1/usr_from_kvm/lkvm.mk || die |
| 50 |
|
| 51 |
# disable fetch of kernel sources |
| 52 |
sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \ |
Archives