diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-21 21:00:58 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-21 21:00:58 +0100 |
commit | 8b2628ad8526c806375e7b157889e4274b70248b (patch) | |
tree | ccba8cd56af7e086131454d6062d5d31115791df /app-emulation/rkt/rkt-1.28.1.ebuild | |
parent | b620fb1b0929ff9657a2588aaa42b85e3021c102 (diff) |
gentoo resync : 21.10.2017
Diffstat (limited to 'app-emulation/rkt/rkt-1.28.1.ebuild')
-rw-r--r-- | app-emulation/rkt/rkt-1.28.1.ebuild | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/app-emulation/rkt/rkt-1.28.1.ebuild b/app-emulation/rkt/rkt-1.28.1.ebuild index c15c8003546e..ea1b51224b7e 100644 --- a/app-emulation/rkt/rkt-1.28.1.ebuild +++ b/app-emulation/rkt/rkt-1.28.1.ebuild @@ -23,6 +23,7 @@ SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE ) rkt_stage1_kvm_lkvm? ( https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz + https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/patch/?id=c0a985531f49c06fd05069024f4664740e6a0baf -> kvmtool-include-sysmacros-c0a985531f49c06fd05069024f4664740e6a0baf.patch ${SRC_URI_KVM} ) rkt_stage1_kvm_qemu? ( @@ -72,10 +73,15 @@ pkg_setup() { } src_unpack() { - local x + local dest x for x in ${A}; do case ${x} in *.img|linux-*) continue ;; + kvmtool-include-sysmacros-*) #627564 + dest=${S}/stage1/usr_from_kvm/lkvm/patches + mkdir -p "${dest}" || die + cp "${DISTDIR}/${x}" "${dest}" || die + ;; kvmtool-*) mkdir kvmtool || die pushd kvmtool >/dev/null || die @@ -150,6 +156,10 @@ src_prepare() { -i stage1/init/init.go || die fi + if use rkt_stage1_kvm_qemu; then + sed '1i#include <sys/sysmacros.h>' -i "${WORKDIR}/qemu-${QEMU_VERSION#v}/hw/9pfs/9p.c" || die + fi + eautoreconf } |