svn commit: r360894 - in head/stand/i386: boot2 pxeldr zfsboot
Alex Richardson
arichardson at FreeBSD.org
Mon May 11 08:40:34 UTC 2020
Author: arichardson
Date: Mon May 11 08:40:33 2020
New Revision: 360894
URL: https://svnweb.freebsd.org/changeset/base/360894
Log:
Avoid using non-portable dd conv=osync option
The same thing can be achieved using the bs=$SIZE and conv=sync options.
Unlike conv=osync, conv=sync is support on both Linux and macOS.
Reviewed By: imp, jhb (earlier version)
Obtained from: CheriBSD
Differential Revision: https://reviews.freebsd.org/D24788
Modified:
head/stand/i386/boot2/Makefile
head/stand/i386/pxeldr/Makefile
head/stand/i386/zfsboot/Makefile
Modified: head/stand/i386/boot2/Makefile
==============================================================================
--- head/stand/i386/boot2/Makefile Mon May 11 07:21:59 2020 (r360893)
+++ head/stand/i386/boot2/Makefile Mon May 11 08:40:33 2020 (r360894)
@@ -66,7 +66,7 @@ BOOT2SIZE= 7680
boot2: boot2.ld
@set -- `ls -l ${.ALLSRC}`; x=$$((${BOOT2SIZE}-$$5)); \
echo "$$x bytes available"; test $$x -ge 0
- ${DD} if=${.ALLSRC} of=${.TARGET} obs=${BOOT2SIZE} conv=osync
+ ${DD} if=${.ALLSRC} of=${.TARGET} bs=${BOOT2SIZE} conv=sync
boot2.ld: boot2.ldr boot2.bin ${BTXKERN}
btxld -v -E ${ORG2} -f bin -b ${BTXKERN} -l boot2.ldr \
Modified: head/stand/i386/pxeldr/Makefile
==============================================================================
--- head/stand/i386/pxeldr/Makefile Mon May 11 07:21:59 2020 (r360893)
+++ head/stand/i386/pxeldr/Makefile Mon May 11 08:40:33 2020 (r360894)
@@ -31,7 +31,7 @@ CLEANFILES+= ${BOOT}.tmp
${BOOT}: ${LDR} ${LOADER}
cat ${LDR} ${LOADER} > ${.TARGET}.tmp
- ${DD} if=${.TARGET}.tmp of=${.TARGET} obs=2k conv=osync
+ ${DD} if=${.TARGET}.tmp of=${.TARGET} bs=2048 conv=sync
rm ${.TARGET}.tmp
LDFLAGS+=${LDFLAGS_BIN}
Modified: head/stand/i386/zfsboot/Makefile
==============================================================================
--- head/stand/i386/zfsboot/Makefile Mon May 11 07:21:59 2020 (r360893)
+++ head/stand/i386/zfsboot/Makefile Mon May 11 08:40:33 2020 (r360894)
@@ -62,7 +62,7 @@ BOOT2SIZE= 262144
zfsboot2: zfsboot.ld
@set -- `ls -l ${.ALLSRC}`; x=$$((${BOOT2SIZE}-$$5)); \
echo "$$x bytes available"; test $$x -ge 0
- ${DD} if=${.ALLSRC} of=${.TARGET} obs=${BOOT2SIZE} conv=osync
+ ${DD} if=${.ALLSRC} of=${.TARGET} bs=${BOOT2SIZE} conv=sync
zfsboot.ld: zfsboot.ldr zfsboot.bin ${BTXKERN}
btxld -v -E ${ORG2} -f bin -b ${BTXKERN} -l zfsboot.ldr \
More information about the svn-src-all
mailing list