domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cypress-nvram: remove PROVIDES in NVRAM packages

Browse Source 
PROVIDES for these packages will cause ambiguity and circular dependency
in planned changes.

For example, if there is a package `brcmfmac-firmware-43455-sdio-rpi-cm4`
that depends on `brcmfmac-firmware-43455-sdio-rpi-4b`, there is no way to
tell which one of below packages the system will go for.

 - package named `brcmfmac-firmware-43455-sdio-rpi-4b`
 - package named `cypress-nvram-43455-sdio-rpi-4b` that PROVIDES
   `brcmfmac-firmware-43455-sdio-rpi-4b`

When ambiguity is unacceptable, PROVIDES (aliases) shall be removed and
packages shall only be used through their exact name.

So remove PROVIDES and keep only CONFLICTS.

Signed-off-by: Kuan-Yi Li <kyli@abysm.org>
This commit is contained in:
Kuan-Yi Li
2022-10-22 23:04:30 +08:00
committed by Álvaro Fernández Rojas
parent ebe2b7190b
commit ce6f86e134
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
package/firmware/cypress-nvram/Makefile
View File

@@ -11,7 +11,7 @@ PKG_NAME:=cypress-nvram
PKG_SOURCE_DATE:=2019-09-03 PKG_SOURCE_DATE:=2019-09-03
PKG_SOURCE_VERSION:=e7b78df22f2a0c5f56abb7b5880661611de35e5f PKG_SOURCE_VERSION:=e7b78df22f2a0c5f56abb7b5880661611de35e5f
PKG_MIRROR_HASH:=1cb20a749696852be0a512d51961365dd9c031362af0af1a2b9f5a3fb894885f PKG_MIRROR_HASH:=1cb20a749696852be0a512d51961365dd9c031362af0af1a2b9f5a3fb894885f
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/openwrt/cypress-nvram.git PKG_SOURCE_URL:=https://github.com/openwrt/cypress-nvram.git
@@ -37,7 +37,6 @@ define Package/cypress-nvram-43430-sdio-rpi-3b
$(Package/cypress-nvram-default) $(Package/cypress-nvram-default)
TITLE:=CYW43430 NVRAM for Raspberry Pi 3B TITLE:=CYW43430 NVRAM for Raspberry Pi 3B
DEPENDS:=@TARGET_bcm27xx DEPENDS:=@TARGET_bcm27xx
PROVIDES:=brcmfmac-firmware-43430-sdio-rpi-3b
CONFLICTS:=brcmfmac-firmware-43430-sdio-rpi-3b CONFLICTS:=brcmfmac-firmware-43430-sdio-rpi-3b
endef endef
@@ -55,7 +54,6 @@ define Package/cypress-nvram-43430-sdio-rpi-zero-w
$(Package/cypress-nvram-default) $(Package/cypress-nvram-default)
TITLE:=CYW43430 NVRAM for Raspberry Pi Zero W TITLE:=CYW43430 NVRAM for Raspberry Pi Zero W
DEPENDS:=@TARGET_bcm27xx DEPENDS:=@TARGET_bcm27xx
PROVIDES:=brcmfmac-firmware-43430-sdio-rpi-zero-w
CONFLICTS:=brcmfmac-firmware-43430-sdio-rpi-zero-w CONFLICTS:=brcmfmac-firmware-43430-sdio-rpi-zero-w
endef endef
@@ -73,7 +71,6 @@ define Package/cypress-nvram-43455-sdio-rpi-3b-plus
$(Package/cypress-nvram-default) $(Package/cypress-nvram-default)
TITLE:=CYW43455 NVRAM for Raspberry Pi 3B+ TITLE:=CYW43455 NVRAM for Raspberry Pi 3B+
DEPENDS:=@TARGET_bcm27xx DEPENDS:=@TARGET_bcm27xx
PROVIDES:=brcmfmac-firmware-43455-sdio-rpi-3b-plus
CONFLICTS:=brcmfmac-firmware-43455-sdio-rpi-3b-plus CONFLICTS:=brcmfmac-firmware-43455-sdio-rpi-3b-plus
endef endef
@@ -91,7 +88,6 @@ define Package/cypress-nvram-43455-sdio-rpi-4b
$(Package/cypress-nvram-default) $(Package/cypress-nvram-default)
TITLE:=CYW43455 NVRAM for Raspberry Pi 4B TITLE:=CYW43455 NVRAM for Raspberry Pi 4B
DEPENDS:=@TARGET_bcm27xx DEPENDS:=@TARGET_bcm27xx
PROVIDES:=brcmfmac-firmware-43455-sdio-rpi-4b
CONFLICTS:=brcmfmac-firmware-43455-sdio-rpi-4b CONFLICTS:=brcmfmac-firmware-43455-sdio-rpi-4b
endef endef
@@ -112,7 +108,6 @@ define Package/cypress-nvram-4339-pico-pi-imx7d
$(Package/cypress-nvram-default) $(Package/cypress-nvram-default)
TITLE:=BCM4339 NVRAM for TechNexion PICO-PI-IMX7D TITLE:=BCM4339 NVRAM for TechNexion PICO-PI-IMX7D
DEPENDS:=@TARGET_imx_cortexa7 DEPENDS:=@TARGET_imx_cortexa7
PROVIDES:=brcmfmac-firmware-4339-pico-pi-imx7d
CONFLICTS:=brcmfmac-firmware-4339-pico-pi-imx7d CONFLICTS:=brcmfmac-firmware-4339-pico-pi-imx7d
endef endef