summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-05-19 08:58:34 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-05-19 08:58:34 +0000
commit3163d6519612f37cc4f633d5b306f12f7e2b2b95 (patch)
treed8e55996b59f7c8c9569e778d7af1d4f2c087c51
parentd463e9a090f184f99bffdab7cde6690c7c55ffef (diff)
downloaddrakx-3163d6519612f37cc4f633d5b306f12f7e2b2b95.tar
drakx-3163d6519612f37cc4f633d5b306f12f7e2b2b95.tar.gz
drakx-3163d6519612f37cc4f633d5b306f12f7e2b2b95.tar.bz2
drakx-3163d6519612f37cc4f633d5b306f12f7e2b2b95.tar.xz
drakx-3163d6519612f37cc4f633d5b306f12f7e2b2b95.zip
- insmod_ is now a symlink to insmod-25
- handle explictly insmod, modinfo and rmmod
-rw-r--r--perl-install/Makefile1
-rw-r--r--perl-install/list.sparc74
-rw-r--r--perl-install/share/aliases3
-rw-r--r--perl-install/share/list.xml4
4 files changed, 5 insertions, 77 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile
index af9e2ffa2..42f9f7570 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -103,7 +103,6 @@ get_needed_files: $(DIRS) mo_files
mv -f $(DEST)/{bin,sbin}/* $(DEST)/usr/bin
mv -f $(DEST)/usr/{lib,X11R6/lib}/*.so* $(DEST)/lib
rmdir $(DEST)/{bin,sbin}
- cd $(DEST)/usr/bin ; mv insmod insmod_
../tools/simplify-drakx-modules $(DEST)/usr/*/*/*/utf8_heavy.pl
cp -f $(STAGE1)/init-stage2 $(DEST)/etc/init
diff --git a/perl-install/list.sparc b/perl-install/list.sparc
deleted file mode 100644
index 448e0b63e..000000000
--- a/perl-install/list.sparc
+++ /dev/null
@@ -1,74 +0,0 @@
-/bin/ash
-/bin/cpio
-/lib/libnss_nis.so.2
-/lib/libnss_files.so.2
-/lib/libnss_dns.so.2
-/lib/libresolv.so.2
-/etc/protocols
-/sbin/fdisk
-/sbin/ifport
-/sbin/insmod
-/sbin/mkraid
-/sbin/rmmod
-/sbin/mkdosfs
-/sbin/mke2fs
-/sbin/raidstart
-/usr/bin/bzip2
-/usr/bin/perl
-/usr/lib/libimlib-png.so
-/usr/lib/gtk/themes/engines/libpixmap.so
-/usr/lib/gtk/themes/engines/libpixmap.la
-/usr/lib/libimlib-png.so
-/usr/lib/perl5/5.00503/AutoLoader.pm
-/usr/lib/perl5/5.00503/Carp.pm
-/usr/lib/perl5/5.00503/Data/Dumper.pm
-/usr/lib/perl5/5.00503/Exporter.pm
-/usr/lib/perl5/5.00503/FileHandle.pm
-/usr/lib/perl5/5.00503/SelectSaver.pm
-/usr/lib/perl5/5.00503/SelfLoader.pm
-/usr/lib/perl5/5.00503/Symbol.pm
-/usr/lib/perl5/5.00503/Time/Local.pm
-/usr/lib/perl5/5.00503/dumpvar.pl
-/usr/lib/perl5/5.00503/sparc-linux/Config.pm
-/usr/lib/perl5/5.00503/sparc-linux/DynaLoader.pm
-/usr/lib/perl5/5.00503/sparc-linux/Fcntl.pm
-/usr/lib/perl5/5.00503/sparc-linux/auto/Fcntl/Fcntl.bs
-/usr/lib/perl5/5.00503/sparc-linux/auto/Fcntl/Fcntl.so
-/usr/lib/perl5/5.00503/sparc-linux/IO/File.pm
-/usr/lib/perl5/5.00503/sparc-linux/IO/Handle.pm
-/usr/lib/perl5/5.00503/sparc-linux/IO/Seekable.pm
-/usr/lib/perl5/5.00503/sparc-linux/IO/Socket.pm
-/usr/lib/perl5/5.00503/sparc-linux/Socket.pm
-/usr/lib/perl5/5.00503/sparc-linux/_h2ph_pre.ph
-/usr/lib/perl5/5.00503/sparc-linux/asm/unistd.ph
-/usr/lib/perl5/5.00503/sparc-linux/asm-sparc/unistd.ph
-/usr/lib/perl5/5.00503/sparc-linux/asm-sparc64/unistd.ph
-/usr/lib/perl5/5.00503/sparc-linux/auto/Data/Dumper/Dumper.bs
-/usr/lib/perl5/5.00503/sparc-linux/auto/Data/Dumper/Dumper.so
-/usr/lib/perl5/5.00503/sparc-linux/auto/IO/IO.so
-/usr/lib/perl5/5.00503/sparc-linux/auto/Socket/Socket.bs
-/usr/lib/perl5/5.00503/sparc-linux/auto/Socket/Socket.so
-/usr/lib/perl5/5.00503/sparc-linux/bits/syscall.ph
-/usr/lib/perl5/5.00503/sparc-linux/sys/syscall.ph
-/usr/lib/perl5/5.00503/sparc-linux/syscall.ph
-/usr/lib/perl5/5.00503/lib.pm
-/usr/lib/perl5/5.00503/overload.pm
-/usr/lib/perl5/5.00503/strict.pm
-/usr/lib/perl5/5.00503/vars.pm
-/usr/lib/perl5/site_perl/5.005/sparc-linux/Gtk.pm
-/usr/lib/perl5/site_perl/5.005/sparc-linux/Gtk/Types.pm
-/usr/lib/perl5/site_perl/5.005/sparc-linux/Net/Cmd.pm
-/usr/lib/perl5/site_perl/5.005/sparc-linux/Net/Config.pm
-/usr/lib/perl5/site_perl/5.005/sparc-linux/Net/FTP.pm
-/usr/lib/perl5/site_perl/5.005/sparc-linux/Net/FTP/A.pm
-/usr/lib/perl5/site_perl/5.005/sparc-linux/Net/FTP/I.pm
-/usr/lib/perl5/site_perl/5.005/sparc-linux/Net/FTP/dataconn.pm
-/usr/lib/perl5/site_perl/5.005/sparc-linux/Net/Netrc.pm
-/usr/lib/perl5/site_perl/5.005/sparc-linux/auto/Gtk/Gtk.bs
-/usr/lib/perl5/site_perl/5.005/sparc-linux/auto/Gtk/Gtk.so
-/usr/lib/rpm/rpmrc
-/usr/X11R6/bin/XF86_FBDev
-/usr/X11R6/bin/XF86_Mach64
-/usr/X11R6/bin/Xsun
-/usr/X11R6/bin/xmodmap
-/usr/X11R6/lib/modules/xf86Wacom.so
diff --git a/perl-install/share/aliases b/perl-install/share/aliases
index ac9f94f70..7c2947345 100644
--- a/perl-install/share/aliases
+++ b/perl-install/share/aliases
@@ -3,3 +3,6 @@ install2 perl-install/install2
commands perl-install/commands
runinstall2 install2
fsck.ext2 e2fsck
+lsmod lsmod-25
+rmmod rmmod-25
+insmod_ insmod-25
diff --git a/perl-install/share/list.xml b/perl-install/share/list.xml
index 6a2dae1b2..8d725f477 100644
--- a/perl-install/share/list.xml
+++ b/perl-install/share/list.xml
@@ -5,11 +5,12 @@
cpio gzip bzip2
<if-not ARCH="ppc">
fdisk
+ rescuept
</if-not>
<if ARCH="ppc">
pdisk
</if>
- insmod insmod.old modinfo rmmod
+ insmod-25 modinfo-25 rmmod-25
losetup
lvm2 mdadm
@@ -108,7 +109,6 @@
/usr/lib/rpm/rpmrc
/usr/lib/rpm/macros
- /sbin/rescuept
/usr/share/locale/UTF-8
/usr/share/terminfo/l/linux
/usr/share/themes/Galaxy/gtk-2.0/gtkrc