lkml.org 
[lkml]   [2015]   [May]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] build: fix broken kernel RPM source symlink
Date
Fix the 'rpm-pkg' makefile target to always generate the correct
/usr/src/kernel/<ver> symlink; this fails on non-RPM-native systems
eg Ubuntu.

On a non-RPM-native system, the symlink created by rpmbuild points to
the source tree, so the ln -sf commands to overwrite build and source will
create a new link inside the directory pointed to by the build and source
symlinks. This will break the -devel.rpm, as the build and source symlinks
will point to non existing directories after installing them.

Candidate for stable.

Signed-off-by: Espen Carlsen <ec@numascale.com>
---
scripts/package/mkspec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/package/mkspec b/scripts/package/mkspec
index d9ab94b..2d28d48 100755
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -123,8 +123,8 @@ echo "mkdir -p "'$RPM_BUILD_ROOT'"/usr/src/kernels/$KERNELRELEASE"
echo "EXCLUDES=\"$RCS_TAR_IGNORE --exclude .tmp_versions --exclude=*vmlinux* --exclude=*.o --exclude=*.ko --exclude=*.cmd --exclude=Documentation --exclude=firmware --exclude .config.old --exclude .missing-syscalls.d\""
echo "tar "'$EXCLUDES'" -cf- . | (cd "'$RPM_BUILD_ROOT'"/usr/src/kernels/$KERNELRELEASE;tar xvf -)"
echo 'cd $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE"
-echo "ln -sf /usr/src/kernels/$KERNELRELEASE build"
-echo "ln -sf /usr/src/kernels/$KERNELRELEASE source"
+echo "ln -sfT /usr/src/kernels/$KERNELRELEASE build"
+echo "ln -sfT /usr/src/kernels/$KERNELRELEASE source"
fi

echo ""
--
1.9.1


\
 
 \ /
  Last update: 2015-05-08 10:01    [W:0.039 / U:0.816 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site