Compare commits

...

No commits in common. "c8s" and "c9s" have entirely different histories.
c8s ... c9s

10 changed files with 72 additions and 20 deletions

View File

@ -1 +1 @@
f09d7ffa6aba894b1d92ffd257fd7631ab1779a8 SOURCES/fxload-2008_10_13-noa3load.tar.gz
f09d7ffa6aba894b1d92ffd257fd7631ab1779a8 fxload-2008_10_13-noa3load.tar.gz

3
.gitignore vendored
View File

@ -1 +1,2 @@
SOURCES/fxload-2008_10_13-noa3load.tar.gz
fxload-2002_04_11-noa3load.tar.gz
/fxload-2008_10_13-noa3load.tar.gz

View File

@ -1,12 +0,0 @@
diff -up fxload-2008_10_13/Makefile.cflags fxload-2008_10_13/Makefile
--- fxload-2008_10_13/Makefile.cflags 2008-10-13 17:44:04.000000000 -0400
+++ fxload-2008_10_13/Makefile 2018-02-25 23:11:02.416103160 -0500
@@ -39,7 +39,7 @@ release: rpms
# object files
$(PROG): $(FILES_OBJ)
- $(CC) -o $(PROG) $(FILES_OBJ)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(FILES_OBJ)
%.o: %.c
$(CC) -c $(CFLAGS) $< -o $@

11
fxload-header.patch Normal file
View File

@ -0,0 +1,11 @@
--- ezusb.c 2002-04-12 06:08:01.000000000 +0200
+++ ezusb.c.new 2006-12-07 23:57:04.000000000 +0100
@@ -29,7 +29,7 @@
# include <sys/ioctl.h>
# include <linux/version.h>
-# include <linux/usb.h>
+# include <linux/usb/ch9.h>
# include <linux/usbdevice_fs.h>
# include "ezusb.h"

12
fxload-ldflags.patch Normal file
View File

@ -0,0 +1,12 @@
diff -ruN fxload-2008_10_13.orig/Makefile fxload-2008_10_13/Makefile
--- fxload-2008_10_13.orig/Makefile 2008-10-13 23:44:04.000000000 +0200
+++ fxload-2008_10_13/Makefile 2020-11-03 16:05:41.516974652 +0100
@@ -39,7 +39,7 @@
# object files
$(PROG): $(FILES_OBJ)
- $(CC) -o $(PROG) $(FILES_OBJ)
+ $(CC) $(LDFLAGS) -o $(PROG) $(FILES_OBJ)
%.o: %.c
$(CC) -c $(CFLAGS) $< -o $@

View File

@ -1,6 +1,6 @@
Name: fxload
Version: 2008_10_13
Release: 10%{?dist}
Release: 21%{?dist}
Summary: A helper program to download firmware into FX and FX2 EZ-USB devices
License: GPLv2+
@ -15,9 +15,9 @@ Source0: fxload-%{version}-noa3load.tar.gz
# ./fxload-generate-tarball.sh 2008_10_13
Source1: fxload-generate-tarball.sh
Patch0: fxload-noa3load.patch
Patch1: fxload-cflags-ldflags.patch
Patch1: fxload-ldflags.patch
BuildRequires: gcc kernel-headers
BuildRequires: gcc kernel-headers make
Requires: udev
Conflicts: hotplug-gtk hotplug
@ -30,10 +30,10 @@ appears on the bus.
%prep
%setup -q
%patch0 -p1 -b .fxload-noa3load
%patch1 -p1 -b .cflags
%patch1 -p1 -b .ldflags
%build
make CC=gcc CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
%{make_build} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS -pie"
%install
mkdir -p -m 755 %{buildroot}/sbin
@ -42,13 +42,46 @@ mkdir -p -m 755 %{buildroot}/%{_mandir}/man8/
install -m 644 fxload.8 %{buildroot}/%{_mandir}/man8/
%files
%defattr(0644,root,root,0755)
%doc COPYING
%doc README.txt
%attr(0755, root, root) /sbin/fxload
%{_mandir}/*/*
%changelog
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2008_10_13-21
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 2008_10_13-20
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2008_10_13-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Dec 08 2020 Charles R. Anderson <cra@alum.wpi.edu> - 2008_10_13-18
- BR: make
* Tue Dec 08 2020 Charles R. Anderson <cra@alum.wpi.edu> - 2008_10_13-17
- Merge PR#2: Make annocheck pass, pass -pie to linker, use make_build macro
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2008_10_13-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Feb 03 2020 Tom Stellard <tstellar@redhat.com> - 2008_10_13-15
- Use __cc macro instead of hard-coding gcc
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2008_10_13-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2008_10_13-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2008_10_13-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2008_10_13-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Sun Feb 25 2018 Charles R. Anderson <cra@wpi.edu> - 2008_10_13-10
- Patch to apply CFLAGS/LDFLAGS to final link so RPM_OPT_FLAGS are picked up (rhbz#1548426)
- Use CC=gcc explicitly

6
gating.yaml Normal file
View File

@ -0,0 +1,6 @@
--- !Policy
product_versions:
- rhel-9
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

1
sources Normal file
View File

@ -0,0 +1 @@
c1856eceed08f71a5600a716e10b29f1 fxload-2008_10_13-noa3load.tar.gz