Commit 729aacc57c5158171a816df32fe1c9eded72c197

Authored by Silvan Calarco
1 parent ca0f92802a
Exists in master

Sync with openmamba target

Showing 16 changed files with 52 additions and 198 deletions Side-by-side Diff

... ... @@ -156,6 +156,9 @@
156 156 libpostproc.so.52[LIBPOSTPROC_52][64bit] = libpostproc-ffmpeg
157 157 libswresample.so.0[][64bit] = libswresample-ffmpeg
158 158 libswresample.so.0[LIBSWRESAMPLE_0][64bit] = libswresample-ffmpeg
  159 +libpoppler-qt4.so.4[][64bit] = libpoppler-qt4
  160 +libpoppler-cpp.so.0[][64bit] = libpoppler
  161 +libpoppler-glib.so.8[][64bit] = libpoppler-glib
159 162 else
160 163 libGL.so.1 = libGL-Mesa-dri
161 164 libGLU.so.1 = libGL-Mesa-dri
... ... @@ -193,6 +196,9 @@
193 196 libpostproc.so.52[LIBPOSTPROC_52] = libpostproc-ffmpeg
194 197 libswresample.so.0 = libswresample-ffmpeg
195 198 libswresample.so.0[LIBSWRESAMPLE_0] = libswresample-ffmpeg
  199 +libpoppler-qt4.so.4 = libpoppler-qt4
  200 +libpoppler-cpp.so.0 = libpoppler
  201 +libpoppler-glib.so.8 = libpoppler-glib
196 202 endif
197 203 /usr/bin/python = python
198 204 python[abi] = python
... ... @@ -85,10 +85,7 @@
85 85 [[ "$TARGET_HOSTNAME" ]] || TARGET_HOSTNAME="$MAKEDIST_TARGET"
86 86 [[ "$TARGET_DOMAIN" ]] || TARGET_DOMAIN="localdomain"
87 87  
88   -echo "$TARGET_HOSTNAME" > $MOUNTDIR/etc/hostname
89   -sed -i "s|HOSTNAME=.*|HOSTNAME=$TARGET_HOSTNAME|" $MOUNTDIR/etc/sysconfig/network
90   -sed -i "s|\(127\.0\.0\.1\W*\)\(.*\)|\1 $TARGET_HOSTNAME.$TARGET_DOMAIN $TARGET_HOSTNAME \2|" \
91   - $MOUNTDIR/etc/hosts
  88 +echo "$TARGET_HOSTNAME.$TARGET_DOMAIN" > $MOUNTDIR/etc/hostname
92 89  
93 90 #install_rpms_by_target "Installing tools packages for ${MAKEDIST_TARGET} target" ${MAKEDIST_TARGET}-tools ""
94 91 install_rpms_by_target "Installing ${PLATFORM} platform packages" ${MAKEDIST_TARGET}-${PLATFORM} "${RPMEXTRAARGS}"
platforms/livecd-gnome-root/Makefile
1 1 $(MAKEDIST_TARGET)-livecd-gnome: \
2 2 openssh-server usbutils wireless_tools parted iputils file rootfiles \
3   - ppp minicom chrony locales mc alsa-utils \
4   - man-db curl zip unzip iptables iproute wpa_supplicant mtd-utils nfs-utils \
  3 + ppp minicom locales mc alsa-utils \
  4 + man-db curl zip unzip iptables iproute mtd-utils nfs-utils \
5 5 openssh-clients binutils telnet ftp debianutils diffutils bluez traceroute \
6 6 timezone sudo openobex liblame expect prelink NetworkManager \
7 7 ModemManager network-manager-applet Mesa-tools \
8 8 x11vnc xorg-server xorg-drv-video-fbdev xorg-drv-input-evdev xorg-drv-input-keyboard \
9 9 xorg-drv-input-mouse xorg-drv-input-void \
10 10 xorg-drv-input-tslib xcursor-transparent-theme rpm smart desktop-base-openmamba \
11   - gdm gnome-session gnome-common gnome-control-center gnome-desktop gnome-desktop-sharp \
  11 + gdm gnome-session gnome-common gnome-control-center gnome-desktop \
