From e8381e28eed31fea322d583edba506cf40ee8a18 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Thu, 31 May 2012 12:37:04 +0200
Subject: [PATCH] Add openssh-server to platform missing it

---
 makedist.inc.sh                   | 8 ++++++++
 platforms/livecd-root/Makefile    | 2 +-
 platforms/livecd-root/post.inc.sh | 2 +-
 platforms/livedvd-root/Makefile   | 2 +-
 platforms/sdk-root/Makefile       | 2 +-
 settings.inc                      | 1 +
 6 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/makedist.inc.sh b/makedist.inc.sh
index 233b048..b8c63fd 100644
--- a/makedist.inc.sh
+++ b/makedist.inc.sh
@@ -164,4 +164,12 @@ rm -rf $MOUNTDIR/tmp/kde-root
 [ "$LANGUAGE" -a -e $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE ] &&
    cp -a --no-preserve=ownership $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE/* $MOUNTDIR/
 
+# enable additional smart repositories
+if [ "$SMART_CHANNELS_ENABLE" != "" ]; then
+   for r in $SMART_CHANNELS_ENABLE; do
+      chroot $MOUNTDIR smart channel --enable $r
+   done
+   echo "$SMART_CHANNELS_ENABLE" > $MOUNTDIR/etc/smart/openmamba-install-enabled-channels
+fi
+
 produce_media
diff --git a/platforms/livecd-root/Makefile b/platforms/livecd-root/Makefile
index 4d783da..3173d47 100644
--- a/platforms/livecd-root/Makefile
+++ b/platforms/livecd-root/Makefile
@@ -6,7 +6,7 @@ $(MAKEDIST_TARGET)-livecd-kde4: kppp4 krfb4 ark4 kcalc4 kdf4 kfloppy4 kgpg4 desk
 $(MAKEDIST_TARGET)-livecd-libreoffice: libreoffice-Calc libreoffice-writer libreofice-impress
 
 $(MAKEDIST_TARGET)-livecd-root: \
-                  postplug-xorg postplug-sound \
+                  postplug-xorg postplug-sound openssh-server \
                   $(MAKEDIST_TARGET)-commontools msysklogd xorg-server \
                   xorg-fonts-100dpi xorg-fonts-Type1 xorg-fonts-TTF \
                   xorg-drv-input-synaptics xorg-apps-extra xterm \
diff --git a/platforms/livecd-root/post.inc.sh b/platforms/livecd-root/post.inc.sh
index 1d9a608..a4f9515 100644
--- a/platforms/livecd-root/post.inc.sh
+++ b/platforms/livecd-root/post.inc.sh
@@ -44,7 +44,7 @@ cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
 
 # configure favorites in kde menu
 for f in /usr/share/applications/chromium-devel.desktop /opt/kde/share/applications/kaffeine.desktop; do
-   chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f
+   chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f || exit 1
 done
 
 for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
diff --git a/platforms/livedvd-root/Makefile b/platforms/livedvd-root/Makefile
index 5fd254a..b4fc52d 100644
--- a/platforms/livedvd-root/Makefile
+++ b/platforms/livedvd-root/Makefile
@@ -7,7 +7,7 @@ $(MAKEDIST_TARGET)-livedvd-kde4: kppp4 krfb4 ark4 kcalc4 kdf4 kfloppy4 kgpg4 des
 $(MAKEDIST_TARGET)-livedvd-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress
 
 $(MAKEDIST_TARGET)-livedvd-root: \
-                  postplug-xorg postplug-sound \
+                  postplug-xorg postplug-sound openssh-server \
                   $(MAKEDIST_TARGET)-commontools msysklogd xorg-server \
                   xorg-fonts-100dpi xorg-fonts-Type1 xorg-fonts-TTF \
                   xorg-drv-input-synaptics xorg-apps-extra xterm \
diff --git a/platforms/sdk-root/Makefile b/platforms/sdk-root/Makefile
index 0bf66ac..21c31be 100644
--- a/platforms/sdk-root/Makefile
+++ b/platforms/sdk-root/Makefile
@@ -12,7 +12,7 @@ $(MAKEDIST_TARGET)-sdk-root: openssh-server usbutils wireless_tools parted \
             tcpdump pcmcia-utils xdg-utils iproute syslog-ng \
             rpm autospec autodist nfs-utils patch sudo smart \
             pkgconfig diffutils autoconf automake libtool gettext xorg-server \
-            tightvnc-server lxde midori $(MAKEDIST_TARGET)-devel
+            tightvnc-server lxde midori $(MAKEDIST_TARGET)-devel icecc
 $(MAKEDIST_TARGET)-sdk-root-missing: wpa_supplicant dosfstools cups vim postplug ipw2100-firmware ipw2200-firmware zd1211-firmware \
             rt2501-firmware rt2870-firmware b43-tools r5u87x-firmware mdadm \
             ndiswrapper slmodem unionfs_utils nfs-utils mbr
diff --git a/settings.inc b/settings.inc
index 278345e..aee695e 100644
--- a/settings.inc
+++ b/settings.inc
@@ -1,6 +1,7 @@
 RELEASE=milestone2
 MAKEFILE_TARGET=${MAKEDIST_TARGET}
 KERNEL_ADDITIONAL="sound-backport vboxvideo"
+SMART_ENABLE_CHANNELS="milestone2-kde4 milestone2-kernel"
 
 #COMPRESSEDFSSIZE=400000
 #COMPRESSEDFSBLOCKSIZE=1k