diff options
| author | Kuan-Yi Li <kyli@abysm.org> | 2022-10-22 23:04:30 +0800 |
|---|---|---|
| committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2022-11-15 20:46:12 +0100 |
| commit | ce6f86e1344ccf79b8f8bcd0923f0865b9eb8db4 (patch) | |
| tree | cb4cce755eaa4b99b2ddd87b5a9d357b429ea6b2 | |
| parent | ebe2b7190b7d8815a588eaf8a5cfdf9edfd85c36 (diff) | |
| download | upstream-ce6f86e1344ccf79b8f8bcd0923f0865b9eb8db4.tar.gz upstream-ce6f86e1344ccf79b8f8bcd0923f0865b9eb8db4.tar.bz2 upstream-ce6f86e1344ccf79b8f8bcd0923f0865b9eb8db4.zip | |
cypress-nvram: remove PROVIDES in NVRAM packages
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>
| -rw-r--r-- | package/firmware/cypress-nvram/Makefile | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/package/firmware/cypress-nvram/Makefile b/package/firmware/cypress-nvram/Makefile index f8b45fbef2..2bf71cd889 100644 --- a/package/firmware/cypress-nvram/Makefile +++ b/package/firmware/cypress-nvram/Makefile @@ -11,7 +11,7 @@ PKG_NAME:=cypress-nvram PKG_SOURCE_DATE:=2019-09-03 PKG_SOURCE_VERSION:=e7b78df22f2a0c5f56abb7b5880661611de35e5f PKG_MIRROR_HASH:=1cb20a749696852be0a512d51961365dd9c031362af0af1a2b9f5a3fb894885f -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=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) TITLE:=CYW43430 NVRAM for Raspberry Pi 3B DEPENDS:=@TARGET_bcm27xx - PROVIDES:=brcmfmac-firmware-43430-sdio-rpi-3b CONFLICTS:=brcmfmac-firmware-43430-sdio-rpi-3b endef @@ -55,7 +54,6 @@ define Package/cypress-nvram-43430-sdio-rpi-zero-w $(Package/cypress-nvram-default) TITLE:=CYW43430 NVRAM for Raspberry Pi Zero W DEPENDS:=@TARGET_bcm27xx - PROVIDES:=brcmfmac-firmware-43430-sdio-rpi-zero-w CONFLICTS:=brcmfmac-firmware-43430-sdio-rpi-zero-w endef @@ -73,7 +71,6 @@ define Package/cypress-nvram-43455-sdio-rpi-3b-plus $(Package/cypress-nvram-default) TITLE:=CYW43455 NVRAM for Raspberry Pi 3B+ DEPENDS:=@TARGET_bcm27xx - PROVIDES:=brcmfmac-firmware-43455-sdio-rpi-3b-plus CONFLICTS:=brcmfmac-firmware-43455-sdio-rpi-3b-plus endef @@ -91,7 +88,6 @@ define Package/cypress-nvram-43455-sdio-rpi-4b $(Package/cypress-nvram-default) TITLE:=CYW43455 NVRAM for Raspberry Pi 4B DEPENDS:=@TARGET_bcm27xx - PROVIDES:=brcmfmac-firmware-43455-sdio-rpi-4b CONFLICTS:=brcmfmac-firmware-43455-sdio-rpi-4b endef @@ -112,7 +108,6 @@ define Package/cypress-nvram-4339-pico-pi-imx7d $(Package/cypress-nvram-default) TITLE:=BCM4339 NVRAM for TechNexion PICO-PI-IMX7D DEPENDS:=@TARGET_imx_cortexa7 - PROVIDES:=brcmfmac-firmware-4339-pico-pi-imx7d CONFLICTS:=brcmfmac-firmware-4339-pico-pi-imx7d endef |