Sync with changes in openmamba (devel) target

Makefile

@@ -16,7 +16,7 @@ $(MAKEDIST_TARGET)-commontools: sysvinit util-linux module-init-tools \
     wireless_tools wpa_supplicant openmamba-release refit-tools openssh-clients \
     dosfstools man mbr iptables cups vim iputils sudo postplug xinetd less \
     reiserfsprogs reiser4progs ppp b43-tools mdadm usb-modeswitch \
-    ndiswrapper slmodem usbutils ftp telnet eject bluez \
+    ndiswrapper slmodem usbutils ftp telnet eject bluez lsof \
     tcpdump pcmcia-utils xdg-utils unionfs_utils iproute $(MAKEDIST_TARGET)-firmwares \
     $(MAKEDIST_TARGET)-devel
 $(MAKEDIST_TARGET)-debug: strace valgrind gdb minicom openssh-server dhcpclient rpm iputils \

Makefile.defs

@@ -99,6 +99,7 @@ libkorganizer_calendar.so.1 = korganizer
 libkorganizer_eventviewer.so.1 = korganizer
 libsmb4kdialogs.so = smb4k4
 
+perl[B] = perl
 perl[bytes] = perl
 perl[Automake__General] = automake
 perl[Automake__Struct] = automake
@@ -127,13 +128,20 @@ perl[Automake__XFile] = automake
 
 libgs.so.9 = ghostscript
 
+# ffmpeg / libav
+libpostproc.so.51 = libpostproc-ffmpeg
+libpostproc.so.51[LIBPOSTPROC_51] = libpostproc-ffmpeg
+ffmpegpresets := ffmpeg-presets
+
 # libreoffice
 libreofficei18n = libreoffice-i18n-$(LANGUAGE)
 
 # vpn
 networkmanagervpnplugin = NetworkManager-vpnc NetworkManager-pptp
+knetworkmanagervpnplugin = plasma-applet-networkmanagement-vpnc plasma-applet-networkmanagement-pptp
 
 packagekitgui = kpackagekit
+firewallgui = kcm_ufw
 
 ifdef PLATFORM
 include $(TARGETSDIR)/$(TARGET)/platforms/$(PLATFORM)/Makefile.defs

platforms/livecd-gnome-root/Makefile.defs

@@ -1 +1,2 @@
 packagekitgui = gnome-packagekit
+firewallgui = gui-ufw

platforms/livecd-gnome-root/post.inc.sh

@@ -45,18 +45,12 @@ esac
 echo $timezone > $MOUNTDIR/etc/timezone
 cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
 
-# prebuild postplug sound CARDID_DB (with some ugly trick to make it work from chroot)
+for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
-[ -e $MOUNTDIR/lib/modules/`uname -r` ] || ln -s ${KERNEL_MAJVER}${KERNEL_EXTRAVER} $MOUNTDIR/lib/modules/`uname -r`
+   # remove unused initramfs generated by kernel
-echo "SOUND_BUILD_CARDID_DB_ONLY=1 /etc/postplug/postplug.d/sound" >> $MOUNTDIR/tmp/sounddb.sh
+   rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${K}.img*
-chroot $MOUNTDIR sh /tmp/sounddb.sh
+   # remove failsafe image to save space for livecd
-rm -f $MOUNTDIR/tmp/sounddb.sh
+   rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}-failsafe.img*
-[ -L $MOUNTDIR/lib/modules/`uname -r` ] && rm $MOUNTDIR/lib/modules/`uname -r`
+done
-
-# remove unused initramfs generated by kernel
-rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img*
-
-# remove failsafe image to save space for livecd
-rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}-failsafe.img*
 
 # install all GConf rules
 cat > $MOUNTDIR/tmp/gconftool.sh << _EOF

platforms/livecd-light-root/Makefile.defs

@@ -1 +1,2 @@
 packagekitgui = gnome-packagekit
+firewallgui = gui-ufw

platforms/livecd-light-root/post.inc.sh

@@ -34,18 +34,12 @@ esac
 echo $timezone > $MOUNTDIR/etc/timezone
 cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
 
