From ad6560f2999593053d3aae8bf2f25562c8bcb3a7 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Mon, 2 Jul 2012 15:11:39 +0200
Subject: [PATCH] Drop reiser4 support (patch is missing since kernel 3.2)

---
 Makefile                            | 2 +-
 platforms/bootcd/post.inc.sh        | 2 +-
 platforms/bootusb-test/post.inc.sh  | 2 +-
 platforms/bootusb/post.inc.sh       | 2 +-
 platforms/flash-1GB/post.inc.sh     | 2 +-
 platforms/flash-512MB/post.inc.sh   | 2 +-
 platforms/flash-server/post.inc.sh  | 2 +-
 platforms/installdvd/post.inc.sh    | 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 +-
 platforms/testcd/post.inc.sh        | 2 +-
 platforms/virtualserver/post.inc.sh | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 7699928..f2a0c9b 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ $(MAKEDIST_TARGET)-commontools: sysvinit util-linux module-init-tools \
     net-tools prelink mc dhcpclient timezone nfs-utils \
     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 \
+    reiserfsprogs ppp b43-tools mdadm usb-modeswitch \
     ndiswrapper slmodem usbutils ftp telnet eject bluez lsof \
     tcpdump pcmcia-utils xdg-utils unionfs_utils iproute $(MAKEDIST_TARGET)-firmwares \
     $(MAKEDIST_TARGET)-devel
diff --git a/platforms/bootcd/post.inc.sh b/platforms/bootcd/post.inc.sh
index 5b6ddc8..6c1df01 100644
--- a/platforms/bootcd/post.inc.sh
+++ b/platforms/bootcd/post.inc.sh
@@ -10,7 +10,7 @@ chroot $MOUNTDIR depmod -a ${KERNEL_MAJVER}${KERNEL_EXTRAVER}
 # make initramfs
 
 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}${KERNEL_EXTRAVER}.img.gz \
    ${KERNEL_MAJVER}${KERNEL_EXTRAVER}
diff --git a/platforms/bootusb-test/post.inc.sh b/platforms/bootusb-test/post.inc.sh
index 3f462ae..b502943 100644
--- a/platforms/bootusb-test/post.inc.sh
+++ b/platforms/bootusb-test/post.inc.sh
@@ -3,7 +3,7 @@
 chroot $MOUNTDIR depmod -a ${KERNEL_MAJVER}${KERNEL_EXTRAVER}
 
 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}${KERNEL_EXTRAVER}.img.gz \
    ${KERNEL_MAJVER}${KERNEL_EXTRAVER}
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/flash-1GB/post.inc.sh b/platforms/flash-1GB/post.inc.sh
index 0fef475..8098ce7 100644
--- a/platforms/flash-1GB/post.inc.sh
+++ b/platforms/flash-1GB/post.inc.sh
@@ -14,7 +14,7 @@ sed -i '/^[4-6]:.*/d' $MOUNTDIR/etc/inittab
 chroot $MOUNTDIR depmod -a
 
 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}${KERNEL_EXTRAVER}.img.gz \
    ${KERNEL_MAJVER}${KERNEL_EXTRAVER}
diff --git a/platforms/flash-512MB/post.inc.sh b/platforms/flash-512MB/post.inc.sh
index 466ba6c..50b083e 100644
--- a/platforms/flash-512MB/post.inc.sh
+++ b/platforms/flash-512MB/post.inc.sh
@@ -13,7 +13,7 @@ sed -i '/^[4-6]:.*/d' $MOUNTDIR/etc/inittab
 # make initramfs
 
 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}${KERNEL_EXTRAVER}.img.gz \
    ${KERNEL_MAJVER}${KERNEL_EXTRAVER}
diff --git a/platforms/flash-server/post.inc.sh b/platforms/flash-server/post.inc.sh
index dea0fd2..00096c0 100644
--- a/platforms/flash-server/post.inc.sh
+++ b/platforms/flash-server/post.inc.sh
@@ -6,7 +6,7 @@
 # make initramfs
 
 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}${KERNEL_EXTRAVER}.img.gz \
    ${KERNEL_MAJVER}${KERNEL_EXTRAVER}
diff --git a/platforms/installdvd/post.inc.sh b/platforms/installdvd/post.inc.sh
index ac1594c..9cf0e56 100644
--- a/platforms/installdvd/post.inc.sh
+++ b/platforms/installdvd/post.inc.sh
@@ -10,7 +10,7 @@
 chroot $MOUNTDIR depmod -a ${KERNEL_MAJVER}${KERNEL_EXTRAVER}
 
 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}${KERNEL_EXTRAVER}.img.gz \
    ${KERNEL_MAJVER}${KERNEL_EXTRAVER}
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}
diff --git a/platforms/testcd/post.inc.sh b/platforms/testcd/post.inc.sh
index a1d749f..ee88ffe 100644
--- a/platforms/testcd/post.inc.sh
+++ b/platforms/testcd/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/virtualserver/post.inc.sh b/platforms/virtualserver/post.inc.sh
index b50e507..2177e05 100644
--- a/platforms/virtualserver/post.inc.sh
+++ b/platforms/virtualserver/post.inc.sh
@@ -6,7 +6,7 @@
 # make initramfs
 
 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}${KERNEL_EXTRAVER}.img.gz \
    ${KERNEL_MAJVER}${KERNEL_EXTRAVER}