include BUILDINFO file in the iso/img files; requested by florian for sysupgrade...

diff --git a/distrib/alpha/iso/Makefile b/distrib/alpha/iso/Makefile
index 2191120..c7340f9 100644 (file)
--- a/distrib/alpha/iso/Makefile
+++ b/distrib/alpha/iso/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.20 2019/05/01 20:53:34 deraadt Exp $
+#      $OpenBSD: Makefile,v 1.21 2024/06/09 17:24:19 deraadt Exp $
 
 CDROM=         install${OSrev}.iso
 MOUNT_POINT=   /mnt
@@ -9,7 +9,7 @@ RELDIR?=        /home/rel-${MACHINE}
 BASE=          ${RELDIR}/base${OSrev}.tgz ${RELDIR}/comp${OSrev}.tgz \
                ${RELDIR}/game${OSrev}.tgz ${RELDIR}/man${OSrev}.tgz \
                ${RELDIR}/bsd ${RELDIR}/bsd.rd ${RELDIR}/bsd.mp \
-               ${RELDIR}/INSTALL.${MACHINE}
+               ${RELDIR}/INSTALL.${MACHINE} ${RELDIR}/BUILDINFO
 XBASE=         ${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xfont${OSrev}.tgz \
                ${RELXDIR}/xshare${OSrev}.tgz ${RELXDIR}/xserv${OSrev}.tgz
 

diff --git a/distrib/amd64/iso/Makefile b/distrib/amd64/iso/Makefile
index 502cdc8..628ce5a 100644 (file)
--- a/distrib/amd64/iso/Makefile
+++ b/distrib/amd64/iso/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.48 2024/06/02 16:00:07 deraadt Exp $
+#      $OpenBSD: Makefile,v 1.49 2024/06/09 17:24:19 deraadt Exp $
 
 FS=            install${OSrev}.img
 FSSIZE=                1425408
@@ -13,7 +13,7 @@ BSDRD=                ${RELDIR}/bsd.rd
 BASE=          ${RELDIR}/base${OSrev}.tgz ${RELDIR}/comp${OSrev}.tgz \
                ${RELDIR}/game${OSrev}.tgz ${RELDIR}/man${OSrev}.tgz \
                ${RELDIR}/bsd ${RELDIR}/bsd.rd ${RELDIR}/bsd.mp \
-               ${RELDIR}/INSTALL.${MACHINE}
+               ${RELDIR}/INSTALL.${MACHINE} ${RELDIR}/BUILDINFO
 XBASE=         ${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xfont${OSrev}.tgz \
                ${RELXDIR}/xshare${OSrev}.tgz ${RELXDIR}/xserv${OSrev}.tgz
 

diff --git a/distrib/arm64/iso/Makefile b/distrib/arm64/iso/Makefile
index 45b3ecf..b0518ee 100644 (file)
--- a/distrib/arm64/iso/Makefile
+++ b/distrib/arm64/iso/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.9 2024/02/10 16:47:46 deraadt Exp $
+#      $OpenBSD: Makefile,v 1.10 2024/06/09 17:24:19 deraadt Exp $
 
 FS=            install${OSrev}.img
 FSSIZE=                1136400
@@ -12,7 +12,7 @@ RELDIR?=      /home/rel-${MACHINE}
 BASE=          ${RELDIR}/base${OSrev}.tgz ${RELDIR}/comp${OSrev}.tgz \
                ${RELDIR}/game${OSrev}.tgz ${RELDIR}/man${OSrev}.tgz \
                ${RELDIR}/bsd ${RELDIR}/bsd.mp ${RELDIR}/bsd.rd \
-               ${RELDIR}/INSTALL.${MACHINE}
+               ${RELDIR}/INSTALL.${MACHINE} ${RELDIR}/BUILDINFO
 XBASE=         ${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xfont${OSrev}.tgz \
                ${RELXDIR}/xshare${OSrev}.tgz ${RELXDIR}/xserv${OSrev}.tgz
 

diff --git a/distrib/hppa/iso/Makefile b/distrib/hppa/iso/Makefile
index c426326..de0ae32 100644 (file)
--- a/distrib/hppa/iso/Makefile
+++ b/distrib/hppa/iso/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.19 2019/04/30 21:14:59 deraadt Exp $
+#      $OpenBSD: Makefile,v 1.20 2024/06/09 17:24:19 deraadt Exp $
 
 CDROM=         install${OSrev}.iso
 RELXDIR?=      /home/relx-${MACHINE}
@@ -7,7 +7,7 @@ RELDIR?=        /home/rel-${MACHINE}
 BASE=          ${RELDIR}/base${OSrev}.tgz ${RELDIR}/comp${OSrev}.tgz \
                ${RELDIR}/game${OSrev}.tgz ${RELDIR}/man${OSrev}.tgz \
                ${RELDIR}/bsd ${RELDIR}/bsd.mp ${RELDIR}/bsd.rd \
-               ${RELDIR}/INSTALL.${MACHINE}
+               ${RELDIR}/INSTALL.${MACHINE} ${RELDIR}/BUILDINFO
 XBASE=         ${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xfont${OSrev}.tgz \
                ${RELXDIR}/xshare${OSrev}.tgz ${RELXDIR}/xserv${OSrev}.tgz
 

diff --git a/distrib/i386/iso/Makefile b/distrib/i386/iso/Makefile
index ec649da..4aea209 100644 (file)
--- a/distrib/i386/iso/Makefile
+++ b/distrib/i386/iso/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.34 2023/04/28 12:26:43 krw Exp $
+#      $OpenBSD: Makefile,v 1.35 2024/06/09 17:24:19 deraadt Exp $
 
 FS=            install${OSrev}.img
 FSSIZE=                921600
@@ -14,7 +14,7 @@ BSDRD=                ${RELDIR}/bsd.rd
 BASE=          ${RELDIR}/base${OSrev}.tgz ${RELDIR}/comp${OSrev}.tgz \
                ${RELDIR}/game${OSrev}.tgz ${RELDIR}/man${OSrev}.tgz \
                ${RELDIR}/bsd ${RELDIR}/bsd.rd ${RELDIR}/bsd.mp \
-               ${RELDIR}/INSTALL.${MACHINE}
+               ${RELDIR}/INSTALL.${MACHINE} ${RELDIR}/BUILDINFO
 XBASE=         ${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xfont${OSrev}.tgz \
                ${RELXDIR}/xshare${OSrev}.tgz ${RELXDIR}/xserv${OSrev}.tgz
 

diff --git a/distrib/macppc/iso/Makefile b/distrib/macppc/iso/Makefile
index e729f77..982e476 100644 (file)
--- a/distrib/macppc/iso/Makefile
+++ b/distrib/macppc/iso/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.18 2019/05/01 20:53:55 deraadt Exp $
+#      $OpenBSD: Makefile,v 1.19 2024/06/09 17:24:19 deraadt Exp $
 
 CDROM=         install${OSrev}.iso
 RELXDIR?=      /home/relx-${MACHINE}
@@ -7,7 +7,7 @@ RELDIR?=        /home/rel-${MACHINE}
 BASE=          ${RELDIR}/base${OSrev}.tgz ${RELDIR}/comp${OSrev}.tgz \
                ${RELDIR}/game${OSrev}.tgz ${RELDIR}/man${OSrev}.tgz \
                ${RELDIR}/bsd ${RELDIR}/bsd.rd ${RELDIR}/bsd.mp \
-               ${RELDIR}/INSTALL.${MACHINE}
+               ${RELDIR}/INSTALL.${MACHINE} ${RELDIR}/BUILDINFO
 XBASE=         ${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xfont${OSrev}.tgz \
                ${RELXDIR}/xshare${OSrev}.tgz ${RELXDIR}/xserv${OSrev}.tgz
 

diff --git a/distrib/octeon/iso/Makefile b/distrib/octeon/iso/Makefile
index 13ed6d7..d4a25bb 100644 (file)
--- a/distrib/octeon/iso/Makefile
+++ b/distrib/octeon/iso/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.3 2023/02/10 15:54:33 krw Exp $
+#      $OpenBSD: Makefile,v 1.4 2024/06/09 17:24:19 deraadt Exp $
 
 FS=            install${OSrev}.img
 FSSIZE=                832192
@@ -11,7 +11,7 @@ RELDIR?=      /home/rel-${MACHINE}
 BASE=          ${RELDIR}/base${OSrev}.tgz ${RELDIR}/comp${OSrev}.tgz \
                ${RELDIR}/game${OSrev}.tgz ${RELDIR}/man${OSrev}.tgz \
                ${RELDIR}/bsd ${RELDIR}/bsd.mp ${RELDIR}/bsd.rd \
-               ${RELDIR}/INSTALL.${MACHINE}
+               ${RELDIR}/INSTALL.${MACHINE} ${RELDIR}/BUILDINFO
 XBASE=         ${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xfont${OSrev}.tgz \
                ${RELXDIR}/xshare${OSrev}.tgz ${RELXDIR}/xserv${OSrev}.tgz
 

diff --git a/distrib/powerpc64/iso/Makefile b/distrib/powerpc64/iso/Makefile
index b9eb6dd..5f373a9 100644 (file)
--- a/distrib/powerpc64/iso/Makefile
+++ b/distrib/powerpc64/iso/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.6 2023/02/10 15:54:33 krw Exp $
+#      $OpenBSD: Makefile,v 1.7 2024/06/09 17:24:19 deraadt Exp $
 
 FS=            install${OSrev}.img
 FSSIZE=                1032192
@@ -12,7 +12,7 @@ RELDIR?=      /home/rel-${MACHINE}
 BASE=          ${RELDIR}/base${OSrev}.tgz ${RELDIR}/comp${OSrev}.tgz \
                ${RELDIR}/game${OSrev}.tgz ${RELDIR}/man${OSrev}.tgz \
                ${RELDIR}/bsd ${RELDIR}/bsd.mp ${RELDIR}/bsd.rd \
-               ${RELDIR}/INSTALL.${MACHINE}
+               ${RELDIR}/INSTALL.${MACHINE} ${RELDIR}/BUILDINFO
 XBASE=         ${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xfont${OSrev}.tgz \
                ${RELXDIR}/xshare${OSrev}.tgz ${RELXDIR}/xserv${OSrev}.tgz
 

diff --git a/distrib/riscv64/iso/Makefile b/distrib/riscv64/iso/Makefile
index 2bb72eb..96575f6 100644 (file)
--- a/distrib/riscv64/iso/Makefile
+++ b/distrib/riscv64/iso/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.6 2023/04/17 22:28:51 krw Exp $
+#      $OpenBSD: Makefile,v 1.7 2024/06/09 17:24:19 deraadt Exp $
 
 FS=            install${OSrev}.img
 FSSIZE=                1032192
@@ -11,7 +11,7 @@ RELDIR?=      /home/rel-${MACHINE}
 BASE=          ${RELDIR}/base${OSrev}.tgz ${RELDIR}/comp${OSrev}.tgz \
                ${RELDIR}/game${OSrev}.tgz ${RELDIR}/man${OSrev}.tgz \
                ${RELDIR}/bsd ${RELDIR}/bsd.mp ${RELDIR}/bsd.rd \
-               ${RELDIR}/INSTALL.${MACHINE}
+               ${RELDIR}/INSTALL.${MACHINE} ${RELDIR}/BUILDINFO
 XBASE=         ${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xfont${OSrev}.tgz \
                ${RELXDIR}/xshare${OSrev}.tgz ${RELXDIR}/xserv${OSrev}.tgz
 

diff --git a/distrib/sparc64/iso/Makefile b/distrib/sparc64/iso/Makefile
index f6ab541..e58b945 100644 (file)
--- a/distrib/sparc64/iso/Makefile
+++ b/distrib/sparc64/iso/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.25 2023/04/28 12:26:43 krw Exp $
+#      $OpenBSD: Makefile,v 1.26 2024/06/09 17:24:19 deraadt Exp $
 
 FS=            install${OSrev}.img
 FSSIZE=                1032192
@@ -13,7 +13,7 @@ RELDIR?=      /home/rel-${MACHINE}
 BASE=          ${RELDIR}/base${OSrev}.tgz ${RELDIR}/comp${OSrev}.tgz \
                ${RELDIR}/game${OSrev}.tgz ${RELDIR}/man${OSrev}.tgz \
                ${RELDIR}/bsd ${RELDIR}/bsd.mp ${RELDIR}/bsd.rd \
-               ${RELDIR}/INSTALL.${MACHINE}
+               ${RELDIR}/INSTALL.${MACHINE} ${RELDIR}/BUILDINFO
 XBASE=         ${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xfont${OSrev}.tgz \
                ${RELXDIR}/xshare${OSrev}.tgz ${RELXDIR}/xserv${OSrev}.tgz