[oe-commits] org.oe.dev merge of '2a6a15e0a08e8a808d409d6dcd8af1d5db6de4cd'

[crofton commit]

merge of '2a6a15e0a08e8a808d409d6dcd8af1d5db6de4cd'
     and 'e50fc707da1372d68e46edaf3a6915bf53f628b9'

Author: crofton at openembedded.org
Branch: org.openembedded.dev
Revision: bb625da55db7de93841c5fa9a5e896f298710cff
ViewMTN: http://monotone.openembedded.org/revision/info/bb625da55db7de93841c5fa9a5e896f298710cff
Files:
1
classes/kernel.bbclass
packages/xorg-font/xorg-minimal-fonts.bb
Diffs:

#
# mt diff -r2a6a15e0a08e8a808d409d6dcd8af1d5db6de4cd -rbb625da55db7de93841c5fa9a5e896f298710cff
#
#
#
# patch "classes/kernel.bbclass"
#  from [aaee7c587861c7c66d492ee0c8e7540f99932496]
#    to [fd4d710e7db2886e29dc83097649bf1ad8661939]
#
============================================================
--- classes/kernel.bbclass	aaee7c587861c7c66d492ee0c8e7540f99932496
+++ classes/kernel.bbclass	fd4d710e7db2886e29dc83097649bf1ad8661939
@@ -450,7 +450,7 @@ do_sizecheck() {
 # Support checking the kernel size since some kernels need to reside in partitions
 # with a fixed length or there is a limit in transferring the kernel to memory
 do_sizecheck() {
-	if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" -a -z "${DONT_CHECK_KERNELSIZE}"]; then
+	if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" -a -z "${DONT_CHECK_KERNELSIZE}" ]; then
         	size=`ls -l ${KERNEL_OUTPUT} | awk '{ print $5}'`
         	if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then
                 	rm ${KERNEL_OUTPUT}


#
# mt diff -re50fc707da1372d68e46edaf3a6915bf53f628b9 -rbb625da55db7de93841c5fa9a5e896f298710cff
#
#
#
# patch "packages/xorg-font/xorg-minimal-fonts.bb"
#  from [ead866f55cd01c842a77f7f3b8bf058f7592737f]
#    to [71e6ca7f3d680bb5770b766f7c0d049a6e8de2cf]
#
============================================================
--- packages/xorg-font/xorg-minimal-fonts.bb	ead866f55cd01c842a77f7f3b8bf058f7592737f
+++ packages/xorg-font/xorg-minimal-fonts.bb	71e6ca7f3d680bb5770b766f7c0d049a6e8de2cf
@@ -2,12 +2,17 @@ LICENSE = "MIT-X"
 SECTION = "x11/fonts"
 LICENSE = "MIT-X"
 
+PR = "r1"
+
 SRC_URI = "file://misc"
 
 do_install() {
 	install -d ${D}/${datadir}/fonts/X11/misc
 	install -m 0644 ${WORKDIR}/misc/* ${D}/${datadir}/fonts/X11/misc/
+	install -d ${D}/${libdir}/X11
+	ln -sf ${datadir}/fonts/X11/ ${D}/${libdir}/X11/fonts -s
+
 }
 
 PACKAGE_ARCH = "all"
+FILES_${PN} = "${libdir}/X11/ ${datadir}/fonts/X11/"
-FILES_${PN} = "${datadir}/fonts/X11/"