X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=build%2Flbuild-sles10;h=9ca55fe5f46fcf36e9f2d76f1a7c0a30a5487c1d;hp=fa02b4887394d4fb261db9cf562dbe90b21b64c2;hb=e1a285dfcc0bb70cc8c3dd0643c811a8c2cae57e;hpb=c9087b3536f47abfd1eee3d9eb194e4d775a6e95 diff --git a/build/lbuild-sles10 b/build/lbuild-sles10 index fa02b48..9ca55fe 100644 --- a/build/lbuild-sles10 +++ b/build/lbuild-sles10 @@ -1,32 +1,44 @@ # vim:expandtab:shiftwidth=4:softtabstop=4:tabstop=4: -DEVEL_KERNEL_TYPE="source" +# increment this if you have made a change that should force a new kernel +# to build built for this distribution (only -- if you want to force a kernel +# build on all distributions, update the BUILD_GEN variable in build/lbuild) +BUILD_GEN+=".0" -prepare_and_build_srpm() { +source ${0%/*}/lbuild-sles - pushd $TOPDIR >/dev/null - # seems there is a bug (on Ubuntu at least) where all of the .specs - # are not put into SPECS - mv SOURCES/*.spec SPECS/ +# the location of the ofed-devel-..rpm +OFED_DEVEL_LOCATION="$KERNELTREE" - # generate our buildid - local buildid="lustre${EXTRA_VERSION##*_lustre}" +# do we want to rebuild the OFED devel RPM or use the supplied one? +REBUILD_OFED_DEVEL_RPM=${REBUILD_OFED_DEVEL_RPM:-false} + +edit_specs() { # edit the SPECs with our changes local spec for spec in $RPMSMPTYPE source; do - #cp $TOPDIR/SPECS/kernel-$spec.spec{,.orig} - sed -i -e 's/^\(Name:.*kernel-\)\(.*\)/\1lustre-\2/' \ - -e "s/^Release:.*/&_${buildid}/" \ + #cp $TOPDIR/SOURCES/kernel-$spec.spec{,.orig} + sed -i -e "s/^Release:.*/&_${buildid}/" \ -e "s/^ExclusiveArch:.*/& ppc ppc64/" \ -e '/^# Apply the patches needed for this architecture\./a\ cp %_sourcedir/linux-2.6.16-lustre.patch %_builddir/%{name}-%{version}/lustre.patch\ ! grep -q lustre.patch %_sourcedir/series.conf && echo -e "\\n\\tlustre.patch" >> %_sourcedir/series.conf' \ -e "/flavor=\${config/a\ [ \"\$flavor\" == \"$RPMSMPTYPE\" ] || continue" \ - -e 's/\(.*\)\([^#].*\)fookernel-source/\1\2kernel-lustre-source/g' \ - -e '/^%build/,/^%changelog/s/kernel-\({*\)source/kernel-\1lustre-source/g' \ - SPECS/kernel-${spec}.spec + SOURCES/kernel-${spec}.spec || fatal 1 "Error while editing SOURCES/kernel-${spec}.spec" + + if $KERNEL_LUSTRE_NAMING; then + # these are all of the changes needed because we change the package names + # to kernel-lustre-*. these should all go away when we stop this insanity + sed -i -e 's/^\(Name:.*kernel-\)\(.*\)/\1lustre-\2/' \ + -e "/^Provides: *kernel = /a\ +Provides: kernel-$spec = %{version}-%{release} +" \ + -e 's/\(.*\)\([^#].*\)fookernel-source/\1\2kernel-lustre-source/g' \ + -e '/^%build/,/^%changelog/s/kernel-\({*\)source/kernel-\1lustre-source/g' \ + SOURCES/kernel-${spec}.spec || fatal 1 "Error while editing SOURCES/kernel-${spec}.spec" + fi # XXX - a building-on-Ubuntu hack if grep -q "Ubuntu" /etc/issue; then @@ -35,67 +47,192 @@ curl ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.17/2.6.17 -e 's/^\(BuildRequires: .*\)$/#NOU \1/g' \ -e 's/%(\(chmod .*\))$/%(bash -c "\1")/' \ -e 's/ -a 109//' \ - SPECS/kernel-${spec}.spec + SOURCES/kernel-${spec}.spec || fatal 1 "Error while editing SOURCES/kernel-${spec}.spec" fi -done - - # XXX - need to flesh this out per the rhel5 method - local targets - for arch in $BUILD_ARCHS; do - targets="--target $arch $targets" - mkdir -p config/$(basearch $arch) - cp $CONFIG_FILE config/$(basearch $arch)/$RPMSMPTYPE done +} - tar cjf SOURCES/config.tar.bz2 config - rm -rf config +unpack_linux_devel_rpm-sles10() { + local callers_rpm="$1" - # do we need any special rpm build options - local rpmbuildopt="-bb" - if $DO_SRC; then - rpmbuildopt="-ba" + # get the Module.symvers out of the kenrel-flavor RPM + local kernelrpm=${callers_rpm/-source-/-$RPMSMPTYPE-} + + if ! rpm2cpio < "$kernelrpm" | cpio -id ./usr/src/linux-${lnxmaj}${lnxmin}-${lnxrel}-obj/$(resolve_arch $TARGET_ARCH $PATCHLESS true)/$RPMSMPTYPE/Module.symvers ./boot/sym\* > /dev/null 2>&1; then + return 255 fi - # XXX - ignore the kabi changes. need to figure out what this is really - # all about. - touch SOURCES/IGNORE-KABI-BADNESS + # now just sanity check that everything needed to build properly versioned + # modules is in place + if [ ! -f usr/src/linux-${lnxmaj}${lnxmin}-${lnxrel}-obj/$(resolve_arch $TARGET_ARCH $PATCHLESS true)/$RPMSMPTYPE/Module.symvers ]; then + fatal 1 "cannot build kernel modules: the Kernel's Module.symvers is missing." + fi + if [ ! -f boot/symsets-${lnxmaj}${lnxmin}-${lnxrel}-$RPMSMPTYPE.tar.gz ]; then + fatal 1 "cannot build modules: the Kernel's symsets is missing." + fi + return 0 -# XXX temp speedup hack -#if false; then - # now build it - if ! $RPMBUILD $rpmbuildopt $targets \ - --define "_topdir $TOPDIR" \ - $TOPDIR/SPECS/kernel-$RPMSMPTYPE.spec >&2; then - fatal 1 "Failed to build kernel RPM" - fi -#fi +} - # for SLES10, we also need to build the kernel-source rpm - if ! $RPMBUILD $rpmbuildopt $targets \ - --define "_topdir $TOPDIR" \ - $TOPDIR/SPECS/kernel-source.spec >&2; then - fatal 1 "Failed to build kernel source RPM" - fi +build_sles_ofed_rpm() { + local variant="${1:+-$1}" + local add_spec_edit="$2" + + if $REBUILD_OFED_DEVEL_RPM; then + # + # rebuild the $variant rpm + # + + local SOURCE="${KERNELTREE}/ofed${variant}-${OFED_DEVEL_VERSION}.src.rpm" + + # dirty hack until Novell make the kernel-source location overridable + # - unpack the src.rpm, patch the .spec and re-pack up the src.rpm + mkdir -p ofed-rpm/S{PEC,OURCE,RPM}S + pushd ofed-rpm + rpm2cpio < $KERNELTREE/ofed${variant}-${OFED_DEVEL_VERSION}.src.rpm | cpio -id + ed ofed${variant}.spec <<"EOF" +/^%define kver /c +%define kver %(flavors=($(ls %kobjdir/%_target_cpu/)); if test -s %kobjdir/%_target_cpu/${flavors[0]}/include/linux/utsrelease.h ; then LINUXRELEASEHEADER=utsrelease.h; else LINUXRELEASEHEADER=version.h; fi; sed -ne "/^#define UTS_RELEASE/s/.*\\"\\\(.*\\\)-${flavors[0]}\\"$/\\1/p" %kobjdir/%_target_cpu/${flavors[0]}/include/linux/$LINUXRELEASEHEADER) +. +/^ --kernel-version=%kver-$flavor --kernel-sources=\/usr\/src\/linux-obj\/%_target_cpu\/\$flavor/c + --kernel-version=%kver-$flavor --kernel-sources=%kobjdir/%_target_cpu/$flavor +. +/^ make -C \/usr\/src\/linux-obj\/%_target_cpu\/\$flavor modules_install \\/c + make -C %kobjdir/%_target_cpu/$flavor modules_install \ +. +wq +EOF + if type -p edit_spec_ofed${variant}; then + edit_spec_ofed${variant} + fi + + mv ofed${variant}.spec SPECS + mv * SOURCES + mv SOURCES/S{PEC,RPM}S . + rpmbuild --bs --nodeps --define "_topdir $(pwd)" SPECS/ofed${variant}.spec 2>&1 || return 255 + popd + mv ofed-rpm/SRPMS/* ${TOPDIR}/SRPMS/ + rm -rf ofed-rpm + SOURCE="${TOPDIR}/SRPMS/ofed${variant}-${OFED_DEVEL_VERSION}.src.rpm" + # end of dirty hack + + # dirty hack until Novell make the kernel-source location overridable + # when building kmps + # XXX - this is very racy. let's hope we only ever have a single + # instance of this running at a time + local tmpfile + if [ -f ~/.rpmmacros ]; then + tmpfile=$(mktemp ~/.rpmmacros.XXXXXX) + cp ~/.rpmmacros $tmpfile + fi + cat <<"EOF" >~/.rpmmacros +# an overridable specification of where the linux-obj tree is located +%{!?kobjdir: %define kobjdir /usr/src/linux-obj} + +# Defines %flavors_to_build and %kernel_source() as a side effect. +%_kernel_module_package(n:v:r:s:f:Xp:) \ +%{expand:%( subpkg=%{-s*}%{!-s:/usr/lib/rpm/rpm-suse-kernel-module-subpackage} \ + echo "%%define _suse_kernel_module_subpackage(n:v:r:f:p:) %%{expand:%%(cd %_sourcedir; cat $subpkg; echo %%%%nil)}" \ + flavors="%{!-X:%*}%{-X:$(ls %kobjdir/%_target_cpu 2>/dev/null)}" \ + a_flavor=($flavors) + flavors_to_build= \ + if [ -s %kobjdir/%_target_cpu/${a_flavor}/include/linux/utsrelease.h ]; then + LINUXRELEASEHEADER=utsrelease.h + else + LINUXRELEASEHEADER=version.h + fi + kver=$(sed -ne "/^#define UTS_RELEASE/s/.*\\"\\\(.*\\\)-${a_flavor}\\"$/\\1/p" %kobjdir/%_target_cpu/${a_flavor}/include/linux/$LINUXRELEASEHEADER) + for flavor in $flavors; do \ + if [ -n "%{-X}" ]; then \ + case " %* " in \ + (*" $flavor "*) \ + continue ;; \ + esac \ + fi \ + krel=$(make -s -C %kobjdir/%_target_cpu/$flavor kernelrelease) \ + [ -e %symsetsdir/symsets-$krel.tar.gz ] || continue \ + flavors_to_build="$flavors_to_build $flavor" \ + echo "%%_suse_kernel_module_subpackage -n %{-n*}%{!-n:%name}-kmp -v %{-v*}%{!-v:%version} -r %{-r*}%{!-r:%release} %{-p} $flavor $krel $kver" \ + done \ + echo "%%global flavors_to_build${flavors_to_build:-%%nil}" \ + echo "%%global kernel_source() %kobjdir/%_target_cpu/%%%%{1}" \ + \ + echo "%package -n %{-n*}%{!-n:%name}-kmp-_dummy_" \ + echo "Version: %version" \ + echo "Summary: %summary" \ + echo "Group: %group" \ + echo "%description -n %{-n*}%{!-n:%name}-kmp-_dummy_" \ + )} +EOF + local targets + for arch in $BUILD_ARCHS; do + targets="--target $(resolve_arch $arch $PATCHLESS) $targets" + done + if ! $RPMBUILD --rebuild --nodeps $targets \ + --define "symsetsdir ${TOPDIR}/reused/boot" \ + --define "kobjdir ${LINUXOBJ%/*/*}" \ + --define "_tmppath /var/tmp" \ + --define "_topdir ${TOPDIR}" \ + ${SOURCE} 2>&1; then + rm ~/.rpmmacros + if [ -n "$tmpfile" ]; then + cp $tmpfile ~/.rpmmacros + rm $tmpfile + fi + return 255 + fi + rm ~/.rpmmacros + if [ -n "$tmpfile" ]; then + cp $tmpfile ~/.rpmmacros + rm $tmpfile + fi + fi # $REBUILD_OFED_DEVEL_RPM; then + +} + +# additional edits need to the ofed spec +edit_spec_ofed() { + + ed ofed.spec <<"EOF" +/^# we assume config.mk and the include files are same for all flavors/a +built_flavors=(%flavors_to_build) +. +/^cp obj\/default\/config\.mk \$RPM_BUILD_ROOT\/%{_prefix}\/src\/kernel-modules-ofed/c +cp obj/${built_flavors[0]}/config.mk $RPM_BUILD_ROOT/%{_prefix}/src/kernel-modules-ofed +. +/^for D in obj\/default\\\\include \$(sed 's@^.*-I\\\${CWD}\/@obj\/default\\\\@' obj\/default\/config.mk); do/c +for D in obj/${built_flavors[0]}\\include $(sed "s@^.*-I\${CWD}/@obj/${built_flavors[0]}\\\@" obj/${built_flavors[0]}/config.mk); do +. +wq +EOF } -devel_kernel_name() { - local lustre=${1:-false} +build_ofed-sles10() { + local outfd=$1 - if $lustre; then - echo "kernel-lustre-$DEVEL_KERNEL_TYPE" - else - echo "kernel-$DEVEL_KERNEL_TYPE" + if [ -z "$outfd" ] || [ $outfd = 1 ]; then + fatal 1 "You must supply a file descriptor to ${FUNCNAME[0]} and it cannot be 1" fi -} + if $REBUILD_OFED_DEVEL_RPM; then + build_sles_ofed_rpm cxgb3-NIC >&${outfd} || return ${PIPESTATUS[0]} + build_sles_ofed_rpm >&${outfd} || return ${PIPESTATUS[0]} + OFED_DEVEL_LOCATION="${TOPDIR}/RPMS/$(resolve_arch $TARGET_ARCH $PATCHLESS)" + fi # $REBUILD_OFED_DEVEL_RPM; then + + # XXX I'm not convinced this belongs in here, but really, this is a + # 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 || ! $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 || ! $REBUILD_OFED_DEVEL_RPM")/$RPMSMPTYPE" + fi -rpm_BUILD_kernel_dirname() { - local rpmsmptype="$1" - local lnxmaj="$2" - local lnxmin="$3" - local arch="$4" + return 0 - echo kernel-lustre-${rpmsmptype}-${lnxmaj}${lnxmin}/linux-${lnxmaj} }