Skip to content

Commit

Permalink
trying to fix the image dbus/freedesktop error
Browse files Browse the repository at this point in the history
  • Loading branch information
Heus-Sueh committed Dec 26, 2024
1 parent c50063a commit 8936ae0
Show file tree
Hide file tree
Showing 19 changed files with 133 additions and 156 deletions.
19 changes: 1 addition & 18 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,25 +28,8 @@ jobs:
- recipe-nvidia.yml
- recipe-dx-nvidia.yml
- recipe-vm.yml
- recipe-testing-nvidia.yml
steps:
- name: Gather image data from recipe
run: |
echo "IMAGE_NAME=$(grep '^name:' ./recipes/${{ matrix.recipe }} | sed 's/^name: //')" >> $GITHUB_ENV
echo "IMAGE_MAJOR_VERSION=$(grep '^image-version:' ./recipes/${{ matrix.recipe }} | sed 's/^image-version: //')" >> $GITHUB_ENV
BASE_IMAGE=$(grep '^base-image:' ./recipes/${{ matrix.recipe }} | sed 's/^base-image: //')
echo "BASE_IMAGE_NAME=$(echo $BASE_IMAGE | sed 's/.*\/.*\///')" >> $GITHUB_ENV
- name: Validate kernel and kmod versions
run: |
set -eo pipefail
linux=$(skopeo inspect docker://ghcr.io/ublue-os/main-kernel:41 | jq -r '.Labels["ostree.linux"]')
AKMODS_KERNEL_VERSION=$(skopeo inspect docker://ghcr.io/ublue-os/akmods:main-41 | jq -r '.Labels["ostree.linux"]')
if [[ "${linux}" != "${AKMODS_KERNEL_VERSION}" ]]; then
echo "Kernel Versions do not match between AKMODS and Cached-Kernel."
exit 1
fi
echo "KERNEL_VERSION=$linux" >> $GITHUB_ENV
# the build is fully handled by the reusable github action
- name: Build Custom Image
uses: blue-build/[email protected]
Expand Down
File renamed without changes.
76 changes: 76 additions & 0 deletions files/scripts/hwe-additions.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
#!/usr/bin/bash

set -eoux pipefail

if [[ "${IMAGE_NAME}" =~ hwe ]]; then
echo "HWE image detected, installing HWE packages"
else
echo "Standard image detected, skipping HWE packages"
exit 0
fi

# Asus/Surface for HWE
curl --retry 3 -Lo /etc/yum.repos.d/_copr_lukenukem-asus-linux.repo \
https://copr.fedorainfracloud.org/coprs/lukenukem/asus-linux/repo/fedora-$(rpm -E %fedora)/lukenukem-asus-linux-fedora-$(rpm -E %fedora).repo

curl --retry 3 -Lo /etc/yum.repos.d/linux-surface.repo \
https://pkg.surfacelinux.com/fedora/linux-surface.repo

# Asus Firmware
git clone https://gitlab.com/asus-linux/firmware.git --depth 1 /tmp/asus-firmware
cp -rf /tmp/asus-firmware/* /usr/lib/firmware/
rm -rf /tmp/asus-firmware

ASUS_PACKAGES=(
asusctl
asusctl-rog-gui
)

SURFACE_PACKAGES=(
iptsd
libcamera
libcamera-tools
libcamera-gstreamer
libcamera-ipa
pipewire-plugin-libcamera
)

rpm-ostree install \
"${ASUS_PACKAGES[@]}" \
"${SURFACE_PACKAGES[@]}"

tee /usr/lib/modules-load.d/ublue-surface.conf << EOF
# Add modules necessary for Disk Encryption via keyboard
surface_aggregator
surface_aggregator_registry
surface_aggregator_hub
surface_hid_core
8250_dw
# Surface Laptop 3/Surface Book 3 and later
surface_hid
surface_kbd
# Only on AMD models
pinctrl_amd
# Only on Intel models
intel_lpss
intel_lpss_pci
# Surface Book 2
pinctrl_sunrisepoint
# For Surface Laptop 3/Surface Book 3
pinctrl_icelake
# For Surface Laptop 4/Surface Laptop Studio
pinctrl_tigerlake
# For Surface Pro 9/Surface Laptop 5
pinctrl_alderlake
# For Surface Pro 10/Surface Laptop 6
pinctrl_meteorlake
EOF

11 changes: 11 additions & 0 deletions files/scripts/hwe-firmware.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/usr/bin/bash

set -eoux pipefail

mkdir -p /tmp/mediatek-firmware
curl --retry 3 -Lo /tmp/mediatek-firmware/WIFI_MT7922_patch_mcu_1_1_hdr.bin https://gitlab.com/kernel-firmware/linux-firmware/-/raw/8f08053b2a7474e210b03dbc2b4ba59afbe98802/mediatek/WIFI_MT7922_patch_mcu_1_1_hdr.bin?inline=false
curl --retry 3 -Lo /tmp/mediatek-firmware/WIFI_RAM_CODE_MT7922_1.bin https://gitlab.com/kernel-firmware/linux-firmware/-/raw/8f08053b2a7474e210b03dbc2b4ba59afbe98802/mediatek/WIFI_RAM_CODE_MT7922_1.bin?inline=false
xz --check=crc32 /tmp/mediatek-firmware/WIFI_MT7922_patch_mcu_1_1_hdr.bin
xz --check=crc32 /tmp/mediatek-firmware/WIFI_RAM_CODE_MT7922_1.bin
mv -vf /tmp/mediatek-firmware/* /usr/lib/firmware/mediatek/
rm -rf /tmp/mediatek-firmware
25 changes: 0 additions & 25 deletions files/scripts/installproprietarypackages.sh

This file was deleted.

3 changes: 0 additions & 3 deletions files/scripts/installrpmfusion.sh

This file was deleted.

31 changes: 0 additions & 31 deletions files/scripts/installsignedkernel.sh

This file was deleted.

10 changes: 0 additions & 10 deletions files/systemd/system/dconf-update.service

This file was deleted.

2 changes: 1 addition & 1 deletion recipes/modules/akmods.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
type: akmods
base: main # if not specified, classic "main" base is used by default
install:
- v4l2loopback
- nvidia
2 changes: 1 addition & 1 deletion recipes/modules/common-modules.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ modules:
# - from-file: modules/akmods.yml
- from-file: modules/scripts.yml
- from-file: modules/pkgs.yml
- from-file: modules/copr-pkgs.yml
- from-file: modules/extra-pkgs.yml
- from-file: modules/default-flatpaks.yml
- from-file: modules/files.yml
- from-file: modules/fonts.yml
Expand Down
23 changes: 13 additions & 10 deletions recipes/modules/developer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,21 @@ modules:
- docker-ce.repo
- mise.repo
install:
- dbus-x11
# cli
- git-credential-libsecret
- gh
- mise
- neovim
- code
- gcc
- clang
- genisoimage
- ddcutil
- flatpak-builder
- pipx
# Libs
# GTK Stuff
# - gtk4
# - gtk4-layer-shell
# - gobject-introspection-devel
# - cairo-gobject-devel
# Terminal Tools
- evtest
- fastfetch
- tealdeer
- bat
- ugrep
- ripgrep
- zoxide
- zsh
Expand All @@ -36,6 +30,15 @@ modules:
- eza
- direnv
- android-tools
- rclone
# Apps
- code
# Libs
# GTK Stuff
# - gtk4
# - gtk4-layer-shell
# - gobject-introspection-devel
# - cairo-gobject-devel
# Net and VPN
- tailscale
# Virtual Machine
Expand Down
File renamed without changes.
38 changes: 0 additions & 38 deletions recipes/modules/experimental/remove-pkgs.yml

This file was deleted.

18 changes: 0 additions & 18 deletions recipes/modules/experimental/ublue-bling.yml

This file was deleted.

File renamed without changes.
10 changes: 10 additions & 0 deletions recipes/modules/hwe.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
# yaml-language-server: $schema=https://schema.blue-build.org/module-v1.json
modules:
- type: script
snippets: []
# - "curl https://example.com/examplebinary > /usr/bin/examplebinary" # example: download binary
scripts:
- hwe-firmware.sh
- hwe-additions.sh
# - example.sh # example: run files/scripts/example.sh
4 changes: 4 additions & 0 deletions recipes/modules/nvidia.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
---
# yaml-language-server: $schema=https://schema.blue-build.org/module-v1.json
modules:
# - type: akmods
# base: main # if not specified, classic "main" base is used by default
# install:
# - nvidia
- type: script
scripts:
- nvidia.sh
1 change: 0 additions & 1 deletion recipes/modules/pkgs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ install:
- qt6ct
- kvantum
# Themes packages
# - adwaita-qt5 # it looks obsolete
- adw-gtk3-theme
- gnome-themes-extra
- gnome-icon-theme
Expand Down
16 changes: 16 additions & 0 deletions recipes/recipe-testing-nvidia.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
# yaml-language-server: $schema=https://schema.blue-build.org/module-v1.json
name: hyprland-testing-nvidia
description: This is my personal OS image.
base-image: quay.io/fedora-ostree-desktops/base-atomic
image-version: 41 # latest is also supported if you want new updates ASAP
modules:
# ---------------------------------------------------------------------------------------------------------------------------
- from-file: modules/akmods.yml
- from-file: modules/common-modules.yml
- from-file: modules/nvidia.yml
# - from-file: modules/final-scripts.yml
# ---------------------------------------------------------------------------------------------------------------------------
# Signing
- type: signing # this sets up the proper policy & signing files for signed images to work fully
# ----------------------------------------------------------------------------------------------------------------------------

0 comments on commit 8936ae0

Please sign in to comment.