12 12 gnome-keyring gnome-menus gnome-mime-data gnome-packagekit gnome-settings-daemon \
13   - gnome-sharp gnome-terminal nautilus gnome-themes evolution gnome-utils gnome-system-log \
14   - desktop-base-gnome gimp vlc gconf-editor rhythmbox
  13 + gnome-terminal nautilus gnome-themes evolution gnome-utils gnome-system-log \
  14 + desktop-base-gnome gimp vlc gconf-editor rhythmbox brasero
15 15  
16 16 #kitchensync4 kontact4 kmail4 akregator4 kdeplasma-addons amarok
17 17 $(MAKEDIST_TARGET)-livecd-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress
platforms/livecd-gnome-root/post.inc.sh
1   -## don't activate some services
2   -#rm -f $MOUNTDIR/etc/rcsysinit.d/{S35hdparm,S30loadmodules,S40swap}
3   -#rm -f $MOUNTDIR/etc/rc*.d/{S12random,S13sysinit,S20network,S44acpid,S55sshd}
4   -#rm -f $MOUNTDIR/etc/rc*.d/{K00splash,K01acpid,K90random,K96swap,K97network,K97udev,K98localnet}
5   -
6   -# change inittab so it opens tty root shells instead of asking for login
7   -#
8   -echo "Forcing \`inittab' to open tty root shells with no login..."
9   -sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty1,' $MOUNTDIR/etc/inittab
10   -sed -i 's,^\([2-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty\1,' $MOUNTDIR/etc/inittab
11   -sed -i '/^[4-6]:.*/d' $MOUNTDIR/etc/inittab
12   -
13   -# configure for runlevel 5 boot
14   -sed -i "s|id:3\(:initdefault.*\)|id:5\1|" $MOUNTDIR/etc/inittab
15   -
16 1 # configure GDM for autologin
17 2 #
18 3 cat > $MOUNTDIR/etc/gdm/custom.conf << _EOF
... ... @@ -38,8 +23,7 @@
38 23 es) timezone=Europe/Madrid ;;
39 24 *) timezone=UTC ;;
40 25 esac
41   -echo $timezone > $MOUNTDIR/etc/timezone
42   -cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
  26 +ln -s ../usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
43 27  
44 28 # clean rpm database before doing other operations with internal rpm
45 29 # to fix cross x86/x86_64 installation error:
platforms/livecd-gnome-root/settings.inc
... ... @@ -2,9 +2,16 @@
2 2 MEDIA=squash_xz
3 3 MULTITHREAD=1
4 4  
5   -KERNEL_EXTRAVER=mamba
6   -KERNEL_PLATFORM=""
7   -#KERNEL_ADDITIONAL="extramodules"
  5 +if [ "$ARCH" = "i586" ]; then
  6 + KERNEL_EXTRAVER=mamba
  7 + KERNEL_PLATFORM=""
  8 + #KERNEL_ADDITIONAL="extramodules"
  9 + KERNEL_MORE_EXTRAVER=mamba-64GB
  10 +elif [ "$ARCH" = "x86_64" ]; then
  11 + KERNEL_EXTRAVER=mamba-x86_64
  12 + KERNEL_PLATFORM=""
  13 + #KERNEL_ADDITIONAL="extramodules"
  14 +fi
8 15  
9 16 TARGET_HOSTNAME=openmamba-gnome
10 17 ROOTDEV=
platforms/livecd-light-root/Makefile
1 1 $(MAKEDIST_TARGET)-livecd-light: openssh-server usbutils wireless_tools parted iputils file rootfiles \
2   - ppp minicom chrony locales mc alsa-utils \
  2 + ppp minicom locales mc alsa-utils \
