fixed module depency creation on non active kernel (core12)

removed directfb (not working with this kernel framebuffer modules)

diff --git a/config/rootfiles/core/12/files b/config/rootfiles/core/12/files
index c0e0d9d4687152e48a247b58c8403fc0b344966e..d42402efee3e92e9db13ebcf2e828da02f399f29 100644 (file)
--- a/config/rootfiles/core/12/files
+++ b/config/rootfiles/core/12/files
@@ -126,8 +126,6 @@ lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/compat_ioctl32.ko
 lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/videodev.ko
 lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/v4l1-compat.ko
 lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/v4l2-common.ko
-lib/modules/2.6.16.57-ipfire/misc/drivers/char/fusion/fusion.ko
-lib/modules/2.6.16.57-ipfire-smp/misc/drivers/char/fusion/fusion.ko
 etc/udev/dvb.sh
 etc/udev/rules.d/10-dvb.rules
 srv/web/ipfire/cgi-bin/services.cgi

diff --git a/config/rootfiles/core/12/update.sh b/config/rootfiles/core/12/update.sh
index 3e4c5db7887485ca2fb39b0e52c5ddb0688b3aa8..be912fcf0546addc7945793d2fb691288e2593c3 100644 (file)
--- a/config/rootfiles/core/12/update.sh
+++ b/config/rootfiles/core/12/update.sh
@@ -3,4 +3,6 @@
 /usr/local/bin/backupctrl exclude >/dev/null 2>&1
 extract_files
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
-depmod -a
+depmod -a 2.6.16.57-ipfire
+depmod -a 2.6.16.57-ipfire-smp
+

diff --git a/config/rootfiles/packages/dfb++ b/config/rootfiles/packages/dfb++
deleted file mode 100644 (file)
index 04a323d..0000000
--- a/config/rootfiles/packages/dfb++
+++ /dev/null
@@ -1,22 +0,0 @@
-usr/bin/dfb++-config
-usr/bin/dfbshow
-usr/bin/dfbswitch
-#usr/include/dfb++
-#usr/include/dfb++/dfb++.h
-#usr/include/dfb++/idirectfb.h
-#usr/include/dfb++/idirectfbdatabuffer.h
-#usr/include/dfb++/idirectfbdisplaylayer.h
-#usr/include/dfb++/idirectfbeventbuffer.h
-#usr/include/dfb++/idirectfbfont.h
-#usr/include/dfb++/idirectfbimageprovider.h
-#usr/include/dfb++/idirectfbinputdevice.h
-#usr/include/dfb++/idirectfbpalette.h
-#usr/include/dfb++/idirectfbscreen.h
-#usr/include/dfb++/idirectfbsurface.h
-#usr/include/dfb++/idirectfbvideoprovider.h
-#usr/include/dfb++/idirectfbwindow.h
-usr/lib/libdfb++-1.0.so.0
-usr/lib/libdfb++-1.0.so.0.0.0
-#usr/lib/libdfb++.la
-usr/lib/libdfb++.so
-#usr/lib/pkgconfig/dfb++.pc

