summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbuild_all.sh (renamed from tools/build_live.sh)7
-rwxr-xr-xbuild_one.sh9
-rwxr-xr-xupdate_bootloader_files.sh1
3 files changed, 12 insertions, 5 deletions
diff --git a/tools/build_live.sh b/build_all.sh
index dce0430..2842913 100755
--- a/tools/build_live.sh
+++ b/build_all.sh
@@ -1,10 +1,8 @@
#!/bin/bash
-# Run this script from the draklive-config directory:
-# ./tools/build_live.sh
declare -A desktops
-release=6-rc
+release=6
archs="i586 x86_64"
@@ -12,9 +10,8 @@ desktops[i586]="Xfce"
desktops[x86_64]="GNOME Plasma Xfce"
-pushd files/mga_rpms
./update_media.sh
-popd
+./update_bootloader_files.sh
for arch in $archs; do
for desktop in ${desktops[$arch]}; do
sudo -u draklive sudo /usr/sbin/draklive --clean --all --define arch=$arch --define desktop=$desktop
diff --git a/build_one.sh b/build_one.sh
new file mode 100755
index 0000000..bf0b47b
--- /dev/null
+++ b/build_one.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+./update_media.sh
+./update_bootloader_files.sh
+draklive='perl -I ../drakiso/lib ../drakiso/draklive'
+if [ $# -ge 0 ] ; then
+ sudo $draklive $*
+else
+ sudo $draklive --clean --all
+fi
diff --git a/update_bootloader_files.sh b/update_bootloader_files.sh
index 98ff5dc..554f872 100755
--- a/update_bootloader_files.sh
+++ b/update_bootloader_files.sh
@@ -1,5 +1,6 @@
#!/bin/sh
repository=$(grep repository config/settings.cfg | sed s/repository=//)
+echo "Fetching bootloader files from $repository"
# Remove old files
rm -rf bootloader