From: krw Date: Mon, 23 May 2022 16:58:10 +0000 (+0000) Subject: Neither macppc nor the retired loongson have any remaining useful X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=30bc1efcff13e1ba0be3851c5b23cb658c5e5ff7;p=openbsd Neither macppc nor the retired loongson have any remaining useful information in /usr/mdec/mbr. Stop telling fdisk(8) that macppc and loongson HAS_MBR, and don't bother including the file in the base set. macppc build/install tests and ok gkoehler@ loongson is gone deraadt@ --- diff --git a/distrib/loongson/ramdisk/list b/distrib/loongson/ramdisk/list index d23b01ddd86..e8ddc8929e5 100644 --- a/distrib/loongson/ramdisk/list +++ b/distrib/loongson/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.37 2021/07/18 15:18:49 deraadt Exp $ +# $OpenBSD: list,v 1.38 2022/05/23 16:58:10 krw Exp $ SRCDIRS distrib/special @@ -68,9 +68,6 @@ LINK instbin usr/sbin/pwd_mkdb ARGVLINK ksh -sh SPECIAL rm bin/md5 -# for fdisk(8) -COPY ${DESTDIR}/usr/mdec/mbr usr/mdec/mbr - # firmware we might need COPY ${DESTDIR}/etc/firmware/kue etc/firmware/kue COPY ${DESTDIR}/etc/firmware/rum-rt2573 etc/firmware/rum-rt2573 diff --git a/distrib/macppc/ramdisk/list b/distrib/macppc/ramdisk/list index 9913faeba75..db7d84b9ec2 100644 --- a/distrib/macppc/ramdisk/list +++ b/distrib/macppc/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.77 2021/10/04 01:34:29 kevlo Exp $ +# $OpenBSD: list,v 1.78 2022/05/23 16:58:10 krw Exp $ SRCDIRS distrib/special @@ -83,9 +83,6 @@ COPY ${DESTDIR}/etc/firmware/urtwn-rtl8192cT etc/firmware/urtwn-rtl8192cT COPY ${DESTDIR}/etc/firmware/urtwn-rtl8192cU etc/firmware/urtwn-rtl8192cU COPY ${DESTDIR}/etc/firmware/urtwn-rtl8192eu etc/firmware/urtwn-rtl8192eu -# for fdisk(8) -COPY ${DESTDIR}/usr/mdec/mbr usr/mdec/mbr - # copy the MAKEDEV script and make some devices SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV SPECIAL cd dev; sh MAKEDEV ramdisk diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson index 53531ac7471..977a99f4fca 100644 --- a/distrib/sets/lists/base/md.loongson +++ b/distrib/sets/lists/base/md.loongson @@ -417,7 +417,6 @@ ./usr/libdata/perl5/mips64el-openbsd/threads/shared.pm ./usr/local/libdata/perl5/site_perl/mips64el-openbsd ./usr/mdec/boot -./usr/mdec/mbr ./usr/sbin/ZZZ ./usr/sbin/apm ./usr/sbin/apmd diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc index c3b9cb314a1..91e0e33deb5 100644 --- a/distrib/sets/lists/base/md.macppc +++ b/distrib/sets/lists/base/md.macppc @@ -421,7 +421,6 @@ ./usr/libdata/perl5/powerpc-openbsd/threads/shared.pm ./usr/local/libdata/perl5/site_perl/powerpc-openbsd ./usr/mdec/bsd.tbxi -./usr/mdec/mbr ./usr/mdec/ofwboot ./usr/sbin/ZZZ ./usr/sbin/apm diff --git a/distrib/special/fdisk/Makefile b/distrib/special/fdisk/Makefile index ca4ec79fe91..9f09316c502 100644 --- a/distrib/special/fdisk/Makefile +++ b/distrib/special/fdisk/Makefile @@ -1,5 +1,5 @@ # -# $OpenBSD: Makefile,v 1.5 2019/05/11 07:18:15 deraadt Exp $ +# $OpenBSD: Makefile,v 1.6 2022/05/23 16:58:11 krw Exp $ # # Copyright (c) 1997 Tobias Weingartner # @@ -40,9 +40,7 @@ manual.c: fdisk.cat8 MAN= fdisk.8 -.if ${MACHINE} == "amd64" || ${MACHINE} == "i386" || \ - ${MACHINE} == "landisk" || ${MACHINE} == "loongson" || \ - ${MACHINE} == "macppc" +.if ${MACHINE} == "amd64" || ${MACHINE} == "i386" || ${MACHINE} == "landisk" CFLAGS += -DHAS_MBR .endif diff --git a/sbin/fdisk/Makefile b/sbin/fdisk/Makefile index 01c4a8e63c6..da4cfa35438 100644 --- a/sbin/fdisk/Makefile +++ b/sbin/fdisk/Makefile @@ -1,5 +1,5 @@ # -# $OpenBSD: Makefile,v 1.45 2020/07/21 04:08:37 deraadt Exp $ +# $OpenBSD: Makefile,v 1.46 2022/05/23 16:58:11 krw Exp $ # # Copyright (c) 1997 Tobias Weingartner # @@ -40,9 +40,7 @@ manual.c: fdisk.cat8 MAN= fdisk.8 -.if ${MACHINE} == "amd64" || ${MACHINE} == "i386" || \ - ${MACHINE} == "landisk" || ${MACHINE} == "loongson" || \ - ${MACHINE} == "macppc" +.if ${MACHINE} == "amd64" || ${MACHINE} == "i386" || ${MACHINE} == "landisk" CFLAGS += -DHAS_MBR .endif diff --git a/sys/arch/loongson/stand/Makefile b/sys/arch/loongson/stand/Makefile index 841fc85a0f0..87024d947d1 100644 --- a/sys/arch/loongson/stand/Makefile +++ b/sys/arch/loongson/stand/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.2 2010/02/17 19:56:43 otto Exp $ +# $OpenBSD: Makefile,v 1.3 2022/05/23 16:58:11 krw Exp $ .if ${MACHINE} == "loongson" SUBDIR+= libsa .endif -SUBDIR+= boot mbr +SUBDIR+= boot .include diff --git a/sys/arch/macppc/stand/Makefile b/sys/arch/macppc/stand/Makefile index f7738fd8b5c..ab429b650ac 100644 --- a/sys/arch/macppc/stand/Makefile +++ b/sys/arch/macppc/stand/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.10 2020/01/26 04:26:46 tedu Exp $ +# $OpenBSD: Makefile,v 1.11 2022/05/23 16:58:11 krw Exp $ # $NetBSD: Makefile,v 1.1 1996/09/30 16:34:59 ws Exp $ MANSUBDIR=macppc MAN=boot.8 .if ${MACHINE} == "macppc" -SUBDIR= ofwboot mbr tbxidata +SUBDIR= ofwboot tbxidata SAREL= KERNREL=