summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAmlal El Mahrouss <amlal@nekernel.org>2026-03-23 01:11:36 +0100
committerAmlal El Mahrouss <amlal@nekernel.org>2026-03-23 01:11:36 +0100
commit6a8d1d5fb1a685d9eba93d100af673053ab68860 (patch)
tree9208011acc6f7453e52e2e9eb59970b0f9a10641
parent5c15e4939723513bab37bfca01ad879b6e353808 (diff)
[FEAT] Improved installation flow and X11 library.
Signed-off-by: Amlal El Mahrouss <amlal@nekernel.org>
-rw-r--r--README.md2
-rw-r--r--frameworks/libThread.fwrk/headers/Config.h11
-rw-r--r--frameworks/libThread.fwrk/src/ThreadMgr.cpp2
-rw-r--r--frameworks/libX11.fwrk/headers/Config.h18
-rw-r--r--frameworks/libX11.fwrk/src/.gitkeep0
-rw-r--r--frameworks/libX11.fwrk/src/X11ConnMgr.cpp34
-rw-r--r--include/.keep0
-rw-r--r--install.sh7
-rw-r--r--tools/kmnt.py6
-rw-r--r--updater/__init__.py8
-rwxr-xr-xupdater/updater.py21
11 files changed, 65 insertions, 44 deletions
diff --git a/README.md b/README.md
index b2cffe4..6f32352 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ There is three main reasons for this repository's existence:
- Easier path resolutions based on a virtual root path, i.e (../kernel -> /src/kernel)
- Easier cycles and vetting for Ne.org releases.
-## The Package Registry:
+## Packages:
We have a package registry for the NeSystem: [https://github.com/ne-ci-org/ports](https://github.com/ne-ci-org/ports) package porting happens here.
diff --git a/frameworks/libThread.fwrk/headers/Config.h b/frameworks/libThread.fwrk/headers/Config.h
new file mode 100644
index 0000000..c6734a4
--- /dev/null
+++ b/frameworks/libThread.fwrk/headers/Config.h
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2026, Amlal El Mahrouss (amlal@nekernel.org)
+// Licensed under the Apache License, Version 2.0 (see LICENSE file)
+// Official repository: https://github.com/ne-foss-org/ne_system
+
+#ifndef LIBTHREAD_FOUNDATION_H
+#define LIBTHREAD_FOUNDATION_H
+
+#include <libSystem/SystemKit/System.h>
+
+#endif // LIBTHREAD_FOUNDATION_H
diff --git a/frameworks/libThread.fwrk/src/ThreadMgr.cpp b/frameworks/libThread.fwrk/src/ThreadMgr.cpp
index f01bbfe..7361f86 100644
--- a/frameworks/libThread.fwrk/src/ThreadMgr.cpp
+++ b/frameworks/libThread.fwrk/src/ThreadMgr.cpp
@@ -3,7 +3,7 @@
// Licensed under the Apache License, Version 2.0 (see LICENSE file)
// Official repository: https://github.com/ne-foss-org/ne_system
-#include <libSystem/SystemKit/System.h>
+#include <libThread.fwrk/headers/Config.h>
#define kThreadMapMax (1024UL)
#define kThreadBaseHash (0x5555ffff6ULL)
diff --git a/frameworks/libX11.fwrk/headers/Config.h b/frameworks/libX11.fwrk/headers/Config.h
index f311fdb..7466eaf 100644
--- a/frameworks/libX11.fwrk/headers/Config.h
+++ b/frameworks/libX11.fwrk/headers/Config.h
@@ -6,6 +6,24 @@
#ifndef X11_FOUNDATION_H
#define X11_FOUNDATION_H
+#include <libSystem/SystemKit/System.h>
+#define _X11_ARRAY_CHECK(PTR) PTR != nullptr
+#define _X11_ARRAY_INDEX(ARR, PTR, LEN) ARR[((SInt64) PTR) % LEN]
+
+namespace X11 {
+
+/// @brief Plain Old Data type for a X11 connection.
+struct X11Connection final {
+ SInt32 fSocket;
+ SInt32 fType;
+ SInt32 fFlags;
+ SInt32 fPad;
+};
+
+typedef X11Connection* X11ConnectionPtr;
+typedef X11ConnectionPtr* X11ConnectionArray;
+
+} // namespace X11
#endif
diff --git a/frameworks/libX11.fwrk/src/.gitkeep b/frameworks/libX11.fwrk/src/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/frameworks/libX11.fwrk/src/.gitkeep
+++ /dev/null
diff --git a/frameworks/libX11.fwrk/src/X11ConnMgr.cpp b/frameworks/libX11.fwrk/src/X11ConnMgr.cpp
index 7477a19..61752f1 100644
--- a/frameworks/libX11.fwrk/src/X11ConnMgr.cpp
+++ b/frameworks/libX11.fwrk/src/X11ConnMgr.cpp
@@ -3,36 +3,26 @@
// Licensed under the Apache License, Version 2.0 (see LICENSE file)
// Official repository: https://github.com/ne-foss-org/ne_system
-#include <libSystem/SystemKit/System.h>
#include <libX11.fwrk/headers/Config.h>
-#define X11_ARRAY_CHECK(PTR) PTR != nullptr
-#define X11_ARRAY_INDEX(ARR, PTR, LEN) ARR[((SInt64) PTR) % LEN]
-
namespace X11 {
-struct X11Connection final {
- SInt32 fSocket;
- SInt32 fType;
- SInt32 fFlags;
- SInt32 fPad;
-};
+namespace Detail {
-typedef X11Connection* X11ConnectionPtr;
-typedef X11ConnectionPtr* X11ConnectionArray;
+ static X11ConnectionPtr X11MakeConnection() {
+ auto ptr = new X11Connection{};
+ if (!ptr) return nullptr;
-static X11ConnectionPtr X11MakeConnection() {
- auto ptr = new X11Connection{};
- if (!ptr) return nullptr;
+ return ptr;
+ }
- return ptr;
-}
+ static Void X11DeleteConnection(X11ConnectionPtr ptr) {
+ if (!ptr) return;
-static Void X11DeleteConnection(X11ConnectionPtr ptr) {
- if (!ptr) return;
+ delete ptr;
+ ptr = nullptr;
+ }
- delete ptr;
- ptr = nullptr;
-}
+} // namespace Detail
} // namespace X11 \ No newline at end of file
diff --git a/include/.keep b/include/.keep
deleted file mode 100644
index e69de29..0000000
--- a/include/.keep
+++ /dev/null
diff --git a/install.sh b/install.sh
index a3e1686..ad94899 100644
--- a/install.sh
+++ b/install.sh
@@ -7,8 +7,9 @@ PROFILE=debug
git clone --recurse-submodules -j8 git@github.com:ne-foss-org/ne-system.git
cd ne-system
+export UPDATER_NO_COMMIT=1
./updater.sh
-./run-$(PROFILE)-$(ARCH).sh
-
-
+./scripts/setup_x64_project.sh
+./scripts/modules_ahci_x64.sh
+./scripts/debug_ahci_x64.sh
diff --git a/tools/kmnt.py b/tools/kmnt.py
deleted file mode 100644
index 7180a0a..0000000
--- a/tools/kmnt.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import sys
-
-if __name__ == "__main__":
- sys.exit(0)
diff --git a/updater/__init__.py b/updater/__init__.py
index 4ca30c3..721a864 100644
--- a/updater/__init__.py
+++ b/updater/__init__.py
@@ -1,10 +1,16 @@
+# Copyright 2026, Amlal El Mahrouss and Ne.org contributors.
+# NeSystem is licensed under Apache-2.0.
+# SPDX-Identifier: Apache-2.0
+
+# -*- coding: utf-8 -*-
+
import updater
def start_updater():
try:
print("Updating system...")
updater.start()
- except Error:
+ except TypeError:
print("Updater failed, sorry!")
diff --git a/updater/updater.py b/updater/updater.py
index f6a19e4..224325e 100755
--- a/updater/updater.py
+++ b/updater/updater.py
@@ -2,22 +2,23 @@
# NeSystem is licensed under Apache-2.0.
# SPDX-Identifier: Apache-2.0
-from os import system
+# -*- coding: utf-8 -*-
+
+import os
class UpdateFunctor:
def __init__(self):
- system("cd src && cd kernel && git pull && cd ..")
- system("cd src && cd nectar && git pull && cd ..")
- system("cd src && cd build && git pull && cd ..")
- system("cd src && cd boot && git pull && cd ..")
- system("cd papers && git pull")
- system("git add src/kernel src/nectar papers src/build src/boot")
- system("git commit -s -S")
+ os.system("cd src && cd kernel && git pull && cd ..")
+ os.system("cd src && cd nectar && git pull && cd ..")
+ os.system("cd src && cd build && git pull && cd ..")
+ os.system("cd src && cd boot && git pull && cd ..")
+ os.system("cd papers && git pull")
+ os.system("git add src/kernel src/nectar papers src/build src/boot")
+ if (os.environ.get('UPDATER_NO_COMMIT', False) == False):
+ os.system("git commit -s -S")
def start():
functor = UpdateFunctor()
print("INFO: Updater: Functor called")
-
-