Merge branch 'arm-port' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x into...

diff --git a/config/rootfiles/core/53/filelists/gcc b/config/rootfiles/core/53/filelists/gcc
deleted file mode 120000 (symlink)
index 8538cc4..0000000
--- a/config/rootfiles/core/53/filelists/gcc
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/gcc
\ No newline at end of file

diff --git a/config/rootfiles/core/53/filelists/glibc b/config/rootfiles/core/53/filelists/glibc
deleted file mode 120000 (symlink)
index fbb4a52..0000000
--- a/config/rootfiles/core/53/filelists/glibc
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/glibc
\ No newline at end of file

diff --git a/config/rootfiles/core/53/filelists/compat-wireless b/config/rootfiles/core/53/filelists/i586/compat-wireless
similarity index 100%
rename from config/rootfiles/core/53/filelists/compat-wireless
rename to config/rootfiles/core/53/filelists/i586/compat-wireless

diff --git a/config/rootfiles/core/53/filelists/i586/gcc b/config/rootfiles/core/53/filelists/i586/gcc
new file mode 120000 (symlink)
index 0000000..ba328e3
--- /dev/null
+++ b/config/rootfiles/core/53/filelists/i586/gcc
@@ -0,0 +1 @@
+../../../../common/i586/gcc
\ No newline at end of file

diff --git a/config/rootfiles/core/53/filelists/i586/glibc b/config/rootfiles/core/53/filelists/i586/glibc
new file mode 120000 (symlink)
index 0000000..943021f
--- /dev/null
+++ b/config/rootfiles/core/53/filelists/i586/glibc
@@ -0,0 +1 @@
+../../../../common/i586/glibc
\ No newline at end of file

diff --git a/config/rootfiles/packages/armv5tel/directfb b/config/rootfiles/packages/armv5tel/directfb
new file mode 100644 (file)
index 0000000..574ba93
--- /dev/null
+++ b/config/rootfiles/packages/armv5tel/directfb
@@ -0,0 +1,241 @@
+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_cyber5k.la
+usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_cyber5k.so
+#usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_davinci.la
+usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_davinci.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_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_sdlgraphics.la
+usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_sdlgraphics.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_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_sdlinput.la
+usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_sdlinput.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_ucb1x00_ts.la
+usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_ucb1x00_ts.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/systems/libdirectfb_sdl.la
+usr/lib/directfb-1.1-0/systems/libdirectfb_sdl.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/cyrus-imapd b/config/rootfiles/packages/cyrus-imapd
index 26a00fc25af3d523d17a67622ee3111fe6b4df70..0c0485e4ef685cb8eea4c2ba9f27cc76b6dfe196 100644 (file)
--- a/config/rootfiles/packages/cyrus-imapd
+++ b/config/rootfiles/packages/cyrus-imapd
@@ -73,24 +73,24 @@ usr/lib/cyrus/timsieved
 usr/lib/cyrus/tls_prune
 #usr/lib/libcyrus.a
 #usr/lib/libcyrus_min.a
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Cyrus
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Cyrus/IMAP
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Cyrus/IMAP.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Cyrus/IMAP/Admin.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Cyrus/IMAP/IMSP.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Cyrus/IMAP/Shell.pm
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Cyrus/SIEVE
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Cyrus/SIEVE/managesieve.pm
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Cyrus
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Cyrus/IMAP
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Cyrus/IMAP/.packlist
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Cyrus/IMAP/IMAP.bs
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Cyrus/IMAP/IMAP.so
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Cyrus/SIEVE
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Cyrus/SIEVE/managesieve
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Cyrus/SIEVE/managesieve/.packlist
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Cyrus/SIEVE/managesieve/managesieve.bs
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Cyrus/SIEVE/managesieve/managesieve.so
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Cyrus
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Cyrus/IMAP
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Cyrus/IMAP.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Cyrus/IMAP/Admin.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Cyrus/IMAP/IMSP.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Cyrus/IMAP/Shell.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Cyrus/SIEVE
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Cyrus/SIEVE/managesieve.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Cyrus
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Cyrus/IMAP
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Cyrus/IMAP/.packlist
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Cyrus/IMAP/IMAP.bs
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Cyrus/IMAP/IMAP.so
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Cyrus/SIEVE
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Cyrus/SIEVE/managesieve
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Cyrus/SIEVE/managesieve/.packlist
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Cyrus/SIEVE/managesieve/managesieve.bs
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Cyrus/SIEVE/managesieve/managesieve.so
 #usr/man/man1/imtest.1
 #usr/man/man1/installsieve.1
 #usr/man/man1/lmtptest.1

