diff options
| author | Erwan Velu <erwan@mandriva.org> | 2003-02-26 14:15:30 +0000 |
|---|---|---|
| committer | Erwan Velu <erwan@mandriva.org> | 2003-02-26 14:15:30 +0000 |
| commit | 78198e1f77503b01f104ae1b71232f42e6a22a24 (patch) | |
| tree | f26715ca64a4ecda00ed39729efd12a21722e131 | |
| parent | 1740f30fc5a1938297c0899779cd09ef231ee859 (diff) | |
| download | drakx-backup-do-not-use-78198e1f77503b01f104ae1b71232f42e6a22a24.tar drakx-backup-do-not-use-78198e1f77503b01f104ae1b71232f42e6a22a24.tar.gz drakx-backup-do-not-use-78198e1f77503b01f104ae1b71232f42e6a22a24.tar.bz2 drakx-backup-do-not-use-78198e1f77503b01f104ae1b71232f42e6a22a24.tar.xz drakx-backup-do-not-use-78198e1f77503b01f104ae1b71232f42e6a22a24.zip | |
merge ia64
| -rw-r--r-- | perl-install/Makefile | 4 | ||||
| -rw-r--r-- | perl-install/share/list.ia64 | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile index f96dadcf2..d6a5e2c94 100644 --- a/perl-install/Makefile +++ b/perl-install/Makefile @@ -152,7 +152,11 @@ endif ifeq (i386,$(ARCH)) cp ../tools/i386/busybox $(DEST)/usr/bin endif +ifeq (ia64,$(ARCH)) + ln -sf bash $(DEST)/usr/bin/sh +else ln -sf ash $(DEST)/usr/bin/sh +endif for i in fonts keyboards locales keymaps; do tar xfj `../tools/specific_arch share/$$i.tar.bz2` -C $(DEST); done diff --git a/perl-install/share/list.ia64 b/perl-install/share/list.ia64 index 9bbf999cb..158ac8387 100644 --- a/perl-install/share/list.ia64 +++ b/perl-install/share/list.ia64 @@ -5,6 +5,10 @@ /sbin/mkdosfs /sbin/resize_reiserfs /usr/bin/strace +/bin/bash +/bin/vim-minimal +/usr/sbin/parted +/usr/sbin/efibootmgr /var/log/XFree86.0.log /usr/X11R6/bin/XFree86 /usr/X11R6/bin/xmodmap @@ -68,7 +72,6 @@ /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/extensions/libxie.a /usr/X11R6/lib/modules/fonts /usr/X11R6/lib/modules/fonts/libbitmap.a /usr/X11R6/lib/modules/fonts/libfreetype.a @@ -116,4 +119,4 @@ /usr/X11R6/lib/modules/linux/libfbdevhw.a /usr/X11R6/lib/modules/v10002d.uc /usr/X11R6/lib/modules/v20002d.uc -/usr/lib/perl5/PERL_VERSION/ARCH-linux/asm/break.ph +/usr/lib/perl5/PERL_VERSION/ARCH-linux-thread-multi/asm/break.ph |