3 3 man-db curl zip unzip iptables iproute wpa_supplicant mtd-utils nfs-utils \
4 4 openssh-clients binutils telnet ftp debianutils diffutils bluez traceroute \
5 5 lxde timezone sudo \
... ... @@ -19,7 +19,7 @@
19 19 ttf-freefont liberation-fonts-ttf \
20 20 gparted ntfs-3g libdvdcss \
21 21 chromium totem-mozilla-plugin \
22   - macbook-tools livecd-tools \
  22 + livecd-tools \
23 23 Mesa-tools driconf parted testdisk \
24 24 samba-server \
25 25 smart-gui cpufreqd mambatray \
platforms/livecd-light-root/post.inc.sh
1   -## don't activate some services
2   -#rm -f $MOUNTDIR/etc/rcsysinit.d/{S35hdparm,S30loadmodules,S40swap}
3   -#rm -f $MOUNTDIR/etc/rc*.d/{S12random,S13sysinit,S20network,S44acpid,S55sshd}
4   -#rm -f $MOUNTDIR/etc/rc*.d/{K00splash,K01acpid,K90random,K96swap,K97network,K97udev,K98localnet}
5   -
6   -# change inittab so it opens tty root shells instead of asking for login
7   -#
8   -echo "Forcing \`inittab' to open tty root shells with no login..."
9   -sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty1,' $MOUNTDIR/etc/inittab
10   -sed -i 's,^\([2-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty\1,' $MOUNTDIR/etc/inittab
11   -sed -i '/^[4-6]:.*/d' $MOUNTDIR/etc/inittab
12   -
13   -# configure for runlevel 5 boot
14   -sed -i "s|id:3\(:initdefault.*\)|id:5\1|" $MOUNTDIR/etc/inittab
15   -
16 1 # configure LXDM for autologin
17 2 #
18 3 sed -i "s|# autologin.*|autologin=liveuser|" $MOUNTDIR/etc/lxdm/lxdm.conf
... ... @@ -27,8 +12,7 @@
27 12 es) timezone=Europe/Madrid ;;
28 13 *) timezone=UTC ;;
29 14 esac
30   -echo $timezone > $MOUNTDIR/etc/timezone
31   -cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
  15 +ln -s ../usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
32 16  
33 17 # clean rpm database before doing other operations with internal rpm
34 18 # to fix cross x86/x86_64 installation error:
platforms/livecd-root/post.inc.sh
1   -## don't activate some services
2   -#rm -f $MOUNTDIR/etc/rcsysinit.d/{S35hdparm,S30loadmodules,S40swap}
3   -#rm -f $MOUNTDIR/etc/rc*.d/{S12random,S13sysinit,S20network,S44acpid,S55sshd}
4   -#rm -f $MOUNTDIR/etc/rc*.d/{K00splash,K01acpid,K90random,K96swap,K97network,K97udev,K98localnet}
5   -
6   -# change inittab so it opens tty root shells instead of asking for login
7   -#
8   -echo "Forcing \`inittab' to open tty root shells with no login..."
9   -sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty1,' $MOUNTDIR/etc/inittab
10   -sed -i 's,^\([2-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty\1,' $MOUNTDIR/etc/inittab
11   -sed -i '/^[4-6]:.*/d' $MOUNTDIR/etc/inittab
12   -
13   -# configure for runlevel 5 boot
14   -sed -i "s|id:3\(:initdefault.*\)|id:5\1|" $MOUNTDIR/etc/inittab
15   -
16 1 # configure KDM for autologin
17 2 #
18 3 if [ -e $MOUNTDIR/opt/kde/share/config/kdm/kdmrc ]; then
... ... @@ -34,8 +19,7 @@
34 19 es) timezone=Europe/Madrid ;;
35 20 *) timezone=UTC ;;
36 21 esac
37   -echo $timezone > $MOUNTDIR/etc/timezone
38   -cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
  22 +ln -s ../usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
