From 8aa26725b4d4c0ba69b132d20c74bc27b8d81009 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Mon, 26 Mar 2018 11:11:23 -0400 Subject: [PATCH] Drop redundant patch FlashingSLOF.pdf is already dropped from the spec, removing INSTALL references doesn't impact any installed content, and the remaining one line README tweak isn't worth carrying a patch for --- 0001-spec-Remove-FlashingSLOF.pdf.patch | 109 ------------------------ SLOF.spec | 2 +- 2 files changed, 1 insertion(+), 110 deletions(-) delete mode 100644 0001-spec-Remove-FlashingSLOF.pdf.patch diff --git a/0001-spec-Remove-FlashingSLOF.pdf.patch b/0001-spec-Remove-FlashingSLOF.pdf.patch deleted file mode 100644 index 402db1f..0000000 --- a/0001-spec-Remove-FlashingSLOF.pdf.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 1c936111766bf8be2b2db875edf9903c397ba3fb Mon Sep 17 00:00:00 2001 -From: Miroslav Rezanina -Date: Thu, 4 Jun 2015 10:49:32 +0200 -Subject: spec: Remove FlashingSLOF.pdf - -Message-id: <1433414972-28403-1-git-send-email-mrezanin@redhat.com> -Patchwork-id: 65378 -O-Subject: [RHEL-7.2 SLOF PATCH] spec: Remove FlashingSLOF.pdf -Bugzilla: 1226264 -RH-Acked-by: Thomas Huth -RH-Acked-by: David Gibson -RH-Acked-by: Jeff Nelson - -From: Miroslav Rezanina - -FlashingSLOF.pdf contains instruction for installing SLOF to JS20/JS21 machines. -We use SLOF for running virtual guests only so we do not need this file. - -Signed-off-by: Miroslav Rezanina ---- - INSTALL | 58 ---------------------------------------------------------- - README | 2 +- - 2 files changed, 1 insertion(+), 59 deletions(-) - -diff --git a/INSTALL b/INSTALL -index 058da63..abf2703 100644 ---- a/INSTALL -+++ b/INSTALL -@@ -3,64 +3,6 @@ Slimline Open Firmware - SLOF - Copyright (C) 2005, 2012 IBM Corporation - - --INSTALL ON JS20/JS21 --=============================================================================== -- -- Detailed information about how to use SLOF on JS20 and JS21 can be found in -- the document FlashingSLOF.pdf -- -- The JS20 and JS21 blades both have 2 "flashsides". They have a 8MB flash part -- which is divided into a 4MB "temporary" side and a 4MB "permanent" side. -- -- The temporary side is the flashside used for the normal operation and the -- permanent side is used as a backup if the temporary should ever fail. -- -- Therefore it is important that the permanent flash side is not changed so -- that if ever required the original firmware can be restored. -- -- SLOF usually warns or in most cases does not easily allow to overwrite the -- permanent side. -- -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! ! -- ! NOTE: WHEN FLASHING A NEW FIRMWARE IMAGE YOU MIGHT ! -- ! DESTROY YOUR FIRMWARE IMAGE AND LOOSE YOUR WARRANTY! ! -- ! ! -- ! YOU MAY NEED TO CALL SERVICE, IF THE FIRMWARE IMAGE ! -- ! IS DESTROYED ! ! -- ! ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- -- --REMOVING SLOF FROM JS20/JS21 --=============================================================================== -- -- If you want to boot the original firmware again, you need to boot the blade -- from the management module. If auto-boot is enabled you have to press "s" -- to reach the firmware prompt. -- On the SLOF command line, type: -- -- 0 > other-firmware -- -- and it should get you back to running the original firmware. To permanently -- get it back, after booting Linux from there, type -- -- $ update_flash -r -- $ halt -- -- You will boot on the PERM side. To boot from the TEMP side again, you need to -- restart the Blade System MGMT Processor. -- -- Following steps are needed on -- Management Module -> Blade Tasks -> Power/Restart -- -- Power Off Blade -- Restart Blade System Mgmt Processor -- Power On Blade -- -- - INSTALL ON KVM/QEMU - =============================================================================== - -diff --git a/README b/README -index 2944588..04786c8 100644 ---- a/README -+++ b/README -@@ -113,7 +113,7 @@ The SLOF source code is structured into the following directories: - Currently, there are two clients: - - net-snk : Used for network bootloading (a TFTP client) - - takeover : A separate binary that can be used for bootstrapping -- SLOF on a JS20/JS21 (see FlashingSLOF.pdf for details). -+ SLOF on a JS20/JS21. - - - drivers : Driver code for various hardware (currently only NIC drivers). - --- -1.8.3.1 - diff --git a/SLOF.spec b/SLOF.spec index e642226..c51a19f 100644 --- a/SLOF.spec +++ b/SLOF.spec @@ -24,7 +24,7 @@ URL: http://www.openfirmware.info/SLOF # git archive -o ../SLOF-{gittagdate}.tar.gz \ # --prefix=SLOF-{gittagdate}/ {gittag} Source0: SLOF-%{gittagdate}.tar.gz -Patch0001: 0001-spec-Remove-FlashingSLOF.pdf.patch + %if 0%{?cross:1} BuildArch: noarch