diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-20 10:18:07 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-20 10:18:07 +0100 |
| commit | 6b9416e4465c909141f4fcfd314e8d3cf0ea8477 (patch) | |
| tree | c76c9e8e93f100c1fc2357fc2b3e16be57a26ef8 /mk | |
| parent | d2b0fbc76dcd2dd31a6842ec990276a36b12cbad (diff) | |
| parent | ec84dd5b5584435ad5ef699cbe3ed9ef98e17463 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/image.mk | 11 |
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} \ |