bblayers: Always include fct layer

In order to avoid issues like missing licenses or corrupted kernel
shared directory, it is better to remove this hack and always include
the fct layer.

BugzID: 70627

build/conf/bblayers.conf

@@ -21,9 +21,5 @@ BBLAYERS ?= " \
   ${YOCTOROOT}/meta-freescale \
   ${YOCTOROOT}/meta-ublox-module \
   ${YOCTOROOT}/meta-netmodule-om \
-  "
-
-# Distro related layers
-BBLAYERS += " \
-  ${@bb.utils.contains_any('DISTRO_TYPE', '-fct -lava', '${YOCTOROOT}/meta-netmodule-fct', '', d)} \
+  ${YOCTOROOT}/meta-netmodule-fct \
   "

env.common

@@ -15,6 +15,4 @@ echo Building for machine $MACHINE, distro: $DISTRO
 
 OSTREE_OSNAME=nm-linux
 
-BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE MACHINE_TYPE DISTRO_OSTREE DISTRO_TYPE"
-
 . ./openembedded-core/oe-init-build-env