eal.exit doesn't exist, corrected to eal.kill

This commit is contained in:
Sàm Héaclou Niholas Wa-Londrois 2025-03-22 18:08:26 +01:00
parent 383b851130
commit 23bf44b564

View file

@ -1,5 +1,21 @@
#!/bin/bash #!/bin/bash
function eal.debug.buildBash() {
EIR_PKG=bash
pushd $LFS/sources/bash
eal.notification.buildconf
./configure --prefix=/usr \
--build=$(sh support/config.guess) \
--host=$LFS_TGT \
--without-bash-malloc || eal.kill "At bash - compilation configuration"
eal.notification.compiling
make || eal.kill "At bash - compilation"
eal.notification.installing
make DESTDIR=$LFS install || eal.kill "At bash - installation"
ln -sv bash $LFS/bin/sh
popd
}
main() { main() {
read -p "Attempting to modify installation at $LFS. Is this correct? (y/n): " WOPT read -p "Attempting to modify installation at $LFS. Is this correct? (y/n): " WOPT
case "$WOPT" in case "$WOPT" in
@ -497,25 +513,25 @@ function eal.install.toolchain() {
mkdir build mkdir build
pushd build pushd build
../configure AWK=gawk ../configure AWK=gawk
make -C include || eal.exit "At ncurses - command \"make -C include\"" make -C include || eal.kill "At ncurses - command \"make -C include\""
make -C progs tic || eal.exit "At ncurses - command \"make -C progs tic\"" make -C progs tic || eal.kill "At ncurses - command \"make -C progs tic\""
popd popd
eal.notification.buildconf eal.notification.buildconf
./configure --prefix=/usr \ ./configure --prefix=/usr \
--host=$LFS_TGT \ --host=$LFS_TGT \
--build=$(./config.guess) \ --build=$(./config.guess) \
--mandir=/usr/share/man \ --mandir=/usr/share/man \
--with-manpage-format=normal \ --with-manpage-format=normal \
--with-shared \ --with-shared \
--without-normal \ --without-normal \
--with-cxx-shared \ --with-cxx-shared \
--without-debug \ --without-debug \
--without-ada \ --without-ada \
--disable-stripping || eal.exit "At ncurses - compilation configuration" --disable-stripping || eal.kill "At ncurses - compilation configuration"
eal.notification.compiling eal.notification.compiling
make || eal.exit "At ncurses - compilation" make || eal.kill "At ncurses - compilation"
eal.notification.installing eal.notification.installing
make DESTDIR=$LFS TIC_PATH=$(pwd)/build/progs/tic install || eal.exit "At ncurses - installation" make DESTDIR=$LFS TIC_PATH=$(pwd)/build/progs/tic install || eal.kill "At ncurses - installation"
ln -sv lib/libncursesw.so $LFS/usr/lib/libncurses.so ln -sv lib/libncursesw.so $LFS/usr/lib/libncurses.so
sed -e 's/^#if.*XOPEN.*$/#if 1/' \ sed -e 's/^#if.*XOPEN.*$/#if 1/' \
-i $LFS/usr/include/curses.h -i $LFS/usr/include/curses.h
@ -526,11 +542,11 @@ function eal.install.toolchain() {
./configure --prefix=/usr \ ./configure --prefix=/usr \
--build=$(sh support/config.guess) \ --build=$(sh support/config.guess) \
--host=$LFS_TGT \ --host=$LFS_TGT \
--without-bash-malloc || eal.exit "At bash - compilation configuration" --without-bash-malloc || eal.kill "At bash - compilation configuration"
eal.notification.compiling eal.notification.compiling
make || eal.exit "At ncurses - compilation" make || eal.kill "At ncurses - compilation"
eal.notification.installing eal.notification.installing
make DESTDIR=$LFS install || eal.exit "At bash - installation" make DESTDIR=$LFS install || eal.kill "At bash - installation"
ln -sv bash $LFS/bin/sh ln -sv bash $LFS/bin/sh
popd popd
EIR_PKG=coreutils EIR_PKG=coreutils
@ -696,32 +712,15 @@ function eal.install.toolchain() {
--disable-libvtv \ --disable-libvtv \
--enable-languages=c,c++ --enable-languages=c,c++
eal.notification.compiling eal.notification.compiling
make || eal.exit "At GCC - Pass 2" make || eal.kill "At GCC - Pass 2"
eal.notification.installing eal.notification.installing
make DESTDIR=$LFS install || eal.exit "At GCC - Pass 2 - Installation" make DESTDIR=$LFS install || eal.kill "At GCC - Pass 2 - Installation"
ln -sv gcc $LFS/usr/bin/cc ln -sv gcc $LFS/usr/bin/cc
popd popd
popd popd
echo "Cross-Toolchain installation has completed." echo "Cross-Toolchain installation has completed."
} }
function eal.debug.buildBash() {
EIR_PKG=bash
pushd $LFS/sources/bash
eal.notification.buildconf
./configure --prefix=/usr \
--build=$(sh support/config.guess) \
--host=$LFS_TGT \
--without-bash-malloc || eal.exit "At bash - compilation configuration"
eal.notification.compiling
make || eal.exit "At ncurses - compilation"
eal.notification.installing
make DESTDIR=$LFS install || eal.exit "At bash - installation"
ln -sv bash $LFS/bin/sh
popd
}
function eal.install.verify() { function eal.install.verify() {
ver_check Binutils $LFS/bin/ld 2.43.1 ver_check Binutils $LFS/bin/ld 2.43.1
ver_check GCC $LGS/bin/gcc 14.2.0 ver_check GCC $LGS/bin/gcc 14.2.0