Add iperf and fix the directfb.

diff --git a/root_image/Makefile b/root_image/Makefile
index f1274b5e555408935cc97f17754a027b59ba23cf..efc3840f3d24d136dd1ad4b6e9e426d47bcd1f57 100644 (file)
--- a/root_image/Makefile
+++ b/root_image/Makefile
@@ -612,6 +612,8 @@ netperf-install:
 
        $(INSTALL_PROG)   netperf/src/netperf     userspace/usr/bin/
        $(INSTALL_PROG)   netperf/src/netserver     userspace/usr/bin/
+       $(call RPM_TO_USERSPACE,./usr/bin/iperf,$(RPM_DIR)/iperf)
+       $(call RPM_TO_USERSPACE,*libstdc++*,$(RPM_DIR)/libstdc++)
 
 .PHONY:        pciutils-install
 pciutils-install:
@@ -674,13 +676,13 @@ endif
 directfb-install: userspace-prep
        $(call RPM_TO_USERSPACE,./usr$(LIBSDIR)/libjpeg.*so*,$(RPM_DIR)/jpeg)
        $(call RPM_TO_USERSPACE,./usr$(LIBSDIR)/libfreetype.*so*,$(RPM_DIR)/freetype)
-       GFX_DRIVERS="gl,i830,i810,matrox,nvidia,radeon"; \
-       INPUT_DRIVERS="keyboard,linuxinput,ps2mouse,serialmouse"; \
-       if ! [ -e directfb/config.h ]; then (cd directfb;./configure --prefix=/usr --disable-sysfs --disable-freetype --disable-osx --disable-x11 --with-gfxdrivers=$$GFX_DRIVERS --with-inputdrivers=$$INPUT_DRIVERS);fi
+       if ! [ -e directfb/config.h ]; then (cd directfb;./configure --prefix=/usr  --disable-sysfs  --disable-osx --disable-x11 --with-gfxdrivers="i830,matrox,nvidia,radeon" --with-inputdrivers="keyboard,linuxinput,ps2mouse,serialmouse" );fi
        $(MAKE) $(MFLAGS) -j$$(($(NCPUS) * 2)) -C directfb
        $(MAKE) $(MFLAGS) -j$$(($(NCPUS) * 2)) -C directfb/tests
        $(MAKE) $(MFLAGS) DESTDIR=$(CURDIR)/userspace -j$$(($(NCPUS) * 2)) -C directfb install
        $(MAKE) $(MFLAGS) DESTDIR=$(CURDIR)/userspace -j$$(($(NCPUS) * 2)) -C directfb/tests install
+
+       $(INSTALL_DATA) directfb/decker.ttf userspace/usr/share/dire*/
        # Don't need to worry about header files - they get pruned later, but must
        # take care of *.pc and *.la files.
        find userspace/usr/ -name '*lib*direct*.la' ! -type l | xargs rm -f