summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2013-01-20 22:17:28 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-28 12:29:30 +0000
commit98bee847ac923d9bf99b8d3457f7b5f6c20d6372 (patch)
tree1f7c4518ecdbb63e0ed26cd2aa190eb0bc249b93
parent44f232f6f8d03fe4e1873fee4cd2f6c61801a510 (diff)
downloadpoky-98bee847ac923d9bf99b8d3457f7b5f6c20d6372.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) (From OE-Core rev: e3d5cb2033245ecb6e25f90d9d71296a018c4342) Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb8
-rw-r--r--meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/fonts.alias80
2 files changed, 3 insertions, 85 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"
6SECTION = "x11/fonts" 6SECTION = "x11/fonts"
7 7
8LICENSE = "PD" 8LICENSE = "PD"
9LIC_FILES_CHKSUM = "file://../misc/fonts.alias;md5=bbe8d3c0e4e74af96e3ac393985c4fbb \ 9LIC_FILES_CHKSUM = "file://../misc/fonts.dir;md5=82a143d94d6a974aafe97132d2d519ab \
10 file://../misc/fonts.dir;md5=82a143d94d6a974aafe97132d2d519ab \
11 file://../misc/cursor.pcf.gz;md5=40bc81001fef4c21ca08df4305014a2a" 10 file://../misc/cursor.pcf.gz;md5=40bc81001fef4c21ca08df4305014a2a"
12 11
13SRC_URI = "file://misc" 12SRC_URI = "file://misc"
14 13
15PE = "1" 14PE = "1"
16PR = "r1" 15PR = "r2"
17 16
18inherit allarch 17inherit allarch
19 18
20PACKAGES = "${PN}" 19PACKAGES = "${PN}"
21FILES_${PN} = "${libdir}/X11/ ${datadir}/fonts/X11/" 20FILES_${PN} = "${libdir}/X11/ ${datadir}/fonts/X11/"
21RDEPENDS_${PN} += "font-alias"
22 22
23do_install() { 23do_install() {
24 install -d ${D}/${datadir}/fonts/X11/misc 24 install -d ${D}/${datadir}/fonts/X11/misc
@@ -26,5 +26,3 @@ do_install() {
26 install -d ${D}/${libdir}/X11 26 install -d ${D}/${libdir}/X11
27 ln -sf ${datadir}/fonts/X11/ ${D}/${libdir}/X11/fonts -s 27 ln -sf ${datadir}/fonts/X11/ ${D}/${libdir}/X11/fonts -s
28} 28}
29
30
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/fonts.alias b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/fonts.alias
deleted file mode 100644
index 3900036739..0000000000
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/fonts.alias
+++ /dev/null
@@ -1,80 +0,0 @@
1!! fonts.alias -- automatically generated file. DO NOT EDIT.
2!! To modify, see update-fonts-alias(8).
3!! /etc/X11/fonts/misc/xfonts-base.alias
4! $Xorg: fonts.alias,v 1.3 2000/08/21 16:42:31 coskrey Exp $
5fixed -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1
6variable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-iso8859-1
75x7 -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-1
85x8 -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-1
96x9 -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-1
106x10 -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-1
116x12 -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-1
126x13 -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1
136x13bold -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-1
147x13 -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-1
157x13bold -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-1
167x13euro -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-15
177x13eurobold -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-15
187x14 -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1
197x14bold -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-1
208x13 -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-1
218x13bold -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-1
228x16 -sony-fixed-medium-r-normal--16-120-100-100-c-80-iso8859-1
239x15 -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-1
249x15bold -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-1
2510x20 -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-1
2612x24 -sony-fixed-medium-r-normal--24-170-100-100-c-120-iso8859-1
27nil2 -misc-nil-medium-r-normal--2-20-75-75-c-10-misc-fontspecific
28
29heb6x13 -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-8
30heb8x13 -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-8
31
32k14 -misc-fixed-medium-r-normal--14-*-*-*-*-*-jisx0208.1983-0
33a14 -misc-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-1
34r14 -misc-fixed-medium-r-normal--14-*-*-*-*-*-jisx0201.1976-0
35rk14 -misc-fixed-medium-r-normal--14-*-*-*-*-*-jisx0201.1976-0
36r16 -sony-fixed-medium-r-normal--16-*-*-*-*-*-jisx0201.1976-0
37rk16 -sony-fixed-medium-r-normal--16-*-*-*-*-*-jisx0201.1976-0
38r24 -sony-fixed-medium-r-normal--24-*-*-*-*-*-jisx0201.1976-0
39rk24 -sony-fixed-medium-r-normal--24-*-*-*-*-*-jisx0201.1976-0
40kana14 -misc-fixed-medium-r-normal--14-*-*-*-*-*-jisx0201.1976-0
418x16kana -sony-fixed-medium-r-normal--16-120-100-100-c-80-jisx0201.1976-0
428x16romankana -sony-fixed-medium-r-normal--16-120-100-100-c-80-jisx0201.1976-0
4312x24kana -sony-fixed-medium-r-normal--24-170-100-100-c-120-jisx0201.1976-0
4412x24romankana -sony-fixed-medium-r-normal--24-170-100-100-c-120-jisx0201.1976-0
45kanji16 -jis-fixed-medium-r-normal--16-*-*-*-*-*-jisx0208.1983-0
46kanji24 -jis-fixed-medium-r-normal--24-*-*-*-*-*-jisx0208.1983-0
47
48hanzigb16st "-isas-song ti-medium-r-normal--16-160-72-72-c-160-gb2312.1980-0"
49hanzigb24st "-isas-song ti-medium-r-normal--24-240-72-72-c-240-gb2312.1980-0"
50hanzigb16fs "-isas-fangsong ti-medium-r-normal--16-160-72-72-c-160-gb2312.1980-0"
51
52olcursor "-sun-open look cursor-----12-120-75-75-p-160-sunolcursor-1"
53olglyph-10 "-sun-open look glyph-----10-100-75-75-p-101-sunolglyph-1"
54olglyph-12 "-sun-open look glyph-----12-120-75-75-p-113-sunolglyph-1"
55olglyph-14 "-sun-open look glyph-----14-140-75-75-p-128-sunolglyph-1"
56olglyph-19 "-sun-open look glyph-----19-190-75-75-p-154-sunolglyph-1"
57
58-misc-fixed-medium-r-normal--7-50-100-100-c-50-iso8859-1 -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-1
59-misc-fixed-medium-r-normal--8-60-100-100-c-50-iso8859-1 -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-1
60-misc-fixed-medium-r-normal--9-80-100-100-c-60-iso8859-1 -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-1
61-misc-fixed-medium-r-normal--10-70-100-100-c-60-iso8859-1 -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-1
62-misc-fixed-medium-r-semicondensed--12-90-100-100-c-60-iso8859-1 -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-1
63-misc-fixed-medium-r-semicondensed--13-100-100-100-c-60-iso8859-1 -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1
64-misc-fixed-bold-r-semicondensed--13-100-100-100-c-60-iso8859-1 -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-1
65-misc-fixed-medium-r-normal--13-100-100-100-c-70-iso8859-1 -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-1
66-misc-fixed-bold-r-normal--13-100-100-100-c-70-iso8859-1 -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-1
67-misc-fixed-medium-r-normal--13-100-100-100-c-80-iso8859-1 -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-1
68-misc-fixed-bold-r-normal--13-100-100-100-c-80-iso8859-1 -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-1
69-misc-fixed-medium-r-normal--14-110-100-100-c-70-iso8859-1 -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1
70-misc-fixed-medium-r-normal--15-120-100-100-c-90-iso8859-1 -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-1
71-misc-fixed-bold-r-normal--15-120-100-100-c-90-iso8859-1 -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-1
72-misc-fixed-medium-r-normal--20-140-100-100-c-100-iso8859-1 -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-1
73-misc-fixed-medium-r-semicondensed--13-100-100-100-c-60-iso8859-8 -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-8
74-misc-fixed-medium-r-normal--13-100-100-100-c-80-iso8859-8 -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-8
75-sony-fixed-medium-r-normal--16-150-75-75-c-80-iso8859-1 -sony-fixed-medium-r-normal--16-120-100-100-c-80-iso8859-1
76-sony-fixed-medium-r-normal--16-150-75-75-c-80-jisx0201.1976-0 -sony-fixed-medium-r-normal--16-120-100-100-c-80-jisx0201.1976-0
77-sony-fixed-medium-r-normal--24-230-75-75-c-120-iso8859-1 -sony-fixed-medium-r-normal--24-170-100-100-c-120-iso8859-1
78-sony-fixed-medium-r-normal--24-230-75-75-c-120-jisx0201.1976-0 -sony-fixed-medium-r-normal--24-170-100-100-c-120-jisx0201.1976-0
79-jis-fixed-medium-r-normal--16-110-100-100-c-160-jisx0208.1983-0 -jis-fixed-medium-r-normal--16-150-75-75-c-160-jisx0208.1983-0
80-jis-fixed-medium-r-normal--24-170-100-100-c-240-jisx0208.1983-0 -jis-fixed-medium-r-normal--24-230-75-75-c-240-jisx0208.1983-0