STAGEDIR=
TMPDIR=${TMPDIR:-"/var/tmp"}
TIMESTAMP=
-# XXX - i think these two parameters/arguments/variables need to be
-# cleaned up and merged. they effectively do the same thing
+# 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
# what does this do exactly? does it imply no kernel build?
NORPM=false
LDISKFSRPM=true
touch $semaphore
if ! wget -nv "$from" -O "$to" || [ ! -s "$to" ]; then
# the trap will remove the files via the fatal below
- fatal 1 "Could not download ${to##*/} from ${from%%/*}/."
+ fatal 1 "Could not download ${to##*/} from ${from%/*}/."
fi
rm -f $semaphore
delete_exit_trap "download"
return 0
fi
- file="MPTLINUX_RHEL5_SLES10_PH15-${MPTLINUX_VERSION}.zip"
+ file="SUN_MPTLINUX_RHEL5_PH16-${MPTLINUX_VERSION}.tar.gz"
download_file "$location/$file" "$KERNELTREE" "$force"
}
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//-/_}
}
untar() {
- local file="$1"
+ local tarfile="$1"
+ shift
+ local extractfile="$@"
- echo "Untarring ${file##*/}..."
- tar $(tarflags "$file") "$file"
+ echo "Untarring ${tarfile##*/}..."
+ tar $(tarflags "$tarfile") "$tarfile" $extractfile
}
unpack_mptlinux() {
- if ! unzip -p $KERNELTREE/MPTLINUX_RHEL5_SLES10_PH15-4.16.00.00-2.zip | tar xzvf - srpms-2/mptlinux-4.16.00.00-2.src.rpm; then
+ if ! untar $KERNELTREE/SUN_MPTLINUX_RHEL5_PH16-${MPTLINUX_VERSION}.tar.gz pkg1-rhel5/srpms-1/mptlinux-${MPTLINUX_VERSION}-1.src.rpm; then
return 1
fi
- mv srpms-2/mptlinux-4.16.00.00-2.src.rpm .
+ mv pkg1-rhel5/srpms-1/mptlinux-${MPTLINUX_VERSION}-1.src.rpm .
}
local do_patch=${1:-true}
- FULL_PATCH="$PWD/lustre-kernel-${TARGET}${EXTRA_VERSION_DELIMITER}${EXTRA_VERSION}.patch"
+ FULL_PATCH="$PWD/lustre-kernel-${TARGET}-${EXTRA_VERSION}.patch"
[ -f "$FULL_PATCH" ] && rm -f "$FULL_PATCH"
$do_patch && pushd linux >/dev/null
for series in $SERIES; do
$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 || \
#generate LUSTRE_EXTRA_VERSION from EXTRA_VERSION
gen_lustre_version() {
- LUSTRE_EXTRA_VERSION="${lnxmaj}${EXTRA_VERSION_DELIMITER}${EXTRA_VERSION}${TARGET_DELIMITER}${RPMSMPTYPE}"
+ LUSTRE_EXTRA_VERSION="${lnxmaj}-${EXTRA_VERSION}${FLAVOR_DELIMITER}${RPMSMPTYPE}"
LUSTRE_EXTRA_VERSION=${LUSTRE_EXTRA_VERSION//-/_}
}
[ $infact_arch == $smp_type ] && RPMSMPTYPE=bigsmp && break
done
+ for smp_type in $PPC64_ARCHS; do
+ [ $infact_arch == $smp_type ] && RPMSMPTYPE=ppc64 && break
+ done
+
for smp_type in $DEFAULT_ARCHS; do
[ $infact_arch == $smp_type ] && RPMSMPTYPE=default && break
done
# or just gotten rid of. :-)
find_linux_rpm() {
local prefix="$1"
- local delimiter=${2:-"-"}
local pathtorpms="${KERNELRPMSBASE}/${lnxmaj}/${DISTRO}"
[ -d $pathtorpms ] || return 255
local kernelbinaryrpm rpmfile
- local wanted_kernel="${lnxmaj}${delimiter}${lnxrel}"
+ local wanted_kernel="${lnxmaj}${lnxmin}-${lnxrel}"
local arch ret=1
for arch in $TARGET_ARCHS_ALL; do
# lustre itself)
unpack_linux_devel_rpm() {
local kernelrpm="${1}"
- # it's worth noting that neither sles10 nor rhel5 appear to use their
- # extra_version delimiter for the dirname under /usr/src, so we could
- # probably just get rid of this parameter
- local delimiter=${2:-"-"}
[ -f "$kernelrpm" ] || return 255
[ -d $TOPDIR/reused ] || mkdir $TOPDIR/reused || return 255
# 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}" \
if $RELEASE; then
local release_str="RELEASE=$RELEASE\n"
fi
- local REUSE_SIGNATURE=$({ echo -en $release_str; echo $BUILD_GEN; cat $CONFIG_FILE $TARGET_FILE $FULL_PATCH; } | md5sum | cut -d" " -f1)
- # see if we can link to the reuse pool
- # XXX - hrm. i'm not convinced this doesn't belong in the reuse "library"
- local CAN_LINK_FOR_REUSE=false
- touch $REUSEBUILD/$$
- if cp -al $REUSEBUILD/$$ $TOPDIR/ 2>/dev/null; then
- CAN_LINK_FOR_REUSE=true
+ if $USE_BUILD_CACHE && [ -n "$REUSEBUILD" ]; then
+ local REUSE_SIGNATURE=$({ echo -en $release_str;
+ echo $BUILD_GEN;
+ cat $CONFIG_FILE $TARGET_FILE $FULL_PATCH; } |
+ md5sum | cut -d" " -f1)
+ # see if we can link to the reuse pool
+ # XXX - hrm. i'm not convinced this doesn't belong in the reuse
+ # "library"
+ local CAN_LINK_FOR_REUSE=false
+ touch $REUSEBUILD/$$
+ if cp -al $REUSEBUILD/$$ $TOPDIR/ 2>/dev/null; then
+ CAN_LINK_FOR_REUSE=true
+ fi
+ rm $REUSEBUILD/$$
fi
- rm $REUSEBUILD/$$
# the extra version string to use for the kernel (which might be a reused
# kernel, remember)
local kernel_extra_version=""
- if $REUSERPM && ! reuse kernel "$TOPDIR" "$CAN_LINK_FOR_REUSE" \
+ if ! $USE_BUILD_CACHE || ! reuse kernel "$TOPDIR" "$CAN_LINK_FOR_REUSE" \
"$REUSE_SIGNATURE"; then
# nothing cached, build from scratch
if [ ! -r "$KERNELDIR/$KERNEL_SRPM" ]; then
prepare_and_build_srpm >&${outfd} ||
fatal 1 "failed to prepare_and_build_srpm"
- # store the resulting kernel RPM build tree for future use
- echo "caching the built kenel for future builds..." >&${outfd}
- if ! store_for_reuse "$TOPDIR/{SPECS,SOURCES,BUILD,SRPMS,RPMS}" \
- "kernel" "$REUSEBUILD" "$REUSE_SIGNATURE" \
- "$CAN_LINK_FOR_REUSE"; then
- error "Failed to store kernel RPMS for reuse"
- echo "unknown"
- return 1
+ if [ -z "$REUSE_SIGNATURE" ]; then
+ echo "No reuse signature was caculated so not storing the built kernel" >&${outfd}
+ else
+ # store the resulting kernel RPM build tree for future use
+ echo "Storing the built kernel for future reuse" >&${outfd}
+ if ! store_for_reuse "$TOPDIR/{SPECS,SOURCES,BUILD,SRPMS,RPMS}" \
+ "kernel" "$REUSEBUILD" "$REUSE_SIGNATURE" \
+ "$CAN_LINK_FOR_REUSE"; then
+ error "Failed to store kernel RPMS for reuse"
+ echo "unknown"
+ return 1
+ fi
fi
fi # build reuse
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" \
# build OFED
# globals used:
# TOPDIR
-# REUSEBUILD, REUSERPM
+# REUSEBUILD, USE_BUILD_CACHE
# CONFIGURE_FLAGS
build_ofed() {
return 0
fi
- if [ -n "$REUSEBUILD" ]; then
+ if $USE_BUILD_CACHE && [ -n "$REUSEBUILD" ]; then
+ local REUSE_SIGNATURE=$({ echo "$ofed_version";
+ echo "$(find_linux_release ${linux})";
+ cat "${linux}/include/linux/autoconf.h"; } |
+ md5sum | cut -d" " -f1)
# see if we can link to the reuse pool
- # XXX - hrm. i'm not convinced this doesn't belong in the reuse
- # "library"
+ # XXX - hrm. i'm not convinced this doesn't belong in the reuse
+ # "library"
local CAN_LINK_FOR_REUSE=false
touch $REUSEBUILD/$$
if cp -al $REUSEBUILD/$$ $TOPDIR/; then
rm $REUSEBUILD/$$
fi
- local REUSE_SIGNATURE=$({ echo "$ofed_version";
- echo "$(find_linux_release ${linux})";
- cat "${linux}/include/linux/autoconf.h"; } |
- md5sum | cut -d" " -f1)
- if ! $REUSERPM || ! reuse ofed "$TOPDIR" "$CAN_LINK_FOR_REUSE" \
+ if ! $USE_BUILD_CACHE || ! reuse ofed "$TOPDIR" "$CAN_LINK_FOR_REUSE" \
"$REUSE_SIGNATURE"; then
- # stash away the existing built articles for a moment
- mkdir bak
- mv {BUILD,{S,}RPMS,S{OURCE,PEC}S} bak
- function mv_back {
- pushd bak
- find . | cpio -pudlm ..
- popd
- rm -rf bak
- }
- create_rpmbuild_dirs
+ if [ -n "$REUSE_SIGNATURE" ]; then
+ # stash away the existing built articles for a moment
+ mkdir bak
+ mv {BUILD,{S,}RPMS,S{OURCE,PEC}S} bak
+ function mv_back {
+ pushd bak
+ find . | cpio -pudlm ..
+ popd
+ rm -rf bak
+ }
+ create_rpmbuild_dirs
+ fi
# build it
build_kernel_ib "${linux}"
- if ! store_for_reuse "$TOPDIR/{SPECS,SOURCES,BUILD,SRPMS,RPMS}" \
- "ofed" "$REUSEBUILD" "$REUSE_SIGNATURE" \
- "$CAN_LINK_FOR_REUSE"; then
- error "Failed to store OFED RPMS for reuse"
+
+ if [ -z "$REUSE_SIGNATURE" ]; then
+ echo "No reuse signature was caculated so not storing the built ofed"
+ else
+ # store the resulting RPM build tree for future use
+ echo "Storing the built ofed for future reuse"
+ if ! store_for_reuse "$TOPDIR/{SPECS,SOURCES,BUILD,SRPMS,RPMS}" \
+ "ofed" "$REUSEBUILD" "$REUSE_SIGNATURE" \
+ "$CAN_LINK_FOR_REUSE"; then
+ error "Failed to store OFED RPMS for reuse"
+ mv_back
+ return 1
+ fi
+ # put the stuff we stashed away back
mv_back
- return 1
fi
- # put the stuff we stashed away back
- mv_back
fi
pushd "$TOPDIR" >/dev/null
fatal 1 "Failed to find a kernel development RPM in $TOPDIR/RPMS/$arch/"
fi
- # install the -devel RPM in preparation for the lustre build
- # note that the EXTRA_VERSION_DELIMITER is *NOT* used in the
- # version of the directory name under /usr/src
+ # 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
+ "$TOPDIR/RPMS/$arch/$kernel_devel_rpm"; then
fatal 1 "Could not find the Linux tree in $TOPDIR/RPMS/$arch/$kernel_devel_rpm"
fi
done
# need to find and unpack the vendor's own kernel-devel for patchless
# client build
local kernelrpm
- if ! kernelrpm=$(find_linux_rpm "-$DEVEL_KERNEL_TYPE" ${EXTRA_VERSION_DELIMITER:-"-"}); then
+ if ! kernelrpm=$(find_linux_rpm "-$DEVEL_KERNEL_TYPE"); then
fatal 1 "Could not find the kernel-$DEVEL_KERNEL_TYPE RPM in ${KERNELRPMSBASE}/${lnxmaj}/${DISTRO}"
fi
if ! lnxrel="$lnxrel" unpack_linux_devel_rpm "$kernelrpm" "-"; then
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"
unpack_lustre
load_target
-EXTRA_VERSION_DELIMITER=${EXTRA_VERSION_DELIMITER:-"-"}
if [ -n "$OFED_VERSION" -a "$OFED_VERSION" != "inkernel" ]; then
download_ofed
build_with_srpm || fatal 1 "Failed to build_with_srpm"
else
+ EXTRA_VERSION_DELIMITER=${EXTRA_VERSION_DELIMITER:-"-"}
source ${0%/*}/lbuild.old_school
old_school_download_kernel