diff --git a/config/rootfiles/packages/foomatic b/config/rootfiles/packages/foomatic
index deab0ec732ffd509b4611ea0192f0c3b1e6a9ecd..589c9e33dc172cc4948fcd254e961015d3898548 100644 (file)
--- a/config/rootfiles/packages/foomatic
+++ b/config/rootfiles/packages/foomatic
@@ -21,8 +21,8 @@ usr/lib/perl5/site_perl/5.12.3/Foomatic/DB.pm
 usr/lib/perl5/site_perl/5.12.3/Foomatic/Defaults.pm
 usr/lib/perl5/site_perl/5.12.3/Foomatic/PPD.pm
 usr/lib/perl5/site_perl/5.12.3/Foomatic/UIElem.pm
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Foomatic
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Foomatic/.packlist
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Foomatic
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Foomatic/.packlist
 #usr/lib/ppr
 #usr/lib/ppr/interfaces
 usr/lib/ppr/interfaces/foomatic-rip

diff --git a/config/rootfiles/packages/git b/config/rootfiles/packages/git
index a7987363041876e0a3aafe233119056af0d8f614..f17851da9e82194a557565bbc8cb208185120bec 100644 (file)
--- a/config/rootfiles/packages/git
+++ b/config/rootfiles/packages/git
@@ -7,8 +7,8 @@ usr/bin/git-upload-pack
 #usr/bin/gitk
 usr/lib/perl5/site_perl/5.12.3/Error.pm
 usr/lib/perl5/site_perl/5.12.3/Git.pm
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Git
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Git/.packlist
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Git
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Git/.packlist
 usr/libexec/git-core
 usr/libexec/git-core/git-add
 usr/libexec/git-core/git-add--interactive

diff --git a/config/rootfiles/packages/directfb b/config/rootfiles/packages/i586/directfb
similarity index 100%
rename from config/rootfiles/packages/directfb
rename to config/rootfiles/packages/i586/directfb

diff --git a/config/rootfiles/packages/linux-pae b/config/rootfiles/packages/i586/linux-pae
similarity index 100%
rename from config/rootfiles/packages/linux-pae
rename to config/rootfiles/packages/i586/linux-pae

diff --git a/config/rootfiles/packages/linux-xen b/config/rootfiles/packages/i586/linux-xen
similarity index 100%
rename from config/rootfiles/packages/linux-xen
rename to config/rootfiles/packages/i586/linux-xen

diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder
index 322b3c39ce55b5fb473254bc61d8ec1005d0f0a5..0577ade3954160f6045b4f7b6bc4495a6b8d3d60 100644 (file)
--- a/config/rootfiles/packages/ipfireseeder
+++ b/config/rootfiles/packages/ipfireseeder
@@ -1,5 +1,5 @@
 etc/rc.d/init.d/ipfireseeder
 #var/ipfire/seeder
-var/ipfire/seeder/ipfire-2.9.i586-full-core51.iso.torrent
+var/ipfire/seeder/ipfire-2.9.MACHINE-full-core51.iso.torrent
 #var/log/seeder
 var/log/seeder/info

