enderice2/Fennix
1
0
Fork 0
mirror of https://github.com/EnderIce2/Fennix.git synced 2025-07-01 18:39:16 +00:00
Code Issues Actions Releases Wiki Activity

refactor(rootfs): reorganize file structure and remove unnecessary .gitkeep files

Browse Source 
Signed-off-by: EnderIce2 <enderice2@protonmail.com>
This commit is contained in:
EnderIce2
2025-03-24 15:33:07 +00:00
parent 8f88d9028e
commit d251d9d03f
55 changed files with 622 additions and 596 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Userspace/libc/CMakeLists.txt
View File

@ -7,8 +7,8 @@ if(NOT DEFINED ENV{WORKSPACE_DIR})
message(STATUS "Compiling standalone")
if(NOT DEFINED ENV{CMAKE_INSTALL_PREFIX})
set(CMAKE_INSTALL_PREFIX "/usr")
message(STATUS "Using default install prefix: /usr")
set(CMAKE_INSTALL_PREFIX "/")
message(STATUS "Using default install prefix: /")
else()
message(STATUS "Using custom install prefix: $ENV{CMAKE_INSTALL_PREFIX}")
endif()
@ -18,8 +18,8 @@ else()
message(STATUS "Compiling within workspace")
if(NOT DEFINED ENV{CMAKE_INSTALL_PREFIX})
set(CMAKE_INSTALL_PREFIX "$ENV{WORKSPACE_DIR}/out")
message(STATUS "Using default install prefix: $ENV{WORKSPACE_DIR}/out")
set(CMAKE_INSTALL_PREFIX "$ENV{WORKSPACE_DIR}/out/sys")
message(STATUS "Using default install prefix: $ENV{WORKSPACE_DIR}/out/sys")
else()
message(STATUS "Using custom install prefix: $ENV{CMAKE_INSTALL_PREFIX}")
endif()
@ -105,18 +105,24 @@ add_subdirectory(interpreter)
add_subdirectory(src)
add_subdirectory(libs)
if(DEFINED ENV{WORKSPACE_DIR})
set(INC_OUTPUT "inc")
else()
set(INC_OUTPUT "include")
endif()
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/
DESTINATION include
DESTINATION ${CMAKE_INSTALL_PREFIX}/${INC_OUTPUT}
FILES_MATCHING
PATTERN "*")
install(DIRECTORY ${ABIS_GENERIC}/
DESTINATION ${CMAKE_INSTALL_PREFIX}/include/
DESTINATION ${CMAKE_INSTALL_PREFIX}/${INC_OUTPUT}
FILES_MATCHING
PATTERN "*")
install(DIRECTORY ${ABIS_PATH}/
DESTINATION ${CMAKE_INSTALL_PREFIX}/include/
DESTINATION ${CMAKE_INSTALL_PREFIX}/${INC_OUTPUT}
FILES_MATCHING
PATTERN "*")

2
Userspace/libc/include/pwd.h
View File

@ -26,7 +26,7 @@ extern "C"
#include <sys/types.h>
/**
* /etc/passwd
* /sys/cfg/passwd
* name:passwd:uid:gid:gecos:dir:shell
*
* Example

2
Userspace/libc/src/std/pwd.c
View File

@ -33,7 +33,7 @@ export struct passwd *getpwent(void)
if (pwfile == NULL)
{
pwfile = fopen("/etc/passwd", "r");
pwfile = fopen("/sys/cfg/passwd", "r"); /* FIXME: this path should be OS dependent */
if (pwfile == NULL)
return NULL;
}

2
Userspace/libc/src/std/unistd.c
View File

@ -209,7 +209,7 @@ export int gethostname(char *name, size_t namelen)
return 0;
}
int fd = open("/etc/hostname", O_RDONLY);
int fd = open("/sys/cfg/hostname", O_RDONLY); /* FIXME: this path should be OS dependent */
if (fd == -1)
return -1;