diff options
Diffstat (limited to 'meta-phosphor/classes')
4 files changed, 10 insertions, 7 deletions
diff --git a/meta-phosphor/classes/image_types_phosphor.bbclass b/meta-phosphor/classes/image_types_phosphor.bbclass index e4663471c..fa5d3191c 100644 --- a/meta-phosphor/classes/image_types_phosphor.bbclass +++ b/meta-phosphor/classes/image_types_phosphor.bbclass @@ -332,6 +332,14 @@ make_signatures() { openssl dgst -sha256 -sign ${SIGNING_KEY} -out "${file}.sig" $file signature_files="${signature_files} ${file}.sig" done + + if [ -n "$signature_files" ]; then + sort_signature_files=`echo "$signature_files" | tr ' ' '\n' | sort | tr '\n' ' '` + cat $sort_signature_files > image-full + openssl dgst -sha256 -sign ${SIGNING_KEY} -out image-full.sig image-full + signature_files="${signature_files} image-full.sig" + rm -rf image-full + fi } do_generate_static_alltar() { diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index b2d3b5ef3..da8c337f1 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -86,11 +86,6 @@ remove_etc_version() { rm ${IMAGE_ROOTFS}${sysconfdir}/version } -disable_systemd_pager() { - echo "SYSTEMD_PAGER=" >> ${IMAGE_ROOTFS}${sysconfdir}/profile - echo "export SYSTEMD_PAGER" >> ${IMAGE_ROOTFS}${sysconfdir}/profile -} - enable_ldap_nsswitch() { sed -i 's/\(\(passwd\|group\|shadow\):\s*\).*/\1files ldap/' \ "${IMAGE_ROOTFS}${sysconfdir}/nsswitch.conf" diff --git a/meta-phosphor/classes/phosphor-networkd-rev.bbclass b/meta-phosphor/classes/phosphor-networkd-rev.bbclass index 7556591cb..9a2f75a38 100644 --- a/meta-phosphor/classes/phosphor-networkd-rev.bbclass +++ b/meta-phosphor/classes/phosphor-networkd-rev.bbclass @@ -1,2 +1,2 @@ SRC_URI += "git://github.com/openbmc/phosphor-networkd" -SRCREV = "ffcba341a893318588afe83e8d767d8c20fd9189" +SRCREV = "86f659e671ffae08b52de7a19728297661b7271a" diff --git a/meta-phosphor/classes/skeleton-rev.bbclass b/meta-phosphor/classes/skeleton-rev.bbclass index d9f5aadce..1fb017bf6 100644 --- a/meta-phosphor/classes/skeleton-rev.bbclass +++ b/meta-phosphor/classes/skeleton-rev.bbclass @@ -1,4 +1,4 @@ -SRCREV ?= "3fbb4443dbc6ae6a7d8b5165a4f3b1992502570f" +SRCREV ?= "361716456e43a44eb890c46aaa1d5a0fd6d79344" SKELETON_URI ?= "git://github.com/openbmc/skeleton" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" |