cp -p the bootblocks to RELEASEDIR; ok tb

diff --git a/etc/etc.alpha/Makefile.inc b/etc/etc.alpha/Makefile.inc
index e736043..2acb2b4 100644 (file)
--- a/etc/etc.alpha/Makefile.inc
+++ b/etc/etc.alpha/Makefile.inc
@@ -1,14 +1,14 @@
-#      $OpenBSD: Makefile.inc,v 1.25 2015/08/29 17:22:41 deraadt Exp $
+#      $OpenBSD: Makefile.inc,v 1.26 2017/04/04 00:03:12 deraadt Exp $
 
 KERNELS += GENERIC.MP bsd.mp
 
 KERNELS += GENERIC.MP bsd.mp
 
 bootblocks:
-       cp ${DESTDIR}/usr/mdec/boot ${RELEASEDIR}
-       cp ${DESTDIR}/usr/mdec/bootxx ${RELEASEDIR}
-       cp ${DESTDIR}/usr/mdec/netboot ${RELEASEDIR}
-       cp ${DESTDIR}/usr/mdec/netboot.mop ${RELEASEDIR}
+       cp -p ${DESTDIR}/usr/mdec/boot ${RELEASEDIR}
+       cp -p ${DESTDIR}/usr/mdec/bootxx ${RELEASEDIR}
+       cp -p ${DESTDIR}/usr/mdec/netboot ${RELEASEDIR}
+       cp -p ${DESTDIR}/usr/mdec/netboot.mop ${RELEASEDIR}
 
 MDEXT= bsd.rd cd${OSrev}.iso \
        miniroot${OSrev}.fs \

diff --git a/etc/etc.amd64/Makefile.inc b/etc/etc.amd64/Makefile.inc
index cbe284f..b2e2443 100644 (file)
--- a/etc/etc.amd64/Makefile.inc
+++ b/etc/etc.amd64/Makefile.inc
@@ -1,13 +1,13 @@
-#      $OpenBSD: Makefile.inc,v 1.17 2015/09/07 01:41:26 deraadt Exp $
+#      $OpenBSD: Makefile.inc,v 1.18 2017/04/04 00:03:12 deraadt Exp $
 
 KERNELS += GENERIC.MP bsd.mp
 
 bootblocks:
-       cp ${DESTDIR}/usr/mdec/pxeboot ${RELEASEDIR}
-       cp ${DESTDIR}/usr/mdec/cdboot ${RELEASEDIR}
-       cp ${DESTDIR}/usr/mdec/cdbr ${RELEASEDIR}
-       cp ${DESTDIR}/usr/mdec/BOOTX64.EFI ${RELEASEDIR}
-       cp ${DESTDIR}/usr/mdec/BOOTIA32.EFI ${RELEASEDIR}
+       cp -p ${DESTDIR}/usr/mdec/pxeboot ${RELEASEDIR}
+       cp -p ${DESTDIR}/usr/mdec/cdboot ${RELEASEDIR}
+       cp -p ${DESTDIR}/usr/mdec/cdbr ${RELEASEDIR}
+       cp -p ${DESTDIR}/usr/mdec/BOOTX64.EFI ${RELEASEDIR}
+       cp -p ${DESTDIR}/usr/mdec/BOOTIA32.EFI ${RELEASEDIR}
 
 MDEXT= bsd.rd cd${OSrev}.iso floppy${OSrev}.fs miniroot${OSrev}.fs \
        pxeboot cdboot cdbr BOOTX64.EFI BOOTIA32.EFI

diff --git a/etc/etc.arm64/Makefile.inc b/etc/etc.arm64/Makefile.inc
index 5f6f8ac..9651f68 100644 (file)
--- a/etc/etc.arm64/Makefile.inc
+++ b/etc/etc.arm64/Makefile.inc
@@ -1,6 +1,6 @@
-#      $OpenBSD: Makefile.inc,v 1.2 2017/02/11 06:36:03 jsg Exp $
+#      $OpenBSD: Makefile.inc,v 1.3 2017/04/04 00:03:12 deraadt Exp $
 
 bootblocks:
