From 8c34c0071e3622cb843892b591b0ca2bfdbe5818 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Sun, 19 Aug 2012 14:04:16 +0200
Subject: [PATCH] Remove reiser4 (no longer supported by kernel patch these
 days) livecd-gnome: add vlc, gimp and gconf-editor

---
 platforms/bootusb/post.inc.sh        | 2 +-
 platforms/livecd-gnome-root/Makefile | 2 +-
 platforms/livecd/post.inc.sh         | 2 +-
 platforms/livedvd/post.inc.sh        | 2 +-
 platforms/sdk-root/Makefile          | 2 +-
 platforms/sdk-root/post.inc.sh       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/platforms/bootusb/post.inc.sh b/platforms/bootusb/post.inc.sh
index de06574..5c692b5 100644
--- a/platforms/bootusb/post.inc.sh
+++ b/platforms/bootusb/post.inc.sh
@@ -2,7 +2,7 @@
 for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
    chroot $MOUNTDIR depmod -a ${KERNEL_MAJVER}${K}
    LANG=${LANGUAGE}_${COUNTRY} chroot $MOUNTDIR dracut \
-      --filesystems "ext3 ext4 unionfs squashfs isofs reiserfs reiser4" \
+      --filesystems "ext3 ext4 unionfs squashfs isofs reiserfs" \
       --nomdadmconf --nolvmconf \
       /boot/initramfs-${KERNEL_MAJVER}${K}.img.gz \
       ${KERNEL_MAJVER}${K}
diff --git a/platforms/livecd-gnome-root/Makefile b/platforms/livecd-gnome-root/Makefile
index 75d9641..9a6f587 100644
--- a/platforms/livecd-gnome-root/Makefile
+++ b/platforms/livecd-gnome-root/Makefile
@@ -11,7 +11,7 @@ $(MAKEDIST_TARGET)-livecd-gnome: \
              gdm gnome-session gnome-common gnome-control-center gnome-desktop gnome-desktop-sharp \
              gnome-keyring gnome-menus gnome-mime-data gnome-packagekit gnome-panel gnome-settings-daemon \
              gnome-sharp gnome-terminal nautilus gnome-themes evolution gnome-utils gnome-system-log \
-             desktop-base-gnome
+             desktop-base-gnome gimp vlc gconf-editor
 
 #kitchensync4 kontact4 kmail4 akregator4 kdeplasma-addons amarok
 $(MAKEDIST_TARGET)-livecd-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress
diff --git a/platforms/livecd/post.inc.sh b/platforms/livecd/post.inc.sh
index a1d749f..ee88ffe 100644
--- a/platforms/livecd/post.inc.sh
+++ b/platforms/livecd/post.inc.sh
@@ -11,7 +11,7 @@ ISOID=
 for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
    chroot $MOUNTDIR depmod -a ${KERNEL_MAJVER}${K}
    LANG=${LANGUAGE}_${COUNTRY} chroot $MOUNTDIR dracut \
-      --filesystems "ext3 ext4 unionfs squashfs isofs reiserfs reiser4" \
+      --filesystems "ext3 ext4 unionfs squashfs isofs reiserfs" \
       --nomdadmconf --nolvmconf \
       /boot/initramfs-${KERNEL_MAJVER}${K}.img.gz \
       ${KERNEL_MAJVER}${K}
diff --git a/platforms/livedvd/post.inc.sh b/platforms/livedvd/post.inc.sh
index a1d749f..ee88ffe 100644
--- a/platforms/livedvd/post.inc.sh
+++ b/platforms/livedvd/post.inc.sh
@@ -11,7 +11,7 @@ ISOID=
 for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
    chroot $MOUNTDIR depmod -a ${KERNEL_MAJVER}${K}
    LANG=${LANGUAGE}_${COUNTRY} chroot $MOUNTDIR dracut \
-      --filesystems "ext3 ext4 unionfs squashfs isofs reiserfs reiser4" \
+      --filesystems "ext3 ext4 unionfs squashfs isofs reiserfs" \
       --nomdadmconf --nolvmconf \
       /boot/initramfs-${KERNEL_MAJVER}${K}.img.gz \
       ${KERNEL_MAJVER}${K}
diff --git a/platforms/sdk-root/Makefile b/platforms/sdk-root/Makefile
index 21c31be..a34c5d8 100644
--- a/platforms/sdk-root/Makefile
+++ b/platforms/sdk-root/Makefile
@@ -8,7 +8,7 @@ $(MAKEDIST_TARGET)-sdk-root: openssh-server usbutils wireless_tools parted \
             NetworkManager ModemManager net-tools mc \
             timezone wireless_tools openmamba-release openssh-clients \
             man iptables iputils xinetd less mtd-utils bluez \
-            reiserfsprogs reiser4progs ppp usbutils ftp telnet eject \
+            reiserfsprogs ppp usbutils ftp telnet eject \
             tcpdump pcmcia-utils xdg-utils iproute syslog-ng \
             rpm autospec autodist nfs-utils patch sudo smart \
             pkgconfig diffutils autoconf automake libtool gettext xorg-server \
diff --git a/platforms/sdk-root/post.inc.sh b/platforms/sdk-root/post.inc.sh
index 777d93c..c870d66 100644
--- a/platforms/sdk-root/post.inc.sh
+++ b/platforms/sdk-root/post.inc.sh
@@ -88,7 +88,7 @@ if [ ! "$KERNEL_IGNORE" ]; then
 
    # create universal initramfs
    LANG=${LANGUAGE}_${COUNTRY} chroot $MOUNTDIR dracut \
-      --filesystems "ext3 ext4 reiserfs reiser4" \
+      --filesystems "ext3 ext4 reiserfs" \
       --nomdadmconf --nolvmconf \
       /boot/initramfs-${KERNEL_MAJVER}${KERNEL_EXTRAVER}.img.gz \
       ${KERNEL_MAJVER}${KERNEL_EXTRAVER}