From 8c2e653abcbeadde7460c34bc2264056a6e2d886 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 19 Dec 2009 21:59:09 +0100
Subject: rename kernel and images files to be conform

- use ADK_TARGET and FS for kernel files
- use ADK_TARGET, ADK_LIBC and FS for image files

ARCH is implicit in ADK_TARGET encoded.
---
 mk/image.mk | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'mk')

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} \
-- 
cgit v1.2.3