summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2014-11-26 04:19:55 +0000
committerFrancis Rowe <info@gluglug.org.uk>2014-11-26 04:19:55 +0000
commit82412a5394acd18064ba62f85f2026a602e692b7 (patch)
treec97294812aaf3a01de352f6080c9d5e6fec9e710
parent2ccadda5b6d1505c12d49fb1c9dcc0f9631a8ad4 (diff)
scripts (all): replace unnecessary rm -rf with rm -f
-rwxr-xr-xDEBLOB10
-rwxr-xr-xbuild8
-rwxr-xr-xbuild-release16
-rwxr-xr-xbuilddeps-flashrom10
-rwxr-xr-xbuilddeps-seabios2
-rwxr-xr-xbuildrom-withgrub4
-rwxr-xr-xcleandeps6
-rwxr-xr-xgetcb6
-rwxr-xr-xgetgrubinvaders6
-rwxr-xr-xgetmt866
10 files changed, 37 insertions, 37 deletions
diff --git a/DEBLOB b/DEBLOB
index 8387fe7..4bdd5c1 100755
--- a/DEBLOB
+++ b/DEBLOB
@@ -25,7 +25,7 @@ cd coreboot/
# ---------------------
# CPU microcode updates
# ---------------------
-rm -rf \
+rm -f \
"src/cpu/intel/model_68x/microcode-617-MU16860c.h" \
"src/cpu/intel/model_68x/microcode-550-MU168307.h" \
"src/cpu/intel/model_68x/microcode-618-MU268602.h" \
@@ -247,7 +247,7 @@ rm -rf \
# --------------------------------------
# Misunderstood (weird: purpose unknown)
# --------------------------------------
-rm -rf \
+rm -f \
"src/mainboard/google/slippy/Micron_4KTF25664HZ.spd.hex" \
"src/mainboard/google/falco/Micron_4KTF25664HZ.spd.hex" \
"src/mainboard/google/peppy/Micron_4KTF25664HZ.spd.hex" \
@@ -276,7 +276,7 @@ rm -rf \
# -------------------------------------
# DSDT/SSDT (pre-coreboot/compiled blobs)
# -------------------------------------
-rm -rf \
+rm -f \
"src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieAlibSsdt.h" \
"src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/LN/F12PcieAlibSsdt.h" \
"src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/AlibSsdtKB.h" \
@@ -287,7 +287,7 @@ rm -rf \
# -----------------------------------------------------------
# southbridge nvidia/sis (unknown purpose, looks like a blob)
# -----------------------------------------------------------
-rm -rf \
+rm -f \
"src/southbridge/nvidia/mcp55/early_setup_ss.h" \
"src/southbridge/nvidia/ck804/early_setup_ss.h" \
"src/southbridge/sis/sis966/early_setup_ss.h"
@@ -295,7 +295,7 @@ rm -rf \
# ---------------------------
# northbridge intel (raminit)
# ---------------------------
-rm -rf \
+rm -f \
"src/northbridge/intel/nehalem/raminit_tables.c" \
"src/northbridge/intel/sandybridge/raminit_patterns.h"
diff --git a/build b/build
index 00e6c37..142d920 100755
--- a/build
+++ b/build
@@ -33,7 +33,7 @@ for romtype in txtmode vesafb
do
cd ../resources/utilities/grub-assemble
./gen."$romtype".sh
- rm -rf ../../../coreboot/grub_"$romtype".elf
+ rm -f ../../../coreboot/grub_"$romtype".elf
mv grub_"$romtype".elf ../../../coreboot/
cd ../../../coreboot
@@ -58,10 +58,10 @@ do
done
# The GRUB payloads are no longer needed
-rm -rf coreboot/grub_vesafb.elf
-rm -rf coreboot/grub_txtmode.elf
+rm -f coreboot/grub_vesafb.elf
+rm -f coreboot/grub_txtmode.elf
# The GRUB configs are no longer needed
-rm -rf coreboot/grub*cfg
+rm -f coreboot/grub*cfg
# ------------------- DONE ----------------------
diff --git a/build-release b/build-release
index 8ec8910..4c47b5d 100755
--- a/build-release
+++ b/build-release
@@ -42,8 +42,8 @@ fi
echo "Deleting old release archives"
-rm -rf libreboot_src.tar.xz
-rm -rf libreboot_bin.tar.xz
+rm -f libreboot_src.tar.xz
+rm -f libreboot_bin.tar.xz
# Get manifest which will be used to copy everything
ls > releasefilelist
@@ -106,13 +106,13 @@ cd ../
# GRUB:
cd grub/
rm -rf .git
-rm -rf .gitignore
+rm -f .gitignore
cd ../
# SeaBIOS:
cd seabios/
rm -rf .git
-rm -rf .gitignore
+rm -f .gitignore
cd ../
cd ../
@@ -293,14 +293,14 @@ cp macbook21_firstflash libreboot_bin/
# ----------------------------------------------------------------------------------------------------------------------------
# Also delete the manifest
-rm -rf libreboot_src/releasefilelist
-rm -rf libreboot_bin/releasefilelist
-rm -rf releasefilelist
+rm -f libreboot_src/releasefilelist
+rm -f libreboot_bin/releasefilelist
+rm -f releasefilelist
# We don't want to encourage development
# to happen on the release archives.
# Development goes in git.
-rm -rf libreboot_src/build-release
+rm -f libreboot_src/build-release
echo "Creating compressed libreboot_src release archive"
diff --git a/builddeps-flashrom b/builddeps-flashrom
index d630827..c549128 100755
--- a/builddeps-flashrom
+++ b/builddeps-flashrom
@@ -34,8 +34,8 @@ cd flashrom
# clean it first
make clean
# remove modified binaries aswell
-rm -rf flashrom_lenovobios_sst
-rm -rf flashrom_lenovobios_macronix
+rm -f flashrom_lenovobios_sst
+rm -f flashrom_lenovobios_macronix
# patch flashchips.c to remove the useless Macronix entries (for X60/T60)
# makes flashrom work without having to use "-c" switch
@@ -48,7 +48,7 @@ else
make SHARED=0 CC='gcc -static'
fi
# restore default flashchips.c
-rm -rf flashchips.c
+rm -f flashchips.c
mv flashchips.c_ flashchips.c
# backup those files
@@ -63,7 +63,7 @@ else
make SHARED=0 CC='gcc -static'
fi
mv flashrom flashrom_lenovobios_macronix
-rm -rf flashchips.c
+rm -f flashchips.c
# build patched version for SST25VF016B flash chip on Lenovo BIOS X60/T60
cp ../resources/flashrom/patch/flashchips.c_lenovobios_sst flashchips.c
@@ -73,7 +73,7 @@ else
make SHARED=0 CC='gcc -static'
fi
mv flashrom flashrom_lenovobios_sst
-rm -rf flashchips.c
+rm -f flashchips.c
# restore default binary/source
mv flashchips.c_ flashchips.c
diff --git a/builddeps-seabios b/builddeps-seabios
index 517957d..d9ccc72 100755
--- a/builddeps-seabios
+++ b/builddeps-seabios
@@ -43,7 +43,7 @@ cp ../resources/seabios/config/config .config
make
# delete the copy of the config (no longer needed)
-rm -rf .config
+rm -f .config
# done. go back to main directory
cd ../
diff --git a/buildrom-withgrub b/buildrom-withgrub
index 51a9c9e..d0454eb 100755
--- a/buildrom-withgrub
+++ b/buildrom-withgrub
@@ -49,7 +49,7 @@ do
mv grub.elf grub_"$romtype".elf
mv build/coreboot.rom "$1"_"$romtype".rom
# .config no longer needed
- rm -rf .config
+ rm -f .config
# Needed on i945 systems for the bucts/dd trick (documented)
# This enables the ROM to be flashed over the lenovo bios firmware
@@ -57,7 +57,7 @@ do
then
dd if="$1"_"$romtype".rom of=top64k.bin bs=1 skip=$[$(stat -c %s "$1"_"$romtype".rom) - 0x10000] count=64k
dd if=top64k.bin of="$1"_"$romtype".rom bs=1 seek=$[$(stat -c %s "$1"_"$romtype".rom) - 0x20000] count=64k conv=notrunc
- rm -rf top64k.bin
+ rm -f top64k.bin
fi
# Add the correct GRUB configuration file for this image.
diff --git a/cleandeps b/cleandeps
index f961970..cefddf6 100755
--- a/cleandeps
+++ b/cleandeps
@@ -42,7 +42,7 @@ make clean
cd ../../
# remove the payloads (they will be built by "build")
-rm -rf grub.elf
+rm -f grub*.elf
# clean reference crossGCC for coreboot
make crossgcc-clean
@@ -86,8 +86,8 @@ cd flashrom
make clean
# remove modified binaries
-rm -rf flashrom_lenovobios_sst
-rm -rf flashrom_lenovobios_macronix
+rm -f flashrom_lenovobios_sst
+rm -f flashrom_lenovobios_macronix
# done. go back to main directory
cd ../
diff --git a/getcb b/getcb
index 77b0422..4eb2a07 100755
--- a/getcb
+++ b/getcb
@@ -78,9 +78,9 @@ echo "deblobbing coreboot"
# The git history (git diff command) shows what blobs were deleted (including the blobs themselves) which is a freedom issue. Just delete .git altogether:
cd coreboot
rm -rf .git
-rm -rf .gitreview
-rm -rf .gitmodules
-rm -rf .gitignore
+rm -f .gitreview
+rm -f .gitmodules
+rm -f .gitignore
cd ../
echo "finished deblobbing coreboot"
diff --git a/getgrubinvaders b/getgrubinvaders
index 30050b6..fcaf7b9 100755
--- a/getgrubinvaders
+++ b/getgrubinvaders
@@ -41,7 +41,7 @@ wget http://www.erikyyy.de/invaders/invaders-1.0.0.tar.gz
tar -xf "invaders-1.0.0.tar.gz"
# delete the tar file (no longer needed)
-rm -rf "invaders-1.0.0.tar.gz"
+rm -f "invaders-1.0.0.tar.gz"
# rename directory (for consistency with script names)
mv invaders grubinvaders
@@ -59,8 +59,8 @@ patch < diff.patch
patch compile.sh < compile.sh.patch
# delete the copy of the patch (no longer needed)
-rm -rf diff.patch
-rm -rf compile.sh.patch
+rm -f diff.patch
+rm -f compile.sh.patch
# we're done
cd ../
diff --git a/getmt86 b/getmt86
index 40412ae..7ee2298 100755
--- a/getmt86
+++ b/getmt86
@@ -41,7 +41,7 @@ wget http://www.memtest.org/download/5.01/memtest86+-5.01.tar.gz
tar -xf "memtest86+-5.01.tar.gz"
# delete the tar file (no longer needed)
-rm -rf "memtest86+-5.01.tar.gz"
+rm -f "memtest86+-5.01.tar.gz"
# there are modifications required
cd "memtest86+-5.01"
@@ -59,11 +59,11 @@ cd "memtest86+-5.01"
# #define BEEP_MODE 1
# place the right config
-rm -rf config.h
+rm -f config.h
cp ../resources/memtest86/patch/config.h .
# place the right Makefile
-rm -rf Makefile
+rm -f Makefile
cp ../resources/memtest86/patch/Makefile .
# (diff them with defaults to see what changed)