commit: 44bad278e0f683899cfd348593bfcf8c56e13520
parent 372e08e4f97378b0704fc5fb1a6c06d3c30de3c4
Author: fosslinux <fosslinux@aussies.space>
Date: Mon, 15 Feb 2021 19:31:17 +1100
Add optional output_filename argument in rootfs.sh
Downloads to a particular filename, allows for different names than
whatever is upstream.
Diffstat:
| M | rootfs.sh | 98 | ++++++++++++++++++++++++++++++++++++++----------------------------------------- |
1 file changed, 47 insertions(+), 51 deletions(-)
diff --git a/rootfs.sh b/rootfs.sh
@@ -8,13 +8,13 @@
set -ex
-QEMU_CMD="${1:-qemu-system-x86_64}" # or 'chroot' or 'minikernel'
+QEMU_CMD="${1:-qemu-system-x86_64}" # or 'chroot' or 'minikernel'
QEMU_RAM="${2:-8G}"
GITDIR="$PWD/$(dirname "$0")"
if [ ! -f 'rootfs.sh' ]; then
- echo 'must be run from base of repo'
- exit 1
+ echo 'must be run from base of repo'
+ exit 1
fi
pushd sysa
@@ -27,33 +27,28 @@ sudo mount -t tmpfs -o size=8G tmpfs tmp
LOGFILE="$PWD/tmp/bootstrap.log"
-wget()
-{
- local url="$1"
- local dir="${CACHEDIR:-$GITDIR/sources}"
- local file
-
- file=$(basename "$url")
- mkdir -p "$dir"
-
- test -s "$dir/$file" || command wget -O "$dir/$file" "$url"
- cp -v "$dir/$file" .
- checksum_do "$dir" "$file"
+_wget() {
+ local url="$1"
+ local dir="${CACHEDIR:-$GITDIR/sources}"
+ local file="${2:-$(basename "${url}")}"
+ mkdir -p "$dir"
+ test -s "$dir/$file" || command wget -O "$dir/$file" "$url"
+ cp -v "$dir/$file" .
+ checksum_do "$dir" "$file"
}
-checksum_do()
-{
- local dir="$1"
- local file="$2"
- local line
- local store="$GITDIR/SHA256SUMS.sources"
-
- if line=$(grep "[[:space:]][[:space:]]$file"$ "$store"); then
- (cd "$dir" && echo "$line" | sha256sum -c)
- else
- echo 'Checksum mismatch or not found!'
- exit 1
- fi
+checksum_do() {
+ local dir="$1"
+ local file="$2"
+ local line
+ local store="$GITDIR/SHA256SUMS.sources"
+
+ if line=$(grep "[[:space:]][[:space:]]$file"$ "$store"); then
+ (cd "$dir" && echo "$line" | sha256sum -c)
+ else
+ echo 'Checksum mismatch or not found!'
+ exit 1
+ fi
}
# base: mescc-tools-seed
@@ -127,11 +122,12 @@ tar -C tmp/after/tar-1.12/src -xf "tmp/after/tar-1.12/src/$(basename $url)" --st
get_file() {
url=$1
make_build=${2:-0}
+ output_filename=$3
ext="${url##*.}"
if [ "$ext" = "tar" ]; then
- bname=$(basename "$url" ".tar")
+ bname=$(basename "${output_filename:-${url}}" ".tar")
else
- bname=$(basename "$url" ".tar.${ext}")
+ bname=$(basename "${output_filename:-${url}}" ".tar.${ext}")
fi
cp -r "${bname}" tmp/after/
target="tmp/after/${bname}"
@@ -141,7 +137,7 @@ get_file() {
fi
pushd "tmp/after/${bname}/src"
if [ ! -f "$(basename "$url")" ]; then
- wget "$url"
+ _wget "$url" "${output_filename:-${url##*/}}"
fi
popd
}
@@ -209,26 +205,26 @@ find . | cpio -H newc -o | gzip > initramfs.igz
# Run
case "${QEMU_CMD}" in
- chroot)
- sudo PATH="/after/bin:${PATH}" chroot . /init | tee "$LOGFILE"
- ;;
- minikernel)
- git clone --depth 1 --branch v0.4 https://github.com/bittorf/kritis-linux.git
-
- kritis-linux/ci_helper.sh \
- --arch x86_64 \
- --ramsize 4G \
- --kernel 5.10.8 \
- --initrd initramfs.igz \
- --log "$LOGFILE"
- ;;
- *)
- ${QEMU_CMD} -enable-kvm \
- -m "${QEMU_RAM:-8G}" \
- -nographic \
- -no-reboot \
- -kernel ../../kernel -initrd initramfs.igz -append console=ttyS0 | tee "$LOGFILE"
- ;;
+ chroot)
+ sudo PATH="/after/bin:${PATH}" chroot . /init | tee "$LOGFILE"
+ ;;
+ minikernel)
+ git clone --depth 1 --branch v0.4 https://github.com/bittorf/kritis-linux.git
+
+ kritis-linux/ci_helper.sh \
+ --arch x86_64 \
+ --ramsize 4G \
+ --kernel 5.10.8 \
+ --initrd initramfs.igz \
+ --log "$LOGFILE"
+ ;;
+ *)
+ ${QEMU_CMD} -enable-kvm \
+ -m "${QEMU_RAM:-8G}" \
+ -nographic \
+ -no-reboot \
+ -kernel ../../kernel -initrd initramfs.igz -append console=ttyS0 | tee "$LOGFILE"
+ ;;
esac
cd ../..
