Attachment 161122 Details for Bug 203159 – diff -c of original tree vs. corrected tree to demonstrate where commands are missing full paths.

[patch] diff -c of original tree vs. corrected tree to demonstrate where commands are missing full paths.

diffs (text/plain), 7.21 KB, created by mcgovern on 2015-09-16 19:05:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: mcgovern

Created: 2015-09-16 19:05:14 UTC

Size: 7.21 KB

patch

obsolete

>Only in /usr/src: .snap
>Only in /usr/src: fat.tmpl.bz2
>diff -c -r /usr/tmp/src/sys/boot/amd64/boot1.efi/Makefile /usr/src/sys/boot/amd64/boot1.efi/Makefile
>*** /usr/tmp/src/sys/boot/amd64/boot1.efi/Makefile	Wed Dec 31 18:25:37 2014
>--- /usr/src/sys/boot/amd64/boot1.efi/Makefile	Wed Sep 16 11:30:35 2015
>***************
>*** 64,73 ****
>  
>  boot1.efifat: boot1.efi
>  	echo ${.OBJDIR}
>! 	uudecode ${.CURDIR}/fat.tmpl.bz2.uu
>  	mv fat.tmpl.bz2 ${.TARGET}.bz2
>! 	bzip2 -f -d ${.TARGET}.bz2
>! 	dd if=boot1.efi of=${.TARGET} seek=${BOOT1_OFFSET} conv=notrunc
>  
>  CLEANFILES= boot1.efifat
>  
>--- 64,73 ----
>  
>  boot1.efifat: boot1.efi
>  	echo ${.OBJDIR}
>! 	/usr/bin/uudecode ${.CURDIR}/fat.tmpl.bz2.uu
>  	mv fat.tmpl.bz2 ${.TARGET}.bz2
>! 	/usr/bin/bzip2 -f -d ${.TARGET}.bz2
>! 	/bin/dd if=boot1.efi of=${.TARGET} seek=${BOOT1_OFFSET} conv=notrunc
>  
>  CLEANFILES= boot1.efifat
>  
>Only in /usr/src/sys/boot/amd64/boot1.efi: fat.tmpl.bz2
>diff -c -r /usr/tmp/src/sys/boot/i386/boot2/Makefile /usr/src/sys/boot/i386/boot2/Makefile
>*** /usr/tmp/src/sys/boot/i386/boot2/Makefile	Thu Apr  9 02:38:32 2015
>--- /usr/src/sys/boot/i386/boot2/Makefile	Wed Sep 16 11:33:28 2015
>***************
>*** 69,84 ****
>  		boot2.s boot2.s.tmp boot2.h sio.o
>  
>  boot2: boot2.ld
>! 	@set -- `ls -l boot2.ld`; x=$$((7680-$$5)); \
>  	    echo "$$x bytes available"; test $$x -ge 0
>! 	dd if=boot2.ld of=${.TARGET} obs=7680 conv=osync
>  
>  boot2.ld: boot2.ldr boot2.bin ${BTXKERN}
>! 	btxld -v -E ${ORG2} -f bin -b ${BTXKERN} -l boot2.ldr \
>  	    -o ${.TARGET} -P 1 boot2.bin
>  
>  boot2.ldr:
>! 	dd if=/dev/zero of=${.TARGET} bs=512 count=1
>  
>  boot2.bin: boot2.out
>  	${OBJCOPY} -S -O binary boot2.out ${.TARGET}
>--- 69,84 ----
>  		boot2.s boot2.s.tmp boot2.h sio.o
>  
>  boot2: boot2.ld
>! 	@set -- `/bin/ls -l boot2.ld`; x=$$((7680-$$5)); \
>  	    echo "$$x bytes available"; test $$x -ge 0
>! 	/bin/dd if=boot2.ld of=${.TARGET} obs=7680 conv=osync
>  
>  boot2.ld: boot2.ldr boot2.bin ${BTXKERN}
>! 	/usr/sbin/btxld -v -E ${ORG2} -f bin -b ${BTXKERN} -l boot2.ldr \
>  	    -o ${.TARGET} -P 1 boot2.bin
>  
>  boot2.ldr:
>! 	/bin/dd if=/dev/zero of=${.TARGET} bs=512 count=1
>  
>  boot2.bin: boot2.out
>  	${OBJCOPY} -S -O binary boot2.out ${.TARGET}
>diff -c -r /usr/tmp/src/sys/boot/i386/gptboot/Makefile /usr/src/sys/boot/i386/gptboot/Makefile
>*** /usr/tmp/src/sys/boot/i386/gptboot/Makefile	Thu Apr  9 02:38:32 2015
>--- /usr/src/sys/boot/i386/gptboot/Makefile	Wed Sep 16 11:34:35 2015
>***************
>*** 49,55 ****
>  CLEANFILES=	gptboot
>  
>  gptboot: gptldr.bin gptboot.bin ${BTXKERN}
>! 	btxld -v -E ${ORG2} -f bin -b ${BTXKERN} -l gptldr.bin \
>  	    -o ${.TARGET} gptboot.bin
>  
>  CLEANFILES+=	gptldr.bin gptldr.out gptldr.o
>--- 49,55 ----
>  CLEANFILES=	gptboot
>  
>  gptboot: gptldr.bin gptboot.bin ${BTXKERN}
>! 	/usr/sbin/btxld -v -E ${ORG2} -f bin -b ${BTXKERN} -l gptldr.bin \
>  	    -o ${.TARGET} gptboot.bin
>  
>  CLEANFILES+=	gptldr.bin gptldr.out gptldr.o
>diff -c -r /usr/tmp/src/sys/boot/i386/gptzfsboot/Makefile /usr/src/sys/boot/i386/gptzfsboot/Makefile
>*** /usr/tmp/src/sys/boot/i386/gptzfsboot/Makefile	Thu Apr  9 02:38:32 2015
>--- /usr/src/sys/boot/i386/gptzfsboot/Makefile	Wed Sep 16 11:42:03 2015
>***************
>*** 47,53 ****
>  CLEANFILES=	gptzfsboot
>  
>  gptzfsboot: gptldr.bin gptzfsboot.bin ${BTXKERN}
>! 	btxld -v -E ${ORG2} -f bin -b ${BTXKERN} -l gptldr.bin \
>  	    -o ${.TARGET} gptzfsboot.bin
>  
>  CLEANFILES+=	gptldr.bin gptldr.out gptldr.o
>--- 47,53 ----
>  CLEANFILES=	gptzfsboot
>  
>  gptzfsboot: gptldr.bin gptzfsboot.bin ${BTXKERN}
>! 	/usr/sbin/btxld -v -E ${ORG2} -f bin -b ${BTXKERN} -l gptldr.bin \
>  	    -o ${.TARGET} gptzfsboot.bin
>  
>  CLEANFILES+=	gptldr.bin gptldr.out gptldr.o
>diff -c -r /usr/tmp/src/sys/boot/i386/loader/Makefile /usr/src/sys/boot/i386/loader/Makefile
>*** /usr/tmp/src/sys/boot/i386/loader/Makefile	Tue Apr 21 21:08:40 2015
>--- /usr/src/sys/boot/i386/loader/Makefile	Wed Sep 16 11:36:39 2015
>***************
>*** 90,104 ****
>  		${NEWVERSWHAT}
>  
>  ${LOADER}: ${LOADER}.bin ${BTXLDR} ${BTXKERN}
>! 	btxld -v -f aout -e ${LOADER_ADDRESS} -o ${.TARGET} -l ${BTXLDR} \
>  		-b ${BTXKERN} ${LOADER}.bin
>  
>  ${LOADER}.bin: ${LOADER}.sym
>! 	cp ${.ALLSRC} ${.TARGET}
>! 	strip -R .comment -R .note ${.TARGET}
>  
>  loader.help: help.common help.i386
>! 	cat ${.ALLSRC} | awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
>  
>  FILES=	${LOADER}
>  # XXX INSTALLFLAGS_loader= -b
>--- 90,104 ----
>  		${NEWVERSWHAT}
>  
>  ${LOADER}: ${LOADER}.bin ${BTXLDR} ${BTXKERN}
>! 	/usr/sbin/btxld -v -f aout -e ${LOADER_ADDRESS} -o ${.TARGET} -l ${BTXLDR} \
>  		-b ${BTXKERN} ${LOADER}.bin
>  
>  ${LOADER}.bin: ${LOADER}.sym
>! 	/bin/cp ${.ALLSRC} ${.TARGET}
>! 	/usr/bin/strip -R .comment -R .note ${.TARGET}
>  
>  loader.help: help.common help.i386
>! 	/bin/cat ${.ALLSRC} | awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
>  
>  FILES=	${LOADER}
>  # XXX INSTALLFLAGS_loader= -b
>diff -c -r /usr/tmp/src/sys/boot/i386/pxeldr/Makefile /usr/src/sys/boot/i386/pxeldr/Makefile
>*** /usr/tmp/src/sys/boot/i386/pxeldr/Makefile	Thu May 10 05:47:04 2012
>--- /usr/src/sys/boot/i386/pxeldr/Makefile	Wed Sep 16 11:37:38 2015
>***************
>*** 30,45 ****
>  CLEANFILES+= ${BOOT}.tmp
>  
>  ${BOOT}: ${LDR} ${LOADER}
>! 	cat ${LDR} ${LOADER} > ${.TARGET}.tmp
>! 	dd if=${.TARGET}.tmp of=${.TARGET} obs=2k conv=osync
>! 	rm ${.TARGET}.tmp
>  
>  LDFLAGS+=-e start -Ttext ${ORG} -Wl,-N,-S,--oformat,binary
>  
>  CLEANFILES+= ${LOADER}
>  
>  ${LOADER}: ${LOADERBIN} ${BTXLDR} ${BTXKERN}
>! 	btxld -v -f aout -e ${LOADER_ADDRESS} -o ${.TARGET} -l ${BTXLDR} \
>  	    -b ${BTXKERN} ${LOADERBIN}
>  
>  .include <bsd.prog.mk>
>--- 30,45 ----
>  CLEANFILES+= ${BOOT}.tmp
>  
>  ${BOOT}: ${LDR} ${LOADER}
>! 	/bin/cat ${LDR} ${LOADER} > ${.TARGET}.tmp
>! 	/bin/dd if=${.TARGET}.tmp of=${.TARGET} obs=2k conv=osync
>! 	/bin/rm ${.TARGET}.tmp
>  
>  LDFLAGS+=-e start -Ttext ${ORG} -Wl,-N,-S,--oformat,binary
>  
>  CLEANFILES+= ${LOADER}
>  
>  ${LOADER}: ${LOADERBIN} ${BTXLDR} ${BTXKERN}
>! 	/usr/sbin/btxld -v -f aout -e ${LOADER_ADDRESS} -o ${.TARGET} -l ${BTXLDR} \
>  	    -b ${BTXKERN} ${LOADERBIN}
>  
>  .include <bsd.prog.mk>
>diff -c -r /usr/tmp/src/sys/boot/i386/zfsboot/Makefile /usr/src/sys/boot/i386/zfsboot/Makefile
>*** /usr/tmp/src/sys/boot/i386/zfsboot/Makefile	Thu Apr  9 02:38:32 2015
>--- /usr/src/sys/boot/i386/zfsboot/Makefile	Wed Sep 16 11:40:26 2015
>***************
>*** 63,78 ****
>  BOOT2SIZE=	65536
>  
>  zfsboot2: zfsboot.ld
>! 	@set -- `ls -l zfsboot.ld`; x=$$((${BOOT2SIZE}-$$5)); \
>  	    echo "$$x bytes available"; test $$x -ge 0
>! 	dd if=zfsboot.ld of=${.TARGET} obs=${BOOT2SIZE} conv=osync
>  
>  zfsboot.ld: zfsboot.ldr zfsboot.bin ${BTXKERN}
>! 	btxld -v -E ${ORG2} -f bin -b ${BTXKERN} -l zfsboot.ldr \
>  	    -o ${.TARGET} -P 1 zfsboot.bin
>  
>  zfsboot.ldr:
>! 	cp /dev/null ${.TARGET}
>  
>  zfsboot.bin: zfsboot.out
>  	${OBJCOPY} -S -O binary zfsboot.out ${.TARGET}
>--- 63,78 ----
>  BOOT2SIZE=	65536
>  
>  zfsboot2: zfsboot.ld
>! 	@set -- `/bin/ls -l zfsboot.ld`; x=$$((${BOOT2SIZE}-$$5)); \
>  	    echo "$$x bytes available"; test $$x -ge 0
>! 	/bin/dd if=zfsboot.ld of=${.TARGET} obs=${BOOT2SIZE} conv=osync
>  
>  zfsboot.ld: zfsboot.ldr zfsboot.bin ${BTXKERN}
>! 	/usr/sbin/btxld -v -E ${ORG2} -f bin -b ${BTXKERN} -l zfsboot.ldr \
>  	    -o ${.TARGET} -P 1 zfsboot.bin
>  
>  zfsboot.ldr:
>! 	/bin/cp /dev/null ${.TARGET}
>  
>  zfsboot.bin: zfsboot.out
>  	${OBJCOPY} -S -O binary zfsboot.out ${.TARGET}

Actions: View | Diff

Attachments on bug 203159: 161122