diff options
author | Francis Rowe <info@gluglug.org.uk> | 2015-08-30 04:47:29 +0100 |
---|---|---|
committer | Francis Rowe <info@gluglug.org.uk> | 2015-08-30 04:47:29 +0100 |
commit | a57f26f2c62805b9e61719361ca17ccf53c897ad (patch) | |
tree | 31777747249a8b538fa6f1bbbec39b131be59044 /resources/scripts/helpers/build/dependencies | |
parent | 8c07c380121cdab4efd50cff453875903b8c67ef (diff) | |
download | librebootfr-a57f26f2c62805b9e61719361ca17ccf53c897ad.tar.gz librebootfr-a57f26f2c62805b9e61719361ca17ccf53c897ad.zip |
all scripts: general fixes and clean up
Diffstat (limited to 'resources/scripts/helpers/build/dependencies')
-rwxr-xr-x | resources/scripts/helpers/build/dependencies/parabola | 7 | ||||
-rwxr-xr-x | resources/scripts/helpers/build/dependencies/trisquel7 | 9 |
2 files changed, 5 insertions, 11 deletions
diff --git a/resources/scripts/helpers/build/dependencies/parabola b/resources/scripts/helpers/build/dependencies/parabola index 692fdf75..92a88be4 100755 --- a/resources/scripts/helpers/build/dependencies/parabola +++ b/resources/scripts/helpers/build/dependencies/parabola @@ -53,7 +53,7 @@ pacman -S arm-none-eabi-gcc pacman -S --needed libpciaccess # For cross-compiling i686 target on x86_64 host. -if [ $(uname -i) = "x86_64" ] || [ $(uname -m) = "x86_64" ] +if [ "$(uname -i)" = "x86_64" ] || [ "$(uname -m)" = "x86_64" ] then printf "Cross-Compiling: You are running on 64-bit architecture, however 32-bit libraries are needed\n" pacman -Sl --needed multilib 1&>/dev/null || (printf "You must enable the multilib repository in /etc/pacman.conf first\n"; exit 1) @@ -78,7 +78,7 @@ pacman -S ncurses doxygen iasl gdb flex bison # pacman -S git base-devel # For cross-compiling i686 target on x86_64 host. -if [ $(uname -i) = "x86_64" ] || [ $(uname -m) = "x86_64" ] +if [ "$(uname -i)" = "x86_64" ] || [ "$(uname -m)" = "x86_64" ] then printf "Cross-Compiling: You are running on 64-bit architecture, however 32-bit libraries are needed\n" pacman -S --needed lib32-ncurses @@ -104,6 +104,3 @@ pacman -S --needed bdf-unifont # trying this, otherwise there was an error. I'll printf "Flashrom: Your external programmer will be most probably using PCI bus, FTDI chips need additional libraries\n" pacman -S --needed pciutils zlib libftdi libftdi-compat # pacman -S --needed base-devel subversion - -# ------------------- DONE ---------------------- - diff --git a/resources/scripts/helpers/build/dependencies/trisquel7 b/resources/scripts/helpers/build/dependencies/trisquel7 index 0a3a2680..d3027f9c 100755 --- a/resources/scripts/helpers/build/dependencies/trisquel7 +++ b/resources/scripts/helpers/build/dependencies/trisquel7 @@ -47,7 +47,7 @@ apt-get -y install build-essential apt-get -y install gcc-arm-linux-gnueabi # For cross-compiling i686 target on x86_64 host. -if [ $(uname -i) = "x86_64" ] || [ $(uname -m) = "x86_64" ] +if [ "$(uname -i)" = "x86_64" ] || [ "$(uname -m)" = "x86_64" ] then apt-get -y install gcc-multilib libc6-i386 libc6-dev-i386 apt-get -y install lib32stdc++6 g++-multilib dh-autoreconf @@ -71,7 +71,7 @@ apt-get -y install build-essential apt-get -y install libncurses5-dev doxygen iasl gdb flex bison build-essential git # For cross-compiling i686 target on x86_64 host. -if [ $(uname -i) = "x86_64" ] || [ $(uname -m) = "x86_64" ] +if [ "$(uname -i)" = "x86_64" ] || [ "$(uname -m)" = "x86_64" ] then apt-get -y install lib32ncurses5-dev fi @@ -92,10 +92,7 @@ apt-get -y install build-essential apt-get -y install libpci-dev pciutils zlib1g-dev libftdi-dev build-essential subversion # For cross-compiling i686 target on x86_64 host. -if [ $(uname -i) = "x86_64" ] || [ $(uname -m) = "x86_64" ] +if [ "$(uname -i)" = "x86_64" ] || [ "$(uname -m)" = "x86_64" ] then apt-get -y install lib32z1-dev fi - -# ------------------- DONE ---------------------- - |