summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xresources/scripts/helpers/build/release/archives6
-rwxr-xr-xresources/scripts/helpers/download/coreboot2
-rwxr-xr-xresources/utilities/coreboot-libre/deblob (renamed from DEBLOB)5
3 files changed, 8 insertions, 5 deletions
diff --git a/resources/scripts/helpers/build/release/archives b/resources/scripts/helpers/build/release/archives
index d7078b4..b488b6d 100755
--- a/resources/scripts/helpers/build/release/archives
+++ b/resources/scripts/helpers/build/release/archives
@@ -339,11 +339,11 @@ rm -f libreboot_src/releasefilelist
rm -f libreboot_util/releasefilelist
rm -f releasefilelist
-# Delete the DEBLOB file from libreboot_src
+# Delete the deblob scripts from libreboot_src
# Since _src doesn't distribute the download scripts,
# and already comes with a deblobbed coreboot, the
-# deblobbing script isn't needed at all
-rm -f libreboot_src/DEBLOB
+# deblobbing scripts aren't needed at all
+rm -rf libreboot_src/resources/utilities/coreboot-libre/
# We don't want to encourage development
# to happen on the release archives.
diff --git a/resources/scripts/helpers/download/coreboot b/resources/scripts/helpers/download/coreboot
index d5c7257..586f1c1 100755
--- a/resources/scripts/helpers/download/coreboot
+++ b/resources/scripts/helpers/download/coreboot
@@ -98,7 +98,7 @@ rm -f .gitignore
cd ../
# Deblob coreboot
-./DEBLOB
+./resources/utilities/coreboot-libre/deblob
# ------------------- DONE ----------------------
diff --git a/DEBLOB b/resources/utilities/coreboot-libre/deblob
index 2f3c918..ae2305b 100755
--- a/DEBLOB
+++ b/resources/utilities/coreboot-libre/deblob
@@ -2,7 +2,7 @@
# DEBLOB script: deblobs the version of coreboot used for this release.
#
-# Copyright (C) 2014 Francis Rowe <info@gluglug.org.uk>
+# Copyright (C) 2014, 2015 Francis Rowe <info@gluglug.org.uk>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -18,6 +18,9 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
+# This script assumes that the current working directory is the root
+# of the libreboot_src/ or git clone.
+
set -u -e -v
cd coreboot/