diff --git a/config/rootfiles/packages/directfb b/config/rootfiles/packages/directfb
deleted file mode 100644 (file)
index 56df1d4..0000000
--- a/config/rootfiles/packages/directfb
+++ /dev/null
@@ -1,243 +0,0 @@
-usr/bin/dfbdump
-usr/bin/dfbfx
-usr/bin/dfbg
-usr/bin/dfbinfo
-usr/bin/dfbinput
-usr/bin/dfblayer
-usr/bin/dfbpenmount
-usr/bin/dfbscreen
-usr/bin/directfb-config
-usr/bin/directfb-csource
-usr/bin/mkdfiff
-usr/bin/mkdgiff
-#usr/include/directfb
-#usr/include/directfb-internal
-#usr/include/directfb-internal/core
-#usr/include/directfb-internal/core/clipboard.h
-#usr/include/directfb-internal/core/colorhash.h
-#usr/include/directfb-internal/core/core.h
-#usr/include/directfb-internal/core/core_parts.h
-#usr/include/directfb-internal/core/core_system.h
-#usr/include/directfb-internal/core/coredefs.h
-#usr/include/directfb-internal/core/coretypes.h
-#usr/include/directfb-internal/core/fonts.h
-#usr/include/directfb-internal/core/gfxcard.h
-#usr/include/directfb-internal/core/graphics_driver.h
-#usr/include/directfb-internal/core/input.h
-#usr/include/directfb-internal/core/input_driver.h
-#usr/include/directfb-internal/core/layer_context.h
-#usr/include/directfb-internal/core/layer_control.h
-#usr/include/directfb-internal/core/layer_region.h
-#usr/include/directfb-internal/core/layers.h
-#usr/include/directfb-internal/core/layers_internal.h
-#usr/include/directfb-internal/core/palette.h
-#usr/include/directfb-internal/core/screen.h
-#usr/include/directfb-internal/core/screens.h
-#usr/include/directfb-internal/core/screens_internal.h
-#usr/include/directfb-internal/core/state.h
-#usr/include/directfb-internal/core/surface.h
-#usr/include/directfb-internal/core/surface_buffer.h
-#usr/include/directfb-internal/core/surface_pool.h
-#usr/include/directfb-internal/core/system.h
-#usr/include/directfb-internal/core/windows.h
-#usr/include/directfb-internal/core/windows_internal.h
-#usr/include/directfb-internal/core/windowstack.h
-#usr/include/directfb-internal/core/wm.h
-#usr/include/directfb-internal/core/wm_module.h
-#usr/include/directfb-internal/devmem
-#usr/include/directfb-internal/devmem/devmem.h
-#usr/include/directfb-internal/devmem/surfacemanager.h
-#usr/include/directfb-internal/display
-#usr/include/directfb-internal/display/idirectfbdisplaylayer.h
-#usr/include/directfb-internal/display/idirectfbpalette.h
-#usr/include/directfb-internal/display/idirectfbscreen.h
-#usr/include/directfb-internal/display/idirectfbsurface.h
-#usr/include/directfb-internal/display/idirectfbsurface_layer.h
-#usr/include/directfb-internal/display/idirectfbsurface_window.h
-#usr/include/directfb-internal/fbdev
-#usr/include/directfb-internal/fbdev/agp.h
-#usr/include/directfb-internal/fbdev/fb.h
-#usr/include/directfb-internal/fbdev/fbdev.h
-#usr/include/directfb-internal/fbdev/surfacemanager.h
-#usr/include/directfb-internal/fbdev/vt.h
-#usr/include/directfb-internal/gfx
-#usr/include/directfb-internal/gfx/clip.h
-#usr/include/directfb-internal/gfx/convert.h
-#usr/include/directfb-internal/gfx/generic
-#usr/include/directfb-internal/gfx/generic/generic.h
-#usr/include/directfb-internal/gfx/util.h
-#usr/include/directfb-internal/idirectfb.h
-#usr/include/directfb-internal/input
-#usr/include/directfb-internal/input/idirectfbinputbuffer.h
-#usr/include/directfb-internal/input/idirectfbinputdevice.h
-#usr/include/directfb-internal/media
-#usr/include/directfb-internal/media/idirectfbdatabuffer.h
-#usr/include/directfb-internal/media/idirectfbfont.h
-#usr/include/directfb-internal/media/idirectfbimageprovider.h
-#usr/include/directfb-internal/media/idirectfbvideoprovider.h
-#usr/include/directfb-internal/misc
-#usr/include/directfb-internal/misc/conf.h
-#usr/include/directfb-internal/misc/gfx_util.h
-#usr/include/directfb-internal/misc/util.h
-#usr/include/directfb-internal/windows
-#usr/include/directfb-internal/windows/idirectfbwindow.h
-#usr/include/directfb/dfb_types.h
-#usr/include/directfb/dfiff.h
-#usr/include/directfb/dgiff.h
-#usr/include/directfb/direct
-#usr/include/directfb/direct/build.h
-#usr/include/directfb/direct/clock.h
-#usr/include/directfb/direct/conf.h
-#usr/include/directfb/direct/debug.h
-#usr/include/directfb/direct/direct.h
-#usr/include/directfb/direct/hash.h
-#usr/include/directfb/direct/interface.h
-#usr/include/directfb/direct/interface_implementation.h
-#usr/include/directfb/direct/list.h
-#usr/include/directfb/direct/log.h
-#usr/include/directfb/direct/mem.h
-#usr/include/directfb/direct/memcpy.h
-#usr/include/directfb/direct/messages.h
-#usr/include/directfb/direct/modules.h
-#usr/include/directfb/direct/serial.h
-#usr/include/directfb/direct/signals.h
-#usr/include/directfb/direct/stream.h
-#usr/include/directfb/direct/system.h
-#usr/include/directfb/direct/thread.h
-#usr/include/directfb/direct/trace.h
-#usr/include/directfb/direct/tree.h
-#usr/include/directfb/direct/types.h
-#usr/include/directfb/direct/utf8.h
-#usr/include/directfb/direct/util.h
-#usr/include/directfb/directfb.h
-#usr/include/directfb/directfb_keyboard.h
-#usr/include/directfb/directfb_keynames.h
-#usr/include/directfb/directfb_strings.h
-#usr/include/directfb/directfb_util.h
-#usr/include/directfb/directfb_version.h
-#usr/include/directfb/directfbgl.h
-#usr/include/directfb/fusion
-#usr/include/directfb/fusion/arena.h
-#usr/include/directfb/fusion/build.h
-#usr/include/directfb/fusion/call.h
-#usr/include/directfb/fusion/conf.h
-#usr/include/directfb/fusion/fusion.h
-#usr/include/directfb/fusion/fusion_internal.h
-#usr/include/directfb/fusion/hash.h
-#usr/include/directfb/fusion/lock.h
-#usr/include/directfb/fusion/object.h
-#usr/include/directfb/fusion/property.h
-#usr/include/directfb/fusion/protocol.h
-#usr/include/directfb/fusion/reactor.h
-#usr/include/directfb/fusion/ref.h
-#usr/include/directfb/fusion/shm
-#usr/include/directfb/fusion/shm/pool.h
-#usr/include/directfb/fusion/shm/shm.h
-#usr/include/directfb/fusion/shm/shm_internal.h
-#usr/include/directfb/fusion/shmalloc.h
-#usr/include/directfb/fusion/types.h
-#usr/include/directfb/fusion/vector.h
-#usr/lib/directfb-1.1-0
-#usr/lib/directfb-1.1-0/gfxdrivers
-#usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_ati128.la
-usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_ati128.so
-#usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_cle266.la
-usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_cle266.so
-#usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_cyber5k.la
-usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_cyber5k.so
-#usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_i810.la
-usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_i810.so
-#usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_i830.la
-usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_i830.so
-#usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_mach64.la
-usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_mach64.so
-#usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_neomagic.la
-usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_neomagic.so
-#usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_nsc.la
-usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_nsc.so
-#usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_nvidia.la
-usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_nvidia.so
-#usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_radeon.la
-usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_radeon.so
-#usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_savage.la
-usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_savage.so
-#usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_sh7722.la
-usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_sh7722.so
-#usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_sis315.la
-usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_sis315.so
-#usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_tdfx.la
-usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_tdfx.so
-#usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_unichrome.la
-usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_unichrome.so
-#usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_vmware.la
-usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_vmware.so
-#usr/lib/directfb-1.1-0/inputdrivers
-#usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_joystick.la
-usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_joystick.so
-#usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_keyboard.la
-usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_keyboard.so
-#usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_linux_input.la
-usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_linux_input.so
-#usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_lirc.la
-usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_lirc.so
-#usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_mutouch.la
-usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_mutouch.so
-#usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_penmount.la
-usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_penmount.so
-#usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_ps2mouse.la
-usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_ps2mouse.so
-#usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_serialmouse.la
-usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_serialmouse.so
-#usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_sonypi.la
-usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_sonypi.so
-#usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_wm97xx_ts.la
-usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_wm97xx_ts.so
-#usr/lib/directfb-1.1-0/interfaces
-#usr/lib/directfb-1.1-0/interfaces/IDirectFBFont
-#usr/lib/directfb-1.1-0/interfaces/IDirectFBFont/libidirectfbfont_default.la
-usr/lib/directfb-1.1-0/interfaces/IDirectFBFont/libidirectfbfont_default.so
-#usr/lib/directfb-1.1-0/interfaces/IDirectFBFont/libidirectfbfont_ft2.la
-usr/lib/directfb-1.1-0/interfaces/IDirectFBFont/libidirectfbfont_ft2.so
-#usr/lib/directfb-1.1-0/interfaces/IDirectFBImageProvider
-#usr/lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.la
-usr/lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so
-#usr/lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.la
-usr/lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so
-#usr/lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.la
-usr/lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.so
-#usr/lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.la
-usr/lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.so
-#usr/lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.la
-usr/lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so
-#usr/lib/directfb-1.1-0/interfaces/IDirectFBVideoProvider
-#usr/lib/directfb-1.1-0/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.la
-usr/lib/directfb-1.1-0/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so
-#usr/lib/directfb-1.1-0/systems
-#usr/lib/directfb-1.1-0/systems/libdirectfb_devmem.la
-usr/lib/directfb-1.1-0/systems/libdirectfb_devmem.so
-#usr/lib/directfb-1.1-0/systems/libdirectfb_fbdev.la
-usr/lib/directfb-1.1-0/systems/libdirectfb_fbdev.so
-#usr/lib/directfb-1.1-0/wm
-#usr/lib/directfb-1.1-0/wm/libdirectfbwm_default.la
-usr/lib/directfb-1.1-0/wm/libdirectfbwm_default.so
-usr/lib/libdirect-1.1.so.0
-usr/lib/libdirect-1.1.so.0.1.0
-#usr/lib/libdirect.la
-usr/lib/libdirect.so
-usr/lib/libdirectfb-1.1.so.0
-usr/lib/libdirectfb-1.1.so.0.1.0
-#usr/lib/libdirectfb.la
-usr/lib/libdirectfb.so
-usr/lib/libfusion-1.1.so.0
-usr/lib/libfusion-1.1.so.0.1.0
-#usr/lib/libfusion.la
-usr/lib/libfusion.so
-#usr/lib/pkgconfig/direct.pc
-#usr/lib/pkgconfig/directfb-internal.pc
-#usr/lib/pkgconfig/directfb.pc
-#usr/lib/pkgconfig/fusion.pc
-#usr/share/directfb-1.1.1
-usr/share/directfb-1.1.1/cursor.dat
-#usr/share/man/man1/dfbg.1
-#usr/share/man/man1/directfb-csource.1
-#usr/share/man/man5/directfbrc.5

