Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/i386/stand bootxx_cd9660 (cdboot), like bootxx_fat1...
details: https://anonhg.NetBSD.org/src/rev/7bb8a32eea1a
branches: trunk
changeset: 760165:7bb8a32eea1a
user: jakllsch <jakllsch%NetBSD.org@localhost>
date: Wed Dec 29 17:44:03 2010 +0000
description:
bootxx_cd9660 (cdboot), like bootxx_fat16 (fatboot), is not a traditional
libsa-based program. As such, build bootxx_cd9660 where its source lives.
This has been done by moving bootxx/bootxx_cd9660/Makefile to cdboot/Makefile
and adjusting the relative paths appropriately, so as to minimize binary change.
diffstat:
sys/arch/i386/stand/Makefile | 4 +-
sys/arch/i386/stand/bootxx/Makefile | 4 +-
sys/arch/i386/stand/bootxx/bootxx_cd9660/Makefile | 54 ------------------
sys/arch/i386/stand/cdboot/Makefile | 66 ++++++++--------------
4 files changed, 29 insertions(+), 99 deletions(-)
diffs (182 lines):
diff -r 6bf9395f457f -r 7bb8a32eea1a sys/arch/i386/stand/Makefile
--- a/sys/arch/i386/stand/Makefile Wed Dec 29 15:53:57 2010 +0000
+++ b/sys/arch/i386/stand/Makefile Wed Dec 29 17:44:03 2010 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2007/01/06 20:48:59 dsl Exp $
+# $NetBSD: Makefile,v 1.26 2010/12/29 17:44:03 jakllsch Exp $
SUBDIR= genprom .WAIT
SUBDIR+= mbr boot
-SUBDIR+= bootxx fatboot
+SUBDIR+= bootxx cdboot fatboot
SUBDIR+= dosboot misc
SUBDIR+= netboot
SUBDIR+= pxeboot
diff -r 6bf9395f457f -r 7bb8a32eea1a sys/arch/i386/stand/bootxx/Makefile
--- a/sys/arch/i386/stand/bootxx/Makefile Wed Dec 29 15:53:57 2010 +0000
+++ b/sys/arch/i386/stand/bootxx/Makefile Wed Dec 29 17:44:03 2010 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2010/09/11 13:06:37 tsutsui Exp $
+# $NetBSD: Makefile,v 1.14 2010/12/29 17:44:03 jakllsch Exp $
-SUBDIR= bootxx_cd9660 bootxx_ffsv1 .WAIT bootxx_ffsv2 bootxx_lfsv1 bootxx_lfsv2
+SUBDIR= bootxx_ffsv1 .WAIT bootxx_ffsv2 bootxx_lfsv1 bootxx_lfsv2
SUBDIR+=bootxx_msdos bootxx_ustarfs
# Ext2fs doesn't have enough free space (it has only 1KB)
diff -r 6bf9395f457f -r 7bb8a32eea1a sys/arch/i386/stand/bootxx/bootxx_cd9660/Makefile
--- a/sys/arch/i386/stand/bootxx/bootxx_cd9660/Makefile Wed Dec 29 15:53:57 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2009/02/14 13:52:51 abs Exp $
-
-S= ${.CURDIR}/../../../../..
-
-NOMAN= # defined
-.include <bsd.own.mk>
-
-STRIPFLAG= # nothing
-
-LIBCRT0= # nothing
-LIBCRTBEGIN= # nothing
-LIBCRTEND= # nothing
-LIBC= # nothing
-
-PRIMARY_LOAD_ADDRESS= 0x600
-SECONDARY_LOAD_ADDRESS= 0x10000
-
-PROG= bootxx_cd9660
-SRCS?= cdboot.S
-
-BINDIR= /usr/mdec
-BINMODE= 444
-
-.PATH: ${.CURDIR}/../.. ${.CURDIR}/../../cdboot
-
-LDFLAGS+= -nostdlib -Wl,-e,start
-CPPFLAGS+= -I. -I${.CURDIR}/../../lib -I${S}
-CPPFLAGS+= -DPRIMARY_LOAD_ADDRESS=${PRIMARY_LOAD_ADDRESS}
-CPPFLAGS+= -DSECONDARY_LOAD_ADDRESS=${SECONDARY_LOAD_ADDRESS}
-CPPFLAGS+= -DDISABLE_KEYPRESS
-
-.if ${MACHINE_ARCH} == "x86_64"
-LDFLAGS+= -Wl,-m,elf_i386
-AFLAGS+= -m32
-.endif
-
-BUILDSYMLINKS+= $S/arch/i386/include machine \
- $S/arch/x86/include x86
-
-DPSRCS+= machine x86
-
-CLEANFILES+= ${PROG}.tmp
-
-${PROG}: ${OBJS}
- ${_MKTARGET_LINK}
- ${CC} -o ${PROG}.tmp ${LDFLAGS} -Wl,-Ttext,${PRIMARY_LOAD_ADDRESS} \
- ${OBJS}
- @ set -- $$( ${NM} -t d ${PROG}.tmp | grep '\<free_space\>' \
- | ${TOOL_SED} 's/^0*//' ); \
- echo "#### There are $$1 free bytes in ${PROG}"
- ${OBJCOPY} -O binary ${PROG}.tmp ${PROG}
- rm -f ${PROG}.tmp
-
-.include <bsd.prog.mk>
diff -r 6bf9395f457f -r 7bb8a32eea1a sys/arch/i386/stand/cdboot/Makefile
--- a/sys/arch/i386/stand/cdboot/Makefile Wed Dec 29 15:53:57 2010 +0000
+++ b/sys/arch/i386/stand/cdboot/Makefile Wed Dec 29 17:44:03 2010 +0000
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2009/02/14 13:52:51 abs Exp $
+# $NetBSD: Makefile,v 1.10 2010/12/29 17:44:03 jakllsch Exp $
-S= ${.CURDIR}/../../../..
+S= ${.CURDIR}/../../../..
NOMAN= # defined
+.include <bsd.own.mk>
+
STRIPFLAG= # nothing
LIBCRT0= # nothing
@@ -10,59 +12,41 @@
LIBCRTEND= # nothing
LIBC= # nothing
-PRIMARY_LOAD_ADDRESS=0x600
-SECONDARY_LOAD_ADDRESS=0x10000
+PRIMARY_LOAD_ADDRESS= 0x600
+SECONDARY_LOAD_ADDRESS= 0x10000
-PIE_CFLAGS=
-PIE_LDFLAGS=
-PIE_AFLAGS=
-
-.include <bsd.own.mk>
+PROG= bootxx_cd9660
+SRCS?= cdboot.S
-PROG= cdboot
-SRCS?= cdboot.S
+BINDIR= /usr/mdec
+BINMODE= 444
-BINDIR= /usr/mdec
-BINMODE=444
+.PATH: ${.CURDIR}/..
-.PATH: ${.CURDIR}/..
-
-LDFLAGS+= -nostdlib -Wl,-e,start
-CPPFLAGS+= -I. -I${.CURDIR}/../lib -I${S}
-CPPFLAGS+= -DPRIMARY_LOAD_ADDRESS=${PRIMARY_LOAD_ADDRESS}
-CPPFLAGS+= -DSECONDARY_LOAD_ADDRESS=${SECONDARY_LOAD_ADDRESS}
-#CPPFLAGS+= -DDISABLE_KEYPRESS
+LDFLAGS+= -nostdlib -Wl,-e,start
+CPPFLAGS+= -I. -I${.CURDIR}/../lib -I${S}
+CPPFLAGS+= -DPRIMARY_LOAD_ADDRESS=${PRIMARY_LOAD_ADDRESS}
+CPPFLAGS+= -DSECONDARY_LOAD_ADDRESS=${SECONDARY_LOAD_ADDRESS}
+CPPFLAGS+= -DDISABLE_KEYPRESS
.if ${MACHINE_ARCH} == "x86_64"
-LDFLAGS+= -Wl,-m,elf_i386
-AFLAGS+= -m32
-.endif
-
-.if !make(obj) && !make(clean) && !make(cleandir)
-.BEGIN: machine x86
-.NOPATH: machine x86
+LDFLAGS+= -Wl,-m,elf_i386
+AFLAGS+= -m32
.endif
-realdepend realall: machine x86
-CLEANFILES+= machine x86
-
-machine::
- -rm -f $@
- ln -s $S/arch/i386/include $@
+BUILDSYMLINKS+= $S/arch/i386/include machine \
+ $S/arch/x86/include x86
-x86::
- -rm -f $@
- ln -s $S/arch/x86/include $@
+DPSRCS+= machine x86
-${OBJS}: machine x86
-
-CLEANFILES+= ${PROG}.tmp
+CLEANFILES+= ${PROG}.tmp
${PROG}: ${OBJS}
${_MKTARGET_LINK}
- ${CC} -o ${PROG}.tmp ${LDFLAGS} -Wl,-Ttext,${PRIMARY_LOAD_ADDRESS} ${OBJS}
+ ${CC} -o ${PROG}.tmp ${LDFLAGS} -Wl,-Ttext,${PRIMARY_LOAD_ADDRESS} \
+ ${OBJS}
@ set -- $$( ${NM} -t d ${PROG}.tmp | grep '\<free_space\>' \
- | ${TOOL_SED} 's/^0*//' ); \
+ | ${TOOL_SED} 's/^0*//' ); \
echo "#### There are $$1 free bytes in ${PROG}"
${OBJCOPY} -O binary ${PROG}.tmp ${PROG}
rm -f ${PROG}.tmp
Home |
Main Index |
Thread Index |
Old Index