Move package/rcw to package/nxp/qoriq-rcw
cover Move package/rcw to package/nxp/qoriq-rcw
There's a pending series of patches from NXP that aims to add the ls1028ardb board to buildroot.
[v5,9/9] board/nxp/ls1028ardb: new board
This series does a couple "core" changes and I think this might be why it's been pending for so long.
One of those changes is a rename package/rcw => package/nxp/qoriq-rcw.
On our side we need a couple patches from the series so for version 2020.02 we manually imported the patches we needed. The problem is that now we are upgrading to version 2020.05 and we need to manually do the rename again since there are patches still being pushed in package/rcw.
Now I feel we are teared apart between where nxp is going and where buildroot is.
Since the nxp series doesn't seem to get merged in for the moment what I propose is that we merge the rename and so at least the new patches posted to buildroot in the meantime are compatible with where nxp wants to go.
Or at least we make a statement now that we don't want to rename so on our side we will do our development and push patches in the correct folder.
These are the original patches just slightly modified to be compatible with the current state of master.
Changming Huang (2):
package/nxp: new package directory package/qoriq-rcw: move rcw into nxp and rename it
Config.in.legacy | 16 +++++++
DEVELOPERS | 2 +-
package/Config.in | 1 +
package/Config.in.host | 2 +-
package/nxp/Config.in | 4 ++
package/nxp/helper.mk | 32 +++++++++++++
package/{rcw => nxp/qoriq-rcw}/Config.in.host | 6 +--
.../rcw.hash => nxp/qoriq-rcw/qoriq-rcw.hash} | 2 +-
.../rcw.mk => nxp/qoriq-rcw/qoriq-rcw.mk} | 46 +++++++++----------
9 files changed, 82 insertions(+), 29 deletions(-)
create mode 100644 package/nxp/Config.in
create mode 100644 package/nxp/helper.mk
rename package/{rcw => nxp/qoriq-rcw}/Config.in.host (88%)
rename package/{rcw/rcw.hash => nxp/qoriq-rcw/qoriq-rcw.hash} (50%)
rename package/{rcw/rcw.mk => nxp/qoriq-rcw/qoriq-rcw.mk} (51%)Signature · 1 line
2.17.1
PATCH 1/2 package/nxp: new package directory
From: Changming Huang <[email protected]>
The "nxp" directory is intended to contain all NXP QorIQ (including PowerPC and LayerScape serial) related packages, together with their download site and version info.
--- package/Config.in | 1 + package/nxp/Config.in | 4 ++++ package/nxp/helper.mk | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 package/nxp/Config.in create mode 100644 package/nxp/helper.mk
package/Config.in +1 -0
@@ -502,6 +502,7 @@ endmenu source "package/nvidia-driver/Config.in" source "package/nvidia-tegra23/Config.in" source "package/nvme/Config.in" + source "package/nxp/Config.in" source "package/ofono/Config.in" source "package/on2-8170-modules/Config.in" source "package/open2300/Config.in"
package/nxp/Config.in new file +4 -0
@@ -0,0 +1,4 @@ +menu "NXP QorIQ libraries" + depends on BR2_aarch64 || BR2_arm || BR2_powerpc64 || BR2_powerpc + +endmenu
package/nxp/helper.mk new file +32 -0
@@ -0,0 +1,32 @@ +################################################################################ +# +# helper +# +################################################################################ + +# Helper for self-extracting binaries distributed by NXP. +# +# The --force option makes sure it doesn't fail if the source +# directory already exists. The --auto-accept skips the license check, +# as it is not needed in Buildroot because we have legal-info. Since +# there's a EULA in the binary file, we extract it in this macro, and +# it should therefore be added to the LICENSE_FILES variable of +# packages using this macro. Also, remember to set REDISTRIBUTE to +# "NO". Indeed, this is a legal minefield: the EULA specifies that the +# Board Support Package includes software and hardware (sic!) for +# which a separate license is needed... +# +# $(1): full path to the archive file +# +define NXP_EXTRACT_HELPER + awk 'BEGIN { start = 0; } \ + /^EOEULA/ { start = 0; } \ + { if (start) print; } \ + /<<EOEULA/ { start = 1; }' \ + $(1) > $(@D)/EULA + cd $(@D) && sh $(1) --force --auto-accept + find $(@D)/$(basename $(notdir $(1))) -mindepth 1 -maxdepth 1 -exec mv {} $(@D) \; + rmdir $(@D)/$(basename $(notdir $(1))) +endef + +include $(sort $(wildcard package/nxp/*/*.mk))
Signature · 1 line
2.17.1
PATCH 1/2 package/nxp: new package directory
Hi,
Quoted 66 lines · Francois Gervais
From: Changming Huang <[email protected]>
The "nxp" directory is intended to contain all NXP QorIQ (including PowerPC and LayerScape serial) related packages, together with their download site and version info.
Signed-off-by Changming Huang <[email protected]>Signed-off-by Francois Gervais <[email protected]>--- package/Config.in | 1 + package/nxp/Config.in | 4 ++++ package/nxp/helper.mk | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 package/nxp/Config.in create mode 100644 package/nxp/helper.mkpackage/Config.in +1
-0@@ -502,6 +502,7 @@ endmenu source "package/nvidia-driver/Config.in" source "package/nvidia-tegra23/Config.in" source "package/nvme/Config.in" + source "package/nxp/Config.in" source "package/ofono/Config.in" source "package/on2-8170-modules/Config.in" source "package/open2300/Config.in"package/nxp/Config.in new file +4
-0@@ -0,0 +1,4 @@ +menu "NXP QorIQ libraries" + depends on BR2_aarch64 || BR2_arm || BR2_powerpc64 || BR2_powerpc + +endmenupackage/nxp/helper.mk new file +22
-0@@ -0,0 +1,32 @@ +################################################################################ +# +# helper +# +################################################################################ + +# Helper for self-extracting binaries distributed by NXP. +# +# The --force option makes sure it doesn't fail if the source +# directory already exists. The --auto-accept skips the license check, +# as it is not needed in Buildroot because we have legal-info. Since +# there's a EULA in the binary file, we extract it in this macro, and +# it should therefore be added to the LICENSE_FILES variable of +# packages using this macro. Also, remember to set REDISTRIBUTE to +# "NO". Indeed, this is a legal minefield: the EULA specifies that the +# Board Support Package includes software and hardware (sic!) for +# which a separate license is needed... +# +# $(1): full path to the archive file +# +define NXP_EXTRACT_HELPER + awk 'BEGIN { start = 0; } \
package/nxp/helper.mk line 32
Quoted 10 lines
package/nxp/helper.mk new file +10
-0+ /^EOEULA/ { start = 0; } \ + { if (start) print; } \ + /<<EOEULA/ { start = 1; }' \ + $(1) > $(@D)/EULA + cd $(@D) && sh $(1) --force --auto-accept + find $(@D)/$(basename $(notdir $(1))) -mindepth 1 -maxdepth 1 -exec mv {} $(@D) \; + rmdir $(@D)/$(basename $(notdir $(1))) +endef + +include $(sort $(wildcard package/nxp/*/*.mk))
This looks like a copy/paste of package/freescale-imx/freescale-imx.mk, maybe it is time to move the latter to a common "nxp" folder so that new QorIQ/i.MX packages share the same macros.
Any thoughts?
Note that latest NXP release (LF) are for both i.MX and QorIQ.
Regards,
Gary
PATCH 2/2 package/qoriq-rcw: move rcw into nxp and rename it
In reply to Francois GervaisFrom: Changming Huang <[email protected]>
Move package/rcw into package/nxp,
and rename it to qoriq-rcw.
---
Config.in.legacy | 16 +++++++
DEVELOPERS | 2 +-
package/Config.in.host | 2 +-
package/{rcw => nxp/qoriq-rcw}/Config.in.host | 6 +--
.../rcw.hash => nxp/qoriq-rcw/qoriq-rcw.hash} | 2 +-
.../rcw.mk => nxp/qoriq-rcw/qoriq-rcw.mk} | 46 +++++++++----------
6 files changed, 45 insertions(+), 29 deletions(-)
rename package/{rcw => nxp/qoriq-rcw}/Config.in.host (88%)
rename package/{rcw/rcw.hash => nxp/qoriq-rcw/qoriq-rcw.hash} (50%)
rename package/{rcw/rcw.mk => nxp/qoriq-rcw/qoriq-rcw.mk} (51%)Config.in.legacy +16 -0
@@ -160,6 +160,22 @@ config BR2_PACKAGE_KODI_PERIPHERAL_STEAMCONTROLLER help This package is broken. +config BR2_PACKAGE_HOST_RCW + bool "rcw package was removed" + select BR2_LEGACY + help + Because rcw package has been renamed to qoriq-rcw and moved + to "nxp", option BR2_PACKAGE_HOST_RCW is removed, the option + BR2_PACKAGE_HOST_QORIQ_RCW can be used for QorIQ platforms. + +config BR2_PACKAGE_HOST_RCW + bool "rcw package was removed" + select BR2_LEGACY + help + Because rcw package has been renamed to qoriq-rcw and moved + to "nxp", option BR2_PACKAGE_HOST_RCW is removed, the option + BR2_PACKAGE_HOST_QORIQ_RCW can be used for QorIQ platforms. + comment "Legacy options removed in 2020.05" config BR2_PACKAGE_WIRINGPI
DEVELOPERS +1 -1
@@ -1704,6 +1704,7 @@ F: package/mrouted/ F: package/mtd/ F: package/mtools/ F: package/nginx-upload/ +F: package/nxp/qoriq-rcw/ F: package/omniorb/ F: package/openresolv/ F: package/paxtest/
@@ -1726,7 +1727,6 @@ F: package/python-pysftp/ F: package/python-tinyrpc/ F: package/python-txdbus/ F: package/raptor/ -F: package/rcw/ F: package/rng-tools/ F: package/rsyslog/ F: package/setools/
package/Config.in.host +1 -1
@@ -48,6 +48,7 @@ menu "Host utilities" source "package/mtd/Config.in.host" source "package/mtools/Config.in.host" source "package/mxsldr/Config.in.host" + source "package/nxp/qoriq-rcw/Config.in.host" source "package/odb/Config.in.host" source "package/omap-u-boot-utils/Config.in.host" source "package/openocd/Config.in.host"
@@ -67,7 +68,6 @@ menu "Host utilities" source "package/qemu/Config.in.host" source "package/raspberrypi-usbboot/Config.in.host" source "package/rauc/Config.in.host" - source "package/rcw/Config.in.host" source "package/rustc/Config.in.host" source "package/s6-rc/Config.in.host" source "package/sam-ba/Config.in.host"
package/nxp/qoriq-rcw/Config.in.host renamed from package/rcw/Config.in.host +3 -3
@@ -1,4 +1,4 @@ -config BR2_PACKAGE_HOST_RCW +config BR2_PACKAGE_HOST_QORIQ_RCW bool "host rcw" help This package provides an reset configuration word(RCW)
@@ -11,9 +11,9 @@ config BR2_PACKAGE_HOST_RCW https://source.codeaurora.org/external/qoriq/qoriq-components/rcw/ -if BR2_PACKAGE_HOST_RCW +if BR2_PACKAGE_HOST_QORIQ_RCW -config BR2_PACKAGE_HOST_RCW_CUSTOM_PATH +config BR2_PACKAGE_HOST_QORIQ_RCW_CUSTOM_PATH string "RCW Source file paths" help Space-separated list of .rcw and .rcwi files, that will be
package/nxp/qoriq-rcw/qoriq-rcw.hash renamed from package/rcw/rcw.hash +1 -1
@@ -1,3 +1,3 @@ # Locally calculated -sha256 b69a6a8b187ba794e0af716a509ced2bbac83da0f6e94b5c7331a34619db21b1 rcw-LSDK-19.09.tar.gz +sha256 4a9ce5bb1733239bf1b740b705df20f90802b16114e24f3fd56c08a7ba4b56c2 qoriq-rcw-LSDK-19.09.tar.gz sha256 a531b3146425e592db17a51ff39c4801cb01fb4055ffdaada0572decc0655bcd LICENSE
package/nxp/qoriq-rcw/qoriq-rcw.mk renamed from package/rcw/rcw.mk +23 -23
90 lines not on this page · raw message
Signature · 1 line
2.17.1