diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2009-05-14 21:16:41 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2009-05-14 21:16:41 +0000 |
| commit | 97e15de9613f3abe94438c8f02951dd4b8a7ba31 (patch) | |
| tree | 63142765465cb403310163b97354ad3645992638 | |
| parent | 8e6ece9578fb915805c3800696ef37c65159828c (diff) | |
Rename sgi GENERIC and RAMDISK with -IP32 suffixes, and have the build
machinery minimally cope with this.
Discussed with and reluctantely accepted by deraadt@; we both dislike
losing the ``naturally comes out of your fingers'' kernel names and the
``one size fits all'' logic; but for now I don't see any easy way to
get a single kernel binary able to run on multiple IP## flavours.
| -rw-r--r-- | distrib/sgi/ramdisk/Makefile | 8 | ||||
| -rw-r--r-- | etc/etc.sgi/Makefile.inc | 8 | ||||
| -rw-r--r-- | sys/arch/sgi/conf/GENERIC-IP32 (renamed from sys/arch/sgi/conf/GENERIC) | 2 | ||||
| -rw-r--r-- | sys/arch/sgi/conf/RAMDISK-IP32 (renamed from sys/arch/sgi/conf/RAMDISK) | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/distrib/sgi/ramdisk/Makefile b/distrib/sgi/ramdisk/Makefile index 4eb06e9de37..a1d0302db64 100644 --- a/distrib/sgi/ramdisk/Makefile +++ b/distrib/sgi/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2009/04/17 03:58:54 deraadt Exp $ +# $OpenBSD: Makefile,v 1.10 2009/05/14 21:16:38 miod Exp $ REV= ${OSrev} @@ -44,10 +44,10 @@ ${IMAGE}: rd_setup do_files rd_teardown .endif bsd: - cd ${.TOP}/../../sys/arch/sgi/conf && config RAMDISK - cd ${.TOP}/../../sys/arch/sgi/compile/RAMDISK && \ + cd ${.TOP}/../../sys/arch/sgi/conf && config RAMDISK-IP32 + cd ${.TOP}/../../sys/arch/sgi/compile/RAMDISK-IP32 && \ ${MAKE} clean && ${MAKE} depend && ${MAKE} - cp ${.TOP}/../../sys/arch/sgi/compile/RAMDISK/bsd bsd + cp ${.TOP}/../../sys/arch/sgi/compile/RAMDISK-IP32/bsd bsd rd_setup: dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS} diff --git a/etc/etc.sgi/Makefile.inc b/etc/etc.sgi/Makefile.inc index b792eff4b02..59073b7ba62 100644 --- a/etc/etc.sgi/Makefile.inc +++ b/etc/etc.sgi/Makefile.inc @@ -1,12 +1,12 @@ -# $OpenBSD: Makefile.inc,v 1.6 2009/04/21 09:12:27 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.7 2009/05/14 21:16:40 miod Exp $ kernels: bsd - cp ${.CURDIR}/../sys/arch/sgi/compile/GENERIC/bsd \ + cp ${.CURDIR}/../sys/arch/sgi/compile/GENERIC-IP32/bsd \ ${RELEASEDIR}/bsd bsd: - cd ${.CURDIR}/../sys/arch/sgi/conf && config GENERIC - cd ${.CURDIR}/../sys/arch/sgi/compile/GENERIC && \ + cd ${.CURDIR}/../sys/arch/sgi/conf && config GENERIC-IP32 + cd ${.CURDIR}/../sys/arch/sgi/compile/GENERIC-IP32 && \ ${MAKE} clean && ${MAKE} depend && exec ${MAKE} MDEXT= bsd bsd.rd cd${OSrev}.iso diff --git a/sys/arch/sgi/conf/GENERIC b/sys/arch/sgi/conf/GENERIC-IP32 index b29fdf1fe7e..4d880d05c43 100644 --- a/sys/arch/sgi/conf/GENERIC +++ b/sys/arch/sgi/conf/GENERIC-IP32 @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.37 2009/04/13 21:13:34 miod Exp $ +# $OpenBSD: GENERIC-IP32,v 1.1 2009/05/14 21:16:40 miod Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. diff --git a/sys/arch/sgi/conf/RAMDISK b/sys/arch/sgi/conf/RAMDISK-IP32 index 9c20e343e4a..c70ecb4a264 100644 --- a/sys/arch/sgi/conf/RAMDISK +++ b/sys/arch/sgi/conf/RAMDISK-IP32 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.24 2009/04/13 21:13:46 miod Exp $ +# $OpenBSD: RAMDISK-IP32,v 1.1 2009/05/14 21:16:40 miod Exp $ # machine sgi mips64 |