From: | Matthew Dillon <dillon@xxxxxxxxxxxxxxxxxxxxxxx> |
Date: | Thu, 18 Jan 2007 23:23:43 -0800 (PST) |
dillon 2007/01/18 23:23:43 PST DragonFly src repository Modified files: . Makefile.inc1 include Makefile lib/libc/gen uname.c share/mk sys.mk sys/boot/i386/libi386 Makefile biosacpi.c sys/boot/ia64/libski acpi_stub.c sys/conf acpi.mk bsd.kern.mk kern.post.mk kern.pre.mk kmod.mk options sys/config GENERIC LINT TINDERBOX VKERNEL sys/cpu/i386/include param.h sys/dev Makefile sys/dev/acpica5 Makefile sys/dev/est Makefile sys/dev/misc/syscons Makefile sys/kern Makefile Makefile.misc kern_mib.c sys/platform/pc32/conf Makefile files sys/platform/pc32/include param.h sys/platform/vkernel/conf Makefile files sys/platform/vkernel/i386 vm_machdep.c sys/sys sysctl.h usr.bin/make main.c make.1 usr.bin/uname uname.c usr.sbin Makefile usr.sbin/config config.h config.y configvers.h lang.l main.c mkmakefile.c mkoptions.c Added files: sys/platform/vkernel/include param.h Log: Rename /usr/src/sys/machine to /usr/src/sys/platform. Give the platform name its own variable, MACHINE_PLATFORM, instead of trying to use MACHINE to name it. Adjust the build infrastructure to match. Revert MACHINE back to its original definition and remove uname shims. This removes confusion with third party software. This means a pc32 build has MACHINE=i386 and MACHINE_ARCH=i386, and a vkernel build also has MACHINE=i386 and MACHINE_ARCH=i386. The new MACHINE_PLAFORM would be pc32 for a pc32 build, and vkernel for a vkernel build. Adjust all kernel configuration files to specify platform, machine, AND machine_arch. Revision Changes Path 1.101 +13 -2 src/Makefile.inc1 1.33 +5 -5 src/include/Makefile 1.5 +2 -7 src/lib/libc/gen/uname.c 1.19 +13 -13 src/share/mk/sys.mk 1.8 +4 -3 src/sys/boot/i386/libi386/Makefile 1.5 +9 -9 src/sys/boot/i386/libi386/biosacpi.c 1.2 +1 -1 src/sys/boot/ia64/libski/acpi_stub.c 1.6 +1 -1 src/sys/conf/acpi.mk 1.12 +1 -1 src/sys/conf/bsd.kern.mk 1.8 +4 -4 src/sys/conf/kern.post.mk 1.4 +5 -5 src/sys/conf/kern.pre.mk 1.32 +2 -2 src/sys/conf/kmod.mk 1.61 +2 -2 src/sys/conf/options 1.48 +2 -1 src/sys/config/GENERIC 1.104 +2 -1 src/sys/config/LINT 1.22 +2 -1 src/sys/config/TINDERBOX 1.9 +2 -1 src/sys/config/VKERNEL 1.13 +6 -11 src/sys/cpu/i386/include/param.h 1.11 +1 -1 src/sys/dev/Makefile 1.16 +1 -1 src/sys/dev/acpica5/Makefile 1.4 +1 -1 src/sys/dev/est/Makefile 1.4 +1 -1 src/sys/dev/misc/syscons/Makefile 1.13 +1 -1 src/sys/kern/Makefile 1.7 +2 -2 src/sys/kern/Makefile.misc 1.15 +5 -9 src/sys/kern/kern_mib.c 1.4 +1 -1 src/sys/platform/pc32/conf/Makefile 1.8 +68 -68 src/sys/platform/pc32/conf/files 1.3 +4 -4 src/sys/platform/pc32/include/param.h 1.6 +1 -1 src/sys/platform/vkernel/conf/Makefile 1.15 +26 -26 src/sys/platform/vkernel/conf/files 1.6 +1 -1 src/sys/platform/vkernel/i386/vm_machdep.c 1.21 +2 -3 src/sys/sys/sysctl.h 1.146 +21 -25 src/usr.bin/make/main.c 1.29 +8 -0 src/usr.bin/make/make.1 1.6 +6 -10 src/usr.bin/uname/uname.c 1.33 +1 -1 src/usr.sbin/Makefile 1.9 +3 -2 src/usr.sbin/config/config.h 1.14 +9 -0 src/usr.sbin/config/config.y 1.9 +1 -1 src/usr.sbin/config/configvers.h 1.13 +1 -0 src/usr.sbin/config/lang.l 1.21 +15 -11 src/usr.sbin/config/main.c 1.18 +8 -6 src/usr.sbin/config/mkmakefile.c 1.19 +3 -3 src/usr.sbin/config/mkoptions.c http://www.dragonflybsd.org/cvsweb/src/Makefile.inc1.diff?r1=1.100&r2=1.101&f=u http://www.dragonflybsd.org/cvsweb/src/include/Makefile.diff?r1=1.32&r2=1.33&f=u http://www.dragonflybsd.org/cvsweb/src/lib/libc/gen/uname.c.diff?r1=1.4&r2=1.5&f=u http://www.dragonflybsd.org/cvsweb/src/share/mk/sys.mk.diff?r1=1.18&r2=1.19&f=u http://www.dragonflybsd.org/cvsweb/src/sys/boot/i386/libi386/Makefile.diff?r1=1.7&r2=1.8&f=u http://www.dragonflybsd.org/cvsweb/src/sys/boot/i386/libi386/biosacpi.c.diff?r1=1.4&r2=1.5&f=u http://www.dragonflybsd.org/cvsweb/src/sys/boot/ia64/libski/acpi_stub.c.diff?r1=1.1&r2=1.2&f=u http://www.dragonflybsd.org/cvsweb/src/sys/conf/acpi.mk.diff?r1=1.5&r2=1.6&f=u http://www.dragonflybsd.org/cvsweb/src/sys/conf/bsd.kern.mk.diff?r1=1.11&r2=1.12&f=u http://www.dragonflybsd.org/cvsweb/src/sys/conf/kern.post.mk.diff?r1=1.7&r2=1.8&f=u http://www.dragonflybsd.org/cvsweb/src/sys/conf/kern.pre.mk.diff?r1=1.3&r2=1.4&f=u http://www.dragonflybsd.org/cvsweb/src/sys/conf/kmod.mk.diff?r1=1.31&r2=1.32&f=u http://www.dragonflybsd.org/cvsweb/src/sys/conf/options.diff?r1=1.60&r2=1.61&f=u http://www.dragonflybsd.org/cvsweb/src/sys/config/GENERIC.diff?r1=1.47&r2=1.48&f=u http://www.dragonflybsd.org/cvsweb/src/sys/config/LINT.diff?r1=1.103&r2=1.104&f=u http://www.dragonflybsd.org/cvsweb/src/sys/config/TINDERBOX.diff?r1=1.21&r2=1.22&f=u http://www.dragonflybsd.org/cvsweb/src/sys/config/VKERNEL.diff?r1=1.8&r2=1.9&f=u http://www.dragonflybsd.org/cvsweb/src/sys/cpu/i386/include/param.h.diff?r1=1.12&r2=1.13&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/Makefile.diff?r1=1.10&r2=1.11&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/acpica5/Makefile.diff?r1=1.15&r2=1.16&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/est/Makefile.diff?r1=1.3&r2=1.4&f=u http://www.dragonflybsd.org/cvsweb/src/sys/dev/misc/syscons/Makefile.diff?r1=1.3&r2=1.4&f=u http://www.dragonflybsd.org/cvsweb/src/sys/kern/Makefile.diff?r1=1.12&r2=1.13&f=u http://www.dragonflybsd.org/cvsweb/src/sys/kern/Makefile.misc.diff?r1=1.6&r2=1.7&f=u http://www.dragonflybsd.org/cvsweb/src/sys/kern/kern_mib.c.diff?r1=1.14&r2=1.15&f=u http://www.dragonflybsd.org/cvsweb/src/sys/platform/pc32/conf/Makefile.diff?r1=1.3&r2=1.4&f=u http://www.dragonflybsd.org/cvsweb/src/sys/platform/pc32/conf/files.diff?r1=1.7&r2=1.8&f=u http://www.dragonflybsd.org/cvsweb/src/sys/platform/pc32/include/param.h.diff?r1=1.2&r2=1.3&f=u http://www.dragonflybsd.org/cvsweb/src/sys/platform/vkernel/conf/Makefile.diff?r1=1.5&r2=1.6&f=u http://www.dragonflybsd.org/cvsweb/src/sys/platform/vkernel/conf/files.diff?r1=1.14&r2=1.15&f=u http://www.dragonflybsd.org/cvsweb/src/sys/platform/vkernel/i386/vm_machdep.c.diff?r1=1.5&r2=1.6&f=u http://www.dragonflybsd.org/cvsweb/src/sys/sys/sysctl.h.diff?r1=1.20&r2=1.21&f=u http://www.dragonflybsd.org/cvsweb/src/usr.bin/make/main.c.diff?r1=1.145&r2=1.146&f=u http://www.dragonflybsd.org/cvsweb/src/usr.bin/make/make.1.diff?r1=1.28&r2=1.29&f=u http://www.dragonflybsd.org/cvsweb/src/usr.bin/uname/uname.c.diff?r1=1.5&r2=1.6&f=u http://www.dragonflybsd.org/cvsweb/src/usr.sbin/Makefile.diff?r1=1.32&r2=1.33&f=u http://www.dragonflybsd.org/cvsweb/src/usr.sbin/config/config.h.diff?r1=1.8&r2=1.9&f=u http://www.dragonflybsd.org/cvsweb/src/usr.sbin/config/config.y.diff?r1=1.13&r2=1.14&f=u http://www.dragonflybsd.org/cvsweb/src/usr.sbin/config/configvers.h.diff?r1=1.8&r2=1.9&f=u http://www.dragonflybsd.org/cvsweb/src/usr.sbin/config/lang.l.diff?r1=1.12&r2=1.13&f=u http://www.dragonflybsd.org/cvsweb/src/usr.sbin/config/main.c.diff?r1=1.20&r2=1.21&f=u http://www.dragonflybsd.org/cvsweb/src/usr.sbin/config/mkmakefile.c.diff?r1=1.17&r2=1.18&f=u http://www.dragonflybsd.org/cvsweb/src/usr.sbin/config/mkoptions.c.diff?r1=1.18&r2=1.19&f=u