Message ID | 20200207083857.28058-1-jerry.huang@nxp.com |
---|---|
State | Rejected |
Headers | show |
Series | [v5,1/9] package/nxp: new package directory | expand |
Hi Changming, I finally started picking up this series after two years. Unfortunately, I have a lot of requests for changes still. On 07/02/2020 09:38, Changming Huang wrote: > 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. We try to avoid subdirectories in package/; we only add them in case there is some common functionality that needs to be factored out, like for e.g. qt5. In this series, the only commonality that I found is the binary extraction, but it ends up to be used only by qoriq-cadence-dp-firmware. That's not worth it IMHO. Therefore, I marked this patch and rejected. Note that it would make sense to do this if we would also move the freescale-imx stuff into the same directory (freescale is anyway nxp now so it should be OK to do that). > Signed-off-by: Changming Huang <jerry.huang@nxp.com> > --- > changes since v4: > no changes. > > changes since v3: > no changes. > > changes since v2: > 1. change the sub-direcotry to "nxp". > 2. add helper.mk macro to extract compressed file. > > changes since v1: > no changes. > --- > 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 > > diff --git a/package/Config.in b/package/Config.in > index bad4f9cba6..f9827769a2 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -497,6 +497,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" > diff --git a/package/nxp/Config.in b/package/nxp/Config.in > new file mode 100644 > index 0000000000..575542c7ab > --- /dev/null > +++ b/package/nxp/Config.in > @@ -0,0 +1,4 @@ > +menu "NXP QorIQ libraries" > + depends on BR2_aarch64 || BR2_arm || BR2_powerpc64 || BR2_powerpc > + > +endmenu > diff --git a/package/nxp/helper.mk b/package/nxp/helper.mk > new file mode 100644 > index 0000000000..79e4236249 > --- /dev/null > +++ b/package/nxp/helper.mk The .mk file should have the same name as the directory, so nxp.mk. Regards, Arnout > @@ -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)) >
Am 2022-01-06 15:45, schrieb Arnout Vandecappelle: > In this series, the only commonality that I found is the binary > extraction, but it ends up to be used only by > qoriq-cadence-dp-firmware. That's not worth it IMHO. mh? all the imx stuff is using this method. > > Therefore, I marked this patch and rejected. > > Note that it would make sense to do this if we would also move the > freescale-imx stuff into the same directory (freescale is anyway nxp > now so it should be OK to do that). ah. yes. that was the idea back then IMHO. -michael
diff --git a/package/Config.in b/package/Config.in index bad4f9cba6..f9827769a2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -497,6 +497,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" diff --git a/package/nxp/Config.in b/package/nxp/Config.in new file mode 100644 index 0000000000..575542c7ab --- /dev/null +++ b/package/nxp/Config.in @@ -0,0 +1,4 @@ +menu "NXP QorIQ libraries" + depends on BR2_aarch64 || BR2_arm || BR2_powerpc64 || BR2_powerpc + +endmenu diff --git a/package/nxp/helper.mk b/package/nxp/helper.mk new file mode 100644 index 0000000000..79e4236249 --- /dev/null +++ b/package/nxp/helper.mk @@ -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))
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 <jerry.huang@nxp.com> --- changes since v4: no changes. changes since v3: no changes. changes since v2: 1. change the sub-direcotry to "nxp". 2. add helper.mk macro to extract compressed file. changes since v1: no changes. --- 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