Skip to content

Commit

Permalink
update sysroot recipes
Browse files Browse the repository at this point in the history
  • Loading branch information
Marc-André Moreau authored and awakecoding committed Dec 11, 2024
1 parent a69a0fc commit 4b7fffe
Show file tree
Hide file tree
Showing 19 changed files with 112 additions and 72 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cbake-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@ jobs:
$ReleaseTitle = "CBake v${Version}"
$Repository = $Env:GITHUB_REPOSITORY
& gh release create $ReleaseTag --repo $Repository --title $ReleaseTitle --draft ./*
& gh release create $ReleaseTag --repo $Repository --title $ReleaseTitle ./*
13 changes: 12 additions & 1 deletion .github/workflows/cbake-sysroots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,18 @@ jobs:
fail-fast: false
matrix:
arch: [ amd64, arm64 ]
distro: [ ubuntu-18.04, ubuntu-20.04, ubuntu-22.04, debian-10, debian-11, rhel8, rhel9, alpine-3.17, fedora-37, opensuse-15.4 ]
distro:
- ubuntu-18.04
- ubuntu-20.04
- ubuntu-22.04
- ubuntu-24.04
- debian-10
- debian-11
- debian-12
- rhel8
- rhel9
- alpine-3.17
- alpine-3.21

include:
- os: linux
Expand Down
1 change: 0 additions & 1 deletion VERSION

This file was deleted.

22 changes: 13 additions & 9 deletions cbake.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,16 @@ function Convert-CBakeSymbolicLinks() {
[string] $RootPath
)

$ReparsePoints = Get-ChildItem $RootPath -Recurse | `
$ReparsePoints = Get-ChildItem $RootPath -Recurse |
Where-Object { $_.Attributes -band [IO.FileAttributes]::ReparsePoint }
$AbsSymlinks = $ReparsePoints | Where-Object { $_.LinkTarget.StartsWith('/') }
$AbsSymlinks | ForEach-Object {
$Source = $_.FullName
$Directory = $_.Directory
$Target = Join-Path $RootPath $_.LinkTarget
if (Test-Path $Target) {
Push-Location
Set-Location $_.Directory
Set-Location $Directory
$Target = Resolve-Path -Path $Target -Relative
Remove-Item $Source | Out-Null
New-Item -ItemType SymbolicLink -Path $Source -Target $Target | Out-Null
Expand All @@ -32,7 +33,7 @@ function Remove-CBakeSymbolicLinks() {
[string] $RootPath
)

$ReparsePoints = Get-ChildItem $RootPath -Recurse | `
$ReparsePoints = Get-ChildItem $RootPath -Recurse |
Where-Object { $_.Attributes -band [IO.FileAttributes]::ReparsePoint }
$ReparsePoints | ForEach-Object {
$Source = $_.FullName
Expand All @@ -50,7 +51,7 @@ function Remove-CBakeExcludedFiles() {
[string] $RootPath
)

$exclude_dirs = @(
$ExcludeDirs = @(
'/bin',
'/boot',
'/etc',
Expand Down Expand Up @@ -78,14 +79,17 @@ function Remove-CBakeExcludedFiles() {
'/usr/local/games',
'/usr/local/share',
'/usr/local/src',
'/usr/local')
'/usr/local'
)

foreach ($exclude_dir in $exclude_dirs) {
$exclude_dir = Join-Path $ExportPath $exclude_dir
Remove-Item -Path $exclude_dir -Recurse -Force -ErrorAction 'SilentlyContinue' | Out-Null
$ExcludeDirs | ForEach-Object {
$ExcludeDir = Join-Path $ExportPath $_
Remove-Item -Path $ExcludeDir -Recurse -Force -ErrorAction 'SilentlyContinue' | Out-Null
}

Get-ChildItem -Path "/usr/share" -Exclude "pkgconfig" | foreach ($_) { Remove-Item $_.FullName -Force -Recurse -ErrorAction 'SilentlyContinue' } | Out-Null
Get-ChildItem -Path "/usr/share" -Exclude "pkgconfig" | ForEach-Object {
Remove-Item $_.FullName -Force -Recurse -ErrorAction 'SilentlyContinue' | Out-Null
}
}

function Optimize-CBakeSysroot() {
Expand Down
2 changes: 1 addition & 1 deletion recipes/alpine-3.17/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.17
FROM alpine:3.21

RUN apk add --no-cache \
gcc \
Expand Down
File renamed without changes.
1 change: 1 addition & 0 deletions recipes/alpine-3.21/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
alpine-3.21-*/
20 changes: 20 additions & 0 deletions recipes/alpine-3.21/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
FROM alpine:3.21

