From 915515ff14ca92232ca8342babe4f0d7d88a25b9 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Tue, 16 Jul 2013 10:11:26 -0700 Subject: [PATCH 1/3] feat(coreos-base/bootengine): initial commit --- .../bootengine/bootengine-0.0.1-r1.ebuild | 1 + .../bootengine/bootengine-0.0.1.ebuild | 27 +++++++++++++++++++ .../bootengine/bootengine-9999.ebuild | 27 +++++++++++++++++++ 3 files changed, 55 insertions(+) create mode 120000 sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-0.0.1-r1.ebuild create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-0.0.1.ebuild create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-9999.ebuild 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-r1.ebuild new file mode 120000 index 0000000000..085f25c3cb --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-0.0.1-r1.ebuild @@ -0,0 +1 @@ +bootengine-0.0.1.ebuild \ No newline at end of file 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 new file mode 100644 index 0000000000..3ca9a6ce86 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-0.0.1.ebuild @@ -0,0 +1,27 @@ +# Copyright (c) 2013 CoreOS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_COMMIT="c3e5455dd4b2ebb5f05f9203ddbe4e24c3af8ede" +CROS_WORKON_PROJECT="coreos/bootengine" +CROS_WORKON_LOCALNAME="bootengine" +CROS_WORKON_OUTOFTREE_BUILD=1 +CROS_WORKON_REPO="git://github.com" + +inherit cros-workon cros-debug cros-au + +DESCRIPTION="CoreOS Bootengine" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 x86" + +DEPEND=" + sys-kernel/dracut" + +src_install() { + modules_dir=${D}/usr/lib/dracut/modules.d/ + mkdir -p $modules_dir + cp -R dracut/80gptprio $modules_dir +} 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 new file mode 100644 index 0000000000..d2b4573ae7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/bootengine/bootengine-9999.ebuild @@ -0,0 +1,27 @@ +# Copyright (c) 2013 CoreOS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +CROS_WORKON_PROJECT="coreos/bootengine" +CROS_WORKON_LOCALNAME="bootengine" +CROS_WORKON_OUTOFTREE_BUILD=1 +CROS_WORKON_REPO="git://github.com" + +inherit cros-workon cros-debug cros-au + +DESCRIPTION="CoreOS Bootengine" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="32bit_au cros_host" + +DEPEND=" + sys-kernel/dracut" + +src_install() { + modules_dir=${D}/usr/lib/dracut/modules.d/ + mkdir -p $modules_dir + cp -R dracut/80gptprio $modules_dir +} From c33c7a422d7e1020c0085c7115f381cc2953b922 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Tue, 16 Jul 2013 10:46:44 -0700 Subject: [PATCH 2/3] feat(coreos-base/bootengine): build the initrds --- .../coreos-base/bootengine/bootengine-0.0.1.ebuild | 9 ++++++++- .../coreos-base/bootengine/bootengine-9999.ebuild | 6 ++++++ 2 files changed, 14 insertions(+), 1 deletion(-) 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 3ca9a6ce86..e2a359b037 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,10 +18,17 @@ SLOT="0" KEYWORDS="amd64 x86" DEPEND=" - sys-kernel/dracut" + sys-kernel/dracut + sys-kernel/coreos-bootkernel" src_install() { modules_dir=${D}/usr/lib/dracut/modules.d/ mkdir -p $modules_dir cp -R dracut/80gptprio $modules_dir + + mkdir ${D}/boot + for i in /boot/vmlinuz-*boot_kernel*; do + ver=${i##*vmlinuz-} + dracut --kver ${ver} ${D}/boot/initramfs-${ver}.img + done } 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 d2b4573ae7..37678450dc 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 @@ -24,4 +24,10 @@ src_install() { modules_dir=${D}/usr/lib/dracut/modules.d/ mkdir -p $modules_dir cp -R dracut/80gptprio $modules_dir + + mkdir ${D}/boot + for i in /boot/vmlinuz-*boot_kernel*; do + ver=${i##*vmlinuz-} + dracut --kver ${ver} ${D}/boot/initramfs-${ver}.img + done } From b634753f4c738b4a883fe7cb5eaa48ec7200463f Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Tue, 16 Jul 2013 11:15:51 -0700 Subject: [PATCH 3/3] hack(coreos-base/bootengine): use chroot dracut doesn't seem to have the ability to use a different root. Force for now. --- .../coreos-base/bootengine/bootengine-0.0.1.ebuild | 5 +++-- .../coreos-base/bootengine/bootengine-9999.ebuild | 6 +++--- 2 files changed, 6 insertions(+), 5 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 e2a359b037..77c3ac637e 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 @@ -27,8 +27,9 @@ src_install() { cp -R dracut/80gptprio $modules_dir mkdir ${D}/boot - for i in /boot/vmlinuz-*boot_kernel*; do + for i in `ls /build/amd64-generic/boot/vmlinuz-*boot_kernel*`; do ver=${i##*vmlinuz-} - dracut --kver ${ver} ${D}/boot/initramfs-${ver}.img + chroot /build/amd64-generic dracut --force --fstab --kver ${ver} /tmp/initramfs-${ver}.img + cp /build/amd64-generic/tmp/initramfs-${ver}.img ${D}/boot/ done } 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 37678450dc..1162b4dd6e 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 @@ -15,7 +15,6 @@ SRC_URI="" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" -IUSE="32bit_au cros_host" DEPEND=" sys-kernel/dracut" @@ -26,8 +25,9 @@ src_install() { cp -R dracut/80gptprio $modules_dir mkdir ${D}/boot - for i in /boot/vmlinuz-*boot_kernel*; do + for i in `ls /build/amd64-generic/boot/vmlinuz-*boot_kernel*`; do ver=${i##*vmlinuz-} - dracut --kver ${ver} ${D}/boot/initramfs-${ver}.img + chroot /build/amd64-generic dracut --force --fstab --kver ${ver} /tmp/initramfs-${ver}.img + cp /build/amd64-generic/tmp/initramfs-${ver}.img ${D}/boot/ done }