From 908f6f2ded18d5301f428e685bface60335bd791 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Sun, 10 May 2015 19:30:03 -0700 Subject: recipes-graphics: add x11 to REQUIRED_DISTRO_FEATURES They can't be built withou x11 in DISTRO_FEATURES. Signed-off-by: Robert Yang --- meta/recipes-graphics/xorg-font/xorg-font-common.inc | 6 +++++- meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'meta/recipes-graphics/xorg-font') 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" -- cgit 1.2.3-korg