mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2026-05-05 12:16:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat(sys-kernel/coreos-bootkernel) fix up the cpio file location

Browse Source 
This lets us rely on the kernel configuration, and not have to edit it
"by hand" with the location of the cpio file, as the cpio initrd is now
placed within the kernel output directory, where the build system picks
it up automatically.
This commit is contained in:
Greg Kroah-Hartman 2013-07-16 22:19:34 -07:00
parent 5b7a8be5e4
commit 6f26999e06
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel/x86_64_defconfig_boot vendored
View File

@ -171,7 +171,7 @@ CONFIG_MM_OWNER=y
# CONFIG_SYSFS_DEPRECATED is not set
CONFIG_RELAY=y
CONFIG_BLK_DEV_INITRD=y
CONFIG_INITRAMFS_SOURCE="XXXXX"
CONFIG_INITRAMFS_SOURCE="bootengine.cpio"
CONFIG_INITRAMFS_ROOT_UID=0
CONFIG_INITRAMFS_ROOT_GID=0
CONFIG_RD_GZIP=y

6
sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel2.eclass vendored
View File

@ -278,10 +278,10 @@ cros-kernel2_src_configure() {
fi
fi
# if this is the boot kernel, set up the initrd location
# if this is the boot kernel, copy the cpio initrd to the output build
# directory so we can tack it onto the kernel image itself.
if [ "$(get_boot_kernel)" = "true" ]; then
cp "${ROOT}"/usr/share/bootengine/bootengine.cpio "${S}" || die "copy of dracut cpio failed."
sed -i -e 's/XXXXX/\/build\/amd64-generic\/usr\/share\/bootengine\/bootengine\.cpio/g' "$(get_build_cfg)" || die "sed failed"
cp "${ROOT}"/usr/share/bootengine/bootengine.cpio "$(cros-workon_get_build_dir)" || die "copy of dracut cpio failed."
fi
# Use default for any options not explitly set in splitconfig