Module Name: src
Committed By: christos
Date: Sun Jan 31 18:56:49 UTC 2016
Modified Files:
src/distrib/utils: Makefile
Added Files:
src/distrib/utils/x_disklabel: Makefile
Log Message:
PR/50729: Izumi Tsutsui: Add "small" disklabel
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/distrib/utils/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/utils/x_disklabel/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/Makefile
diff -u src/distrib/utils/Makefile:1.21 src/distrib/utils/Makefile:1.22
--- src/distrib/utils/Makefile:1.21 Sat Jul 26 15:35:10 2014
+++ src/distrib/utils/Makefile Sun Jan 31 13:56:49 2016
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2014/07/26 19:35:10 dholland Exp $
+# $NetBSD: Makefile,v 1.22 2016/01/31 18:56:49 christos Exp $
.if make(obj)
SUBDIR= libhack more ssh tls \
- x_ed x_gzip x_ifconfig \
+ x_disklabel x_ed x_gzip x_ifconfig \
x_netstat x_ping x_route x_umount zcat
.if ${MACHINE} == "acorn32"
Added files:
Index: src/distrib/utils/x_disklabel/Makefile
diff -u /dev/null src/distrib/utils/x_disklabel/Makefile:1.1
--- /dev/null Sun Jan 31 13:56:49 2016
+++ src/distrib/utils/x_disklabel/Makefile Sun Jan 31 13:56:49 2016
@@ -0,0 +1,40 @@
+# $NetBSD: Makefile,v 1.1 2016/01/31 18:56:49 christos Exp $
+# Build a small disklabel (for tiny boot media)
+
+SRCDIR= ${.CURDIR}/../../../sbin/disklabel
+
+PROG= disklabel
+SRCS= main.c dkcksum.c printlabel.c
+#SRCS+= interact.c
+NOMAN= # defined
+
+CPPFLAGS+= -DNO_INTERACT
+CPPFLAGS+= -DNATIVELABEL_ONLY
+
+DPADD+= ${LIBUTIL}
+LDADD+= -lutil
+
+# these have additional requirements on the alignment of a partition
+.if (${MACHINE} == "sparc") || (${MACHINE} == "sparc64") \
+ || (${MACHINE} == "sun3")
+CPPFLAGS+= -DSTRICT_CYLINDER_ALIGNMENT
+.endif
+
+.if (${MACHINE} == "acorn32" || ${MACHINE} == "acorn26")
+# Support FileCore boot block
+CPPFLAGS+= -DUSE_ACORN
+.endif
+
+.if (${MACHINE_ARCH} == "alpha")
+# alpha requires boot block checksum
+CPPFLAGS+= -DALPHA_BOOTBLOCK_CKSUM
+.endif
+
+.if (${MACHINE_ARCH} == "vax")
+# vax requires labels in alternative sectors on SMD disk
+CPPFLAGS+= -DVAX_ALTLABELS
+.endif
+
+.include <bsd.prog.mk>
+
+.PATH: ${SRCDIR}
