diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-10 11:03:58 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-10 11:03:58 +0100 |
commit | 94c763109f74b446e4d5d31e55ef337c8c8d86cb (patch) | |
tree | 22d1cd06809f5a5c11241e998d9ead4010ac3c91 /mk/image.mk | |
parent | a217fc80b29080dae963bb15051df023de36ce39 (diff) | |
parent | 16d94117a716fc361d3db9a2a17cf4c45eab837d (diff) |
resolve conflicts
Diffstat (limited to 'mk/image.mk')
-rw-r--r-- | mk/image.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mk/image.mk b/mk/image.mk index 6b0eff483..1bfc1f78b 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -42,7 +42,6 @@ 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 - chmod 1777 ${TARGET_DIR}/tmp @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}; \ |