diff options
Diffstat (limited to 'meta-google/recipes-phosphor')
8 files changed, 77 insertions, 0 deletions
diff --git a/meta-google/recipes-phosphor/host/phosphor-host-postd_%.bbappend b/meta-google/recipes-phosphor/host/phosphor-host-postd_%.bbappend new file mode 100644 index 000000000..01669cca8 --- /dev/null +++ b/meta-google/recipes-phosphor/host/phosphor-host-postd_%.bbappend @@ -0,0 +1,7 @@ +# It's useful for debugging to have post codes written to the journal +# while the machine is booting. Especially when host serial logs also get +# written. This enables the verbose output of the daemon, providing +# the logging behavior. +do_install_append_gbmc_dev() { + sed -i '/^ExecStart=/ s,$, -v,' ${D}${systemd_system_unitdir}/lpcsnoop.service +} diff --git a/meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bbappend b/meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bbappend new file mode 100644 index 000000000..905a39a48 --- /dev/null +++ b/meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bbappend @@ -0,0 +1,20 @@ +# This is needed to guarantee that our whitelist takes +# precendence over the OpenBMC one +FILESEXTRAPATHS_prepend_gbmc := "${THISDIR}/${PN}:" + +SRC_URI_append_gbmc_dev = " file://whitelist.dev" + +do_install_append_gbmc_dev() { + cat ${WORKDIR}/whitelist.dev >>${D}/whitelist +} + +SRC_URI_append_gbmc_dev = " file://rwfs-clean-dev.patch" +# Required for the clean-dev patch to detect version changes +RDEPENDS_${PN}_append_gbmc_dev = " os-release" + +do_install_append_gbmc_prod() { + echo "clean-rwfs-filesystem" > ${D}/init-options-base + chmod 0644 ${D}/init-options-base +} + +FILES_${PN}_append_gbmc_prod = " /init-options-base" diff --git a/meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs/rwfs-clean-dev.patch b/meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs/rwfs-clean-dev.patch new file mode 100644 index 000000000..7631c85ce --- /dev/null +++ b/meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs/rwfs-clean-dev.patch @@ -0,0 +1,29 @@ +diff --git a/meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-init.sh b/meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-init.sh +index 62be89f039..689fbea5bf 100644 +--- a/obmc-init.sh ++++ b/obmc-init.sh +@@ -275,6 +275,14 @@ then + fi + fi + ++# Ensure that we clean our rwfs on version change ++if mount $rwdev $rwdir -t $rwfst -o $rwopts; then ++ if ! cmp "$rwdir"/os-release /etc/os-release 2>/dev/null; then ++ echo "RWFS from older BMC version, cleaning" ++ touch $trigger ++ fi ++ umount "$rwdir" ++fi + if grep -w clean-rwfs-filesystem $optfile + then + echo "Cleaning of read-write overlay filesystem requested." +@@ -399,6 +407,9 @@ HERE + debug_takeover "$msg" + fi + ++# Keep track of the last version to use this rwfs ++cp /etc/os-release "$rwdir"/os-release ++ + rm -rf $work + mkdir -p $upper $work + diff --git a/meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs/whitelist b/meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs/whitelist new file mode 100644 index 000000000..a2244cca8 --- /dev/null +++ b/meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs/whitelist @@ -0,0 +1,6 @@ +/etc/dropbear/dropbear_rsa_host_key +/etc/hostname +/etc/machine-id +/etc/systemd/network +/var/google +/var/lib/phosphor-inventory-manager diff --git a/meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs/whitelist.dev b/meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs/whitelist.dev new file mode 100644 index 000000000..89dd3bb6d --- /dev/null +++ b/meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs/whitelist.dev @@ -0,0 +1 @@ +/home/root diff --git a/meta-google/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-google/recipes-phosphor/network/phosphor-network_%.bbappend new file mode 100644 index 000000000..4a1cbe139 --- /dev/null +++ b/meta-google/recipes-phosphor/network/phosphor-network_%.bbappend @@ -0,0 +1,3 @@ +# Platforms with Hoth don't use the U-Boot environment since this would allow +# bypassing attestation. +PACKAGECONFIG_remove_hoth = "uboot-env" diff --git a/meta-google/recipes-phosphor/settings/phosphor-settings-manager/timemanager-default-HOST-MANUAL.override.yml b/meta-google/recipes-phosphor/settings/phosphor-settings-manager/timemanager-default-HOST-MANUAL.override.yml new file mode 100644 index 000000000..77c0dff08 --- /dev/null +++ b/meta-google/recipes-phosphor/settings/phosphor-settings-manager/timemanager-default-HOST-MANUAL.override.yml @@ -0,0 +1,6 @@ +--- +/xyz/openbmc_project/time/sync_method: + - Interface: xyz.openbmc_project.Time.Synchronization + Properties: + TimeSyncMethod: + Default: Synchronization::Method::Manual diff --git a/meta-google/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-google/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend new file mode 100644 index 000000000..46d11234e --- /dev/null +++ b/meta-google/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend @@ -0,0 +1,5 @@ +#Override the default time settings from BMC/NTP to Host/Manual, so that host +#can set BMC time via an IPMI command. + +FILESEXTRAPATHS_append_gbmc := ":${THISDIR}/${PN}" +SRC_URI_append_gbmc = " file://timemanager-default-HOST-MANUAL.override.yml" |