From 50343d62dc8fc6ab125e57b3513adce7df7f1af0 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 13 Oct 2017 11:30:22 +0200 Subject: [PATCH 1/3] gpu-aml: fix install path after PR1835 Signed-off-by: Matthias Reichl --- packages/linux-drivers/gpu-aml/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux-drivers/gpu-aml/package.mk b/packages/linux-drivers/gpu-aml/package.mk index 3f8ddfb8d0..d428bd6cc3 100644 --- a/packages/linux-drivers/gpu-aml/package.mk +++ b/packages/linux-drivers/gpu-aml/package.mk @@ -42,6 +42,6 @@ make_target() { makeinstall_target() { LDFLAGS="" make -C $(kernel_path) M=$PKG_BUILD/mali \ - INSTALL_MOD_PATH=$INSTALL/usr INSTALL_MOD_STRIP=1 DEPMOD=: \ + INSTALL_MOD_PATH=$INSTALL/$(get_kernel_overlay_dir) INSTALL_MOD_STRIP=1 DEPMOD=: \ modules_install } From dfa8e8615116a6da9b9568e96301b97096f031e1 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 13 Oct 2017 11:31:19 +0200 Subject: [PATCH 2/3] brcmfmac_sdio-firmware-aml: fix install path after PR1835 Signed-off-by: Matthias Reichl --- .../brcmfmac_sdio-firmware-aml/package.mk | 3 +++ ...firmware-aml-0001-install-firmware-in-usr.patch | 14 -------------- 2 files changed, 3 insertions(+), 14 deletions(-) delete mode 100644 packages/linux-firmware/brcmfmac_sdio-firmware-aml/patches/brcmfmac_sdio-firmware-aml-0001-install-firmware-in-usr.patch diff --git a/packages/linux-firmware/brcmfmac_sdio-firmware-aml/package.mk b/packages/linux-firmware/brcmfmac_sdio-firmware-aml/package.mk index 5566c28452..da49ef5d5c 100644 --- a/packages/linux-firmware/brcmfmac_sdio-firmware-aml/package.mk +++ b/packages/linux-firmware/brcmfmac_sdio-firmware-aml/package.mk @@ -31,3 +31,6 @@ PKG_LONGDESC="Firmware for Broadcom Bluetooth devices used in some Amlogic based PKG_IS_ADDON="no" PKG_AUTORECONF="no" +makeinstall_target() { + DESTDIR=$INSTALL/$(get_kernel_overlay_dir) make install +} diff --git a/packages/linux-firmware/brcmfmac_sdio-firmware-aml/patches/brcmfmac_sdio-firmware-aml-0001-install-firmware-in-usr.patch b/packages/linux-firmware/brcmfmac_sdio-firmware-aml/patches/brcmfmac_sdio-firmware-aml-0001-install-firmware-in-usr.patch deleted file mode 100644 index 839f4adfeb..0000000000 --- a/packages/linux-firmware/brcmfmac_sdio-firmware-aml/patches/brcmfmac_sdio-firmware-aml-0001-install-firmware-in-usr.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur a/Makefile b/Makefile ---- a/Makefile 2014-10-07 14:00:34.000000000 -0700 -+++ b/Makefile 2016-12-06 11:24:34.855522455 -0800 -@@ -15,8 +15,8 @@ - install: - mkdir -p $(DESTDIR)/usr/bin - cp -P $(PROG) $(DESTDIR)/usr/bin -- mkdir -p $(DESTDIR)/lib/firmware -- cp -PR firmware/brcm $(DESTDIR)/lib/firmware/ -+ mkdir -p $(DESTDIR)/usr/lib/firmware -+ cp -PR firmware/brcm $(DESTDIR)/usr/lib/firmware/ - - clean: - rm -f $(PROG) From 530235efd5eb26b73ec88217c28ee70fc0f72059 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 13 Oct 2017 11:32:53 +0200 Subject: [PATCH 3/3] brcmfmac_sdio-firmware-imx: fix install path after PR1835 Signed-off-by: Matthias Reichl --- .../brcmfmac_sdio-firmware-imx/package.mk | 3 +++ ...firmware-imx-0001-install-firmware-in-usr.patch | 14 -------------- 2 files changed, 3 insertions(+), 14 deletions(-) delete mode 100644 packages/linux-firmware/brcmfmac_sdio-firmware-imx/patches/brcmfmac_sdio-firmware-imx-0001-install-firmware-in-usr.patch diff --git a/packages/linux-firmware/brcmfmac_sdio-firmware-imx/package.mk b/packages/linux-firmware/brcmfmac_sdio-firmware-imx/package.mk index 6f4a7e3733..a56119c096 100644 --- a/packages/linux-firmware/brcmfmac_sdio-firmware-imx/package.mk +++ b/packages/linux-firmware/brcmfmac_sdio-firmware-imx/package.mk @@ -31,3 +31,6 @@ PKG_LONGDESC="Firmware for Broadcom Bluetooth chips used in some Freescale iMX b PKG_IS_ADDON="no" PKG_AUTORECONF="no" +makeinstall_target() { + DESTDIR=$INSTALL/$(get_kernel_overlay_dir) make install +} diff --git a/packages/linux-firmware/brcmfmac_sdio-firmware-imx/patches/brcmfmac_sdio-firmware-imx-0001-install-firmware-in-usr.patch b/packages/linux-firmware/brcmfmac_sdio-firmware-imx/patches/brcmfmac_sdio-firmware-imx-0001-install-firmware-in-usr.patch deleted file mode 100644 index 839f4adfeb..0000000000 --- a/packages/linux-firmware/brcmfmac_sdio-firmware-imx/patches/brcmfmac_sdio-firmware-imx-0001-install-firmware-in-usr.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur a/Makefile b/Makefile ---- a/Makefile 2014-10-07 14:00:34.000000000 -0700 -+++ b/Makefile 2016-12-06 11:24:34.855522455 -0800 -@@ -15,8 +15,8 @@ - install: - mkdir -p $(DESTDIR)/usr/bin - cp -P $(PROG) $(DESTDIR)/usr/bin -- mkdir -p $(DESTDIR)/lib/firmware -- cp -PR firmware/brcm $(DESTDIR)/lib/firmware/ -+ mkdir -p $(DESTDIR)/usr/lib/firmware -+ cp -PR firmware/brcm $(DESTDIR)/usr/lib/firmware/ - - clean: - rm -f $(PROG)