Revert "gbmc-bridge: Add support for RWFS purging"
This reverts commit 4cba4d89f7b1bf6c7f3330a48403f74262ada42b.
Breaks on izumi due to initscript pinning being done in the vendor repo.
Requires
https://quanta-bmc-private-review.googlesource.com/c/meta-gsz/+/17176.
Change-Id: Iff674301678f6b47c23b10aac14d89678bc20eda
Signed-off-by: William A. Kennington III <wak@google.com>
diff --git a/recipes-google/networking/gbmc-bridge.bbappend b/recipes-google/networking/gbmc-bridge.bbappend
deleted file mode 100644
index 7cf4f47..0000000
--- a/recipes-google/networking/gbmc-bridge.bbappend
+++ /dev/null
@@ -1,9 +0,0 @@
-FILESEXTRAPATHS:prepend:gbmc := "${THISDIR}/${PN}:"
-SRC_URI:append:gbmc = " \
- file://49-purge-rwfs.sh \
- file://51-clear-purge-rwfs.sh \
- "
-do_install:append:gbmc() {
- install -m0644 ${WORKDIR}/49-purge-rwfs.sh ${D}${datadir}/gbmc-br-dhcp/
- install -m0644 ${WORKDIR}/51-clear-purge-rwfs.sh ${D}${datadir}/gbmc-br-dhcp/
-}
diff --git a/recipes-google/networking/gbmc-bridge/49-purge-rwfs.sh b/recipes-google/networking/gbmc-bridge/49-purge-rwfs.sh
deleted file mode 100644
index 247f9ed..0000000
--- a/recipes-google/networking/gbmc-bridge/49-purge-rwfs.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-# Copyright 2022 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-[ -z "${gbmc_purge_rwfs-}" ] || return
-
-gbmc_purge_rwfs_hook() {
- # Only execute this hook if we aren't already purged
- if [ -e '/run/initramfs/rwfs-purged' ]; then
- echo 'RWFS already purged' >&2
- return 0
- fi
-
- echo 'RWFS Purge is required' >&2
- touch /var/google/do-rwfs-purge
-
- echo 'Deferring powercycle' >&2
- gbmc_psu_hardreset_needed=1
-}
-
-GBMC_BR_DHCP_HOOKS+=(gbmc_purge_rwfs_hook)
-
-gbmc_purge_rwfs=1
diff --git a/recipes-google/networking/gbmc-bridge/51-clear-purge-rwfs.sh b/recipes-google/networking/gbmc-bridge/51-clear-purge-rwfs.sh
deleted file mode 100644
index 198af89..0000000
--- a/recipes-google/networking/gbmc-bridge/51-clear-purge-rwfs.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-# Copyright 2022 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-[ -z "${gbmc_clear_purge_rwfs-}" ] || return
-
-gbmc_clear_purge_rwfs_hook() {
- rm -f /run/initramfs/rwfs-purged
-}
-
-GBMC_BR_DHCP_HOOKS+=(gbmc_clear_purge_rwfs_hook)
-
-gbmc_clear_purge_rwfs=1
diff --git a/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bbappend b/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bbappend
deleted file mode 100644
index a2d368e..0000000
--- a/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS:prepend:gbmc := "${THISDIR}/${PN}:"
-SRC_URI:append:gbmc = " file://0001-obmc-phosphor-initfs-Add-support-for-purging-RWFS.patch"
diff --git a/recipes-phosphor/initrdscripts/obmc-phosphor-initfs/0001-obmc-phosphor-initfs-Add-support-for-purging-RWFS.patch b/recipes-phosphor/initrdscripts/obmc-phosphor-initfs/0001-obmc-phosphor-initfs-Add-support-for-purging-RWFS.patch
deleted file mode 100644
index 91a04fa..0000000
--- a/recipes-phosphor/initrdscripts/obmc-phosphor-initfs/0001-obmc-phosphor-initfs-Add-support-for-purging-RWFS.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From fba0afe53006051d2bfa33501e3e73bd7ad8e592 Mon Sep 17 00:00:00 2001
-From: "William A. Kennington III" <wak@google.com>
-Date: Thu, 16 Jun 2022 14:27:57 -0700
-Subject: [PATCH] obmc-phosphor-initfs: Add support for purging RWFS
-
-This adds a flag to the RWFS that makes it possible to purge on the next
-bootup.
-
-Signed-off-by: William A. Kennington III <wak@google.com>
----
- obmc-init.sh | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/obmc-init.sh b/obmc-init.sh
-index e61ede9..43eb8e7 100644
---- a/obmc-init.sh
-+++ b/obmc-init.sh
-@@ -413,5 +413,10 @@ HERE
-
- rm -rf $work
-+if [ -e $upper/var/google/do-rwfs-purge ]; then
-+ echo 'Purging RWFS'
-+ rm -rf $upper
-+ touch run/initramfs/rwfs-purged
-+fi
- mkdir -p $upper $work
-
- mount -t overlay -o lowerdir=$rodir,upperdir=$upper,workdir=$work cow /root
---
-2.37.0.rc0.104.g0611611a94-goog
-
