mathben/archlinux-s390x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix ci

Browse source
This commit is contained in:
Josephine Pfeiffer 2025-06-01 12:38:14 +02:00
parent 79d84414e5
commit d7690f4c1d
No known key found for this signature in database
3 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
.github/workflows/release.yml vendored
View file

@ -26,25 +26,38 @@ jobs:
sudo apt-get update sudo apt-get update
sudo apt-get install -y podman sudo apt-get install -y podman
- name: Build containers
run: |
echo "Building required containers..."
# Build the main container
scripts/build-container.sh
# Tag it with the additional name used by initramfs script
sudo podman tag s390x-archlinux-dev s390x-mkinitcpio-complete
- name: Build kernel - name: Build kernel
run: | run: |
echo "Building s390x kernel..." echo "Building s390x kernel..."
scripts/build-all.sh --kernel-only scripts/build-kernel-container.sh
- name: Build initramfs - name: Build initramfs
run: | run: |
echo "Building s390x initramfs..." echo "Building s390x initramfs..."
scripts/build-all.sh --initramfs-only scripts/build-initramfs-final.sh
- name: Prepare boot files
run: |
echo "Preparing boot configuration..."
scripts/prepare-boot.sh
- name: Prepare release artifacts - name: Prepare release artifacts
run: | run: |
mkdir -p release-artifacts mkdir -p release-artifacts
# Copy kernel # Copy kernel
cp output/vmlinuz-linux release-artifacts/vmlinuz-linux-s390x cp output/vmlinuz-6.6.10-s390x release-artifacts/vmlinuz-linux-s390x
# Copy initramfs # Copy initramfs
cp output/initramfs-linux.img release-artifacts/initramfs-linux-s390x.img cp output/initramfs-6.6.10-s390x.img release-artifacts/initramfs-linux-s390x.img
# Copy boot configuration files # Copy boot configuration files
cp -r boot/* release-artifacts/ cp -r boot/* release-artifacts/

2
scripts/build-all.sh
View file

@ -52,7 +52,7 @@ fi
# Setup toolchain path # Setup toolchain path
echo -e "${YELLOW}Setting up toolchain path...${NC}" echo -e "${YELLOW}Setting up toolchain path...${NC}"
source "$PROJECT_ROOT/setup-path.sh" source "$PROJECT_ROOT/scripts/setup-path.sh"
# Parse arguments # Parse arguments
BUILD_KERNEL=true BUILD_KERNEL=true

7
scripts/build-initramfs-final.sh
View file

@ -9,7 +9,7 @@ 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="$PROJECT_ROOT/mkinitcpio-source" MKINITCPIO_SOURCE="$PROJECT_ROOT/mkinitcpio-source"
MKINITCPIO_REPO="https://gitlab.archlinux.org/archlinux/mkinitcpio.git" MKINITCPIO_REPO="https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio.git"
MKINITCPIO_VERSION="v39.2" # Latest stable version MKINITCPIO_VERSION="v39.2" # Latest stable version
# Colors # Colors
@ -137,16 +137,13 @@ PATCH_EOF
echo "✓ Applied s390x patches to base install hook" echo "✓ Applied s390x patches to base install hook"
# Clean any existing build # Clean any existing build directory
rm -rf build rm -rf build
# Build with meson # Build with meson
echo "Setting up meson build..." echo "Setting up meson build..."
meson setup build --prefix=/usr --sysconfdir=/etc meson setup build --prefix=/usr --sysconfdir=/etc
echo "Building mkinitcpio..."
meson compile -C build
echo "Installing mkinitcpio..." echo "Installing mkinitcpio..."
meson install -C build meson install -C build