Skip to content

C
core
Kaydet (Commit) 9eac7365 authored tarafından Kurt Zenker's avatar Kurt Zenker
Dosyalara gözat
Seçenekler

INTEGRATION: CWS s390xport01 (1.77.10); FILE MERGED 

2008/03/27 08:48:55 cmc 1.77.10.1: #i87464# add support for s390x
üst 986f2cd4
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 15 deletions
solenv/bin/modules/installer/epmfile.pm
Dosyayı görüntüle @ 9eac7365
......@@ -4,9 +4,9 @@
#
# $RCSfile: epmfile.pm,v $
#
# $Revision: 1.78 $
# $Revision: 1.79 $
#
# last change: $Author: kz $ $Date: 2008-04-02 15:59:44 $
# last change: $Author: kz $ $Date: 2008-04-03 16:45:08 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
......@@ -2259,10 +2259,6 @@ sub create_packages_without_epm
my $target = "";
if ( $installer::globals::compiler =~ /unxlngi/) { $target = "i586"; }
elsif ( $installer::globals::compiler =~ /unxlngx/) { $target = "x86_64"; }
elsif ( $installer::globals::compiler =~ /unxlngs/) { $target = "sparc"; }
elsif ( $installer::globals::compiler =~ /unxlngppc64/) {$target = "ppc64"; }
elsif ( $installer::globals::compiler =~ /unxlngppc/) {$target = "ppc"; }
elsif ( $installer::globals::compiler =~ /unxlng/) {$target = (POSIX::uname())[4]; }
my $systemcall = "$rpmcommand -bb $specfilename --target $target 2\>\&1 |";
......@@ -2443,11 +2439,9 @@ sub create_new_directory_structure
{
my $rpmdir;
my $machine = "";
if ( $installer::globals::compiler =~ /unxlngi/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/i586"; }
elsif ( $installer::globals::compiler =~ /unxlngx/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/x86_64"; }
elsif ( $installer::globals::compiler =~ /unxlngs/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/sparc"; }
elsif ( $installer::globals::compiler =~ /unxlngppc64/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/ppc64"; }
elsif ( $installer::globals::compiler =~ /unxlngppc/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/ppc"; }
if ( $installer::globals::compiler =~ /unxlngi/) {
$rpmdir = "$installer::globals::epmoutpath/RPMS/i586";
}
elsif ( $installer::globals::compiler =~ /unxlng/) {
$machine = (POSIX::uname())[4];
$rpmdir = "$installer::globals::epmoutpath/RPMS/$machine";
......@@ -2478,12 +2472,8 @@ sub create_new_directory_structure
{
installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/$machine");
}
installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/x86_64");
installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/i586");
installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/i386");
installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/sparc");
installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/ppc64");
installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/ppc");
installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS");
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment