linux-libre-dtb: add new package to [libre], dtbs files will be built from it for all kernels like linux-libre-firmware

1 files changed, 4 insertions, 3 deletions

diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 655c8c651..b1665d2c7 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -107,7 +107,7 @@ prepare() {
     patch -p1 -i "${srcdir}/patch-${_pkgbasever}-${_pkgver}"
   fi
 
-  if [ "${CARCH}" == "armv7h" ]; then
+  if [ "${CARCH}" = "armv7h" ]; then
 
     # RCN patch (CM3 firmware deblobbed)
     patch -p1 -i "${srcdir}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch"
@@ -170,7 +170,7 @@ build() {
   if [ "${CARCH}" != "armv7h" ]; then
     make ${MAKEFLAGS} LOCALVERSION= bzImage modules
   else
-    make ${MAKEFLAGS} LOCALVERSION= zImage modules dtbs
+    make ${MAKEFLAGS} LOCALVERSION= zImage modules
   fi
 }
 
@@ -180,6 +180,8 @@ _package() {
   depends=('coreutils' 'linux-libre-firmware' 'kmod')
   if [ "${CARCH}" != "armv7h" ]; then
     depends+=('mkinitcpio>=0.7')
+  else
+    depends+=("linux-libre-dtb=${pkgver}")
   fi
   optdepends=('crda: to set the correct wireless channels of your country')
   provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}")
@@ -206,7 +208,6 @@ _package() {
     cp arch/$KARCH/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}"
   else
     cp arch/$KARCH/boot/zImage "${pkgdir}/boot/vmlinuz-${pkgbase}"
-    cp arch/$KARCH/boot/dts/*.dtb "${pkgdir}/boot/dtbs"
 
     for _arm in armada-{370-smileplug,370-mirabox,xp-openblocks-ax3-4} dove-{d3plug,cubox}; do
       cat arch/$KARCH/boot/zImage arch/$KARCH/boot/dts/${_arm}.dtb > myimage-${_arm}