syscall::pipe: fix fds type

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

Author: Andy-Python-Programmer

bootstrap/xorg.yml

@@ -669,7 +669,7 @@ packages:
         - '--disable-glamor'
         - '--disable-glx'
         environ:
-          CFLAGS: '-Wno-error=array-bounds -O0 -g -pipe'
+          CFLAGS: '-Wno-error=array-bounds -O2 -pipe'
     build:
       - args: ['make', '-j@PARALLELISM@']
       - args: ['make', 'install-strip']
@@ -1377,6 +1377,44 @@ packages:
           DESTDIR: '@THIS_COLLECT_DIR@'
       - args: ['mkdir', '-p', "@THIS_COLLECT_DIR@/usr/share/X11/xkb"]
 
+  - name: xkbutils
+    source:
+      subdir: 'bundled'
+      git: 'https://gitlab.freedesktop.org/xorg/app/xkbutils.git'
+      tag: 'xkbutils-1.0.4'
+      version: '1.0.4'
+      tools_required:
+        - host-autoconf-v2.69
+        - host-automake-v1.16
+        - host-libtool
+        - host-pkg-config
+        - host-xorg-macros
+      regenerate:
+        - args: ['autoreconf', '-vfi']
+    tools_required:
+      - host-autoconf-v2.69
+      - host-automake-v1.16
+      - host-libtool
+      - host-pkg-config
+      - host-gcc
+    pkgs_required:
+      - mlibc
+      - xorg-util-macros
+      - xorg-proto
+      - libx11
+      - libxt
+      - libxaw
+    configure:
+      - args:
+        - '@THIS_SOURCE_DIR@/configure'
+        - '--host=x86_64-aero'
+        - '--prefix=/usr'
+        - '--with-sysroot=@SYSROOT_DIR@' # Set libtool's lt_sysroot.
+    build:
+      - args: ['make', '-j@PARALLELISM@']
+      - args: ['make', 'install-strip']
+        environ:
+          DESTDIR: '@THIS_COLLECT_DIR@'
 
   - name: xkeyboard-config
     source:

patches/xorg-server/0001-xserver-aero-specific-changes.patch

@@ -1,4 +1,4 @@
-From ec91d28586ecf3df66e23da1ce94dbba3042cd86 Mon Sep 17 00:00:00 2001
+From 3d08eb0ba228adf632f38c0c8f6476c1d0342386 Mon Sep 17 00:00:00 2001
 From: Andy-Python-Programmer <[email protected]>
 Date: Thu, 30 Jun 2022 11:10:21 +1000
 Subject: [PATCH] xserver: aero specific changes
@@ -20,8 +20,8 @@ Signed-off-by: Andy-Python-Programmer <[email protected]>
  include/os.h                             |  1 +
  mi/mibitblt.c                            |  2 ++
  os/access.c                              |  2 +-
- os/utils.c                               |  4 +--
- 16 files changed, 49 insertions(+), 19 deletions(-)
+ os/utils.c                               |  6 ++--
+ 16 files changed, 50 insertions(+), 20 deletions(-)
 
 diff --git a/.gitignore b/.gitignore
 index dc56b46..81d9886 100644
@@ -328,7 +328,7 @@ index 9724616..81befe3 100644
  #endif
  #if defined(SYSV) &&  defined(__i386__)
 diff --git a/os/utils.c b/os/utils.c
-index 2ba1c80..63dedc6 100644
+index 2ba1c80..ffa961f 100644
 --- a/os/utils.c
 +++ b/os/utils.c
 @@ -1402,7 +1402,7 @@ System(const char *command)
@@ -340,6 +340,15 @@ index 2ba1c80..63dedc6 100644
  }
 
  static struct pid {
+@@ -1474,7 +1474,7 @@ Popen(const char *command, const char *type)
+             }
+             close(pdes[1]);
+         }
+-        execl("/bin/sh", "sh", "-c", command, (char *) NULL);
++        execl("/usr/bin/bash", "sh", "-c", command, (char *) NULL);
+         _exit(127);
+     }
+ 
 @@ -1632,7 +1632,7 @@ Pclose(void *iop)
      }
  #endif

src/aero_kernel/src/syscall/fs.rs

@@ -253,7 +253,7 @@ pub fn seek(fd: usize, offset: usize, whence: usize) -> Result<usize, SyscallErr
 }
 
 #[syscall]
-pub fn pipe(fds: &mut [usize; 2], flags: usize) -> Result<usize, SyscallError> {
+pub fn pipe(fds: &mut [i32; 2], flags: usize) -> Result<usize, SyscallError> {
     let flags = OpenFlags::from_bits(flags).ok_or(SyscallError::EINVAL)?;
     let pipe = Pipe::new();
 
@@ -278,8 +278,8 @@ pub fn pipe(fds: &mut [usize; 2], flags: usize) -> Result<usize, SyscallError> {
         Ok(fd2) => fd2,
     };
 
-    fds[0] = fd1;
-    fds[1] = fd2;
+    fds[0] = fd1 as i32;
+    fds[1] = fd2 as i32;
 
     Ok(0x00)
 }
@@ -362,6 +362,12 @@ pub fn fcntl(fd: usize, command: usize, arg: usize) -> Result<usize, SyscallErro
             Ok(flags)
         }
 
+        aero_syscall::prelude::F_SETFL => {
+            log::debug!("F_SETFL: is a stub!");
+
+            Ok(0x00)
+        }
+
         _ => unimplemented!("fcntl: unknown command {command}"),
     }
 }

tools/gdb-debug-userland.py

@@ -26,7 +26,7 @@ def gdb_main(program: str, is_lib: bool):
         print("setting a breakpoint at the entry point")
 
         # set a breakpoint at the entry point of the program
-        gdb.execute("b main")
+        gdb.execute("b _start")
 
 
 def wait_for_process(process):