[tyndur-devel] [PATCH 4/4] config: lost/config.h in .gitignore eingetragen
Andreas Freimuth ·
+ .gitignore: Týndurs Konfigurations-Datei auf die Ignoreliste gesetzt da Änderungen an der Konfiguration im Allgemeinen local sind und nicht im Repo landen sollen. + lost/default_config.h: dient als Template für die locale Týndur-Konfigurations-Datei Signed-off-by: Andreas Freimuth <m.nemo at gmx.net> --- .gitignore | 1 + Makefile | 10 ++++- src/include/lost/config.h | 79 --------------------------------------- src/include/lost/default_config.h | 79 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 88 insertions(+), 81 deletions(-) delete mode 100644 src/include/lost/config.h create mode 100644 src/include/lost/default_config.h diff --git a/.gitignore b/.gitignore index 7142323..386d47e 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ ppas.sh *.rst *.orig /myconf.sh +/src/include/lost/config.h /lbuilds /build/root /build/images diff --git a/Makefile b/Makefile index f83a098..474b7c3 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ BUILD_DIR=$(BUILD_ROOT) AS=$(AS_BINARY) -all: +all: config $(MAKE) --no-print-directory -s makefiles $(MAKE) --no-print-directory -s subdirs $(MAKE) --no-print-directory -s obj @@ -90,7 +90,13 @@ cscope: find `pwd`/src -name '*.[ch]' > cscope.files cscope -bk -menuconfig: +.PHONY: config +config: src/include/lost/config.h + +src/include/lost/config.h: + cp src/include/lost/default_config.h src/include/lost/config.h + +menuconfig: src/include/lost/config.h python config.py documentation: diff --git a/src/include/lost/config.h b/src/include/lost/config.h deleted file mode 100644 index 919a739..0000000 --- a/src/include/lost/config.h +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (c) 2006 The tyndur Project. All rights reserved. - * - * This code is derived from software contributed to the tyndur Project - * by Andreas Klebinger. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _CONFIG_H_ -#define _CONFIG_H_ - -#define MALLOC_LOST 1 -#define MALLOC_BSD 2 -#define MALLOC_LIBALLOC 3 - -#define ARCH_I386 1 -#define ARCH_AMD64 2 - -#define SYSCALL_V1 1 -#define SYSCALL_V2 2 - -//%desc "Architektur" -//%type "radio" -//%values "ARCH_I386,ARCH_AMD64" -#define CONFIG_ARCH ARCH_I386 - -//%desc "Kooperatives Multitasking" -//%type "yesno" -#undef CONFIG_COOPERATIVE_MULTITASKING - -//%desc "Timerfrequenz in Hertz" -//%type "text" -#define CONFIG_TIMER_HZ 50 - -//%desc "Letzten Syscall fuer Debugausgaben merken" -//%type "yesno" -#define CONFIG_DEBUG_LAST_SYSCALL - -//%desc "malloc" -//%type "radio" -//%values "MALLOC_LOST,MALLOC_BSD,MALLOC_LIBALLOC" -#define CONFIG_MALLOC MALLOC_LIBALLOC - -//%desc "shell - Eingebaute Befehle" -//%type "yesno" -#define CONFIG_SHELL_BUILTIN_ONLY - -//%desc "Releaseversion (Einige Pruefungen weglassen)" -//%type "yesno" -#undef CONFIG_RELEASE_VERSION - -//%desc "Stubs in der LibC nicht benutzen" -//%type "yesno" -#define CONFIG_LIBC_NO_STUBS - -#include <lost/version.h> - -#endif // _CONFIG_H_ - diff --git a/src/include/lost/default_config.h b/src/include/lost/default_config.h new file mode 100644 index 0000000..919a739 --- /dev/null +++ b/src/include/lost/default_config.h @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2006 The tyndur Project. All rights reserved. + * + * This code is derived from software contributed to the tyndur Project + * by Andreas Klebinger. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _CONFIG_H_ +#define _CONFIG_H_ + +#define MALLOC_LOST 1 +#define MALLOC_BSD 2 +#define MALLOC_LIBALLOC 3 + +#define ARCH_I386 1 +#define ARCH_AMD64 2 + +#define SYSCALL_V1 1 +#define SYSCALL_V2 2 + +//%desc "Architektur" +//%type "radio" +//%values "ARCH_I386,ARCH_AMD64" +#define CONFIG_ARCH ARCH_I386 + +//%desc "Kooperatives Multitasking" +//%type "yesno" +#undef CONFIG_COOPERATIVE_MULTITASKING + +//%desc "Timerfrequenz in Hertz" +//%type "text" +#define CONFIG_TIMER_HZ 50 + +//%desc "Letzten Syscall fuer Debugausgaben merken" +//%type "yesno" +#define CONFIG_DEBUG_LAST_SYSCALL + +//%desc "malloc" +//%type "radio" +//%values "MALLOC_LOST,MALLOC_BSD,MALLOC_LIBALLOC" +#define CONFIG_MALLOC MALLOC_LIBALLOC + +//%desc "shell - Eingebaute Befehle" +//%type "yesno" +#define CONFIG_SHELL_BUILTIN_ONLY + +//%desc "Releaseversion (Einige Pruefungen weglassen)" +//%type "yesno" +#undef CONFIG_RELEASE_VERSION + +//%desc "Stubs in der LibC nicht benutzen" +//%type "yesno" +#define CONFIG_LIBC_NO_STUBS + +#include <lost/version.h> + +#endif // _CONFIG_H_ + -- 1.7.11.7