Module Name: src
Committed By: riz
Date: Mon Nov 22 03:15:33 UTC 2010
Modified Files:
src/distrib/shark/instkernel/instkernel [netbsd-5]: Makefile
src/etc/etc.shark [netbsd-5]: Makefile.inc
Log Message:
Pull up following revision(s) (requested by is in ticket #1127):
distrib/shark/instkernel/instkernel/Makefile: revision 1.20
etc/etc.shark/Makefile.inc: revision 1.11
distrib/shark/instkernel/instkernel/Makefile: revision 1.19
Install a.out version of INSTALL kernel in release. Slightly modified
from a patch provided by Izumi Tsutsui as response to PR 41672.
2nd part of "install kernel -> release" fix, inspired by tsutsui@'s patch
to PR 41672.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.16.2.1 \
src/distrib/shark/instkernel/instkernel/Makefile
cvs rdiff -u -r1.10 -r1.10.6.1 src/etc/etc.shark/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/shark/instkernel/instkernel/Makefile
diff -u src/distrib/shark/instkernel/instkernel/Makefile:1.16 src/distrib/shark/instkernel/instkernel/Makefile:1.16.2.1
--- src/distrib/shark/instkernel/instkernel/Makefile:1.16 Mon Jun 23 02:16:54 2008
+++ src/distrib/shark/instkernel/instkernel/Makefile Mon Nov 22 03:15:32 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/06/23 02:16:54 matt Exp $
+# $NetBSD: Makefile,v 1.16.2.1 2010/11/22 03:15:32 riz Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -9,16 +9,15 @@
MDSETTARGETS= INSTALL ${RAMDISK} -
MDSET_RELEASEDIR= binary/kernel
-MDSET_POST= \
- ${OBJCOPY} -O a.out-arm-netbsd -R .ident -R .arm.atpcs -R .comment \
- ${.TARGET} ${.TARGET}.aout; \
- gzip -9c ${.TARGET}.aout >${.TARGET}.aout.gz
+MDSET_SUFFIXES.-= aout create-aout
+create-aout= \
+ ${OBJCOPY} -O a.out-arm-netbsd \
+ -R .ident -R .arm.atpcs -R .comment -R .note.netbsd.ident \
+ -R .debug_abbrev -R .debug_info -R .debug_line -R .debug_str \
+ -R .debug_frame -R .debug_loc -R .debug_pubnames \
+ -R .debug_aranges -R .ARM.attributes \
+ ${.TARGET:R} ${.TARGET}
.include "${DISTRIBDIR}/common/Makefile.mdset"
-.PHONY: release-aout-instkernel
-release-aout-instkernel:
- ${RELEASE_INSTALL} netbsd-INSTALL.aout.gz \
- ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/instkernel/netbsd.gz
-
.include <bsd.prog.mk>
Index: src/etc/etc.shark/Makefile.inc
diff -u src/etc/etc.shark/Makefile.inc:1.10 src/etc/etc.shark/Makefile.inc:1.10.6.1
--- src/etc/etc.shark/Makefile.inc:1.10 Tue Mar 18 04:20:37 2008
+++ src/etc/etc.shark/Makefile.inc Mon Nov 22 03:15:33 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.10 2008/03/18 04:20:37 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.10.6.1 2010/11/22 03:15:33 riz Exp $
#
# etc.shark/Makefile.inc -- shark-specific etc Makefile targets
#
@@ -10,10 +10,3 @@
KERNEL_SUFFIXES= aout
BUILD_KERNELS= INSTALL
-
-INSTALLATION_DIRS+= installation/instkernel
-
-snap_md_post:
- cd ${NETBSDSRCDIR}/distrib/shark/instkernel/instkernel && \
- ${MAKE} release-aout-instkernel
- ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/instkernel '*.gz'
