Commit e8381e28eed31fea322d583edba506cf40ee8a18

Authored by Silvan Calarco
1 parent 24e04b642a
Exists in master

Add openssh-server to platform missing it

Showing 6 changed files with 13 additions and 4 deletions Side-by-side Diff

... ... @@ -164,5 +164,13 @@
164 164 [ "$LANGUAGE" -a -e $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE ] &&
165 165 cp -a --no-preserve=ownership $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE/* $MOUNTDIR/
166 166  
  167 +# enable additional smart repositories
  168 +if [ "$SMART_CHANNELS_ENABLE" != "" ]; then
  169 + for r in $SMART_CHANNELS_ENABLE; do
  170 + chroot $MOUNTDIR smart channel --enable $r
  171 + done
  172 + echo "$SMART_CHANNELS_ENABLE" > $MOUNTDIR/etc/smart/openmamba-install-enabled-channels
  173 +fi
  174 +
167 175 produce_media
platforms/livecd-root/Makefile
... ... @@ -6,7 +6,7 @@
6 6 $(MAKEDIST_TARGET)-livecd-libreoffice: libreoffice-Calc libreoffice-writer libreofice-impress
7 7  
8 8 $(MAKEDIST_TARGET)-livecd-root: \
9   - postplug-xorg postplug-sound \
  9 + postplug-xorg postplug-sound openssh-server \
10 10 $(MAKEDIST_TARGET)-commontools msysklogd xorg-server \
11 11 xorg-fonts-100dpi xorg-fonts-Type1 xorg-fonts-TTF \
12 12 xorg-drv-input-synaptics xorg-apps-extra xterm \
platforms/livecd-root/post.inc.sh
... ... @@ -44,7 +44,7 @@
44 44  
45 45 # configure favorites in kde menu
46 46 for f in /usr/share/applications/chromium-devel.desktop /opt/kde/share/applications/kaffeine.desktop; do
47   - chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f
  47 + chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f || exit 1
48 48 done
49 49  
50 50 for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
platforms/livedvd-root/Makefile
... ... @@ -7,7 +7,7 @@
7 7 $(MAKEDIST_TARGET)-livedvd-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress
8 8  
9 9 $(MAKEDIST_TARGET)-livedvd-root: \
10   - postplug-xorg postplug-sound \
  10 + postplug-xorg postplug-sound openssh-server \
11 11 $(MAKEDIST_TARGET)-commontools msysklogd xorg-server \
12 12 xorg-fonts-100dpi xorg-fonts-Type1 xorg-fonts-TTF \
13 13 xorg-drv-input-synaptics xorg-apps-extra xterm \
platforms/sdk-root/Makefile
... ... @@ -12,7 +12,7 @@
12 12 tcpdump pcmcia-utils xdg-utils iproute syslog-ng \
13 13 rpm autospec autodist nfs-utils patch sudo smart \
14 14 pkgconfig diffutils autoconf automake libtool gettext xorg-server \
15   - tightvnc-server lxde midori $(MAKEDIST_TARGET)-devel
  15 + tightvnc-server lxde midori $(MAKEDIST_TARGET)-devel icecc
16 16 $(MAKEDIST_TARGET)-sdk-root-missing: wpa_supplicant dosfstools cups vim postplug ipw2100-firmware ipw2200-firmware zd1211-firmware \
17 17 rt2501-firmware rt2870-firmware b43-tools r5u87x-firmware mdadm \
18 18 ndiswrapper slmodem unionfs_utils nfs-utils mbr
1 1 RELEASE=milestone2
2 2 MAKEFILE_TARGET=${MAKEDIST_TARGET}
3 3 KERNEL_ADDITIONAL="sound-backport vboxvideo"
  4 +SMART_ENABLE_CHANNELS="milestone2-kde4 milestone2-kernel"
4 5  
5 6 #COMPRESSEDFSSIZE=400000
6 7 #COMPRESSEDFSBLOCKSIZE=1k