From 365984670549c784c056379ad2bc5452a0494e21 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Tue, 16 Jul 2013 13:36:02 -0700 Subject: [PATCH] fix(coreos-base/bootengine): don't hardcode ${ROOT} use the ${ROOT} variable instead of hard coding our own right here. --- .../coreos-base/bootengine/bootengine-0.0.1.ebuild | 7 +++++-- .../coreos-base/bootengine/bootengine-9999.ebuild | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-0.0.1.ebuild index c8cabbf131..cc23325675 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-0.0.1.ebuild @@ -24,8 +24,11 @@ src_install() { insinto /usr/lib/dracut/modules.d/ doins -r ${S}/dracut/80gptprio $modules_dir - chroot /build/amd64-generic dracut --no-kernel --fstab --no-compress /tmp/bootengine.cpio + chroot ${ROOT} dracut --force --no-kernel --fstab --no-compress /tmp/bootengine.cpio + + cpio=${ROOT}/tmp/bootengine.cpio insinto /usr/share/bootengine/ - doins /build/amd64-generic/tmp/bootengine.cpio + doins ${cpio} + rm ${cpio} } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-9999.ebuild index c092388e37..7c26e0b1cf 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-9999.ebuild @@ -23,8 +23,11 @@ src_install() { insinto /usr/lib/dracut/modules.d/ doins -r ${S}/dracut/80gptprio $modules_dir - chroot /build/amd64-generic dracut --no-kernel --fstab --no-compress /tmp/bootengine.cpio + chroot ${ROOT} dracut --force --no-kernel --fstab --no-compress /tmp/bootengine.cpio + + cpio=${ROOT}/tmp/bootengine.cpio insinto /usr/share/bootengine/ - doins /build/amd64-generic/tmp/bootengine.cpio + doins ${cpio} + rm ${cpio} }