diff --git a/config/rootfiles/packages/netsnmpd b/config/rootfiles/packages/netsnmpd
index e0858b9300172c63d0b952b86a267d09850de2f7..30dbf93bce894309f53d25b9cda0182f5cbb56a6 100644 (file)
--- a/config/rootfiles/packages/netsnmpd
+++ b/config/rootfiles/packages/netsnmpd
@@ -208,51 +208,51 @@ usr/lib/libnetsnmpmibs.so.15.1.2
 usr/lib/libnetsnmptrapd.so
 usr/lib/libnetsnmptrapd.so.15
 usr/lib/libnetsnmptrapd.so.15.1.2
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Bundle
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Bundle/Makefile.subs.pl
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/NetSNMP
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/NetSNMP/ASN.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/NetSNMP/OID.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/NetSNMP/TrapReceiver.pm
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/NetSNMP/agent
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/NetSNMP/agent.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/NetSNMP/agent/Support.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/NetSNMP/agent/default_store.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/NetSNMP/agent/netsnmp_request_infoPtr.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/NetSNMP/default_store.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/SNMP.pm
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Bundle
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Bundle/NetSNMP
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Bundle/NetSNMP/.packlist
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/ASN
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/ASN/ASN.bs
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/ASN/ASN.so
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/ASN/autosplit.ix
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/OID
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/OID/OID.bs
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/OID/OID.so
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/OID/autosplit.ix
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/TrapReceiver
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/TrapReceiver/TrapReceiver.bs
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/TrapReceiver/TrapReceiver.so
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/TrapReceiver/autosplit.ix
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/agent
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/agent/agent.bs
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/agent/agent.so
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/agent/autosplit.ix
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/agent/default_store
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/agent/default_store/autosplit.ix
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/agent/default_store/default_store.bs
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/agent/default_store/default_store.so
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/default_store
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/default_store/autosplit.ix
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/default_store/default_store.bs
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/default_store/default_store.so
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/SNMP
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/SNMP/SNMP.bs
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/SNMP/SNMP.so
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/SNMP/autosplit.ix
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Bundle
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Bundle/Makefile.subs.pl
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/NetSNMP
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/NetSNMP/ASN.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/NetSNMP/OID.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/NetSNMP/TrapReceiver.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/NetSNMP/agent
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/NetSNMP/agent.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/NetSNMP/agent/Support.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/NetSNMP/agent/default_store.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/NetSNMP/agent/netsnmp_request_infoPtr.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/NetSNMP/default_store.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/SNMP.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Bundle
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Bundle/NetSNMP
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Bundle/NetSNMP/.packlist
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/ASN
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/ASN/ASN.bs
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/ASN/ASN.so
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/ASN/autosplit.ix
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/OID
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/OID/OID.bs
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/OID/OID.so
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/OID/autosplit.ix
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/TrapReceiver
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/TrapReceiver/TrapReceiver.bs
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/TrapReceiver/TrapReceiver.so
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/TrapReceiver/autosplit.ix
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/agent
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/agent/agent.bs
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/agent/agent.so
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/agent/autosplit.ix
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/agent/default_store
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/agent/default_store/autosplit.ix
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/agent/default_store/default_store.bs
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/agent/default_store/default_store.so
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/default_store
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/default_store/autosplit.ix
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/default_store/default_store.bs
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/default_store/default_store.so
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/SNMP
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/SNMP/SNMP.bs
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/SNMP/SNMP.so
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/SNMP/autosplit.ix
 #usr/man/man1/encode_keychange.1
 #usr/man/man1/fixproc.1
 #usr/man/man1/mib2c-update.1