RUN apk add --no-cache \
gcc \
g++ \
openssl-dev \
libxcursor-dev \
libxkbfile-dev \
libxinerama-dev \
libxv-dev \
libxdamage-dev \
libxi-dev \
libxkbcommon-dev \
cups-dev \
alsa-lib-dev \
ffmpeg-dev \
gst-plugins-base-dev \
gsm-dev \
libusb-dev \
wayland-dev
2 changes: 1 addition & 1 deletion recipes/debian-10/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ RUN apt-get install -y \
libusb-1.0-0-dev \
libudev-dev \
libsdl2-dev \
libsdl2-ttf-dev
libsdl2-ttf-dev
File renamed without changes.
1 change: 1 addition & 0 deletions recipes/debian-12/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
debian-12-*/
28 changes: 28 additions & 0 deletions recipes/debian-12/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
FROM debian:bookworm-slim

ARG DEBIAN_FRONTEND=noninteractive

RUN apt-get update -y

RUN apt-get install -y \
gcc \
libssl-dev \
libpam-dev \
libkrb5-dev \
libffi-dev \
libsystemd-dev \
libx11-dev \
libxtst-dev \
libxcursor-dev \
libxrandr-dev \
libgtk2.0-dev \
libgtk-3-dev \
libglib2.0-dev \
libappindicator-dev \
libappindicator3-dev \
libnotify-dev \
libcups2-dev \
libusb-1.0-0-dev \
libudev-dev \
libsdl2-dev \
libsdl2-ttf-dev
1 change: 0 additions & 1 deletion recipes/fedora-37/.gitignore

This file was deleted.

26 changes: 0 additions & 26 deletions recipes/fedora-37/Dockerfile

This file was deleted.

1 change: 0 additions & 1 deletion recipes/opensuse-15.4/.gitignore

This file was deleted.

30 changes: 0 additions & 30 deletions recipes/opensuse-15.4/Dockerfile

This file was deleted.

2 changes: 2 additions & 0 deletions recipes/ubuntu-24.04/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
**/
*.tar.*
1 change: 1 addition & 0 deletions recipes/ubuntu-24.04/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ubuntu-22.04-*/
31 changes: 31 additions & 0 deletions recipes/ubuntu-24.04/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
FROM ubuntu:24.04

ARG DEBIAN_FRONTEND=noninteractive

RUN sed -i 's/archive.ubuntu.com/ubuntu.mirrors.ovh.net/g' /etc/apt/sources.list
RUN apt-get update -y

RUN apt-get install -y \
gcc \
libssl-dev \
libpam-dev \
libkrb5-dev \
libffi-dev \
libsystemd-dev \
libx11-dev \
libxtst-dev \
libxcursor-dev \
libxrandr-dev \
libgtk2.0-dev \
libgtk-3-dev \
libglib2.0-dev \
libappindicator3-dev \
libnotify-dev \
libcups2-dev \
libusb-1.0-0-dev \
libudev-dev \
libsdl2-dev \
libsdl2-ttf-dev \
libsoup-3.0-dev \
libwebkit2gtk-4.1-dev \
libvte-2.91-dev

0 comments on commit 4b7fffe

Please sign in to comment.