Skip to content

Commit

Permalink
general clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
fossrob committed Nov 4, 2023
1 parent d4fc063 commit b4f10dc
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 69 deletions.
1 change: 1 addition & 0 deletions Containerfile.fedora-kmods
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ ARG FEDORA_VERSION

RUN echo "Prepare for build..." && \
ln -s /usr/bin/dnf5 /usr/bin/dnf && \
for i in $(ls /etc/yum.repos.d/*); do sed -i $i -re 's/^#baseurl/baseurl/' -e 's/^manifest/#manifest/'; done && \
sed -i /etc/yum.repos.d/fedora-cisco-openh264.repo -re 's/enabled=1/enabled=0/' && \
sed -i /etc/yum.repos.d/fedora-updates-testing.repo -re 's/enabled=0/enabled=1/' && \
mkdir -p /rpms && mkdir -p /var/lib/alternatives && \
Expand Down
21 changes: 10 additions & 11 deletions fedora-custom.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ basearch: x86_64
repos:
- fedora
- fedora-updates
- fedora-updates-testing
- fedora-updates-testing # remove after fedora 39 stable launch
- fedora-cisco-openh264
- rpmfusion-free
- rpmfusion-free-updates
Expand All @@ -24,7 +24,7 @@ packages:
- grub2-efi-x64
- shim
# dracut
- binutils
- binutils # used during initramfs build for strip by rpm-ostree
- memstrack
- pigz
# kernel
Expand Down Expand Up @@ -62,8 +62,7 @@ packages:
- plymouth
# printing
- hplip
# useful tools (fd-find, fzf, the_silver_searcher: dev container rather?)
- binutils # used during initramfs build for strip by rpm-ostree
# tools
- dnf5
- dnf5-plugins
- git-core
Expand All @@ -84,15 +83,15 @@ exclude-packages:
- PackageKit
- PackageKit-glib
- braille-printer-app # removes quite a lot, recommended by cups-filters
- gdouros-symbola-fonts # recommended by ibus-typing-booster
- gnome-color-manager # recommended by gnome-control-centre
- gnome-tour # recommended by gnome-shell
- grubby # recommended by crypto-policies-scripts
- initscripts-service # recommended by audit
- gdouros-symbola-fonts # gets recommended by ibus-typing-booster
- gnome-color-manager # gets recommended by gnome-control-centre
- gnome-tour # gets recommended by gnome-shell
- grubby # gets recommended by crypto-policies-scripts
- initscripts-service # gets recommended by audit
- qemu-user-static # not using other arch containers, recommended by containers-common-extra
- rygel # upnp media server, recommended by gnome-control-center
- sane-backends-drivers-cameras # recommended by sane-backends-libs
- systemd-networkd # recommended by systemd, we are using networkmanager
- sane-backends-drivers-cameras # gets recommended by sane-backends-libs
- systemd-networkd # gets recommended by systemd, we are using networkmanager

add-files:
- ["tailscale.repo", "/etc/yum.repos.d/tailscale.repo"]
Expand Down
11 changes: 4 additions & 7 deletions fedora.repo
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
[fedora]
name=Fedora $releasever - $basearch
baseurl=https://dl.fedoraproject.org/pub/fedora/linux/development/$releasever/Everything/$basearch/os/
https://dl.fedoraproject.org/pub/fedora-secondary/development/$releasever/Everything/$basearch/os/
# baseurl=https://dl.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
# https://dl.fedoraproject.org/pub/fedora-secondary/releases/$releasever/Everything/$basearch/os/
baseurl=https://dl.fedoraproject.org/pub/fedora/linux/development/$releasever/Everything/$basearch/os/
https://dl.fedoraproject.org/pub/fedora-secondary/development/$releasever/Everything/$basearch/os/
# metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
enabled=1
gpgcheck=1
metadata_expire=1h

[fedora-updates]
name=Fedora $releasever - $basearch - Updates
Expand All @@ -16,7 +15,6 @@ baseurl=https://dl.fedoraproject.org/pub/fedora/linux/updates/$releasever/Everyt
# metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
enabled=1
gpgcheck=1
metadata_expire=1h

[fedora-updates-testing]
name=Fedora $releasever - $basearch - Test Updates
Expand All @@ -25,11 +23,10 @@ baseurl=https://dl.fedoraproject.org/pub/fedora/linux/updates/testing/$releaseve
# metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
enabled=1
gpgcheck=1
metadata_expire=1h

[fedora-cisco-openh264]
name=Fedora $releasever openh264 (From Cisco) - $basearch
metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-cisco-openh264-$releasever&arch=$basearch
baseurl=https://codecs.fedoraproject.org/openh264/$releasever/$basearch/os/
# metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-cisco-openh264-$releasever&arch=$basearch
enabled=1
gpgcheck=1
metadata_expire=1h
35 changes: 0 additions & 35 deletions negativo17.repo

This file was deleted.

10 changes: 8 additions & 2 deletions rpmfusion.repo
Original file line number Diff line number Diff line change
@@ -1,41 +1,47 @@
[rpmfusion-free]
name=RPM Fusion for Fedora $releasever - Free
baseurl=https://download1.rpmfusion.org/free/fedora/development/$releasever/Everything/$basearch/os/
https://download0.rpmfusion.org/free/fedora/development/$releasever/Everything/$basearch/os/
# metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-$releasever&arch=$basearch
enabled=1
gpgcheck=0

[rpmfusion-free-updates]
name=RPM Fusion for Fedora $releasever - Free - Updates
baseurl=https://download1.rpmfusion.org/free/fedora/updates/39/x86_64/
baseurl=https://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/
https://download0.rpmfusion.org/free/fedora/updates/$releasever/$basearch/
# metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-$releasever&arch=$basearch
enabled=1
gpgcheck=0

[rpmfusion-free-updates-testing]
name=RPM Fusion for Fedora $releasever - Free - Test Updates
baseurl=http://download1.rpmfusion.org/free/fedora/updates/testing/$releasever/$basearch/
http://download0.rpmfusion.org/free/fedora/updates/testing/$releasever/$basearch/
# metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-$releasever&arch=$basearch
enabled=1
gpgcheck=0

[rpmfusion-nonfree]
name=RPM Fusion for Fedora $releasever - Nonfree
baseurl=https://download1.rpmfusion.org/nonfree/fedora/development/$releasever/Everything/$basearch/os/
https://download0.rpmfusion.org/nonfree/fedora/development/$releasever/Everything/$basearch/os/
# metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-$releasever&arch=$basearch
enabled=1
gpgcheck=0

[rpmfusion-nonfree-updates]
name=RPM Fusion for Fedora $releasever - Nonfree - Updates
baseurl=https://download1.rpmfusion.org/nonfree/fedora/updates/39/x86_64/
baseurl=https://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/
https://download0.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/
# metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch
enabled=1
gpgcheck=0

[rpmfusion-nonfree-updates-testing]
name=RPM Fusion for Fedora $releasever - Nonfree - Test Updates
baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/testing/$releasever/$basearch/
http://download0.rpmfusion.org/nonfree/fedora/updates/testing/$releasever/$basearch/
# metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch
enabled=1
gpgcheck=0
7 changes: 0 additions & 7 deletions terra.repo

This file was deleted.

7 changes: 0 additions & 7 deletions ublue.repo

This file was deleted.

0 comments on commit b4f10dc

Please sign in to comment.