diff --git a/config/rootfiles/packages/perl-DBD-mysql b/config/rootfiles/packages/perl-DBD-mysql
index 98d789ddb90b33d06717c198f75a8f4e0295bfac..177b3ee8506609cbf04c84ded7f78fad6de42863 100644 (file)
--- a/config/rootfiles/packages/perl-DBD-mysql
+++ b/config/rootfiles/packages/perl-DBD-mysql
@@ -1,14 +1,14 @@
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Bundle/DBD
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Bundle/DBD/mysql.pm
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBD/mysql
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBD/mysql.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBD/mysql/GetInfo.pm
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBD/mysql/INSTALL.pod
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/DBD
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/DBD/mysql
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/DBD/mysql/.packlist
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/DBD/mysql/mysql.bs
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/DBD/mysql/mysql.so
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Bundle/DBD
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Bundle/DBD/mysql.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/mysql
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/mysql.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/mysql/GetInfo.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/mysql/INSTALL.pod
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBD
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBD/mysql
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBD/mysql/.packlist
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBD/mysql/mysql.bs
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBD/mysql/mysql.so
 #usr/share/man/man3/Bundle::DBD::mysql.3
 #usr/share/man/man3/DBD::mysql.3
 #usr/share/man/man3/DBD::mysql::INSTALL.3

diff --git a/config/rootfiles/packages/perl-DBI b/config/rootfiles/packages/perl-DBI
index b923fc1bab8195d23f82e95947a48a70861f077b..188fa18abb19e2c63b5f7774e1dbd8e1e63a5656 100644 (file)
--- a/config/rootfiles/packages/perl-DBI
+++ b/config/rootfiles/packages/perl-DBI
@@ -1,83 +1,83 @@
 usr/bin/dbilogstrip
 usr/bin/dbiprof
 usr/bin/dbiproxy
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Bundle/DBI.pm
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBD
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBD/DBM.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBD/ExampleP.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBD/File.pm
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBD/Gofer
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBD/Gofer.pm
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBD/Gofer/Policy
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBD/Gofer/Policy/Base.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBD/Gofer/Policy/classic.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBD/Gofer/Policy/pedantic.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBD/Gofer/Policy/rush.pm
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBD/Gofer/Transport
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBD/Gofer/Transport/Base.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBD/Gofer/Transport/null.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBD/Gofer/Transport/pipeone.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBD/Gofer/Transport/stream.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBD/NullP.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBD/Proxy.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBD/Sponge.pm
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI/Changes.pm
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI/Const
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI/Const/GetInfo
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI/Const/GetInfo/ANSI.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI/Const/GetInfo/ODBC.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI/Const/GetInfoReturn.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI/Const/GetInfoType.pm
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI/DBD
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI/DBD.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI/DBD/Metadata.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI/FAQ.pm
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI/Gofer
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI/Gofer/Execute.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI/Gofer/Request.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI/Gofer/Response.pm
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI/Gofer/Serializer
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI/Gofer/Serializer/Base.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI/Gofer/Serializer/DataDumper.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI/Gofer/Serializer/Storable.pm
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI/Gofer/Transport
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI/Gofer/Transport/Base.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI/Gofer/Transport/pipeone.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI/Gofer/Transport/stream.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI/Profile.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI/ProfileData.pm
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI/ProfileDumper
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI/ProfileDumper.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI/ProfileDumper/Apache.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI/ProfileSubs.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI/ProxyServer.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI/PurePerl.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI/Roadmap.pm
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI/SQL
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI/SQL/Nano.pm
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI/Util
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI/Util/CacheMemory.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI/Util/_accessor.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/DBI/W32ODBC.pm
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Roadmap.pod
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/TASKS.pod
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Win32
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Win32/DBIODBC.pm
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/DBI
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/DBI/.packlist
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/DBI/DBI.bs
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/DBI/DBI.so
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/DBI/DBIXS.h
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/DBI/Driver.xst
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/DBI/Driver_xst.h
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/DBI/dbd_xsh.h
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/DBI/dbi_sql.h
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/DBI/dbipport.h
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/DBI/dbivport.h
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/DBI/dbixs_rev.h
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/dbixs_rev.pl
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Bundle/DBI.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/DBM.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/ExampleP.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/File.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/Gofer
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/Gofer.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/Gofer/Policy
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/Gofer/Policy/Base.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/Gofer/Policy/classic.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/Gofer/Policy/pedantic.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/Gofer/Policy/rush.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/Gofer/Transport
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/Gofer/Transport/Base.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/Gofer/Transport/null.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/Gofer/Transport/pipeone.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/Gofer/Transport/stream.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/NullP.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/Proxy.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/Sponge.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/Changes.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/Const
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/Const/GetInfo
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/Const/GetInfo/ANSI.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/Const/GetInfo/ODBC.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/Const/GetInfoReturn.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/Const/GetInfoType.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/DBD
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/DBD.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/DBD/Metadata.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/FAQ.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/Gofer
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/Gofer/Execute.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/Gofer/Request.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/Gofer/Response.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/Gofer/Serializer
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/Gofer/Serializer/Base.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/Gofer/Serializer/DataDumper.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/Gofer/Serializer/Storable.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/Gofer/Transport
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/Gofer/Transport/Base.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/Gofer/Transport/pipeone.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/Gofer/Transport/stream.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/Profile.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/ProfileData.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/ProfileDumper
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/ProfileDumper.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/ProfileDumper/Apache.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/ProfileSubs.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/ProxyServer.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/PurePerl.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/Roadmap.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/SQL
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/SQL/Nano.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/Util
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/Util/CacheMemory.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/Util/_accessor.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/W32ODBC.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Roadmap.pod
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/TASKS.pod
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Win32
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Win32/DBIODBC.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBI
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBI/.packlist
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBI/DBI.bs
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBI/DBI.so
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBI/DBIXS.h
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBI/Driver.xst
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBI/Driver_xst.h
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBI/dbd_xsh.h
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBI/dbi_sql.h
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBI/dbipport.h
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBI/dbivport.h
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBI/dbixs_rev.h
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/dbixs_rev.pl
 #usr/share/man/man1/dbilogstrip.1
 #usr/share/man/man1/dbiprof.1
 #usr/share/man/man1/dbiproxy.1

