sys_read_link: stub

Signed-off-by: Andy-Python-Programmer <[email protected]>

Author: Andy-Python-Programmer

bootstrap.yml

@@ -97,17 +97,17 @@ sources:
   # Rust patched crates end
   # ---------------------------------------------------------------------------
 
-  # - name: python
-  #   subdir: 'bundled'
-  #   patch-path-strip: 1
-  #   git: 'https://github.com/python/cpython.git'
-  #   tag: 'v3.8.2'
-  #   version: '3.8.2'
-  #   tools_required:
-  #     - host-autoconf-v2.69
-  #     - host-automake-v1.16
-  #   regenerate:
-  #     - args: ['autoreconf', '-f', '-i']
+  - name: python
+    subdir: 'bundled'
+    patch-path-strip: 1
+    git: 'https://github.com/python/cpython.git'
+    tag: 'v3.8.2'
+    version: '3.8.2'
+    tools_required:
+      - host-autoconf-v2.69
+      - host-automake-v1.16
+    regenerate:
+      - args: ['autoreconf', '-f', '-i']
 
 tools:
   - name: host-autoconf-v2.69
@@ -211,16 +211,16 @@ tools:
         - '--root'
         - '@PREFIX@'
 
-  # - name: host-python
-  #   from_source: python
-  #   configure:
-  #     - args:
-  #       - '@THIS_SOURCE_DIR@/configure'
-  #       - '--prefix=@PREFIX@'
-  #   compile:
-  #     - args: ['make', '-j@PARALLELISM@']
-  #   install:
-  #     - args: ['make', 'install']
+  - name: host-python
+    from_source: python
+    configure:
+      - args:
+        - '@THIS_SOURCE_DIR@/configure'
+        - '--prefix=@PREFIX@'
+    compile:
+      - args: ['make', '-j@PARALLELISM@']
+    install:
+      - args: ['make', 'install']
 
   - name: host-binutils
     from_source: binutils
@@ -618,34 +618,34 @@ packages:
         environ:
           DESTDIR: '@THIS_COLLECT_DIR@'
 
-  # - name: python
-  #   from_source: python
-  #   tools_required:
-  #     - host-gcc
-  #     - host-python
-  #   pkgs_required:
-  #     - mlibc
-  #   configure:
-  #     - args:
-  #       - '@THIS_SOURCE_DIR@/configure'
-  #       - '--host=x86_64-aero'
-  #       - '--build=x86_64-linux-gnu'
-  #       - '--prefix=/usr'
-  #       - '--enable-shared'
-  #       - '--with-sysroot=@SYSROOT_DIR@' # Set libtool's lt_sysroot.
-  #       - '--with-system-ffi'
-  #       - '--with-system-expat'
-  #       - '--disable-ipv6'
-  #       - '--without-ensurepip'
-  #       environ:
-  #         CONFIG_SITE: '@SOURCE_ROOT@/extra-files/python/python-config-site'
-  #         PKG_CONFIG_SYSROOT_DIR: '@BUILD_ROOT@/system-root'
-  #         PKG_CONFIG_LIBDIR: '@BUILD_ROOT@/system-root/usr/lib/pkgconfig:@BUILD_ROOT@/system-root/usr/share/pkgconfig'
-  #   build:
-  #     - args: ['make', '-j@PARALLELISM@']
-  #     - args: ['make', 'install']
-  #       environ:
-  #         DESTDIR: '@THIS_COLLECT_DIR@'
+  - name: python
+    from_source: python
+    tools_required:
+      - host-gcc
+      - host-python
+    pkgs_required:
+      - mlibc
+    configure:
+      - args:
+        - '@THIS_SOURCE_DIR@/configure'
+        - '--host=x86_64-aero'
+        - '--build=x86_64-linux-gnu'
+        - '--prefix=/usr'
+        - '--enable-shared'
+        - '--with-sysroot=@SYSROOT_DIR@' # Set libtool's lt_sysroot.
+        - '--with-system-ffi'
+        - '--with-system-expat'
+        - '--disable-ipv6'
+        - '--without-ensurepip'
+        environ:
+          CONFIG_SITE: '@SOURCE_ROOT@/extra-files/python/python-config-site'
+          PKG_CONFIG_SYSROOT_DIR: '@BUILD_ROOT@/system-root'
+          PKG_CONFIG_LIBDIR: '@BUILD_ROOT@/system-root/usr/lib/pkgconfig:@BUILD_ROOT@/system-root/usr/share/pkgconfig'
+    build:
+      - args: ['make', '-j@PARALLELISM@']
+      - args: ['make', 'install']
+        environ:
+          DESTDIR: '@THIS_COLLECT_DIR@'
 
   - name: doomgeneric
     source:

patches/mlibc/mlibc.patch

@@ -1,33 +1,29 @@
-From 4642a80de4f0c967d553e020347cf042d367c381 Mon Sep 17 00:00:00 2001
+From 9c5cf9aa5c8997984bdfb1f5973b5061755d5454 Mon Sep 17 00:00:00 2001
 From: Andy-Python-Programmer <[email protected]>
 Date: Thu, 10 Feb 2022 19:12:25 +1100
 Subject: [PATCH] yes
 
 Signed-off-by: Andy-Python-Programmer <[email protected]>
 ---
