tfgrid/zosbuilder
11
0
Fork 1
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: major build system improvements and container output issues

Browse Source 
- Fix container output visibility with proper TTY handling and debug mode
- Fix build order: kernel modules built before initramfs creation
- Implement two-stage kernel build to resolve chicken-and-egg dependency
- Fix sed command issues in kernel configuration with direct execution
- Add diffutils package to container for proper kernel build support
- Enhance NIC module/firmware correlation with intelligent selection
- Fix module staging logic: all NICs loaded in stage1 before network up
- Add smart firmware installation based on module requirements
- Create comprehensive function documentation (scripts/functionlist.md)
- Add debug container script for troubleshooting

Major fixes:
* Container builds now show real-time output
* Kernel builds work with proper GNU diff support
* Module/firmware selection optimized for common hardware
* Build process handles dependencies correctly
* Documentation provides complete function reference
This commit is contained in:
Jan De Landtsheer
2025-09-03 14:06:44 +02:00
parent 6d44575860
commit b9f94105cf
23 changed files with 1072 additions and 4310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

228
scripts/lib/initramfs.sh
View File

@@ -32,10 +32,10 @@ function initramfs_setup_zinit() {
safe_execute rm -f "${initramfs_dir}/sbin/init"
safe_execute ln -sf zinit "${initramfs_dir}/sbin/init"
# Copy zinit configuration
# Copy zinit configuration (all YAML and scripts)
log_info "Installing zinit configuration"
safe_mkdir "${initramfs_dir}/etc/zinit"
safe_copy "${zinit_config_dir}"/* "${initramfs_dir}/etc/zinit/"
safe_execute cp -r "${zinit_config_dir}"/* "${initramfs_dir}/etc/zinit/"
# Ensure proper permissions
safe_execute chmod 755 "${initramfs_dir}/sbin/zinit"
@@ -67,13 +67,40 @@ function initramfs_setup_zinit() {
log_info "zinit setup complete - OpenRC completely replaced"
}
# Setup 2-stage module loading system with dependency resolution
# Install the critical /init script for initramfs boot
function initramfs_install_init_script() {
local initramfs_dir="$1"
local init_script_path="$2"
section_header "Installing initramfs /init script"
if [[ ! -f "$init_script_path" ]]; then
log_error "Init script not found: ${init_script_path}"
return 1
fi
# Install the init script as /init in initramfs root
log_info "Installing init script from: ${init_script_path}"
safe_execute cp "$init_script_path" "${initramfs_dir}/init"
safe_execute chmod 755 "${initramfs_dir}/init"
# Verify installation
if [[ ! -x "${initramfs_dir}/init" ]]; then
log_error "Failed to install init script"
return 1
fi
log_info "✓ Initramfs /init script installed successfully"
log_info " Boot flow: /init -> setup environment -> switch_root -> /sbin/zinit init"
}
# Setup 2-stage module loading system with dependency resolution and firmware correlation
function initramfs_setup_modules() {
local initramfs_dir="$1"
local modules_conf="$2"
local kernel_version="${3:-$(uname -r)}"
section_header "Setting up 2-stage module loading with dependencies"
section_header "Setting up 2-stage module loading with firmware correlation"
if [[ ! -f "$modules_conf" ]]; then
log_error "Modules configuration file not found: ${modules_conf}"
@@ -83,12 +110,24 @@ function initramfs_setup_modules() {
local modules_dir="${initramfs_dir}/lib/modules/${kernel_version}"
safe_mkdir "$modules_dir"
# Create stage1 module list with dependencies
# Track required firmware packages
local required_firmware=()
# Create stage1 module list with dependencies and firmware
log_info "Resolving stage1 module dependencies (critical boot modules)"
local stage1_modules=()
while IFS= read -r module; do
[[ -n "$module" ]] && stage1_modules+=("$module")
done < <(grep "^stage1:" "$modules_conf" | cut -d: -f2)
local stage1_firmware=()
while IFS=: read -r stage module firmware; do
if [[ "$stage" == "stage1" && -n "$module" ]]; then
stage1_modules+=("$module")
if [[ -n "$firmware" && "$firmware" != "none" ]]; then
stage1_firmware+=("$firmware")
required_firmware+=("$firmware")
log_debug "Module $module requires firmware: $firmware"
fi
fi
done < <(grep "^stage1:" "$modules_conf")
local stage1_with_deps=()
if [[ ${#stage1_modules[@]} -gt 0 ]]; then
@@ -98,12 +137,21 @@ function initramfs_setup_modules() {
# Write stage1 list with dependencies
printf '%s\n' "${stage1_with_deps[@]}" > "${modules_dir}/stage1.list"
# Create stage2 module list with dependencies
# Create stage2 module list with dependencies and firmware
log_info "Resolving stage2 module dependencies (extended hardware)"
local stage2_modules=()
while IFS= read -r module; do
[[ -n "$module" ]] && stage2_modules+=("$module")
done < <(grep "^stage2:" "$modules_conf" | cut -d: -f2)
local stage2_firmware=()
while IFS=: read -r stage module firmware; do
if [[ "$stage" == "stage2" && -n "$module" ]]; then
stage2_modules+=("$module")
if [[ -n "$firmware" && "$firmware" != "none" ]]; then
stage2_firmware+=("$firmware")
required_firmware+=("$firmware")
log_debug "Module $module requires firmware: $firmware"
fi
fi
done < <(grep "^stage2:" "$modules_conf")
local stage2_with_deps=()
if [[ ${#stage2_modules[@]} -gt 0 ]]; then
@@ -122,16 +170,34 @@ function initramfs_setup_modules() {
# Write stage2 list with unique dependencies
printf '%s\n' "${stage2_with_deps[@]}" > "${modules_dir}/stage2.list"
# Create firmware requirements list (remove duplicates)
local unique_firmware=($(printf '%s\n' "${required_firmware[@]}" | sort -u))
if [[ ${#unique_firmware[@]} -gt 0 ]]; then
printf '%s\n' "${unique_firmware[@]}" > "${modules_dir}/required-firmware.list"
log_info "Created firmware requirements list: ${#unique_firmware[@]} packages"
for fw in "${unique_firmware[@]}"; do
log_info " Required firmware: $fw"
done
# Export for use by firmware installation
export REQUIRED_FIRMWARE_PACKAGES="${unique_firmware[*]}"
else
log_info "No firmware packages required"
export REQUIRED_FIRMWARE_PACKAGES=""
fi
# Create module loading scripts
initramfs_create_module_scripts "$initramfs_dir" "$kernel_version"
# Report final counts
local stage1_count=${#stage1_with_deps[@]}
local stage2_count=${#stage2_with_deps[@]}
local firmware_count=${#unique_firmware[@]}
log_info "Module configuration complete:"
log_info " Stage1 (critical + deps): ${stage1_count} modules"
log_info " Stage2 (extended + deps): ${stage2_count} modules"
log_info " Required firmware packages: ${firmware_count}"
log_info " Total unique modules: $((stage1_count + stage2_count))"
}
@@ -204,10 +270,6 @@ function initramfs_resolve_module_dependencies() {
printf '%s\n' "${unique_modules[@]}"
}
# Export functions
export -f alpine_extract_miniroot alpine_setup_chroot alpine_cleanup_chroot
export -f alpine_install_packages alpine_install_firmware alpine_aggressive_cleanup
export -f alpine_configure_repos alpine_configure_system
# Create module loading scripts for zinit
function initramfs_create_module_scripts() {
@@ -292,22 +354,31 @@ function initramfs_strip_and_upx() {
if file "$file" | grep -q "ELF.*executable"; then
log_debug "Processing executable: $file"
# Strip debug symbols
if strip "$file" 2>/dev/null; then
((stripped_count++))
log_debug "Stripped: $file"
else
((failed_strip++))
log_debug "Failed to strip: $file"
# Strip debug symbols (ignore already stripped files)
if strip "$file" 2>/dev/null || true; then
if [[ $? -eq 0 ]]; then
((stripped_count++))
log_debug "Stripped: $file"
else
((failed_strip++))
log_debug "Already stripped or failed: $file"
fi
fi
# UPX compress (best compression)
if upx --best --force "$file" 2>/dev/null; then
((upx_count++))
log_debug "UPX compressed: $file"
# UPX compress (best compression) - skip if already compressed or fails
if command_exists "upx"; then
if upx --best --force "$file" >/dev/null 2>&1 || true; then
if [[ $? -eq 0 ]]; then
((upx_count++))
log_debug "UPX compressed: $file"
else
((failed_upx++))
log_debug "UPX failed or already compressed: $file"
fi
fi
else
log_debug "UPX not available, skipping compression for: $file"
((failed_upx++))
log_debug "Failed to UPX: $file"
fi
fi
done < <(find "$initramfs_dir" -type f -executable -print0)
@@ -323,12 +394,14 @@ function initramfs_strip_and_upx() {
log_debug "Processing library: $file"
# Strip libraries (more conservative - keep function symbols)
if strip --strip-unneeded "$file" 2>/dev/null; then
((lib_stripped++))
log_debug "Stripped library: $file"
else
((lib_failed++))
log_debug "Failed to strip library: $file"
if strip --strip-unneeded "$file" 2>/dev/null || true; then
if [[ $? -eq 0 ]]; then
((lib_stripped++))
log_debug "Stripped library: $file"
else
((lib_failed++))
log_debug "Library already stripped or failed: $file"
fi
fi
fi
done < <(find "$initramfs_dir" -name "*.so*" -type f -print0)
@@ -421,6 +494,7 @@ function initramfs_validate() {
# Check essential files and directories
local essential_items=(
"init"
"sbin/init"
"sbin/zinit"
"bin/busybox"
@@ -443,7 +517,15 @@ function initramfs_validate() {
fi
done
# Check that init is properly linked to zinit
# Check that initramfs /init script exists
if [[ -x "${initramfs_dir}/init" ]]; then
log_info "✓ Initramfs /init script found"
else
log_error "✗ Initramfs /init script missing"
((errors++))
fi
# Check that /sbin/init is properly linked to zinit
if [[ -L "${initramfs_dir}/sbin/init" ]]; then
local link_target=$(readlink "${initramfs_dir}/sbin/init")
if [[ "$link_target" == "zinit" ]]; then
@@ -540,75 +622,7 @@ function initramfs_test_archive() {
log_info "Archive integrity test passed"
}
# Export functions
export -f initramfs_setup_zinit initramfs_setup_modules initramfs_create_module_scripts
export -f initramfs_strip_and_upx initramfs_create_cpio
export -f initramfs_validate initramfs_test_archive
# Resolve module dependencies recursively using modinfo
function initramfs_resolve_module_dependencies() {
local modules=("$@")
local resolved_modules=()
local processed_modules=()
log_debug "Resolving dependencies for modules: ${modules[*]}"
# Function to recursively resolve a single module's dependencies
function resolve_single_module() {
local module="$1"
# Skip if already processed
if printf '%s\n' "${processed_modules[@]}" | grep -q "^${module}$"; then
return 0
fi
processed_modules+=("$module")
# Get module dependencies using modinfo
local deps=()
if command_exists "modinfo"; then
# Try to get dependencies - modinfo may fail for built-in modules
local modinfo_output
if modinfo_output=$(modinfo "$module" 2>/dev/null); then
# Extract depends line and parse comma-separated dependencies
local depends_line=$(echo "$modinfo_output" | grep '^depends:' | head -1 | cut -d: -f2- | tr -d ' ')
if [[ -n "$depends_line" && "$depends_line" != "-" ]]; then
IFS=',' read -ra deps <<< "$depends_line"
fi
else
log_debug "modinfo failed for module: $module (may be built-in)"
fi
else
log_warn "modinfo not available, skipping dependency resolution"
fi
# Recursively resolve dependencies first
for dep in "${deps[@]}"; do
if [[ -n "$dep" ]]; then
log_debug "Module $module depends on: $dep"
resolve_single_module "$dep"
fi
done
# Add current module to resolved list (after dependencies)
resolved_modules+=("$module")
}
# Process all requested modules
for module in "${modules[@]}"; do
resolve_single_module "$module"
done
# Remove duplicates while preserving order
local unique_modules=()
local seen_modules=()
for module in "${resolved_modules[@]}"; do
if ! printf '%s\n' "${seen_modules[@]}" | grep -q "^${module}$"; then
unique_modules+=("$module")
seen_modules+=("$module")
fi
done
log_debug "Resolved ${#unique_modules[@]} unique modules with dependencies"
printf '%s\n' "${unique_modules[@]}"
}
# Export all functions at the end after they're all defined
export -f initramfs_setup_zinit initramfs_setup_modules initramfs_resolve_module_dependencies
export -f initramfs_install_init_script initramfs_create_module_scripts initramfs_strip_and_upx
export -f initramfs_create_cpio initramfs_validate initramfs_test_archive