Skip to content
This repository was archived by the owner on Aug 5, 2024. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions do-update-makerpm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -263,12 +263,18 @@ elif [[ $ID == "sles" ]]; then
if [[ $VERSION_ID == "15" ]]; then
distro_dir=SLES12SP4
fi
else
distro_dir=RH83
compat_dir=RH83
fi

if [[ ! -d $PWD/compat/$compat_dir ]]; then
echo "compat directory $compat_dir is missing, cannot build"
exit
fi

echo "compat_dir_path = $PWD/compat/$compat_dir"

if [[ -d $PWD/distro/$distro_dir/ipoib ]]; then
ln -s $PWD/distro/$distro_dir/ipoib drivers/infiniband/ulp/ipoib
aipbuild="true"
Expand Down Expand Up @@ -452,10 +458,10 @@ if [ "$DEFAULT_KERNEL_VERSION" == "" ]; then
fi

if echo $srcdir | grep -q "components"; then
rpmrelease=$(git rev-list WFR_driver_first..HEAD -- $srcdir | wc -l)
rpmrelease=$(git rev-list opa-10_11_0_1..HEAD -- $srcdir | wc -l)
echo "ifs-all build"
else
rpmrelease=$(cd "$srcdir"; git rev-list "WFR_driver_first..HEAD" | wc -l)
rpmrelease=$(cd "$srcdir"; git rev-list "opa-10_11_0_1..HEAD" | wc -l)
echo "wfr-linux-devel build"
fi
rpmrelease=$((rpmrelease + 1400))
Expand All @@ -478,8 +484,9 @@ then
kernel_rpmver=$(rpm -q --qf %{VERSION} kernel-$(uname -r))
kmod_subdir=extra
else
kernel_rpmver=$(rpm -q --qf %{VERSION} kernel-default)
#kernel_rpmver=$(rpm -q --qf ${DEFAULT_KERNEL_VERSION} kernel-default)
kmod_subdir=updates
kernel_rpmver="${DEFAULT_KERNEL_VERSION}"
fi
# create a new $rpmname.conf and $rpmname.files
src_path=$workdir/rpmbuild/SOURCES/
Expand All @@ -502,6 +509,7 @@ echo "Copy the working files to $tardir"
pushd $srcdir/$kerneldir
for (( i = 0 ; i <= modules_cnt ; i++ ))
do
echo "$files_to_copy[$i] $tardir/$modules[$i]/"
cp ${files_to_copy[$i]} $tardir/${modules[$i]}/
done
echo "Copying header files"
Expand All @@ -520,8 +528,9 @@ cd $workdir
# create the spec file
echo "Creating spec file"

if [ $distro = 'rhel' ]
then
if [ $distro = 'rhel' ]; then
cp $filedir/$rpmname.spec.rhel $workdir/rpmbuild/SPECS/$rpmname.spec
elif [ $distro = 'ubuntu' ]; then
cp $filedir/$rpmname.spec.rhel $workdir/rpmbuild/SPECS/$rpmname.spec
else
cp $filedir/$rpmname.spec.sles $workdir/rpmbuild/SPECS/$rpmname.spec
Expand Down
5 changes: 3 additions & 2 deletions files/ifs-kernel-updates.spec.rhel
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,16 @@ Source0: %{name}-RPMVERSION.tgz
Source1: %{name}.files
Source2: %{name}.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: %kernel_module_package_buildreqs
#BuildRequires: %kernel_module_package_buildreqs

%global __os_install_post %{nil}
%define debug_package %{nil}

%define arch %(uname -p)
Requires: kernel = %(echo %{kver} | sed -e 's/\(.*\)\.%{arch}/\1/g')

%kernel_module_package -f %{SOURCE1} default
#%kernel_module_package
#kmod -f {SOURCE1} default

# find our target version
%global kbuild %(
Expand Down
4 changes: 3 additions & 1 deletion files/ifs-kernel-updates.spec.sles
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ Source0: %{name}-RPMVERSION.tgz
Source1: %{name}.files
Source2: %{name}.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: %kernel_module_package_buildreqs
BuildRequires: %{_bindir}/kmodtool

# %kernel_module_package_buildreqs

Requires: kernel = %(echo %{kver} | sed -e 's/\(.*\).default/\1/g')

Expand Down