- .gitignore                          |  7 ++++++
- sysdeps/aero/generic/filesystem.cpp | 34 +++++++++++++++++++++++------
- sysdeps/aero/generic/signals.cpp    |  8 +++++--
- sysdeps/aero/include/aero/syscall.h |  6 +++++
- 4 files changed, 46 insertions(+), 9 deletions(-)
+ .gitignore                          |  3 ++
+ sysdeps/aero/generic/filesystem.cpp | 46 ++++++++++++++++++++++++-----
+ sysdeps/aero/generic/signals.cpp    |  8 +++--
+ sysdeps/aero/include/aero/syscall.h |  7 +++++
+ 4 files changed, 54 insertions(+), 10 deletions(-)
 
 diff --git a/.gitignore b/.gitignore
-index dbb35e8b..384b3395 100644
+index dbb35e8b..20c8d4c3 100644
 --- a/.gitignore
 +++ b/.gitignore
-@@ -8,3 +8,10 @@ subprojects/cxxshim
+@@ -8,3 +8,6 @@ subprojects/cxxshim
  subprojects/frigg
  .vscode
  .clang-format
 +
-+# clangd files
-+# 
-+# * The compile commands json is usually generated by the build system
-+# if not, it can be constructed manually and should be in the root of
-+# of the project directory.
-+compile_commands.json
++# clangd cache
++.cache
 diff --git a/sysdeps/aero/generic/filesystem.cpp b/sysdeps/aero/generic/filesystem.cpp
-index 6a13f19c..69833ae5 100644
+index 6a13f19c..53223dc6 100644
 --- a/sysdeps/aero/generic/filesystem.cpp
 +++ b/sysdeps/aero/generic/filesystem.cpp
 @@ -1,3 +1,4 @@
@@ -82,7 +78,26 @@ index 6a13f19c..69833ae5 100644
      };
 
      // The reclen is the size of the dirent struct, plus the size of the name.
-@@ -252,7 +273,6 @@ int sys_pselect(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
+@@ -214,7 +235,17 @@ int sys_open_dir(const char *path, int *handle) {
+ }
+ 
+ int sys_rename(const char *path, const char *new_path) UNIMPLEMENTED("sys_rename")
+-int sys_readlink(const char *path, void *buffer, size_t max_size, ssize_t *length) UNIMPLEMENTED("sys_readlink")
++
++int sys_readlink(const char *path, void *buffer, size_t max_size, ssize_t *length) {
++    auto result = syscall(SYS_READ_LINK, path, strlen(path), buffer, max_size);
++
++    if (result < 0) {
++        return -result;
++    }
++
++    *length = result;
++    return 0;
++}
+ 
+ int sys_dup(int fd, int flags, int *newfd) {
+     auto result = syscall(SYS_DUP, fd, flags);
+@@ -252,7 +283,6 @@ int sys_pselect(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
                  const struct timespec *timeout, const sigset_t *sigmask,
                  int *num_events) {
      mlibc::infoLogger() << "sys_pselect() is not implemented" << frg::endlog;
@@ -111,10 +126,10 @@ index 3527370c..a6f69fff 100644
  } // namespace mlibc
 \ No newline at end of file
 diff --git a/sysdeps/aero/include/aero/syscall.h b/sysdeps/aero/include/aero/syscall.h
-index 07b1b51b..f6d7836d 100644
+index 07b1b51b..bd4d348d 100644
 --- a/sysdeps/aero/include/aero/syscall.h
 +++ b/sysdeps/aero/include/aero/syscall.h
-@@ -49,6 +49,12 @@
+@@ -49,6 +49,13 @@
  #define SYS_DUP 42
  #define SYS_FCNTL 43
  #define SYS_DUP2 44
@@ -124,6 +139,7 @@ index 07b1b51b..f6d7836d 100644
 +#define SYS_BECOME_ROOT 48
 +#define SYS_STAT 49
 +#define SYS_FSTAT 50
++#define SYS_READ_LINK 51
 
  // Invalid syscall used to trigger a log error in the kernel (as a hint)
  // so, that we can implement the syscall in the kernel.

src/aero_kernel/src/syscall/fs.rs

@@ -398,3 +398,16 @@ pub fn stat(path: usize, path_size: usize, stat_struct: usize) -> Result<usize,
 
     Ok(0)
 }
+
+pub fn read_link(
+    path: usize,
+    path_size: usize,
+    _buffer: usize,
+    _buffer_size: usize,
+) -> Result<usize, AeroSyscallError> {
+    let path = validate_str(path as *mut u8, path_size).ok_or(AeroSyscallError::EINVAL)?;
+    let path = Path::new(path);
+
+    log::warn!("read_link: is a stub! (path={path:?})");
+    Err(AeroSyscallError::EINVAL)
+}

src/aero_kernel/src/syscall/mod.rs

@@ -72,6 +72,7 @@
 //! | 48     | ipc_become_root         |
 //! | 49     | stat                    |
 //! | 50     | fstat                   |
+//! | 51     | read_link               |
 
 use core::mem::MaybeUninit;
 
@@ -201,6 +202,7 @@ pub fn generic_do_syscall(
         SYS_FCNTL => fs::fcntl(b, c, d),
         SYS_STAT => fs::stat(b, c, d),
         SYS_FSTAT => fs::fstat(b, c),
+        SYS_READ_LINK => fs::read_link(b, c, d, e),
 
         SYS_SOCKET => net::socket(b, c, d),
         SYS_BIND => net::bind(b, c, d),

src/aero_syscall/src/consts.rs

@@ -69,6 +69,7 @@ pub const SYS_IPC_DISCOVER_ROOT: usize = 47;
 pub const SYS_IPC_BECOME_ROOT: usize = 48;
 pub const SYS_STAT: usize = 49;
 pub const SYS_FSTAT: usize = 50;
+pub const SYS_READ_LINK: usize = 51;
 
 // fcntl constants:
 pub const F_GETFD: usize = 3;