Merge branch 'master' of git+ssh://openadk.org/git/openadk

mk/image.mk

@@ -42,7 +42,7 @@ image-prepare-post:
 	    dd if=$$rng bs=512 count=1 >>${TARGET_DIR}/etc/.rnd 2>/dev/null; \
 	    chmod 600 ${TARGET_DIR}/etc/.rnd
 	chmod 4511 ${TARGET_DIR}/bin/busybox
-	@if [ -d ${TARGET_DIR}/usr/share/fonts/X11 ];then \
+	@-if [ -d ${TARGET_DIR}/usr/share/fonts/X11 ];then \
 		for i in $$(ls ${TARGET_DIR}/usr/share/fonts/X11/);do \
 			mkfontdir ${TARGET_DIR}/usr/share/fonts/X11/$${i}; \
 		done; \

package/mkfontdir/Makefile

@@ -9,6 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		d13d01127f88eb50f5c6c3d47ae585e5
 PKG_DESCR:=		font utility
 PKG_SECTION:=		x11/apps
+PKG_DEPENDS:=		mkfontscale
 PKG_SITES:=		http://www.x.org/releases/X11R7.6/src/everything/
 PKG_OPTS:=		noscripts
 

target/packages/pkg-available/development

@@ -22,6 +22,7 @@ config ADK_PKG_DEVELOPMENT
 	select ADK_PACKAGE_LZOP
 	select ADK_PACKAGE_M4
 	select ADK_PACKAGE_MAKE
+	select ADK_PACKAGE_MKFONTDIR
 	select ADK_PACKAGE_PATCH
 	select ADK_PACKAGE_PKG_CONFIG
 	select ADK_PACKAGE_MICROPERL