Skip to content

Commit

Permalink
Merge pull request #3 from ublue-os/main
Browse files Browse the repository at this point in the history 
Merge upstream
  • Loading branch information
@apoordev
apoordev authored Oct 9, 2024
2 parents 08a57e7 + ca6f6e5 commit c0e15e0
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 156 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/reusable-build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,7 @@ jobs:
- onyx
- base
- lazurite
- mate
- vauxite
exclude:
# There is currently no Fedora 40 version of mate
- image_name: mate
fedora_version: 40

steps:
# Checkout push-to-registry action GitHub repository
Expand Down Expand Up @@ -192,7 +187,6 @@ jobs:
SOURCE_ORG=${{ env.SOURCE_ORG }}
SOURCE_IMAGE=${{ env.SOURCE_IMAGE }}
FEDORA_MAJOR_VERSION=${{ matrix.fedora_version }}
RPMFUSION_MIRROR=${{ vars.RPMFUSION_MIRROR }}
KERNEL_VERSION=${{ env.KERNEL_VERSION }}
IMAGE_REGISTRY=${{ env.IMAGE_REGISTRY }}
labels: ${{ steps.meta.outputs.labels }}
Expand Down
1 change: 0 additions & 1 deletion Containerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION}

ARG IMAGE_NAME="${IMAGE_NAME:-silverblue}"
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}"
ARG RPMFUSION_MIRROR="${:-}"
ARG KERNEL_VERSION="${KERNEL_VERSION:-6.9.7-200.fc40.x86_64}"

COPY sys_files/usr /usr
Expand Down
64 changes: 20 additions & 44 deletions install.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,11 @@ RELEASE="$(rpm -E %fedora)"
KERNEL_SUFFIX=""
QUALIFIED_KERNEL="$(rpm -qa | grep -P 'kernel-(|'"$KERNEL_SUFFIX"'-)(\d+\.\d+\.\d+)' | sed -E 's/kernel-(|'"$KERNEL_SUFFIX"'-)//')"

RPMFUSION_MIRROR_RPMS="https://mirrors.rpmfusion.org"
if [ -n "${RPMFUSION_MIRROR}" ]; then
RPMFUSION_MIRROR_RPMS=${RPMFUSION_MIRROR}
fi

mkdir -p /tmp/rpm-repos
curl -Lo /tmp/rpm-repos/rpmfusion-free-release-"${RELEASE}".noarch.rpm "${RPMFUSION_MIRROR_RPMS}"/free/fedora/rpmfusion-free-release-"${RELEASE}".noarch.rpm
curl -Lo /tmp/rpm-repos/rpmfusion-nonfree-release-"${RELEASE}".noarch.rpm "${RPMFUSION_MIRROR_RPMS}"/nonfree/fedora/rpmfusion-nonfree-release-"${RELEASE}".noarch.rpm

curl -Lo /etc/yum.repos.d/_copr_ublue-os_staging.repo https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-"${RELEASE}"/ublue-os-staging-fedora-"${RELEASE}".repo
curl -Lo /etc/yum.repos.d/_copr_kylegospo_oversteer.repo https://copr.fedorainfracloud.org/coprs/kylegospo/oversteer/repo/fedora-"${RELEASE}"/kylegospo-oversteer-fedora-"${RELEASE}".repo

