From cdbf4de7e04b9399f69caef6b2e9e141e7f89541 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sat, 26 Aug 2017 18:51:45 +0100
Subject: [PATCH] Install guix within image
---
src/freedombone-image-customise | 1 +
src/freedombone-utils-guile | 15 +++++++++++++--
src/freedombone-utils-setup | 3 +++
3 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index ed9363aaf..107a3c1c6 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -1469,6 +1469,7 @@ configure_user_interface
image_setup_utils
image_install_inadyn
image_install_nodejs
+image_install_guix
image_preinstall_repos
# remove downloaded packages
diff --git a/src/freedombone-utils-guile b/src/freedombone-utils-guile
index 5d409f6e3..05eafa56e 100755
--- a/src/freedombone-utils-guile
+++ b/src/freedombone-utils-guile
@@ -96,8 +96,6 @@ function install_guile {
}
function install_guix_get_architecture {
- read_config_param ARCHITECTURE
-
if [[ ${ARCHITECTURE} == *"386" || ${ARCHITECTURE} == *"686" ]]; then
CURR_ARCH='i686'
fi
@@ -137,6 +135,17 @@ function install_guix_user {
fi
}
+function image_install_guix {
+ install_guix_get_architecture
+ if [ ! -d $rootdir$INSTALL_DIR/guix ]; then
+ mkdir -p $INSTALL_DIR/guix
+ fi
+ cd $rootdir$INSTALL_DIR/guix
+ if [ ! -f guix-binary-${GUIX_VERSION}.${CURR_ARCH}-linux.tar.xz ]; then
+ wget $GUIX_DOWNLOAD_URL/guix-binary-${GUIX_VERSION}.${CURR_ARCH}-linux.tar.xz
+ fi
+}
+
function install_guix {
if [[ $(app_is_installed install_guix) == "1" ]]; then
return
@@ -145,6 +154,8 @@ function install_guix {
apt-get -qy install wget xz-utils
read_config_param MY_USERNAME
+ read_config_param ARCHITECTURE
+
install_guix_get_architecture
if [ ! -d $INSTALL_DIR/guix ]; then
diff --git a/src/freedombone-utils-setup b/src/freedombone-utils-setup
index ce528df6a..ad7ed4f5d 100755
--- a/src/freedombone-utils-setup
+++ b/src/freedombone-utils-setup
@@ -997,6 +997,9 @@ function setup_utils {
function_check setup_powerline
setup_powerline
+
+ function_check install_guix
+ install_guix
}
function setup_email {
--
GitLab