diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2015-05-10 19:30:03 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-14 11:43:58 +0100 |
| commit | b741051080652eabcbcab0f2fa73e82cf31b742a (patch) | |
| tree | 21f5cf99d8bace687ed89cba8f111ee2da8f0bd9 /meta/recipes-graphics/xorg-font | |
| parent | f609f7aba72f4297386fd6f88544db4dc86a63ef (diff) | |
| download | openembedded-core-contrib-b741051080652eabcbcab0f2fa73e82cf31b742a.tar.gz | |
recipes-graphics: add x11 to REQUIRED_DISTRO_FEATURES
They can't be built withou x11 in DISTRO_FEATURES.
(From OE-Core rev: 908f6f2ded18d5301f428e685bface60335bd791)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-font')
| -rw-r--r-- | meta/recipes-graphics/xorg-font/xorg-font-common.inc | 6 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/meta/recipes-graphics/xorg-font/xorg-font-common.inc b/meta/recipes-graphics/xorg-font/xorg-font-common.inc index d3b995a358..d5267f59a2 100644 --- a/meta/recipes-graphics/xorg-font/xorg-font-common.inc +++ b/meta/recipes-graphics/xorg-font/xorg-font-common.inc @@ -10,10 +10,14 @@ RDEPENDS_${PN} = "encodings font-util font-alias" XORG_PN = "${BPN}" INC_PR = "r2" + SRC_URI = "${XORG_MIRROR}/individual/font/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" -inherit autotools pkgconfig +inherit autotools pkgconfig distro_features_check + +# The mkfontscale-native requires x11 in DISTRO_FEATURES +REQUIRED_DISTRO_FEATURES = "x11" EXTRA_OEMAKE += "FCCACHE=/bin/true UTIL_DIR=${STAGING_DIR_TARGET}\$\(MAPFILES_PATH\)" diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb index bee500b43a..9bcd1b2fa6 100644 --- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb @@ -13,7 +13,10 @@ SRC_URI = "file://misc" PE = "1" PR = "r2" -inherit allarch +inherit allarch distro_features_check + +# The font-alias requires x11 in DISTRO_FEATURES +REQUIRED_DISTRO_FEATURES = "x11" S = "${WORKDIR}/misc" |