mirror/bazzite
1
0
Fork 0
mirror of https://github.com/ublue-os/bazzite.git synced 2025-02-04 12:39:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Restore distrobox-git

Browse Source
This commit is contained in:
Kyle Gospodnetich 2023-08-13 10:37:21 -07:00
parent bf6767af9e
commit 65de6c8374
8 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Containerfile
View File

@ -31,6 +31,7 @@ RUN sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo
# Setup Copr repos
RUN wget https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/repo/fedora-$(rpm -E %fedora)/kylegospo-bazzite-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_kylegospo-bazzite.repo && \
wget https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite-multilib/repo/fedora-$(rpm -E %fedora)/kylegospo-bazzite-multilib-fedora-$(rpm -E %fedora).repo?arch=x86_64 -O /etc/yum.repos.d/_copr_kylegospo-bazzite-multilib.repo && \
wget https://copr.fedorainfracloud.org/coprs/ublue-os/distrobox-git/repo/fedora-$(rpm -E %fedora)/ublue-os-distrobox-git-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_ublue-os-distrobox-git.repo && \
wget https://copr.fedorainfracloud.org/coprs/kylegospo/system76-scheduler/repo/fedora-$(rpm -E %fedora)/kylegospo-system76-scheduler-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_kylegospo-system76-scheduler.repo && \
wget https://copr.fedorainfracloud.org/coprs/kylegospo/hl2linux-selinux/repo/fedora-$(rpm -E %fedora)/kylegospo-hl2linux-selinux-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_kylegospo-hl2linux-selinux.repo && \
wget https://copr.fedorainfracloud.org/coprs/kylegospo/obs-vkcapture/repo/fedora-$(rpm -E %fedora)/kylegospo-obs-vkcapture-fedora-$(rpm -E %fedora).repo?arch=x86_64 -O /etc/yum.repos.d/_copr_kylegospo-obs-vkcapture.repo && \
@ -45,13 +46,15 @@ RUN rpm-ostree override remove \
firefox \
firefox-langpacks \
toolbox \
htop
htop \
distrobox
# Install new packages
RUN rpm-ostree install \
extest.i686 \
python3-pip \
libadwaita \
distrobox-git \
duperemove \
rmlint \
compsize \
@ -137,6 +140,7 @@ RUN rm /usr/share/applications/shredder.desktop && \
pip install --prefix=/usr yafti && \
sed -i 's/stage/none/g' /etc/rpm-ostreed.conf && \
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo && \
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ublue-os-distrobox-git.repo && \
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-bazzite.repo && \
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-bazzite-multilib.repo && \
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-system76-scheduler.repo && \

1
README.md
View File

