From 03caac8396cbecfbef49752c33b7645cd9d42a8f Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Sun, 8 Oct 2017 21:52:53 +0200
Subject: [PATCH 1/2] scripts/unpack: apply *.patch

---
 scripts/unpack | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/unpack b/scripts/unpack
index 21dd0db371..ce8845c76e 100755
--- a/scripts/unpack
+++ b/scripts/unpack
@@ -125,8 +125,8 @@ if [ -d "$SOURCES/$1" -o -d "$PKG_DIR/sources" ]; then
     done
   fi
 
-  for i in $PKG_DIR/patches/$PKG_NAME-*.patch \
-           $PKG_DIR/patches/$PATCH_ARCH/$PKG_NAME-*.patch \
+  for i in $PKG_DIR/patches/*.patch \
+           $PKG_DIR/patches/$PATCH_ARCH/*.patch \
            $PATCH_DIRS_PKG \
            $PKG_DIR/patches/$PKG_VERSION/*.patch \
            $PKG_DIR/patches/$PKG_VERSION/$PATCH_ARCH/*.patch \

From 82bc756eacd08510ee8f1065119e56b12dbe6b34 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Sun, 8 Oct 2017 21:52:53 +0200
Subject: [PATCH 2/2] scripts/unpack: apply device specific PKG_PATCH_DIRS

---
 scripts/unpack | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/unpack b/scripts/unpack
index ce8845c76e..4fec596070 100755
--- a/scripts/unpack
+++ b/scripts/unpack
@@ -122,6 +122,7 @@ if [ -d "$SOURCES/$1" -o -d "$PKG_DIR/sources" ]; then
     for patch_dir in $PKG_PATCH_DIRS; do
       [ -d $PKG_DIR/patches/$patch_dir ] && PATCH_DIRS_PKG="$PATCH_DIRS_PKG $PKG_DIR/patches/$patch_dir/*.patch"
       [ -d $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$patch_dir ] && PATCH_DIRS_PRJ="$PATCH_DIRS_PRJ $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$patch_dir/*.patch"
+      [ -d $PROJECT_DIR/$PROJECT/devices/$DEVICE/patches/$PKG_NAME/$patch_dir ] && PATCH_DIRS_PRJ="$PATCH_DIRS_PRJ $PROJECT_DIR/$PROJECT/devices/$DEVICE/patches/$PKG_NAME/$patch_dir/*.patch"
     done
   fi
 
@@ -157,6 +158,8 @@ if [ -d "$SOURCES/$1" -o -d "$PKG_DIR/sources" ]; then
     else
       if [[ "$thisdir" =~ ^$PKG_DIR/.* ]]; then
         PATCH_DESC="(common - $(basename "$thisdir"))"
+      elif [[ "$thisdir" =~ ^$PROJECT_DIR/.*/devices/.* ]]; then
+        PATCH_DESC="(device - $(basename "$thisdir"))"
       elif [[ "$thisdir" =~ ^$PROJECT_DIR/.* ]]; then
         PATCH_DESC="(project - $(basename "$thisdir"))"
       else