summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2015-02-14 03:34:31 (EST)
committer Francis Rowe <info@gluglug.org.uk>2015-02-14 05:10:24 (EST)
commit50c4ca21103d6afcefda81833852c8f274398e20 (patch)
treeec043689b4ca8e0c6530383283d23c53180c5aa7
parentc742ec0ecb2f2c5b7cc4f6e67d66792695822a0c (diff)
downloadlibreboot-50c4ca21103d6afcefda81833852c8f274398e20.zip
libreboot-50c4ca21103d6afcefda81833852c8f274398e20.tar.gz
libreboot-50c4ca21103d6afcefda81833852c8f274398e20.tar.bz2
Move the "get" scripts to resources/scripts/helpers/fetch/
Replace "getall" with "download", which takes as input an argument specifying which programme the user wants to download.
-rwxr-xr-xbuild-release14
-rw-r--r--docs/git/index.html4
-rwxr-xr-xdownload51
-rwxr-xr-xgetall48
-rwxr-xr-xresources/scripts/helpers/fetch/bucts (renamed from getbucts)7
-rwxr-xr-xresources/scripts/helpers/fetch/coreboot (renamed from getcb)7
-rwxr-xr-xresources/scripts/helpers/fetch/flashrom (renamed from getflashrom)7
-rwxr-xr-xresources/scripts/helpers/fetch/grub (renamed from getgrub)5
-rwxr-xr-xresources/scripts/helpers/fetch/memtest86plus (renamed from getmt86)7
9 files changed, 83 insertions, 67 deletions
diff --git a/build-release b/build-release
index 29842ee..9384433 100755
--- a/build-release
+++ b/build-release
@@ -94,7 +94,7 @@ rm -rf .git*
cd ../
# coreboot:
-# the instructions for coreboot remain in getgb script
+# the instructions for coreboot remain in the download script
# they need to stay there, because otherwise "git diff"
# will show the blobs that were deleted (which means,
# that libreboot would be distributing blobs)
@@ -334,14 +334,12 @@ rm -f releasefilelist
# We don't want to encourage development
# to happen on the release archives.
-# Development goes in git.
+# Development goes in git. These scripts are
+# not needed in libreboot_src, because
+# the files that they download are already included
rm -f libreboot_src/build-release
-rm -f libreboot_src/getall
-rm -f libreboot_src/getbucts
-rm -f libreboot_src/getcb
-rm -f libreboot_src/getflashrom
-rm -f libreboot_src/getgrub
-rm -f libreboot_src/getmt86
+rm -f libreboot_src/download
+rm -rf libreboot_src/resources/scripts/helpers/fetch/
# ich9deblob: there are certain files in there
# that the user most likely does not want to share
diff --git a/docs/git/index.html b/docs/git/index.html
index df2b0fc..e6682d1 100644
--- a/docs/git/index.html
+++ b/docs/git/index.html
@@ -104,8 +104,8 @@
</p>
<p>
- After that, run the get script:<br/>
- <b>$ ./getall</b>
+ After that, run the script:<br/>
+ <b>$ ./download everything</b>
</p>
<p>
diff --git a/download b/download
new file mode 100755
index 0000000..69ce4f2
--- /dev/null
+++ b/download
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+# download script: Download the programmes used in libreboot, that
+# aren't distributed in the git repository.
+#
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+set -u -e -v
+
+download=./resources/scripts/helpers/fetch
+programme="unknown"
+
+usage="./download programme"
+availableprogrammes="$(ls $download/)"
+
+# User specified no or too few/many parameters
+if (( $# != 1 )); then
+ printf "$usage\n\n"
+ printf "possible values for 'programme':\neverything:\n$availableprogrammes\n\n"
+ printf "Example (download everything): ./download everything\n"
+ printf "Example (download coreboot): ./download coreboot\n\n"
+ exit 1
+fi
+programme=$1
+
+if [ "$programme" = "everything" ]; then
+ for programme in $availableprogrammes; do
+ $download/$programme
+ done
+elif [ -f "$download/$programme" ]; then
+ $download/$programme
+else
+ printf "Invalid programme. Available programmes are:\neverything\n$availableprogrammes\n"
+ exit 1
+fi
+
+# ------------------- DONE ----------------------
diff --git a/getall b/getall
deleted file mode 100755
index ce377ee..0000000
--- a/getall
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-# getall script: download everything from upstreams and apply patches
-#
-# Copyright (C) 2014 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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-
-set -u -e -v
-
-# Download bucts
-# ---------------------------------------------------
-
-./getbucts
-
-# Download coreboot
-# ---------------------------------------------------
-
-./getcb
-
-# Download flashrom
-# ---------------------------------------------------
-
-./getflashrom
-
-# Download GRUB
-# ---------------------------------------------------
-
-./getgrub
-
-# Download MemTest86+
-# ---------------------------------------------------
-
-./getmt86
-
-# ------------------- DONE ----------------------
diff --git a/getbucts b/resources/scripts/helpers/fetch/bucts
index 3c7205c..5d5e5d1 100755
--- a/getbucts
+++ b/resources/scripts/helpers/fetch/bucts
@@ -1,8 +1,8 @@
#!/bin/bash
-# getbucts script: downloads bucts and patches it
+# helper script: downloads bucts and patches it
#
-# 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 working directory is the
+# root of libreboot_src or libreboot git.
+
set -u -e -v
# Get bucts and checkout last revision used
diff --git a/getcb b/resources/scripts/helpers/fetch/coreboot
index 68ff9da..d5c7257 100755
--- a/getcb
+++ b/resources/scripts/helpers/fetch/coreboot
@@ -1,8 +1,8 @@
#!/bin/bash
-# getcb script: downloads coreboot and patches/deblobs it
+# helper script: downloads coreboot and patches/deblobs it
#
-# 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 working directory is the
+# root of libreboot_src or libreboot git.
+
set -u -e -v
# This grabs current base used, and applies patches
diff --git a/getflashrom b/resources/scripts/helpers/fetch/flashrom
index b74ff6e..45f7a34 100755
--- a/getflashrom
+++ b/resources/scripts/helpers/fetch/flashrom
@@ -1,8 +1,8 @@
#!/bin/bash
-# getflashrom script: downloads flashrom and patches it
+# helper script: downloads flashrom and patches it
#
-# 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 working directory is the
+# root of libreboot_src or libreboot git.
+
set -u -e -v
# Get flashrom at the last previously tested revision
diff --git a/getgrub b/resources/scripts/helpers/fetch/grub
index 03d0226..8dc512e 100755
--- a/getgrub
+++ b/resources/scripts/helpers/fetch/grub
@@ -1,6 +1,6 @@
#!/bin/bash
-# getgrub script: Downloads GRUB and patches it.
+# helper script: Downloads GRUB and patches it.
#
# Copyright (C) 2014, 2015 Francis Rowe <info@gluglug.org.uk>
#
@@ -18,6 +18,9 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
+# This script assumes that the working directory is the
+# root of libreboot_src or libreboot git.
+
set -u -e -v
# Get GRUB, revert to commit last used and apply patches.
diff --git a/getmt86 b/resources/scripts/helpers/fetch/memtest86plus
index d97dedd..37564cc 100755
--- a/getmt86
+++ b/resources/scripts/helpers/fetch/memtest86plus
@@ -1,8 +1,8 @@
#!/bin/bash
-# getmt86: Downloads MemTest86+ and patches it
+# helper script: Downloads MemTest86+ and patches it
#
-# 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 working directory is the
+# root of libreboot_src or libreboot git.
+
set -u -e -v
# Get the last version of MemTest86+ used, apply patches, build it.