[Buildroot] [PATCH v2] package/rcw: rename to qoriq-rcw
Yann E. MORIN
yann.morin.1998 at free.fr
Wed Dec 16 21:20:23 UTC 2020
Micheal, All,
On 2020-12-15 09:17 +0100, Michael Walle spake thusly:
> This is really only for QoriQ SoCs. Also the upstream package - despite
> its base name of the git repository - is "qoriq-components/rcw". Thus
> rename it to a more specify package name.
>
> Please note that this will also rename the installed rcw files from
> $(HOST_DIR)/share/rcw to $(HOST_DIR)/share/qoriq-rcw.
>
> There are no configs or dependencies which uses this package.
>
> Signed-off-by: Michael Walle <michael at walle.cc>
> Cc: Matt Weber <matthew.weber at rockwellcollins.com>
Thanks for resnding and reviving this change.
I've now applied a mix of the original patch from Changming and your
patch.
Thanks!
Regards,
Yann E. MORIN.
> ---
> changes since v1:
> - move the legacy option into the correct section in
> Config.in.legacy.
>
> Config.in.legacy | 8 +++
> DEVELOPERS | 2 +-
> package/Config.in.host | 2 +-
> package/{rcw => qoriq-rcw}/Config.in.host | 8 +--
> .../rcw.hash => qoriq-rcw/qoriq-rcw.hash} | 2 +-
> package/qoriq-rcw/qoriq-rcw.mk | 67 +++++++++++++++++++
> package/rcw/rcw.mk | 67 -------------------
> 7 files changed, 82 insertions(+), 74 deletions(-)
> rename package/{rcw => qoriq-rcw}/Config.in.host (86%)
> rename package/{rcw/rcw.hash => qoriq-rcw/qoriq-rcw.hash} (50%)
> create mode 100644 package/qoriq-rcw/qoriq-rcw.mk
> delete mode 100644 package/rcw/rcw.mk
>
> diff --git a/Config.in.legacy b/Config.in.legacy
> index 0b963cba3a..b29dde8c49 100644
> --- a/Config.in.legacy
> +++ b/Config.in.legacy
> @@ -166,6 +166,14 @@ config BR2_powerpc_601
> help
> The support for the PowerPC 601 processors has been removed.
>
> +config BR2_PACKAGE_HOST_RCW
> + bool "BR2_PACKAGE_HOST_RCW was renamed"
> + select BR2_LEGACY
> + select BR2_PACKAGE_HOST_QORIQ_RCW
> + help
> + QoriQ RCW package has been renamed to BR2_PACKAGE_HOST_QORIQ_RCW
> + to match the upstream package name.
> +
> comment "Legacy options removed in 2020.11"
>
> config BR2_PACKAGE_OPENCV
> diff --git a/DEVELOPERS b/DEVELOPERS
> index a2c7f7f34a..882e8cd825 100644
> --- a/DEVELOPERS
> +++ b/DEVELOPERS
> @@ -1747,8 +1747,8 @@ F: package/python-pyrex/
> F: package/python-pysftp/
> F: package/python-tinyrpc/
> F: package/python-txdbus/
> +F: package/qoriq-rcw/
> F: package/raptor/
> -F: package/rcw/
> F: package/rng-tools/
> F: package/rsyslog/
> F: package/setools/
> diff --git a/package/Config.in.host b/package/Config.in.host
> index 4f69785810..ba6a68c728 100644
> --- a/package/Config.in.host
> +++ b/package/Config.in.host
> @@ -70,9 +70,9 @@ menu "Host utilities"
> source "package/python-xlrd/Config.in.host"
> source "package/python3/Config.in.host"
> source "package/qemu/Config.in.host"
> + source "package/qoriq-rcw/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"
> diff --git a/package/rcw/Config.in.host b/package/qoriq-rcw/Config.in.host
> similarity index 86%
> rename from package/rcw/Config.in.host
> rename to package/qoriq-rcw/Config.in.host
> index a9253958d9..1f69c0389c 100644
> --- a/package/rcw/Config.in.host
> +++ b/package/qoriq-rcw/Config.in.host
> @@ -1,5 +1,5 @@
> -config BR2_PACKAGE_HOST_RCW
> - bool "host rcw"
> +config BR2_PACKAGE_HOST_QORIQ_RCW
> + bool "host qoriq-rcw"
> help
> This package provides an reset configuration word(RCW)
> compiler to build NXP QoriQ/LS PBL/RCW binary(s).
> @@ -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
> diff --git a/package/rcw/rcw.hash b/package/qoriq-rcw/qoriq-rcw.hash
> similarity index 50%
> rename from package/rcw/rcw.hash
> rename to package/qoriq-rcw/qoriq-rcw.hash
> index 76b6373942..88460716f9 100644
> --- a/package/rcw/rcw.hash
> +++ b/package/qoriq-rcw/qoriq-rcw.hash
> @@ -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
> diff --git a/package/qoriq-rcw/qoriq-rcw.mk b/package/qoriq-rcw/qoriq-rcw.mk
> new file mode 100644
> index 0000000000..8026f60fbf
> --- /dev/null
> +++ b/package/qoriq-rcw/qoriq-rcw.mk
> @@ -0,0 +1,67 @@
> +################################################################################
> +#
> +# qoriq-rcw
> +#
> +################################################################################
> +
> +QORIQ_RCW_VERSION = LSDK-19.09
> +QORIQ_RCW_SITE = https://source.codeaurora.org/external/qoriq/qoriq-components/rcw
> +QORIQ_RCW_SITE_METHOD = git
> +QORIQ_RCW_LICENSE = BSD-3-Clause
> +QORIQ_RCW_LICENSE_FILES = LICENSE
> +
> +HOST_QORIQ_RCW_DEPENDENCIES = $(BR2_PYTHON3_HOST_DEPENDENCY)
> +
> +QORIQ_RCW_FILES = $(call qstrip,$(BR2_PACKAGE_HOST_QORIQ_RCW_CUSTOM_PATH))
> +
> +ifneq ($(QORIQ_RCW_FILES),)
> +QORIQ_RCW_INCLUDES = $(filter-out %.rcw,$(QORIQ_RCW_FILES))
> +# Get the name of the custom rcw file from the custom list
> +QORIQ_RCW_PROJECT = $(notdir $(filter %.rcw,$(QORIQ_RCW_FILES)))
> +
> +# Error if there are no or more than one .rcw file
> +ifeq ($(BR_BUILDING),y)
> +ifneq ($(words $(QORIQ_RCW_PROJECT)),1)
> +$(error BR2_PACKAGE_HOST_QORIQ_RCW_CUSTOM_PATH must have exactly one .rcw file)
> +endif
> +endif
> +
> +ifneq ($(QORIQ_RCW_INCLUDES),)
> +define HOST_QORIQ_RCW_ADD_CUSTOM_RCW_INCLUDES
> + mkdir -p $(@D)/custom_board
> + cp -f $(QORIQ_RCW_INCLUDES) $(@D)/custom_board
> +endef
> +HOST_QORIQ_RCW_POST_PATCH_HOOKS += HOST_QORIQ_RCW_ADD_CUSTOM_RCW_INCLUDES
> +endif
> +
> +define HOST_QORIQ_RCW_ADD_CUSTOM_RCW_FILES
> + mkdir -p $(@D)/custom_board/rcw
> + cp -f $(filter %.rcw,$(QORIQ_RCW_FILES)) $(@D)/custom_board/rcw
> +endef
> +HOST_QORIQ_RCW_POST_PATCH_HOOKS += HOST_QORIQ_RCW_ADD_CUSTOM_RCW_FILES
> +
> +# rcw.py is a python3-only script, and we can be using either the
> +# system-provided python3, or our own built with host-python3.
> +# Fortunately, rcw.py uses #!/usr/bin/env python3, so it will
> +# easily find it from PATH.
> +define HOST_QORIQ_RCW_BUILD_CMDS
> + PATH=$(BR_PATH) \
> + $(@D)/rcw.py \
> + -i $(@D)/custom_board/rcw/$(QORIQ_RCW_PROJECT) \
> + -I $(@D)/custom_board -o $(@D)/PBL.bin
> +endef
> +
> +define HOST_QORIQ_RCW_INSTALL_DELIVERY_FILE
> + $(INSTALL) -D -m 0644 $(@D)/PBL.bin $(BINARIES_DIR)/PBL.bin
> +endef
> +endif
> +
> +# Copy source files and script into $(HOST_DIR)/share/qoriq-rcw/ so a developer
> +# could use a post image or SDK to build/install PBL files.
> +define HOST_QORIQ_RCW_INSTALL_CMDS
> + mkdir -p $(HOST_DIR)/share/qoriq-rcw
> + cp -a $(@D)/* $(HOST_DIR)/share/qoriq-rcw
> + $(HOST_QORIQ_RCW_INSTALL_DELIVERY_FILE)
> +endef
> +
> +$(eval $(host-generic-package))
> diff --git a/package/rcw/rcw.mk b/package/rcw/rcw.mk
> deleted file mode 100644
> index 22e3be4f13..0000000000
> --- a/package/rcw/rcw.mk
> +++ /dev/null
> @@ -1,67 +0,0 @@
> -################################################################################
> -#
> -# rcw
> -#
> -################################################################################
> -
> -RCW_VERSION = LSDK-19.09
> -RCW_SITE = https://source.codeaurora.org/external/qoriq/qoriq-components/rcw
> -RCW_SITE_METHOD = git
> -RCW_LICENSE = BSD-3-Clause
> -RCW_LICENSE_FILES = LICENSE
> -
> -HOST_RCW_DEPENDENCIES = $(BR2_PYTHON3_HOST_DEPENDENCY)
> -
> -RCW_FILES = $(call qstrip,$(BR2_PACKAGE_HOST_RCW_CUSTOM_PATH))
> -
> -ifneq ($(RCW_FILES),)
> -RCW_INCLUDES = $(filter-out %.rcw,$(RCW_FILES))
> -# Get the name of the custom rcw file from the custom list
> -RCW_PROJECT = $(notdir $(filter %.rcw,$(RCW_FILES)))
> -
> -# Error if there are no or more than one .rcw file
> -ifeq ($(BR_BUILDING),y)
> -ifneq ($(words $(RCW_PROJECT)),1)
> -$(error BR2_PACKAGE_HOST_RCW_CUSTOM_PATH must have exactly one .rcw file)
> -endif
> -endif
> -
> -ifneq ($(RCW_INCLUDES),)
> -define HOST_RCW_ADD_CUSTOM_RCW_INCLUDES
> - mkdir -p $(@D)/custom_board
> - cp -f $(RCW_INCLUDES) $(@D)/custom_board
> -endef
> -HOST_RCW_POST_PATCH_HOOKS += HOST_RCW_ADD_CUSTOM_RCW_INCLUDES
> -endif
> -
> -define HOST_RCW_ADD_CUSTOM_RCW_FILES
> - mkdir -p $(@D)/custom_board/rcw
> - cp -f $(filter %.rcw,$(RCW_FILES)) $(@D)/custom_board/rcw
> -endef
> -HOST_RCW_POST_PATCH_HOOKS += HOST_RCW_ADD_CUSTOM_RCW_FILES
> -
> -# rcw.py is a python3-only script, and we can be using either the
> -# system-provided python3, or our own built with host-python3.
> -# Fortunately, rcw.py uses #!/usr/bin/env python3, so it will
> -# easily find it from PATH.
> -define HOST_RCW_BUILD_CMDS
> - PATH=$(BR_PATH) \
> - $(@D)/rcw.py \
> - -i $(@D)/custom_board/rcw/$(RCW_PROJECT) \
> - -I $(@D)/custom_board -o $(@D)/PBL.bin
> -endef
> -
> -define HOST_RCW_INSTALL_DELIVERY_FILE
> - $(INSTALL) -D -m 0644 $(@D)/PBL.bin $(BINARIES_DIR)/PBL.bin
> -endef
> -endif
> -
> -# Copy source files and script into $(HOST_DIR)/share/rcw/ so a developer
> -# could use a post image or SDK to build/install PBL files.
> -define HOST_RCW_INSTALL_CMDS
> - mkdir -p $(HOST_DIR)/share/rcw
> - cp -a $(@D)/* $(HOST_DIR)/share/rcw
> - $(HOST_RCW_INSTALL_DELIVERY_FILE)
> -endef
> -
> -$(eval $(host-generic-package))
> --
> 2.20.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
More information about the buildroot
mailing list