diff options
author | Patrick Vacek <patrickvacek@gmail.com> | 2020-10-16 12:26:23 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-16 12:26:23 +0200 |
commit | 9a633371b557114443194246bbc22c3fad56c9eb (patch) | |
tree | 2825eb1c431cbee4e77d7a0ec087aa5555fbe0b3 /recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb | |
parent | 67ab5b0333cf2c63a6099bab655b836d1b62db78 (diff) | |
parent | f9e462ef42bcf79beb2b354b5a1c069c8e47d65d (diff) | |
download | meta-updater-9a633371b557114443194246bbc22c3fad56c9eb.tar.gz |
Merge pull request #777 from ricardosalveti/fit
ostree-kernel-initramfs: add back initramfs fit workaround
Diffstat (limited to 'recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb')
-rw-r--r-- | recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb b/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb index 9ac90b9..9a229ba 100644 --- a/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb +++ b/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb | |||
@@ -36,7 +36,13 @@ do_install() { | |||
36 | 36 | ||
37 | cp ${DEPLOY_DIR_IMAGE}/${OSTREE_KERNEL} $kerneldir/vmlinuz | 37 | cp ${DEPLOY_DIR_IMAGE}/${OSTREE_KERNEL} $kerneldir/vmlinuz |
38 | 38 | ||
39 | if [ "${KERNEL_IMAGETYPE}" != "fitImage" ]; then | 39 | if [ "${KERNEL_IMAGETYPE}" = "fitImage" ]; then |
40 | if [ -n "${INITRAMFS_IMAGE}" ]; then | ||
41 | # this is a hack for ostree not to override init= in kernel cmdline - | ||
42 | # make it think that the initramfs is present (while it is in FIT image) | ||
43 | touch $kerneldir/initramfs.img | ||
44 | fi | ||
45 | else | ||
40 | if [ -n "${INITRAMFS_IMAGE}" ]; then | 46 | if [ -n "${INITRAMFS_IMAGE}" ]; then |
41 | cp ${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.${INITRAMFS_FSTYPES} $kerneldir/initramfs.img | 47 | cp ${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.${INITRAMFS_FSTYPES} $kerneldir/initramfs.img |
42 | fi | 48 | fi |