From baa24fdcf908c2b58d00b13f97bf41b1b6f7fe0e Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Wed, 11 Oct 2017 07:13:51 +0200
Subject: [PATCH] Fix kernel.SlackBuild for 14.1

---
 convert32pkg.sh   |  5 +++--
 kernel.SlackBuild | 11 ++++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/convert32pkg.sh b/convert32pkg.sh
index 2663f12..bd806e7 100755
--- a/convert32pkg.sh
+++ b/convert32pkg.sh
@@ -108,8 +108,9 @@ if [ -f install/doinst.sh ]; then
         sed -i -e '/^if \[ \(-e etc\/rc.d\/rc.messagebus\|-r etc\/rc.d\/rc.messagebus.new\) \]; then/,/^fi/d' install/doinst.sh
     fi
 
-    # Extract all lines treating with symlinks. See /sbin/removepkg
-    sed -n -e 's,^[ ]*( [ ]*cd[ ]* .* [ ]*; [ ]*\(rm\|ln\) [ ]*-\(rf\|sf\)[ ]* .* [ ]*)[ ]*$,&,p' -e 's,^[ ]*config .*[ ]*$,&,p' install/doinst.64 > install/doinst
+    # Extract all lines treating with symlinks or config files. See /sbin/removepkg
+    sed -n -e 's,^[ ]*( [ ]*cd[ ]* .* [ ]*; [ ]*\(rm\|ln\) [ ]*-\(rf\|sf\)[ ]* .* [ ]*)[ ]*$,&,p' \
+           -e 's,^[ ]*config .*[ ]*$,&,p' install/doinst.64 > install/doinst
     rm install/doinst.64
 
     echo
diff --git a/kernel.SlackBuild b/kernel.SlackBuild
index 073ea3d..1d67d91 100755
--- a/kernel.SlackBuild
+++ b/kernel.SlackBuild
@@ -119,8 +119,7 @@ cp System.map $PKG
 cp .config $PKG/config
 
 # Copy the packaging SlackBuild
-cp $CWD/packaging-$ARCH/kernel-huge/kernel-huge.SlackBuild $PKG
-cp $CWD/packaging-$ARCH/kernel-huge/slack-desc $PKG
+cp -aT $CWD/packaging-$ARCH/kernel-huge $PKG
 
 # Run the packaging SlackBuild
 cd $PKG
@@ -147,8 +146,7 @@ cp System.map $PKG
 cp .config $PKG/config
 
 # Copy the packaging SlackBuild
-cp $CWD/packaging-$ARCH/kernel-generic/kernel-generic.SlackBuild $PKG
-cp $CWD/packaging-$ARCH/kernel-generic/slack-desc $PKG
+cp -aT $CWD/packaging-$ARCH/kernel-generic $PKG
 
 # Run the packaging SlackBuild
 cd $PKG
@@ -175,11 +173,10 @@ ln -s /usr/src/$PKGNAM-$VERSION $PKG/lib/modules/$VERSION/build
 ln -s /usr/src/$PKGNAM-$VERSION $PKG/lib/modules/$VERSION/source
 
 # Copy the packaging SlackBuild
-cp $CWD/packaging-$ARCH/kernel-modules/kernel-modules.SlackBuild $PKG
-cp $CWD/packaging-$ARCH/kernel-modules/slack-desc $PKG
+cp -aT $CWD/packaging-$ARCH/kernel-modules $PKG
 
 # Prefix absolute module paths in the SlackBuild with $CWD, since we installed the modules there
-sed -i -e 's@/lib/modules/${KERNELRELEASE}@$CWD&@' $PKG/kernel-modules.SlackBuild
+sed -i -e 's@/lib/modules/@$CWD&@' $PKG/kernel-modules.SlackBuild
 
 # Run the packaging SlackBuild
 cd $PKG