Skip to content

Commit 297cc6d

Browse files
committed
mkosi: dev-fedora: Use [Match] for cross compiler packages
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
1 parent 43cb62c commit 297cc6d

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[Content]
2+
Packages=binutils-x86_64-linux-gnu
3+
gcc-x86_64-linux-gnu
4+
[Match]
5+
Architecture=arm64
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[Content]
2+
Packages=binutils-aarch64-linux-gnu
3+
gcc-aarch64-linux-gnu
4+
[Match]
5+
Architecture=x86-64

mkosi/dev-fedora/mkosi.postinst.d/01-install-packages.fish.chroot

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
# Setup external repos
44
curl -LSso /etc/yum.repos.d/gh-cli.repo https://cli.github.com/packages/rpm/gh-cli.repo
5+
or return
56

67
echo '[tuxmake]
78
name=tuxmake
@@ -14,15 +15,6 @@ enabled=1' >/etc/yum.repos.d/tuxmake.repo
1415
dnf update -y
1516
or return
1617

17-
set packages \
18+
dnf install -y \
1819
gh \
1920
tuxmake
20-
switch $ARCHITECTURE
21-
case arm64
22-
set -a packages {binutils,gcc}-x86_64-linux-gnu
23-
case x86-64
24-
set -a packages {binutils,gcc}-aarch64-linux-gnu
25-
end
26-
27-
dnf install -y $packages
28-
or return

0 commit comments

Comments
 (0)