From m.nemo at gmx.net Wed Oct 3 16:55:21 2012 From: m.nemo at gmx.net (Andreas Freimuth) Date: Wed, 3 Oct 2012 16:55:21 +0200 Subject: [tyndur-devel] [PATCH 1/4] Makefile: $LOST_TOOLS_QEMU auch nutzen Message-ID: <1349276124-21443-1-git-send-email-m.nemo@gmx.net> * Da nicht bei jedem Qemu auch 'qemu' heißt ist es sinnvoll die dafür vorgesehene Konfigurationsvariable auch zu nutzen. Signed-off-by: Andreas Freimuth --- Makefile | 7 ++++--- buildmk.sh | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 1927650..f83a098 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,7 @@ CC=$(CC_BINARY) CPP=$(CPP_BINARY) PPC=$(PPC_BINARY) -n -Cn -CX -Ttyndur -Fu../lib/units -Fu../units +QEMU=$(QEMU_BINARY) ASM_ELF=nasm -felf -O99 ASM_BIN=nasm -fbin -O99 @@ -73,13 +74,13 @@ image-cdrom: updateroot build/scripts/image_cdrom_$(GRUB_VERSION) test-qemu-floppy: image-floppy - qemu -serial stdio -fda build/images/floppy.img -boot a -net user -net nic,model=rtl8139 | tee qemu-serial.log + $(QEMU) -serial stdio -fda build/images/floppy.img -boot a -net user -net nic,model=rtl8139 | tee qemu-serial.log test-qemu-hd: image-hd - qemu -serial stdio -hda build/images/hd.img -net user -net nic,model=rtl8139 | tee qemu-serial.log + $(QEMU) -serial stdio -hda build/images/hd.img -net user -net nic,model=rtl8139 | tee qemu-serial.log test-qemu-cdrom: image-cdrom - qemu -serial stdio -cdrom build/images/cdrom.img -boot d -net user -net nic,model=rtl8139 | tee qemu-serial.log + $(QEMU) -serial stdio -cdrom build/images/cdrom.img -boot d -net user -net nic,model=rtl8139 | tee qemu-serial.log test-bochs: image-floppy bochs -f bochs.config diff --git a/buildmk.sh b/buildmk.sh index 8078812..083ea21 100644 --- a/buildmk.sh +++ b/buildmk.sh @@ -90,6 +90,7 @@ CC_BINARY=$LOST_TOOLS_GCC CPP_BINARY=$LOST_TOOLS_GPP PPC_BINARY=$LOST_TOOLS_PPC LD_BINARY=$LOST_TOOLS_LD +QEMU_BINARY=$LOST_TOOLS_QEMU EOF # Ist grub legacy installiert? -- 1.7.11.7 From m.nemo at gmx.net Wed Oct 3 16:55:22 2012 From: m.nemo at gmx.net (Andreas Freimuth) Date: Wed, 3 Oct 2012 16:55:22 +0200 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH_2/4=5D_build=3A_Tempor=C3=A4re_?= =?utf-8?q?Dateien_geh=C3=B6ren_nach_/tmp?= In-Reply-To: <1349276124-21443-1-git-send-email-m.nemo@gmx.net> References: <1349276124-21443-1-git-send-email-m.nemo@gmx.net> Message-ID: <1349276124-21443-2-git-send-email-m.nemo@gmx.net> * build/scripts/image_floppy_grub1: Die Konfigurationsdatei für MTOOLS wird nur kurz benötigt und dann gleich wieder gelöscht. Also ab damit nach /tmp Signed-off-by: Andreas Freimuth --- build/scripts/image_floppy_grub1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/scripts/image_floppy_grub1 b/build/scripts/image_floppy_grub1 index 463b117..f4f81a3 100755 --- a/build/scripts/image_floppy_grub1 +++ b/build/scripts/image_floppy_grub1 @@ -45,7 +45,7 @@ export LOST_BUILDMK_ROOT="`pwd`" source config.sh -export MTOOLSRC=lostmtools.conf +export MTOOLSRC=/tmp/lostmtools.conf$$ # Konfigurationsdatei fuer mtools generieren cat << EOF > $MTOOLSRC -- 1.7.11.7 From m.nemo at gmx.net Wed Oct 3 16:55:23 2012 From: m.nemo at gmx.net (Andreas Freimuth) Date: Wed, 3 Oct 2012 16:55:23 +0200 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH_3/4=5D_config=3A_Informationen_?= =?utf-8?q?=C3=BCber_die_T=E1=BB=B3ndur-Version_extrahiert?= In-Reply-To: <1349276124-21443-1-git-send-email-m.nemo@gmx.net> References: <1349276124-21443-1-git-send-email-m.nemo@gmx.net> Message-ID: <1349276124-21443-3-git-send-email-m.nemo@gmx.net> + lost/version.h: Versionsinformationen zu T?ndur aus lost/config.h extrahiert Signed-off-by: Andreas Freimuth --- src/include/lost/config.h | 12 +----------- src/include/lost/version.h | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 11 deletions(-) create mode 100644 src/include/lost/version.h diff --git a/src/include/lost/config.h b/src/include/lost/config.h index cec4d1b..919a739 100644 --- a/src/include/lost/config.h +++ b/src/include/lost/config.h @@ -73,17 +73,7 @@ //%type "yesno" #define CONFIG_LIBC_NO_STUBS - -#define TYNDUR_VERSION "0.3.0" -#define TYNDUR_RELEASE "Smaug" - -#if CONFIG_ARCH == ARCH_I386 - #define TYNDUR_ARCH "i386" -#elif CONFIG_ARCH == ARCH_AMD64 - #define TYNDUR_ARCH "amd64" -#else - #error Unbekannte Architektur -#endif +#include #endif // _CONFIG_H_ diff --git a/src/include/lost/version.h b/src/include/lost/version.h new file mode 100644 index 0000000..9b61e5c --- /dev/null +++ b/src/include/lost/version.h @@ -0,0 +1,17 @@ +#ifndef TYNDUR_VERSION_H +#define TYNDUR_VERSION_H + +#include + +#define TYNDUR_VERSION "0.3.0" +#define TYNDUR_RELEASE "Smaug" + +#if CONFIG_ARCH == ARCH_I386 + #define TYNDUR_ARCH "i386" +#elif CONFIG_ARCH == ARCH_AMD64 + #define TYNDUR_ARCH "amd64" +#else + #error Unbekannte Architektur +#endif + +#endif -- 1.7.11.7 From m.nemo at gmx.net Wed Oct 3 16:55:24 2012 From: m.nemo at gmx.net (Andreas Freimuth) Date: Wed, 3 Oct 2012 16:55:24 +0200 Subject: [tyndur-devel] [PATCH 4/4] config: lost/config.h in .gitignore eingetragen In-Reply-To: <1349276124-21443-1-git-send-email-m.nemo@gmx.net> References: <1349276124-21443-1-git-send-email-m.nemo@gmx.net> Message-ID: <1349276124-21443-4-git-send-email-m.nemo@gmx.net> + .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 --- .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 - -#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 + +#endif // _CONFIG_H_ + -- 1.7.11.7 From m.nemo at gmx.net Wed Oct 3 17:15:01 2012 From: m.nemo at gmx.net (Andreas Freimuth) Date: Wed, 3 Oct 2012 17:15:01 +0200 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH_1/3=5D_lib=3A_unn=C3=B6tigen_Au?= =?utf-8?q?fruf_von_to=5Ftree=5Fitem_entfernt?= Message-ID: <1349277303-22324-1-git-send-email-m.nemo@gmx.net> * lib/collection/tree.c: subst wird nach der Initialisierung mit to_tree_item direkt wieder überschrieben. Da to_tree_item keine sonstigen Auswirkungen hat, können wir uns den Aufruf hier sparen. Reported-by: Clang 3.0 Signed-off-by: Andreas Freimuth --- src/lib/collections/tree.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/collections/tree.c b/src/lib/collections/tree.c index 6bb3c63..cbb1b63 100644 --- a/src/lib/collections/tree.c +++ b/src/lib/collections/tree.c @@ -400,7 +400,7 @@ void* tree_remove(tree_t* tree, void* node) // Knoten als Ersatz fuer den geloeschten. Ein guter Kandidat dafuer ist // der am weitesten rechts gelegene Knoten des linken Teilbaums. - struct tree_item* subst = to_tree_item(tree, node); + struct tree_item* subst; struct tree_item** psubst; subst = item->left; @@ -470,7 +470,7 @@ void* tree_remove(tree_t* tree, void* node) void* tree_prev(tree_t* tree, void* node) { struct tree_item* current = to_tree_item(tree, node); - struct tree_item* old = current; + struct tree_item* old; if (node == NULL) { current = tree->root; @@ -517,7 +517,7 @@ void* tree_prev(tree_t* tree, void* node) void* tree_next(tree_t* tree, void* node) { struct tree_item* current = to_tree_item(tree, node); - struct tree_item* old = current; + struct tree_item* old; if (node == NULL) { current = tree->root; -- 1.7.11.7 From m.nemo at gmx.net Wed Oct 3 17:15:02 2012 From: m.nemo at gmx.net (Andreas Freimuth) Date: Wed, 3 Oct 2012 17:15:02 +0200 Subject: [tyndur-devel] [PATCH 2/3] stdlibc: strftime erlaubt keine NULL-Pointer In-Reply-To: <1349277303-22324-1-git-send-email-m.nemo@gmx.net> References: <1349277303-22324-1-git-send-email-m.nemo@gmx.net> Message-ID: <1349277303-22324-2-git-send-email-m.nemo@gmx.net> - time.c: wenn datestr NULL ist macht das alles keinen Sinn. Da hilft auch keine Extraportion Unsinn. Reported-by: Clang 3.0 Signed-off-by: Andreas Freimuth --- src/modules/lib/stdlibc/time.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/modules/lib/stdlibc/time.c b/src/modules/lib/stdlibc/time.c index b05933b..04b4b5e 100644 --- a/src/modules/lib/stdlibc/time.c +++ b/src/modules/lib/stdlibc/time.c @@ -251,11 +251,6 @@ size_t strftime(char *str, size_t maxs, const char* datestr, char dflcase[] = "%?"; - // TODO: Aktuelle Zeit ermitteln - if (datestr == NULL) { - nstr = ""; - } - // Datumsformatstring parsen while ((c = *datestr++) != '\0') { if (c != '%') { -- 1.7.11.7 From m.nemo at gmx.net Wed Oct 3 17:15:03 2012 From: m.nemo at gmx.net (Andreas Freimuth) Date: Wed, 3 Oct 2012 17:15:03 +0200 Subject: [tyndur-devel] =?utf-8?b?W1BBVENIIDMvM10gZmRpc2s6IMO8YmVyZmzDvHNz?= =?utf-8?q?ige_Variablenzuweisung_entfernt?= In-Reply-To: <1349277303-22324-1-git-send-email-m.nemo@gmx.net> References: <1349277303-22324-1-git-send-email-m.nemo@gmx.net> Message-ID: <1349277303-22324-3-git-send-email-m.nemo@gmx.net> - fdisk.c: Der zugewiesen Wert wird nie gelesen und garantiert überschrieben. Reported-by: Clang 3.0 Signed-off-by: Andreas Freimuth --- src/modules/c/fdisk/fdisk.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/modules/c/fdisk/fdisk.c b/src/modules/c/fdisk/fdisk.c index ba05b92..94c3b31 100644 --- a/src/modules/c/fdisk/fdisk.c +++ b/src/modules/c/fdisk/fdisk.c @@ -352,7 +352,6 @@ static void shell_new(void) // Soll die Endadresse im CHS oder im LBA Format eingegeben werden? // Oder anhand der Groesse berechnet werden? printf("Partitionsende: Angabe CHS, LBA oder als Groesse? [CLS] "); - input_type = 0; do { printf("\b"); input_type = keyboard_read_char(); -- 1.7.11.7 From m.nemo at gmx.net Wed Oct 3 18:21:20 2012 From: m.nemo at gmx.net (Andreas Freimuth) Date: Wed, 3 Oct 2012 18:21:20 +0200 Subject: [tyndur-devel] [PATCH] losh: Erneut KRITIKEL gefixt In-Reply-To: <20120409133017.GA8432@silvanus> References: <20120409133017.GA8432@silvanus> Message-ID: <1349281280-20397-1-git-send-email-m.nemo@gmx.net> From: Alexander Kluth * commmands.c: Nun heißt die Datei commands.c und der Text wurde verfeinert Signed-off-by: Alexander Kluth Signed-off-by: Andreas Freimuth --- Alexanders Patches vereint: 4. April [tyndur-devel] [PATCH] shell: comm_m_ands.c vernünftig gelöscht 14. Januar [tyndur-devel] [PATCH] losh: Erneut KRITIKEL gefixt src/modules/c/shell/{commmands.c => commands.c} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename src/modules/c/shell/{commmands.c => commands.c} (99%) diff --git a/src/modules/c/shell/commmands.c b/src/modules/c/shell/commands.c similarity index 99% rename from src/modules/c/shell/commmands.c rename to src/modules/c/shell/commands.c index 4e47ab7..53a8cfe 100644 --- a/src/modules/c/shell/commmands.c +++ b/src/modules/c/shell/commands.c @@ -109,7 +109,7 @@ int shell_command_default(int argc, char* argv[], const char* cmd) if (strlen(cmd) == 0) { return 0; } - + if (shell_start_path_app(cmd, true) == 0) { return 0; } @@ -140,7 +140,7 @@ int shell_command_start(int argc, char* argv[], const char* cmd) return 0; } - puts(TMS(start_not_found, "Befehl wurde nicht gefunden!")); + puts(TMS(start_not_found, "Datei nicht gefunden!")); return -1; } @@ -170,7 +170,7 @@ int shell_command_help(int argc, char* argv[], const char* args) // Wenn nicht, gibt es eben die klassische Hilfe puts(TMS(help_text, "Verfügbare Befehle:\n" - + " Startet das Programm an im Vordergrund\n" " start Startet das Programm an im Hintergrund\n" " echo Zeigt an\n" @@ -198,7 +198,7 @@ int shell_command_help(int argc, char* argv[], const char* args) " pstree Zeigt die Prozesshierarchie als Baum an\n" " kill Beendet den Prozess \n" " dbg_st Zeigt einen Stack Backtrace des Prozesses an\n" - + " set Setzt Umgebungsvariablen oder zeigt sie an\n" " read Liest einen Wert für die Umgebungsvariable ein\n" " source Führt das Skript in der aktuellen Shell aus\n" -- 1.7.11.7 From m.nemo at gmx.net Wed Oct 3 20:04:49 2012 From: m.nemo at gmx.net (MNemo) Date: Wed, 03 Oct 2012 20:04:49 +0200 Subject: [tyndur-devel] [PATCH] modules/sysinfo: fixed cpu brand string In-Reply-To: <1340664670-6657-1-git-send-email-particleflux@googlemail.com> References: <1340664670-6657-1-git-send-email-particleflux@googlemail.com> Message-ID: <506C7E41.10402@gmx.net> On 26.06.2012 00:51, Stefan Linke wrote: > ! brand-string wird nun richtig ausgelesen und angezeigt > > Signed-off-by: Stefan Linke Bis auf die Leerzeichen in den Leerzeilen und den drei Tabs zum Einrücken sieht das gut aus. Acked-by: Andreas Freimuth -- Andreas From m.nemo at gmx.net Thu Oct 4 12:57:38 2012 From: m.nemo at gmx.net (MNemo) Date: Thu, 04 Oct 2012 12:57:38 +0200 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH=5D_kbc=3A_m=C3=B6gliche_Endloss?= =?utf-8?q?chleife_gefixt?= In-Reply-To: <1341425248-25844-1-git-send-email-arne.hasselbring@googlemail.com> References: <1341425248-25844-1-git-send-email-arne.hasselbring@googlemail.com> Message-ID: <506D6BA2.1000808@gmx.net> On 04.07.2012 20:07, Arne Hasselbring wrote: > ! Wenn in send_kbc_command kein 0xfa (ACK), sondern 0xfe (Resend) zurück- > kommt, hätte es eine Endlosschleife gegeben. > > Signed-off-by: Arne Hasselbring > --- Acked-by: Andreas Freimuth From m.nemo at gmx.net Mon Oct 8 17:30:32 2012 From: m.nemo at gmx.net (Andreas Freimuth) Date: Mon, 8 Oct 2012 17:30:32 +0200 Subject: [tyndur-devel] [PATCH 1/6] kernel2: fix Mulitboot-Info-Struktur Message-ID: <1349710237-14791-1-git-send-email-m.nemo@gmx.net> ! multiboot.h: Pointer auf die Command-Line hat ist immer 32 Bit breit. Er darf also aus Kompatibilitätsgründen kein char* sein. Signed-off-by: Andreas Freimuth --- src/kernel2/include/multiboot.h | 2 +- src/kernel2/src/init.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kernel2/include/multiboot.h b/src/kernel2/include/multiboot.h index 8621d92..39f116f 100644 --- a/src/kernel2/include/multiboot.h +++ b/src/kernel2/include/multiboot.h @@ -103,7 +103,7 @@ struct multiboot_info { uint8_t mi_boot_device_drive; /* Valid if mi_flags sets MULTIBOOT_INFO_HAS_CMDLINE. */ - char* mi_cmdline; + uint32_t mi_cmdline; /* Valid if mi_flags sets MULTIBOOT_INFO_HAS_MODS. */ uint32_t mi_mods_count; diff --git a/src/kernel2/src/init.c b/src/kernel2/src/init.c index 732b8ca..d6332db 100644 --- a/src/kernel2/src/init.c +++ b/src/kernel2/src/init.c @@ -139,7 +139,7 @@ void init(int multiboot_magic, struct multiboot_info *boot_info, bool bsp) // Debugparameter verarbeiten, das ist aber nur moeglich, wenn eine // Kernelkommandozeile existiert. if ((multiboot_info.mi_flags & MULTIBOOT_INFO_HAS_CMDLINE) != 0) { - parse_cmdline(multiboot_info.mi_cmdline); + parse_cmdline((char*)(uintptr_t)multiboot_info.mi_cmdline); } #if CONFIG_ARCH == ARCH_I386 -- 1.7.11.7 From m.nemo at gmx.net Mon Oct 8 17:30:33 2012 From: m.nemo at gmx.net (Andreas Freimuth) Date: Mon, 8 Oct 2012 17:30:33 +0200 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH_2/6=5D_kernel2=3A_kprintf_=27?= =?utf-8?q?=25p=27_korrekt_behandeln_und_=27z=27_hinzugef=C3=BCgt?= In-Reply-To: <1349710237-14791-1-git-send-email-m.nemo@gmx.net> References: <1349710237-14791-1-git-send-email-m.nemo@gmx.net> Message-ID: <1349710237-14791-2-git-send-email-m.nemo@gmx.net> ! kprintf.c: ein Pointer hat nicht immer die Größe von 'unsigend int' statt dessen sollte 'uintptr_t' verwendet werden. + kprintf.c: 'z' als Größen Angabe für 'size_t' Werte. Signed-off-by: Andreas Freimuth --- src/kernel2/src/kprintf.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/kernel2/src/kprintf.c b/src/kernel2/src/kprintf.c index 29d8e5a..d2cea6c 100644 --- a/src/kernel2/src/kprintf.c +++ b/src/kernel2/src/kprintf.c @@ -34,6 +34,7 @@ */ #include +#include #include #include "kprintf.h" @@ -161,6 +162,9 @@ void kaprintf(char* format, va_list args) value = tmp; } format++; + } else if(format[0] == 'z' && (format[1] == 'u' || format[1] == 'x')) { + value = va_arg(args, size_t); + format++; } else if(format[0] == 'l' && (format[1] == 'o' || format[1] == 'u' || format[1] == 'x')) { @@ -177,10 +181,10 @@ void kaprintf(char* format, va_list args) } else { value = tmp; } - } - else if(format[0] == 'u' || format[0] == 'o' || format[0] == 'p' || format[0] == 'x') - { + } else if(format[0] == 'u' || format[0] == 'o' || format[0] == 'x') { value = va_arg(args, unsigned int); + } else if(format[0] == 'p') { + value = va_arg(args, uintptr_t); } switch(*format) @@ -233,7 +237,7 @@ void kaprintf(char* format, va_list args) } /* printf für den Kernel. Nur für Testzwecke gedacht. - Unterstützt %c, %d, %i, %o, %p, %u, %s, %x und %lld, %lli, %llo, %llu, %llx. */ + Unterstützt %c, %d, %i, %o, %p, %u, %s, %x und %lld, %lli, %llo, %llu, %llx, %zu, %zx. */ void kprintf(char* format, ...) { lock(&printf_lock); -- 1.7.11.7 From m.nemo at gmx.net Mon Oct 8 17:30:34 2012 From: m.nemo at gmx.net (Andreas Freimuth) Date: Mon, 8 Oct 2012 17:30:34 +0200 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH_3/6=5D_kernel2=3A_amd64-Kernel_?= =?utf-8?q?soll_auch_tyndur2_hei=C3=9Fen?= In-Reply-To: <1349710237-14791-1-git-send-email-m.nemo@gmx.net> References: <1349710237-14791-1-git-send-email-m.nemo@gmx.net> Message-ID: <1349710237-14791-3-git-send-email-m.nemo@gmx.net> * Makefile.all(amd64): erstellt jetzt auch ein tyndur2 statt lost2 Signed-off-by: Andreas Freimuth --- src/kernel2/src/arch/amd64/Makefile.all | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kernel2/src/arch/amd64/Makefile.all b/src/kernel2/src/arch/amd64/Makefile.all index a5ce3fd..7e2cc1b 100644 --- a/src/kernel2/src/arch/amd64/Makefile.all +++ b/src/kernel2/src/arch/amd64/Makefile.all @@ -12,7 +12,7 @@ $LOST_TOOLS_OBJCOPY -B i386:x86-64 -I binary -O elf64-x86-64 rm_trampoline.o rm_ rm rm_trampoline.o $LOST_TOOLS_LD -okernel -Tkernel.ld header.o --start-group $KERNEL/*.o $KERNEL/*/!(rm_trampoline).o !(header).o !(loader)/*.o $2 --end-group $LOST_TOOLS_OBJCOPY -B i386:x86-64 -I binary -O elf64-x86-64 kernel kernel.o -$LOST_TOOLS_LD -olost2.krn -Tloader/loader.ld loader/startup.o loader/!(startup).o kernel.o $2 +$LOST_TOOLS_LD -otyndur2.krn -Tloader/loader.ld loader/startup.o loader/!(startup).o kernel.o $2 -mv lost2.krn $1/kernel/lost2 +mv tyndur2.krn $1/kernel/tyndur2 -- 1.7.11.7 From m.nemo at gmx.net Mon Oct 8 17:30:35 2012 From: m.nemo at gmx.net (Andreas Freimuth) Date: Mon, 8 Oct 2012 17:30:35 +0200 Subject: [tyndur-devel] [PATCH 4/6] kernel2: fix eigenen Tippfehler im Variablennamen In-Reply-To: <1349710237-14791-1-git-send-email-m.nemo@gmx.net> References: <1349710237-14791-1-git-send-email-m.nemo@gmx.net> Message-ID: <1349710237-14791-4-git-send-email-m.nemo@gmx.net> ! mm_virt.c(amd64): damit das auch Compiliert ein c aus 'context' entfernt Signed-off-by: Andreas Freimuth --- src/kernel2/src/arch/amd64/mm/mm_virt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kernel2/src/arch/amd64/mm/mm_virt.c b/src/kernel2/src/arch/amd64/mm/mm_virt.c index 8dae4c1..8f5af47 100644 --- a/src/kernel2/src/arch/amd64/mm/mm_virt.c +++ b/src/kernel2/src/arch/amd64/mm/mm_virt.c @@ -105,7 +105,7 @@ void vmm_init_local(mmc_context_t* context) } // Kontext aktivieren - mmc_activate(contecxt); + mmc_activate(context); } /** -- 1.7.11.7 From m.nemo at gmx.net Mon Oct 8 17:30:36 2012 From: m.nemo at gmx.net (Andreas Freimuth) Date: Mon, 8 Oct 2012 17:30:36 +0200 Subject: [tyndur-devel] [PATCH 5/6] kernel2: im_enable in im_init_local umbenannt In-Reply-To: <1349710237-14791-1-git-send-email-m.nemo@gmx.net> References: <1349710237-14791-1-git-send-email-m.nemo@gmx.net> Message-ID: <1349710237-14791-5-git-send-email-m.nemo@gmx.net> * im.c(amd64): im_enable in im_init_local umbenannt, da sie der (i386)im_init_local entspricht, und von init aufgerufen wird. Signed-off-by: Andreas Freimuth --- src/kernel2/src/arch/amd64/im/im.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/kernel2/src/arch/amd64/im/im.c b/src/kernel2/src/arch/amd64/im/im.c index c41c731..ad0ebc7 100644 --- a/src/kernel2/src/arch/amd64/im/im.c +++ b/src/kernel2/src/arch/amd64/im/im.c @@ -606,9 +606,9 @@ void im_init() } /** - * Die IDT laden und Interrupts aktivieren. - */ -void im_enable() + * Die IDT laden und Interrupts aktivieren. + */ +void im_init_local() { // Register zum laden der IDT vorbereiten struct { @@ -620,7 +620,8 @@ void im_enable() }; asm("lidt %0" : : "m" (idt_ptr)); -} +} + /** * Ein Gate in der IDT setzen -- 1.7.11.7 From m.nemo at gmx.net Mon Oct 8 17:30:37 2012 From: m.nemo at gmx.net (Andreas Freimuth) Date: Mon, 8 Oct 2012 17:30:37 +0200 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH_6/6=5D_kernel2=3A_Namenskonflik?= =?utf-8?b?dCB7cG0sbW19cG1fZ2V0IGF1ZmdlbMO2c3Q=?= In-Reply-To: <1349710237-14791-1-git-send-email-m.nemo@gmx.net> References: <1349710237-14791-1-git-send-email-m.nemo@gmx.net> Message-ID: <1349710237-14791-6-git-send-email-m.nemo@gmx.net> * mm/mm_context.c(amd64): da pm hier scheinbar für Page-Map steht und sich auf die Oberste Paging-Struktur bezieht in allen namen durch pml4 (Page-Map-Level-4) ersetzt. Signed-off-by: Andreas Freimuth --- src/kernel2/include/arch/amd64/mm_arch.h | 2 +- src/kernel2/src/arch/amd64/mm/mm_context.c | 68 +++++++++++++++--------------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/kernel2/include/arch/amd64/mm_arch.h b/src/kernel2/include/arch/amd64/mm_arch.h index fe07190..dfb0ed9 100644 --- a/src/kernel2/include/arch/amd64/mm_arch.h +++ b/src/kernel2/include/arch/amd64/mm_arch.h @@ -65,7 +65,7 @@ #define MAPPED_PHYS_MEM_GET(addr) ((vaddr_t) ((uintptr_t)MAPPED_PHYS_MEM_START \ | (uintptr_t)(addr))) -typedef uint64_t mmc_pm_entry_t; +typedef uint64_t mmc_pml4_entry_t; typedef uint64_t mmc_pdpt_entry_t; typedef uint64_t mmc_pd_entry_t; typedef uint64_t mmc_pt_entry_t; diff --git a/src/kernel2/src/arch/amd64/mm/mm_context.c b/src/kernel2/src/arch/amd64/mm/mm_context.c index 1cc175a..e109dbd 100644 --- a/src/kernel2/src/arch/amd64/mm/mm_context.c +++ b/src/kernel2/src/arch/amd64/mm/mm_context.c @@ -66,14 +66,14 @@ void mmc_sync(mmc_context_t* ctx) // TODO ctx und kernel_ctx locken (Philosophenproblem) if(ctx->version < kernel_ctx.version) { - mmc_pm_entry_t* user_pm = MAPPED_PHYS_MEM_GET(ctx->pml4); - mmc_pm_entry_t* kernel_pm = MAPPED_PHYS_MEM_GET(kernel_ctx.pml4); + mmc_pml4_entry_t* user_pm = MAPPED_PHYS_MEM_GET(ctx->pml4); + mmc_pml4_entry_t* kernel_pm = MAPPED_PHYS_MEM_GET(kernel_ctx.pml4); // Kopiere die vom Kernel belegten Page Maps unsigned int kernelStartIndex = PAGE_MAP_INDEX(KERNEL_MEM_START); memcpy(&user_pm[kernelStartIndex], &kernel_pm[kernelStartIndex], - sizeof(mmc_pm_entry_t) * + sizeof(mmc_pml4_entry_t) * NUM_PAGE_MAPS(KERNEL_MEM_END - KERNEL_MEM_START)); @@ -82,7 +82,7 @@ void mmc_sync(mmc_context_t* ctx) PAGE_MAP_INDEX(MAPPED_PHYS_MEM_START & ~ADDRESS_SIGN_EXTEND); memcpy(&user_pm[idMapStartIndex], &kernel_pm[idMapStartIndex], - sizeof(mmc_pm_entry_t) * + sizeof(mmc_pml4_entry_t) * NUM_PAGE_MAPS(-1L - MAPPED_PHYS_MEM_START)); ctx->version = kernel_ctx.version; } @@ -183,12 +183,12 @@ static void free_pd(mmc_pdpt_entry_t pdpt_entry) * Eine Page-Directory-Pointer-Table und alle untergeordneten Strukturen * freigeben. * - * @param pm_entry Page-Map-Eintrag für die freizugebende + * @param pml4_entry Page-Map-Eintrag für die freizugebende * Page-Directory-Pointer-Table */ -static void free_pdpt(mmc_pm_entry_t pm_entry) +static void free_pdpt(mmc_pml4_entry_t pml4_entry) { - mmc_pdpt_entry_t* pdpt = MAPPED_PHYS_MEM_GET(pm_entry & PAGE_MASK); + mmc_pdpt_entry_t* pdpt = MAPPED_PHYS_MEM_GET(pml4_entry & PAGE_MASK); unsigned int i; for(i = 0; i < PAGE_DIR_PTR_TABLE_LENGTH; i++) { @@ -197,7 +197,7 @@ static void free_pdpt(mmc_pm_entry_t pm_entry) } } - pmm_free(pm_entry & PAGE_MASK, 1); + pmm_free(pml4_entry & PAGE_MASK, 1); } /** @@ -207,7 +207,7 @@ static void free_pdpt(mmc_pm_entry_t pm_entry) */ void mmc_destroy(mmc_context_t* context) { - mmc_pm_entry_t* pml4 = MAPPED_PHYS_MEM_GET(context->pml4); + mmc_pml4_entry_t* pml4 = MAPPED_PHYS_MEM_GET(context->pml4); pml4 += PAGE_MAP_INDEX(USER_MEM_START); unsigned int i; @@ -237,15 +237,15 @@ void mmc_activate(mmc_context_t* context) /** * Pointer auf die Pagemap eines Kontexts holen. Der Pointer ist eine virtuelle * Adresse und darf direkt benutzt werden. Wenn er nicht mehr gebraucht wird, - * muss er per pm_free freigegeben werden. + * muss er per pml4_free freigegeben werden. * * @param context Kontext * * @return Die Page Map des Kontexts */ -static mmc_pm_entry_t* pm_get(mmc_context_t context) +static mmc_pml4_entry_t* pml4_get(mmc_context_t context) { - return vmm_kernel_automap(context, PAGE_SIZE); + return vmm_kernel_automap(context.pml4, PAGE_SIZE); } /** @@ -253,17 +253,17 @@ static mmc_pm_entry_t* pm_get(mmc_context_t context) * * @param pm Page Map */ -static void pm_free(mmc_pm_entry_t* pm) +static void pml4_free(mmc_pml4_entry_t* pm) { vmm_kernel_unmap(pm, PAGE_SIZE); } /** * Pointer auf eine Page directory pointer table holen. Weitere Informationen - * bei pm_get. + * bei pml4_get. * * @param pm Pointer auf die Pagemap. Dieser muss gemappt sein. Am besten mit - * pm_get. + * pml4_get. * @param create Wenn true, werden nicht existierende PDPTs erstellt und * gemappt. * @param user Wenn die pdpt erstellt werden muss, bestimmt dieser Parameter ob @@ -272,12 +272,12 @@ static void pm_free(mmc_pm_entry_t* pm) * @return Pointer auf Page directory pointer table, oder NULL wenn sie nicht * existiert, und nicht erstellt werden soll. */ -static mmc_pdpt_entry_t* pdpt_get(mmc_pm_entry_t* pm, +static mmc_pdpt_entry_t* pdpt_get(mmc_pml4_entry_t* pm, size_t index, bool create, bool user) { // Nur praesente PDPTs mappen if ((pm[index] & PAGE_FLAGS_PRESENT) != 0) { - return vmm_kernel_automap((paddr_t) (pm[index] & PAGE_MASK), + return vmm_kernel_automap((paddr_t) (pm[index] & PAGE_MASK), PAGE_SIZE); } else { if (create == true) { @@ -289,7 +289,7 @@ static mmc_pdpt_entry_t* pdpt_get(mmc_pm_entry_t* pm, memset(pdpt, 0, PAGE_SIZE); // Die pdpt wird in der Pagemap eingetragen - pm[index] = (mmc_pm_entry_t) phys | PAGE_FLAGS_PRESENT | + pm[index] = (mmc_pml4_entry_t) phys | PAGE_FLAGS_PRESENT | PAGE_FLAGS_WRITABLE | PAGE_FLAGS_USER; return pdpt; @@ -301,7 +301,7 @@ static mmc_pdpt_entry_t* pdpt_get(mmc_pm_entry_t* pm, } /** - * Siehe pm_free + * Siehe pml4_free */ static void pdpt_free(mmc_pdpt_entry_t* pdpt) { @@ -340,7 +340,7 @@ static mmc_pd_entry_t* pd_get(mmc_pdpt_entry_t* pdpt, size_t index, } /** - * Siehe pm_free + * Siehe pml4_free */ static void pd_free(mmc_pd_entry_t* pd) { @@ -350,12 +350,12 @@ static void pd_free(mmc_pd_entry_t* pd) /** * Siehe pdpt_get */ -static mmc_pt_entry_t* pt_get(mmc_pd_entry_t* pd, size_t index, bool create, +static mmc_pt_entry_t* pt_get(mmc_pd_entry_t* pd, size_t index, bool create, bool user) { // Praesent und keine grosse Page if (((pd[index] & 1) == 1) && ((pd[index] & (1 << 7)) == 0)) { - return vmm_kernel_automap((paddr_t) (pd[index] & PAGE_MASK), + return vmm_kernel_automap((paddr_t) (pd[index] & PAGE_MASK), PAGE_SIZE); } else { if ((create == true) && ((pd[index] & 1) == 0)) { @@ -365,7 +365,7 @@ static mmc_pt_entry_t* pt_get(mmc_pd_entry_t* pd, size_t index, bool create, // Die PT wird sauber mit Null initialisiert => Present-Bit // geloescht. memset(pt, 0, PAGE_SIZE); - + // Die PT wird in der Pagemap eingetragen pd[index] = (mmc_pd_entry_t) phys | PAGE_FLAGS_PRESENT | PAGE_FLAGS_WRITABLE | PAGE_FLAGS_USER; @@ -379,7 +379,7 @@ static mmc_pt_entry_t* pt_get(mmc_pd_entry_t* pd, size_t index, bool create, } /** - * Siehe pm_free + * Siehe pml4_free */ static void pt_free(mmc_pt_entry_t* pt) { @@ -400,7 +400,7 @@ static void pt_free(mmc_pt_entry_t* pt) * * @return PD */ -static mmc_pd_entry_t* pd_get_from_context(mmc_context_t context, +static mmc_pd_entry_t* pd_get_from_context(mmc_context_t context, vaddr_t address, bool create, bool user) { mmc_pd_entry_t* pd = NULL; @@ -408,18 +408,18 @@ static mmc_pd_entry_t* pd_get_from_context(mmc_context_t context, // Die einzelnen Strukturen nacheinander holen. Dabei wird jeweils nur // weiter gefahren, wenn die vorherige geholt werden konnte. - mmc_pm_entry_t* pm = pm_get(context); + mmc_pml4_entry_t* pm = pml4_get(context); if (pm != NULL) { - mmc_pdpt_entry_t* pdpt = pdpt_get(pm, + mmc_pdpt_entry_t* pdpt = pdpt_get(pm, PAGE_MAP_INDEX(int_address), create, user); if (pdpt != NULL) { - pd = pd_get(pdpt, PAGE_DIR_PTR_TABLE_INDEX(int_address), create, + pd = pd_get(pdpt, PAGE_DIR_PTR_TABLE_INDEX(int_address), create, user); pdpt_free(pdpt); } - pm_free(pm); + pml4_free(pm); } return pd; @@ -439,7 +439,7 @@ static mmc_pd_entry_t* pd_get_from_context(mmc_context_t context, * * @return Page Table */ -static mmc_pt_entry_t* pt_get_from_context(mmc_context_t context, +static mmc_pt_entry_t* pt_get_from_context(mmc_context_t context, vaddr_t address, bool create, bool user) { mmc_pt_entry_t* pt = NULL; @@ -447,9 +447,9 @@ static mmc_pt_entry_t* pt_get_from_context(mmc_context_t context, // Die einzelnen Strukturen nacheinander holen. Dabei wird jeweils nur // weiter gefahren, wenn sie auch voranden ist. - mmc_pm_entry_t* pm = pm_get(context); + mmc_pml4_entry_t* pm = pml4_get(context); if (pm != NULL) { - mmc_pdpt_entry_t* pdpt = pdpt_get(pm, + mmc_pdpt_entry_t* pdpt = pdpt_get(pm, PAGE_MAP_INDEX(int_address), create, user); if (pdpt != NULL) { @@ -457,7 +457,7 @@ static mmc_pt_entry_t* pt_get_from_context(mmc_context_t context, int_address) , create, user); if (pd != NULL) { - pt = pt_get(pd, PAGE_DIRECTORY_INDEX(int_address), create, + pt = pt_get(pd, PAGE_DIRECTORY_INDEX(int_address), create, user); pd_free(pd); @@ -465,7 +465,7 @@ static mmc_pt_entry_t* pt_get_from_context(mmc_context_t context, pdpt_free(pdpt); } - pm_free(pm); + pml4_free(pm); } return pt; -- 1.7.11.7 From kevin at tyndur.org Tue Oct 9 18:37:49 2012 From: kevin at tyndur.org (Kevin Wolf) Date: Tue, 9 Oct 2012 18:37:49 +0200 Subject: [tyndur-devel] =?iso-8859-1?q?=5BPATCH_2/4=5D_build=3A_Tempor=E4r?= =?iso-8859-1?q?e_Dateien_geh=F6ren_nach_/tmp?= In-Reply-To: <1349276124-21443-2-git-send-email-m.nemo@gmx.net> References: <1349276124-21443-1-git-send-email-m.nemo@gmx.net> <1349276124-21443-2-git-send-email-m.nemo@gmx.net> Message-ID: <20121009163748.GA10024@silvanus> On Wed, Oct 03, 2012 at 04:55:22PM +0200, Andreas Freimuth wrote: > * build/scripts/image_floppy_grub1: Die Konfigurationsdatei für MTOOLS > wird nur kurz benötigt und dann gleich wieder gelöscht. Also ab damit > nach /tmp > > Signed-off-by: Andreas Freimuth > --- > build/scripts/image_floppy_grub1 | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/build/scripts/image_floppy_grub1 b/build/scripts/image_floppy_grub1 > index 463b117..f4f81a3 100755 > --- a/build/scripts/image_floppy_grub1 > +++ b/build/scripts/image_floppy_grub1 > @@ -45,7 +45,7 @@ export LOST_BUILDMK_ROOT="`pwd`" > source config.sh > > > -export MTOOLSRC=lostmtools.conf > +export MTOOLSRC=/tmp/lostmtools.conf$$ Wäre nicht sowas wie ${TMPDIR:-/tmp} besser? Nicht, dass es irgendjemand auf einem System benutzen würde, auf dem das anders ist (oder funktioniert dieses Skript unter Windows?), aber trotzdem... Kevin From m.nemo at gmx.net Wed Oct 10 10:40:58 2012 From: m.nemo at gmx.net (MNemo) Date: Wed, 10 Oct 2012 10:40:58 +0200 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH_2/4=5D_build=3A_Tempor=C3=A4re_?= =?utf-8?q?Dateien_geh=C3=B6ren_nach_/tmp?= In-Reply-To: <20121009163748.GA10024@silvanus> References: <1349276124-21443-1-git-send-email-m.nemo@gmx.net> <1349276124-21443-2-git-send-email-m.nemo@gmx.net> <20121009163748.GA10024@silvanus> Message-ID: <5075349A.8070904@gmx.net> On 09.10.2012 18:37, Kevin Wolf wrote: > On Wed, Oct 03, 2012 at 04:55:22PM +0200, Andreas Freimuth wrote: >> * build/scripts/image_floppy_grub1: Die Konfigurationsdatei für MTOOLS >> wird nur kurz benötigt und dann gleich wieder gelöscht. Also ab damit >> nach /tmp >> >> Signed-off-by: Andreas Freimuth >> --- >> build/scripts/image_floppy_grub1 | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/build/scripts/image_floppy_grub1 b/build/scripts/image_floppy_grub1 >> index 463b117..f4f81a3 100755 >> --- a/build/scripts/image_floppy_grub1 >> +++ b/build/scripts/image_floppy_grub1 >> @@ -45,7 +45,7 @@ export LOST_BUILDMK_ROOT="`pwd`" >> source config.sh >> >> >> -export MTOOLSRC=lostmtools.conf >> +export MTOOLSRC=/tmp/lostmtools.conf$$ > > Wäre nicht sowas wie ${TMPDIR:-/tmp} besser? Nicht, dass es irgendjemand > auf einem System benutzen würde, auf dem das anders ist (oder > funktioniert dieses Skript unter Windows?), aber trotzdem... Ja? das sieht Sinnvoll aus. Ich habe glaube ich auch zu erst mit TMPDIR probiert aber das ist bei mir nicht gesetzt, und den Syntax ${var:-default} kannte ich noch nicht. > > Kevin > _______________________________________________ > tyndur-devel mailing list > tyndur-devel at tyndur.org > http://list.tyndur.org/mailman/listinfo/tyndur-devel > From arne.hasselbring at googlemail.com Wed Oct 10 20:50:47 2012 From: arne.hasselbring at googlemail.com (Arne Hasselbring) Date: Wed, 10 Oct 2012 20:50:47 +0200 Subject: [tyndur-devel] [PATCH] HD-Images mit Syslinux Message-ID: <1349895047-21995-1-git-send-email-arne.hasselbring@googlemail.com> + Festplattenimages können auch mit Syslinux (bzw. Extlinux) statt mit GRUB erstellt werden. Signed-off-by: Arne Hasselbring --- Makefile | 6 +-- build/config/syslinux_hd.cfg | 19 +++++++ build/scripts/image_hd_syslinux | 113 ++++++++++++++++++++++++++++++++++++++++ buildmk.sh | 9 +++- config.sh | 1 + 5 files changed, 143 insertions(+), 5 deletions(-) create mode 100644 build/config/syslinux_hd.cfg create mode 100755 build/scripts/image_hd_syslinux diff --git a/Makefile b/Makefile index 474b7c3..96a6b24 100644 --- a/Makefile +++ b/Makefile @@ -65,13 +65,13 @@ updateroot: subdirs build/scripts/updateroot image-floppy: updateroot - build/scripts/image_floppy_$(GRUB_VERSION) + build/scripts/image_floppy_$(BOOTLOADER) image-hd: updateroot - build/scripts/image_hd_$(GRUB_VERSION) + build/scripts/image_hd_$(BOOTLOADER) image-cdrom: updateroot - build/scripts/image_cdrom_$(GRUB_VERSION) + build/scripts/image_cdrom_$(BOOTLOADER) test-qemu-floppy: image-floppy $(QEMU) -serial stdio -fda build/images/floppy.img -boot a -net user -net nic,model=rtl8139 | tee qemu-serial.log diff --git a/build/config/syslinux_hd.cfg b/build/config/syslinux_hd.cfg new file mode 100644 index 0000000..9fcefb6 --- /dev/null +++ b/build/config/syslinux_hd.cfg @@ -0,0 +1,19 @@ +DEFAULT tyndurde +PROMPT 0 +UI menu.c32 +MENU TITLE Tyndur 0.3.0 +MENU COLOR screen 37;40 #ffffff #000000 std +MENU COLOR border 37;40 #ffffff #000000 std +MENU COLOR title 37;40 #ffffff #000000 std +MENU COLOR unsel 37;40 #ffffff #000000 std +MENU COLOR sel 30;47 #000000 #ffffff std +MENU COLOR tabmsg 37;40 #000000 #ffffff std + +LABEL tyndurde +MENU LABEL Tyndur (Deutsch) +KERNEL mboot.c32 +APPEND /boot/tyndur2 debug=s --- /modules/init boot=file:/ --- /modules/pci --- /modules/ata --- /modules/ext2 --- /modules/console servmgr:/term servmgr:/term --- /modules/servmgr ata:/ata00_p0|ext2:/ vterm:/vterm8/out ata ext2 console pci +LABEL tynduren +MENU LABEL Tyndur (English) +KERNEL mboot.c32 +APPEND /boot/tyndur2 debug=s --- /modules/init boot=file:/ env.LANG=en --- /modules/pci --- /modules/ata --- /modules/ext2 --- /modules/console servmgr:/term servmgr:/term --- /modules/servmgr ata:/ata00_p0|ext2:/ vterm:/vterm8/out ata ext2 console pci diff --git a/build/scripts/image_hd_syslinux b/build/scripts/image_hd_syslinux new file mode 100755 index 0000000..a487920 --- /dev/null +++ b/build/scripts/image_hd_syslinux @@ -0,0 +1,113 @@ +#!/bin/bash + +# Copyright (c) 2012 The tyndur Project. All rights reserved. +# +# This code is derived from software contributed to the tyndur Project +# by Arne Hasselbring. +# +# 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. +# 3. All advertising materials mentioning features or use of this software +# must display the following acknowledgement: +# This product includes software developed by the tyndur Project +# and its contributors. +# 4. Neither the name of the tyndur Project nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# 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. + +ROOT=build/root +ROOT_COMMON=build/root-common +ROOT_HD=build/root-hd +ROOT_LOCAL=build/root-local +MOUNT=build/mnt +SUDO=sudo + +export PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin + +export LOST_BUILDMK_ROOT="`pwd`" +source build/config/image_hd.sh +source config.sh + +die() +{ + echo $1 + exit -1 +} + +# Wenn das Image neu erstellt werden muss, kommen noch ein paar schritte mehr +# dazu. +NEW=0 +if ! [ -f $IMAGE_PATH ]; then + # Leeres Image erstellen und formatieren + dd of=$IMAGE_PATH bs=$((1024 * 1024)) seek=$IMAGE_SIZE count=0 + build/scripts/create_partition $IMAGE_PATH + NEW=1 +fi + + +# Start und Ende der Partition einlesen +PARTITIONS="`build/scripts/get_partition $IMAGE_PATH`" +PART_START=`echo $PARTITIONS | awk '{print $1}'` +PART_SIZE=`echo $PARTITIONS | awk '{print $2}'` + +if [ $NEW -ne 0 ]; then + LOOP_DEV=`$SUDO losetup -f $IMAGE_PATH --sizelimit $(($PART_SIZE * 512)) -o $(($PART_START * 512)) --show` + if [ $? -ne 0 ]; then + die "Loop Device konnte nicht angelegt werden" + fi + + # Dateisystem erstellen + $SUDO $LOST_TOOLS_MKE2FS -T ext2 -F -q $LOOP_DEV || die "Dateisystem konnte nicht erstellt werden" + + $SUDO losetup -d $LOOP_DEV +fi + +# Partition mounten +mkdir -p $MOUNT +$SUDO mount $IMAGE_PATH $MOUNT -t ext2 -o loop,offset=$((${PART_START} * 512)) +$SUDO chmod 777 -Rf $MOUNT + +# Daten Kopieren +cp -rP --preserve=links,timestamps $ROOT/* $ROOT_COMMON/* $ROOT_HD/* $MOUNT/ +[ -d $ROOT_LOCAL ] && cp -rP --preserve=links,timestamps $ROOT_LOCAL/* $MOUNT/ + +# Syslinux-Konfiguration kopieren +mkdir -p $MOUNT/boot/syslinux +rm -f $MOUNT/boot/syslinux/syslinux.cfg +cat build/config/syslinux_hd.cfg >> $MOUNT/boot/syslinux/syslinux.cfg + + +# Syslinux installieren und Dateien kopieren +if [ $NEW -ne 0 ]; then + $SUDO extlinux --install $MOUNT/boot/syslinux + cp $LOST_SYSLINUX_DIR/mboot.c32 $MOUNT/boot/syslinux + cp $LOST_SYSLINUX_DIR/menu.c32 $MOUNT/boot/syslinux +fi + +# Partition unmounten und loopback-Device freigeben +while fuser -m $MOUNT; do true; done +$SUDO umount $MOUNT +rmdir $MOUNT + +# MBR installieren +if [ $NEW -ne 0 ]; then + printf '\1' | cat $LOST_SYSLINUX_DIR/altmbr.bin - | dd bs=440 count=1 conv=notrunc iflag=fullblock of=$IMAGE_PATH +fi diff --git a/buildmk.sh b/buildmk.sh index 083ea21..abbd359 100644 --- a/buildmk.sh +++ b/buildmk.sh @@ -95,9 +95,14 @@ EOF # Ist grub legacy installiert? if [ -f $LOST_GRUB_STAGESDIR/stage1 ]; then - echo GRUB_VERSION=grub1 >> Makefile.local + echo BOOTLOADER=grub1 >> Makefile.local + elif [ -d $LOST_GRUB2_MODULESDIR ]; then + echo BOOTLOADER=grub2 >> Makefile.local + elif [ -d $LOST_SYSLINUX_DIR ]; then + echo BOOTLOADER=syslinux >> Makefile.local else - echo GRUB_VERSION=grub2 >> Makefile.local + echo "Kein passender Bootloader gefunden" + exit -1 fi for dir in doc src; do diff --git a/config.sh b/config.sh index 8693bcb..e102b4d 100644 --- a/config.sh +++ b/config.sh @@ -4,6 +4,7 @@ COMPILER_PREFIX_I386= LOST_TOOLS_PPC=$LOST_BUILDMK_ROOT/lbuilds/env/bin/fpc LOST_GRUB_STAGESDIR=/boot/grub LOST_GRUB2_MODULESDIR=/usr/lib/grub/i386-pc +LOST_SYSLINUX_DIR=/usr/lib/syslinux LOST_TOOLS_GRUB=grub LOST_TOOLS_MKE2FS=/sbin/mke2fs LOST_TOOLS_QEMU=qemu -- 1.7.12.2 From kevin at tyndur.org Wed Oct 10 23:24:46 2012 From: kevin at tyndur.org (Kevin Wolf) Date: Wed, 10 Oct 2012 23:24:46 +0200 Subject: [tyndur-devel] [PATCH] HD-Images mit Syslinux In-Reply-To: <1349895047-21995-1-git-send-email-arne.hasselbring@googlemail.com> References: <1349895047-21995-1-git-send-email-arne.hasselbring@googlemail.com> Message-ID: <20121010212445.GA6295@silvanus> On Wed, Oct 10, 2012 at 08:50:47PM +0200, Arne Hasselbring wrote: > + Festplattenimages können auch mit Syslinux (bzw. Extlinux) statt mit > GRUB erstellt werden. > > Signed-off-by: Arne Hasselbring Danke! Ist jetzt drin. Ich hab das aber noch angepasst, weil neuere syslinux-Versionen /usr/share/syslinux benutzen (also angepasst heißt einen Check eingebaut, nicht bedingungslos ersetzt). Kevin From kevin at tyndur.org Wed Oct 10 23:25:42 2012 From: kevin at tyndur.org (Kevin Wolf) Date: Wed, 10 Oct 2012 23:25:42 +0200 Subject: [tyndur-devel] =?iso-8859-1?q?=5BPATCH_2/4=5D_build=3A_Tempor=E4r?= =?iso-8859-1?q?e_Dateien_geh=F6ren_nach_/tmp?= In-Reply-To: <5075349A.8070904@gmx.net> References: <1349276124-21443-1-git-send-email-m.nemo@gmx.net> <1349276124-21443-2-git-send-email-m.nemo@gmx.net> <20121009163748.GA10024@silvanus> <5075349A.8070904@gmx.net> Message-ID: <20121010212542.GB6295@silvanus> On Wed, Oct 10, 2012 at 10:40:58AM +0200, MNemo wrote: > On 09.10.2012 18:37, Kevin Wolf wrote: > > On Wed, Oct 03, 2012 at 04:55:22PM +0200, Andreas Freimuth wrote: > >> * build/scripts/image_floppy_grub1: Die Konfigurationsdatei für MTOOLS > >> wird nur kurz benötigt und dann gleich wieder gelöscht. Also ab damit > >> nach /tmp > >> > >> Signed-off-by: Andreas Freimuth > >> --- > >> build/scripts/image_floppy_grub1 | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > >> > >> diff --git a/build/scripts/image_floppy_grub1 b/build/scripts/image_floppy_grub1 > >> index 463b117..f4f81a3 100755 > >> --- a/build/scripts/image_floppy_grub1 > >> +++ b/build/scripts/image_floppy_grub1 > >> @@ -45,7 +45,7 @@ export LOST_BUILDMK_ROOT="`pwd`" > >> source config.sh > >> > >> > >> -export MTOOLSRC=lostmtools.conf > >> +export MTOOLSRC=/tmp/lostmtools.conf$$ > > > > Wäre nicht sowas wie ${TMPDIR:-/tmp} besser? Nicht, dass es irgendjemand > > auf einem System benutzen würde, auf dem das anders ist (oder > > funktioniert dieses Skript unter Windows?), aber trotzdem... > Ja? das sieht Sinnvoll aus. Ich habe glaube ich auch zu erst mit TMPDIR > probiert aber das ist bei mir nicht gesetzt, und den Syntax > ${var:-default} kannte ich noch nicht. Hab das mal eingebaut und gepusht. Ich glaube, damit müssten jetzt alle deine Patches drin sein. Du kannst ja mal rebasen, dass du siehst, ob noch was fehlt. Kevin From m.nemo at gmx.net Thu Oct 11 11:01:32 2012 From: m.nemo at gmx.net (MNemo) Date: Thu, 11 Oct 2012 11:01:32 +0200 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH_2/4=5D_build=3A_Tempor=C3=A4re_?= =?utf-8?q?Dateien_geh=C3=B6ren_nach_/tmp?= In-Reply-To: <20121010212542.GB6295@silvanus> References: <1349276124-21443-1-git-send-email-m.nemo@gmx.net> <1349276124-21443-2-git-send-email-m.nemo@gmx.net> <20121009163748.GA10024@silvanus> <5075349A.8070904@gmx.net> <20121010212542.GB6295@silvanus> Message-ID: <50768AEC.9060108@gmx.net> On 10.10.2012 23:25, Kevin Wolf wrote: > On Wed, Oct 10, 2012 at 10:40:58AM +0200, MNemo wrote: >> On 09.10.2012 18:37, Kevin Wolf wrote: >>> On Wed, Oct 03, 2012 at 04:55:22PM +0200, Andreas Freimuth wrote: >>>> * build/scripts/image_floppy_grub1: Die Konfigurationsdatei für MTOOLS >>>> wird nur kurz benötigt und dann gleich wieder gelöscht. Also ab damit >>>> nach /tmp >>>> >>>> Signed-off-by: Andreas Freimuth >>>> --- >>>> build/scripts/image_floppy_grub1 | 2 +- >>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>>> >>>> diff --git a/build/scripts/image_floppy_grub1 b/build/scripts/image_floppy_grub1 >>>> index 463b117..f4f81a3 100755 >>>> --- a/build/scripts/image_floppy_grub1 >>>> +++ b/build/scripts/image_floppy_grub1 >>>> @@ -45,7 +45,7 @@ export LOST_BUILDMK_ROOT="`pwd`" >>>> source config.sh >>>> >>>> >>>> -export MTOOLSRC=lostmtools.conf >>>> +export MTOOLSRC=/tmp/lostmtools.conf$$ >>> >>> Wäre nicht sowas wie ${TMPDIR:-/tmp} besser? Nicht, dass es irgendjemand >>> auf einem System benutzen würde, auf dem das anders ist (oder >>> funktioniert dieses Skript unter Windows?), aber trotzdem... >> Ja? das sieht Sinnvoll aus. Ich habe glaube ich auch zu erst mit TMPDIR >> probiert aber das ist bei mir nicht gesetzt, und den Syntax >> ${var:-default} kannte ich noch nicht. > > Hab das mal eingebaut und gepusht. Ich glaube, damit müssten jetzt alle > deine Patches drin sein. Du kannst ja mal rebasen, dass du siehst, ob > noch was fehlt. Jo. Hast alles erwischt. Danke. > > Kevin > _______________________________________________ > tyndur-devel mailing list > tyndur-devel at tyndur.org > http://list.tyndur.org/mailman/listinfo/tyndur-devel >