aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorÁlvaro Fernández Rojas <noltari@gmail.com>2020-11-25 10:25:01 +0100
committerÁlvaro Fernández Rojas <noltari@gmail.com>2020-11-25 10:30:44 +0100
commit367877844586c6a219b03ce2d064ead451318b98 (patch)
tree37b1d5397d345496059192c04bc7dd4dd5937052
parentbbe302d2b6edd092db943c4ad9fb541acc49148f (diff)
downloadupstream-367877844586c6a219b03ce2d064ead451318b98.tar.gz
upstream-367877844586c6a219b03ce2d064ead451318b98.tar.bz2
upstream-367877844586c6a219b03ce2d064ead451318b98.zip
cypress-firmware: add proper package conflicts
There are linux firmwares packages for 43362, 43430 and 43455 which shouldn't be installed at the same time as Cypress firmwares. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
-rw-r--r--package/firmware/cypress-firmware/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/package/firmware/cypress-firmware/Makefile b/package/firmware/cypress-firmware/Makefile
index 73c3cfc711..d881384006 100644
--- a/package/firmware/cypress-firmware/Makefile
+++ b/package/firmware/cypress-firmware/Makefile
@@ -11,7 +11,7 @@ UNPACK_CMD=unzip -q -p $(DL_DIR)/$(PKG_SOURCE) $(PKG_SOURCE_UNZIP) | gzip -dc |
PKG_NAME:=cypress-firmware
PKG_VERSION:=v5.4.18-2020_0402
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PKG_SOURCE_UNZIP:=cypress-firmware-$(PKG_VERSION).tar.gz
PKG_SOURCE:=cypress-fmac-$(PKG_VERSION).zip
@@ -70,6 +70,7 @@ define Package/cypress-firmware-43362-sdio
$(Package/cypress-firmware-default)
TITLE:=CYW43362 FullMac SDIO firmware
PROVIDES:=brcmfmac-firmware-43362-sdio
+ CONFLICTS:=brcmfmac-firmware-43362-sdio
endef
define Package/cypress-firmware-43362-sdio/install
@@ -101,6 +102,7 @@ define Package/cypress-firmware-43430-sdio
$(Package/cypress-firmware-default)
TITLE:=CYW43430 FullMac SDIO firmware
PROVIDES:=brcmfmac-firmware-43430-sdio
+ CONFLICTS:=brcmfmac-firmware-43430-sdio
endef
define Package/cypress-firmware-43430-sdio/install
@@ -120,6 +122,7 @@ define Package/cypress-firmware-43455-sdio
$(Package/cypress-firmware-default)
TITLE:=CYW43455 FullMac SDIO firmware
PROVIDES:=brcmfmac-firmware-43455-sdio
+ CONFLICTS:=brcmfmac-firmware-43455-sdio
endef
define Package/cypress-firmware-43455-sdio/install