diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-02-01 10:27:11 -0500 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-03-12 22:51:39 -0400 |
commit | 6e60e8b2b2bab889379b380a28a167a0edd9d1d3 (patch) | |
tree | f12f54d5ba8e74e67e5fad3651a1e125bb8f4191 /import-layers/meta-openembedded/meta-oe/recipes-support/emacs/emacs.inc | |
parent | 509842add85b53e13164c1569a1fd43d5b8d91c5 (diff) | |
download | talos-openbmc-6e60e8b2b2bab889379b380a28a167a0edd9d1d3.tar.gz talos-openbmc-6e60e8b2b2bab889379b380a28a167a0edd9d1d3.zip |
Yocto 2.3
Move OpenBMC to Yocto 2.3(pyro).
Tested: Built and verified Witherspoon and Palmetto images
Change-Id: I50744030e771f4850afc2a93a10d3507e76d36bc
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Resolves: openbmc/openbmc#2461
Diffstat (limited to 'import-layers/meta-openembedded/meta-oe/recipes-support/emacs/emacs.inc')
-rw-r--r-- | import-layers/meta-openembedded/meta-oe/recipes-support/emacs/emacs.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/emacs/emacs.inc b/import-layers/meta-openembedded/meta-oe/recipes-support/emacs/emacs.inc index 012895e85..5b905f93f 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-support/emacs/emacs.inc +++ b/import-layers/meta-openembedded/meta-oe/recipes-support/emacs/emacs.inc @@ -18,7 +18,7 @@ X11DEPENDS = " \ EXTRA_OECONF = "--without-sound --with-crt-dir=${STAGING_LIBDIR} " -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" PACKAGECONFIG[x11] = "--with-x-toolkit=gtk,--without-x --without-dbus,${X11DEPENDS}" @@ -86,7 +86,7 @@ do_compile_prepend() { ${STAGING_DIR_TARGET}/${base_libdir}/libgcc_s.so.* \ ${STAGING_DIR_TARGET}/${base_libdir}/libpthread* $treedir/${base_libdir}/ - if [ ! -z "${@bb.utils.contains('PACKAGECONFIG', 'x11', 'x11', '', d)}" ] ; then + if [ ! -z "${@bb.utils.filter('PACKAGECONFIG', 'x11', d)}" ]; then echo "X11 build enabled" # copy only as much stuff as we need # before: 5.5G ../../qemu-treedir/ |