History

build-x86-images: add gnome image support

John Zimmermann committed 8 years ago

Commit ff6be0b1 parent 4d817471 file · +10 −1Browse files

Unified · Split

build-x86-images.sh.in+10−1
@@ -7,7 +7,7 @@ while getopts "a:b:hr:" opt; do · 6 unmodified lines
7case $opt in7case $opt in
8 a) ARCH="$OPTARG";;8 a) ARCH="$OPTARG";;
9 b) IMAGE="$OPTARG";;9 b) IMAGE="$OPTARG";;
10 h) echo "${0#/*}: [-a arch] [-b base|e|xfce|mate|cinnamon|kde|lxde|lxqt] [-r repo]" >&2; exit 1;;10 h) echo "${0#/*}: [-a arch] [-b base|e|xfce|mate|cinnamon|gnome|kde|lxde|lxqt] [-r repo]" >&2; exit 1;;
11 r) REPO="-r $OPTARG $REPO";;11 r) REPO="-r $OPTARG $REPO";;
12esac12esac
13done13done
@@ -21,6 +21,7 @@ readonly E_IMG=void-live-${ARCH}-${DATE}-enlightenment.iso · 7 unmodified lines
21readonly XFCE_IMG=void-live-${ARCH}-${DATE}-xfce.iso21readonly XFCE_IMG=void-live-${ARCH}-${DATE}-xfce.iso
22readonly MATE_IMG=void-live-${ARCH}-${DATE}-mate.iso22readonly MATE_IMG=void-live-${ARCH}-${DATE}-mate.iso
23readonly CINNAMON_IMG=void-live-${ARCH}-${DATE}-cinnamon.iso23readonly CINNAMON_IMG=void-live-${ARCH}-${DATE}-cinnamon.iso
24readonly GNOME_IMG=void-live-${ARCH}-${DATE}-gnome.iso
24readonly KDE_IMG=void-live-${ARCH}-${DATE}-kde.iso25readonly KDE_IMG=void-live-${ARCH}-${DATE}-kde.iso
25readonly LXDE_IMG=void-live-${ARCH}-${DATE}-lxde.iso26readonly LXDE_IMG=void-live-${ARCH}-${DATE}-lxde.iso
26readonly LXQT_IMG=void-live-${ARCH}-${DATE}-lxqt.iso27readonly LXQT_IMG=void-live-${ARCH}-${DATE}-lxqt.iso
@@ -33,6 +34,7 @@ readonly E_PKGS="$X_PKGS lxdm enlightenment terminology econnman udisks2 firefox · 6 unmodified lines
33readonly XFCE_PKGS="$X_PKGS lxdm xfce4 gnome-themes-standard gnome-keyring network-manager-applet gvfs-afc gvfs-mtp gvfs-smb udisks2 firefox-esr"34readonly XFCE_PKGS="$X_PKGS lxdm xfce4 gnome-themes-standard gnome-keyring network-manager-applet gvfs-afc gvfs-mtp gvfs-smb udisks2 firefox-esr"
34readonly MATE_PKGS="$X_PKGS lxdm mate mate-extra gnome-keyring network-manager-applet gvfs-afc gvfs-mtp gvfs-smb udisks2 firefox-esr"35readonly MATE_PKGS="$X_PKGS lxdm mate mate-extra gnome-keyring network-manager-applet gvfs-afc gvfs-mtp gvfs-smb udisks2 firefox-esr"
35readonly CINNAMON_PKGS="$X_PKGS lxdm cinnamon gnome-keyring colord gnome-terminal gvfs-afc gvfs-mtp gvfs-smb udisks2 firefox-esr"36readonly CINNAMON_PKGS="$X_PKGS lxdm cinnamon gnome-keyring colord gnome-terminal gvfs-afc gvfs-mtp gvfs-smb udisks2 firefox-esr"
37readonly GNOME_PKGS="$X_PKGS gnome gnome-terminal firefox-esr"
36readonly KDE_PKGS="$X_PKGS kde5 konsole firefox dolphin"38readonly KDE_PKGS="$X_PKGS kde5 konsole firefox dolphin"
37readonly LXDE_PKGS="$X_PKGS lxdm lxde gvfs-afc gvfs-mtp gvfs-smb udisks2 firefox-esr"39readonly LXDE_PKGS="$X_PKGS lxdm lxde gvfs-afc gvfs-mtp gvfs-smb udisks2 firefox-esr"
38readonly LXQT_PKGS="$X_PKGS lxdm lxqt gvfs-afc gvfs-mtp gvfs-smb udisks2 qupzilla"40readonly LXQT_PKGS="$X_PKGS lxdm lxqt gvfs-afc gvfs-mtp gvfs-smb udisks2 qupzilla"
@@ -64,6 +66,13 @@ if [ -z "$IMAGE" -o "$IMAGE" = cinnamon ]; then · 25 unmodified lines
64 ./mklive.sh -a $ARCH -o $CINNAMON_IMG -p "$CINNAMON_PKGS" ${REPO} $@66 ./mklive.sh -a $ARCH -o $CINNAMON_IMG -p "$CINNAMON_PKGS" ${REPO} $@
65 fi67 fi
66fi68fi
69
70if [ -z "$IMAGE" -o "$IMAGE" = gnome ]; then
71 if [ ! -e $CINNAMON_IMG ]; then
72 ./mklive.sh -a $ARCH -o $GNOME_IMG -p "$GNOME_PKGS" ${REPO} $@
73 fi
74fi
75
67if [ -z "$IMAGE" -o "$IMAGE" = lxde ]; then76if [ -z "$IMAGE" -o "$IMAGE" = lxde ]; then
68 if [ ! -e $LXDE_IMG ]; then77 if [ ! -e $LXDE_IMG ]; then
69 ./mklive.sh -a $ARCH -o $LXDE_IMG -p "$LXDE_PKGS" ${REPO} $@78 ./mklive.sh -a $ARCH -o $LXDE_IMG -p "$LXDE_PKGS" ${REPO} $@

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t