diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-06-28 15:31:57 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-06-28 15:31:57 +0000 |
| commit | 90f8406ba21657b75f123e483b0cea7724cb0d8d (patch) | |
| tree | 2b7b1b40eb841c8d8e5ff5cb298ba9ee501c0b1c | |
| parent | bc7f2842f5bd9fb4a1bb6058ae99ee3fe284d5a5 (diff) | |
| download | drakx-90f8406ba21657b75f123e483b0cea7724cb0d8d.tar drakx-90f8406ba21657b75f123e483b0cea7724cb0d8d.tar.gz drakx-90f8406ba21657b75f123e483b0cea7724cb0d8d.tar.bz2 drakx-90f8406ba21657b75f123e483b0cea7724cb0d8d.tar.xz drakx-90f8406ba21657b75f123e483b0cea7724cb0d8d.zip | |
- bundle /etc/rpm/platform for rpm 4.4.8
| -rw-r--r-- | perl-install/install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/install/pkgs.pm | 6 | ||||
| -rw-r--r-- | perl-install/install/share/list.xml | 1 | ||||
| -rw-r--r-- | perl-install/install/share/symlinks | 1 | ||||
| -rw-r--r-- | perl-install/lang.pm | 2 |
5 files changed, 10 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index e3f03689c..85e47fc65 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,4 @@ +- bundle /etc/rpm/platform for rpm 4.4.8 - use modularized ide drivers and configure ide-controller in modprobe.conf - auto_install: o allow "automatic=met:http,ser:server,dir:/pub/dir diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm index f7d1374ec..1d2f82ff3 100644 --- a/perl-install/install/pkgs.pm +++ b/perl-install/install/pkgs.pm @@ -2,6 +2,12 @@ package install::pkgs; # $Id$ use strict; +BEGIN { + # needed before "use URPM" + mkdir '/etc/rpm'; + symlink '/tmp/stage2/etc/rpm/platform', '/etc/rpm/platform'; +} + use URPM; use URPM::Resolve; use URPM::Signature; diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml index e5ef465e5..df2348ba4 100644 --- a/perl-install/install/share/list.xml +++ b/perl-install/install/share/list.xml @@ -116,6 +116,7 @@ /etc/mke2fs.conf /etc/fonts/fonts.conf /etc/protocols + /etc/rpm/platform /usr/LIB/xserver/SecurityPolicy /etc/pango/ARCH/pango.modules /usr/LIB/gtk-2.0/*/loaders/libpixbufloader-png.so diff --git a/perl-install/install/share/symlinks b/perl-install/install/share/symlinks index 07f969a06..90591c482 100644 --- a/perl-install/install/share/symlinks +++ b/perl-install/install/share/symlinks @@ -4,6 +4,7 @@ /etc/services /etc/group /etc/passwd +/etc/rpm/platform /etc/termcap /lib /lib64 diff --git a/perl-install/lang.pm b/perl-install/lang.pm index d7fe7c943..00913c111 100644 --- a/perl-install/lang.pm +++ b/perl-install/lang.pm @@ -1021,7 +1021,7 @@ sub read { sub write_langs { my ($langs) = @_; my $s = pack_langs($langs); - symlink "$::prefix/etc/rpm", "/etc/rpm" if $::prefix; + symlink "$::prefix/etc/rpm/macros", "/etc/rpm/macros" if $::prefix; require URPM; URPM::add_macro("_install_langs $s"); substInFile { s/%_install_langs.*//; $_ .= "%_install_langs $s\n" if eof && $s } "$::prefix/etc/rpm/macros"; |