ver4a/ostree-native-containers
1
0
Fork 0
Code Activity Actions

Compare commits

base: ver4a:3ec2883d7bab58d8056af675ae694420d7123ba3
Branches Tags
ver4a:main
...
compare: ver4a:e57c27451167edaeea06cf811d3f6efe952d9a7e
Branches Tags
ver4a:main

2 commits
3ec2883d7b ... e57c274511

Author SHA1 Message Date
ver4a
e57c274511 Revert "build: move configuration after build scripts"
Some checks failed
/ Build onc-kde:main (push) Failing after 41m16s
Details
/ Build onc-kde:main-ver4a (push) Has been skipped
Details
/ Build onc-kde:main-nvidia (push) Has been skipped
Details
/ Build onc-kde:main-nvidia-ver4a (push) Has been skipped
Details 
This change broke scx config generation.

This reverts commit 3ec2883d7b.
 2026-02-20 10:18:54 +01:00
ver4a
80f135638f fix: restore custom prompt 
Removing the bash-color-prompt package removed the customized prompt,
the default prompt will now stay in place, and the custom will load
after.
 2026-02-20 09:58:50 +01:00
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
containers/Dockerfile.kde
View file

@ -35,13 +35,13 @@ COPY --from=scx-build /build/scx/services/scx.service /usr/lib/systemd/system/sc
# dnf configuration has to be in effect during build # dnf configuration has to be in effect during build
COPY etc/dnf /etc/dnf COPY etc/dnf /etc/dnf
# Apply configuration
COPY etc /etc
COPY usr /usr
# Run build logic # Run build logic
COPY build-scripts/kde.bash /tmp/kde.bash COPY build-scripts/kde.bash /tmp/kde.bash
RUN chmod +x /tmp/kde.bash RUN chmod +x /tmp/kde.bash
RUN /tmp/kde.bash RUN /tmp/kde.bash
# Apply configuration
COPY etc /etc
COPY usr /usr
LABEL quay.expires-after="" LABEL quay.expires-after=""

3
containers/build-scripts/kde.bash
View file

@ -18,9 +18,6 @@ PKGS_NTSYNC="ntsync-autoload"
# Add packages # Add packages
dnf5 -y install --allowerasing ${PKGS_CODECS} ${PKGS_UTILS} ${PKGS_GENERAL} ${PKGS_DEFAULT_EDITOR} ${PKGS_NTSYNC} dnf5 -y install --allowerasing ${PKGS_CODECS} ${PKGS_UTILS} ${PKGS_GENERAL} ${PKGS_DEFAULT_EDITOR} ${PKGS_NTSYNC}
# Remove default color prompt (is replaced with a custom one)
dnf5 -y remove bash-color-prompt
# Apply configuration # Apply configuration
# fix-up kconfig path # fix-up kconfig path
sed -i "/SCX_FLAGS=/ s/$/ --kconfig \/usr\/lib\/modules\/$(rpm -qa kernel | sed 's/kernel-//g')\/config/" /etc/default/scx sed -i "/SCX_FLAGS=/ s/$/ --kconfig \/usr\/lib\/modules\/$(rpm -qa kernel | sed 's/kernel-//g')\/config/" /etc/default/scx