diff options
| author |   Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2013-01-20 22:17:28 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-28 12:25:34 +0000 |
| commit | e3d5cb2033245ecb6e25f90d9d71296a018c4342 (patch) | |
| tree | 9bf762455ac49f426b82613818a58841f10c092d /meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb | |
| parent | dc1bb7a5532411bc9cb7e8678bc540c44fd2cd63 (diff) | |
| download | openembedded-core-contrib-e3d5cb2033245ecb6e25f90d9d71296a018c4342.tar.gz | |
xorg-minimal-fonts: depend on font-alias instead of shipping fonts.alias
| Collected errors:
| * check_data_file_clashes: Package font-alias wants to install file /home/hrw/HDD/devel/canonical/aarch64/openembedded/build/tmp-eglibc/work/genericarmv8-oe-linux/core-image-lsb-dev/1.0-r0/rootfs/usr/share/fonts/X11/misc/fonts.alias
| But that file is already provided by package * xorg-minimal-fonts
| * opkg_install_cmd: Cannot install package packagegroup-core-lsb-dev.
| ERROR: Function failed: do_rootfs (see /home/hrw/HDD/devel/canonical/aarch64/openembedded/build/tmp-eglibc/work/genericarmv8-oe-linux/core-image-lsb-dev/1.0-r0/temp/log.do_rootfs.7564 for further information)
Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb')
| -rw-r--r-- | meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb index b1a65e7b85..5e33f14339 100644 --- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb @@ -6,19 +6,19 @@ BUGTRACKER = "n/a" SECTION = "x11/fonts" LICENSE = "PD" -LIC_FILES_CHKSUM = "file://../misc/fonts.alias;md5=bbe8d3c0e4e74af96e3ac393985c4fbb \ - file://../misc/fonts.dir;md5=82a143d94d6a974aafe97132d2d519ab \ +LIC_FILES_CHKSUM = "file://../misc/fonts.dir;md5=82a143d94d6a974aafe97132d2d519ab \ file://../misc/cursor.pcf.gz;md5=40bc81001fef4c21ca08df4305014a2a" SRC_URI = "file://misc" PE = "1" -PR = "r1" +PR = "r2" inherit allarch PACKAGES = "${PN}" FILES_${PN} = "${libdir}/X11/ ${datadir}/fonts/X11/" +RDEPENDS_${PN} += "font-alias" do_install() { install -d ${D}/${datadir}/fonts/X11/misc @@ -26,5 +26,3 @@ do_install() { install -d ${D}/${libdir}/X11 ln -sf ${datadir}/fonts/X11/ ${D}/${libdir}/X11/fonts -s } - - |