diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-04-29 17:58:35 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-04-29 17:58:35 +0200 |
| commit | aa2345af436cfb40dff27df88cbd4a5fb79d477a (patch) | |
| tree | 1ae9e9930056a2e8b8ae401da270bdd156ee7498 | |
| parent | ea63ed9bc4b8912bb08661e5bce309b528060a37 (diff) | |
| parent | 11d7426128183e687ebc1f2b4a8f3f21fbfec791 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | mk/image.mk | 2 | ||||
| -rw-r--r-- | package/mkfontdir/Makefile | 1 | ||||
| -rw-r--r-- | target/packages/pkg-available/development | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/mk/image.mk b/mk/image.mk index 38e206df3..ec681a48e 100644 --- a/mk/image.mk +++ b/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; \ diff --git a/package/mkfontdir/Makefile b/package/mkfontdir/Makefile index a8ed9c35c..32b9e2e4f 100644 --- a/package/mkfontdir/Makefile +++ b/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 diff --git a/target/packages/pkg-available/development b/target/packages/pkg-available/development index d49a40788..cd2435c25 100644 --- a/target/packages/pkg-available/development +++ b/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 |