39 23  
40 24 # configure favorites in kde menu
41 25 for f in /usr/share/applications/chromium-devel.desktop; do
platforms/livedvd-root/post.inc.sh
1   -## don't activate some services
2   -#rm -f $MOUNTDIR/etc/rcsysinit.d/{S35hdparm,S30loadmodules,S40swap}
3   -#rm -f $MOUNTDIR/etc/rc*.d/{S12random,S13sysinit,S20network,S44acpid,S55sshd}
4   -#rm -f $MOUNTDIR/etc/rc*.d/{K00splash,K01acpid,K90random,K96swap,K97network,K97udev,K98localnet}
5   -
6   -# change inittab so it opens tty root shells instead of asking for login
7   -#
8   -echo "Forcing \`inittab' to open tty root shells with no login..."
9   -sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty1,' $MOUNTDIR/etc/inittab
10   -sed -i 's,^\([2-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty\1,' $MOUNTDIR/etc/inittab
11   -sed -i '/^[4-6]:.*/d' $MOUNTDIR/etc/inittab
12   -
13   -# configure for runlevel 5 boot
14   -sed -i "s|id:3\(:initdefault.*\)|id:5\1|" $MOUNTDIR/etc/inittab
15   -
16 1 # configure KDM for autologin
17 2 #
18 3 if [ -e $MOUNTDIR/opt/kde/share/config/kdm/kdmrc ]; then
... ... @@ -29,16 +14,17 @@
29 14  
30 15 # set timezone according to LANGUAGE (default is UTC)
31 16 #
32   -case $LANGUAGE in
33   - it) timezone=Europe/Rome ;;
34   - es) timezone=Europe/Madrid ;;
35   - fr) timezone=Europe/Paris ;;
36   - de) timezone=Europe/Berlin ;;
37   - en) timezone=Europe/London ;;
38   - *) timezone=UTC ;;
39   -esac
40   -echo $timezone > $MOUNTDIR/etc/timezone
41   -cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
  17 +if [ ! "$MULTILANGUAGE" ]; then
  18 + case $LANGUAGE in
  19 + it) timezone=Europe/Rome ;;
  20 + es) timezone=Europe/Madrid ;;
  21 + fr) timezone=Europe/Paris ;;
  22 + de) timezone=Europe/Berlin ;;
  23 + en) timezone=Europe/London ;;
  24 + *) timezone=UTC ;;
  25 + esac
  26 + ln -s ../usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
  27 +fi
42 28  
43 29 # configure favorites in kde menu
44 30 for f in /usr/share/applications/chromium-devel.desktop /opt/kde/share/applications/amarok.desktop; do
platforms/livegames-root/post.inc.sh
1   -## don't activate some services
2   -#rm -f $MOUNTDIR/etc/rcsysinit.d/{S35hdparm,S30loadmodules,S40swap}
3   -#rm -f $MOUNTDIR/etc/rc*.d/{S12random,S13sysinit,S20network,S44acpid,S55sshd}
4   -#rm -f $MOUNTDIR/etc/rc*.d/{K00splash,K01acpid,K90random,K96swap,K97network,K97udev,K98localnet}
5   -
6   -# change inittab so it opens tty root shells instead of asking for login
7   -#
8   -echo "Forcing \`inittab' to open tty root shells with no login..."
9   -sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty1,' $MOUNTDIR/etc/inittab
10   -sed -i 's,^\([2-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty\1,' $MOUNTDIR/etc/inittab
11   -sed -i '/^[4-6]:.*/d' $MOUNTDIR/etc/inittab
12   -
13   -# configure for runlevel 5 boot
14   -sed -i "s|id:3\(:initdefault.*\)|id:5\1|" $MOUNTDIR/etc/inittab
15   -
16 1 # configure KDM for autologin
17 2 #
18 3 if [ -e $MOUNTDIR/opt/kde/share/config/kdm/kdmrc ]; then
... ... @@ -34,8 +19,7 @@
34 19 es) timezone=Europe/Madrid ;;
35 20 *) timezone=UTC ;;
36 21 esac
37   -echo $timezone > $MOUNTDIR/etc/timezone
38   -cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
  22 +ln -s ../usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
