From e737ebc5a0ef2261be7b03d3497cd5802fade9e2 Mon Sep 17 00:00:00 2001 From: Francis Rowe Date: Fri, 3 Apr 2015 01:10:24 +0100 Subject: Revert "Move parabola/trisquel dependency scripts to scripts/helpers/build" This reverts commit 0fe9cd2f2e6b7e0a4a6f7d06e5027be154933c54. --- docs/git/index.html | 10 +- .../scripts/dependencies/paraboladependencies | 132 +++++++++++++++++++++ .../scripts/dependencies/trisquel7dependencies | 101 ++++++++++++++++ .../scripts/helpers/build/dependencies/parabola | 132 --------------------- .../scripts/helpers/build/dependencies/trisquel7 | 101 ---------------- 5 files changed, 235 insertions(+), 241 deletions(-) create mode 100755 resources/scripts/dependencies/paraboladependencies create mode 100755 resources/scripts/dependencies/trisquel7dependencies delete mode 100755 resources/scripts/helpers/build/dependencies/parabola delete mode 100755 resources/scripts/helpers/build/dependencies/trisquel7 diff --git a/docs/git/index.html b/docs/git/index.html index a1e9dd9f..62b17755 100644 --- a/docs/git/index.html +++ b/docs/git/index.html @@ -60,18 +60,12 @@

For Trisquel 7, you can run the following command:
- $ sudo ./build dependencies trisquel7 -

-

- For Parabola, you can run the following command:
- $ sudo ./build dependencies parabola
- or:
- # ./build dependencies parabola + $ sudo ./resources/scripts/dependencies/trisquel7dependencies

- For other GNU/Linux distributions, you can adapt the existing scripts. + For other GNU/Linux distributions, you can adapt the Trisquel 7 script for your needs.

Back to top of page

