Skip to content

Commit 31b3525

Browse files
committed
Install qemu-user from Vivid repository & output statuses on BigRedButton
1 parent 68f1357 commit 31b3525

File tree

2 files changed

+30
-20
lines changed

2 files changed

+30
-20
lines changed

bin/install-dependencies

+23-13
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,41 @@
1-
#! /usr/bin/env sh
1+
#! /usr/bin/env bash
2+
3+
set -o pipefail
4+
5+
6+
APT='apt-get -qq -y'
7+
28

39
#
410
# Install Ubuntu dependencies
511
# The dependencies of one level would also be needed for the next ones
612
#
713

814
# Update cache
9-
dpkg --add-architecture i386
10-
apt-get update -qq || exit 1
15+
dpkg --add-architecture i386 &&
16+
$APT update || exit 1
17+
18+
19+
# Ubuntu 14.04 LTS has an old version of qemu-user (2.0.0)
20+
# Install the one from the Vivid repository
21+
wget -P deps \
22+
http://security.ubuntu.com/ubuntu/pool/universe/q/qemu/qemu-user_2.2+dfsg-5expubuntu9.5_amd64.deb &&
23+
dpkg -i deps/*.deb || exit 2
1124

1225

1326
# cross-compiler
14-
apt-get install -qq -y gcc texinfo || exit 10
27+
$APT install gcc texinfo || exit 10
1528

1629
# barebones
17-
apt-get install -qq -y bc qemu-system qemu-user || exit 11
18-
19-
# initramfs
20-
apt-get install -qq -y nodejs-legacy || exit 12
30+
$APT install bc qemu-system qemu-user || exit 11
2131

2232
# rootfs
23-
apt-get install -qq -y genisoimage libuuid1:i386 || exit 13
33+
$APT install genisoimage libuuid1:i386 || exit 12
2434

2535
# usersfs
26-
apt-get install -qq -y autoconf automake || exit 14
36+
$APT install autoconf automake || exit 13
2737

2838

29-
# Update Node.js to v0.12
30-
curl -sL https://deb.nodesource.com/setup_0.12 | bash || exit 15
31-
apt-get install -qq -y nodejs || exit 16
39+
# Update Node.js to v0.12 from the NodeSource repository
40+
curl -sL https://deb.nodesource.com/setup_0.12 | bash &&
41+
$APT install nodejs || exit 20

scripts/BigRedButton

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#!/usr/bin/env bash
22

33

4-
PLATFORM=iso_32 npm install --no-spin || exit $?
5-
PLATFORM=iso_64 npm install --no-spin || exit $?
6-
PLATFORM=qemu_32 npm install --no-spin || exit $?
7-
PLATFORM=qemu_64 npm install --no-spin || exit $?
8-
#PLATFORM=raspberry npm install --no-spin || exit $?
9-
PLATFORM=vagga_32 npm install --no-spin || exit $?
10-
PLATFORM=vagga_64 npm install --no-spin || exit $?
4+
PLATFORM=iso_32 npm install --no-spin || exit 1
5+
PLATFORM=iso_64 npm install --no-spin || exit 2
6+
PLATFORM=qemu_32 npm install --no-spin || exit 3
7+
PLATFORM=qemu_64 npm install --no-spin || exit 4
8+
#PLATFORM=raspberry npm install --no-spin || exit 5
9+
PLATFORM=vagga_32 npm install --no-spin || exit 6
10+
PLATFORM=vagga_64 npm install --no-spin || exit 7

0 commit comments

Comments
 (0)