Oh boy, more fallout from our not building i586 kernels for sles.
If we are building lustre servers and NOT rebuilding the Suse ofed
RPM, then we need to look for the i586 ofed-devel package.
i=yangsheng
find $dir -type f |
xargs ln -t $dest/RPMS/${dir##*/} -s
done
-
fi
return 0
else
local dir
for dir in RPMS/*; do
pushd $dir
- for file in *; do
- if [ -h $file ]; then
- cp $file foo
- mv foo $file
- fi
- done
+ for file in $(ls); do
+ if [ -h $file ]; then
+ cp $file foo
+ mv foo $file
+ fi
done
- popd
+ popd
+ done
# also, for i?86, make sure all of the RPMs are in RPMS/$TARGET_ARCH
# as that's where LTS expects to find them
for dir in RPMS/*; do
;;
i?86) if $canonical; then
arch=i386
- elif $for_patchless; then
+ elif $(eval $for_patchless); then
arch=i586
fi
;;
# temporary hack until we get a base O/S intalled ofed-devel
local arch=$TARGET_ARCH
if [ -n "$OFED_VERSION" -a "$OFED_VERSION" = "inkernel" ]; then
- local ofed_devel="${OFED_DEVEL_LOCATION}/ofed-devel-${OFED_DEVEL_VERSION}.$(resolve_arch $TARGET_ARCH $PATCHLESS).rpm"
+ local ofed_devel="${OFED_DEVEL_LOCATION}/ofed-devel-${OFED_DEVEL_VERSION}.$(resolve_arch $TARGET_ARCH "$PATCHLESS || ! $REBUILD_OFED_DEVEL_RPM").rpm"
if ! rpm2cpio < $ofed_devel | cpio -id; then
fatal 1 "could not unpack the ofed-devel rpm."
fi
- echo "$(pwd)/usr/src/kernel-modules-ofed/$(resolve_arch $TARGET_ARCH $PATCHLESS)/$RPMSMPTYPE"
+ echo "$(pwd)/usr/src/kernel-modules-ofed/$(resolve_arch $TARGET_ARCH "$PATCHLESS || ! $REBUILD_OFED_DEVEL_RPM")/$RPMSMPTYPE"
fi
return 0