Skip to content

Commit

Permalink
Remove Fedora 38 and CentOS 7
Browse files Browse the repository at this point in the history
Fedora 38 is EOL.  CentOS 7 is going EOL at the end of June and support never
really worked well based on some tickets that have been open for a while.

Removed checks for i386 in spec file since we are only building for x86_64.

Signed-off-by: Michael L. Young <[email protected]>
  • Loading branch information
elguero committed May 16, 2024
1 parent 3d27ed8 commit 08098ff
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 49 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@


<!-- Provide the following information -->
* Fedora / CentOS / Rocky Linux
* Fedora / CentOS Stream / Rocky Linux / AlmaLinux OS
* Version
* Kernel version `(uname -a)`

Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/buildcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,12 @@ jobs:
strategy:
matrix:
include:
- os: fedora
version: 38
dockernamespace: quay.io/fedora/fedora
- os: fedora
version: 39
dockernamespace: quay.io/fedora/fedora
- os: fedora
version: 40
dockernamespace: quay.io/fedora/fedora
- os: centos
version: 7.9.2009
dockernamespace: quay.io/centos/centos
- os: centos-stream
version: stream8
dockernamespace: quay.io/centos/centos
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/mainbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,12 @@ jobs:
strategy:
matrix:
include:
- os: fedora
version: 38
dockernamespace: quay.io/fedora/fedora
- os: fedora
version: 39
dockernamespace: quay.io/fedora/fedora
- os: fedora
version: 40
dockernamespace: quay.io/fedora/fedora
- os: centos
version: 7.9.2009
dockernamespace: quay.io/centos/centos
- os: centos-stream
version: stream8
dockernamespace: quay.io/centos/centos
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,12 @@ jobs:
strategy:
matrix:
include:
- os: fedora
version: 38
dockernamespace: quay.io/fedora/fedora
- os: fedora
version: 39
dockernamespace: quay.io/fedora/fedora
- os: fedora
version: 40
dockernamespace: quay.io/fedora/fedora
- os: centos
version: 7.9.2009
dockernamespace: quay.io/centos/centos
- os: centos-stream
version: stream8
dockernamespace: quay.io/centos/centos
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[![Build Status](https://github.com/displaylink-rpm/displaylink-rpm/actions/workflows/rawhidebuilds.yml/badge.svg)](https://github.com/displaylink-rpm/displaylink-rpm/actions/workflows/rawhidebuilds.yml)

This is the recipe for building the [DisplayLink driver][displaylink]
in a RPM package for Fedora, CentOS 7 and Rocky Linux. This driver supports the following
in a RPM package for Fedora, CentOS Stream, Rocky Linux and AlmaLinux OS. This driver supports the following
device families:

- DL-7xxx
Expand Down
33 changes: 4 additions & 29 deletions displaylink.spec
Original file line number Diff line number Diff line change
Expand Up @@ -121,38 +121,15 @@ cp -a evdi-%{version}/library/libevdi.so.%{version} %{buildroot}%{_libexecdir}/%
ln -sf %{_libexecdir}/%{name}/libevdi.so.%{version} %{buildroot}%{_libexecdir}/%{name}/libevdi.so

# Copy over binaries in package

# Don't copy libusb-1.0.so.0.2.0 it's already shipped by newer versions of libusbx
# CentOS 7 still has older libusbx. Copy over for this distro.

# Don't copy libevdi.so, we compiled it from source

cd displaylink-driver-%{_daemon_version}

cp -a LICENSE ../

%ifarch x86_64
cp -a x64-ubuntu-1604/DisplayLinkManager %{buildroot}%{_libexecdir}/%{name}/

%if 0%{?rhel} && 0%{?rhel} <= 7
cp -a x64-ubuntu-1604/libusb-1.0.so.0.2.0 %{buildroot}%{_libexecdir}/%{name}/
ln -sf %{_libexecdir}/%{name}/libusb-1.0.so.0.2.0 %{buildroot}/%{_libexecdir}/%{name}/libusb-1.0.so.0
ln -sf %{_libexecdir}/%{name}/libusb-1.0.so.0.2.0 %{buildroot}/%{_libexecdir}/%{name}/libusb-1.0.so
%endif

%endif

%ifarch %ix86
cp -a x86-ubuntu-1604/DisplayLinkManager %{buildroot}%{_libexecdir}/%{name}/

%if 0%{?rhel} && 0%{?rhel} <= 7
cp -a x86-ubuntu-1604/libusb-1.0.so.0.2.0 %{buildroot}%{_libexecdir}/%{name}/
ln -sf %{_libexecdir}/%{name}/libusb-1.0.so.0.2.0 %{buildroot}/%{_libexecdir}/%{name}/libusb-1.0.so.0
ln -sf %{_libexecdir}/%{name}/libusb-1.0.so.0.2.0 %{buildroot}/%{_libexecdir}/%{name}/libusb-1.0.so
%endif

%endif

# Firmwares
cp -a ella-dock-release.spkg firefly-monitor-release.spkg navarro-dock-release.spkg ridge-dock-release.spkg %{buildroot}%{_libexecdir}/%{name}/

Expand Down Expand Up @@ -238,12 +215,6 @@ done
%{_libexecdir}/%{name}/ridge-dock-release.spkg
%{_libexecdir}/%{name}/udev.sh

%if 0%{?rhel} && 0%{?rhel} <= 7
%{_libexecdir}/%{name}/libusb-1.0.so.0.2.0
%{_libexecdir}/%{name}/libusb-1.0.so.0
%{_libexecdir}/%{name}/libusb-1.0.so
%endif

%dir %{_localstatedir}/log/%{name}/

%preun
Expand All @@ -254,6 +225,10 @@ done
%systemd_postun_with_restart displaylink-driver.service

%changelog
* Thu May 16 2024 Michael L. Young <[email protected]> 1.14.4-2
- Remove support for CentOS 7 which never really worked and it is EOL at end of June
- Remove checks for i386 since we are only building x86_64

* Mon May 06 2024 Grzegorz Bialek <[email protected]> 1.14.4-2
- Update to new DisplayLink 6.0.0 package
- Remove unneeded patches for newer kernels
Expand Down

0 comments on commit 08098ff

Please sign in to comment.