-       cp ${DESTDIR}/usr/mdec/BOOTAA64.EFI ${RELEASEDIR}
+       cp -p ${DESTDIR}/usr/mdec/BOOTAA64.EFI ${RELEASEDIR}
 
 MDEXT= bsd.rd BOOTAA64.EFI miniroot${OSrev}.fs

diff --git a/etc/etc.armv7/Makefile.inc b/etc/etc.armv7/Makefile.inc
index 64f3867..18a4447 100644 (file)
--- a/etc/etc.armv7/Makefile.inc
+++ b/etc/etc.armv7/Makefile.inc
@@ -1,7 +1,7 @@
-#      $OpenBSD: Makefile.inc,v 1.14 2016/05/29 07:38:01 jsg Exp $
+#      $OpenBSD: Makefile.inc,v 1.15 2017/04/04 00:03:12 deraadt Exp $
 
 bootblocks:
-       cp ${DESTDIR}/usr/mdec/BOOTARM.EFI ${RELEASEDIR}
+       cp -p ${DESTDIR}/usr/mdec/BOOTARM.EFI ${RELEASEDIR}
 
 MDEXT= bsd.rd BOOTARM.EFI \
        miniroot-am335x-${OSrev}.fs miniroot-beagle-${OSrev}.fs \

diff --git a/etc/etc.hppa/Makefile.inc b/etc/etc.hppa/Makefile.inc
index 2b2bf2c..728c0bb 100644 (file)
--- a/etc/etc.hppa/Makefile.inc
+++ b/etc/etc.hppa/Makefile.inc
@@ -1,8 +1,8 @@
-#      $OpenBSD: Makefile.inc,v 1.12 2011/07/22 09:30:54 espie Exp $
+#      $OpenBSD: Makefile.inc,v 1.13 2017/04/04 00:03:12 deraadt Exp $
 
 KERNELS += GENERIC.MP bsd.mp
 
 bootblocks:
-       cp ${DESTDIR}/usr/mdec/xxboot ${RELEASEDIR}
+       cp -p ${DESTDIR}/usr/mdec/xxboot ${RELEASEDIR}
 
 MDEXT= bsd.rd cd${OSrev}.iso lif${OSrev}.fs xxboot

diff --git a/etc/etc.i386/Makefile.inc b/etc/etc.i386/Makefile.inc
index 08635d9..d187d91 100644 (file)
--- a/etc/etc.i386/Makefile.inc
+++ b/etc/etc.i386/Makefile.inc
@@ -1,11 +1,11 @@
-#      $OpenBSD: Makefile.inc,v 1.24 2015/01/12 17:10:38 deraadt Exp $
+#      $OpenBSD: Makefile.inc,v 1.25 2017/04/04 00:03:12 deraadt Exp $
 
 KERNELS += GENERIC.MP bsd.mp
 
 bootblocks:
-       cp ${DESTDIR}/usr/mdec/pxeboot ${RELEASEDIR}
-       cp ${DESTDIR}/usr/mdec/cdboot ${RELEASEDIR}
-       cp ${DESTDIR}/usr/mdec/cdbr ${RELEASEDIR}
+       cp -p ${DESTDIR}/usr/mdec/pxeboot ${RELEASEDIR}
+       cp -p ${DESTDIR}/usr/mdec/cdboot ${RELEASEDIR}
+       cp -p ${DESTDIR}/usr/mdec/cdbr ${RELEASEDIR}
 
 MDEXT= bsd.rd cd${OSrev}.iso floppy${OSrev}.fs miniroot${OSrev}.fs \
        pxeboot cdboot cdbr

