History

build-x86-images: add firefox/pa to all DE flavours; add support to build X img.

Juan RP committed 11 years ago

Commit f263a251 parent 1c6321d1 file · +27 −16Browse files

Unified · Split

build-x86-images.sh.in+27−16
@@ -1,5 +1,7 @@
11 #!/bin/sh
22
3+readonly TARGET="$1"
4+
35 readonly ARCH=$(uname -m)
46 readonly DATE=$(date +%Y%m%d)
57 readonly BASE_IMG=void-live-${ARCH}-${DATE}.iso
@@ -14,27 +16,36 @@ case "$ARCH" in · 8 unmodified lines
1416 esac
1517
1618 readonly BASE_PKGS="dialog cryptsetup lvm2 mdadm $GRUB"
17−readonly X_PKGS="$BASE_PKGS xorg-minimal xorg-input-drivers xorg-video-drivers lxdm setxkbmap xauth font-misc-misc terminus-font cantarell-fonts gnome-themes-standard"
18−readonly E_PKGS="$X_PKGS enlightenment terminology econnman udisks2 firefox"
19−readonly XFCE_PKGS="$X_PKGS xfce4 firefox network-manager-applet gvfs-afc gvfs-mtp gvfs-smb udisks2"
20−readonly MATE_PKGS="$X_PKGS mate mate-extra firefox network-manager-applet gvfs-afc gvfs-mtp gvfs-smb udisks2"
21−readonly CINNAMON_PKGS="$X_PKGS cinnamon firefox gnome-terminal gvfs-afc gvfs-mtp gvfs-smb udisks2"
19+readonly X_PKGS="$BASE_PKGS xorg-minimal xorg-input-drivers xorg-video-drivers setxkbmap xauth font-misc-misc terminus-font cantarell-fonts gnome-themes-standard alsa-plugins-pulseaudio"
20+readonly E_PKGS="$X_PKGS lxdm enlightenment terminology econnman udisks2"
21+readonly XFCE_PKGS="$X_PKGS lxdm xfce4 network-manager-applet gvfs-afc gvfs-mtp gvfs-smb udisks2"
22+readonly MATE_PKGS="$X_PKGS lxdm mate mate-extra network-manager-applet gvfs-afc gvfs-mtp gvfs-smb udisks2"
23+readonly CINNAMON_PKGS="$X_PKGS lxdm cinnamon colord gnome-terminal gvfs-afc gvfs-mtp gvfs-smb udisks2"
2224
2325 [ ! -x mklive.sh ] && exit 0
2426
25−if [ ! -e $BASE_IMG ]; then
26− ./mklive.sh -o $BASE_IMG -p "$BASE_PKGS" $@
27+if [ -z "$TARGET" -o $TARGET = base ]; then
28+ if [ ! -e $BASE_IMG ]; then
29+ ./mklive.sh -o $BASE_IMG -p "$BASE_PKGS" $@
30+ fi
2731 fi
28−if [ ! -e $E_IMG ]; then
29− ./mklive.sh -o $E_IMG -p "$E_PKGS" $@
32+if [ -z "$TARGET" -o $TARGET = e ]; then
33+ if [ ! -e $E_IMG ]; then
34+ ./mklive.sh -o $E_IMG -p "$E_PKGS" $@
35+ fi
3036 fi
31−if [ ! -e $XFCE_IMG ]; then
32− ./mklive.sh -o $XFCE_IMG -p "$XFCE_PKGS" $@
37+if [ -z "$TARGET" -o $TARGET = xfce ]; then
38+ if [ ! -e $XFCE_IMG ]; then
39+ ./mklive.sh -o $XFCE_IMG -p "$XFCE_PKGS" $@
40+ fi
3341 fi
34−if [ ! -e $MATE_IMG ]; then
35− ./mklive.sh -o $MATE_IMG -p "$MATE_PKGS" $@
42+if [ -z "$TARGET" -o $TARGET = mate ]; then
43+ if [ ! -e $MATE_IMG ]; then
44+ ./mklive.sh -o $MATE_IMG -p "$MATE_PKGS" $@
45+ fi
3646 fi
37−if [ ! -e $CINNAMON_IMG ]; then
38− ./mklive.sh -o $CINNAMON_IMG -p "$CINNAMON_PKGS" $@
47+if [ -z "$TARGET" -o $TARGET = cinnamon ]; then
48+ if [ ! -e $CINNAMON_IMG ]; then
49+ ./mklive.sh -o $CINNAMON_IMG -p "$CINNAMON_PKGS" $@
50+ fi
3951 fi
40−

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