From 2ab59a9587dd207b46688875d9d52019d4596597 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Mon, 17 Nov 2003 13:45:51 +0000 Subject: remove /lib/i686 and use non-i686 libraries --- move/data/always.dirs | 1 - move/data/always.list | 7 ++++++- move/data/boot.dirs | 1 - move/data/boot.list | 1 - move/data/totem.list | 1 - 5 files changed, 6 insertions(+), 5 deletions(-) (limited to 'move/data') diff --git a/move/data/always.dirs b/move/data/always.dirs index 6413106c5..e69de29bb 100644 --- a/move/data/always.dirs +++ b/move/data/always.dirs @@ -1 +0,0 @@ -/lib/i686 diff --git a/move/data/always.list b/move/data/always.list index 6b205617e..53c8ecbb3 100644 --- a/move/data/always.list +++ b/move/data/always.list @@ -3,7 +3,12 @@ /tmp/live_tree/bin/umount /tmp/live_tree/etc/ld.so.cache /tmp/live_tree/etc/nsswitch.conf -/tmp/live_tree/lib/i686 +/tmp/live_tree/lib/libc-2.3.2.so +/tmp/live_tree/lib/libc.so.6 +/tmp/live_tree/lib/libm-2.3.2.so +/tmp/live_tree/lib/libpthread-0.10.so +/tmp/live_tree/lib/librt-2.3.2.so +/tmp/live_tree/lib/libthread_db-1.0.so /tmp/live_tree/lib/ld-2.3.2.so /tmp/live_tree/lib/ld-linux.so.2 /tmp/live_tree/lib/libdl-2.3.2.so diff --git a/move/data/boot.dirs b/move/data/boot.dirs index a8dbbfe57..df381c82e 100644 --- a/move/data/boot.dirs +++ b/move/data/boot.dirs @@ -2,7 +2,6 @@ /etc/X11/xserver /etc/gtk-2.0 /etc/pango -/lib/i686 /lib/modutils /usr/X11R6/lib/X11/locale/C /usr/X11R6/lib/modules/drivers/linux diff --git a/move/data/boot.list b/move/data/boot.list index 7463bba33..c1b7d3cb2 100644 --- a/move/data/boot.list +++ b/move/data/boot.list @@ -80,7 +80,6 @@ /tmp/live_tree/etc/shells /tmp/live_tree/etc/sudoers /tmp/live_tree/etc/syslog.conf -/tmp/live_tree/lib/i686 /tmp/live_tree/lib/ld-2.3.2.so /tmp/live_tree/lib/libcom_err.so.2.1 /tmp/live_tree/lib/libcrypt-2.3.2.so diff --git a/move/data/totem.list b/move/data/totem.list index 2b7b745a9..9d5f66e2c 100644 --- a/move/data/totem.list +++ b/move/data/totem.list @@ -1,5 +1,4 @@ /tmp/live_tree/bin/sleep -/tmp/live_tree/lib/i686 /tmp/live_tree/usr/X11R6/lib/libXi.so.6.0 /tmp/live_tree/usr/X11R6/lib/libXrandr.so.2.0 /tmp/live_tree/usr/X11R6/lib/libXtst.so.6.1 -- cgit v1.2.1