From 82c905dc58a36aeae40b1b273a12f63fb1973cf4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 13 Apr 2020 13:39:40 -0500 Subject: meta-openembedded and poky: subtree updates Squash of the following due to dependencies among them and OpenBMC changes: meta-openembedded: subtree update:d0748372d2..9201611135 meta-openembedded: subtree update:9201611135..17fd382f34 poky: subtree update:9052e5b32a..2e11d97b6c poky: subtree update:2e11d97b6c..a8544811d7 The change log was too large for the jenkins plugin to handle therefore it has been removed. Here is the first and last commit of each subtree: meta-openembedded:d0748372d2 cppzmq: bump to version 4.6.0 meta-openembedded:17fd382f34 mpv: Remove X11 dependency poky:9052e5b32a package_ipk: Remove pointless comment to trigger rebuild poky:a8544811d7 pbzip2: Fix license warning Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6 Signed-off-by: Andrew Geissler --- .../recipes-core/images/initramfs-debug-image.bb | 20 ++++++++++++++ .../images/initramfs-kexecboot-image.bb | 26 ++++++++++++++++++ .../images/initramfs-kexecboot-klibc-image.bb | 12 +++++++++ .../recipes-core/images/meta-initramfs-image.bb | 2 -- .../recipes-core/initrdscripts/files/init-debug.sh | 31 ++++++++++++++++++++++ .../initrdscripts/initramfs-debug_1.0.bb | 14 ++++++++++ .../packagegroups/packagegroup-meta-initramfs.bb | 20 +------------- 7 files changed, 104 insertions(+), 21 deletions(-) create mode 100644 meta-openembedded/meta-initramfs/recipes-core/images/initramfs-debug-image.bb create mode 100644 meta-openembedded/meta-initramfs/recipes-core/images/initramfs-kexecboot-image.bb create mode 100644 meta-openembedded/meta-initramfs/recipes-core/images/initramfs-kexecboot-klibc-image.bb create mode 100644 meta-openembedded/meta-initramfs/recipes-core/initrdscripts/files/init-debug.sh create mode 100644 meta-openembedded/meta-initramfs/recipes-core/initrdscripts/initramfs-debug_1.0.bb (limited to 'meta-openembedded/meta-initramfs/recipes-core') 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 new file mode 100644 index 000000000..c3dcd2b82 --- /dev/null +++ b/meta-openembedded/meta-initramfs/recipes-core/images/initramfs-debug-image.bb @@ -0,0 +1,20 @@ +# Simple initramfs image. Mostly used for live images. +DESCRIPTION = "Small image capable of booting a device. The kernel includes \ +the Minimal RAM-based Initial Root Filesystem (initramfs), which one can use \ +to check the hardware efficiently." + +PACKAGE_INSTALL = "initramfs-debug busybox base-passwd ${ROOTFS_BOOTSTRAP_INSTALL}" + +# Do not pollute the initrd image with rootfs features +IMAGE_FEATURES = "" + +export IMAGE_BASENAME = "initramfs-debug-image" +IMAGE_LINGUAS = "" + +IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" +inherit core-image + +IMAGE_ROOTFS_SIZE = "8192" +IMAGE_ROOTFS_EXTRA_SPACE = "0" + +BAD_RECOMMENDATIONS += "busybox-syslog" 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 new file mode 100644 index 000000000..9a686f366 --- /dev/null +++ b/meta-openembedded/meta-initramfs/recipes-core/images/initramfs-kexecboot-image.bb @@ -0,0 +1,26 @@ +SUMMARY = "Initramfs image for kexecboot kernel" +DESCRIPTION = "This image provides kexecboot (linux as bootloader) and helpers." + +inherit image + +IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" + +# avoid circular dependencies +EXTRA_IMAGEDEPENDS = "" +KERNELDEPMODDEPEND = "" + +# We really need just kexecboot, kexec and ubiattach +IMAGE_INSTALL = "kexecboot kexec mtd-utils-ubifs" + +# Do not pollute the initrd image with rootfs features +IMAGE_FEATURES = "" + +IMAGE_LINGUAS = "" + +FEED_DEPLOYDIR_BASE_URI = "" +LDCONFIGDEPEND = "" +IMAGE_ROOTFS_EXTRA_SPACE = "0" + +# disable runtime dependency on run-postinsts -> update-rc.d +ROOTFS_BOOTSTRAP_INSTALL = "" + diff --git a/meta-openembedded/meta-initramfs/recipes-core/images/initramfs-kexecboot-klibc-image.bb b/meta-openembedded/meta-initramfs/recipes-core/images/initramfs-kexecboot-klibc-image.bb new file mode 100644 index 000000000..3a8d9f743 --- /dev/null +++ b/meta-openembedded/meta-initramfs/recipes-core/images/initramfs-kexecboot-klibc-image.bb @@ -0,0 +1,12 @@ +require initramfs-kexecboot-image.bb + +SUMMARY = "Initramfs image for kexecboot kernel (klibc-static binaries)" + +# We really need just kexecboot, kexec and ubiattach +# statically compiled against klibc +IMAGE_INSTALL = "kexecboot-klibc kexec-klibc ubiattach-klibc" + +python () { + if d.getVar('TARGET_ARCH') == "nios2": + raise bb.parse.SkipRecipe("'nios2' not supported arch") +} diff --git a/meta-openembedded/meta-initramfs/recipes-core/images/meta-initramfs-image.bb b/meta-openembedded/meta-initramfs/recipes-core/images/meta-initramfs-image.bb index 9d70d6d02..4c041eb5f 100644 --- a/meta-openembedded/meta-initramfs/recipes-core/images/meta-initramfs-image.bb +++ b/meta-openembedded/meta-initramfs/recipes-core/images/meta-initramfs-image.bb @@ -3,6 +3,4 @@ SUMMARY = "meta-initramfs build test image" IMAGE_INSTALL = "packagegroup-core-boot \ packagegroup-meta-initramfs" -LICENSE = "MIT" - inherit core-image diff --git a/meta-openembedded/meta-initramfs/recipes-core/initrdscripts/files/init-debug.sh b/meta-openembedded/meta-initramfs/recipes-core/initrdscripts/files/init-debug.sh new file mode 100644 index 000000000..7edbd70cb --- /dev/null +++ b/meta-openembedded/meta-initramfs/recipes-core/initrdscripts/files/init-debug.sh @@ -0,0 +1,31 @@ +#!/bin/sh + +PATH=/sbin:/bin:/usr/sbin:/usr/bin + +do_mount_fs() { + grep -q "$1" /proc/filesystems || return + test -d "$2" || mkdir -p "$2" + mount -t "$1" "$1" "$2" +} + +do_mknod() { + test -e "$1" || mknod "$1" "$2" "$3" "$4" +} + +mkdir -p /proc +mount -t proc proc /proc + +do_mount_fs sysfs /sys +do_mount_fs debugfs /sys/kernel/debug +do_mount_fs devtmpfs /dev +do_mount_fs devpts /dev/pts +do_mount_fs tmpfs /dev/shm + +mkdir -p /run +mkdir -p /var/run + +do_mknod /dev/console c 5 1 +do_mknod /dev/null c 1 3 +do_mknod /dev/zero c 1 5 + +exec sh /dev/console 2>/dev/console diff --git a/meta-openembedded/meta-initramfs/recipes-core/initrdscripts/initramfs-debug_1.0.bb b/meta-openembedded/meta-initramfs/recipes-core/initrdscripts/initramfs-debug_1.0.bb new file mode 100644 index 000000000..667690f88 --- /dev/null +++ b/meta-openembedded/meta-initramfs/recipes-core/initrdscripts/initramfs-debug_1.0.bb @@ -0,0 +1,14 @@ +SUMMARY = "Extremely basic live image init script" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" +SRC_URI = "file://init-debug.sh" + +S = "${WORKDIR}" + +do_install() { + install -m 0755 ${WORKDIR}/init-debug.sh ${D}/init +} + +inherit allarch + +FILES_${PN} += " /init " diff --git a/meta-openembedded/meta-initramfs/recipes-core/packagegroups/packagegroup-meta-initramfs.bb b/meta-openembedded/meta-initramfs/recipes-core/packagegroups/packagegroup-meta-initramfs.bb index bfede5a74..2955baea2 100644 --- a/meta-openembedded/meta-initramfs/recipes-core/packagegroups/packagegroup-meta-initramfs.bb +++ b/meta-openembedded/meta-initramfs/recipes-core/packagegroups/packagegroup-meta-initramfs.bb @@ -6,31 +6,13 @@ PROVIDES = "${PACKAGES}" PACKAGES = ' \ packagegroup-meta-initramfs \ packagegroup-meta-initramfs-devtools \ - packagegroup-meta-initramfs-kernel \ ' RDEPENDS_packagegroup-meta-initramfs = "\ packagegroup-meta-initramfs-devtools \ - packagegroup-meta-initramfs-kernel \ " RDEPENDS_packagegroup-meta-initramfs-devtools = "\ - libklibc dracut \ - klibc-utils-cat klibc-utils-losetup klibc-utils-readlink klibc-utils-chroot \ - klibc-utils-ls klibc-utils-reboot klibc-utils-cpio klibc-utils-minips \ - klibc-utils-resume klibc-utils-dd klibc-utils-mkdir klibc-utils-run-init \ - klibc-utils-dmesg klibc-utils-mkfifo klibc-utils-sh.shared klibc-utils-false \ - klibc-utils-mknod klibc-utils-sleep klibc-utils-fstype klibc-utils-mount \ - klibc-utils-sync klibc-utils-halt klibc-utils-mv klibc-utils-true klibc-utils-ipconfig \ - klibc-utils-nfsmount klibc-utils-umount klibc-utils-kill klibc-utils-nuke klibc-utils-uname \ - mtdinfo-klibc ubiattach-klibc ubiblock-klibc ubicrc32-klibc ubidetach-klibc \ - ubiformat-klibc ubimkvol-klibc ubinfo-klibc ubinize-klibc ubirename-klibc \ - ubirmvol-klibc ubirsvol-klibc ubiupdatevol-klibc \ + dracut \ ${@bb.utils.contains_any("TRANSLATED_TARGET_ARCH", "i586 x86-64", "grubby", "", d)} \ " - -RDEPENDS_packagegroup-meta-initramfs-kernel = "\ - kexec-klibc vmcore-dmesg-klibc \ - " - -EXCLUDE_FROM_WORLD = "1" -- cgit v1.2.3