diff --git a/etc/etc.landisk/Makefile.inc b/etc/etc.landisk/Makefile.inc
index 302b170..bebb94d 100644 (file)
--- a/etc/etc.landisk/Makefile.inc
+++ b/etc/etc.landisk/Makefile.inc
@@ -1,8 +1,8 @@
-#      $OpenBSD: Makefile.inc,v 1.8 2011/07/22 09:30:54 espie Exp $
+#      $OpenBSD: Makefile.inc,v 1.9 2017/04/04 00:03:12 deraadt Exp $
 
 bootblocks:
-       cp ${DESTDIR}/usr/mdec/mbr ${RELEASEDIR}
-       cp ${DESTDIR}/usr/mdec/xxboot ${RELEASEDIR}
-       cp ${DESTDIR}/usr/mdec/boot ${RELEASEDIR}
+       cp -p ${DESTDIR}/usr/mdec/mbr ${RELEASEDIR}
+       cp -p ${DESTDIR}/usr/mdec/xxboot ${RELEASEDIR}
+       cp -p ${DESTDIR}/usr/mdec/boot ${RELEASEDIR}
 
 MDEXT= mbr bsd.rd xxboot boot miniroot${OSrev}.fs

diff --git a/etc/etc.loongson/Makefile.inc b/etc/etc.loongson/Makefile.inc
index b932846..785745d 100644 (file)
--- a/etc/etc.loongson/Makefile.inc
+++ b/etc/etc.loongson/Makefile.inc
@@ -1,6 +1,6 @@
-#      $OpenBSD: Makefile.inc,v 1.5 2011/07/22 09:30:54 espie Exp $
+#      $OpenBSD: Makefile.inc,v 1.6 2017/04/04 00:03:12 deraadt Exp $
 
 bootblocks:
-       cp ${DESTDIR}/usr/mdec/boot ${RELEASEDIR}
+       cp -p ${DESTDIR}/usr/mdec/boot ${RELEASEDIR}
 
 MDEXT= bsd.rd boot miniroot${OSrev}.fs

diff --git a/etc/etc.luna88k/Makefile.inc b/etc/etc.luna88k/Makefile.inc
index 720c62a..a8ce33b 100644 (file)
--- a/etc/etc.luna88k/Makefile.inc
+++ b/etc/etc.luna88k/Makefile.inc
@@ -1,9 +1,9 @@
-#      $OpenBSD: Makefile.inc,v 1.9 2014/02/27 18:55:39 miod Exp $
+#      $OpenBSD: Makefile.inc,v 1.10 2017/04/04 00:03:12 deraadt Exp $
 
 KERNELS += GENERIC.MP bsd.mp
 
 bootblocks:
