From acadae4c45fe5caae69f49e46d5f0a137f7322b6 Mon Sep 17 00:00:00 2001 From: Minh Diep Date: Thu, 13 Oct 2016 14:10:33 -0700 Subject: [PATCH] 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 Reviewed-on: http://review.whamcloud.com/23166 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Bob Glossman Reviewed-by: Dmitry Eremin Reviewed-by: Oleg Drokin --- contrib/lbuild/lbuild-sles | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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 } -- 1.8.3.1