-# prebuild postplug sound CARDID_DB (with some ugly trick to make it work from chroot)
+for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
-[ -e $MOUNTDIR/lib/modules/`uname -r` ] || ln -s ${KERNEL_MAJVER}${KERNEL_EXTRAVER} $MOUNTDIR/lib/modules/`uname -r`
+   # remove unused initramfs generated by kernel
-echo "SOUND_BUILD_CARDID_DB_ONLY=1 /etc/postplug/postplug.d/sound" >> $MOUNTDIR/tmp/sounddb.sh
+   rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${K}.img*
-chroot $MOUNTDIR sh /tmp/sounddb.sh
+   # remove failsafe image to save space for livecd
-rm -f $MOUNTDIR/tmp/sounddb.sh
+   rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}-failsafe.img*
-[ -L $MOUNTDIR/lib/modules/`uname -r` ] && rm $MOUNTDIR/lib/modules/`uname -r`
+done
-
-# remove unused initramfs generated by kernel
-rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img*
-
-# remove failsafe image to save space for livecd
-rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}-failsafe.img*
 
 # remove some documentation to save space on CD
 for f in ChangeLog Changelog CHANGES TODO NEWS README README.txt; do

platforms/livecd-root/post.inc.sh

@@ -46,18 +46,12 @@ for f in /usr/share/applications/chromium-devel.desktop /opt/kde/share/applicati
    chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f
 done
 
-# prebuild postplug sound CARDID_DB (with some ugly trick to make it work from chroot)
+for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
-[ -e $MOUNTDIR/lib/modules/`uname -r` ] || ln -s ${KERNEL_MAJVER}${KERNEL_EXTRAVER} $MOUNTDIR/lib/modules/`uname -r`
+   # remove unused initramfs generated by kernel
-echo "SOUND_BUILD_CARDID_DB_ONLY=1 /etc/postplug/postplug.d/sound" >> $MOUNTDIR/tmp/sounddb.sh
+   rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${K}.img*
-chroot $MOUNTDIR sh /tmp/sounddb.sh
+   # remove failsafe image to save space for livecd
-rm -f $MOUNTDIR/tmp/sounddb.sh
+   rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}-failsafe.img*
-[ -L $MOUNTDIR/lib/modules/`uname -r` ] && rm $MOUNTDIR/lib/modules/`uname -r`
+done
-
-# remove unused initramfs generated by kernel
-rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img*
-
-# remove failsafe image to save space for livecd
-rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}-failsafe.img*
 
 # remove some documentation to save space on CD
 for f in ChangeLog Changelog CHANGES TODO NEWS README README.txt; do

platforms/livedvd-root/post.inc.sh

@@ -47,16 +47,11 @@ for f in /usr/share/applications/chromium-devel.desktop \
    chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f
 done
 
-# prebuild postplug sound CARDID_DB (with some ugly trick to make it work from chroot)
 for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
-   [ -e $MOUNTDIR/lib/modules/`uname -r` ] || ln -s ${KERNEL_MAJVER}${K} $MOUNTDIR/lib/modules/`uname -r`
-   echo "SOUND_BUILD_CARDID_DB_ONLY=1 /etc/postplug/postplug.d/sound" >> $MOUNTDIR/tmp/sounddb.sh
-   chroot $MOUNTDIR sh /tmp/sounddb.sh
-   rm -f $MOUNTDIR/tmp/sounddb.sh
-   [ -L $MOUNTDIR/lib/modules/`uname -r` ] && rm $MOUNTDIR/lib/modules/`uname -r`
-
    # remove unused initramfs generated by kernel
    rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${K}.img*
+#   # remove failsafe image to save space for livecd
+#   rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}-failsafe.img*
 done
 
 prelink

platforms/sdk-root/Makefile

@@ -19,6 +19,6 @@ $(MAKEDIST_TARGET)-sdk-root-missing: wpa_supplicant dosfstools cups vim postplug
 $(MAKEDIST_TARGET)-sdk-root-en:
 $(MAKEDIST_TARGET)-sdk-root-it:
 $(MAKEDIST_TARGET)-sdk-root-es:
-$(MAKEDIST_TARGET)-sdk-root-i586: grub2
+$(MAKEDIST_TARGET)-sdk-root-i586: grub
 $(MAKEDIST_TARGET)-sdk-root-arm:
 $(MAKEDIST_TARGET)-sdk-root-ppc: yaboot