diff --git a/resources/scripts/dependencies/paraboladependencies b/resources/scripts/dependencies/paraboladependencies new file mode 100755 index 00000000..6a43805b --- /dev/null +++ b/resources/scripts/dependencies/paraboladependencies @@ -0,0 +1,132 @@ +#!/bin/bash + +# helper script: installs build dependencies for Parabola +# works on 32-bit. TODO: adapt for 64-bit +# this script is based on the script for Trisquel 7 +# +# Copyright (C) 2014, 2015 Francis Rowe +# +# 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 . +# + +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e + +if [[ $EUID -ne 0 ]]; then + echo "This script must be run as root" + exit 1 +fi + +# Duplications are intentional. Please do not re-factor. +# +# This is so that they can moved to separate scripts. +# + +# TODO: get everything building in parabola 64-bit +# (this script was written for 32-bit parabola) + +pacman -S --noconfirm wget + +# For downloading source code +# ------------------------------------------------------------ + +pacman -S --noconfirm subversion git + +# For building source code: +# ------------------------------------------------------------ + +pacman -S --noconfirm base-devel + +# THIS IS ONLY FOR "./build release archives" +# TODO: ADAPT FOR PARABOLA +# for cross-compiling ARM binaries +apt-get -y install gcc-arm-linux-gnueabi # TODO: ADAPT IN PARABOLA +# For cross-compiling i686 target on x86_64 host. +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 + # recommended, but not sure what for: + apt-get -y install lib32tinfo-dev texi2html +fi + +# Memtest86+ build dependencies +# ------------------------------------------------------------ + +# pacman -S --noconfirm base-devel + +# i945-pwm build dependencies +# ------------------------------------------------------------ + +# pacman -S --noconfirm base-devel + +# Coreboot build dependencies (also requires build-essential and git) +# ------------------------------------------------------------ + +pacman -S --noconfirm ncurses doxygen iasl gdb flex bison +# pacman -S --noconfirm git base-devel + +# For cross-compiling i686 target on x86_64 host. +TODO: ADAPT FOR PARABOLA (needed for "./build release archives") +if [ $(uname -i) = "x86_64" ] || [ $(uname -m) = "x86_64" ] + then + apt-get -y install lib32ncurses5-dev +fi + +# GRUB build dependencies (also requires build-essential, bison and flex) +# ------------------------------------------------------------ + + +# TODO: is bdf-unifont the equivalent to Trisquel's ttf-unifont? Or do you need ttf-unifont from AUR, eg: +# https://aur.archlinux.org/packages/ttf-unifont/ + +# TODO: what is the equivalent to libopts25? + +# TODO: what is the equivalent to libselinux1-dev? +# Do you need it from AUR? +# Is SELinux even needed at all? + +# TODO: what is the equivalent to autotools-dev? + +# TODO: what is the equivalent to libfont-freetype-perl? is it freetype2 (already in the list below)? + +# pacman -S --noconfirm base-devel bison flex + +pacman -S --noconfirm autogen m4 autoconf help2man freetype2 automake fuse fuse-exfat xz gawk device-mapper libtool python +pacman -S --noconfirm bdf-unifont # trying this, otherwise there was an error. I'll try AUR if this won't work. + +# BucTS build dependencies (external script) +# ------------------------------------------------------------ + +# pacman -S --noconfirm base-devel + +# Flashrom build dependencies (also requires build-essential and subversion) +# ------------------------------------------------------------ + +# TODO: what is the equivalent to libpci-dev? + +# + +pacman -S --noconfirm pciutils zlib libftdi libftdi-compat +# pacman -S --noconfirm base-devel subversion + +# For cross-compiling i686 target on x86_64 host. +# TODO: ADAPT FOR PARABOLA (needed for "./build release archives" +if [ $(uname -i) = "x86_64" ] || [ $(uname -m) = "x86_64" ] + then + apt-get -y install lib32z1-dev +fi + +# ------------------- DONE ---------------------- + diff --git a/resources/scripts/dependencies/trisquel7dependencies b/resources/scripts/dependencies/trisquel7dependencies new file mode 100755 index 00000000..f9c04be8 --- /dev/null +++ b/resources/scripts/dependencies/trisquel7dependencies @@ -0,0 +1,101 @@ +#!/bin/bash + +# for_trisquel7 script: installs build dependencies for Trisquel 7 +# +# Copyright (C) 2014, 2015 Francis Rowe +# +# 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 . +# + +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e + +if [[ $EUID -ne 0 ]]; then + echo "This script must be run as root" + exit 1 +fi + +# Duplications are intentional. Please do not re-factor. +# +# This is so that they can moved to separate scripts. +# + +apt-get -y install wget + +# For downloading source code +# ------------------------------------------------------------ + +apt-get -y install subversion git + +# For building source code: +# ------------------------------------------------------------ + +apt-get -y install build-essential + +# for cross-compiling ARM binaries +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" ] + then + apt-get -y install gcc-multilib libc6-i386 libc6-dev-i386 + apt-get -y install lib32stdc++6 g++-multilib dh-autoreconf + # recommended, but not sure what for: + apt-get -y install lib32tinfo-dev texi2html +fi + +# Memtest86+ build dependencies +# ------------------------------------------------------------ + +apt-get -y install build-essential + +# i945-pwm build dependencies +# ------------------------------------------------------------ + +apt-get -y install build-essential + +# Coreboot build dependencies (also requires build-essential and git) +# ------------------------------------------------------------ + +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" ] + then + apt-get -y install lib32ncurses5-dev +fi + +# GRUB build dependencies (also requires build-essential, bison and flex) +# ------------------------------------------------------------ + +apt-get -y install ttf-unifont libopts25 libselinux1-dev autogen m4 autoconf help2man libopts25-dev libfont-freetype-perl automake autotools-dev build-essential bison flex libfuse-dev liblzma-dev gawk libdevmapper-dev libtool libfreetype6-dev + +# BucTS build dependencies (external script) +# ------------------------------------------------------------ + +apt-get -y install build-essential + +# Flashrom build dependencies (also requires build-essential and subversion) +# ------------------------------------------------------------ + +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" ] + then + apt-get -y install lib32z1-dev +fi + +# ------------------- DONE ---------------------- + diff --git a/resources/scripts/helpers/build/dependencies/parabola b/resources/scripts/helpers/build/dependencies/parabola deleted file mode 100755 index 6a43805b..00000000 --- a/resources/scripts/helpers/build/dependencies/parabola +++ /dev/null @@ -1,132 +0,0 @@ -#!/bin/bash - -# helper script: installs build dependencies for Parabola -# works on 32-bit. TODO: adapt for 64-bit -# this script is based on the script for Trisquel 7 -# -# Copyright (C) 2014, 2015 Francis Rowe -# -# 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 . -# - -[ "x${DEBUG+set}" = 'xset' ] && set -v -set -u -e - -if [[ $EUID -ne 0 ]]; then - echo "This script must be run as root" - exit 1 -fi - -# Duplications are intentional. Please do not re-factor. -# -# This is so that they can moved to separate scripts. -# - -# TODO: get everything building in parabola 64-bit -# (this script was written for 32-bit parabola) - -pacman -S --noconfirm wget - -# For downloading source code -# ------------------------------------------------------------ - -pacman -S --noconfirm subversion git - -# For building source code: -# ------------------------------------------------------------ - -pacman -S --noconfirm base-devel - -# THIS IS ONLY FOR "./build release archives" -# TODO: ADAPT FOR PARABOLA -# for cross-compiling ARM binaries -apt-get -y install gcc-arm-linux-gnueabi # TODO: ADAPT IN PARABOLA -# For cross-compiling i686 target on x86_64 host. -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 - # recommended, but not sure what for: - apt-get -y install lib32tinfo-dev texi2html -fi - -# Memtest86+ build dependencies -# ------------------------------------------------------------ - -# pacman -S --noconfirm base-devel - -# i945-pwm build dependencies -# ------------------------------------------------------------ - -# pacman -S --noconfirm base-devel - -# Coreboot build dependencies (also requires build-essential and git) -# ------------------------------------------------------------ - -pacman -S --noconfirm ncurses doxygen iasl gdb flex bison -# pacman -S --noconfirm git base-devel - -# For cross-compiling i686 target on x86_64 host. -TODO: ADAPT FOR PARABOLA (needed for "./build release archives") -if [ $(uname -i) = "x86_64" ] || [ $(uname -m) = "x86_64" ] - then - apt-get -y install lib32ncurses5-dev -fi - -# GRUB build dependencies (also requires build-essential, bison and flex) -# ------------------------------------------------------------ - - -# TODO: is bdf-unifont the equivalent to Trisquel's ttf-unifont? Or do you need ttf-unifont from AUR, eg: -# https://aur.archlinux.org/packages/ttf-unifont/ - -# TODO: what is the equivalent to libopts25? - -# TODO: what is the equivalent to libselinux1-dev? -# Do you need it from AUR? -# Is SELinux even needed at all? - -# TODO: what is the equivalent to autotools-dev? - -# TODO: what is the equivalent to libfont-freetype-perl? is it freetype2 (already in the list below)? - -# pacman -S --noconfirm base-devel bison flex - -pacman -S --noconfirm autogen m4 autoconf help2man freetype2 automake fuse fuse-exfat xz gawk device-mapper libtool python -pacman -S --noconfirm bdf-unifont # trying this, otherwise there was an error. I'll try AUR if this won't work. - -# BucTS build dependencies (external script) -# ------------------------------------------------------------ - -# pacman -S --noconfirm base-devel - -# Flashrom build dependencies (also requires build-essential and subversion) -# ------------------------------------------------------------ - -# TODO: what is the equivalent to libpci-dev? - -# - -pacman -S --noconfirm pciutils zlib libftdi libftdi-compat -# pacman -S --noconfirm base-devel subversion - -# For cross-compiling i686 target on x86_64 host. -# TODO: ADAPT FOR PARABOLA (needed for "./build release archives" -if [ $(uname -i) = "x86_64" ] || [ $(uname -m) = "x86_64" ] - then - apt-get -y install lib32z1-dev -fi - -# ------------------- DONE ---------------------- - diff --git a/resources/scripts/helpers/build/dependencies/trisquel7 b/resources/scripts/helpers/build/dependencies/trisquel7 deleted file mode 100755 index f9c04be8..00000000 --- a/resources/scripts/helpers/build/dependencies/trisquel7 +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash - -# for_trisquel7 script: installs build dependencies for Trisquel 7 -# -# Copyright (C) 2014, 2015 Francis Rowe -# -# 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 . -# - -[ "x${DEBUG+set}" = 'xset' ] && set -v -set -u -e - -if [[ $EUID -ne 0 ]]; then - echo "This script must be run as root" - exit 1 -fi - -# Duplications are intentional. Please do not re-factor. -# -# This is so that they can moved to separate scripts. -# - -apt-get -y install wget - -# For downloading source code -# ------------------------------------------------------------ - -apt-get -y install subversion git - -# For building source code: -# ------------------------------------------------------------ - -apt-get -y install build-essential - -# for cross-compiling ARM binaries -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" ] - then - apt-get -y install gcc-multilib libc6-i386 libc6-dev-i386 - apt-get -y install lib32stdc++6 g++-multilib dh-autoreconf - # recommended, but not sure what for: - apt-get -y install lib32tinfo-dev texi2html -fi - -# Memtest86+ build dependencies -# ------------------------------------------------------------ - -apt-get -y install build-essential - -# i945-pwm build dependencies -# ------------------------------------------------------------ - -apt-get -y install build-essential - -# Coreboot build dependencies (also requires build-essential and git) -# ------------------------------------------------------------ - -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" ] - then - apt-get -y install lib32ncurses5-dev -fi - -# GRUB build dependencies (also requires build-essential, bison and flex) -# ------------------------------------------------------------ - -apt-get -y install ttf-unifont libopts25 libselinux1-dev autogen m4 autoconf help2man libopts25-dev libfont-freetype-perl automake autotools-dev build-essential bison flex libfuse-dev liblzma-dev gawk libdevmapper-dev libtool libfreetype6-dev - -# BucTS build dependencies (external script) -# ------------------------------------------------------------ - -apt-get -y install build-essential - -# Flashrom build dependencies (also requires build-essential and subversion) -# ------------------------------------------------------------ - -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" ] - then - apt-get -y install lib32z1-dev -fi - -# ------------------- DONE ---------------------- - -- cgit v1.2.3-70-g09d2