39 23  
40 24 # configure favorites in kde menu
41 25 for f in /usr/share/applications/chromium-devel.desktop; do
platforms/rootfs-light/Makefile
... ... @@ -4,15 +4,20 @@
4 4 kernel-rpi kernel-rpi-modules \
5 5 kernel-cubox kernel-cubox-modules \
6 6 kernel-mamba-arm kernel-mamba-arm-sound kernel-mamba-arm-wireless \
  7 + kernel-mamba-arm-dove kernel-mamba-arm-dove-sound kernel-mamba-arm-dove-wireless \
  8 + kernel-sunxi kernel-sunxi-modules u-boot-sunxi-Bananapi \
7 9 brcm_patchram midori u-boot-tools
8 10  
9 11 $(MAKEDIST_TARGET)-$(PLATFORM)-i586: \
10 12 kernel-mamba kernel-mamba-sound kernel-mamba-wireless chromium \
11 13 kernel-mamba-64GB kernel-mamba-64GB-sound kernel-mamba-64GB-wireless
12 14  
  15 +$(MAKEDIST_TARGET)-$(PLATFORM)-x86_64: \
  16 + kernel-mamba-x86_64 kernel-mamba-x86_64-sound kernel-mamba-x86_64-wireless chromium
  17 +
13 18 $(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \
14 19 lxde openssh-server usbutils wireless_tools screen i2c-tools \
15   - parted iputils file rootfiles ppp minicom chrony locales mc \
  20 + parted iputils file rootfiles ppp minicom locales mc \
16 21 man-db curl zip unzip iptables iproute wpa_supplicant mtd-utils nfs-utils \
17 22 openssh-clients binutils telnet ftp debianutils diffutils bluez traceroute \
18 23 timezone sudo kmod \
platforms/rootfs-light/post.inc.sh
... ... @@ -34,24 +34,6 @@
34 34 #chkconfig --del portmap
35 35 #"
36 36  
37   -## use system default language
38   -#> $MOUNTDIR/etc/sysconfig/i18n
39   -
40   -# set localtime (default to Europe/Berlin)
41   -case $LANGUAGE in
42   - it) timezone=Europe/Rome ;;
43   - es) timezone=Europe/Madrid ;;
44   - *) timezone=Europe/Berlin ;;
45   -esac
46   -echo $timezone > $MOUNTDIR/etc/timezone
47   -cp /usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
48   -
49   -# disable automatic depmod and ldconfig execution on boot (also due to clock error)
50   -cat >> $MOUNTDIR/etc/sysconfig/rc << _EOF
51   -no_auto_depmod=1
52   -no_auto_ldconfig=1
53   -_EOF
54   -
55 37 # configure touchscreen
56 38 cat > $MOUNTDIR/etc/ts-calibrate.conf << _EOF
57 39 TSLIB_CONFFILE=/etc/ts.conf
... ... @@ -62,22 +44,6 @@
62 44 HOME=/root
63 45 _EOF
64 46  
65   -
66   -# change inittab so it opens tty root shells instead of asking for login
67   -#
68   -echo "Forcing \`inittab' to open tty root shells with no login..."
69   -# configure for serial console login
70   -#echo "s0:2345:respawn:/sbin/agetty -L -f /etc/issue 115200 tcc-uart0 vt100" >> $MOUNTDIR/etc/inittab
71   -sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty1,' $MOUNTDIR/etc/inittab
72   -sed -i 's,^\([2-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty\1,' $MOUNTDIR/etc/inittab
73   -sed -i 's,^4:.*,4:2345:respawn:/sbin/agetty ttyS0 115200,' $MOUNTDIR/etc/inittab
74   -sed -i 's,^5:.*,5:2345:respawn:/sbin/agetty ttyGS0 115200,' $MOUNTDIR/etc/inittab
75   -sed -i 's,^6:.*,6:2345:respawn:/sbin/agetty ttyAMA0 115200,' $MOUNTDIR/etc/inittab
76   -#sed -i '/^[5-6]:.*/d' $MOUNTDIR/etc/inittab
77   -
78   -# configure for runlevel 5 boot
79   -sed -i "s|id:3\(:initdefault.*\)|id:5\1|" $MOUNTDIR/etc/inittab
80   -
81 47 # configure LXDM for autologin
82 48 #
83 49 sed -i "s|# autologin.*|autologin=liveuser|" $MOUNTDIR/etc/lxdm/lxdm.conf
... ... @@ -89,8 +55,7 @@
89 55 es) timezone=Europe/Madrid ;;
90 56 *) timezone=UTC ;;
91 57 esac
92   -echo $timezone > $MOUNTDIR/etc/timezone
93   -cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
  58 +ln -s ../usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
