From cc125f84ea6d719e5dd5c589fab874991e8ebd75 Mon Sep 17 00:00:00 2001
From: is <is@NetBSD.org>
Date: Fri, 6 Nov 2009 12:31:44 +0000
Subject: [PATCH] Install a.out version of INSTALL kernel in release. Slightly
 modified from a patch provided by Izumi Tsutsui as response to PR 41672.

---
 distrib/shark/instkernel/instkernel/Makefile | 15 +++++++++------
 etc/etc.shark/Makefile.inc                   |  9 +--------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/distrib/shark/instkernel/instkernel/Makefile b/distrib/shark/instkernel/instkernel/Makefile
index 76220202eb40..1c77334cb019 100644
--- a/distrib/shark/instkernel/instkernel/Makefile
+++ b/distrib/shark/instkernel/instkernel/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.18 2009/09/02 07:48:50 skrll Exp $
+#	$NetBSD: Makefile,v 1.19 2009/11/06 12:31:44 is Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -9,11 +9,14 @@ RAMDISK=	${RAMDISKDIR}/ramdisk.fs
 MDSETTARGETS=		INSTALL ${RAMDISK} -
 MDSET_RELEASEDIR=	binary/kernel
 
-MDSET_POST= \
-	${OBJCOPY} -O a.out-arm-netbsd -R .ident -R .arm.atpcs -R .comment \
-	    -R .note.netbsd.ident -R .ARM.attributes \
-	    ${.TARGET} ${.TARGET}.aout; \
-	gzip -9nc ${.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"
 
diff --git a/etc/etc.shark/Makefile.inc b/etc/etc.shark/Makefile.inc
index 7497ccd595f9..ad7d6cc8c6d2 100644
--- a/etc/etc.shark/Makefile.inc
+++ b/etc/etc.shark/Makefile.inc
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.10 2008/03/18 04:20:37 lukem Exp $
+#	$NetBSD: Makefile.inc,v 1.11 2009/11/06 12:31:44 is Exp $
 #
 #	etc.shark/Makefile.inc -- shark-specific etc Makefile targets
 #
@@ -10,10 +10,3 @@ KERNEL_SETS=		GENERIC
 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'