diff options
Diffstat (limited to 'poky/meta/recipes-graphics/xorg-font')
5 files changed, 14 insertions, 14 deletions
diff --git a/poky/meta/recipes-graphics/xorg-font/encodings_1.0.5.bb b/poky/meta/recipes-graphics/xorg-font/encodings_1.0.5.bb index 713fcfb93..8ddbaf24d 100644 --- a/poky/meta/recipes-graphics/xorg-font/encodings_1.0.5.bb +++ b/poky/meta/recipes-graphics/xorg-font/encodings_1.0.5.bb @@ -10,7 +10,7 @@ PE = "1" PR = "r3" DEPENDS = "mkfontscale-native mkfontdir-native font-util-native" -RDEPENDS_${PN} = "" +RDEPENDS:${PN} = "" SRC_URI += "file://nocompiler.patch" SRC_URI[md5sum] = "bbae4f247b88ccde0e85ed6a403da22a" @@ -21,5 +21,5 @@ inherit allarch EXTRA_OECONF += "--with-encodingsdir=${datadir}/fonts/X11/encodings" # postinst from .inc doesn't apply to this recipe -pkg_postinst_${PN} () { +pkg_postinst:${PN} () { } diff --git a/poky/meta/recipes-graphics/xorg-font/font-alias_1.0.4.bb b/poky/meta/recipes-graphics/xorg-font/font-alias_1.0.4.bb index e4b70c69d..d80ecbeb8 100644 --- a/poky/meta/recipes-graphics/xorg-font/font-alias_1.0.4.bb +++ b/poky/meta/recipes-graphics/xorg-font/font-alias_1.0.4.bb @@ -13,8 +13,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bf0158b89be493d523d69d9f29265038 \ SRC_URI += "file://nocompiler.patch" DEPENDS = "util-macros-native font-util-native" -RDEPENDS_${PN} = "encodings font-util" -RDEPENDS_${PN}_class-native = "font-util-native" +RDEPENDS:${PN} = "encodings font-util" +RDEPENDS:${PN}:class-native = "font-util-native" inherit allarch diff --git a/poky/meta/recipes-graphics/xorg-font/font-util_1.3.2.bb b/poky/meta/recipes-graphics/xorg-font/font-util_1.3.2.bb index ebe7a603f..8f2d10e25 100644 --- a/poky/meta/recipes-graphics/xorg-font/font-util_1.3.2.bb +++ b/poky/meta/recipes-graphics/xorg-font/font-util_1.3.2.bb @@ -10,13 +10,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5df208ec65eb84ce5bb8d82d8f3b9675 \ file://map-ISO8859-1;beginline=9;endline=23;md5=1cecb984063248f29ffe5c46f5c04f34" DEPENDS = "encodings util-macros" -DEPENDS_class-native = "util-macros-native" -RDEPENDS_${PN} = "mkfontdir mkfontscale encodings" -RDEPENDS_${PN}_class-native = "" +DEPENDS:class-native = "util-macros-native" +RDEPENDS:${PN} = "mkfontdir mkfontscale encodings" +RDEPENDS:${PN}:class-native = "" BBCLASSEXTEND = "native" SRC_URI[md5sum] = "3d6adb76fdd072db8c8fae41b40855e8" SRC_URI[sha256sum] = "3ad880444123ac06a7238546fa38a2a6ad7f7e0cc3614de7e103863616522282" -SYSROOT_DIRS_BLACKLIST_remove = "${datadir}/fonts" +SYSROOT_DIRS_BLACKLIST:remove = "${datadir}/fonts" diff --git a/poky/meta/recipes-graphics/xorg-font/xorg-font-common.inc b/poky/meta/recipes-graphics/xorg-font/xorg-font-common.inc index 7ca5c76a6..ba5840425 100644 --- a/poky/meta/recipes-graphics/xorg-font/xorg-font-common.inc +++ b/poky/meta/recipes-graphics/xorg-font/xorg-font-common.inc @@ -5,7 +5,7 @@ SECTION = "x11/fonts" LICENSE = "MIT-X" DEPENDS = " encodings font-alias font-util-native" -RDEPENDS_${PN} = "encodings font-util font-alias" +RDEPENDS:${PN} = "encodings font-util font-alias" XORG_PN = "${BPN}" @@ -19,17 +19,17 @@ REQUIRED_DISTRO_FEATURES = "x11" EXTRA_OEMAKE += "FCCACHE=/bin/true UTIL_DIR=${STAGING_DIR_TARGET}\$\(MAPFILES_PATH\)" -do_install_append() { +do_install:append() { find ${D}${libdir}/X11/fonts -type f -name fonts.dir | xargs rm -f find ${D}${libdir}/X11/fonts -type f -name fonts.scale | xargs rm -f find ${D}${datadir}/fonts/X11 -type f -name fonts.dir | xargs rm -f find ${D}${datadir}/fonts/X11 -type f -name fonts.scale | xargs rm -f } -FILES_${PN} += " ${libdir}/X11/fonts ${datadir}" +FILES:${PN} += " ${libdir}/X11/fonts ${datadir}" PACKAGE_WRITE_DEPS += "mkfontdir-native mkfontscale-native" -pkg_postinst_${PN} () { +pkg_postinst:${PN} () { for fontdir in `find $D/usr/lib/X11/fonts -type d`; do mkfontdir $fontdir mkfontscale $fontdir diff --git a/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb index f0c77f33b..88f534ccf 100644 --- a/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb +++ b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb @@ -25,8 +25,8 @@ REQUIRED_DISTRO_FEATURES = "x11" S = "${WORKDIR}/misc" PACKAGES = "${PN}" -FILES_${PN} = "${libdir}/X11/ ${datadir}/fonts/X11/" -RDEPENDS_${PN} += "font-alias" +FILES:${PN} = "${libdir}/X11/ ${datadir}/fonts/X11/" +RDEPENDS:${PN} += "font-alias" do_install() { install -d ${D}/${datadir}/fonts/X11/misc |