-       cp ${DESTDIR}/usr/mdec/* ${RELEASEDIR}/
+       cp -p ${DESTDIR}/usr/mdec/* ${RELEASEDIR}/
 
 MDEXT= bsd.rd \
        miniroot${OSrev}.fs \

diff --git a/etc/etc.macppc/Makefile.inc b/etc/etc.macppc/Makefile.inc
index 121aca6..119d5c1 100644 (file)
--- a/etc/etc.macppc/Makefile.inc
+++ b/etc/etc.macppc/Makefile.inc
@@ -1,10 +1,10 @@
-#      $OpenBSD: Makefile.inc,v 1.16 2011/07/22 09:30:54 espie Exp $
+#      $OpenBSD: Makefile.inc,v 1.17 2017/04/04 00:03:12 deraadt Exp $
 
 KERNELS += GENERIC.MP bsd.mp
 
 bootblocks:
-       cp ${DESTDIR}/usr/mdec/ofwboot ${RELEASEDIR}/ofwboot
-       cp ${DESTDIR}/usr/mdec/bsd.tbxi ${RELEASEDIR}/bsd.tbxi
-       cp ${DESTDIR}/usr/mdec/boot.mac ${RELEASEDIR}/boot.mac
+       cp -p ${DESTDIR}/usr/mdec/ofwboot ${RELEASEDIR}/ofwboot
+       cp -p ${DESTDIR}/usr/mdec/bsd.tbxi ${RELEASEDIR}/bsd.tbxi
+       cp -p ${DESTDIR}/usr/mdec/boot.mac ${RELEASEDIR}/boot.mac
 
 MDEXT= bsd.rd cd${OSrev}.iso ofwboot bsd.tbxi boot.mac

diff --git a/etc/etc.sgi/Makefile.inc b/etc/etc.sgi/Makefile.inc
index 41f5268..e1c1cd2 100644 (file)
--- a/etc/etc.sgi/Makefile.inc
+++ b/etc/etc.sgi/Makefile.inc
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.inc,v 1.18 2015/12/27 16:31:08 deraadt Exp $
+#      $OpenBSD: Makefile.inc,v 1.19 2017/04/04 00:03:12 deraadt Exp $
 
 ALLIP= 22 26 27 28 30 32
 KERNELS=
@@ -12,8 +12,8 @@ KERNELS+=     GENERIC-IP30.MP bsd.mp.IP30
 KERNELS+=      GENERIC-IP27.MP bsd.mp.IP27
 
 bootblocks:
-       cp ${DESTDIR}/usr/mdec/boot32 ${RELEASEDIR}
-       cp ${DESTDIR}/usr/mdec/boot64 ${RELEASEDIR}
-       cp ${DESTDIR}/usr/mdec/bootecoff ${RELEASEDIR}
+       cp -p ${DESTDIR}/usr/mdec/boot32 ${RELEASEDIR}
+       cp -p ${DESTDIR}/usr/mdec/boot64 ${RELEASEDIR}
+       cp -p ${DESTDIR}/usr/mdec/bootecoff ${RELEASEDIR}
 
 MDEXT+=        boot32 boot64 bootecoff cd${OSrev}.iso

diff --git a/etc/etc.socppc/Makefile.inc b/etc/etc.socppc/Makefile.inc
index b8e51f3..34f7ae8 100644 (file)
--- a/etc/etc.socppc/Makefile.inc
+++ b/etc/etc.socppc/Makefile.inc
@@ -1,7 +1,7 @@
-#      $OpenBSD: Makefile.inc,v 1.7 2011/07/22 09:30:54 espie Exp $
+#      $OpenBSD: Makefile.inc,v 1.8 2017/04/04 00:03:12 deraadt Exp $
 
 bootblocks:
-       cp ${DESTDIR}/usr/mdec/boot ${RELEASEDIR}/boot
-       cp ${DESTDIR}/usr/mdec/boot.elf ${RELEASEDIR}/boot.elf
+       cp -p ${DESTDIR}/usr/mdec/boot ${RELEASEDIR}/boot
+       cp -p ${DESTDIR}/usr/mdec/boot.elf ${RELEASEDIR}/boot.elf
 
 MDEXT= bsd.bin bsd.rd boot boot.elf miniroot${OSrev}.fs

diff --git a/etc/etc.sparc64/Makefile.inc b/etc/etc.sparc64/Makefile.inc
index e41c4af..973dea3 100644 (file)
--- a/etc/etc.sparc64/Makefile.inc
+++ b/etc/etc.sparc64/Makefile.inc
@@ -1,9 +1,9 @@
-#      $OpenBSD: Makefile.inc,v 1.14 2014/11/27 12:36:49 stsp Exp $
+#      $OpenBSD: Makefile.inc,v 1.15 2017/04/04 00:03:12 deraadt Exp $
 
 KERNELS += GENERIC.MP bsd.mp
 
 bootblocks:
-       cp ${DESTDIR}/usr/mdec/{bootblk,ofwboot,ofwboot.net} ${RELEASEDIR}
+       cp -p ${DESTDIR}/usr/mdec/{bootblk,ofwboot,ofwboot.net} ${RELEASEDIR}
 
 MDEXT= bsd.rd cd${OSrev}.iso \
        miniroot${OSrev}.fs floppy${OSrev}.fs floppyB${OSrev}.fs \