diff options
Diffstat (limited to 'meta-openembedded/meta-initramfs')
5 files changed, 20 insertions, 5 deletions
diff --git a/meta-openembedded/meta-initramfs/README b/meta-openembedded/meta-initramfs/README index 79244d43f..a8f17ba85 100644 --- a/meta-openembedded/meta-initramfs/README +++ b/meta-openembedded/meta-initramfs/README @@ -23,7 +23,7 @@ Send patches / pull requests to openembedded-devel@lists.openembedded.org with '[meta-initramfs]' in the subject. When sending single patches, please using something like: -'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-initramfs][PATCH' +git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-initramfs][PATCH' Interm layer maintainer: Khem Raj <raj.khem@gmail.com> diff --git a/meta-openembedded/meta-initramfs/recipes-core/images/initramfs-debug-image.bb b/meta-openembedded/meta-initramfs/recipes-core/images/initramfs-debug-image.bb index c3dcd2b82..601056b7e 100644 --- a/meta-openembedded/meta-initramfs/recipes-core/images/initramfs-debug-image.bb +++ b/meta-openembedded/meta-initramfs/recipes-core/images/initramfs-debug-image.bb @@ -11,7 +11,12 @@ IMAGE_FEATURES = "" export IMAGE_BASENAME = "initramfs-debug-image" IMAGE_LINGUAS = "" -IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" +# Some BSPs use IMAGE_FSTYPES_<machine override> which would override +# an assignment to IMAGE_FSTYPES so we need anon python +python () { + d.setVar("IMAGE_FSTYPES", d.getVar("INITRAMFS_FSTYPES")) +} + inherit core-image IMAGE_ROOTFS_SIZE = "8192" diff --git a/meta-openembedded/meta-initramfs/recipes-core/images/initramfs-kexecboot-image.bb b/meta-openembedded/meta-initramfs/recipes-core/images/initramfs-kexecboot-image.bb index 9a686f366..dd082ba52 100644 --- a/meta-openembedded/meta-initramfs/recipes-core/images/initramfs-kexecboot-image.bb +++ b/meta-openembedded/meta-initramfs/recipes-core/images/initramfs-kexecboot-image.bb @@ -1,9 +1,13 @@ SUMMARY = "Initramfs image for kexecboot kernel" DESCRIPTION = "This image provides kexecboot (linux as bootloader) and helpers." -inherit image +# Some BSPs use IMAGE_FSTYPES_<machine override> which would override +# an assignment to IMAGE_FSTYPES so we need anon python +python () { + d.setVar("IMAGE_FSTYPES", d.getVar("INITRAMFS_FSTYPES")) +} -IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" +inherit image # avoid circular dependencies EXTRA_IMAGEDEPENDS = "" diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_git.bb b/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_git.bb index ce975f5a1..4d702dc56 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_git.bb +++ b/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_git.bb @@ -66,3 +66,6 @@ RRECOMMENDS_${PN} = " \ busybox \ coreutils \ " + +# CVE-2010-4176 affects only Fedora +CVE_CHECK_WHITELIST += "CVE-2010-4176" diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/klcc-cross-accept-clang-options.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/klcc-cross-accept-clang-options.patch index 56905a515..431c75e3a 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/klcc-cross-accept-clang-options.patch +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/klcc-cross-accept-clang-options.patch @@ -5,7 +5,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> --- a/klcc/klcc.in +++ b/klcc/klcc.in -@@ -207,6 +207,24 @@ while ( defined($a = shift(@ARGV)) ) { +@@ -207,6 +207,27 @@ while ( defined($a = shift(@ARGV)) ) { } elsif ( $a =~ /^--([sysroot=])(.*)$/ ) { # Override gcc encoded sysroot push(@ccopt, $a); @@ -27,6 +27,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> + } elsif ( $a =~ '--unwindlib=.*' ) { + # Allow clang options + push(@ccopt, $a); ++ } elsif ( $a =~ '-rtlib=.*' ) { ++ # Allow clang options ++ push(@ccopt, $a); } else { die "$0: unknown option: $a\n"; } |