From 5365827939181c960d6069ff5dd9e80fe0ac467d Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Tue, 16 Jul 2013 12:27:18 -0700 Subject: [PATCH] fix(coreos-base/bootengine): change to build single image don't build an image for every boot kernel, just build a single uncompressed image and put it in /usr/share/bootengine/bootengine.cpio. --- ....1-r1.ebuild => bootengine-0.0.1-r2.ebuild} | 0 .../bootengine/bootengine-0.0.1.ebuild | 18 +++++++----------- .../bootengine/bootengine-9999.ebuild | 15 ++++++--------- 3 files changed, 13 insertions(+), 20 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/{bootengine-0.0.1-r1.ebuild => bootengine-0.0.1-r2.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-0.0.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-0.0.1-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-0.0.1-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-0.0.1-r2.ebuild 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 77c3ac637e..c8cabbf131 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 @@ -18,18 +18,14 @@ SLOT="0" KEYWORDS="amd64 x86" DEPEND=" - sys-kernel/dracut - sys-kernel/coreos-bootkernel" + sys-kernel/dracut" src_install() { - modules_dir=${D}/usr/lib/dracut/modules.d/ - mkdir -p $modules_dir - cp -R dracut/80gptprio $modules_dir + insinto /usr/lib/dracut/modules.d/ + doins -r ${S}/dracut/80gptprio $modules_dir - mkdir ${D}/boot - for i in `ls /build/amd64-generic/boot/vmlinuz-*boot_kernel*`; do - ver=${i##*vmlinuz-} - chroot /build/amd64-generic dracut --force --fstab --kver ${ver} /tmp/initramfs-${ver}.img - cp /build/amd64-generic/tmp/initramfs-${ver}.img ${D}/boot/ - done + chroot /build/amd64-generic dracut --no-kernel --fstab --no-compress /tmp/bootengine.cpio + + insinto /usr/share/bootengine/ + doins /build/amd64-generic/tmp/bootengine.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 1162b4dd6e..c092388e37 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 @@ -20,14 +20,11 @@ DEPEND=" sys-kernel/dracut" src_install() { - modules_dir=${D}/usr/lib/dracut/modules.d/ - mkdir -p $modules_dir - cp -R dracut/80gptprio $modules_dir + insinto /usr/lib/dracut/modules.d/ + doins -r ${S}/dracut/80gptprio $modules_dir - mkdir ${D}/boot - for i in `ls /build/amd64-generic/boot/vmlinuz-*boot_kernel*`; do - ver=${i##*vmlinuz-} - chroot /build/amd64-generic dracut --force --fstab --kver ${ver} /tmp/initramfs-${ver}.img - cp /build/amd64-generic/tmp/initramfs-${ver}.img ${D}/boot/ - done + chroot /build/amd64-generic dracut --no-kernel --fstab --no-compress /tmp/bootengine.cpio + + insinto /usr/share/bootengine/ + doins /build/amd64-generic/tmp/bootengine.cpio }