diff --git a/config/rootfiles/packages/vdr-softdevice b/config/rootfiles/packages/vdr-softdevice
index de66a778ddfcb9f7af79dee7d2432968eceb51d2..3b6270da306bc34552789f043f5d596b8b0960fa 100644 (file)
--- a/config/rootfiles/packages/vdr-softdevice
+++ b/config/rootfiles/packages/vdr-softdevice
@@ -1,5 +1,4 @@
 opt/vdr/bin/runvdr-soft
-opt/vdr/PLUGINS/lib/libsoftdevice-dfb.so.1.6.0
 opt/vdr/PLUGINS/lib/libsoftdevice-fb.so.1.6.0
 opt/vdr/PLUGINS/lib/libsoftdevice-shm.so.1.6.0
 opt/vdr/PLUGINS/lib/libvdr-softdevice.so.1.6.0

diff --git a/config/rootfiles/packages/videolan b/config/rootfiles/packages/videolan
index 7c7d4372cc40bad662ffd626f50a4ee6a6ef6352..7c570d314193d4845f75feb10512ed75bea31313 100644 (file)
--- a/config/rootfiles/packages/videolan
+++ b/config/rootfiles/packages/videolan
@@ -220,7 +220,6 @@ usr/lib/vlc/video_filter/libtime_plugin.so
 usr/lib/vlc/video_filter/libtransform_plugin.so
 usr/lib/vlc/video_filter/libwall_plugin.so
 #usr/lib/vlc/video_output