diff --git a/config/rootfiles/packages/perl-gettext b/config/rootfiles/packages/perl-gettext
index cc88563d4d0c8df6b8d57b7a712cfc73d7d7d592..e4b563220f0e81a2c7baf99a6f2959536c72c9b1 100644 (file)
--- a/config/rootfiles/packages/perl-gettext
+++ b/config/rootfiles/packages/perl-gettext
@@ -1,8 +1,8 @@
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Locale
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Locale/gettext.pm
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Locale
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Locale/gettext
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Locale/gettext/.packlist
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Locale/gettext/gettext.bs
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Locale/gettext/gettext.so
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Locale
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Locale/gettext.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Locale
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Locale/gettext
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Locale/gettext/.packlist
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Locale/gettext/gettext.bs
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Locale/gettext/gettext.so
 #usr/share/man/man3/Locale::gettext.3

diff --git a/config/rootfiles/packages/spamassassin b/config/rootfiles/packages/spamassassin
index b0c472f857f4defc6c91ed5a40cc3b3e73caf4d1..b6b36b945b30e8b4e4ed656fe7fd01c74e6c7f78 100644 (file)
--- a/config/rootfiles/packages/spamassassin
+++ b/config/rootfiles/packages/spamassassin
@@ -90,8 +90,8 @@ usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin.pm
 #usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Util/DependencyInfo.pm
 #usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Util/Progress.pm
 #usr/lib/perl5/site_perl/5.12.3/Mail/SpamAssassin/Util/RegistrarBoundaries.pm
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Mail/SpamAssassin
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Mail/SpamAssassin/.packlist
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Mail/SpamAssassin
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Mail/SpamAssassin/.packlist
 #usr/lib/perl5/site_perl/5.12.3/spamassassin-run.pod
 #usr/share/man/man1/sa-learn.1
 #usr/share/man/man1/sa-update.1

