Fix envsetup old iso creation function name
* Also include WIP repo_updater base modules * Some slight changes for CLI iso package includes
This commit is contained in:
parent
9372c15486
commit
0f7946342f
@ -45,10 +45,11 @@ while (("$#" >= 1)); do
|
||||
--kde) echo "${DOCKER_BUILD_CONTAINER_NAME_KDE}" > $TOOL_TEMP/docker001;;
|
||||
--pkgrel-bump) echo 'TOOL_SKIPBUMP=false' > $TOOL_TEMP/envvar001;;
|
||||
--mkiso) export intended && iso_variant_selector;;
|
||||
--mkiso-clean-cli) intended && make_clean_iso;;
|
||||
--mkiso-clean-cli) intended && make_cli_clean_iso;;
|
||||
--mkiso-plasma-clean-cli) intended && make_plasma_clean_iso;; # Create LiveOS env with plasma desktop
|
||||
--leave-tmp) echo 'true' > $TOOL_TEMP/.keep_tmp;; # This will be used by docker builder only ( keep away from help menu )
|
||||
-c|--clean) TOOL_CLEAN=true;;
|
||||
--repo-update) echo "WIP" ;;
|
||||
-d|--docker)
|
||||
if [ $# -eq 1 ]; then
|
||||
msg_error "Docker option cant be used alone ( need to be first arg! )"
|
||||
|
@ -73,6 +73,10 @@ loading "Docker functions..."
|
||||
source $P_ROOT/build/toolset/shell/modules/docker_modules.sh
|
||||
loaded "Docker functions"
|
||||
|
||||
loading "Repo update system functions"
|
||||
source $P_ROOT/build/toolset/shell/modules/repo_modules.sh
|
||||
loaded "Repo update system functions"
|
||||
|
||||
# Feed the scriptlet main arch
|
||||
export ARCH=$(cat $TOOL_TEMP/is_arch)
|
||||
|
||||
|
@ -13,6 +13,34 @@ make_cli_rootfs() {
|
||||
|
||||
# Now clean up some firmware files that wont be needed for installation in x86_64 env
|
||||
as_root rm -rf $ISO_ROOT/rootfs/system/lib/firmware/{netronome,qcom,mellanox,qca}
|
||||
|
||||
set +e
|
||||
|
||||
# Now clean up some firmware files that wont be needed for installation in x86_64 env
|
||||
as_root rm -rf $ISO_ROOT/rootfs/system/lib/firmware/{netronome,qcom,mellanox,qca}
|
||||
|
||||
# Same for other things
|
||||
as_root rm -rf $ISO_ROOT/rootfs/system/var/cache/bottle/pkg/*
|
||||
as_root rm -rf $ISO_ROOT/rootfs/system/include/
|
||||
as_root rm -rf $ISO_ROOT/rootfs/system/usr/include
|
||||
as_root rm -rf $ISO_ROOT/rootfs/system/usr/scr
|
||||
as_root rm -rf $ISO_ROOT/rootfs/system/usr/libexec/gcc
|
||||
as_root rm -rf $ISO_ROOT/rootfs/system/usr/lib*/lib*.a
|
||||
as_root rm -rf $ISO_ROOT/rootfs/system/usr/lib*/lib*.la
|
||||
as_root rm -rf $ISO_ROOT/rootfs/system/usr/lib*/*/lib*.a
|
||||
as_root rm -rf $ISO_ROOT/rootfs/system/usr/lib*/*/lib*.la
|
||||
as_root rm -rf $ISO_ROOT/rootfs/system/usr/lib/lib*.a
|
||||
|
||||
# Firmware
|
||||
as_root mv $ISO_ROOT/rootfs/system/lib/firmware/{amd,amdgpu,nvidia} $ISO_ROOT/rootfs/system
|
||||
as_root rm -rf $ISO_ROOT/rootfs/system/lib/firmware/*
|
||||
as_root mv $ISO_ROOT/rootfs/system/{amd,amdgpu,nvidia} $ISO_ROOT/rootfs/system/lib/firmware/
|
||||
|
||||
# strip
|
||||
as_root strip --strip-unneeded $ISO_ROOT/rootfs/system/usr/bin/* &> /dev/null
|
||||
as_root strip --strip-unneeded $ISO_ROOT/rootfs/system/usr/lib*/*.so &> /dev/null
|
||||
|
||||
set -e
|
||||
}
|
||||
|
||||
# Start from scratch and delete old files
|
||||
|
@ -165,13 +165,13 @@ build_pkg_docker() {
|
||||
docker_user_run_cmd $DOCKER_BUILD_CONTAINER_NAME_KDE "cd ~/$TOOL_MAIN_NAME && ./envsetup --leave-tmp -b ${PKG_NAME}"
|
||||
|
||||
# Reset the container
|
||||
docker_build_kde_reset
|
||||
#docker_build_kde_reset
|
||||
else
|
||||
msg_debug "Using build container"
|
||||
docker_user_run_cmd $DOCKER_BUILD_CONTAINER_NAME "cd ~/$TOOL_MAIN_NAME && ./envsetup --leave-tmp -b ${PKG_NAME}"
|
||||
|
||||
# Reset the container
|
||||
docker_build_base_reset
|
||||
#docker_build_base_reset
|
||||
fi
|
||||
|
||||
rm -f $TOOL_TEMP/builds $TOOL_TEMP/.builder_locked
|
||||
|
19
shell/modules/repo_modules.sh
Normal file
19
shell/modules/repo_modules.sh
Normal file
@ -0,0 +1,19 @@
|
||||
##
|
||||
# Load all pieces of repo system moudles here
|
||||
##
|
||||
|
||||
# Load global functions that are used by beelow modules
|
||||
source $P_ROOT/build/toolset/shell/modules/repo_updater/repo_common.sh
|
||||
loaded " repo -> common functions"
|
||||
|
||||
# Functions to update local repositories
|
||||
source $P_ROOT/build/toolset/shell/modules/repo_updater/repo_update.sh
|
||||
loaded " repo -> update functions"
|
||||
|
||||
# Functions to push local repository to server
|
||||
source $P_ROOT/build/toolset/shell/modules/repo_updater/repo_push.sh
|
||||
loaded " repo -> push functions"
|
||||
|
||||
# Functions from all modules to make one working big function out of
|
||||
source $P_ROOT/build/toolset/shell/modules/repo_updater/repo_system.sh
|
||||
loaded " repo -> system functions"
|
7
shell/modules/repo_updater/repo_common.sh
Normal file
7
shell/modules/repo_updater/repo_common.sh
Normal file
@ -0,0 +1,7 @@
|
||||
##
|
||||
# Here will be the common functions that are used by other repo modules
|
||||
##
|
||||
|
||||
repo_fail_if_docker() {
|
||||
echo "Fail"
|
||||
}
|
3
shell/modules/repo_updater/repo_push.sh
Normal file
3
shell/modules/repo_updater/repo_push.sh
Normal file
@ -0,0 +1,3 @@
|
||||
##
|
||||
# Repo push functions and failsafes
|
||||
##
|
1
shell/modules/repo_updater/repo_system.sh
Normal file
1
shell/modules/repo_updater/repo_system.sh
Normal file
@ -0,0 +1 @@
|
||||
|
3
shell/modules/repo_updater/repo_update.sh
Normal file
3
shell/modules/repo_updater/repo_update.sh
Normal file
@ -0,0 +1,3 @@
|
||||
##
|
||||
# Repo updater functions
|
||||
##
|
@ -52,7 +52,8 @@ export DISTRO_NAME=evolinx
|
||||
export STRAP="base-strap"
|
||||
|
||||
# Rootfs packages
|
||||
export CLI_PKG="base-system nano dracut wireless-tools base-install-scripts sudo parted libmd"
|
||||
export CLI_PKG="base-system nano dracut base-install-scripts sudo parted libmd"
|
||||
#export CLI_PKG="base-minimal util-linux coreutils libseccomp linux"
|
||||
export INSTALLER_PKG="base-system nano dracut wireless-tools base-install-scripts sudo parted libmd plymouth plasma-desktop konsole"
|
||||
|
||||
##
|
||||
|
Loading…
Reference in New Issue
Block a user