rpm-ostree install \
/tmp/rpms/*.rpm \
/tmp/rpm-repos/*.rpm \
/tmp/akmods-rpms/*.rpm \
fedora-repos-archive

Expand All @@ -42,35 +32,27 @@ else
/tmp/kernel-rpms/kernel-modules-*.rpm
fi

if [[ "${FEDORA_MAJOR_VERSION}" -ge 39 ]]; then
# note: this is done before single mirror hack to ensure this persists in image and is not reset
echo "Enable rpmfusion-(non)free-updates-testing with low priority for Fedora ${FEDORA_MAJOR_VERSION}"
sed -i '0,/enabled=0/{s/enabled=0/enabled=1\npriority=110/}' /etc/yum.repos.d/rpmfusion-*-updates-testing.repo
fi

# Temporary fix for an upstream issue
# https://github.com/coreos/rpm-ostree/issues/5048
if [[ "${FEDORA_MAJOR_VERSION}" -eq 40 ]]; then
rpm-ostree override replace \
--experimental \
--from repo=copr:copr.fedorainfracloud.org:ublue-os:staging \
rpm-ostree \
rpm-ostree-libs
fi

# after F41 launches, bump to 42
if [[ "${FEDORA_MAJOR_VERSION}" -ge 41 ]]; then
# note: this is done before single mirror hack to ensure this persists in image and is not reset
# pre-release rpmfusion is in a different location
sed -i "s%free/fedora/releases%free/fedora/development%" /etc/yum.repos.d/rpmfusion-*.repo
fi
# use negativo17 for 3rd party packages with higher priority than default
curl -Lo /etc/yum.repos.d/negativo17-fedora-multimedia.repo https://negativo17.org/repos/fedora-multimedia.repo
sed -i '0,/enabled=0/{s/enabled=0/enabled=1\npriority=90/}' /etc/yum.repos.d/negativo17-fedora-multimedia.repo

if [ -n "${RPMFUSION_MIRROR}" ]; then
# force use of single rpmfusion mirror
echo "Using single rpmfusion mirror: ${RPMFUSION_MIRROR}"
sed -i.bak "s%^metalink=%#metalink=%" /etc/yum.repos.d/rpmfusion-*.repo
sed -i "s%^#baseurl=http://download1.rpmfusion.org%baseurl=${RPMFUSION_MIRROR}%" /etc/yum.repos.d/rpmfusion-*.repo
fi
# use override to replace mesa and others with less crippled versions
rpm-ostree override replace \
--experimental \
--from repo='fedora-multimedia' \
libheif \
libva \
libva-intel-media-driver \
libvdpau \
mesa-dri-drivers \
mesa-filesystem \
mesa-libEGL \
mesa-libGL \
mesa-libgbm \
mesa-libglapi \
mesa-libxatracker \
mesa-va-drivers \
mesa-vulkan-drivers

# run common packages script
/ctx/packages.sh
Expand All @@ -81,9 +63,3 @@ fi
if [[ "${KERNEL_VERSION}" == "${QUALIFIED_KERNEL}" ]]; then
/ctx/initramfs.sh
fi

if [ -n "${RPMFUSION_MIRROR}" ]; then
# reset forced use of single rpmfusion mirror
echo "Revert from single rpmfusion mirror: ${RPMFUSION_MIRROR}"
rename -v .repo.bak .repo /etc/yum.repos.d/rpmfusion-*repo.bak
fi
113 changes: 8 additions & 105 deletions packages.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,17 @@
"grub2-tools-extra",
"heif-pixbuf-loader",
"htop",
"intel-media-driver",
"intel-vaapi-driver",
"just",
"kernel-tools",
"libcamera",
"libcamera-tools",
"libcamera-gstreamer",
"libcamera-ipa",
"libheif-freeworld",
"libheif-tools",
"libfdk-aac",
"libratbag-ratbagd",
"libva-intel-driver",
"libva-utils",
"libva-utils",
"lshw",
"mesa-va-drivers-freeworld.x86_64",
"net-tools",
"nvme-cli",
"nvtop",
Expand All @@ -43,7 +40,7 @@
"pam-u2f",
"pam_yubico",
"pamu2fcfg",
"pipewire-codec-aptx",
"pipewire-libs-extra",
"pipewire-plugin-libcamera",
"powerstat",
"smartmontools",
Expand All @@ -55,6 +52,7 @@
"traceroute",
"vim",
"wireguard-tools",
"wl-clipboard",
"yubikey-manager",
"zstd"
],
Expand All @@ -71,101 +69,6 @@
"kio-admin",
"ksshaskpass"
],
"mate": [
"NetworkManager-adsl",
"NetworkManager-openconnect-gnome",
"NetworkManager-openvpn-gnome",
"NetworkManager-ppp",
"NetworkManager-pptp-gnome",
"NetworkManager-ssh-gnome",
"NetworkManager-vpnc-gnome",
"NetworkManager-wwan",
"atril",
"atril-caja",
"atril-thumbnailer",
"blueman",
"caja",
"caja-actions",
"caja-image-converter",
"caja-open-terminal",
"caja-sendto",
"caja-wallpaper",
"caja-xattr-tags",
"dconf-editor",
"engrampa",
"eom",
"fedora-release-matecompiz",
"firefox",
"firewall-config",
"gnome-epub-thumbnailer",
"gnome-themes-extra",
"gstreamer1-plugins-ugly-free",
"gtk2-engines",
"gucharmap",
"gvfs-afc",
"gvfs-afp",
"gvfs-archive",
"gvfs-fuse",
"gvfs-gphoto2",
"gvfs-mtp",
"gvfs-nfs",
"gvfs-smb",
"initial-setup-gui",
"libmatekbd",
"libmatemixer",
"libmateweather",
"libsecret",
"lightdm",
"lm_sensors",
"marco",
"mate-applets",
"mate-backgrounds",
"mate-calc",
"mate-control-center",
"mate-desktop-configs",
"mate-dictionary",
"mate-disk-usage-analyzer",
"mate-icon-theme",
"mate-media",
"mate-menus",
"mate-menus-preferences-category-menu",
"mate-notification-daemon",
"mate-panel",
"mate-polkit",
"mate-power-manager",
"mate-screensaver",
"mate-screenshot",
"mate-search-tool",
"mate-session-manager",
"mate-settings-daemon",
"mate-system-log",
"mate-system-monitor",
"mate-terminal",
"mate-themes",
"mate-user-admin",
"mate-user-guide",
"mozo",
"network-manager-applet",
"nm-connection-editor",
"orca",
"parole",
"pavucontrol",
"pipewire-alsa",
"pipewire-pulseaudio",
"pluma",
"seahorse",
"seahorse-caja",
"setroubleshoot",
"slick-greeter-mate",
"system-config-language",
"system-config-printer",
"system-config-printer-applet",
"usermode-gtk",
"xdg-desktop-portal-gtk",
"xdg-user-dirs-gtk",
"xmodmap",
"xrdb"
],
"sericea": [
"clipman",
"gvfs-mtp",
Expand All @@ -179,6 +82,7 @@
},
"exclude": {
"all": [
"fdk-aac-free",
"ffmpeg-free",
"google-noto-sans-cjk-vf-fonts",
"libavcodec-free",
Expand All @@ -188,8 +92,7 @@
"libavutil-free",
"libpostproc-free",
"libswresample-free",
"libswscale-free",
"mesa-va-drivers"
"libswscale-free"
],
"kinoite": [
"ffmpegthumbnailer",
Expand Down Expand Up @@ -221,7 +124,7 @@
"all": [],
"kinoite": [
"kf6-kimageformats",
"qt6-qtimageformats"
"qt6-qtimageformats"
]
},
"exclude": {
Expand Down

0 comments on commit c0e15e0

Please sign in to comment.