diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-05-24 22:54:37 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-05-24 23:12:35 +0300 |
commit | 2a64b8ae9b952b18b4aef38cb7c41ce6dba16c50 (patch) | |
tree | 704eb802dc7b987411a0e44d128bdd8978745d8c /meta-openbmc-mods/meta-common/classes | |
parent | 0e0df451ae365f09d5c0c766b253f23de26901f2 (diff) | |
download | openbmc-2a64b8ae9b952b18b4aef38cb7c41ce6dba16c50.tar.xz |
Update to internal 0.52
Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
Diffstat (limited to 'meta-openbmc-mods/meta-common/classes')
-rw-r--r-- | meta-openbmc-mods/meta-common/classes/obmc-phosphor-full-fitimage.bbclass | 32 | ||||
-rw-r--r-- | meta-openbmc-mods/meta-common/classes/print-src.bbclass | 7 |
2 files changed, 23 insertions, 16 deletions
diff --git a/meta-openbmc-mods/meta-common/classes/obmc-phosphor-full-fitimage.bbclass b/meta-openbmc-mods/meta-common/classes/obmc-phosphor-full-fitimage.bbclass index 0fdad5b5c..6e0411a5c 100644 --- a/meta-openbmc-mods/meta-common/classes/obmc-phosphor-full-fitimage.bbclass +++ b/meta-openbmc-mods/meta-common/classes/obmc-phosphor-full-fitimage.bbclass @@ -77,7 +77,7 @@ fitimage_emit_section_kernel() { if [ -n "${kernel_csum}" ]; then hash_blk=$(cat << EOF - hash@1 { + hash-1 { algo = "${kernel_csum}"; }; EOF @@ -91,7 +91,7 @@ EOF fi cat << EOF >> ${1} - kernel@${2} { + kernel-${2} { description = "Linux kernel"; data = /incbin/("${3}"); type = "kernel"; @@ -117,7 +117,7 @@ fitimage_emit_section_dtb() { dtb_csum="${4}" if [ -n "${dtb_csum}" ]; then hash_blk=$(cat << EOF - hash@1 { + hash-1 { algo = "${dtb_csum}"; }; EOF @@ -125,7 +125,7 @@ EOF fi cat << EOF >> ${1} - fdt@${2} { + fdt-${2} { description = "Flattened Device Tree blob"; data = /incbin/("${3}"); type = "flat_dt"; @@ -148,7 +148,7 @@ fitimage_emit_section_setup() { setup_csum="${4}" if [ -n "${setup_csum}" ]; then hash_blk=$(cat << EOF - hash@1 { + hash-1 { algo = "${setup_csum}"; }; EOF @@ -156,7 +156,7 @@ EOF fi cat << EOF >> ${1} - setup@${2} { + setup-${2} { description = "Linux setup.bin"; data = /incbin/("${3}"); type = "x86_setup"; @@ -182,7 +182,7 @@ fitimage_emit_section_ramdisk() { ramdisk_csum="${4}" if [ -n "${ramdisk_csum}" ]; then hash_blk=$(cat << EOF - hash@1 { + hash-1 { algo = "${ramdisk_csum}"; }; EOF @@ -218,7 +218,7 @@ EOF esac cat << EOF >> ${1} - ramdisk@${2} { + ramdisk-${2} { description = "${INITRAMFS_IMAGE}"; data = /incbin/("${3}"); type = "ramdisk"; @@ -248,7 +248,7 @@ fitimage_emit_section_config() { conf_csum="${7}" if [ -n "${conf_csum}" ]; then hash_blk=$(cat << EOF - hash@1 { + hash-1 { algo = "${conf_csum}"; }; EOF @@ -260,7 +260,7 @@ EOF # Test if we have any DTBs at all conf_desc="Linux kernel" - kernel_line="kernel = \"kernel@${2}\";" + kernel_line="kernel = \"kernel-${2}\";" fdt_line="" ramdisk_line="" setup_line="" @@ -268,26 +268,26 @@ EOF if [ -n "${3}" ]; then conf_desc="${conf_desc}, FDT blob" - fdt_line="fdt = \"fdt@${3}\";" + fdt_line="fdt = \"fdt-${3}\";" fi if [ -n "${4}" ]; then conf_desc="${conf_desc}, ramdisk" - ramdisk_line="ramdisk = \"ramdisk@${4}\";" + ramdisk_line="ramdisk = \"ramdisk-${4}\";" fi if [ -n "${5}" ]; then conf_desc="${conf_desc}, setup" - setup_line="setup = \"setup@${5}\";" + setup_line="setup = \"setup-${5}\";" fi if [ "${6}" = "1" ]; then - default_line="default = \"conf@${3}\";" + default_line="default = \"conf-${3}\";" fi cat << EOF >> ${1} ${default_line} - conf@${3} { + conf-${3} { description = "${6} ${conf_desc}"; ${kernel_line} ${fdt_line} @@ -315,7 +315,7 @@ EOF sign_line="${sign_line};" cat << EOF >> ${1} - signature@1 { + signature-1 { algo = "${conf_csum},rsa2048"; key-name-hint = "${conf_sign_keyname}"; ${sign_line} diff --git a/meta-openbmc-mods/meta-common/classes/print-src.bbclass b/meta-openbmc-mods/meta-common/classes/print-src.bbclass new file mode 100644 index 000000000..f305a5433 --- /dev/null +++ b/meta-openbmc-mods/meta-common/classes/print-src.bbclass @@ -0,0 +1,7 @@ +python do_print_src () { + srcuri = d.getVar('SRC_URI', True).split() + srcrev = d.getVar('SRCREV', True).split() + bb.warn("SRC_URI: %s SRCREV: %s" % (srcuri, srcrev)) +} + +addtask do_print_src before do_fetch |