From 96dc40fee6a95bb718b2b3b65b9969984ebeb71a Mon Sep 17 00:00:00 2001 From: abs Date: Thu, 6 Nov 2008 17:12:20 +0000 Subject: [PATCH] Add the following note to README: Please commit changes to 'GENERIC.in' and other source files *first*, then run 'makeconf' and commit the generated files to ensure the 'Created from:' tags are correct. Then follow it. Noted by tsutsui@ --- sys/arch/atari/conf/ATARITT | 4 ++-- sys/arch/atari/conf/BOOT | 4 ++-- sys/arch/atari/conf/BOOTX | 4 ++-- sys/arch/atari/conf/FALCON | 4 ++-- sys/arch/atari/conf/HADES | 4 ++-- sys/arch/atari/conf/MILAN-ISAIDE | 4 ++-- sys/arch/atari/conf/MILAN-PCIIDE | 4 ++-- sys/arch/atari/conf/README | 4 ++++ 8 files changed, 18 insertions(+), 14 deletions(-) diff --git a/sys/arch/atari/conf/ATARITT b/sys/arch/atari/conf/ATARITT index 6ac67cb79e8a..b0bcfae69485 100644 --- a/sys/arch/atari/conf/ATARITT +++ b/sys/arch/atari/conf/ATARITT @@ -1,12 +1,12 @@ # -# $NetBSD: ATARITT,v 1.87 2008/11/05 23:55:06 abs Exp $ +# $NetBSD: ATARITT,v 1.88 2008/11/06 17:12:20 abs Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. # # Created from: # NetBSD: ATARITT.in,v 1.4 2001/04/10 06:28:38 leo Exp $ -# NetBSD: GENERIC.in,v 1.73 2008/07/31 07:47:43 simonb Exp $ +# NetBSD: GENERIC.in,v 1.74 2008/11/05 23:55:06 abs Exp $ include "arch/atari/conf/std.atari" options INCLUDE_CONFIG_FILE # embed config file in kernel binary maxusers 16 diff --git a/sys/arch/atari/conf/BOOT b/sys/arch/atari/conf/BOOT index 71f65610fc35..363488a74b9d 100644 --- a/sys/arch/atari/conf/BOOT +++ b/sys/arch/atari/conf/BOOT @@ -1,12 +1,12 @@ # -# $NetBSD: BOOT,v 1.77 2008/11/05 23:55:06 abs Exp $ +# $NetBSD: BOOT,v 1.78 2008/11/06 17:12:20 abs Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. # # Created from: # NetBSD: FALCON.in,v 1.8 2005/12/11 12:16:54 christos Exp $ -# NetBSD: GENERIC.in,v 1.73 2008/07/31 07:47:43 simonb Exp $ +# NetBSD: GENERIC.in,v 1.74 2008/11/05 23:55:06 abs Exp $ include "arch/atari/conf/std.atari" options INCLUDE_CONFIG_FILE # embed config file in kernel binary maxusers 16 diff --git a/sys/arch/atari/conf/BOOTX b/sys/arch/atari/conf/BOOTX index a1d4c489711e..7452df4cea87 100644 --- a/sys/arch/atari/conf/BOOTX +++ b/sys/arch/atari/conf/BOOTX @@ -1,12 +1,12 @@ # -# $NetBSD: BOOTX,v 1.72 2008/11/05 23:55:06 abs Exp $ +# $NetBSD: BOOTX,v 1.73 2008/11/06 17:12:20 abs Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. # # Created from: # NetBSD: FALCON.in,v 1.8 2005/12/11 12:16:54 christos Exp $ -# NetBSD: GENERIC.in,v 1.73 2008/07/31 07:47:43 simonb Exp $ +# NetBSD: GENERIC.in,v 1.74 2008/11/05 23:55:06 abs Exp $ include "arch/atari/conf/std.atari" options INCLUDE_CONFIG_FILE # embed config file in kernel binary maxusers 16 diff --git a/sys/arch/atari/conf/FALCON b/sys/arch/atari/conf/FALCON index ebc0fda8ef20..8edeac1bdb68 100644 --- a/sys/arch/atari/conf/FALCON +++ b/sys/arch/atari/conf/FALCON @@ -1,12 +1,12 @@ # -# $NetBSD: FALCON,v 1.85 2008/11/05 23:55:06 abs Exp $ +# $NetBSD: FALCON,v 1.86 2008/11/06 17:12:20 abs Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. # # Created from: # NetBSD: FALCON.in,v 1.8 2005/12/11 12:16:54 christos Exp $ -# NetBSD: GENERIC.in,v 1.73 2008/07/31 07:47:43 simonb Exp $ +# NetBSD: GENERIC.in,v 1.74 2008/11/05 23:55:06 abs Exp $ include "arch/atari/conf/std.atari" options INCLUDE_CONFIG_FILE # embed config file in kernel binary maxusers 16 diff --git a/sys/arch/atari/conf/HADES b/sys/arch/atari/conf/HADES index f181bb4e3a10..2957dc185120 100644 --- a/sys/arch/atari/conf/HADES +++ b/sys/arch/atari/conf/HADES @@ -1,12 +1,12 @@ # -# $NetBSD: HADES,v 1.77 2008/11/05 23:55:06 abs Exp $ +# $NetBSD: HADES,v 1.78 2008/11/06 17:12:20 abs Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. # # Created from: # NetBSD: HADES.in,v 1.8 2005/12/11 12:16:54 christos Exp $ -# NetBSD: GENERIC.in,v 1.73 2008/07/31 07:47:43 simonb Exp $ +# NetBSD: GENERIC.in,v 1.74 2008/11/05 23:55:06 abs Exp $ include "arch/atari/conf/std.hades" options INCLUDE_CONFIG_FILE # embed config file in kernel binary maxusers 16 diff --git a/sys/arch/atari/conf/MILAN-ISAIDE b/sys/arch/atari/conf/MILAN-ISAIDE index a1f45d7408f6..5ffe70cf7f92 100644 --- a/sys/arch/atari/conf/MILAN-ISAIDE +++ b/sys/arch/atari/conf/MILAN-ISAIDE @@ -1,12 +1,12 @@ # -# $NetBSD: MILAN-ISAIDE,v 1.54 2008/11/05 23:55:06 abs Exp $ +# $NetBSD: MILAN-ISAIDE,v 1.55 2008/11/06 17:12:20 abs Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. # # Created from: # NetBSD: MILAN.in,v 1.21 2006/09/03 13:51:24 bjh21 Exp $ -# NetBSD: GENERIC.in,v 1.73 2008/07/31 07:47:43 simonb Exp $ +# NetBSD: GENERIC.in,v 1.74 2008/11/05 23:55:06 abs Exp $ include "arch/atari/conf/std.milan" options INCLUDE_CONFIG_FILE # embed config file in kernel binary maxusers 16 diff --git a/sys/arch/atari/conf/MILAN-PCIIDE b/sys/arch/atari/conf/MILAN-PCIIDE index afd7bacb71de..d8fbc1896683 100644 --- a/sys/arch/atari/conf/MILAN-PCIIDE +++ b/sys/arch/atari/conf/MILAN-PCIIDE @@ -1,12 +1,12 @@ # -# $NetBSD: MILAN-PCIIDE,v 1.58 2008/11/05 23:55:06 abs Exp $ +# $NetBSD: MILAN-PCIIDE,v 1.59 2008/11/06 17:12:20 abs Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. # # Created from: # NetBSD: MILAN.in,v 1.21 2006/09/03 13:51:24 bjh21 Exp $ -# NetBSD: GENERIC.in,v 1.73 2008/07/31 07:47:43 simonb Exp $ +# NetBSD: GENERIC.in,v 1.74 2008/11/05 23:55:06 abs Exp $ include "arch/atari/conf/std.milan" options INCLUDE_CONFIG_FILE # embed config file in kernel binary maxusers 16 diff --git a/sys/arch/atari/conf/README b/sys/arch/atari/conf/README index 4ad737186c94..304bcd59df8f 100644 --- a/sys/arch/atari/conf/README +++ b/sys/arch/atari/conf/README @@ -4,4 +4,8 @@ preprocessor defines. If something needs to be changed in 'GENERIC.in' or some of the other '.in' files, please regenerate the config files and commit them too... +Please commit changes to 'GENERIC.in' and other source files *first*, then +run 'makeconf' and commit the generated files to ensure the 'Created from:' +tags are correct. + Leo.