From: Minh Diep <minh.diep@intel.com>
Date: Thu, 13 Oct 2016 21:10:33 +0000 (-0700)
Subject: LU-8707 build: fix lbuild-sles for kernel_module_package
X-Git-Tag: 2.8.60~3
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;ds=sidebyside;h=refs%2Fchanges%2F66%2F23166%2F6;p=fs%2Flustre-release.git

LU-8707 build: fix lbuild-sles for kernel_module_package

kernel_module_package macro also checking for
/boot/symsets-$kver-$flavor.tag.gz
in case of lbuild, we need to point it to lbuild
kernel-source directory

Change-Id: I3cf9c1f43fe9ea543f67967773fc8715325a47e9
Signed-off-by: Minh Diep <minh.diep@intel.com>
Reviewed-on: http://review.whamcloud.com/23166
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/contrib/lbuild/lbuild-sles b/contrib/lbuild/lbuild-sles
index 8ceccd0..3419fb6 100644
--- a/contrib/lbuild/lbuild-sles
+++ b/contrib/lbuild/lbuild-sles
@@ -128,8 +128,10 @@ find_linux_devel_paths() {
 
 	# We modify %kernel_module_package macro to use the linux obj
 	# that lbuild install, not the OS installed /usr/src
-	sed -i "/^%kernel_module_package/,/^)}$/d" $RMAC
-	sed -e "s/\/usr\/src/${path//\//\\/}\/usr\/src/" ${SUSE_MACROS} >> $RMAC
+	sed -i -e "/^%kernel_module_package/,/^)}$/d" \
+	    -e "/^# A few cross-distro definitions/d" $RMAC
+	sed -e "s/\/usr\/src/${path//\//\\/}\/usr\/src/" \
+	    -e "s/\/boot/${path//\//\\/}\/boot/" ${SUSE_MACROS} >> $RMAC
 
 	return 0
 }
@@ -147,5 +149,6 @@ find_linux_release() {
 
 # cleanup the modified/added rpmmacros
 cleanup_rpmmacros() {
-	sed -i "/^%kernel_module_package/,/^)}$/d" $RMAC
+	sed -i -e "/^%kernel_module_package/,/^)}$/d" \
+	    -e "/^# A few cross-distro definitions/d" $RMAC
 }