Skip to content
Snippets Groups Projects
Commit 7a41a134 authored by Luis Guzmán's avatar Luis Guzmán
Browse files

makeiso: remove efi calls, makeall.sh: add log file for further debugging.

parent 3860d291
No related branches found
No related tags found
1 merge request!21makeiso: remove efi calls, makeall.sh: add log file for further debugging.
......@@ -18,6 +18,9 @@
#
set -ex
[ ! -d logs ] && mkdir logs
{
echo "Started at $(date +'%Y-%m-%d %H:%M:%S')" >> logs/makeall.log
if [ $UID != 0 ]; then
echo You need to run this script as root!
......@@ -87,3 +90,5 @@ do
done
maketorrent trisquel-base_${VERSION}_armhf.tar.bz2 "ARM32/armhf/ARMv7 base image"
version_gt $VERSION 10.9 && maketorrent trisquel-base_${VERSION}_arm64.tar.bz2 "arm64/ARMv7 base image"
} > >(tee -a logs/makeall.log) 2> >(tee -a logs/makeall.log >&2)
......@@ -215,6 +215,9 @@ CHROOT=$CHROOT
-------------------------------------------------------------------------
"
KERNEL=linux-generic
DM=lightdm-gtk-greeter
TXTCFG=files/$DIST.cfg
rm -rf master
cp -a files/master-template master
mkdir master/casper
......@@ -224,7 +227,6 @@ echo https://trisquel.info/wiki/$CODENAME > master/.disk/release_notes_url
touch master/.disk/base_installable
echo 'full_cd/single' > master/.disk/cd_type
TXTCFG=files/$DIST.cfg
cp $TXTCFG master/isolinux/txt.cfg
DELETE_CHROOT $CHROOT
......@@ -272,19 +274,6 @@ mount -t sysfs none $CHROOT/sys
mount -t tmpfs none $CHROOT/tmp
echo "127.0.0.1 localhost" > $CHROOT/etc/hosts
#Setup local EFI repository
EFI_LOCAL_REPO="http://builds.trisquel.org/efi"
DISTRO_REPO=$(curl -s $EFI_LOCAL_REPO/|grep $CODENAME|awk -F'"' '{print$6}')
#Get and copy repo to master
wget -q $EFI_LOCAL_REPO/$DISTRO_REPO
rm -rf master/{dists,pool}
tar -zxvf $DISTRO_REPO --directory master/
rm $DISTRO_REPO
KERNEL=linux-generic
DM=lightdm-gtk-greeter
[ $DIST = triskel ] && DM=sddm
[ $DIST = trisquel-gnome ] && DM=gdm3
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment