Skip to content
Snippets Groups Projects
Commit 8e32ec6b authored by Brian J. Murrell's avatar Brian J. Murrell
Browse files

b=15482

i=cliffw
i=wangyb

A forgotten small portion of the previous commit for this bug.
parent 0fe560ea
No related branches found
No related tags found
No related merge requests found
...@@ -715,7 +715,7 @@ if [ "%{buildbase}" -ne 0 ] ; then ...@@ -715,7 +715,7 @@ if [ "%{buildbase}" -ne 0 ] ; then
if [ "%{buildup}" -ne 0 ] ; then if [ "%{buildup}" -ne 0 ] ; then
BuildObj up BuildObj up
fi fi
perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = %{kextraverdelim}%{kextraver}custom/" $RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}/Makefile perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = %{kextraverdelim}%{kextraver}%{flavordelim}custom/" $RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}/Makefile
# Remove $RPM_BUILD_ROOT prefix from symlinks. # Remove $RPM_BUILD_ROOT prefix from symlinks.
for link in $(find $objdir -type l); do for link in $(find $objdir -type l); do
target=$(readlink $link) target=$(readlink $link)
...@@ -723,7 +723,7 @@ if [ "%{buildbase}" -ne 0 ] ; then ...@@ -723,7 +723,7 @@ if [ "%{buildbase}" -ne 0 ] ; then
ln -s ${target/$RPM_BUILD_ROOT/} $link ln -s ${target/$RPM_BUILD_ROOT/} $link
done done
else # 2.4 rh-style else # 2.4 rh-style
perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = %{kextraverdelim}%{kextraver}custom/" $RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}/Makefile perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = %{kextraverdelim}%{kextraver}%{flavordelim}custom/" $RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}/Makefile
# get the one from the build we just completed as it might have picked # get the one from the build we just completed as it might have picked
# up new options # up new options
#cp ../lustre/kernel_patches/kernel_configs/kernel-%{kversion}-@LUSTRE_TARGET@-%{_target_cpu}%{dashtargetboard}.config $RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}/.config #cp ../lustre/kernel_patches/kernel_configs/kernel-%{kversion}-@LUSTRE_TARGET@-%{_target_cpu}%{dashtargetboard}.config $RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}/.config
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment