From fbefe16d7e9b8e6502ec781910af376f3edf6bb3 Mon Sep 17 00:00:00 2001 From: Vladimir Sokolovsky Date: Wed, 20 Sep 2017 00:10:05 +0300 Subject: [PATCH] install.pl: Added support for using source RPM per Distro Starting rdma-core-v15 there are different RPM spec files per SUSE and RedHat. So, install.pl will use the corresponding source RPM. Signed-off-by: Vladimir Sokolovsky --- install.pl | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/install.pl b/install.pl index c105256..ac2bf93 100755 --- a/install.pl +++ b/install.pl @@ -381,6 +381,10 @@ if ($dist_rpm =~ /openSUSE-release-11.2/) { my $SRPMS = $CWD . '/' . 'SRPMS/'; chomp $SRPMS; +my $SRPMS_DISTRO = 'RH'; +if ($DISTRO =~ /SLES/) { + $SRPMS_DISTRO = 'SUSE'; +} my $RPMS = $CWD . '/' . 'RPMS' . '/' . $dist_rpm . '/' . $arch; chomp $RPMS; if (not -d $RPMS) { @@ -3245,7 +3249,7 @@ sub main my @list = (); set_availability(); - for my $srcrpm ( <$SRPMS*> ) { + for my $srcrpm ( <$SRPMS*.rpm>,<$SRPMS$SRPMS_DISTRO/*.rpm> ) { set_cfg ($srcrpm); } @@ -3356,7 +3360,7 @@ sub main return 0; } elsif ($inp == 2) { - for my $srcrpm ( <$SRPMS*> ) { + for my $srcrpm ( <$SRPMS*.rpm>,<$SRPMS$SRPMS_DISTRO/*.rpm> ) { set_cfg ($srcrpm); } @@ -3396,7 +3400,7 @@ sub main } else { - for my $srcrpm ( <$SRPMS*> ) { + for my $srcrpm ( <$SRPMS*.rpm>,<$SRPMS$SRPMS_DISTRO/*.rpm> ) { set_cfg ($srcrpm); } -- 2.46.0