change scripts to use upstream mkincpio instead of local copy

This commit is contained in:
Josephine Pfeiffer 2025-06-01 12:35:33 +02:00
parent 5cb0b445d1
commit 79d84414e5
No known key found for this signature in database

View file

@ -8,7 +8,9 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
PROJECT_ROOT="$(dirname "$SCRIPT_DIR")" PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
OUTPUT_DIR="$PROJECT_ROOT/output" OUTPUT_DIR="$PROJECT_ROOT/output"
INITRAMFS_NAME="initramfs-${KERNEL_VERSION}-s390x.img" INITRAMFS_NAME="initramfs-${KERNEL_VERSION}-s390x.img"
MKINITCPIO_SOURCE="/home/josie/development/archlinux/mkinitcpio" # changeme :) MKINITCPIO_SOURCE="$PROJECT_ROOT/mkinitcpio-source"
MKINITCPIO_REPO="https://gitlab.archlinux.org/archlinux/mkinitcpio.git"
MKINITCPIO_VERSION="v39.2" # Latest stable version
# Colors # Colors
RED='\033[0;31m' RED='\033[0;31m'
@ -18,6 +20,16 @@ NC='\033[0m'
echo -e "${GREEN}=== Building initramfs with modified mkinitcpio ===${NC}" echo -e "${GREEN}=== Building initramfs with modified mkinitcpio ===${NC}"
# Clone mkinitcpio from upstream
echo -e "${YELLOW}Cloning mkinitcpio from upstream...${NC}"
rm -rf "$MKINITCPIO_SOURCE"
git clone --depth 1 --branch "$MKINITCPIO_VERSION" "$MKINITCPIO_REPO" "$MKINITCPIO_SOURCE"
if [ $? -ne 0 ]; then
echo -e "${RED}Failed to clone mkinitcpio${NC}"
exit 1
fi
echo -e "${GREEN}✓ Cloned mkinitcpio ${MKINITCPIO_VERSION}${NC}"
# Create build script that runs inside container # Create build script that runs inside container
cat > "$PROJECT_ROOT/build-final-initramfs.sh" << 'EOF' cat > "$PROJECT_ROOT/build-final-initramfs.sh" << 'EOF'
#!/bin/bash #!/bin/bash
@ -286,10 +298,7 @@ EOF
chmod +x "$PROJECT_ROOT/build-final-initramfs.sh" chmod +x "$PROJECT_ROOT/build-final-initramfs.sh"
# Copy the mkinitcpio source to our project for mounting # mkinitcpio source already cloned at the beginning of the script
echo -e "${YELLOW}Copying mkinitcpio source...${NC}"
rm -rf "$PROJECT_ROOT/mkinitcpio-source"
cp -r "$MKINITCPIO_SOURCE" "$PROJECT_ROOT/mkinitcpio-source"
# Run mkinitcpio in container # Run mkinitcpio in container
echo -e "${YELLOW}Running modified mkinitcpio for s390x...${NC}" echo -e "${YELLOW}Running modified mkinitcpio for s390x...${NC}"