diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2016-08-17 15:04:38 -0500 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2016-08-22 16:43:32 +0000 |
commit | b48b7b4109868a8c0ddda090992e936e821c7ea6 (patch) | |
tree | 696be8ea782f2548c0f63bb0188f4c8d3eeed681 /import-layers/meta-openembedded/meta-oe/conf | |
parent | d849ec78de728ef9a2d383b92ccfeabf40f8f1d0 (diff) | |
download | talos-openbmc-b48b7b4109868a8c0ddda090992e936e821c7ea6.tar.gz talos-openbmc-b48b7b4109868a8c0ddda090992e936e821c7ea6.zip |
Squashed 'import-layers/meta-openembedded/' content from commit 247b126
Change-Id: I40827e9ce5fba63f1cca2a0be44976ae8383b4c0
git-subtree-dir: import-layers/meta-openembedded
git-subtree-split: 247b1267bbe95719cd4877d2d3cfbaf2a2f4865a
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'import-layers/meta-openembedded/meta-oe/conf')
-rw-r--r-- | import-layers/meta-openembedded/meta-oe/conf/distro/include/meta_oe_security_flags.inc | 7 | ||||
-rw-r--r-- | import-layers/meta-openembedded/meta-oe/conf/layer.conf | 75 |
2 files changed, 82 insertions, 0 deletions
diff --git a/import-layers/meta-openembedded/meta-oe/conf/distro/include/meta_oe_security_flags.inc b/import-layers/meta-openembedded/meta-oe/conf/distro/include/meta_oe_security_flags.inc new file mode 100644 index 000000000..2565e32ad --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/conf/distro/include/meta_oe_security_flags.inc @@ -0,0 +1,7 @@ +# Build errors with the pie options enabled +SECURITY_CFLAGS_pn-lvm2 = "${SECURITY_NO_PIE_CFLAGS}" +SECURITY_CFLAGS_pn-rrdtool = "${SECURITY_NO_PIE_CFLAGS}" + +# This has text reloc errors with the pie options enabled +SECURITY_CFLAGS_pn-mozjs = "${SECURITY_NO_PIE_CFLAGS}" +SECURITY_CFLAGS_pn-openldap = "${SECURITY_NO_PIE_CFLAGS}" diff --git a/import-layers/meta-openembedded/meta-oe/conf/layer.conf b/import-layers/meta-openembedded/meta-oe/conf/layer.conf new file mode 100644 index 000000000..a67cc1a19 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/conf/layer.conf @@ -0,0 +1,75 @@ +# It really depends on order of the layers appearing in BBLAYERS +# variable in toplevel bblayers.conf file, where bitbake will search +# for .inc files and others where bitbake uses BBPATH since it will +# search the directories from first to last as specified in BBPATH +# Therefore if you want a given layer to be considered high priority +# for the .inc and .conf etc. then consider it adding at the beginning +# of BBPATH. For bblayers bitbake will use BBFILES_PRIORITY to resolve +# the recipe contention so the order of directories in BBFILES does +# not matter. + +# We have a conf and classes directory, append to BBPATH +BBPATH .= ":${LAYERDIR}" + +# We have a recipes directory, add to BBFILES +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend" + +BBFILE_COLLECTIONS += "openembedded-layer" +BBFILE_PATTERN_openembedded-layer := "^${LAYERDIR}/" + +# Define the priority for recipes (.bb files) from this layer, +# choosing carefully how this layer interacts with all of the +# other layers. + +BBFILE_PRIORITY_openembedded-layer = "6" + +# This should only be incremented on significant changes that will +# cause compatibility issues with other layers +LAYERVERSION_openembedded-layer = "1" + +LAYERDEPENDS_openembedded-layer = "core" + +LICENSE_PATH += "${LAYERDIR}/licenses" + +SIGGEN_EXCLUDERECIPES_ABISAFE += " \ + mplayer-common \ + fbset-modes \ + gpsd-machine-conf \ + distro-feed-configs \ + ca-certificates \ +" + +SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ + usb-modeswitch-data->usb-modeswitch \ + lmsensors->lmsensors-config \ + phoronix-test-suite->bash \ + phoronix-test-suite->python \ + phoronix-test-suite->php \ +" + +# ttf.inc inherits fontcache which adds fontconfig-utils to RDEPENDS +SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ + terminus-font->fontconfig \ + ttf-arphic-uming->fontconfig \ + ttf-dejavu->fontconfig \ + ttf-droid->fontconfig \ + ttf-gentium->fontconfig \ + ttf-hunkyfonts->fontconfig \ + ttf-inconsolata->fontconfig \ + ttf-liberation->fontconfig \ + ttf-pt-sans->fontconfig \ + ttf-mplus->fontconfig \ + ttf-sazanami->fontconfig \ + ttf-tlwg->fontconfig \ + ttf-ubuntu-font-family->fontconfig \ + ttf-wqy-zenhei->fontconfig \ + source-han-sans-cn-fonts->fontconfig \ + source-han-sans-jp-fonts->fontconfig \ + source-han-sans-kr-fonts->fontconfig \ + source-han-sans-tw-fonts->fontconfig \ +" + +FREESMARTPHONE_GIT = "git://git.freesmartphone.org" + +# Override security flags +require conf/distro/include/meta_oe_security_flags.inc |