-usr/lib/vlc/video_output/libdirectfb_plugin.so
 usr/lib/vlc/video_output/libfb_plugin.so
 usr/lib/vlc/video_output/libimage_plugin.so
 usr/lib/vlc/video_output/libvout_sdl_plugin.so

diff --git a/lfs/addonsvc b/lfs/addonsvc
deleted file mode 100644 (file)
index cb52bc6..0000000
--- a/lfs/addonsvc
+++ /dev/null
@@ -1,58 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = ipfire
-
-THISAPP    = addonsvc-$(VER)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = addonsvc
-PAK_VER    = 1
-
-DEPS       = ""
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-install : $(TARGET)
-
-check : 
-
-download :
-
-md5 : 
-
-dist: 
-       @$(PAK)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-       @$(PREBUILD)
-       @$(POSTBUILD)

diff --git a/lfs/dfb++ b/lfs/dfb++
deleted file mode 100644 (file)
index 56c01d1..0000000
--- a/lfs/dfb++
+++ /dev/null
@@ -1,86 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 1.0.0
-
-THISAPP    = DFB++-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = dfb++
-PAK_VER    = 1
-
-DEPS       = "directfb"
-
-
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = c7d0b98bcc648a25ff11bfc74635f4ca
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-dist: 
-       @$(PAK)
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-       @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-       @$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-       @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr 
-       cd $(DIR_APP) && make $(MAKETUNING)
-       cd $(DIR_APP) && make install
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)

