Skip to content

Commit

Permalink
Merge branch 'main' into switch-latest-to-upstream-kernel
Browse files Browse the repository at this point in the history
  • Loading branch information
bsherman authored Oct 6, 2024
2 parents 3712e72 + a642333 commit 8aec558
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/reusable-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ jobs:
echo "digest=${digest}" >> $GITHUB_OUTPUT
# Sign container
- uses: sigstore/cosign-installer@4959ce089c160fddf62f7b42464195ba1a56d382 # v3.6.0
- uses: sigstore/cosign-installer@dc72c7d5c4d10cd6bcb8cf6e3fd625a9e5e537da # v3.7.0
if: github.event_name != 'pull_request'

- name: Sign container image
Expand Down
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,27 @@
# Changelog

## [3.5.0](https://github.com/ublue-os/bluefin/compare/v3.4.0...v3.5.0) (2024-10-04)


### Features

* Add os-release changes from Bazzite ([#1708](https://github.com/ublue-os/bluefin/issues/1708)) ([78671f2](https://github.com/ublue-os/bluefin/commit/78671f218b60e52e4240b480f1319e19d6f1cfbb))
* add setools-console ([#1738](https://github.com/ublue-os/bluefin/issues/1738)) ([a6996d2](https://github.com/ublue-os/bluefin/commit/a6996d21776ce492f5480b5c40102d3a37ede74b))
* add specific flatpaks to dx images ([#1732](https://github.com/ublue-os/bluefin/issues/1732)) ([85714c3](https://github.com/ublue-os/bluefin/commit/85714c3943b2649b3d2cba729b48a4b80c1f8d8d))
* **bluefin-cli:** add trash-cli ([#1720](https://github.com/ublue-os/bluefin/issues/1720)) ([4f15f91](https://github.com/ublue-os/bluefin/commit/4f15f9157cbd2e525229b0782cfae54602b75bf3))
* **dx:** add virt-v2v ([#1733](https://github.com/ublue-os/bluefin/issues/1733)) ([a7bf567](https://github.com/ublue-os/bluefin/commit/a7bf567538713b084222908f7980c0805fc08677))
* fix weird titlebar on chromium ([#1709](https://github.com/ublue-os/bluefin/issues/1709)) ([9fe6e1c](https://github.com/ublue-os/bluefin/commit/9fe6e1c5dd0a1778e92458efed896ee7254c42e1))
* **framework:** add color profile for the new fw13 screen ([#1705](https://github.com/ublue-os/bluefin/issues/1705)) ([09f8bae](https://github.com/ublue-os/bluefin/commit/09f8baeeef0fd6a529983cbd1f64377dab8b6e0b))


### Bug Fixes

* Correct doubled build ID in DX images ([#1714](https://github.com/ublue-os/bluefin/issues/1714)) ([afee492](https://github.com/ublue-os/bluefin/commit/afee4926b1ee2f1417703c2d3dc4e9ef073491e9))
* don't update if on a metered connection ([#1658](https://github.com/ublue-os/bluefin/issues/1658)) ([76fb411](https://github.com/ublue-os/bluefin/commit/76fb4117c1a5c68805ab3801ad680dbc90d45a5f))
* ensure gnome-extensions-app is removed ([#1724](https://github.com/ublue-os/bluefin/issues/1724)) ([a2c65af](https://github.com/ublue-os/bluefin/commit/a2c65af00821491c7aa28527276fc4e90c27c6a1))
* remove scx-scheds ([#1723](https://github.com/ublue-os/bluefin/issues/1723)) ([cce3a1c](https://github.com/ublue-os/bluefin/commit/cce3a1cf24bcdf2563c11560280ef28cc4b63824))
* rename discourse shortcut to community ([#1710](https://github.com/ublue-os/bluefin/issues/1710)) ([7b8091e](https://github.com/ublue-os/bluefin/commit/7b8091e7e882f21f8d1a9ad2847c5633a696cf48))

## [3.4.0](https://github.com/ublue-os/bluefin/compare/v3.3.0...v3.4.0) (2024-09-27)


Expand Down
5 changes: 0 additions & 5 deletions build_files/copr-repos-dx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,3 @@ curl -Lo /etc/yum.repos.d/atim-ubuntu-fonts-fedora-"${FEDORA_MAJOR_VERSION}".rep

# Kvmfr module
curl -Lo /etc/yum.repos.d/hikariknight-looking-glass-kvmfr-fedora-"${FEDORA_MAJOR_VERSION}".repo https://copr.fedorainfracloud.org/coprs/hikariknight/looking-glass-kvmfr/repo/fedora-"${FEDORA_MAJOR_VERSION}"/hikariknight-looking-glass-kvmfr-fedora-"${FEDORA_MAJOR_VERSION}".repo

# Renenable RPMFusion
sed -i '0,/enabled=0/s//enabled=1/' /etc/yum.repos.d/rpmfusion-{,non}free.repo
sed -i '0,/enabled=0/s//enabled=1/' /etc/yum.repos.d/rpmfusion-{,non}free-updates.repo
sed -i '0,/enabled=0/s//enabled=1/' /etc/yum.repos.d/rpmfusion-{,non}free-updates-testing.repo
14 changes: 9 additions & 5 deletions build_files/install-akmods.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,22 @@ if [[ "${NVIDIA_TYPE}" == "nvidia" ]]; then
rm -f /usr/share/vulkan/icd.d/nouveau_icd.*.json
fi

curl -Lo /etc/yum.repos.d/negativo17-fedora-multimedia.repo https://negativo17.org/repos/fedora-multimedia.repo
sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo

# Everyone
rpm-ostree install \
/tmp/akmods/kmods/*xone*.rpm \
/tmp/akmods/kmods/*openrazer*.rpm \
/tmp/akmods/kmods/*wl*.rpm \
/tmp/akmods/kmods/*v4l2loopback*.rpm
/tmp/akmods/kmods/*openrazer*.rpm
# /tmp/akmods-rpms/kmods/*framework-laptop*.rpm

sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/negativo17-fedora-multimedia.repo
# rpmfusion dependent kmods
rpm-ostree install \
https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm \
https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
rpm-ostree install \
broadcom-wl /tmp/akmods/kmods/*wl*.rpm \
v4l2loopback /tmp/akmods/kmods/*v4l2loopback*.rpm
rpm-ostree uninstall rpmfusion-free-release rpmfusion-nonfree-release

# ZFS for gts/stable
if [[ ${AKMODS_FLAVOR} =~ "coreos" ]]; then
Expand Down
2 changes: 1 addition & 1 deletion just/bluefin-tools.just
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ ollama ACTION="help":
echo "open-webui container already exists, skipping..."
fi
systemctl --user daemon-reload
echo "Ollama Web UI container started. You can access it at http://localhost:8080"
echo "Ollama Open WebUI service installed."
elif [[ "${OPTION,,}" == "remove" ]]; then
echo "Removing ollama container"
echo "stopping ollama Quadlet"
Expand Down
1 change: 1 addition & 0 deletions packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
"samba-winbind-clients",
"samba-winbind-modules",
"samba",
"setools-console",
"solaar",
"sssd-ad",
"sssd-ipa",
Expand Down
1 change: 1 addition & 0 deletions system_files/shared/etc/ublue-update/ublue-update.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
min_battery_percent = 20.0
max_cpu_load_percent = 50.0
max_mem_percent = 90.0
network_not_metered = true # Abort if network connection is metered
[notify]
dbus_notify = false

0 comments on commit 8aec558

Please sign in to comment.