On 08/17/2011 12:26 PM, Tom Zanussi wrote: > On Wed, 2011-08-17 at 10:25 -0700, Darren Hart wrote: >> >> On 08/17/2011 09:51 AM, tom.zanu...@intel.com wrote: >>> From: Tom Zanussi <tom.zanu...@intel.com> >>> >>> The emgd-driver-bin recipe now automatically downloads and installs >>> EMGD using the new click-through-free tarball, but since the binaries >>> still fall under a non-free license, we need to prevent it from being >>> accidentally installed in an image. >>> >>> We therefore make sure it's labeled in the fri2 layer with >>> 'COMMERCIAL_LICENSE'. In order to build an fri2 image, the user >>> now needs to add a 'COMMERCIAL_LICENSE = ""' line to local.conf. >>> >>> Signed-off-by: Tom Zanussi <tom.zanu...@intel.com> >>> --- >>> meta-fri2/conf/layer.conf | 2 ++ >>> 1 files changed, 2 insertions(+), 0 deletions(-) >>> >>> diff --git a/meta-fri2/conf/layer.conf b/meta-fri2/conf/layer.conf >>> index 261cccc..eb17336 100644 >>> --- a/meta-fri2/conf/layer.conf >>> +++ b/meta-fri2/conf/layer.conf >>> @@ -10,3 +10,5 @@ BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ >>> BBFILE_COLLECTIONS += "fri2" >>> BBFILE_PATTERN_fri2 := "^${LAYERDIR}/" >>> BBFILE_PRIORITY_fri2 = "6" >>> + >>> +COMMERCIAL_LICENSE += "emgd-driver-bin" >> >> Can't this be done in the common emgd driver recipe? Seems wrong to have >> to specify commercial license for recipe in a machine config... A >> different machine could just omit it and the user would not have to add >> COMMERCIAL_LICENSE = "" to their local.conf and it would be fine? >> >> > > I did try that first, but puting it in the layer.conf was the only thing > that worked. I think the same thing could be said for the other recipes > in the COMMERCIAL_LICENSE list in default-distrovars, as well as the > COMMERCIAL_LICENSE = "" override in local.conf, which is always the > answer on the list given whenever people try to use those recipes (none > of this is documented anywhere that I could find either. Now at least > it is for these layers.)
Alright, sounds like a bigger project to get it out of the layer.conf and probably something we need to get into the documentation somewhere. This series looks fine to me otherwise. -- Darren Hart Intel Open Source Technology Center Yocto Project - Linux Kernel _______________________________________________ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto