d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unbreak boot2 by backing out rev 1.36 to Makefile, which does not

Browse Source 
work as advertised:

	bang# pwd
	/bang/src/sys/boot/i386/boot2
	bang# make clean >& /dev/null
	bang# cvs -q update -r 1.35 Makefile >& /dev/null
	bang# make >& /dev/null
	bang# cat /usr/obj/`pwd`/boot2.h
	#define XREADORG 0x725
	bang# cvs -q update -r 1.36 Makefile > & /dev/null
	bang# make clean > & /dev/null
	bang# make > & /dev/null
	bang# cat /usr/obj/`pwd`/boot2.h
	#define XREADORG 0x25
	bang#
This commit is contained in:
Poul-Henning Kamp 2002-10-08 07:52:28 +00:00
parent 943e5db958
commit a201162d71
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/boot/i386/boot2/Makefile
View File

@ -24,7 +24,6 @@ BTX= ${.OBJDIR}/../btx
BTX= ${.CURDIR}/../btx
.endif
REL1= 0x700
ORG1= 0x7c00
ORG2= 0x1000
@ -69,8 +68,7 @@ boot2.o: boot2.c ${.CURDIR}/../../common/ufsread.c
boot2.h: boot1.out
${NM} -t d ${.ALLSRC} | awk '/([0-9])+ T xread/ \
{ x = $$1 - ORG1; \
printf("#define XREADORG %#x\n", REL1 + x) }' \
{ x = $$1 - ORG1; printf("#define XREADORG 0x7%x\n", x) }' \
ORG1=`printf "%d" ${ORG1}` > boot2.h
boot2: boot2.ldr boot2.bin ${BTX}/btx/btx

4
sys/boot/i386/gptboot/Makefile
View File

@ -24,7 +24,6 @@ BTX= ${.OBJDIR}/../btx
BTX= ${.CURDIR}/../btx
.endif
REL1= 0x700
ORG1= 0x7c00
ORG2= 0x1000
@ -69,8 +68,7 @@ boot2.o: boot2.c ${.CURDIR}/../../common/ufsread.c
boot2.h: boot1.out
${NM} -t d ${.ALLSRC} | awk '/([0-9])+ T xread/ \
{ x = $$1 - ORG1; \
printf("#define XREADORG %#x\n", REL1 + x) }' \
{ x = $$1 - ORG1; printf("#define XREADORG 0x7%x\n", x) }' \
ORG1=`printf "%d" ${ORG1}` > boot2.h
boot2: boot2.ldr boot2.bin ${BTX}/btx/btx