summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorU-windows7\wbx <wbx@windows7.(none)>2009-12-20 13:29:10 +0100
committerU-windows7\wbx <wbx@windows7.(none)>2009-12-20 13:29:10 +0100
commit9115ff8b3139bab8ebc2d25f1ec03a98b2641c99 (patch)
tree2c7535d8970d7ebf5a7b5613fc3324b3200c0645 /mk
parent82009b8fa77db023dd186444e2698a5d9c01d496 (diff)
parent6b65886e809bdbfd7699e7fbbc8980f5eb4992c4 (diff)
Merge branch 'master' of git://openadk.org/git/openadk
Diffstat (limited to 'mk')
-rw-r--r--mk/image.mk11
1 files changed, 6 insertions, 5 deletions
diff --git a/mk/image.mk b/mk/image.mk
index a720bb1ea..c6f5ce266 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -48,10 +48,10 @@ image-prepare-post:
chmod 4511 ${TARGET_DIR}/bin/busybox
chmod 1777 ${TARGET_DIR}/tmp
-INITRAMFS= ${ADK_TARGET}-${ARCH}-${FS}
-ROOTFSSQUASHFS= ${ADK_TARGET}-${ARCH}-${FS}.img
-ROOTFSTARBALL= ${ADK_TARGET}-${ARCH}-${FS}.tar.gz
-INITRAMFS_PIGGYBACK= ${ADK_TARGET}-${ARCH}-${FS}.cpio
+INITRAMFS= ${ADK_TARGET}-${ADK_LIBC}-${FS}
+ROOTFSSQUASHFS= ${ADK_TARGET}-${ADK_LIBC}-${FS}.img
+ROOTFSTARBALL= ${ADK_TARGET}-${ADK_LIBC}-${FS}.tar.gz
+INITRAMFS_PIGGYBACK= ${ADK_TARGET}-${ADK_LIBC}-${FS}.cpio
${BIN_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR}
cd ${TARGET_DIR}; tar -cf - --owner=0 --group=0 . | gzip -n9 >$@
@@ -68,7 +68,8 @@ ${BIN_DIR}/${ROOTFSSQUASHFS}: ${TARGET_DIR}
PATH='${TARGET_PATH}' \
mksquashfs ${TARGET_DIR} ${BUILD_DIR}/root.squashfs \
-nopad -noappend -root-owned $(MAKE_TRACE)
- cat ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel ${BUILD_DIR}/root.squashfs > \
+ cat ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel \
+ ${BUILD_DIR}/root.squashfs > \
${BUILD_DIR}/${ROOTFSSQUASHFS}
# padding of images is required, foxboard only?
#dd if=${BUILD_DIR}/${ROOTFSSQUASHFS} of=${BIN_DIR}/${ROOTFSSQUASHFS} \