94 59  
95 60 # remove some documentation to save space
96 61 for f in ChangeLog Changelog CHANGES TODO NEWS README README.txt; do
platforms/rootfs/Makefile
... ... @@ -6,6 +6,7 @@
6 6  
7 7 $(MAKEDIST_TARGET)-$(PLATFORM)-arm: \
8 8 kernel-iconia kernel-iconia-modules kernel-hannspad kernel-hannspad-modules \
  9 + kernel-sgn kernel-sgn-modules \
9 10 kernel-mamba-arm kernel-mamba-arm-sound kernel-mamba-arm-wireless \
10 11 kernel-mamba-arm-firmware brcm_patchram u-boot-tools
11 12  
... ... @@ -16,7 +17,7 @@
16 17  
17 18 $(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \
18 19 $(MAKEDIST_TARGET)-$(PLATFORM)-kde4 openssh-server usbutils wireless_tools i2c-tools \
19   - parted iputils file rootfiles ppp minicom chrony locales mc \
  20 + parted iputils file rootfiles ppp minicom locales mc \
20 21 man-db curl zip unzip iptables iproute wpa_supplicant mtd-utils nfs-utils \
21 22 openssh-clients binutils telnet ftp debianutils diffutils bluez traceroute \
22 23 timezone sudo kmod \
... ... @@ -24,7 +25,7 @@
24 25 xorg-server x11vnc xkeyboard-config screen \
25 26 xorg-drv-input-tslib xcursor-transparent-theme rpm smart xdg-utils \
26 27 dhcp-server rfkill plymouth livecd-tools rdesktop mingetty \
27   - postplug-xorg postplug-sound gparted tar net-tools chrony mambatray kvkbd
  28 + postplug-xorg postplug-sound gparted tar net-tools mambatray kvkbd
28 29  
29 30 # startactive
30 31 # tightvnc-server lxde network-manager-applet matchbox-keyboard midori Mesa-tools alsa-utils
platforms/rootfs/post.inc.sh
... ... @@ -34,24 +34,6 @@
34 34 #chkconfig --del portmap
35 35 #"
36 36  
37   -## use system default language
38   -#> $MOUNTDIR/etc/sysconfig/i18n
39   -
40   -# set localtime (default to Europe/Berlin)
41   -case $LANGUAGE in
42   - it) timezone=Europe/Rome ;;
43   - es) timezone=Europe/Madrid ;;
44   - *) timezone=Europe/Berlin ;;
45   -esac
46   -echo $timezone > $MOUNTDIR/etc/timezone
47   -cp /usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
48   -
49   -# disable automatic depmod and ldconfig execution on boot (also due to clock error)
50   -cat >> $MOUNTDIR/etc/sysconfig/rc << _EOF
51   -no_auto_depmod=1
52   -no_auto_ldconfig=1
53   -_EOF
54   -
55 37 # configure touchscreen
56 38 cat > $MOUNTDIR/etc/ts-calibrate.conf << _EOF
57 39 TSLIB_CONFFILE=/etc/ts.conf
... ... @@ -62,19 +44,6 @@
62 44 HOME=/root
63 45 _EOF
64 46  
65   -# change inittab so it opens tty root shells instead of asking for login
66   -#
67   -echo "Forcing \`inittab' to open tty root shells with no login..."
68   -sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty1,' $MOUNTDIR/etc/inittab
69   -sed -i 's,^\([2-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty\1,' $MOUNTDIR/etc/inittab
70   -sed -i 's,^4:.*,4:2345:respawn:/sbin/agetty ttyS0 115200,' $MOUNTDIR/etc/inittab
71   -sed -i 's,^5:.*,5:2345:respawn:/sbin/agetty ttyGS0 115200,' $MOUNTDIR/etc/inittab
72   -sed -i 's,^6:.*,6:2345:respawn:/sbin/agetty ttyAMA0 115200,' $MOUNTDIR/etc/inittab
73   -#sed -i '/^[5-6]:.*/d' $MOUNTDIR/etc/inittab
74   -
75   -# configure for runlevel 5 boot
76   -sed -i "s|id:3\(:initdefault.*\)|id:5\1|" $MOUNTDIR/etc/inittab
77   -
78 47 # configure KDM for autologin
79 48 #
80 49 if [ -e $MOUNTDIR/opt/kde/share/config/kdm/kdmrc ]; then
... ... @@ -93,8 +62,7 @@
93 62 es) timezone=Europe/Madrid ;;
94 63 *) timezone=UTC ;;
95 64 esac
96   -echo $timezone > $MOUNTDIR/etc/timezone
97   -cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
  65 +ln -s ../usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