diff --git a/lfs/Config b/lfs/Config
index db4891b21a29965724c51aed31f0acb44d8d1127..b91f2ee63d06705c06d2c1fe13e4a243f93f007a 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -185,7 +185,12 @@ define PAK
                cp -f /usr/src/src/paks/default/{,un}install.sh /usr/src/src/paks/default/update.sh \
                /install/packages/package; \
        fi
-       cp -v /usr/src/config/rootfiles/packages/$(PROG) /install/packages/package/ROOTFILES
+       for i in $(DIR_SRC)/config/rootfiles/packages/{$(MACHINE),}/$(PROG); do \
+               if [ -e "$${i}" ]; then \
+                       cp -v $${i} /install/packages/package/ROOTFILES; \
+                       break; \
+               fi; \
+       done
        sed -e 's/BUILDTARGET/$(BUILDTARGET)/g' -e 's/KVER/$(KVER)/g' -e 's/MACHINE/$(MACHINE)/g' -i /install/packages/package/ROOTFILES
        sed -e 's/xxxKVERxxx/$(KVER)/g' -i /install/packages/package/install.sh
        chmod 755 /install/packages/package/{{,un}install,update}.sh

diff --git a/lfs/ccache b/lfs/ccache
index 6ae52330ac29e7ecc496a5f7d261dfc5c847247b..b7cad8697d143be739ed38ecf1d66c33559ba517 100644 (file)
--- a/lfs/ccache
+++ b/lfs/ccache
@@ -77,6 +77,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        ln -sf ccache $(ROOT)/usr/local/bin/gcc
        ln -sf ccache $(ROOT)/usr/local/bin/g++
        ln -sf ccache $(ROOT)/usr/local/bin/cc
