linux-from-scratch/custom_blfs_packages
1
0
Fork 0
mirror of https://github.com/krizsipeti/custom_blfs_packages.git synced 2025-01-23 14:32:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Moved blfs config creation

Browse Source
This commit is contained in:
Krizsan Peter 2024-12-04 08:51:37 +01:00
parent 7251dd4385
commit 401cce1a1d
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
blfsSetup.sh
View File

@ -17,9 +17,6 @@ _build_blfs()
local dir_lfs="$(realpath "$1")" local dir_lfs="$(realpath "$1")"
_setup_autologin "$dir_lfs" || return 1 _setup_autologin "$dir_lfs" || return 1
# Create new blfs config
_create_blfs_config "$dir_lfs" || return 1
# Create autologin script to run blfs build after reboot # Create autologin script to run blfs build after reboot
_create_blfs_builder_script "$dir_lfs" || return 1 _create_blfs_builder_script "$dir_lfs" || return 1

2
libs/func_general.sh
View File

@ -144,7 +144,6 @@ _finalize_lfs_build()
# Move blfs folder to pkr home folder # Move blfs folder to pkr home folder
sudo mv -v "$dir_lfs/blfs_root" "$dir_lfs/home/pkr/" && sudo mv -v "$dir_lfs/blfs_root" "$dir_lfs/home/pkr/" &&
sudo chroot "$dir_lfs" sed -i -E "/(=configuration|python3)/s/^/#/g;/=configuration/i\ source /home/pkr/custom_blfs_packages/libs/func_general.sh && _create_blfs_config_xorg /" /home/pkr/blfs_root/Makefile &&
sudo chroot "$dir_lfs" chown -hR pkr:pkr "/home/pkr/blfs_root" && sudo chroot "$dir_lfs" chown -hR pkr:pkr "/home/pkr/blfs_root" &&
sudo chroot "$dir_lfs" chown -hR pkr:pkr "/var/lib/jhalfs" && sudo chroot "$dir_lfs" chown -hR pkr:pkr "/var/lib/jhalfs" &&
sudo sed -i "s|/blfs_root/packdesc.dtd|/home/pkr/blfs_root/packdesc.dtd|g" "$dir_lfs/var/lib/jhalfs/BLFS/instpkg.xml" sudo sed -i "s|/blfs_root/packdesc.dtd|/home/pkr/blfs_root/packdesc.dtd|g" "$dir_lfs/var/lib/jhalfs/BLFS/instpkg.xml"
@ -351,6 +350,7 @@ _build_blfs()
cd "$dir_blfs_root" cd "$dir_blfs_root"
make clean && make clean &&
make update && make update &&
sed -i -E "/(=configuration|python3)/s/^/#/g;/=configuration/i\ source /home/pkr/custom_blfs_packages/libs/func_general.sh && _create_blfs_config_xorg /" "$dir_blfs_root/Makefile" &&
make <<< yes && make <<< yes &&
cd "$dir_blfs_work" && cd "$dir_blfs_work" &&
../gen-makefile.sh && ../gen-makefile.sh &&