From 08b06173bb1e996b8c9b86343e96eefadbdf74c8 Mon Sep 17 00:00:00 2001 From: brian Date: Tue, 2 Jun 2009 20:52:00 +0000 Subject: [PATCH] b=19671 i=jack i=wangyb Give lbuild's old-school-build RPM storage code the ability to understand the format of RPMs built from OFED pre-releases. --- build/lbuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build/lbuild b/build/lbuild index 54a3ac5..4699024 100755 --- a/build/lbuild +++ b/build/lbuild @@ -991,8 +991,10 @@ store_for_reuse() if [ -n "$OFED_VERSION" -a "$OFED_VERSION" != "inkernel" ]; then # store kernel-ib RPMs local rpmname + local ofed_version=$(echo $OFED_VERSION | + sed -re 's/-(20[0-9]{6,6}-[0-9]{4,4}|rc[0-9]*)$//') for rpmname in "kernel-ib" "kernel-ib-devel"; do - rpmname="${rpmname}-${OFED_VERSION}" + rpmname="${rpmname}-${ofed_version}" if $PATCHLESS; then rpmname="${rpmname}-${LINUXRELEASE//-/_}" else -- 1.8.3.1