+       ln -sf ccache $(ROOT)/usr/local/bin/$(BUILDTARGET)-gcc
+       ln -sf ccache $(ROOT)/usr/local/bin/$(BUILDTARGET)-g++
+       ln -sf ccache $(ROOT)/usr/local/bin/$(BUILDTARGET)-cc
        $(ROOT)/usr/local/bin/ccache -z
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/core-updates b/lfs/core-updates
index 0dd2ecccbc5a20a2e1c939fdacc011154a22eb56..c4cedcd66bc57e133775367c1ff65085903fc22d 100644 (file)
--- a/lfs/core-updates
+++ b/lfs/core-updates
@@ -49,13 +49,18 @@ CORE = $(patsubst $(DIR_SRC)/config/rootfiles/%,%,$(wildcard $(DIR_SRC)/config/r
 
 $(TARGET) : $(CORE)
 
+.PHONY:
 core/%:
        rm -rf /install/packages/package
        mkdir -p /install/packages/package
        eval $$(cat /usr/src/config/rootfiles/$@/meta)
 
-       #Generate ROOTFILES from filelists      
-       find $(DIR_SRC)/config/rootfiles/$@/filelists/* -maxdepth 1 | xargs cat >> /tmp/ROOTFILES.tmp
+       #Generate ROOTFILES from filelists
+       $(DIR_SRC)/src/scripts/archive.files \
+               $(DIR_SRC)/config/rootfiles/$@/filelists \
+               $(DIR_SRC)/config/rootfiles/$@/files \
+               $(DIR_SRC)/config/rootfiles/$@/files.$(MACHINE) \
+               > /tmp/ROOTFILES.tmp
 
        #remove excluded files from ROOTFILES
        grep -f $(DIR_SRC)/config/rootfiles/$@/exclude -v /tmp/ROOTFILES.tmp > /tmp/ROOTFILES

diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder
index 0fd2f3c9130fa3eccccf26c61e6625c7fd6eb8c1..8834bbcbfd12aa6e10905c291bf0cf2728fcbf24 100644 (file)
--- a/lfs/ipfireseeder
+++ b/lfs/ipfireseeder
@@ -32,6 +32,7 @@ DL_FILE    = ipfire-2.9.i586-full-core51.iso.torrent
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+SUP_ARCH   = i586
 PROG       = ipfireseeder
 PAK_VER    = 27
 

diff --git a/lfs/vdr_epgsearch b/lfs/vdr_epgsearch
index ead59a1524916bd404795892c1e801560ec0bfcb..6b6dff8243a9e734fc8579732b610e7fdd731338 100644 (file)
--- a/lfs/vdr_epgsearch
+++ b/lfs/vdr_epgsearch
@@ -28,6 +28,7 @@ VER        = plugin
 
 THISAPP    = vdr_epgsearch-$(VER)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
+SUP_ARCH   = i586
 PROG       = vdr_epgsearch
 PAK_VER    = 5
 

diff --git a/lfs/vdr_softdevice b/lfs/vdr_softdevice
index c836e2e6dd3a02a06cb82fa58639029f53247446..dc7f4c91699b2334396aa65fe75806abb9b4669b 100644 (file)
--- a/lfs/vdr_softdevice
+++ b/lfs/vdr_softdevice
@@ -28,6 +28,7 @@ VER        = plugin
 
 THISAPP    = vdr_softdevice-$(VER)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
+SUP_ARCH   = i586
 PROG       = vdr_softdevice
 PAK_VER    = 5
 

diff --git a/make.sh b/make.sh
index 7ecc812e785aabc2520f4b5b54ab1b6e891862c8..15ab38b72cfe76736ac72196cd7457c9ff34b4d5 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -413,7 +413,7 @@ buildipfire() {
   ipfiremake kqemu
   ipfiremake kvm-kmod
   ipfiremake madwifi
-  if [ "${MACHINE_TYPE}" = "arm" ]; then
+  if [ "${MACHINE_TYPE}" != "arm" ]; then
     #todo enable alsa driver in kernel config
     ipfiremake alsa                    KMOD=1
   fi
@@ -791,7 +791,7 @@ buildpackages() {
   ipfirepackages
 
   # Check if there is a loop device for building in virtual environments
-  if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]); then
+  if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]) && [ "${MACHINE_TYPE}" != "arm" ]; then
         cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/
         cp -f $BASEDIR/packages/meta-linux-xen $LFS/install/packages/
        ipfiremake xen-image
@@ -828,7 +828,10 @@ buildpackages() {
 
 ipfirepackages() {
        ipfiremake core-updates
-       for i in $(ls -1 $BASEDIR/config/rootfiles/packages); do
+
+       local i
+       for i in $(find $BASEDIR/config/rootfiles/packages{${machine},} -maxdepth 1 -type f); do
+               i=$(basename ${i})
                if [ -e $BASEDIR/lfs/$i ]; then
                        ipfiredist $i
                else

diff --git a/src/scripts/archive.files b/src/scripts/archive.files
index 8e276bac7f25e1f39782ef8310ea059c43dc0177..ca0ee51b6823c664e9c0a31571ac84177ce0ca80 100755 (executable)
--- a/src/scripts/archive.files
+++ b/src/scripts/archive.files
@@ -22,7 +22,17 @@
 FILELIST=
 
 for dir in $@; do
+       # Skip all objects that do not exist.
+       [ -e "${dir}" ] || continue
+
+       # Files go directly to the rootfile.
+       if [ -f "${dir}" ]; then
+               FILELIST="${FILELIST} ${dir}"
+               continue
+       fi
+
        for exclude in ${dir}/${MACHINE}/*; do
+               [ -f "${exclude}" ] || continue
                EXCLUDE="$EXCLUDE $exclude"
        done
 
@@ -41,5 +51,5 @@ for dir in $@; do
        done
 done
 
-cat ${FILELIST} | grep -v ^# | sort | uniq | \
+cat ${FILELIST} 2>/dev/null | grep -v ^# | sort | uniq | \
        sed -e "s/KVER/${KVER}/g" -e "s/MACHINE/${MACHINE}/g" -e "s/BUILDTARGET/${BUILDTARGET}/g"