@ -157,6 +157,7 @@ Ported SteamOS and ChimeraOS packages, among others used by Bazzite, are built o
Additionally, the following packages are used from other Copr repos:
|Package|Status|
|---|---|
|[distrobox](https://github.com/89luca89/distrobox)-git|![Build Status](https://copr.fedorainfracloud.org/coprs/ublue-os/distrobox-git/package/distrobox-git/status_image/last_build.png?)|
|[gcadapter_oc-kmod](https://copr.fedorainfracloud.org/coprs/ublue-os/akmods/)|![Build Status](https://copr.fedorainfracloud.org/coprs/ublue-os/akmods/package/gcadapter_oc-kmod/status_image/last_build.png?)|
|[gnome-vrr](https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/)|![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/package/mutter/status_image/last_build.png?)|
|[gradience](https://copr.fedorainfracloud.org/coprs/lyessaadi/gradience/)|![Build Status](https://copr.fedorainfracloud.org/coprs/lyessaadi/gradience/package/gradience/status_image/last_build.png?)|

3
system_files/desktop/kinoite/usr/share/ublue-os/distrobox/bazzite-arch
View File

@ -8,3 +8,6 @@ replace=false
start_now=true
volume=/usr/lib/extest/libextest.so:/usr/lib/extest/libextest.so
init_hooks=pacman -S rocm-opencl-runtime rocm-hip-runtime --noconfirm && runuser -u $USER -- paru -S steamcmd --noconfirm
exported_apps="steam lutris protontricks"
exported_bins="/usr/bin/steamcmd"
exported_bins_path="~/.steam"

5
system_files/desktop/kinoite/usr/share/ublue-os/distrobox/bazzite-arch-nvidia
View File

@ -6,5 +6,8 @@ pull=true
root=false
replace=false
start_now=true
volume=/usr/lib/extest/libextest.so:/usr/lib/extest/libextest.so /usr/lib64/libnvidia-vulkan-producer.so:/usr/lib64/libnvidia-vulkan-producer.so
volume=/usr/lib/extest/libextest.so:/usr/lib/extest/libextest.so
init_hooks=runuser -u $USER -- paru -S steamcmd --noconfirm
exported_apps="steam lutris protontricks"
exported_bins="/usr/bin/steamcmd"
exported_bins_path="~/.steam"

2
system_files/desktop/shared/usr/bin/bazzite-hardware-setup
View File

@ -33,7 +33,7 @@ if [[ ":Jupiter:" =~ ":$SYS_ID:" ]]; then
fi
if [[ ! $KARGS =~ "amdgpu.gttsize" ]]; then
if [[ "$(awk '/MemTotal/{print $(NF-1)}' /proc/meminfo)" = "31664740" ]]; then
if [[ "$(awk '/MemTotal/{print $(NF-1)}' /proc/meminfo)" == "31664740" ]]; then
echo "32GB Steam Deck detected"
NEEDED_KARGS="$NEEDED_KARGS --append=amdgpu.gttsize=16256"
else

8
system_files/desktop/shared/usr/share/ublue-os/just/custom.just
View File

@ -1,6 +1,8 @@
install-bazzite-arch:
#!/usr/bin/env bash
source /etc/default/bazzite
mkdir -p ~/.steam
if [[ ${IMAGE_FLAVOR} == 'nvidia' ]]; then
echo 'Installing Bazzite Arch (Nvidia)...'
distrobox assemble create --file /usr/share/ublue-os/distrobox/bazzite-arch-nvidia
@ -9,15 +11,11 @@ install-bazzite-arch:
distrobox assemble create --file /usr/share/ublue-os/distrobox/bazzite-arch
fi
distrobox-enter -n bazzite-arch -- ' /usr/bin/bazzite-steam-runtime --silent &'
distrobox-enter -n bazzite-arch -- ' distrobox-export --app steam'
cp ~/.local/share/applications/bazzite-arch-steam.desktop ~/.config/autostart/bazzite-arch-steam-silent.desktop
sed -i 's@/usr/bin/bazzite-steam-runtime %U@/usr/bin/bazzite-steam-runtime -silent %U@g' ~/.config/autostart/bazzite-arch-steam-silent.desktop
distrobox-enter -n bazzite-arch -- ' distrobox-export --app lutris'
distrobox-enter -n bazzite-arch -- ' distrobox-export --app protontricks'
mkdir -p ~/.steam
distrobox-enter -n bazzite-arch -- ' distrobox-export --bin /usr/bin/steamcmd --export-path ~/.steam'
mv ~/.steam/steamcmd ~/.steam/steamcmd.sh
if [[ ${BASE_IMAGE_NAME} == 'kinoite' ]]; then
echo 'Creating desktop shortcuts...'
cp ~/.local/share/applications/bazzite-arch-steam.desktop ~/Desktop/bazzite-arch-steam.desktop
sed -i 's@ (on bazzite-arch)@@g' ~/Desktop/bazzite-arch-steam.desktop
cp ~/.local/share/applications/bazzite-arch-net.lutris.Lutris.desktop ~/Desktop/bazzite-arch-net.lutris.Lutris.desktop

3
system_files/desktop/silverblue/usr/share/ublue-os/distrobox/bazzite-arch
View File

@ -8,3 +8,6 @@ replace=false
start_now=true
volume=/usr/lib/extest/libextest.so:/usr/lib/extest/libextest.so
init_hooks=pacman -Rnsdd xdg-desktop-portal-kde --noconfirm && pacman -S xdg-desktop-portal-gnome rocm-opencl-runtime rocm-hip-runtime --noconfirm && runuser -u $USER -- paru -S steamcmd adw-gtk3 --noconfirm
exported_apps="steam lutris protontricks"
exported_bins="/usr/bin/steamcmd"
exported_bins_path="~/.steam"

5
system_files/desktop/silverblue/usr/share/ublue-os/distrobox/bazzite-arch-nvidia
View File

@ -6,5 +6,8 @@ pull=true
root=false
replace=false
start_now=true
volume=/usr/lib/extest/libextest.so:/usr/lib/extest/libextest.so /usr/lib64/libnvidia-vulkan-producer.so:/usr/lib64/libnvidia-vulkan-producer.so
volume=/usr/lib/extest/libextest.so:/usr/lib/extest/libextest.so
init_hooks=pacman -Rnsdd xdg-desktop-portal-kde --noconfirm && pacman -S xdg-desktop-portal-gnome --noconfirm && runuser -u $USER -- paru -S steamcmd adw-gtk3 --noconfirm
exported_apps="steam lutris protontricks"
exported_bins="/usr/bin/steamcmd"
exported_bins_path="~/.steam"