- Move xf86Wacom.so modules to {i386,ppc}-specific filelist

- Make filelists lib64 aware with LIB variable
- Add x86_64-specific filelist

6 files changed, 153 insertions, 35 deletions

diff --git a/perl-install/Makefile b/perl-install/Makefile
index fad7888e1..d09718f55 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -84,7 +84,7 @@ get_needed_files: $(DIRS) $(MOFILES)
 #	export PERL_INSTALL_TEST=1 ; strace -f -e trace=file -o '| grep -v "(No such file or directory)" | sed -e "s/[^\"]*\"//" -e "s/\".*//" | grep "^/" | grep -v -e "^/tmp" -e "^/home" -e "^/proc" -e "^/var" -e "^/dev" -e "^/etc" -e "^/usr/lib/rpm" > /tmp/list ' $(PERL) -d install2 < /dev/null
 	eval `perl -V:version`; \
 	cat share/list `../tools/specific_arch share/list` | \
-	perl -pe "s/ARCH/$(ARCH)/g" | perl -pe "s/PERL_VERSION/$$version/g" > /tmp/list
+	perl -pe "s/ARCH/$(ARCH)/g ; s/PERL_VERSION/$$version/g ; s|/LIB/|/$(LIB)/|g" > /tmp/list
 
 	@missing=`perl -lne 'print if !-e $$_' /tmp/list`; [ -z "$$missing" ] || { echo "missing files vvvvvvvvvvvvvvvvvvvvvvvvvv" ; echo "$$missing" ; echo "missing files ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" ; exit 1; }
 
diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config
index b575efcd6..c88797dc4 100644
--- a/perl-install/Makefile.config
+++ b/perl-install/Makefile.config
@@ -2,6 +2,12 @@
 ARCH := $(patsubst i%86,i386,$(shell uname -m))
 ARCH := $(patsubst sparc%,sparc,$(ARCH))
 
+ifeq (x86_64, $(ARCH))
+LIB = lib64
+else
+LIB	= lib
+endif
+
 VERSION     = 2.2.10-BOOT                                                                             
 SUDO        = sudo
 SO_FILES    = c/blib/arch/auto/c/c.so                                                                 
diff --git a/perl-install/share/list b/perl-install/share/list
index e40aa9248..ee74cc277 100644
--- a/perl-install/share/list
+++ b/perl-install/share/list
@@ -2,10 +2,10 @@
 /bin/consolechars
 /bin/cpio
 /bin/gzip
-/lib/libnss_nis.so.2
-/lib/libnss_files.so.2
-/lib/libnss_dns.so.2
-/lib/libresolv.so.2
+/LIB/libnss_nis.so.2
+/LIB/libnss_files.so.2
+/LIB/libnss_dns.so.2
+/LIB/libresolv.so.2
 /etc/protocols
 /etc/imrc
 /etc/im_palette.pal
@@ -20,39 +20,38 @@
 /sbin/resize2fs
 /sbin/dumpe2fs
 /sbin/modinfo
-/usr/X11R6/lib/modules/xf86Wacom.so
 /usr/bin/bzip2
 /usr/bin/fb2png
 /usr/bin/packdrake
 /usr/bin/parsehdlist
 /usr/bin/perl
