Module Name: src
Committed By: joerg
Date: Wed Jan 26 21:35:14 UTC 2011
Modified Files:
src/sys/arch/powerpc/stand/mkbootimage: Makefile mkbootimage.c
Log Message:
Fix tools build on !NetBSD. Fix printfs to use correct types.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/powerpc/stand/mkbootimage/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/sys/arch/powerpc/stand/mkbootimage/mkbootimage.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/stand/mkbootimage/Makefile
diff -u src/sys/arch/powerpc/stand/mkbootimage/Makefile:1.3 src/sys/arch/powerpc/stand/mkbootimage/Makefile:1.4
--- src/sys/arch/powerpc/stand/mkbootimage/Makefile:1.3 Sat Nov 7 17:56:14 2009
+++ src/sys/arch/powerpc/stand/mkbootimage/Makefile Wed Jan 26 21:35:14 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/11/07 17:56:14 skrll Exp $
+# $NetBSD: Makefile,v 1.4 2011/01/26 21:35:14 joerg Exp $
BINDIR= /usr/mdec
PROG= mkbootimage
@@ -15,7 +15,7 @@
CPPFLAGS= -I${LIBSA} -I${.CURDIR} -I${BFDTOP}/include
CPPFLAGS+= -DATTRIBUTE_PACKED=
-DPADD= ${LIBZ}
-LDADD= -lz
+DPADD+= ${LIBZ}
+LDADD+= -lz
.include <bsd.prog.mk>
Index: src/sys/arch/powerpc/stand/mkbootimage/mkbootimage.c
diff -u src/sys/arch/powerpc/stand/mkbootimage/mkbootimage.c:1.13 src/sys/arch/powerpc/stand/mkbootimage/mkbootimage.c:1.14
--- src/sys/arch/powerpc/stand/mkbootimage/mkbootimage.c:1.13 Sat Oct 16 05:14:14 2010
+++ src/sys/arch/powerpc/stand/mkbootimage/mkbootimage.c Wed Jan 26 21:35:14 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mkbootimage.c,v 1.13 2010/10/16 05:14:14 kiyohara Exp $ */
+/* $NetBSD: mkbootimage.c,v 1.14 2011/01/26 21:35:14 joerg Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -527,19 +527,19 @@
write(rs6000_fd, (void *)rs6000_magic, RS6000_MAGICSIZE);
lenpos = lseek(rs6000_fd, 0, SEEK_CUR);
if (verboseflag)
- printf("wrote magic at pos 0x%x\n", lenpos);
+ printf("wrote magic at pos 0x%lx\n", (unsigned long)lenpos);
tmp = sa_htobe32(0);
write(rs6000_fd, (void *)&tmp, KERNLENSIZE);
/* write in the compressed kernel */
kstart = lseek(rs6000_fd, 0, SEEK_CUR);
if (verboseflag)
- printf("kernel start at pos 0x%x\n", kstart);
+ printf("kernel start at pos 0x%lx\n", (unsigned long)kstart);
kgzlen = gzwrite(gzf, kern_img, kern_stat.st_size);
gzclose(gzf);
kend = lseek(rs6000_fd, 0, SEEK_CUR);
if (verboseflag)
- printf("kernel end at pos 0x%x\n", kend);
+ printf("kernel end at pos 0x%lx\n", (unsigned long)kend);
/* jump back to the length position now that we know the length */
lseek(rs6000_fd, lenpos, SEEK_SET);
