SILO-GROUP
/
Dyad
forked from Dark-Horse-Linux/pyrois
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

functional chroot

master
phanes 2023-02-20 00:51:16 -05:00
parent cec4493a82
commit 9a95b0e699
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rex.project/x86_64/components/stage1/gcc.bash
View File

@ -365,13 +365,13 @@ mode_build_gcc_pass2() {
# patches # patches
logprint "Applying patches..." logprint "Applying patches..."
patch -p0 < "${PATCHES_DIR}/gcc_libarchpath_fhs.patch" #patch -p0 < "${PATCHES_DIR}/gcc_libarchpath_fhs.patch"
sed -e '/m64=/s/lib64/lib/' -i.orig gcc/config/i386/t-linux64
assert_zero $? assert_zero $?
# TODO turn this into a patch # TODO turn this into a patch
logprint "Enabling posix thread support..." logprint "Enabling posix thread support..."
sed '/thread_header =/s/@.*@/gthr-posix.h/' \ sed '/thread_header =/s/@.*@/gthr-posix.h/' -i libgcc/Makefile.in libstdc++-v3/include/Makefile.in
-i libgcc/Makefile.in libstdc++-v3/include/Makefile.in
assert_zero $? assert_zero $?
logprint "Entering build subdirectory" logprint "Entering build subdirectory"
@ -419,7 +419,7 @@ mode_install_gcc_pass2() {
pushd "${T_SOURCE_DIR}/build" pushd "${T_SOURCE_DIR}/build"
assert_zero $? assert_zero $?
make -DESTDIR=${T_SYSROOT} install make DESTDIR=${T_SYSROOT} install
assert_zero $? assert_zero $?
@ -462,6 +462,7 @@ fi
if [ "$MODE_GCC_PASS2" = "true" ]; then if [ "$MODE_GCC_PASS2" = "true" ]; then
logprint "PASS2 selected." logprint "PASS2 selected."
rm -Rf ${T_SOURCE_DIR}
MODE_STAGE=true MODE_STAGE=true
MODE_BUILD_GCC_PASS2=true MODE_BUILD_GCC_PASS2=true
MODE_INSTALL_GCC_PASS2=true MODE_INSTALL_GCC_PASS2=true

4
rex.project/x86_64/units/stage2.units
View File

@ -326,7 +326,7 @@
}, },
{ {
"name": "set sysroot ownership for chroot", "name": "set sysroot ownership for chroot",
"target": "components/stage1/fix_chroot_perms.bash", "target": "components/stage2/fix_chroot_perms.bash",
"is_shell_command": true, "is_shell_command": true,
"shell_definition": "bash", "shell_definition": "bash",
"force_pty": true, "force_pty": true,
@ -344,7 +344,7 @@
}, },
{ {
"name": "preparing virtual kernel file systems", "name": "preparing virtual kernel file systems",
"target": "components/stage1/prepare_vkfs.bash", "target": "components/stage2/prepare_vkfs.bash",
"is_shell_command": true, "is_shell_command": true,
"shell_definition": "bash", "shell_definition": "bash",
"force_pty": true, "force_pty": true,