[source] layerscape: rename firmware packages to avoid name collisions
LEDE Commits
lede-commits at lists.infradead.org
Sat Dec 2 08:02:44 PST 2017
thess pushed a commit to source.git, branch master:
https://git.lede-project.org/b83c32511e6536112788486448864ca15300a426
commit b83c32511e6536112788486448864ca15300a426
Author: Ted Hess <thess at kitschensync.net>
AuthorDate: Fri Dec 1 16:32:26 2017 -0500
layerscape: rename firmware packages to avoid name collisions
layerscape firmware package names collide with existing package contributions.
Ex: layerscape mc and midnight-commander(mc) are in conflict.
Firmware packages: mc, ppa, rcw and dpl are renamed to ls-mc, ls-ppa, ls-rcw
and ls-dpl respectively.
Signed-off-by: Ted Hess <thess at kitschensync.net>
---
package/firmware/layerscape/{dpl => ls-dpl}/Makefile | 2 +-
package/firmware/layerscape/{mc => ls-mc}/Makefile | 2 +-
package/firmware/layerscape/{ppa => ls-ppa}/Makefile | 14 +++++++-------
package/firmware/layerscape/{rcw => ls-rcw}/Makefile | 14 +++++++-------
...01-makefile-generate-byte_swap-rcw-for-ls1046ardb.patch | 0
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/package/firmware/layerscape/dpl/Makefile b/package/firmware/layerscape/ls-dpl/Makefile
similarity index 99%
rename from package/firmware/layerscape/dpl/Makefile
rename to package/firmware/layerscape/ls-dpl/Makefile
index 5d6cb60..f305dfb 100644
--- a/package/firmware/layerscape/dpl/Makefile
+++ b/package/firmware/layerscape/ls-dpl/Makefile
@@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk
-PKG_NAME:=dpl
+PKG_NAME:=ls-dpl
PKG_VERSION:=2017.09
PKG_RELEASE:=1
diff --git a/package/firmware/layerscape/mc/Makefile b/package/firmware/layerscape/ls-mc/Makefile
similarity index 98%
rename from package/firmware/layerscape/mc/Makefile
rename to package/firmware/layerscape/ls-mc/Makefile
index f5851db..377ac0a 100644
--- a/package/firmware/layerscape/mc/Makefile
+++ b/package/firmware/layerscape/ls-mc/Makefile
@@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk
-PKG_NAME:=mc
+PKG_NAME:=ls-mc
PKG_VERSION:=2017.09
PKG_RELEASE:=1
diff --git a/package/firmware/layerscape/ppa/Makefile b/package/firmware/layerscape/ls-ppa/Makefile
similarity index 79%
rename from package/firmware/layerscape/ppa/Makefile
rename to package/firmware/layerscape/ls-ppa/Makefile
index c72439a..52fa06d 100644
--- a/package/firmware/layerscape/ppa/Makefile
+++ b/package/firmware/layerscape/ls-ppa/Makefile
@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk
-PKG_NAME:=ppa
+PKG_NAME:=ls-ppa
PKG_VERSION:=2017.09
PKG_RELEASE:=1
@@ -29,32 +29,32 @@ define ppa/Default
endef
define ppa/ls1043ardb
- TITLE=PPA firmware $(PKG_NAME)-$(PKG_VERSION) for NXP ls1043ardb 64b/32b Dev Board
+ TITLE=PPA firmware $(PKG_VERSION) for NXP ls1043ardb 64b/32b Dev Board
CONFIG=ppa-ls1043a.itb
endef
define ppa/ls1046ardb
- TITLE=PPA firmware $(PKG_NAME)-$(PKG_VERSION) for NXP ls1046ardb 64b/32b Dev Board
+ TITLE=PPA firmware $(PKG_VERSION) for NXP ls1046ardb 64b/32b Dev Board
CONFIG=ppa-ls1046a.itb
endef
define ppa/ls1012ardb
- TITLE=PPA firmware $(PKG_NAME)-$(PKG_VERSION) for NXP ls1012ardb 64b/32b Dev Board
+ TITLE=PPA firmware $(PKG_VERSION) for NXP ls1012ardb 64b/32b Dev Board
CONFIG=ppa-ls1012a.itb
endef
define ppa/ls1088ardb
- TITLE=PPA firmware $(PKG_NAME)-$(PKG_VERSION) for NXP ls1088ardb 64b/32b Dev Board
+ TITLE=PPA firmware $(PKG_VERSION) for NXP ls1088ardb 64b/32b Dev Board
CONFIG=ppa-ls1088a.itb
endef
define ppa/ls2088ardb
- TITLE=PPA firmware $(PKG_NAME)-$(PKG_VERSION) for NXP ls2088ardb 64b/32b Dev Board
+ TITLE=PPA firmware $(PKG_VERSION) for NXP ls2088ardb 64b/32b Dev Board
CONFIG=ppa-ls2088a.itb
endef
define ppa/ls1012afrdm
- TITLE=PPA firmware $(PKG_NAME)-$(PKG_VERSION) for NXP ls1012afrdm 64b/32b Dev Board
+ TITLE=PPA firmware $(PKG_VERSION) for NXP ls1012afrdm 64b/32b Dev Board
CONFIG=ppa-ls1012a.itb
endef
diff --git a/package/firmware/layerscape/rcw/Makefile b/package/firmware/layerscape/ls-rcw/Makefile
similarity index 83%
rename from package/firmware/layerscape/rcw/Makefile
rename to package/firmware/layerscape/ls-rcw/Makefile
index f4d9eeb..e479d4d 100644
--- a/package/firmware/layerscape/rcw/Makefile
+++ b/package/firmware/layerscape/ls-rcw/Makefile
@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk
-PKG_NAME:=rcw
+PKG_NAME:=ls-rcw
PKG_VERSION:=2017.09
PKG_RELEASE:=1
@@ -32,32 +32,32 @@ define rcw/Default
endef
define rcw/ls1043ardb
- TITLE=RCW binary $(PKG_NAME)-$(PKG_VERSION) for NXP ls1043ardb 64b/32b Dev Board
+ TITLE=RCW binary $(PKG_VERSION) for NXP ls1043ardb 64b/32b Dev Board
CONFIG=ls1043ardb/RR_FQPP_1455/rcw_1600.bin
endef
define rcw/ls1046ardb
- TITLE=RCW binary $(PKG_NAME)-$(PKG_VERSION) for NXP ls1046ardb 64b/32b Dev Board
+ TITLE=RCW binary $(PKG_VERSION) for NXP ls1046ardb 64b/32b Dev Board
CONFIG=ls1046ardb/RR_FFSSPPPH_1133_5559/rcw_1800_qspiboot_swap.bin
endef
define rcw/ls1012ardb
- TITLE=RCW binary $(PKG_NAME)-$(PKG_VERSION) for NXP ls1012ardb 64b/32b Dev Board
+ TITLE=RCW binary $(PKG_VERSION) for NXP ls1012ardb 64b/32b Dev Board
CONFIG=ls1012ardb/R_SPNH_3508/PBL_0x35_0x08_1000_250_1000_default.bin
endef
define rcw/ls1088ardb
- TITLE=RCW binary $(PKG_NAME)-$(PKG_VERSION) for NXP ls1088ardb 64b/32b Dev Board
+ TITLE=RCW binary $(PKG_VERSION) for NXP ls1088ardb 64b/32b Dev Board
CONFIG=ls1088ardb/FCQQQQQQQQ_PPP_H_0x1d_0x0d/PBL_QSPI_1600_700_2100_0x1d_0x0d.bin
endef
define rcw/ls2088ardb
- TITLE=RCW binary $(PKG_NAME)-$(PKG_VERSION) for NXP ls2088ardb 64b/32b Dev Board
+ TITLE=RCW binary $(PKG_VERSION) for NXP ls2088ardb 64b/32b Dev Board
CONFIG=ls2088ardb/FFFFFFFF_PP_HH_0x2a_0x41/PBL_0x2a_0x41_1800_700_1866_1600.bin
endef
define rcw/ls1012afrdm
- TITLE=RCW binary $(PKG_NAME)-$(PKG_VERSION) for NXP ls1012afrdm 64b/32b Dev Board
+ TITLE=RCW binary $(PKG_VERSION) for NXP ls1012afrdm 64b/32b Dev Board
CONFIG=ls1012afrdm/N_SSNP_3305/PBL_0x33_0x05_800_250_1000_default.bin
endef
diff --git a/package/firmware/layerscape/rcw/patches/0001-makefile-generate-byte_swap-rcw-for-ls1046ardb.patch b/package/firmware/layerscape/ls-rcw/patches/0001-makefile-generate-byte_swap-rcw-for-ls1046ardb.patch
similarity index 100%
rename from package/firmware/layerscape/rcw/patches/0001-makefile-generate-byte_swap-rcw-for-ls1046ardb.patch
rename to package/firmware/layerscape/ls-rcw/patches/0001-makefile-generate-byte_swap-rcw-for-ls1046ardb.patch
More information about the lede-commits
mailing list