-/usr/lib/gconv/BIG5.so
-/usr/lib/gconv/EUC-JP.so
-/usr/lib/gconv/libGB.so
-/usr/lib/gconv/libJIS.so
-/usr/lib/gconv/libKSC.so
-/usr/lib/gconv/EUC-KR.so
-/usr/lib/gconv/ISO8859-15.so
-/usr/lib/gconv/ISO8859-14.so
-/usr/lib/gconv/ISO8859-13.so
-/usr/lib/gconv/ISO8859-9E.so
-/usr/lib/gconv/ISO8859-9.so
-/usr/lib/gconv/ISO8859-7.so
-/usr/lib/gconv/ISO8859-5.so
-/usr/lib/gconv/ISO8859-3.so
-/usr/lib/gconv/ISO8859-2.so
-/usr/lib/gconv/ISO8859-1.so
-/usr/lib/gconv/KOI8-K.so
-/usr/lib/gconv/KOI8-U.so
-/usr/lib/gconv/KOI8-R.so
-/usr/lib/gconv/TIS-620.so
-/usr/lib/gconv/CP1251.so
-/usr/lib/gconv/GEORGIAN-PS.so
-/usr/lib/gconv/EUC-CN.so
-/usr/lib/gconv/gconv-modules
-/usr/lib/gtk/themes/engines/libpixmap.so
-/usr/lib/gtk/themes/engines/libpixmap.la
-/usr/lib/libimlib-png.so
+/usr/LIB/gconv/BIG5.so
+/usr/LIB/gconv/EUC-JP.so
+/usr/LIB/gconv/libGB.so
+/usr/LIB/gconv/libJIS.so
+/usr/LIB/gconv/libKSC.so
+/usr/LIB/gconv/EUC-KR.so
+/usr/LIB/gconv/ISO8859-15.so
+/usr/LIB/gconv/ISO8859-14.so
+/usr/LIB/gconv/ISO8859-13.so
+/usr/LIB/gconv/ISO8859-9E.so
+/usr/LIB/gconv/ISO8859-9.so
+/usr/LIB/gconv/ISO8859-7.so
+/usr/LIB/gconv/ISO8859-5.so
+/usr/LIB/gconv/ISO8859-3.so
+/usr/LIB/gconv/ISO8859-2.so
+/usr/LIB/gconv/ISO8859-1.so
+/usr/LIB/gconv/KOI8-K.so
+/usr/LIB/gconv/KOI8-U.so
+/usr/LIB/gconv/KOI8-R.so
+/usr/LIB/gconv/TIS-620.so
+/usr/LIB/gconv/CP1251.so
+/usr/LIB/gconv/GEORGIAN-PS.so
+/usr/LIB/gconv/EUC-CN.so
+/usr/LIB/gconv/gconv-modules
+/usr/LIB/gtk/themes/engines/libpixmap.so
+/usr/LIB/gtk/themes/engines/libpixmap.la
+/usr/LIB/libimlib-png.so
 /usr/lib/perl5/PERL_VERSION/AutoLoader.pm
 /usr/lib/perl5/PERL_VERSION/Carp.pm
 /usr/lib/perl5/PERL_VERSION/Carp/Heavy.pm
@@ -124,8 +123,8 @@
 /usr/lib/perl5/vendor_perl/PERL_VERSION/ARCH-linux/Gtk/Gdk/ImlibImage.pm
 /usr/lib/perl5/vendor_perl/PERL_VERSION/ARCH-linux/auto/Gtk/Gtk.so
 /usr/lib/perl5/vendor_perl/PERL_VERSION/ARCH-linux/auto/Gtk/Gdk/ImlibImage/ImlibImage.so
-/usr/lib/rpm/rpmrc
-/usr/lib/rpm/macros
+/usr/LIB/rpm/rpmrc
+/usr/LIB/rpm/macros
 /sbin/rescuept
 /usr/share/icons/amusement_section.png
 /usr/share/icons/arcade_section.png
diff --git a/perl-install/share/list.i386 b/perl-install/share/list.i386
index d7735f29c..189a1e9e9 100644
--- a/perl-install/share/list.i386
+++ b/perl-install/share/list.i386
@@ -9,3 +9,4 @@
 /usr/X11R6/bin/XF86_FBDev
 /usr/X11R6/bin/XF86_VGA16
 /usr/X11R6/bin/xmodmap
+/usr/X11R6/lib/modules/xf86Wacom.so
diff --git a/perl-install/share/list.ppc b/perl-install/share/list.ppc
index 332c97dc2..e992fbba3 100644
--- a/perl-install/share/list.ppc
+++ b/perl-install/share/list.ppc
@@ -12,4 +12,5 @@
 /usr/X11R6/bin/xmodmap
 /sbin/mkfs.xfs
 /sbin/mkfs.jfs
