diff --git a/.gitignore b/.gitignore index 9a55da2..f7514cf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ stage logs *.tgz +.nfs* diff --git a/README.md b/README.md new file mode 100644 index 0000000..ef93f8f --- /dev/null +++ b/README.md @@ -0,0 +1,11 @@ +# Dyad + +An automation of the creation of a Linux sysroot closely aligned to the LFS documentation. + +## Pre-Work + +Dyad is developed on a a vanilla Fedora 39 system. In order to meet prerequisites to start the build, you will need to install the following packages: + +``` +dnf -y install make vim cmake g++ dialog +``` diff --git a/rex.project/x86_64/components/stage1/glibc.bash b/rex.project/x86_64/components/stage1/glibc.bash index e0265a8..f03d5d9 100755 --- a/rex.project/x86_64/components/stage1/glibc.bash +++ b/rex.project/x86_64/components/stage1/glibc.bash @@ -155,7 +155,7 @@ mode_build_pass1() { # patches logprint "Applying patches..." - patch -Np1 < "${PATCHES_DIR}/glibc-2.37-fhs-1.patch" + patch -Np1 < "${PATCHES_DIR}/glibc-${VERSION}-fhs-1.patch" assert_zero $? mkdir -p build diff --git a/rex.project/x86_64/components/stage2/coreutils.bash b/rex.project/x86_64/components/stage2/coreutils.bash index 48f5a99..b907d79 100755 --- a/rex.project/x86_64/components/stage2/coreutils.bash +++ b/rex.project/x86_64/components/stage2/coreutils.bash @@ -139,7 +139,8 @@ mode_build_temp() { --host=${T_TRIPLET} \ --build=$(build-aux/config.guess) \ --enable-install-program=hostname \ - --enable-no-install-program=kill,uptime + --enable-no-install-program=kill,uptime \ + gl_cv_macro_MB_CUR_MAX_good=y assert_zero $? logprint "Compiling..." diff --git a/rex.project/x86_64/components/stage4/coreutils.bash b/rex.project/x86_64/components/stage4/coreutils.bash index 2703e3a..522c6ac 100755 --- a/rex.project/x86_64/components/stage4/coreutils.bash +++ b/rex.project/x86_64/components/stage4/coreutils.bash @@ -133,7 +133,7 @@ mode_build() { assert_zero $? logprint "Pre-install patching..." - patch -Np1 -i ${PATCHES_DIR}/coreutils-9.1-i18n-1.patch + patch -Np1 -i ${PATCHES_DIR}/coreutils-${VERSION}-i18n-1.patch assert_zero $? logprint "Preconfiguring ${APPNAME}..." diff --git a/rex.project/x86_64/components/stage4/glibc.bash b/rex.project/x86_64/components/stage4/glibc.bash index f456ed1..79517eb 100755 --- a/rex.project/x86_64/components/stage4/glibc.bash +++ b/rex.project/x86_64/components/stage4/glibc.bash @@ -137,8 +137,8 @@ mode_build() { assert_zero $? # TODO make this a patch - sed '/width -=/s/workend - string/number_length/' -i stdio-common/vfprintf-process-arg.c - assert_zero $? + #sed '/width -=/s/workend - string/number_length/' -i stdio-common/vfprintf-process-arg.c + #assert_zero $? logprint "Entering temp build dir..." mkdir -p build @@ -153,7 +153,7 @@ mode_build() { ../configure \ --prefix=/usr \ --disable-werror \ - --enable-kernel=3.2 \ + --enable-kernel=4.14 \ --enable-stack-protector=strong \ --with-headers=/usr/include \ libc_cv_slibdir=/usr/lib