mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-24 07:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1711 from marineam/kernel-fixes

Browse Source 
Minor cleanup/fixes for the kernel eclass
This commit is contained in:
Michael Marineau 2016-01-06 23:24:05 -08:00
commit 2867d33ce7
1 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass vendored
View File

@ -125,23 +125,16 @@ kmake() {
# Discard the module signing key, we use new keys for each build. # Discard the module signing key, we use new keys for each build.
shred_keys() { shred_keys() {
if [[ -e signing_key.priv ]]; then shred -u build/certs/signing_key.pem || die
shred -u signing_key.* || die
rm -f x509.genkey || die
fi
} }
# Populate /lib/modules/$(uname -r)/{build,source} # Populate /lib/modules/$(uname -r)/{build,source}
prepare-lib-modules-release-dirs() { prepare-lib-modules-release-dirs() {
local kernel_arch=$(tc-arch-kernel)
# build and source must cleaned up to avoid referencing $ROOT # build and source must cleaned up to avoid referencing $ROOT
rm "${D}/usr/lib/modules/${version}"/{build,source} || die rm "${D}/usr/lib/modules/${version}"/{build,source} || die
# XXX: For some reason tc-arch-kernel is returning x86_64 on > 2.6.24
local kernel_arch=$(tc-arch-kernel)
if [ "${kernel_arch}" == "x86_64" ]; then
kernel_arch="x86"
fi
# Install a stripped source for out-of-tree module builds (Debian-derived) # Install a stripped source for out-of-tree module builds (Debian-derived)
{ {
echo source/Makefile echo source/Makefile
@ -175,7 +168,32 @@ prepare-lib-modules-release-dirs() {
"${D}/usr/lib/modules/${version}" || die "${D}/usr/lib/modules/${version}" || die
} }
coreos-kernel_pkg_pretend() {
[[ "${MERGE_TYPE}" == binary ]] && return
if [[ -f "${KERNEL_DIR}/.config" || -d "${KERNEL_DIR}/include/config" ]]
then
die "Source is not clean! Run make mrproper in ${KERNEL_DIR}"
fi
}
# We are bad, we want to get around the sandbox. So do the creation of the
# cpio image in pkg_setup() where we are free to mount filesystems, chroot,
# and other fun stuff.
coreos-kernel_pkg_setup() {
[[ "${MERGE_TYPE}" == binary ]] && return
if [[ "${ROOT:-/}" != / ]]; then
${ROOT}/usr/sbin/update-bootengine -m -c ${ROOT} || die
else
update-bootengine || die
fi
}
coreos-kernel_src_unpack() { coreos-kernel_src_unpack() {
# tc-arch-kernel requires a call to get_version from linux-info.eclass
get_version || die "Failed to detect kernel version in ${KERNEL_DIR}"
# we more or less reproduce the layout in /lib/modules/$(uname -r)/ # we more or less reproduce the layout in /lib/modules/$(uname -r)/
mkdir -p "${S}/build" || die mkdir -p "${S}/build" || die
mkdir -p "${S}/source" || die mkdir -p "${S}/source" || die
@ -183,11 +201,6 @@ coreos-kernel_src_unpack() {
} }
coreos-kernel_src_prepare() { coreos-kernel_src_prepare() {
if [[ -f ".config" || -d "include/config" ]]
then
die "Source is not clean! Run make mrproper in ${KERNEL_DIR}"
fi
restore_config build/.config restore_config build/.config
if [[ ! -f build/.config ]]; then if [[ ! -f build/.config ]]; then
local config="$(find_defconfig)" local config="$(find_defconfig)"
@ -257,22 +270,8 @@ coreos-kernel_src_install() {
dosym "vmlinuz-${version}" /usr/boot/vmlinuz dosym "vmlinuz-${version}" /usr/boot/vmlinuz
dosym "config-${version}" /usr/boot/config dosym "config-${version}" /usr/boot/config
prepare-lib-modules-release-dirs
shred_keys shred_keys
prepare-lib-modules-release-dirs
} }
# We are bad, we want to get around the sandbox. So do the creation of the EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare src_configure src_compile src_install
# cpio image in pkg_setup() where we are free to mount filesystems, chroot,
# and other fun stuff.
coreos-kernel_pkg_setup() {
[[ "${MERGE_TYPE}" == binary ]] && return
if [[ "${ROOT:-/}" != / ]]; then
${ROOT}/usr/sbin/update-bootengine -m -c ${ROOT} || die
else
update-bootengine || die
fi
}
EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install pkg_setup