Browse Source

ToaruOS-NIH => ToaruOS

K. Lange 2 years ago
parent
commit
655e829112
8 changed files with 30 additions and 36 deletions
  1. 1 1
      Makefile
  2. 16 22
      README.md
  3. 2 2
      apps/about.c
  4. 3 3
      apps/font-server.c
  5. 1 1
      boot/README.md
  6. 1 1
      boot/cstuff.c
  7. 3 3
      kernel/sys/version.c
  8. 3 3
      util/netinit.c

+ 1 - 1
Makefile

@@ -334,7 +334,7 @@ efi64: image.iso
 	  -bios /usr/share/qemu/OVMF.fd
 
 
-VMNAME=ToaruOS-NIH CD
+VMNAME=ToaruOS CD
 
 define virtualbox-runner =
 .PHONY: $1

File diff suppressed because it is too large
+ 16 - 22
README.md


+ 2 - 2
apps/about.c

@@ -75,7 +75,7 @@ static void redraw(void) {
 }
 
 static void init_default(void) {
-	title_str = "About ToaruOS-NIH";
+	title_str = "About ToaruOS";
 	icon_path = "/usr/share/logo_login.bmp";
 
 	{
@@ -86,7 +86,7 @@ static void init_default(void) {
 		if (tmp) {
 			*tmp = '\0';
 		}
-		sprintf(version_str, "ToaruOS-NIH %s", u.release);
+		sprintf(version_str, "ToaruOS %s", u.release);
 	}
 
 	copyright_str[0] = "(C) 2011-2018 K. Lange, et al.";

+ 3 - 3
apps/font-server.c

@@ -6,9 +6,9 @@
  * font-server - Provides shared-memory fonts.
  *
  * This is an implementation of the shared memory font server
- * from Yutani in mainline ToaruOS. In theory, with the fonts
- * installed, this could be used to provide fonts for legacy
- * mainline applications in ToaruOS-NIH, but this is untested.
+ * from Yutani in ToaruOS 1.2.x. It allows applications to
+ * make use of the Freetype font rendering backend by providing
+ * a common set of font files.
  */
 #include <stdio.h>
 #include <stdlib.h>

+ 1 - 1
boot/README.md

@@ -1,4 +1,4 @@
-# ToaruOS-NIH Bootloader
+# ToaruOS Bootloader
 
 This is a simple, limited BIOS and EFI bootloader for ToaruOS kernels.
 

+ 1 - 1
boot/cstuff.c

@@ -19,7 +19,7 @@ EFI_HANDLE ImageHandleIn;
 #include "options.h"
 
 /* Basic text strings */
-#define BASE_VERSION "ToaruOS-NIH Bootloader v2.1"
+#define BASE_VERSION "ToaruOS Bootloader v2.1"
 #ifdef EFI_PLATFORM
 #  if defined(__x86_64__)
 #    define VERSION_TEXT BASE_VERSION " (EFI, X64)"

+ 3 - 3
kernel/sys/version.c

@@ -17,8 +17,8 @@ char * __kernel_version_format = "%d.%d.%d-%s";
 
 /* Version numbers X.Y.Z */
 int    __kernel_version_major = 1;
-int    __kernel_version_minor = 5;
-int    __kernel_version_lower = 3;
+int    __kernel_version_minor = 6;
+int    __kernel_version_lower = 0;
 
 /* Kernel build suffix, which doesn't necessarily
  * mean anything, but can be used to distinguish
@@ -34,7 +34,7 @@ int    __kernel_version_lower = 3;
 char * __kernel_version_suffix   = KERNEL_VERSION_SUFFIX;
 
 /* The release codename. */
-char * __kernel_version_codename = "nih";
+char * __kernel_version_codename = "core";
 
 /* Build architecture (should probably not be
  * here as a string, but rather some sort of

+ 3 - 3
util/netinit.c

@@ -462,10 +462,10 @@ int main(int argc, char * argv[]) {
 		signal(SIGWINEVENT, update_video);
 	}
 
-	TRACE("\n\nToaruOS-NIH Netinit Host\n\n");
+	TRACE("\n\nToaruOS Netinit Host\n\n");
 
-	TRACE("ToaruOS-NIH is free software under the NCSA / University of Illinois license.\n");
-	TRACE("   https://toaruos.org/   https://git.toaruos.org/klange/toaru-nih\n\n");
+	TRACE("ToaruOS is free software under the NCSA / University of Illinois license.\n");
+	TRACE("   https://toaruos.org/   https://git.toaruos.org/klange/toaruos\n\n");
 
 	struct utsname u;
 	uname(&u);