Skip to content

Commit

Permalink
Merge branch 'stable' into stable-kde
Browse files Browse the repository at this point in the history
  • Loading branch information
@honjow
honjow committed Dec 9, 2024
2 parents 7afa6cb + ec1a984 commit ce3569c
Show file tree
Hide file tree
Showing 10 changed files with 32 additions and 30 deletions.
6 changes: 3 additions & 3 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,6 @@
[submodule "aur-pkgs/yay-git"]
path = aur-pkgs/yay-git
url = https://aur.archlinux.org/yay-git.git
[submodule "aur-pkgs/edid-decode-git"]
path = aur-pkgs/edid-decode-git
url = https://aur.archlinux.org/edid-decode-git.git
[submodule "aur-pkgs/hhd-ui"]
path = aur-pkgs/hhd-ui
url = https://aur.archlinux.org/hhd-ui.git
Expand All @@ -148,3 +145,6 @@
[submodule "aur-pkgs/parui"]
path = aur-pkgs/parui
url = https://aur.archlinux.org/parui.git
[submodule "aur-pkgs/v4l-utils-git"]
path = aur-pkgs/v4l-utils-git
url = https://aur.archlinux.org/v4l-utils-git.git
4 changes: 2 additions & 2 deletions all-install.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ else
fi

for package in ${OWN_PACKAGES_TO_DELETE}; do
rm -f "/own_pkgs/${package}" || true
rm -f /own_pkgs/${package} || true
done

# install own override packages
Expand Down Expand Up @@ -64,7 +64,7 @@ done

# remove AUR packages
for package in ${AUR_PACKAGES_TO_DELETE}; do
rm -f "/extra_pkgs/${package}" || true
rm -f /extra_pkgs/${package} || true
done

# install AUR packages
Expand Down
2 changes: 1 addition & 1 deletion aur-pkgs/amdgpu-test-scripts-git
Submodule amdgpu-test-scripts-git updated from f35f7a to 97c68b
1 change: 0 additions & 1 deletion aur-pkgs/edid-decode-git
Submodule edid-decode-git deleted from 437757
2 changes: 1 addition & 1 deletion aur-pkgs/gamescope-sk
Submodule gamescope-sk updated from 828e9f to 9aac66
2 changes: 1 addition & 1 deletion aur-pkgs/hhd
Submodule hhd updated from 02a72a to 52c94a
2 changes: 1 addition & 1 deletion aur-pkgs/hhd-ui
Submodule hhd-ui updated from 030977 to 249257
2 changes: 1 addition & 1 deletion aur-pkgs/mission-center
Submodule mission-center updated from 63a2cf to 9d268c
1 change: 1 addition & 0 deletions aur-pkgs/v4l-utils-git
Submodule v4l-utils-git added at 7fdfdc
40 changes: 21 additions & 19 deletions manifest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,24 +215,25 @@ export PACKAGES="\
export PACKAGE_OVERRIDES="\
https://github.com/3003n/linux-chimeraos/releases/download/v6.11.9-sko1-1/linux-chimeraos-6.11.9.sko1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/linux-chimeraos/releases/download/v6.11.9-sko1-1/linux-chimeraos-headers-6.11.9.sko1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0-chos1-1/lib32-libva-mesa-driver-1--24.3.0.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0-chos1-1/lib32-mesa-1--24.3.0.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0-chos1-1/lib32-mesa-vdpau-1--24.3.0.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0-chos1-1/lib32-opencl-rusticl-mesa-1--24.3.0.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0-chos1-1/lib32-vulkan-intel-1--24.3.0.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0-chos1-1/lib32-vulkan-mesa-layers-1--24.3.0.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0-chos1-1/lib32-vulkan-radeon-1--24.3.0.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0-chos1-1/lib32-vulkan-nouveau-1--24.3.0.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0-chos1-1/lib32-vulkan-swrast-1--24.3.0.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0-chos1-1/libva-mesa-driver-1--24.3.0.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0-chos1-1/mesa-1--24.3.0.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0-chos1-1/mesa-vdpau-1--24.3.0.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0-chos1-1/opencl-rusticl-mesa-1--24.3.0.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0-chos1-1/vulkan-intel-1--24.3.0.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0-chos1-1/vulkan-mesa-layers-1--24.3.0.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0-chos1-1/vulkan-radeon-1--24.3.0.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0-chos1-1/vulkan-nouveau-1--24.3.0.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0-chos1-1/vulkan-swrast-1--24.3.0.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.1-chos1-1/lib32-mesa-1--24.3.1.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.1-chos1-1/lib32-opencl-clover-mesa-1--24.3.1.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.1-chos1-1/lib32-opencl-rusticl-mesa-1--24.3.1.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.1-chos1-1/lib32-vulkan-intel-1--24.3.1.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.1-chos1-1/lib32-vulkan-mesa-layers-1--24.3.1.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.1-chos1-1/lib32-vulkan-nouveau-1--24.3.1.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.1-chos1-1/lib32-vulkan-radeon-1--24.3.1.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.1-chos1-1/lib32-vulkan-swrast-1--24.3.1.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.1-chos1-1/lib32-vulkan-virtio-1--24.3.1.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.1-chos1-1/mesa-1--24.3.1.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.1-chos1-1/mesa-docs-1--24.3.1.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.1-chos1-1/opencl-clover-mesa-1--24.3.1.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.1-chos1-1/opencl-rusticl-mesa-1--24.3.1.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.1-chos1-1/vulkan-intel-1--24.3.1.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.1-chos1-1/vulkan-mesa-layers-1--24.3.1.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.1-chos1-1/vulkan-nouveau-1--24.3.1.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.1-chos1-1/vulkan-radeon-1--24.3.1.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.1-chos1-1/vulkan-swrast-1--24.3.1.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.1-chos1-1/vulkan-virtio-1--24.3.1.chos1-1-x86_64.pkg.tar.zst \
https://ns.switchsystem.eu.org/d/guest/stos/pkgs/mutter-x11-scaling-47.1-2-x86_64.pkg.tar.zst \
"

Expand All @@ -249,7 +250,6 @@ export AUR_PACKAGES="\
chimeraos-device-quirks-sk-git \
downgrade \
ds-inhibit \
edid-decode-git \
evdev-keepalive \
frzr-sk \
gamescope-session-sk-git \
Expand Down Expand Up @@ -288,6 +288,7 @@ export AUR_PACKAGES="\
sk-chos-tool \
steam_notif_daemon \
tsukimi-bin \
v4l-utils-git \
waydroid \
waydroid-script-git \
yay-git \
Expand All @@ -304,6 +305,7 @@ export PACKAGES_TO_DELETE="\
openvr \
pulseaudio \
pulseaudio-alsa \
v4l-utils \
"
export OWN_PACKAGES_TO_DELETE=""

Expand Down

0 comments on commit ce3569c

Please sign in to comment.