98 66  
99 67 # configure favorites in kde menu
100 68 for f in /usr/share/applications/chromium-devel.desktop /opt/kde/share/applications/kaffeine.desktop; do
platforms/testcd-root/post.inc.sh
1   -## don't activate some services
2   -#rm -f $MOUNTDIR/etc/rcsysinit.d/{S35hdparm,S30loadmodules,S40swap}
3   -#rm -f $MOUNTDIR/etc/rc*.d/{S12random,S13sysinit,S20network,S44acpid,S55sshd}
4   -#rm -f $MOUNTDIR/etc/rc*.d/{K00splash,K01acpid,K90random,K96swap,K97network,K97udev,K98localnet}
5   -
6   -# change inittab so it opens tty root shells instead of asking for login
7   -#
8   -echo "Forcing \`inittab' to open tty root shells with no login..."
9   -sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty1,' $MOUNTDIR/etc/inittab
10   -sed -i 's,^\([2-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty\1,' $MOUNTDIR/etc/inittab
11   -sed -i '/^[4-6]:.*/d' $MOUNTDIR/etc/inittab
12   -
13   -# configure for runlevel 5 boot
14   -sed -i "s|id:3\(:initdefault.*\)|id:5\1|" $MOUNTDIR/etc/inittab
15   -
16 1 # configure KDM for autologin
17 2 #
18 3 if [ -e $MOUNTDIR/opt/kde/share/config/kdm/kdmrc ]; then
... ... @@ -34,8 +19,7 @@
34 19 es) timezone=Europe/Madrid ;;
35 20 *) timezone=UTC ;;
36 21 esac
37   -echo $timezone > $MOUNTDIR/etc/timezone
38   -cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
  22 +ln -s ../usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
39 23  
40 24 # configure favorites in kde menu
41 25 for f in /usr/share/applications/chromium-devel.desktop; do
platforms/virtualserver/post.inc.sh
... ... @@ -34,8 +34,7 @@
34 34 it) timezone=Europe/Rome ;;
35 35 *) timezone=UTC ;;
36 36 esac
37   -echo $timezone > $MOUNTDIR/etc/timezone
38   -cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
  37 +ln -s ../usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
39 38  
40 39 prelink
41 40