diff --git a/lfs/directfb b/lfs/directfb
deleted file mode 100644 (file)
index bb803e5..0000000
--- a/lfs/directfb
+++ /dev/null
@@ -1,90 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 1.1.1
-
-THISAPP    = DirectFB-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = directfb
-PAK_VER    = 1
-
-DEPS       = ""
-
-
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = c75255049ca8d5c69afe4db58f603028
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-dist: 
-       @$(PAK)
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-       @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-       @$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-       @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && sed -i "s/checkfor_matrox=yes/checkfor_matrox=no/g" configure
-       cd $(DIR_APP) && sed -i "s/checkfor_cle266=no/checkfor_cle266=yes/g" configure
-       cd $(DIR_APP) && ./configure --prefix=/usr --disable-x11 \
-                                    --enable-video4linux2 --enable-multi 
-       cd $(DIR_APP) && make $(MAKETUNING)
-       cd $(DIR_APP) && make install
-       ln -s $(THISAPP) /usr/src/directfb
-#      @rm -rf $(DIR_APP)
-       @$(POSTBUILD)

diff --git a/lfs/vdr-softdevice b/lfs/vdr-softdevice
index d00242dfb0bfa978a80644ff944990dbef391524..a457ddca6859a1035dfd34e3d6a5a442308005a7 100644 (file)
--- a/lfs/vdr-softdevice
+++ b/lfs/vdr-softdevice
@@ -31,7 +31,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 PROG       = vdr-softdevice
 PAK_VER    = 1
 
-DEPS       = "directfb dfb++ ffmpeg alsa"
+DEPS       = "ffmpeg alsa"
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/videolan b/lfs/videolan
index 6c1c937ac2fb4de0914007c63a05f36d9d4db355..e693e4d4a42e92377839e158165f96efe2892499 100644 (file)
--- a/lfs/videolan
+++ b/lfs/videolan
@@ -88,8 +88,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                                                                --enable-mad \
                                                                --enable-libdvbpsi --enable-faac --enable-mkv  \
                                                                --enable-x264 --enable-release \
-                                                               --disable-nls \
-                                                               --enable-directfb --with-directfb=/usr/src/directfb
+                                                               --disable-nls
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/make.sh b/make.sh
index 7a178837491b8d05926993d4c9c0265d232a0bfc..13002c6a1df98be7dbedcf94ce76098e1019b8e8 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -341,7 +341,6 @@ buildipfire() {
   ipfiremake dm9601                    SMP=1
   ipfiremake kqemu                     SMP=1
   ipfiremake sane              KMOD=1  SMP=1
-  ipfiremake linux-fusion              SMP=1
   ipfiremake linux
   ipfiremake ipp2p
   ipfiremake zaptel
@@ -352,7 +351,6 @@ buildipfire() {
   ipfiremake dm9601
   ipfiremake kqemu
   ipfiremake sane              KMOD=1
-  ipfiremake linux-fusion
   ipfiremake madwifi
   ipfiremake pkg-config
   ipfiremake linux-atm
@@ -556,8 +554,6 @@ buildipfire() {
   ipfiremake teamspeak
   ipfiremake elinks
   ipfiremake igmpproxy
-  ipfiremake directfb
-  ipfiremake dfb++
   ipfiremake sdl
   ipfiremake qemu
   ipfiremake sane