+/usr/X11R6/lib/modules/xf86Wacom.so
 
diff --git a/perl-install/share/list.x86_64 b/perl-install/share/list.x86_64
new file mode 100644
index 000000000..1a9851428
--- /dev/null
+++ b/perl-install/share/list.x86_64
@@ -0,0 +1,111 @@
+/usr/bin/strace
+/var/log/XFree86.0.log
+/usr/X11R6/bin/XFree86
+/usr/X11R6/bin/xmodmap
+/usr/X11R6/lib/modules/
+/usr/X11R6/lib/modules/codeconv
+/usr/X11R6/lib/modules/codeconv/libARABIC.a
+/usr/X11R6/lib/modules/codeconv/libARMSCII8.a
+/usr/X11R6/lib/modules/codeconv/libBIG5.a
+/usr/X11R6/lib/modules/codeconv/libDOSENCODING.a
+/usr/X11R6/lib/modules/codeconv/libGB2312.a
+/usr/X11R6/lib/modules/codeconv/libGEORGIAN.a
+/usr/X11R6/lib/modules/codeconv/libISO8859_1.a
+/usr/X11R6/lib/modules/codeconv/libISO8859_10.a
+/usr/X11R6/lib/modules/codeconv/libISO8859_11.a
+/usr/X11R6/lib/modules/codeconv/libISO8859_14.a
+/usr/X11R6/lib/modules/codeconv/libISO8859_15.a
+/usr/X11R6/lib/modules/codeconv/libISO8859_2.a
+/usr/X11R6/lib/modules/codeconv/libISO8859_3.a
+/usr/X11R6/lib/modules/codeconv/libISO8859_4.a
+/usr/X11R6/lib/modules/codeconv/libISO8859_5.a
+/usr/X11R6/lib/modules/codeconv/libISO8859_6.a
+/usr/X11R6/lib/modules/codeconv/libISO8859_7.a
+/usr/X11R6/lib/modules/codeconv/libISO8859_8.a
+/usr/X11R6/lib/modules/codeconv/libISO8859_9.a
+/usr/X11R6/lib/modules/codeconv/libJISX0201.a
+/usr/X11R6/lib/modules/codeconv/libJISX0208.a
+/usr/X11R6/lib/modules/codeconv/libJISX0212.a
+/usr/X11R6/lib/modules/codeconv/libKOI8.a
+/usr/X11R6/lib/modules/codeconv/libKSC5601.a
+/usr/X11R6/lib/modules/codeconv/libKSCJOHAB.a
+/usr/X11R6/lib/modules/codeconv/libMULEENCODING.a
+/usr/X11R6/lib/modules/codeconv/libTCVN.a
+/usr/X11R6/lib/modules/codeconv/libVISCII.a
+/usr/X11R6/lib/modules/dri
+/usr/X11R6/lib/modules/dri/gamma_dri.so
+/usr/X11R6/lib/modules/dri/i810_dri.so
+/usr/X11R6/lib/modules/dri/mga_dri.so
+/usr/X11R6/lib/modules/dri/r128_dri.so
+/usr/X11R6/lib/modules/dri/sis_dri.so
+/usr/X11R6/lib/modules/drivers
+/usr/X11R6/lib/modules/drivers/ati_drv.o
+/usr/X11R6/lib/modules/drivers/atimisc_drv.o
+/usr/X11R6/lib/modules/drivers/fbdev_drv.o
+/usr/X11R6/lib/modules/drivers/glint_drv.o
+/usr/X11R6/lib/modules/drivers/i740_drv.o
+/usr/X11R6/lib/modules/drivers/linux
+/usr/X11R6/lib/modules/drivers/linux/v4l_drv.o
+/usr/X11R6/lib/modules/drivers/mga_drv.o
+/usr/X11R6/lib/modules/drivers/nv_drv.o
+/usr/X11R6/lib/modules/drivers/r128_drv.o
+/usr/X11R6/lib/modules/drivers/radeon_drv.o
+/usr/X11R6/lib/modules/drivers/rendition_drv.o
+/usr/X11R6/lib/modules/drivers/s3virge_drv.o
+/usr/X11R6/lib/modules/drivers/sis_drv.o
+/usr/X11R6/lib/modules/drivers/tdfx_drv.o
+/usr/X11R6/lib/modules/drivers/vga_drv.o
+/usr/X11R6/lib/modules/extensions
+/usr/X11R6/lib/modules/extensions/libGLcore.a
+/usr/X11R6/lib/modules/extensions/libdbe.a
+/usr/X11R6/lib/modules/extensions/libdri.a
+/usr/X11R6/lib/modules/extensions/libextmod.a
+/usr/X11R6/lib/modules/extensions/libglx.a
+/usr/X11R6/lib/modules/extensions/librecord.a
+/usr/X11R6/lib/modules/fonts
+/usr/X11R6/lib/modules/fonts/libbitmap.a
+/usr/X11R6/lib/modules/fonts/libfreetype.a
+/usr/X11R6/lib/modules/fonts/libspeedo.a
+/usr/X11R6/lib/modules/fonts/libtype1.a
+/usr/X11R6/lib/modules/fonts/libxtt.a
+/usr/X11R6/lib/modules/input
+/usr/X11R6/lib/modules/input/citron_drv.o
+/usr/X11R6/lib/modules/input/digitaledge_drv.o
+/usr/X11R6/lib/modules/input/dynapro_drv.o
+/usr/X11R6/lib/modules/input/elographics_drv.o
+/usr/X11R6/lib/modules/input/microtouch_drv.o
+/usr/X11R6/lib/modules/input/mouse_drv.o
+/usr/X11R6/lib/modules/input/mutouch_drv.o
+/usr/X11R6/lib/modules/input/spaceorb_drv.o
+/usr/X11R6/lib/modules/input/summa_drv.o
+/usr/X11R6/lib/modules/input/void_drv.o
+/usr/X11R6/lib/modules/input/wacom_drv.o
+/usr/X11R6/lib/modules/libafb.a
+/usr/X11R6/lib/modules/libcfb.a
+/usr/X11R6/lib/modules/libcfb16.a
+/usr/X11R6/lib/modules/libcfb24.a
+/usr/X11R6/lib/modules/libcfb32.a
+/usr/X11R6/lib/modules/libddc.a
+/usr/X11R6/lib/modules/libfb.a
+/usr/X11R6/lib/modules/libi2c.a
+/usr/X11R6/lib/modules/libint10.a
+/usr/X11R6/lib/modules/libmfb.a
+/usr/X11R6/lib/modules/libpcidata.a
+/usr/X11R6/lib/modules/librac.a
+/usr/X11R6/lib/modules/libramdac.a
+/usr/X11R6/lib/modules/libscanpci.a
+/usr/X11R6/lib/modules/libshadow.a
+/usr/X11R6/lib/modules/libshadowfb.a
+/usr/X11R6/lib/modules/libvbe.a
+/usr/X11R6/lib/modules/libvgahw.a
+/usr/X11R6/lib/modules/libxaa.a
+/usr/X11R6/lib/modules/libxf1bpp.a
+/usr/X11R6/lib/modules/libxf24_32bpp.a
+/usr/X11R6/lib/modules/libxf4bpp.a
+/usr/X11R6/lib/modules/libxf8_16bpp.a
+/usr/X11R6/lib/modules/libxf8_32bpp.a
+/usr/X11R6/lib/modules/linux
+/usr/X11R6/lib/modules/linux/libdrm.a
+/usr/X11R6/lib/modules/linux/libfbdevhw.a
+/usr/X11R6/lib/modules/v10002d.uc
+/usr/X11R6/lib/modules/v20002d.uc