[wl-kmod] Rework SPEC file in order to build for RHEL 8.x
by Nicolas Viéville
commit df370aa0c2127011c223d7684c30e39536eacff8
Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
Date: Tue Sep 24 21:29:03 2019 +0200
Rework SPEC file in order to build for RHEL 8.x
Signed-off-by: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
wl-kmod.spec | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
---
diff --git a/wl-kmod.spec b/wl-kmod.spec
index 99b5b25..8846205 100644
--- a/wl-kmod.spec
+++ b/wl-kmod.spec
@@ -230,6 +230,27 @@ pushd %{name}-%{version}-src
%endif
%endif
%endif
+%if 0%{?rhel} == 8
+ # Define kvl (linux) & kvr (release) for use in "patching" logical
+ %define kvl %(echo %{kernel_versions} | cut -d"-" -f1)
+ %define kvr %(echo %{kernel_versions} | cut -d"-" -f2 | cut -d"." -f1)
+
+ # Perform "patching" edits to the src/wl/sys/wl_cfg80211_hybrid.c file.
+ # Note: Using this method, as opposed to making a patch, allows
+ # the src.rpm to be compiled under various point release kernels.
+ # Note: Use [ >][>=] where both >= & > are present
+ %if "%{kvl}" == "4.18.0"
+ %if %{kvr} == 80
+ # Only apply to EL 8.0 point release
+ # > No changes currently needed for EL 8.0 point release
+ fi
+ %endif
+ %if %{kvr} >= 80
+ # Apply to EL 8.0 point release and later
+ # > No changes currently needed for EL 8.0 point release
+ %endif
+ %endif
+%endif
popd
for kernel_version in %{?kernel_versions} ; do
4 years, 7 months
[wl-kmod] Reworked patch to workaround RHBZ#1703745 and RFBZ#5245
by Nicolas Viéville
commit b36d952799a76b18f89d82a7b5b1d0dc1d4705bd
Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
Date: Tue Sep 24 21:26:38 2019 +0200
Reworked patch to workaround RHBZ#1703745 and RFBZ#5245
Signed-off-by: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
wl-kmod-016_fix_unsupported_mesh_point.patch | 104 ++++++++++++++++++++++++++-
1 file changed, 101 insertions(+), 3 deletions(-)
---
diff --git a/wl-kmod-016_fix_unsupported_mesh_point.patch b/wl-kmod-016_fix_unsupported_mesh_point.patch
index ba8f449..db407b1 100644
--- a/wl-kmod-016_fix_unsupported_mesh_point.patch
+++ b/wl-kmod-016_fix_unsupported_mesh_point.patch
@@ -1,19 +1,117 @@
diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_cfg80211_hybrid.c hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_cfg80211_hybrid.c
--- hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_cfg80211_hybrid.c 2019-04-14 17:35:23.565460847 +0200
-+++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_cfg80211_hybrid.c 2019-05-19 17:23:24.985525866 +0200
-@@ -522,6 +522,7 @@
++++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_cfg80211_hybrid.c 2019-06-01 14:37:25.675650990 +0200
+@@ -522,6 +522,10 @@
switch (type) {
case NL80211_IFTYPE_MONITOR:
case NL80211_IFTYPE_WDS:
+ case NL80211_IFTYPE_MESH_POINT:
++ case NL80211_IFTYPE_P2P_DEVICE:
++ case NL80211_IFTYPE_P2P_CLIENT:
++ case NL80211_IFTYPE_P2P_GO:
WL_ERR(("type (%d) : currently we do not support this type\n",
type));
return -EOPNOTSUPP;
-@@ -2944,6 +2945,7 @@
+@@ -532,6 +536,10 @@
+ wl->conf->mode = WL_MODE_BSS;
+ infra = 1;
+ break;
++ case NL80211_IFTYPE_AP:
++ wl->conf->mode = WL_MODE_AP;
++ ap = 1;
++ break;
+ default:
+ return -EINVAL;
+ }
+@@ -1893,6 +1901,8 @@
+ return NL80211_IFTYPE_STATION;
+ case WL_MODE_IBSS:
+ return NL80211_IFTYPE_ADHOC;
++ case WL_MODE_AP:
++ return NL80211_IFTYPE_AP;
+ default:
+ return NL80211_IFTYPE_UNSPECIFIED;
+ }
+@@ -1900,6 +1910,46 @@
+ return err;
+ }
+
++static const struct ieee80211_txrx_stypes
++wl_txrx_stypes[NUM_NL80211_IFTYPES] = {
++ [NL80211_IFTYPE_STATION] = {
++ .tx = 0xffff,
++ .rx = BIT(IEEE80211_STYPE_ACTION >> 4) |
++ BIT(IEEE80211_STYPE_PROBE_REQ >> 4)
++ },
++ [NL80211_IFTYPE_AP] = {
++ .tx = 0xffff,
++ .rx = BIT(IEEE80211_STYPE_ASSOC_REQ >> 4) |
++ BIT(IEEE80211_STYPE_REASSOC_REQ >> 4) |
++ BIT(IEEE80211_STYPE_PROBE_REQ >> 4) |
++ BIT(IEEE80211_STYPE_DISASSOC >> 4) |
++ BIT(IEEE80211_STYPE_AUTH >> 4) |
++ BIT(IEEE80211_STYPE_DEAUTH >> 4) |
++ BIT(IEEE80211_STYPE_ACTION >> 4)
++ }
++};
++
++static const struct ieee80211_iface_limit wl_limits[] = {
++ {
++ .max = 1,
++ .types = BIT(NL80211_IFTYPE_STATION),
++ },
++ {
++ .max = 1,
++ .types = BIT(NL80211_IFTYPE_AP),
++ },
++};
++
++static const struct ieee80211_iface_combination wl_combination [] = {
++ {
++ .limits = wl_limits,
++ .n_limits = ARRAY_SIZE(wl_limits),
++ .max_interfaces = 2,
++ .num_different_channels = 1,
++ .beacon_int_infra_match = true,
++ },
++};
++
+ static s32 wl_alloc_wdev(struct device *dev, struct wireless_dev **rwdev)
+ {
+ struct wireless_dev *wdev;
+@@ -1922,7 +1972,10 @@
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)
+ wdev->wiphy->max_num_pmkids = WL_NUM_PMKIDS_MAX;
+ #endif
+- wdev->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC);
++ wdev->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC) | BIT(NL80211_IFTYPE_AP);
++ wdev->wiphy->iface_combinations = wl_combination;
++ wdev->wiphy->n_iface_combinations = ARRAY_SIZE(wl_combination);
++ wdev->wiphy->mgmt_stypes = wl_txrx_stypes;
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
+ wdev->wiphy->bands[NL80211_BAND_2GHZ] = &__wl_band_2ghz;
+ wdev->wiphy->bands[NL80211_BAND_5GHZ] = &__wl_band_5ghz_a;
+@@ -2944,15 +2997,22 @@
switch (iftype) {
case NL80211_IFTYPE_MONITOR:
case NL80211_IFTYPE_WDS:
+ case NL80211_IFTYPE_MESH_POINT:
++ case NL80211_IFTYPE_P2P_DEVICE:
++ case NL80211_IFTYPE_P2P_CLIENT:
++ case NL80211_IFTYPE_P2P_GO:
WL_ERR(("type (%d) : currently we do not support this mode\n",
iftype));
+- err = -EINVAL;
++ err = -EOPNOTSUPP;
+ return err;
+ case NL80211_IFTYPE_ADHOC:
+ break;
+ case NL80211_IFTYPE_STATION:
+ infra = 1;
+ break;
++ case NL80211_IFTYPE_AP:
++ ap = 1;
++ break;
+ default:
err = -EINVAL;
+ WL_ERR(("invalid type (%d)\n", iftype));
4 years, 7 months
[rfpkg] Update to 1.26.0 Sync with fedpkg 1.37
by Sérgio M. Basto
commit 13765a7c183c66cd7207f61e10d01c0a0accbe59
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Sep 24 16:30:51 2019 +0100
Update to 1.26.0
Sync with fedpkg 1.37
koji_destname.patch | 40 -------------------------
py3.patch | 84 -----------------------------------------------------
rfpkg.spec | 70 ++++++++++++++++++--------------------------
sources | 2 +-
4 files changed, 29 insertions(+), 167 deletions(-)
---
diff --git a/rfpkg.spec b/rfpkg.spec
index d6a35b1..7a6072c 100644
--- a/rfpkg.spec
+++ b/rfpkg.spec
@@ -4,15 +4,13 @@
%endif
Name: rfpkg
-Version: 1.25.6
-Release: 5%{?dist}
+Version: 1.26.0
+Release: 1%{?dist}
Summary: RPM Fusion utility for working with dist-git
License: GPLv2+
Group: Applications/System
URL: https://github.com/rpmfusion-infra/rfpkg
Source0: %url/archive/v%{version}/%{name}-%{version}.tar.gz
-Patch0: py3.patch
-Patch1: koji_destname.patch
BuildArch: noarch
@@ -23,12 +21,12 @@ BuildArch: noarch
%bcond_without python2
%endif
+BuildRequires: pkgconfig
BuildRequires: bash-completion
BuildRequires: git
-Requires: bodhi-client
-Requires: redhat-rpm-config
Requires: koji
+Requires: redhat-rpm-config
%if %{with python2}
# This package redefines __python and can use the python_ macros
@@ -36,16 +34,15 @@ Requires: koji
BuildRequires: python2-devel
BuildRequires: python2-setuptools
-BuildRequires: pkgconfig
# We br these things for man page generation due to imports
BuildRequires: rpmfusion-cert
BuildRequires: packagedb-cli > 2.2
-BuildRequires: pyrpkg >= 1.44
+BuildRequires: python2-rpkg >= 1.45
# For testing
BuildRequires: python-nose
BuildRequires: python-mock
-Requires: pyrpkg >= 1.45
+Requires: python2-rpkg >= 1.45
Requires: python-pycurl
Requires: python-fedora
Requires: rpmfusion-cert
@@ -59,7 +56,6 @@ Requires: packagedb-cli > 2.2
BuildRequires: python3-devel
BuildRequires: python3-future
BuildRequires: python3-setuptools
-BuildRequires: pkgconfig
# We br these things for man page generation due to imports
BuildRequires: python3-rpmfusion-cert
@@ -67,8 +63,8 @@ BuildRequires: rfpkgdb-cli
BuildRequires: python3-rpkg
# For testing
-BuildRequires: python3-nose
BuildRequires: python3-mock
+BuildRequires: python3-nose
Requires: python3-rpkg
Requires: redhat-rpm-config
@@ -81,54 +77,44 @@ Requires: bodhi-client
Requires: rfpkgdb-cli
%endif
+
%description
RPM Fusion utility for working with dist-git.
%prep
%setup -q
-%if ! %{with python2}
-%patch0 -p1
-%endif
-%patch1 -p1
%build
-%if %{with python2}
-%py2_build
-%{__python2} src/rfpkg_man_page.py > rfpkg.1
-%else
-%py3_build
-%{__python3} src/rfpkg_man_page.py > rfpkg.1
-%endif
+%py_build
+%{__python} doc/rfpkg_man_page.py > rfpkg.1
-%install
-%if %{with python2}
-%py2_install
-sed -e 's|^#!python|#!%{__python2}|g' -i $RPM_BUILD_ROOT%{_bindir}/rfpkg
-chmod a+x $RPM_BUILD_ROOT%{python2_sitelib}/rfpkg/__main__.py
-
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-install -p -m 0644 rfpkg.1 $RPM_BUILD_ROOT%{_mandir}/man1
+%install
+%py_install
+%{__install} -d %{buildroot}%{_mandir}/man1
+%{__install} -p -m 0644 rfpkg.1 %{buildroot}%{_mandir}/man1
%if 0%{?rhel} && 0%{?rhel} == 7
# The completion file must be named similarly to the command.
-mv $RPM_BUILD_ROOT%{compdir}/rfpkg.bash $RPM_BUILD_ROOT%{compdir}/rfpkg
+mv %{buildroot}%{compdir}/rfpkg.bash $RPM_BUILD_ROOT%{compdir}/rfpkg
%endif
-%else
-%py3_install
-sed -e 's|^#!python|#!%{__python3}|g' -i $RPM_BUILD_ROOT%{_bindir}/rfpkg
-sed -e 's|^#!/usr/bin/python2|#!%{__python3}|g' -i $RPM_BUILD_ROOT%{python3_sitelib}/rfpkg/__main__.py
-chmod a+x $RPM_BUILD_ROOT%{python3_sitelib}/rfpkg/__main__.py
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-install -p -m 0644 rfpkg.1 $RPM_BUILD_ROOT%{_mandir}/man1
+%check
+%if 0%{?rhel} == 6
+# cannot use -m nose on EL6 (python 2.6)
+nosetests
+%else
+#{__python} -m nose
%endif
%files
%doc README
%license COPYING
+%config(noreplace) %{_sysconfdir}/rpkg/rfpkg.conf
+%(dirname %{compdir})
%{_bindir}/rfpkg
+%{_mandir}/man1/rfpkg.1*
%if %{with python2}
%{python2_sitelib}/rfpkg/
%{python2_sitelib}/rfpkg-%{version}-py%{python2_version}.egg-info/
@@ -136,15 +122,15 @@ install -p -m 0644 rfpkg.1 $RPM_BUILD_ROOT%{_mandir}/man1
%{python3_sitelib}/rfpkg/
%{python3_sitelib}/rfpkg-%{version}-py%{python3_version}.egg-info/
%endif
-%{_mandir}/man1/rfpkg.1*
-%(dirname %{compdir})
-%dir %{_sysconfdir}/rpkg
-%config(noreplace) %{_sysconfdir}/rpkg/rfpkg.conf
# zsh completion
%{_datadir}/zsh/site-functions/_%{name}
%changelog
+* Tue Sep 24 2019 Sérgio Basto <sergio(a)serjux.com> - 1.26.0-1
+- Update to 1.26.0
+- Sync with fedpkg 1.37
+
* Sat Aug 24 2019 Leigh Scott <leigh123linux(a)gmail.com> - 1.25.6-5
- Rebuild for python-3.8
diff --git a/sources b/sources
index b4b8241..947b215 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8410c807b744ce80b44da4ea2cc8d418 rfpkg-1.25.6.tar.gz
+61971193932cdfd6b934816d40056f8d02f72b3481792504463adeca03747b85ff6eebf0425b0ff8a8ec5d89b77c94aa6f04e19a3558c76f4effff3546ce84c0 rfpkg-1.26.0.tar.gz
4 years, 7 months
[chromium-vaapi/f30: 10/10] Merge branch 'master' into f30
by hellbanger
commit 578480cc1f1d85788c18958dd9005c9a60b8a616
Merge: b65c857 9d56b6c
Author: Akarshan Biswas <akarshanbiswas(a)fedoraproject.org>
Date: Tue Sep 24 10:00:42 2019 +0530
Merge branch 'master' into f30
...VPP-on-Linux-Add-some-info-logs-and-fix-v.patch | 154 -------------
UseNormalBAM.patch | 82 +++++++
brand.patch | 2 +-
chromium-base-location.patch | 13 ++
chromium-gcc9-r666279.patch | 59 -----
chromium-gcc9-r666336.patch | 40 ----
chromium-gcc9-r666401.patch | 48 ----
chromium-gcc9-r666436.patch | 42 ----
chromium-gcc9-r666619.patch | 38 ----
chromium-gcc9-r666714.patch | 111 ----------
chromium-gcc9-r667064.patch | 114 ----------
chromium-gcc9-r667228.patch | 102 ---------
chromium-gcc9-r667260.patch | 46 ----
chromium-gcc9-r667484.patch | 68 ------
chromium-gcc9-r667901.patch | 105 ---------
chromium-gcc9-r668015.patch | 72 ------
chromium-gcc9-r668033.patch | 124 -----------
chromium-gcc9-r670973.patch | 55 -----
chromium-gcc9-r670980.patch | 61 -----
chromium-gcc9-r681321.patch | 35 +++
chromium-gcc9-r681333.patch | 71 ++++++
chromium-gcc9-r684731.patch | 138 ++++++++++++
chromium-quiche-gcc9.patch | 245 ---------------------
chromium-skia-harmony.patch | 14 --
chromium-unbundle-zlib.patch | 25 +++
chromium-vaapi.spec | 147 +++++++------
enable-vaapi.patch | 62 +++---
link-against-harfbuzz-subset.patch | 55 +++++
sources | 2 +-
29 files changed, 528 insertions(+), 1602 deletions(-)
---
4 years, 7 months
[chromium-vaapi/f30] (10 commits) ...Merge branch 'master' into f30
by hellbanger
Summary of changes:
4fb0363... Correct writting either RPM Fusion or rpmfusion (*)
97b636a... Update to 77.0.3865.90 Disabled Nvidia support (*)
7b33c54... Use the bundled python2 as python2 is going to be removed f (*)
58a9a8f... Add build requires: /usr/bin/python2 (*)
08af7c1... Preserve bundled pylibs (*)
6724e3f... Rebundle harfbuzz (*)
0257b50... Enable Shiftshader support (*)
5b41de2... Revert "Rebundle harfbuzz" (*)
9d56b6c... Add patch from upstream to fix building with system harfbuz (*)
578480c... Merge branch 'master' into f30
(*) This commit already existed in another branch; no separate mail sent
4 years, 7 months
[chromium-vaapi/f31] (9 commits) ...Add patch from upstream to fix building with system harfbuzz
by hellbanger
Summary of changes:
4fb0363... Correct writting either RPM Fusion or rpmfusion (*)
97b636a... Update to 77.0.3865.90 Disabled Nvidia support (*)
7b33c54... Use the bundled python2 as python2 is going to be removed f (*)
58a9a8f... Add build requires: /usr/bin/python2 (*)
08af7c1... Preserve bundled pylibs (*)
6724e3f... Rebundle harfbuzz (*)
0257b50... Enable Shiftshader support (*)
5b41de2... Revert "Rebundle harfbuzz" (*)
9d56b6c... Add patch from upstream to fix building with system harfbuz (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 7 months
[rfpkg] minor improvements
by Sérgio M. Basto
commit 9b5596843a006ce1954c95d6a61cba480b4c25a1
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Sep 24 01:29:49 2019 +0100
minor improvements
rfpkg.spec | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/rfpkg.spec b/rfpkg.spec
index 6fa576c..d6a35b1 100644
--- a/rfpkg.spec
+++ b/rfpkg.spec
@@ -16,7 +16,7 @@ Patch1: koji_destname.patch
BuildArch: noarch
-# fedpkg command switched to python3 on Fedora 30 and RHEL > 8:
+# fedpkg command switched to python3 on Fedora 30 and RHEL > 7:
%if 0%{?fedora} > 29 || 0%{?rhel} > 7
%bcond_with python2
%else
@@ -36,7 +36,7 @@ Requires: koji
BuildRequires: python2-devel
BuildRequires: python2-setuptools
-BuildRequires: python2-setuptools pkgconfig
+BuildRequires: pkgconfig
# We br these things for man page generation due to imports
BuildRequires: rpmfusion-cert
BuildRequires: packagedb-cli > 2.2
@@ -59,7 +59,7 @@ Requires: packagedb-cli > 2.2
BuildRequires: python3-devel
BuildRequires: python3-future
BuildRequires: python3-setuptools
-BuildRequires: python3-setuptools pkgconfig
+BuildRequires: pkgconfig
# We br these things for man page generation due to imports
BuildRequires: python3-rpmfusion-cert
@@ -86,7 +86,7 @@ RPM Fusion utility for working with dist-git.
%prep
%setup -q
-%if 0%{?fedora} > 29 || 0%{?rhel} > 7
+%if ! %{with python2}
%patch0 -p1
%endif
%patch1 -p1
4 years, 7 months
[rfpkg/el8] Tweak %%if for el8
by Leigh Scott
Summary of changes:
9ef1bde... Tweak %%if for el8 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 7 months
[rfpkg] Tweak %%if for el8
by Leigh Scott
commit 9ef1bdec4e73f0291d122afd8744c60979a8f688
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Sep 23 19:32:09 2019 +0100
Tweak %%if for el8
rfpkg.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/rfpkg.spec b/rfpkg.spec
index fcbdc00..6fa576c 100644
--- a/rfpkg.spec
+++ b/rfpkg.spec
@@ -17,7 +17,7 @@ Patch1: koji_destname.patch
BuildArch: noarch
# fedpkg command switched to python3 on Fedora 30 and RHEL > 8:
-%if 0%{?fedora} > 29 || 0%{?rhel} > 8
+%if 0%{?fedora} > 29 || 0%{?rhel} > 7
%bcond_with python2
%else
%bcond_without python2
@@ -86,7 +86,7 @@ RPM Fusion utility for working with dist-git.
%prep
%setup -q
-%if 0%{?fedora} > 29 || 0%{?rhel} > 8
+%if 0%{?fedora} > 29 || 0%{?rhel} > 7
%patch0 -p1
%endif
%patch1 -p1
4 years, 7 months
