# this is a dir to try reuse old kernel RPMs in (although, it seems to be
# unused in any real manner
REUSERPM=
+# this is the dir that should be used to store reuse products
REUSEBUILD=
# should cached products be used or force rebuilding?
USE_BUILD_CACHE=true
elif ! $RELEASE; then
# if there is no patch series, then this is not a lustre specific
# kernel. don't make it look like one
- if [ -n "$SERIES" ]; then
- #remove the @VERSION@ (lustre version)
-# EXTRA_VERSION=$(echo $EXTRA_VERSION | sed -e "s/\(.*_lustre\)\..*/\1/")
+ if $PATCHLESS || [ -n "$SERIES" ]; then
+ EXTRA_VERSION=$(echo $EXTRA_VERSION | sed -e "s/\(.*_lustre\)\..*/\1/")
# EXTRA_VERSION="${EXTRA_VERSION}-${TAG}.${TIMESTAMP}"
- ! ( $PATCHLESS ) && EXTRA_VERSION="${EXTRA_VERSION}.${TIMESTAMP}"
+ EXTRA_VERSION="${EXTRA_VERSION}.${TIMESTAMP}"
fi
fi
# EXTRA_VERSION=${EXTRA_VERSION//-/_}
$RPMBUILD $targets $rpmbuildopt ../lustre.spec \
${is_patchless:+--define "lustre_name lustre-client"} \
${lustre_tests:+--define "build_lustre_tests 0"} \
+ ${FIND_REQUIRES:+--define "__find_requires $FIND_REQUIRES"} \
--define "configure_args $confoptions ${CONFIGURE_FLAGS}" \
--define "_tmppath $TMPDIR" \
--define "_topdir $TOPDIR" 2>&1 || \
# call a distro specific hook, if available
if type -p unpack_linux_devel_rpm-$DISTRO; then
- unpack_linux_devel_rpm-$DISTRO "$kernelrpm"
+ if ! unpack_linux_devel_rpm-$DISTRO "$kernelrpm"; then
+ return 255
+ fi
fi
popd &>/dev/null
}
-# XXX - this rhel/sles goop needs abstracting out into the
-# lbuild-{rhel5,sles10} method files
-find_linux_devel_paths() {
- local path="$1"
-
- local RC=0
-
- pushd $path
- # RHEL-style and SLES-style rpms
- # XXX - until bug 19336 cleans this up, we need to extricate the
- # ${lnxmin}- from the $lnxrel
- local paths="kernels/${lnxmaj}${lnxmin}${delimiter}${lnxrel}-${TARGET_ARCH} linux-${lnxmaj}${lnxmin}${delimiter}${lnxrel##${lnxmin#.}-}"
-
- local path
- for path in $paths; do
- local src='usr/src'
-
- if [ -d "$src/$path/" ]; then
- LINUX="$(pwd)/$src/$path"
- fi
- # SLES has a separate -obj tree
- if [ -d "$src/${path}-obj" ]; then
- local src="$src/${path}-obj"
- local objects="$TARGET_ARCH/$RPMSMPTYPE"
-
- # Novell, are you *TRYING* to make life hard for me?
- if [ -d "$src/powerpc" ]; then
- objects="powerpc/$TARGET_ARCH"
- elif [ $TARGET_ARCH == 'i686' ]; then
- objects="i386/$RPMSMPTYPE"
- fi
-
- LINUXOBJ="$(pwd)/$src/$objects"
- fi
- done
- if [ -z "$LINUX" ]; then
- RC=255
- else
- # dig out the release version
- LINUXRELEASE=$(find_linux_release ${LINUXOBJ:-$LINUX})
- if [ -z "$LINUXRELEASE" ]; then
- echo "Failed to find linux release in ${LINUXOBJ:-$LINUX}"
- RC=255
- fi
- fi
- popd
- return $RC
-}
-
build_kernel_ib() {
local linux="$1"
rpm --define "_topdir ${TOPDIR}" -ivh $SOURCE
SOURCE="${TOPDIR}/SPECS/ofa_kernel.spec"
local file ed_fragment1 ed_fragment2 n=1
- for file in ${TOPDIR}/lustre/build/patches/ofed/*; do
+ for file in $(ls ${TOPDIR}/lustre/build/patches/ofed/*); do
ed_fragment1="$ed_fragment1
Patch$n: ${file%%*/}"
ed_fragment2="$ed_fragment2
let n=$n+1
done
- ed $SOURCE <<EOF
+ if [ $n -gt 1 ]; then
+ ed $SOURCE <<EOF
/^Source: /a
$ed_fragment1
.
.
wq
EOF
+ fi
fi
local linuxrelease=$(find_linux_release "$linux")
if ! $RPMBUILD $BUILD_TYPE --define 'build_kernel_ib 1' --define 'build_kernel_ib_devel 1' \
+ ${FIND_REQUIRES:+--define "__find_requires $FIND_REQUIRES"} \
--define "_topdir ${TOPDIR}" --target ${TARGET_ARCH} \
--define "KVERSION ${linuxrelease}" \
--define "$K_SRC ${linux}" \
fi
if ! $RPMBUILD $targets $rpmbuildopt \
+ ${FIND_REQUIRES:+--define "__find_requires $FIND_REQUIRES"} \
--define "_tmppath /var/tmp" \
--define "_topdir ${TOPDIR}" \
--define "kernel_obj $linux" \
fi
if $DO_SRC; then
if ! $RPMBUILD -bs \
+ ${FIND_REQUIRES:+--define "__find_requires $FIND_REQUIRES"} \
--define "_tmppath /var/tmp" \
--define "_topdir ${TOPDIR}" \
--define "kernel_obj $linux" \
;;
esac
if ! $RPMBUILD $targets $rpmbuildopt --define "dist $distro" \
+ ${FIND_REQUIRES:+--define "__find_requires $FIND_REQUIRES"} \
--define "_tmppath /var/tmp" \
--define "_topdir ${TOPDIR}" \
--define "kernel_obj $linux" \
fi
if $DO_SRC; then
if ! $RPMBUILD -bs --define "dist $distro" \
+ ${FIND_REQUIRES:+--define "__find_requires $FIND_REQUIRES"} \
--define "_tmppath /var/tmp" \
--define "_topdir ${TOPDIR}" \
--define "kernel_obj $linux" \
fatal 1 "Failed to find a kernel development RPM in $TOPDIR/RPMS/$arch/"
fi
- # install the -devel RPM in preparation for the lustre build
+ # install the -devel RPM in preparation for modules builds
if ! lnxrel="$kernel_extra_version" unpack_linux_devel_rpm \
"$TOPDIR/RPMS/$arch/$kernel_devel_rpm"; then
fatal 1 "Could not find the Linux tree in $TOPDIR/RPMS/$arch/$kernel_devel_rpm"
fi
fi
+ # ~sigh~ have to make copies of and modify some of the rpm
+ # infrastructure files so that find-requires can find our unpacked
+ # kernel-devel artifacts
+ cp $RPM_HELPERS_DIR/{symset-table,find-requires{,.ksyms}} .
+ FIND_REQUIRES="$(pwd)/find-requires"
+ chmod 755 {symset-table,find-requires{,.ksyms}}
+ local tmp="$(pwd)"
+ tmp="${tmp//\//\\/}"
+ ed find-requires <<EOF
+1a
+set -x
+.
+/|.*find-requires.ksyms/s/|/| bash -x/
+g/ [^ ]*\/\(find-requires\.ksyms\)/s// $tmp\/\1/g
+wq
+EOF
+ ed find-requires.ksyms <<EOF
+1a
+set -x
+.
+g/\/.*\/\(symset-table\)/s//$tmp\/\1/g
+wq
+EOF
+ ed symset-table <<EOF
+1a
+set -x
+.
+g/\(\/boot\/\)/s//$tmp\/reused\1/g
+g/\(\/usr\/src\/kernels\/\)/s//$tmp\/reused\1/g
+wq
+EOF
+
build_ofed "${LINUXOBJ:-$LINUX}" "$OFED_VERSION" ||
fatal 1 "error building OFED"
git://git.whamcloud.com / fs / lustre-release.git / blobdiff