[packages/xen] - note on DEVEL branch
commit 3cd1c8617bcba8eb32025658f3bd692d20fab5cd Author: Jakub BoguszDate: Tue Aug 1 05:32:01 2017 +0200 - note on DEVEL branch xen.spec | 1 + 1 file changed, 1 insertion(+) --- diff --git a/xen.spec b/xen.spec index 71e38ce..449b028 100644 --- a/xen.spec +++ b/xen.spec @@ -39,6 +39,7 @@ Summary: Xen - a virtual machine monitor Summary(pl.UTF-8): Xen - monitor maszyny wirtualnej Name: xen +# NOTE: 4.9.0 being prepared on DEVEL branch Version: 4.6.6 Release: 1 License: GPL v2, interface parts on BSD-like gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xen.git/commitdiff/3cd1c8617bcba8eb32025658f3bd692d20fab5cd ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/dlm] - note on Source URL
commit 7a8ded5c3443c990657a4f837698d6bc2ad5017e Author: Jakub BoguszDate: Tue Aug 1 05:30:30 2017 +0200 - note on Source URL dlm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/dlm.spec b/dlm.spec index 1183a28..f0e702e 100644 --- a/dlm.spec +++ b/dlm.spec @@ -10,7 +10,7 @@ Release: 1 License: LGPL v2.1+, GPL v2 Group: Libraries # formerly https://git.fedorahosted.org/cgit/dlm.git/snapshot/%{name}-%{version}.tar.gz -# in the future probably https://pagure.io/dlm/releases +# in the future http://releases.pagure.org/dlm/%{name}-%{release}.tar.gz (4.0.7 is repacked) Source0: %{name}-%{version}.tar.gz # Source0-md5: a16563a92198ca57064b270d43452e47 Source1: %{name}.init gitweb: http://git.pld-linux.org/gitweb.cgi/packages/dlm.git/commitdiff/7a8ded5c3443c990657a4f837698d6bc2ad5017e ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/rtl8812au] - start fixing build with linux 4.12
commit f28b7c49f1713b4500df6f9faabb7eac3af6ef7f Author: Jan RękorajskiDate: Tue Aug 1 00:01:10 2017 +0200 - start fixing build with linux 4.12 linux-4.12.patch | 14 ++ rtl8812au.spec | 2 ++ 2 files changed, 16 insertions(+) --- diff --git a/rtl8812au.spec b/rtl8812au.spec index 6e1fc27..bffa047 100644 --- a/rtl8812au.spec +++ b/rtl8812au.spec @@ -35,6 +35,7 @@ Patch12: linux-4.7.patch Patch13: linux-4.8.patch Patch14: linux-4.11.patch Patch15: linux-4.11.9.patch +Patch16: linux-4.12.patch BuildRequires: rpmbuild(macros) >= 1.701 %{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2} BuildRoot: %{tmpdir}/%{pname}-%{version}-root-%(id -u -n) @@ -92,6 +93,7 @@ Driver for AC1200 (802.11ac) Wireless Dual-Band USB Adapter\ %patch13 -p1 %patch14 -p1 %patch15 -p1 +%patch16 -p1 %build %{expand:%build_kernel_packages} diff --git a/linux-4.12.patch b/linux-4.12.patch new file mode 100644 index 000..a35c922 --- /dev/null +++ b/linux-4.12.patch @@ -0,0 +1,14 @@ +--- rtl8812au_linux-master/os_dep/linux/ioctl_cfg80211.c~ 2017-07-31 23:54:36.0 +0200 rtl8812au_linux-master/os_dep/linux/ioctl_cfg80211.c 2017-07-31 23:58:19.371143221 +0200 +@@ -5991,7 +5991,11 @@ + #endif + + #if defined(CONFIG_PM) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0)) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++ wiphy->max_sched_scan_reqs = 1; ++#else + wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN; ++#endif + #ifdef CONFIG_PNO_SUPPORT + wiphy->max_sched_scan_ssids = MAX_PNO_LIST_COUNT; + #endif gitweb: http://git.pld-linux.org/gitweb.cgi/packages/rtl8812au.git/commitdiff/f28b7c49f1713b4500df6f9faabb7eac3af6ef7f ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/wl] - rel 7 - fix building with kernel 4.12
commit 60301872dcb6c56f832b79cf58d39e4d761f2f1b Author: Jan RękorajskiDate: Mon Jul 31 23:48:11 2017 +0200 - rel 7 - fix building with kernel 4.12 linux-4.12.patch | 68 wl.spec | 4 +++- 2 files changed, 71 insertions(+), 1 deletion(-) --- diff --git a/wl.spec b/wl.spec index be51f5f..654ce3e 100644 --- a/wl.spec +++ b/wl.spec @@ -18,7 +18,7 @@ exit 1 %define_duplicate_files_terminate_build0 -%definerel 6 +%definerel 7 %definepname wl %definefile_ver%(echo %{version} | tr . _) Summary: Broadcom 802.11 a/b/g/n hybrid Linux networking device driver @@ -42,6 +42,7 @@ Patch3: linux-4.7.patch Patch4:linux-4.8.patch Patch5:17-fix-kernel-warnings.patch Patch6:linux-4.11.patch +Patch7:linux-4.12.patch URL: http://www.broadcom.com/support/802.11 BuildRequires: rpmbuild(macros) >= 1.701 %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}} @@ -129,6 +130,7 @@ EOF\ %patch4 -p1 %patch5 -p2 %patch6 -p1 +%patch7 -p1 mkdir wl mv lib src Makefile wl/ diff --git a/linux-4.12.patch b/linux-4.12.patch new file mode 100644 index 000..8abc73d --- /dev/null +++ b/linux-4.12.patch @@ -0,0 +1,68 @@ +diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c +index da36405..d3741eb 100644 +--- a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c +@@ -53,7 +53,11 @@ u32 wl_dbg_level = WL_DBG_ERR; + #endif + + static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++ enum nl80211_iftype type, struct vif_params *params); ++#else +enum nl80211_iftype type, u32 *flags, struct vif_params *params); ++#endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) + static s32 + wl_cfg80211_scan(struct wiphy *wiphy, +@@ -466,7 +470,11 @@ wl_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len) + + static s32 + wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++ enum nl80211_iftype type, ++#else + enum nl80211_iftype type, u32 *flags, ++#endif +struct vif_params *params) + { + struct wl_cfg80211_priv *wl = wiphy_to_wl(wiphy); +@@ -2361,6 +2369,20 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev, + const wl_event_msg_t *e, void *data) + { + struct wl_cfg80211_connect_info *conn_info = wl_to_conn(wl); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++ struct cfg80211_bss *bss; ++ struct wlc_ssid *ssid; ++ ssid = >profile->ssid; ++ bss = cfg80211_get_bss(wl_to_wiphy(wl), NULL, (s8 *)>bssid, ++ ssid->SSID, ssid->SSID_len, WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS); ++ struct cfg80211_roam_info roam_info = { ++ .bss = bss, ++ .req_ie = conn_info->req_ie, ++ .req_ie_len = conn_info->req_ie_len, ++ .resp_ie = conn_info->resp_ie, ++ .resp_ie_len = conn_info->resp_ie_len, ++ }; ++#endif + s32 err = 0; + + wl_get_assoc_ies(wl); +@@ -2368,12 +2390,17 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev, + memcpy(>bssid, >addr, ETHER_ADDR_LEN); + wl_update_bss_info(wl); + cfg80211_roamed(ndev, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++ _info, ++#else + #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39) + >conf->channel, + #endif + (u8 *)>bssid, + conn_info->req_ie, conn_info->req_ie_len, +- conn_info->resp_ie, conn_info->resp_ie_len, GFP_KERNEL); ++ conn_info->resp_ie, conn_info->resp_ie_len, ++#endif ++ GFP_KERNEL); + WL_DBG(("Report roaming result\n")); + + set_bit(WL_STATUS_CONNECTED, >status); gitweb: http://git.pld-linux.org/gitweb.cgi/packages/wl.git/commitdiff/60301872dcb6c56f832b79cf58d39e4d761f2f1b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/zfs] - rel 1, updated files
commit 5bf6436c63f25a67c0e95965175e4c65587e5483 Author: Jan RękorajskiDate: Mon Jul 31 22:39:47 2017 +0200 - rel 1, updated files zfs.spec | 17 - 1 file changed, 16 insertions(+), 1 deletion(-) --- diff --git a/zfs.spec b/zfs.spec index 4d90566..7d37713 100644 --- a/zfs.spec +++ b/zfs.spec @@ -26,7 +26,7 @@ exit 1 %define_duplicate_files_terminate_build0 -%definerel 0.1 +%definerel 1 %definepname zfs Summary: Native Linux port of the ZFS filesystem Summary(pl.UTF-8): Natywny linuksowy port systemu plików ZFS @@ -258,6 +258,11 @@ cp -a installed/* $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_pkgconfigdir} %{__mv} $RPM_BUILD_ROOT%{_npkgconfigdir}/* $RPM_BUILD_ROOT%{_pkgconfigdir} + +# Package these? These are integration tests of the implementation. +%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/zfs/{zfs-tests,test-runner,runfiles} +%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/{raidz_test,test-runner}.1* +%{__rm} $RPM_BUILD_ROOT%{_bindir}/raidz_test %endif %clean @@ -274,6 +279,7 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/arc_summary.py %attr(755,root,root) %{_bindir}/arcstat.py %attr(755,root,root) %{_bindir}/dbufstat.py +%attr(755,root,root) %{_bindir}/zgenhostid %attr(755,root,root) %{_sbindir}/fsck.zfs %attr(755,root,root) %{_sbindir}/zdb %attr(755,root,root) %{_sbindir}/zed @@ -290,6 +296,8 @@ rm -rf $RPM_BUILD_ROOT %dir %{_sysconfdir}/zfs/zed.d %attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/zfs/zed.d/*.sh %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/zfs/zed.d/zed.rc +%dir %{_sysconfdir}/zfs/zpool.d +%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/zfs/zpool.d/* %attr(754,root,root) /etc/rc.d/init.d/zfs-import %attr(754,root,root) /etc/rc.d/init.d/zfs-mount %attr(754,root,root) /etc/rc.d/init.d/zfs-share @@ -312,6 +320,8 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libdir}/zfs %dir %{_libdir}/zfs/zed.d %attr(755,root,root) %{_libdir}/zfs/zed.d/*.sh +%dir %{_libdir}/zfs/zpool.d +%attr(755,root,root) %{_libdir}/zfs/zpool.d/* %dir %{_datadir}/zfs %attr(755,root,root) %{_datadir}/zfs/*.sh %dir %{_datadir}/zfs/zpios-profile @@ -333,6 +343,7 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/zdb.8* %{_mandir}/man8/zed.8* %{_mandir}/man8/zfs.8* +%{_mandir}/man8/zgenhostid.8* %{_mandir}/man8/zinject.8* %{_mandir}/man8/zpool.8* %{_mandir}/man8/zstreamdump.8* @@ -378,12 +389,16 @@ rm -rf $RPM_BUILD_ROOT %files -n dracut-zfs %defattr(644,root,root,755) %doc contrib/dracut/README.dracut.markdown +%dir %{dracutlibdir}/modules.d/02zfsexpandknowledge +%attr(755,root,root) %{dracutlibdir}/modules.d/02zfsexpandknowledge/module-setup.sh %dir %{dracutlibdir}/modules.d/90zfs %attr(755,root,root) %{dracutlibdir}/modules.d/90zfs/export-zfs.sh %attr(755,root,root) %{dracutlibdir}/modules.d/90zfs/module-setup.sh %attr(755,root,root) %{dracutlibdir}/modules.d/90zfs/mount-zfs.sh %attr(755,root,root) %{dracutlibdir}/modules.d/90zfs/parse-zfs.sh +%attr(755,root,root) %{dracutlibdir}/modules.d/90zfs/zfs-generator.sh %attr(755,root,root) %{dracutlibdir}/modules.d/90zfs/zfs-lib.sh +%attr(755,root,root) %{dracutlibdir}/modules.d/90zfs/zfs-needshutdown.sh %endif %if %{with kernel} gitweb: http://git.pld-linux.org/gitweb.cgi/packages/zfs.git/commitdiff/5bf6436c63f25a67c0e95965175e4c65587e5483 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: sanlock: sanlock-3.5.0.tar.gz
Request by: qboosh Files fetched: 1 STORED: http://releases.pagure.org/sanlock/sanlock-3.5.0.tar.gz e5e8bb6ce10901de07f80d3dceaa6976 sanlock-3.5.0.tar.gz Size: 219144 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/sanlock] - updated to 3.5.0
commit cb823b72e8d8c177167ff96efda701103e3b5912 Author: Jakub BoguszDate: Mon Jul 31 22:24:02 2017 +0200 - updated to 3.5.0 sanlock.spec | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) --- diff --git a/sanlock.spec b/sanlock.spec index f7b8ce3..c6df8d6 100644 --- a/sanlock.spec +++ b/sanlock.spec @@ -1,13 +1,12 @@ Summary: Shared storage lock manager Summary(pl.UTF-8): Zarządca blokad dla współdzielonego składowania danych Name: sanlock -Version: 3.4.0 +Version: 3.5.0 Release: 1 License: LGPL v2+ (libsanlock_client, libwdmd), GPL v2 (libsanlock, utilities) Group: Networking -#Source0Download: https://git.fedorahosted.org/cgit/sanlock.git/ -Source0: https://git.fedorahosted.org/cgit/sanlock.git/snapshot/%{name}-%{version}.tar.xz -# Source0-md5: d882beb5f188abff545b64cc3cbe9c79 +Source0: http://releases.pagure.org/sanlock/%{name}-%{version}.tar.gz +# Source0-md5: e5e8bb6ce10901de07f80d3dceaa6976 Patch0:%{name}-link.patch Patch1:%{name}-init-pld.patch URL: https://pagure.io/sanlock gitweb: http://git.pld-linux.org/gitweb.cgi/packages/sanlock.git/commitdiff/cb823b72e8d8c177167ff96efda701103e3b5912 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: glusterfs: glusterfs-3.10.4.tar.gz
Request by: qboosh Files fetched: 1 STORED: https://download.gluster.org/pub/gluster/glusterfs/3.10/LATEST/glusterfs-3.10.4.tar.gz 4e1771c08523a3ab32356e4899b088f5 glusterfs-3.10.4.tar.gz Size: 9008915 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/glusterfs] - updated to 3.10.4
commit 28ddd7ca467c3aec82dec7bfcc4d0f3acd15c5b9 Author: Jakub BoguszDate: Mon Jul 31 22:16:15 2017 +0200 - updated to 3.10.4 glusterfs.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- diff --git a/glusterfs.spec b/glusterfs.spec index b42b739..86127e2 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -15,12 +15,12 @@ Summary: Clustered File Storage that can scale to peta bytes Summary(pl.UTF-8): Klastrowy system przechowywania plików skalujący się do petabajtów Name: glusterfs -Version: 3.10.1 +Version: 3.10.4 Release: 1 License: LGPL v3+ or GPL v2 (libraries), GPL v3+ (programs) Group: Applications/System Source0: https://download.gluster.org/pub/gluster/glusterfs/3.10/LATEST/glusterfs-%{version}.tar.gz -# Source0-md5: a14b97098baec020054943d061261d61 +# Source0-md5: 4e1771c08523a3ab32356e4899b088f5 Source1: glusterfsd.init Patch0:%{name}-link.patch Patch1:%{name}-noquiet.patch @@ -486,6 +486,7 @@ fi %files server %defattr(644,root,root,755) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/glusterfsd.vol +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/group-metadata-cache %attr(754,root,root) /etc/rc.d/init.d/glusterfsd %attr(755,root,root) %{_sbindir}/conf.py %attr(755,root,root) %{_sbindir}/gcron.py gitweb: http://git.pld-linux.org/gitweb.cgi/packages/glusterfs.git/commitdiff/28ddd7ca467c3aec82dec7bfcc4d0f3acd15c5b9 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: xen: xen-4.9.0.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz zlib-1.2.3.tar.gz pciutils-2.2.9.tar.bz2 grub-0.97.tar.gz ipxe-git-827dd1bfee67daa683935ce65316f7e0f057fe1c.tar.gz polarssl-1.1.
Request by: qboosh Files fetched: 2 STORED: https://downloads.xenproject.org/release/xen/4.9.0/xen-4.9.0.tar.gz f0a753637630f982dfbdb64121fd71e1 xen-4.9.0.tar.gz Size: 23361741 bytes ALREADY GOT: http://xenbits.xensource.com/xen-extfiles/lwip-1.3.0.tar.gz 36cc57650cffda9a0269493be2a169bb lwip-1.3.0.tar.gz ALREADY GOT: http://xenbits.xensource.com/xen-extfiles/newlib-1.16.0.tar.gz bf8f1f9e3ca83d732c00a79a6ef29bc4 newlib-1.16.0.tar.gz ALREADY GOT: http://xenbits.xensource.com/xen-extfiles/zlib-1.2.3.tar.gz debc62758716a169df9f62e6ab2bc634 zlib-1.2.3.tar.gz ALREADY GOT: http://xenbits.xensource.com/xen-extfiles/pciutils-2.2.9.tar.bz2 cec05e7785497c5e19da2f114b934ffd pciutils-2.2.9.tar.bz2 ALREADY GOT: http://xenbits.xensource.com/xen-extfiles/grub-0.97.tar.gz cd3f3eb54446be6003156158d51f4884 grub-0.97.tar.gz STORED: http://xenbits.xen.org/xen-extfiles/ipxe-git-827dd1bfee67daa683935ce65316f7e0f057fe1c.tar.gz 71c69b5e1db9e01d5f246226eca03c22 ipxe-git-827dd1bfee67daa683935ce65316f7e0f057fe1c.tar.gz Size: 3656744 bytes ALREADY GOT: http://xenbits.xensource.com/xen-extfiles/polarssl-1.1.4-gpl.tgz 7b72caf22b01464ee7d6165f2fd85f44 polarssl-1.1.4-gpl.tgz ALREADY GOT: http://xenbits.xen.org/xen-extfiles/tpm_emulator-0.7.4.tar.gz e26becb8a6a2b6695f6b3e8097593db8 tpm_emulator-0.7.4.tar.gz ALREADY GOT: ftp://ftp.gmplib.org/pub/gmp-4.3.2/gmp-4.3.2.tar.bz2 dd60683d7057917e34630b4a787932e8 gmp-4.3.2.tar.bz2 -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xen/DEVEL] - updated to 4.9.0 (rel 0.1, needs testing) - updated no_Werror,stubdom-build,systemd patches - remo
commit 9178a513a5d519026afa57c47cd339279f12e3a1 Author: Jakub BoguszDate: Mon Jul 31 21:26:07 2017 +0200 - updated to 4.9.0 (rel 0.1, needs testing) - updated no_Werror,stubdom-build,systemd patches - removed obsolete curses,gawk,xen-gmp-abi,fix-misleading-indentation,deprecated-readdir_r,ipxe-build,unused-function patches - added link patch (fix libxenguest linking with -as-needed) - added pkgconfig patch (move .pc files to arch-dependent pkgconfig dir) deprecated-readdir_r.patch | 174 -- fix-misleading-indentation.patch | 150 --- ipxe-build.patch | 306 --- unused-function.patch| 20 --- xen-curses.patch | 11 -- xen-gawk.patch | 11 -- xen-gmp-abi.patch| 12 -- xen-link.patch | 11 ++ xen-no_Werror.patch | 9 +- xen-pkgconfigdir.patch | 9 ++ xen-stubdom-build.patch | 22 +-- xen-systemd.patch| 33 ++--- xen.spec | 92 13 files changed, 108 insertions(+), 752 deletions(-) --- diff --git a/xen.spec b/xen.spec index 71e38ce..ef69389 100644 --- a/xen.spec +++ b/xen.spec @@ -39,13 +39,13 @@ Summary: Xen - a virtual machine monitor Summary(pl.UTF-8): Xen - monitor maszyny wirtualnej Name: xen -Version: 4.6.6 -Release: 1 +Version: 4.9.0 +Release: 0.1 License: GPL v2, interface parts on BSD-like Group: Applications/System # for available versions see https://www.xenproject.org/developers/teams/hypervisor.html Source0: https://downloads.xenproject.org/release/xen/%{version}/%{name}-%{version}.tar.gz -# Source0-md5: 698328dcac775c8ccef0da3167020b19 +# Source0-md5: f0a753637630f982dfbdb64121fd71e1 # used by stubdoms Source10: %{xen_extfiles_url}/lwip-1.3.0.tar.gz # Source10-md5:36cc57650cffda9a0269493be2a169bb @@ -57,8 +57,8 @@ Source13: %{xen_extfiles_url}/pciutils-2.2.9.tar.bz2 # Source13-md5:cec05e7785497c5e19da2f114b934ffd Source14: %{xen_extfiles_url}/grub-0.97.tar.gz # Source14-md5:cd3f3eb54446be6003156158d51f4884 -Source15: http://xenbits.xen.org/xen-extfiles/ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz -# Source15-md5:7496268cebf47d5c9ccb0696e3b26065 +Source15: http://xenbits.xen.org/xen-extfiles/ipxe-git-827dd1bfee67daa683935ce65316f7e0f057fe1c.tar.gz +# Source15-md5:71c69b5e1db9e01d5f246226eca03c22 Source17: %{xen_extfiles_url}/polarssl-%{polarssl_version}-gpl.tgz # Source17-md5:7b72caf22b01464ee7d6165f2fd85f44 Source18: http://xenbits.xen.org/xen-extfiles/tpm_emulator-%{tpm_emulator_version}.tar.gz @@ -83,27 +83,22 @@ Source60: xen-init-list Source61: xen-toolstack Patch0:%{name}-python_scripts.patch Patch1:%{name}-symbols.patch -Patch2:%{name}-curses.patch +Patch2:%{name}-link.patch Patch3:pygrubfix.patch +Patch4:%{name}-pkgconfigdir.patch # Warning: this disables ingress filtering implemented in xen scripts! Patch7:%{name}-net-disable-iptables-on-bridge.patch -Patch9:%{name}-gawk.patch Patch10: %{name}-qemu.patch Patch12: %{name}-doc.patch Patch13: %{name}-paths.patch Patch14: %{name}-no_fetcher.patch Patch15: odd-glib2-fix.patch -Patch16: %{name}-gmp-abi.patch Patch18: %{name}-make.patch Patch19: %{name}-no_Werror.patch Patch22: %{name}-stubdom-build.patch Patch23: link.patch Patch24: %{name}-systemd.patch -Patch25: fix-misleading-indentation.patch -Patch26: deprecated-readdir_r.patch -Patch27: ipxe-build.patch Patch28: sysmacros.patch -Patch29: unused-function.patch URL: http://www.xen.org/products/xenhyp.html BuildRequires: autoconf >= 2.67 %ifarch %{ix86} %{x8664} @@ -147,11 +142,13 @@ BuildRequires:ocaml-findlib %endif BuildRequires: nss-devel >= 3.12.8 BuildRequires: openssl-devel +BuildRequires: pandoc BuildRequires: pciutils-devel BuildRequires: perl-base BuildRequires: perl-tools-pod BuildRequires: pkgconfig BuildRequires: python-devel >= 2 +BuildRequires: python-markdown BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(macros) >= 1.647 BuildRequires: seabios @@ -392,24 +389,19 @@ Nadzorca Xen w postaci, która może być uruchomiona wprost z firmware %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %patch7 -p1 -%patch9 -p1 %patch10 -p1 %patch12 -p1 %patch13 -p1 %patch14 -p1 %patch15 -p1 -%patch16 -p1 %patch18 -p1 %patch19 -p1 %patch22 -p1 %patch23 -p1 %patch24 -p1 -%patch25 -p1 -%patch26 -p1 -%patch27 -p1 %patch28 -p1 -%patch29 -p1 # stubdom sources ln -s %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13}
[packages/xen] Created branch DEVEL
The branch 'DEVEL' was created. Summary of new commits: 9178a51... - updated to 4.9.0 (rel 0.1, needs testing) - updated no_We ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xen] Deleted branch DEVEL
The branch 'DEVEL' was deleted at 2e1267fa879339ec67e8696f62c7939572b8b352. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: lttng-modules: lttng-modules-2.9.3.tar.bz2
Request by: qboosh Files fetched: 1 STORED: http://lttng.org/files/lttng-modules/lttng-modules-2.9.3.tar.bz2 9abf694dddcc197988189ef65b496f4c lttng-modules-2.9.3.tar.bz2 Size: 334193 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/lttng-modules] - updated to 2.9.3
commit e3e5646786d20fa6698ba191d32a8bb0532d489d Author: Jakub BoguszDate: Mon Jul 31 21:14:54 2017 +0200 - updated to 2.9.3 lttng-modules.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/lttng-modules.spec b/lttng-modules.spec index d744492..020e4cc 100644 --- a/lttng-modules.spec +++ b/lttng-modules.spec @@ -12,12 +12,12 @@ Summary: LTTng 2.x kernel modules Summary(pl.UTF-8): Moduły jądra LTTng 2.x Name: %{pname}%{_alt_kernel} -Version: 2.9.2 +Version: 2.9.3 Release: %{rel}@%{_kernel_ver_str} License: GPL v2 Group: Base/Kernel Source0: http://lttng.org/files/lttng-modules/%{pname}-%{version}.tar.bz2 -# Source0-md5: 6c02645c77fd4d6475a4f83bda1d75ff +# Source0-md5: 9abf694dddcc197988189ef65b496f4c Patch0:build.patch URL: http://lttng.org/ %{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.38} gitweb: http://git.pld-linux.org/gitweb.cgi/packages/lttng-modules.git/commitdiff/e3e5646786d20fa6698ba191d32a8bb0532d489d ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: lttng-tools: lttng-tools-2.9.5.tar.bz2
Request by: qboosh Files fetched: 1 STORED: http://lttng.org/files/lttng-tools/lttng-tools-2.9.5.tar.bz2 051224eb991aee07f8721ff1877d0b96 lttng-tools-2.9.5.tar.bz2 Size: 1133881 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/lttng-tools] - updated to 2.9.5
commit af6d9d6a9d639b1953a8d0d7d7f9886192625c57 Author: Jakub BoguszDate: Mon Jul 31 21:09:21 2017 +0200 - updated to 2.9.5 lttng-tools.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/lttng-tools.spec b/lttng-tools.spec index c9095b3..c025b09 100644 --- a/lttng-tools.spec +++ b/lttng-tools.spec @@ -1,12 +1,12 @@ Summary: LTTng Trace Control Summary(pl.UTF-8): Sterowanie śledzeniem LTTng Name: lttng-tools -Version: 2.9.4 +Version: 2.9.5 Release: 1 License: LGPL v2.1+ (library), GPL v2 (tools) Group: Libraries Source0: http://lttng.org/files/lttng-tools/%{name}-%{version}.tar.bz2 -# Source0-md5: 10f47abfa214b167580358388428770d +# Source0-md5: 051224eb991aee07f8721ff1877d0b96 Patch0:%{name}-python.patch Patch1:x32.patch URL: http://lttng.org/ gitweb: http://git.pld-linux.org/gitweb.cgi/packages/lttng-tools.git/commitdiff/af6d9d6a9d639b1953a8d0d7d7f9886192625c57 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: lttng-ust: lttng-ust-2.9.1.tar.bz2
Request by: qboosh Files fetched: 1 STORED: http://lttng.org/files/lttng-ust/lttng-ust-2.9.1.tar.bz2 5a5636fc3d9aa370f65b25a802a79e6e lttng-ust-2.9.1.tar.bz2 Size: 766856 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/lttng-ust] - updated to 2.9.1
commit ed3261dd8000793d182a28b49f65d72f2f3a1ad8 Author: Jakub BoguszDate: Mon Jul 31 20:54:19 2017 +0200 - updated to 2.9.1 lttng-ust.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/lttng-ust.spec b/lttng-ust.spec index 4b0bf0b..94e47b5 100644 --- a/lttng-ust.spec +++ b/lttng-ust.spec @@ -7,12 +7,12 @@ Summary: LTTng Userspace Tracer Summary(pl.UTF-8): LTTng Userspace Tracer - narzędzia LTTng do śledzenia przestrzeni użytkownika Name: lttng-ust -Version: 2.9.0 +Version: 2.9.1 Release: 1 License: LGPL v2.1 (library), MIT (headers), GPL v2 (programs) Group: Libraries Source0: http://lttng.org/files/lttng-ust/%{name}-%{version}.tar.bz2 -# Source0-md5: 77f3378ba37a36801420bce87b702e9c +# Source0-md5: 5a5636fc3d9aa370f65b25a802a79e6e Patch0:%{name}-link.patch Patch1:%{name}-java.patch Patch2:%{name}-python.patch gitweb: http://git.pld-linux.org/gitweb.cgi/packages/lttng-ust.git/commitdiff/ed3261dd8000793d182a28b49f65d72f2f3a1ad8 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/userspace-rcu/DEVEL] - updated to 0.10.0 (note: new sonames)
commit f2c5ed195e0aafa104b2d6e00c6bd02424b1b0d4 Author: Jakub BoguszDate: Mon Jul 31 19:31:04 2017 +0200 - updated to 0.10.0 (note: new sonames) userspace-rcu.spec | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) --- diff --git a/userspace-rcu.spec b/userspace-rcu.spec index c0b4f70..53fea9f 100644 --- a/userspace-rcu.spec +++ b/userspace-rcu.spec @@ -1,12 +1,12 @@ Summary: Userspace RCU implementation Summary(pl.UTF-8): Implementacja RCU w przestrzeni użytkownika Name: userspace-rcu -Version: 0.9.3 +Version: 0.10.0 Release: 1 License: LGPL v2.1+ (library), GPL v2 (tests) Group: Libraries Source0: http://lttng.org/files/urcu/%{name}-%{version}.tar.bz2 -# Source0-md5: 920970e35a1a2066c8353eabfeab8730 +# Source0-md5: 69dab85b6929c378338b9504adc6aea7 URL: http://lttng.org/urcu BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -77,7 +77,7 @@ rm -rf $RPM_BUILD_ROOT # *.la kept - urcu-common not handled in any way in .pc files # packaged as %doc -%{__rm} $RPM_BUILD_ROOT%{_docdir}/userspace-rcu/{{rcu,cds,uatomic}-api.md,ChangeLog,README.md} +%{__rm} $RPM_BUILD_ROOT%{_docdir}/userspace-rcu/{{rcu,cds,uatomic}-api.md,LICENSE,README.md,solaris-build.md} install -d $RPM_BUILD_ROOT%{_examplesdir} %{__mv} $RPM_BUILD_ROOT%{_docdir}/userspace-rcu/examples $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} @@ -92,19 +92,19 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %doc ChangeLog LICENSE README.md lgpl-relicensing.txt %attr(755,root,root) %{_libdir}/liburcu.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/liburcu.so.4 +%attr(755,root,root) %ghost %{_libdir}/liburcu.so.6 %attr(755,root,root) %{_libdir}/liburcu-bp.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/liburcu-bp.so.4 +%attr(755,root,root) %ghost %{_libdir}/liburcu-bp.so.6 %attr(755,root,root) %{_libdir}/liburcu-cds.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/liburcu-cds.so.4 +%attr(755,root,root) %ghost %{_libdir}/liburcu-cds.so.6 %attr(755,root,root) %{_libdir}/liburcu-common.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/liburcu-common.so.4 +%attr(755,root,root) %ghost %{_libdir}/liburcu-common.so.6 %attr(755,root,root) %{_libdir}/liburcu-mb.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/liburcu-mb.so.4 +%attr(755,root,root) %ghost %{_libdir}/liburcu-mb.so.6 %attr(755,root,root) %{_libdir}/liburcu-qsbr.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/liburcu-qsbr.so.4 +%attr(755,root,root) %ghost %{_libdir}/liburcu-qsbr.so.6 %attr(755,root,root) %{_libdir}/liburcu-signal.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/liburcu-signal.so.4 +%attr(755,root,root) %ghost %{_libdir}/liburcu-signal.so.6 %files devel %defattr(644,root,root,755) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/userspace-rcu.git/commitdiff/f2c5ed195e0aafa104b2d6e00c6bd02424b1b0d4 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: userspace-rcu: userspace-rcu-0.10.0.tar.bz2
Request by: qboosh Files fetched: 1 STORED: http://lttng.org/files/urcu/userspace-rcu-0.10.0.tar.bz2 69dab85b6929c378338b9504adc6aea7 userspace-rcu-0.10.0.tar.bz2 Size: 483899 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/userspace-rcu] Created branch DEVEL
The branch 'DEVEL' was created. Summary of new commits: f2c5ed1... - updated to 0.10.0 (note: new sonames) ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/zfs] - rel 0.1 - a lot of unpackaged files
commit 67ee122d3889a738d496501fd6347270ae1eb23f Author: Jan RękorajskiDate: Mon Jul 31 20:19:18 2017 +0200 - rel 0.1 - a lot of unpackaged files zfs.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- diff --git a/zfs.spec b/zfs.spec index 73a24a6..4d90566 100644 --- a/zfs.spec +++ b/zfs.spec @@ -26,7 +26,7 @@ exit 1 %define_duplicate_files_terminate_build0 -%definerel 1 +%definerel 0.1 %definepname zfs Summary: Native Linux port of the ZFS filesystem Summary(pl.UTF-8): Natywny linuksowy port systemu plików ZFS @@ -178,6 +178,8 @@ pakietu kernel%{_alt_kernel} w wersji %{_kernel_ver}.\ %defattr(644,root,root,755)\ %dir /lib/modules/%{_kernel_ver}/misc/avl\ /lib/modules/%{_kernel_ver}/misc/avl/zavl.ko*\ +%dir /lib/modules/%{_kernel_ver}/misc/icp\ +/lib/modules/%{_kernel_ver}/misc/icp/icp.ko*\ %dir /lib/modules/%{_kernel_ver}/misc/nvpair\ /lib/modules/%{_kernel_ver}/misc/nvpair/znvpair.ko*\ %dir /lib/modules/%{_kernel_ver}/misc/unicode\ gitweb: http://git.pld-linux.org/gitweb.cgi/packages/zfs.git/commitdiff/67ee122d3889a738d496501fd6347270ae1eb23f ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: userspace-rcu: userspace-rcu-0.9.4.tar.bz2
Request by: qboosh Files fetched: 1 STORED: http://lttng.org/files/urcu/userspace-rcu-0.9.4.tar.bz2 62919b6fdcc1424f7fd6e0fd4d39 userspace-rcu-0.9.4.tar.bz2 Size: 472839 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/userspace-rcu] - updated to 0.9.4
commit 12975a31478f4672fb9ca26617137415ac3f Author: Jakub BoguszDate: Mon Jul 31 20:21:21 2017 +0200 - updated to 0.9.4 userspace-rcu.spec | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) --- diff --git a/userspace-rcu.spec b/userspace-rcu.spec index c0b4f70..3c0efcd 100644 --- a/userspace-rcu.spec +++ b/userspace-rcu.spec @@ -1,12 +1,13 @@ Summary: Userspace RCU implementation Summary(pl.UTF-8): Implementacja RCU w przestrzeni użytkownika Name: userspace-rcu -Version: 0.9.3 +# NOTE: for 0.10.x (for lttng 2.10) see DEVEL branch +Version: 0.9.4 Release: 1 License: LGPL v2.1+ (library), GPL v2 (tests) Group: Libraries Source0: http://lttng.org/files/urcu/%{name}-%{version}.tar.bz2 -# Source0-md5: 920970e35a1a2066c8353eabfeab8730 +# Source0-md5: 62919b6fdcc1424f7fd6e0fd4d39 URL: http://lttng.org/urcu BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -77,7 +78,7 @@ rm -rf $RPM_BUILD_ROOT # *.la kept - urcu-common not handled in any way in .pc files # packaged as %doc -%{__rm} $RPM_BUILD_ROOT%{_docdir}/userspace-rcu/{{rcu,cds,uatomic}-api.md,ChangeLog,README.md} +%{__rm} $RPM_BUILD_ROOT%{_docdir}/userspace-rcu/{{rcu,cds,uatomic}-api.md,ChangeLog,README.md,solaris-build.md} install -d $RPM_BUILD_ROOT%{_examplesdir} %{__mv} $RPM_BUILD_ROOT%{_docdir}/userspace-rcu/examples $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} gitweb: http://git.pld-linux.org/gitweb.cgi/packages/userspace-rcu.git/commitdiff/12975a31478f4672fb9ca26617137415ac3f ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/kernel] - updated linux-wistron-nx patch; now builds on i686
commit c7cc2fb09e795e568f76b81ed9f43d42da1d3eb7 Author: Jakub BoguszDate: Mon Jul 31 20:06:51 2017 +0200 - updated linux-wistron-nx patch; now builds on i686 linux-wistron-nx.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/linux-wistron-nx.patch b/linux-wistron-nx.patch index 1ab8ed32..8fee5bbe 100644 --- a/linux-wistron-nx.patch +++ b/linux-wistron-nx.patch @@ -4,7 +4,7 @@ #include #include #include -+#include ++#include /* How often we poll keys - msecs */ #define POLL_INTERVAL_DEFAULT 500 /* when idle */ gitweb: http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/c7cc2fb09e795e568f76b81ed9f43d42da1d3eb7 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/kernel] Revert "- drop ancient patch"
commit 28c4ae14bc229175bca1b38f3b83eb3b1e3d91b6 Author: Jakub BoguszDate: Mon Jul 31 20:06:31 2017 +0200 Revert "- drop ancient patch" This reverts commit 294f635766f4f49c437764a990a8df4106534c30. kernel.spec| 2 ++ linux-wistron-nx.patch | 26 ++ 2 files changed, 28 insertions(+) --- diff --git a/kernel.spec b/kernel.spec index d0468c1f..cd3ba333 100644 --- a/kernel.spec +++ b/kernel.spec @@ -152,6 +152,7 @@ Source58: kernel-inittmpfs.config # http://dev.gentoo.org/~spock/projects/fbcondecor/archive/fbcondecor-0.9.4-2.6.25-rc6.patch Patch3:kernel-fbcondecor.patch +Patch6:linux-wistron-nx.patch # netfilter related stuff mostly based on patch-o-matic-ng # snapshot 20070806 with some fixes. Some modules @@ -632,6 +633,7 @@ cd linux-%{basever} %if %{with fbcondecor} %patch3 -p1 %endif +%patch6 -p1 ## netfilter # diff --git a/linux-wistron-nx.patch b/linux-wistron-nx.patch new file mode 100644 index ..1ab8ed32 --- /dev/null +++ b/linux-wistron-nx.patch @@ -0,0 +1,26 @@ +--- linux-3.10/drivers/input/misc/wistron_btns.c.orig 2013-11-16 09:05:55.612742472 +0100 linux-3.10/drivers/input/misc/wistron_btns.c 2013-11-16 09:24:37.356028732 +0100 +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + + /* How often we poll keys - msecs */ + #define POLL_INTERVAL_DEFAULT 500 /* when idle */ +@@ -124,6 +125,7 @@ + if (entry_point >= 0xF) { + bios_code_map_base = base; + bios_entry_point = bios_code_map_base + (entry_point & 0x); ++ set_memory_x((unsigned long)bios_code_map_base, 0x1 >> PAGE_SHIFT); + } else { + iounmap(base); + bios_code_map_base = ioremap(entry_point & ~0x3FFF, 0x4000); +@@ -134,6 +136,7 @@ + goto err; + } + bios_entry_point = bios_code_map_base + (entry_point & 0x3FFF); ++ set_memory_x((unsigned long)bios_code_map_base, 0x4000 >> PAGE_SHIFT); + } + /* The Windows driver maps 0x1 bytes, we keep only one page... */ + bios_data_map_base = ioremap(0x400, 0xc00); gitweb: http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/c7cc2fb09e795e568f76b81ed9f43d42da1d3eb7 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: zfs: zfs-0.7.0.tar.gz
Request by: baggins Files fetched: 1 STORED: https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.0/zfs-0.7.0.tar.gz e1ed13c757ca5866550272263ec2e60e zfs-0.7.0.tar.gz Size: 6714094 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/zfs] - up to 0.7.0
commit 7d78d23a8f4e0b3993a7163021f5b40b964d0fc9 Author: Jan RękorajskiDate: Mon Jul 31 20:02:53 2017 +0200 - up to 0.7.0 kernel-4.11.patch | 391 -- zfs.spec | 8 +- 2 files changed, 3 insertions(+), 396 deletions(-) --- diff --git a/zfs.spec b/zfs.spec index 9e9272d..73a24a6 100644 --- a/zfs.spec +++ b/zfs.spec @@ -26,20 +26,19 @@ exit 1 %define_duplicate_files_terminate_build0 -%definerel 2 +%definerel 1 %definepname zfs Summary: Native Linux port of the ZFS filesystem Summary(pl.UTF-8): Natywny linuksowy port systemu plików ZFS Name: %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel} -Version: 0.6.5.9 +Version: 0.7.0 Release: %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}} License: CDDL (ZFS), GPL v2+ (ZPIOS) Group: Applications/System Source0: https://github.com/zfsonlinux/zfs/releases/download/zfs-%{version}/%{pname}-%{version}.tar.gz -# Source0-md5: 9dceb3930be4e1a8cf35bcc40e48e527 +# Source0-md5: e1ed13c757ca5866550272263ec2e60e Patch0:%{pname}-link.patch Patch1:x32.patch -Patch2:kernel-4.11.patch URL: http://zfsonlinux.org/ BuildRequires: autoconf >= 2.50 BuildRequires: automake @@ -220,7 +219,6 @@ p=`pwd`\ %setup -q -n %{pname}-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build %{__libtoolize} diff --git a/kernel-4.11.patch b/kernel-4.11.patch deleted file mode 100644 index 849b5ea..000 --- a/kernel-4.11.patch +++ /dev/null @@ -1,391 +0,0 @@ -From 4859fe796c5b03687a7b2ab3735b882c4f5cad66 Mon Sep 17 00:00:00 2001 -From: Olaf Faaland -Date: Tue, 28 Feb 2017 16:10:18 -0800 -Subject: [PATCH] Linux 4.11 compat: avoid refcount_t name conflict - -Linux 4.11 introduces a new type, refcount_t, which conflicts with the -type of the same name defined within ZFS. - -Rename the ZFS type zfs_refcount_t. Within the ZFS code, use a macro to -cause references to refcount_t to be changed to zfs_refcount_t at -compile time. This reduces conflicts when later landing OpenZFS -patches. - -Reviewed-by: George Melikov -Reviewed-by: Giuseppe Di Natale -Reviewed-by: Brian Behlendorf -Signed-off-by: Olaf Faaland -Closes #5823 -Closes #5842 - include/sys/refcount.h | 17 ++--- - module/zfs/refcount.c | 2 +- - 2 files changed, 15 insertions(+), 4 deletions(-) - -diff --git a/include/sys/refcount.h b/include/sys/refcount.h -index 3f50cdd..a96220b 100644 a/include/sys/refcount.h -+++ b/include/sys/refcount.h -@@ -41,6 +41,17 @@ extern "C" { - */ - #define FTAG ((char *)__func__) - -+/* -+ * Starting with 4.11, torvalds/linux@f405df5, the linux kernel defines a -+ * refcount_t type of its own. The macro below effectively changes references -+ * in the ZFS code from refcount_t to zfs_refcount_t at compile time, so that -+ * existing code need not be altered, reducing conflicts when landing openZFS -+ * patches. -+ */ -+ -+#define refcount_t zfs_refcount_t -+#define refcount_addzfs_refcount_add -+ - #ifdefZFS_DEBUG - typedef struct reference { - list_node_t ref_link; -@@ -56,7 +67,7 @@ typedef struct refcount { - list_t rc_removed; - int64_t rc_count; - int64_t rc_removed_count; --} refcount_t; -+} zfs_refcount_t; - - /* Note: refcount_t must be initialized with refcount_create[_untracked]() */ - -@@ -67,7 +78,7 @@ void refcount_destroy(refcount_t *rc); - void refcount_destroy_many(refcount_t *rc, uint64_t number); - int refcount_is_zero(refcount_t *rc); - int64_t refcount_count(refcount_t *rc); --int64_t refcount_add(refcount_t *rc, void *holder_tag); -+int64_t zfs_refcount_add(refcount_t *rc, void *holder_tag); - int64_t refcount_remove(refcount_t *rc, void *holder_tag); - int64_t refcount_add_many(refcount_t *rc, uint64_t number, void *holder_tag); - int64_t refcount_remove_many(refcount_t *rc, uint64_t number, void *holder_tag); -@@ -92,7 +103,7 @@ typedef struct refcount { - #define refcount_destroy_many(rc, number) ((rc)->rc_count = 0) - #define refcount_is_zero(rc) ((rc)->rc_count == 0) - #define refcount_count(rc) ((rc)->rc_count) --#define refcount_add(rc, holder) atomic_add_64_nv(&(rc)->rc_count, 1) -+#define zfs_refcount_add(rc, holder) atomic_add_64_nv(&(rc)->rc_count, 1) - #define refcount_remove(rc, holder) atomic_add_64_nv(&(rc)->rc_count, -1) - #define refcount_add_many(rc, number, holder) \ - atomic_add_64_nv(&(rc)->rc_count, number) -diff --git a/module/zfs/refcount.c b/module/zfs/refcount.c -index b338747..a151ace 100644 a/module/zfs/refcount.c -+++ b/module/zfs/refcount.c -@@ -143,7 +143,7 @@ refcount_add_many(refcount_t *rc, uint64_t number,
DISTFILES: spl: spl-0.7.0.tar.gz
Request by: baggins Files fetched: 1 STORED: https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.0/spl-0.7.0.tar.gz 5ae8ecb138c25d90371bf0d4a35ab779 spl-0.7.0.tar.gz Size: 608150 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/spl] - up to 0.7.0
commit ece2a02c5b4521d053de978055ec4cfdafcdabc2 Author: Jan RękorajskiDate: Mon Jul 31 20:01:29 2017 +0200 - up to 0.7.0 kernel-4.11.patch | 397 -- spl.spec | 9 +- 2 files changed, 4 insertions(+), 402 deletions(-) --- diff --git a/spl.spec b/spl.spec index 613737d..d22cad2 100644 --- a/spl.spec +++ b/spl.spec @@ -21,17 +21,16 @@ exit 1 %define_duplicate_files_terminate_build0 %definepname spl -%definerel 2 +%definerel 1 Summary: Solaris Porting Layer Summary(pl.UTF-8): Solaris Porting Layer - warstwa do portowania kodu z Solarisa Name: %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel} -Version: 0.6.5.9 +Version: 0.7.0 Release: %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}} License: GPL v2+ Group: Applications/System Source0: https://github.com/zfsonlinux/zfs/releases/download/zfs-%{version}/%{pname}-%{version}.tar.gz -# Source0-md5: ab4e2538231dc4b3acf65fe2436ec46b -Patch0:kernel-4.11.patch +# Source0-md5: 5ae8ecb138c25d90371bf0d4a35ab779 URL: http://zfsonlinux.org/ BuildRequires: rpmbuild(macros) >= 1.701 %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}} @@ -123,7 +122,6 @@ p=`pwd`\ %prep %setup -q -n %{pname}-%{version} -%patch0 -p1 %build %{__aclocal} -I config @@ -161,6 +159,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) %doc AUTHORS DISCLAIMER +%attr(755,root,root) %{_bindir}/splslab.py %attr(755,root,root) %{_sbindir}/splat %{_mandir}/man1/splat.1* %{_mandir}/man5/spl-module-parameters.5.gz diff --git a/kernel-4.11.patch b/kernel-4.11.patch deleted file mode 100644 index 2a6ed00..000 --- a/kernel-4.11.patch +++ /dev/null @@ -1,397 +0,0 @@ -From 8d5feecacfdcca29336209bdccd6493a5fa53576 Mon Sep 17 00:00:00 2001 -From: Olaf Faaland -Date: Thu, 23 Feb 2017 09:52:08 -0800 -Subject: [PATCH] Linux 4.11 compat: set_task_state() removed - -Replace uses of set_task_state(current, STATE) with -set_current_state(STATE). - -In Linux 4.11, torvalds/linux@642fa44, set_task_state() is removed. - -All spl uses are of the form set_task_state(current, STATE). -set_current_state(STATE) is equivalent and has been available since -Linux 2.2.26. - -Furthermore, set_current_state(STATE) is already used in about 15 -locations within spl. This change should have no impact other than -removing an unnecessary dependency. - -Reviewed-by: Brian Behlendorf -Signed-off-by: Olaf Faaland -Closes #603 - module/spl/spl-err.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/module/spl/spl-err.c b/module/spl/spl-err.c -index 14ff8a3..cf9f096 100644 a/module/spl/spl-err.c -+++ b/module/spl/spl-err.c -@@ -65,7 +65,7 @@ spl_panic(const char *file, const char *func, int line, const char *fmt, ...) { - spl_dumpstack(); - - /* Halt the thread to facilitate further debugging */ -- set_task_state(current, TASK_UNINTERRUPTIBLE); -+ set_current_state(TASK_UNINTERRUPTIBLE); - while (1) - schedule(); - -@@ -98,7 +98,7 @@ vcmn_err(int ce, const char *fmt, va_list ap) - spl_dumpstack(); - - /* Halt the thread to facilitate further debugging */ -- set_task_state(current, TASK_UNINTERRUPTIBLE); -+ set_current_state(TASK_UNINTERRUPTIBLE); - while (1) - schedule(); - } -From 94b1ab2ae01e9ee642aee87dd1a73e8d63629372 Mon Sep 17 00:00:00 2001 -From: Olaf Faaland -Date: Tue, 7 Mar 2017 13:18:53 -0800 -Subject: [PATCH] Linux 4.11 compat: vfs_getattr() takes 4 args - -There are changes to vfs_getattr() in torvalds/linux@a528d35. The new -interface is: - -int vfs_getattr(const struct path *path, struct kstat *stat, - u32 request_mask, unsigned int query_flags) - -The request_mask argument indicates which field(s) the caller intends to -use. Fields the caller does not specify via request_mask may be set in -the returned struct anyway, but their values may be approximate. - -The query_flags argument indicates whether the filesystem must update -the attributes from the backing store. - -This patch uses the query_flags which result in vfs_getattr behaving the same -as it did with the 2-argument version which the kernel provided before -Linux 4.11. - -Members blksize and blocks are now always the same size regardless of -arch. They match the size of the equivalent members in vnode_t. - -The configure checks are modified to ensure that the appropriate -vfs_getattr() interface is used. - -A more complete fix, removing the ZFS dependency on vfs_getattr() -entirely, is deferred as it is a much larger project. -
DISTFILES: dbus: dbus-1.10.22.tar.gz
Request by: qboosh Files fetched: 1 STORED: https://dbus.freedesktop.org/releases/dbus/dbus-1.10.22.tar.gz baaa10b7cb49086ad91179a8decfadc5 dbus-1.10.22.tar.gz Size: 1989350 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/dbus] - updated to 1.10.22
commit c2d43d503ceefa85aed4decc985c4b1836e6ee81 Author: Jakub BoguszDate: Mon Jul 31 17:33:53 2017 +0200 - updated to 1.10.22 dbus.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/dbus.spec b/dbus.spec index 940659b..d5976c4 100644 --- a/dbus.spec +++ b/dbus.spec @@ -12,12 +12,12 @@ Summary: D-BUS message bus Summary(pl.UTF-8): Magistrala przesyłania komunikatów D-BUS Name: dbus -Version: 1.10.20 +Version: 1.10.22 Release: 1 License: AFL v2.1 or GPL v2 Group: Libraries Source0: https://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz -# Source0-md5: 94c991e763d4f9f13690416b2dcd9411 +# Source0-md5: baaa10b7cb49086ad91179a8decfadc5 Source1: messagebus.init Source2: %{name}-daemon-1-profile.d-sh Source3: %{name}-sysconfig gitweb: http://git.pld-linux.org/gitweb.cgi/packages/dbus.git/commitdiff/c2d43d503ceefa85aed4decc985c4b1836e6ee81 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/obs-studio] fix reported version number
commit c0e58c59750bb7857d8ade7c7e56770c72781b3a Author: Jacek KoniecznyDate: Mon Jul 31 16:25:10 2017 +0200 fix reported version number "OBS 0.0.1" does not look good Release: 2 obs-studio.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- diff --git a/obs-studio.spec b/obs-studio.spec index b7c1ea0..0bb3f65 100644 --- a/obs-studio.spec +++ b/obs-studio.spec @@ -1,7 +1,7 @@ Summary: OBS Studio - live streaming and screen recording software Name: obs-studio Version: 19.0.3 -Release: 1 +Release: 2 License: GPL v2 Group: Applications Source0: https://github.com/jp9000/obs-studio/archive/%{version}/%{name}-%{version}.tar.gz @@ -64,6 +64,7 @@ export OBS_MULTIARCH_SUFFIX=x32 %endif %cmake \ + -DOBS_VERSION_OVERRIDE=%{version} \ ../ %{__make} gitweb: http://git.pld-linux.org/gitweb.cgi/packages/obs-studio.git/commitdiff/c0e58c59750bb7857d8ade7c7e56770c72781b3a ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: augeas: augeas-1.8.0.tar.gz
Request by: qboosh Files fetched: 1 STORED: http://download.augeas.net/augeas-1.8.0.tar.gz cc99cf86ec5f5c4dac71f2800bde2758 augeas-1.8.0.tar.gz Size: 2164146 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/augeas] - updated to 1.8.0
commit b6c06733ce73dd4c99238b65a470eb3d27ccdbf2 Author: Jakub BoguszDate: Mon Jul 31 16:08:54 2017 +0200 - updated to 1.8.0 augeas.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/augeas.spec b/augeas.spec index ec0c526..e70f303 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,12 +1,12 @@ Summary: Augeas - configuration editing tool Summary(pl.UTF-8): Augeas - narzędzie do modyfikowania konfiguracji Name: augeas -Version: 1.7.0 +Version: 1.8.0 Release: 1 License: LGPL v2.1+ Group: Applications/System Source0: http://download.augeas.net/%{name}-%{version}.tar.gz -# Source0-md5: 18bdf9249c6f61af9d1d09127e15d8e3 +# Source0-md5: cc99cf86ec5f5c4dac71f2800bde2758 Patch0:%{name}-pld_interfaces.patch URL: http://augeas.net/ BuildRequires: libselinux-devel gitweb: http://git.pld-linux.org/gitweb.cgi/packages/augeas.git/commitdiff/b6c06733ce73dd4c99238b65a470eb3d27ccdbf2 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/obs-studio] obs-libfdk and vlc-video plugins added
commit 1caed8491d6a22a63b24677a6377a63245565adf Author: Jacek KoniecznyDate: Mon Jul 31 16:04:18 2017 +0200 obs-libfdk and vlc-video plugins added obs-studio.spec | 8 1 file changed, 8 insertions(+) --- diff --git a/obs-studio.spec b/obs-studio.spec index a9260b2..b7c1ea0 100644 --- a/obs-studio.spec +++ b/obs-studio.spec @@ -12,6 +12,7 @@ BuildRequires:Qt5Core-devel BuildRequires: Qt5Gui-devel BuildRequires: cmake BuildRequires: curl-devel +BuildRequires: fdk-aac-devel BuildRequires: ffmpeg-devel BuildRequires: fontconfig-devel BuildRequires: freetype-devel @@ -22,6 +23,7 @@ BuildRequires:pulseaudio-devel BuildRequires: qt5-build BuildRequires: qt5-qmake BuildRequires: udev-devel +BuildRequires: vlc-devel BuildRequires: xorg-lib-libXcomposite-devel BuildRequires: xorg-lib-libXinerama-devel BuildRequires: xorg-lib-libXrandr-devel @@ -129,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/obs/obs-plugins/obs-filters/*.effect %{_datadir}/obs/obs-plugins/obs-filters/LUTs +%dir %{_datadir}/obs/obs-plugins/obs-libfdk +%{_datadir}/obs/obs-plugins/obs-libfdk/locale + %dir %{_datadir}/obs/obs-plugins/obs-outputs %{_datadir}/obs/obs-plugins/obs-outputs/locale @@ -149,6 +154,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/obs/obs-plugins/text-freetype2/locale %{_datadir}/obs/obs-plugins/text-freetype2/*.effect +%dir %{_datadir}/obs/obs-plugins/vlc-video +%{_datadir}/obs/obs-plugins/vlc-video/locale + %files devel %defattr(644,root,root,755) %{_includedir}/obs gitweb: http://git.pld-linux.org/gitweb.cgi/packages/obs-studio.git/commitdiff/1caed8491d6a22a63b24677a6377a63245565adf ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/obs-studio] fix x32 build
commit c7025d0a693b2957e154e3de9e075f8f476578d0 Author: Jacek KoniecznyDate: Mon Jul 31 15:37:13 2017 +0200 fix x32 build obs-studio.spec | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) --- diff --git a/obs-studio.spec b/obs-studio.spec index fe21568..a9260b2 100644 --- a/obs-studio.spec +++ b/obs-studio.spec @@ -53,9 +53,14 @@ Pliki nagłówkowe biblioteki %{name}. %build install -d build cd build -%ifarch x86_64 + +%if "%{_lib}" == "lib64" export OBS_MULTIARCH_SUFFIX=64 %endif +%if "%{_lib}" == "libx32" +export OBS_MULTIARCH_SUFFIX=x32 +%endif + %cmake \ ../ %{__make} gitweb: http://git.pld-linux.org/gitweb.cgi/packages/obs-studio.git/commitdiff/c7025d0a693b2957e154e3de9e075f8f476578d0 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: obs-studio: obs-studio-19.0.3.tar.gz
Request by: jajcus Files fetched: 1 STORED: https://github.com/jp9000/obs-studio/archive/19.0.3/obs-studio-19.0.3.tar.gz c0e2b4f7a18a9a4e1e15ab4c71dc95e7 obs-studio-19.0.3.tar.gz Size: 5510739 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/obs-studio] new package, now with the spec file :)
commit 19691b4e8cf346e14e39066827f9031b931f87c4 Author: Jacek KoniecznyDate: Mon Jul 31 15:15:13 2017 +0200 new package, now with the spec file :) obs-studio.spec | 154 1 file changed, 154 insertions(+) --- diff --git a/obs-studio.spec b/obs-studio.spec new file mode 100644 index 000..fe21568 --- /dev/null +++ b/obs-studio.spec @@ -0,0 +1,154 @@ +Summary: OBS Studio - live streaming and screen recording software +Name: obs-studio +Version: 19.0.3 +Release: 1 +License: GPL v2 +Group: Applications +Source0: https://github.com/jp9000/obs-studio/archive/%{version}/%{name}-%{version}.tar.gz +# Source0-md5: c0e2b4f7a18a9a4e1e15ab4c71dc95e7 +Patch0:libobs_link.patch +URL: https://obsproject.com/ +BuildRequires: Qt5Core-devel +BuildRequires: Qt5Gui-devel +BuildRequires: cmake +BuildRequires: curl-devel +BuildRequires: ffmpeg-devel +BuildRequires: fontconfig-devel +BuildRequires: freetype-devel +BuildRequires: jack-audio-connection-kit-devel +BuildRequires: jansson-devel +BuildRequires: libv4l-devel +BuildRequires: pulseaudio-devel +BuildRequires: qt5-build +BuildRequires: qt5-qmake +BuildRequires: udev-devel +BuildRequires: xorg-lib-libXcomposite-devel +BuildRequires: xorg-lib-libXinerama-devel +BuildRequires: xorg-lib-libXrandr-devel +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%define_noautoprovfiles%{_libdir}/obs-plugins + +%description +OBS Studio is software designed for capturing, compositing, encoding, +recording, and streaming video content, efficiently. + +%package devel +Summary: Header files for OBS Studio +Summary(pl.UTF-8): Pliki nagłówkowe biblioteki %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +Header files for %{name} library. + +%description devel -l pl.UTF-8 +Pliki nagłówkowe biblioteki %{name}. + +%prep +%setup -q + +%patch0 -p1 + +%build +install -d build +cd build +%ifarch x86_64 +export OBS_MULTIARCH_SUFFIX=64 +%endif +%cmake \ + ../ +%{__make} + +%install +rm -rf $RPM_BUILD_ROOT +%{__make} -C build install/fast \ +DESTDIR=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig +%postun-p /sbin/ldconfig + +%files +%defattr(644,root,root,755) +%doc AUTHORS README.rst +%attr(755,root,root) %{_bindir}/obs +%attr(755,root,root) %{_libdir}/libobs-frontend-api.so.0.* +%ghost %{_libdir}/libobs-frontend-api.so.0 +%attr(755,root,root) %{_libdir}/libobs-opengl.so.0.* +%ghost %{_libdir}/libobs-opengl.so.0 +%attr(755,root,root) %{_libdir}/libobs.so.0 +%attr(755,root,root) %{_libdir}/libobsglad.so.0 +%dir %{_libdir}/obs-plugins +%attr(755,root,root) %{_libdir}/obs-plugins/*.so +%{_desktopdir}/obs.desktop +%{_iconsdir}/*/*/apps/obs.png + +%dir %{_datadir}/obs +%{_datadir}/obs/libobs +%{_datadir}/obs/obs-studio +%dir %{_datadir}/obs/obs-plugins + +%dir %{_datadir}/obs/obs-plugins/frontend-tools +%{_datadir}/obs/obs-plugins/frontend-tools/locale + +%dir %{_datadir}/obs/obs-plugins/image-source +%{_datadir}/obs/obs-plugins/image-source/locale + +%dir %{_datadir}/obs/obs-plugins/linux-alsa +%{_datadir}/obs/obs-plugins/linux-alsa/locale + +%dir %{_datadir}/obs/obs-plugins/linux-capture +%{_datadir}/obs/obs-plugins/linux-capture/locale + +%dir %{_datadir}/obs/obs-plugins/linux-decklink +%{_datadir}/obs/obs-plugins/linux-decklink/locale + +%dir %{_datadir}/obs/obs-plugins/linux-jack +%{_datadir}/obs/obs-plugins/linux-jack/locale + +%dir %{_datadir}/obs/obs-plugins/linux-pulseaudio +%{_datadir}/obs/obs-plugins/linux-pulseaudio/locale + +%dir %{_datadir}/obs/obs-plugins/linux-v4l2 +%{_datadir}/obs/obs-plugins/linux-v4l2/locale + +%dir %{_datadir}/obs/obs-plugins/obs-ffmpeg +%{_datadir}/obs/obs-plugins/obs-ffmpeg/locale +%attr(755,root,root) %{_datadir}/obs/obs-plugins/obs-ffmpeg/ffmpeg-mux + +%dir %{_datadir}/obs/obs-plugins/obs-filters +%{_datadir}/obs/obs-plugins/obs-filters/locale +%{_datadir}/obs/obs-plugins/obs-filters/*.effect +%{_datadir}/obs/obs-plugins/obs-filters/LUTs + +%dir %{_datadir}/obs/obs-plugins/obs-outputs +%{_datadir}/obs/obs-plugins/obs-outputs/locale + +%dir %{_datadir}/obs/obs-plugins/obs-transitions +%{_datadir}/obs/obs-plugins/obs-transitions/locale +%{_datadir}/obs/obs-plugins/obs-transitions/*.effect +%{_datadir}/obs/obs-plugins/obs-transitions/*.inc +%{_datadir}/obs/obs-plugins/obs-transitions/luma_wipes + +%dir %{_datadir}/obs/obs-plugins/obs-x264 +%{_datadir}/obs/obs-plugins/obs-x264/locale + +%dir %{_datadir}/obs/obs-plugins/rtmp-services +%{_datadir}/obs/obs-plugins/rtmp-services/locale +%{_datadir}/obs/obs-plugins/rtmp-services/*.json + +%dir %{_datadir}/obs/obs-plugins/text-freetype2 +%{_datadir}/obs/obs-plugins/text-freetype2/locale +%{_datadir}/obs/obs-plugins/text-freetype2/*.effect + +%files devel +%defattr(644,root,root,755)
DISTFILES: ERROR fetching sources for obs-studio (refs/heads/master)
Requester: j.konieczny cannot parse obs-studio (refs/heads/master) -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/obs-studio] new package
commit 58395ecc64b809abc3a756c60b687cf902965e86 Author: Jacek KoniecznyDate: Mon Jul 31 15:02:05 2017 +0200 new package libobs_link.patch | 13 + 1 file changed, 13 insertions(+) --- diff --git a/libobs_link.patch b/libobs_link.patch new file mode 100644 index 000..847c99d --- /dev/null +++ b/libobs_link.patch @@ -0,0 +1,13 @@ +diff -dur obs-studio-19.0.3.orig/libobs/CMakeLists.txt obs-studio-19.0.3/libobs/CMakeLists.txt +--- obs-studio-19.0.3.orig/libobs/CMakeLists.txt 2017-06-22 09:58:45.0 +0200 obs-studio-19.0.3/libobs/CMakeLists.txt2017-07-31 14:19:57.0 +0200 +@@ -425,6 +425,9 @@ + ${OBS_JANSSON_IMPORT} + ${FFMPEG_LIBRARIES} + ${ZLIB_LIBRARIES} ++ ${PKG_X11_XCB_LIBRARIES} ++ -ldl ++ -lm + PUBLIC + ${THREADS_LIBRARIES}) + gitweb: http://git.pld-linux.org/gitweb.cgi/packages/obs-studio.git/commitdiff/58395ecc64b809abc3a756c60b687cf902965e86 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/obs-studio] Created branch master
The branch 'master' was created. Summary of new commits: 58395ec... new package ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: ERROR fetching sources for obs-studio (refs/heads/master)
Requester: jajcus cannot parse obs-studio (refs/heads/master) -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: percona-server: percona-server-5.7.18-16.tar.gz sphinx-2.2.11-release.tar.gz
Request by: arekm Files fetched: 1 STORED: https://www.percona.com/downloads/Percona-Server-5.7/LATEST/source/tarball/percona-server-5.7.18-16.tar.gz 01a79e52b352f771ce2025b549b98d6a percona-server-5.7.18-16.tar.gz Size: 79234764 bytes ALREADY GOT: http://www.sphinxsearch.com/files/sphinx-2.2.11-release.tar.gz 5cac34f3d78a9d612ca4301abfcbd666 sphinx-2.2.11-release.tar.gz -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/percona-server] - up to 5.7.18-16; sphinx up to 2.2.11
commit a1a9dfeb3fb65428113ae939170abbe5bba53004 Author: Arkadiusz MiśkiewiczDate: Mon Jul 31 13:06:07 2017 +0200 - up to 5.7.18-16; sphinx up to 2.2.11 mysql-opt.patch | 12 +--- percona-server.spec | 50 +- 2 files changed, 42 insertions(+), 20 deletions(-) --- diff --git a/percona-server.spec b/percona-server.spec index 713d65e..873148f 100644 --- a/percona-server.spec +++ b/percona-server.spec @@ -67,7 +67,7 @@ %endif %definerel 0.1 -%definepercona_rel 10 +%definepercona_rel 16 %include /usr/lib/rpm/macros.perl Summary: Percona Server: a very fast and reliable SQL database engine Summary(de.UTF-8): Percona Server: ist eine SQL-Datenbank @@ -78,14 +78,14 @@ Summary(ru.UTF-8): Percona Server - быстрый SQL-сервер Summary(uk.UTF-8): Percona Server - швидкий SQL-сервер Summary(zh_CN.UTF-8): Percona Server数据库服务器 Name: percona-server -Version: 5.7.16 +Version: 5.7.18 Release: %{percona_rel}.%{rel} License: GPL + Percona Server FLOSS Exception Group: Applications/Databases Source0: https://www.percona.com/downloads/Percona-Server-5.7/LATEST/source/tarball/%{name}-%{version}-%{percona_rel}.tar.gz -# Source0-md5: 9ac2b8e800dd40bb042493f4a859db67 -Source100: http://www.sphinxsearch.com/files/sphinx-2.2.10-release.tar.gz -# Source100-md5: dda52b24d8348fc09e26d8a649a231d2 +# Source0-md5: 01a79e52b352f771ce2025b549b98d6a +Source100: http://www.sphinxsearch.com/files/sphinx-2.2.11-release.tar.gz +# Source100-md5: 5cac34f3d78a9d612ca4301abfcbd666 Source1: %{name}.init Source2: %{name}.sysconfig Source3: %{name}.logrotate @@ -582,6 +582,7 @@ CPPFLAGS="%{rpmcppflags}" \ -DINSTALL_SQLBENCHDIR=%{_datadir} \ -DINSTALL_SUPPORTFILESDIR=share/%{name}-support \ -DINSTALL_MYSQLSHAREDIR=share/%{name} \ + -DINSTALL_SECURE_FILE_PRIVDIR="" \ -DMYSQL_UNIX_ADDR=/var/lib/%{name}/%{name}.sock \ %{?debug:-DWITH_DEBUG=ON} \ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ @@ -590,6 +591,7 @@ CPPFLAGS="%{rpmcppflags}" \ -DWITH_PAM=ON \ -DWITH_PERFSCHEMA_STORAGE_ENGINE=1 \ -DWITH_PIC=ON \ + -DWITH_SCALABILITY_METRICS=ON \ %if "%{pld_release}" == "ac" -DWITH_SSL=%{?with_ssl:bundled}%{!?with_ssl:no} \ %else @@ -775,11 +777,12 @@ fi %files %defattr(644,root,root,755) -%doc build/support-files/*.cnf +%doc build-ps/rpm/*.cnf %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name} %attr(754,root,root) /etc/rc.d/init.d/%{name} %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name} %attr(640,root,mysql) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/clusters.conf +%attr(755,root,root) %{_bindir}/ps_mysqld_helper %attr(755,root,root) %{_bindir}/ps_tokudb_admin %attr(755,root,root) %{_sbindir}/innochecksum %attr(755,root,root) %{_sbindir}/my_print_defaults @@ -795,20 +798,44 @@ fi %dir %{_libdir}/%{name}/plugin %attr(755,root,root) %{_libdir}/%{name}/plugin/adt_null.so %attr(755,root,root) %{_libdir}/%{name}/plugin/audit_log.so -%attr(755,root,root) %{_libdir}/%{name}/plugin/auth.so -%attr(755,root,root) %{_libdir}/%{name}/plugin/auth_pam.so %attr(755,root,root) %{_libdir}/%{name}/plugin/auth_pam_compat.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/auth_pam.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/auth.so %attr(755,root,root) %{_libdir}/%{name}/plugin/auth_socket.so %attr(755,root,root) %{_libdir}/%{name}/plugin/auth_test_plugin.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/connection_control.so %attr(755,root,root) %{_libdir}/%{name}/plugin/dialog.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/group_replication.so #%attr(755,root,root) %{_libdir}/%{name}/plugin/ha_archive.so #%attr(755,root,root) %{_libdir}/%{name}/plugin/ha_blackhole.so #%attr(755,root,root) %{_libdir}/%{name}/plugin/ha_federated.so #%attr(755,root,root) %{_libdir}/%{name}/plugin/handlersocket.so %attr(755,root,root) %{_libdir}/%{name}/plugin/keyring_file.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/keyring_udf.so %attr(755,root,root) %{_libdir}/%{name}/plugin/libfnv1a_udf.so %attr(755,root,root) %{_libdir}/%{name}/plugin/libfnv_udf.so %attr(755,root,root) %{_libdir}/%{name}/plugin/libmurmur_udf.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/libtest_framework.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/libtest_services.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/libtest_services_threaded.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/libtest_session_detach.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/libtest_session_info.so +%attr(755,root,root) %{_libdir}/%{name}/plugin/libtest_session_in_thd.so +%attr(755,root,root)
[packages/kernel] - drop ancient patch
commit 294f635766f4f49c437764a990a8df4106534c30 Author: Arkadiusz MiśkiewiczDate: Mon Jul 31 11:37:10 2017 +0200 - drop ancient patch kernel.spec| 2 -- linux-wistron-nx.patch | 26 -- 2 files changed, 28 deletions(-) --- diff --git a/kernel.spec b/kernel.spec index cd3ba333..d0468c1f 100644 --- a/kernel.spec +++ b/kernel.spec @@ -152,7 +152,6 @@ Source58: kernel-inittmpfs.config # http://dev.gentoo.org/~spock/projects/fbcondecor/archive/fbcondecor-0.9.4-2.6.25-rc6.patch Patch3:kernel-fbcondecor.patch -Patch6:linux-wistron-nx.patch # netfilter related stuff mostly based on patch-o-matic-ng # snapshot 20070806 with some fixes. Some modules @@ -633,7 +632,6 @@ cd linux-%{basever} %if %{with fbcondecor} %patch3 -p1 %endif -%patch6 -p1 ## netfilter # diff --git a/linux-wistron-nx.patch b/linux-wistron-nx.patch deleted file mode 100644 index 1ab8ed32.. --- a/linux-wistron-nx.patch +++ /dev/null @@ -1,26 +0,0 @@ linux-3.10/drivers/input/misc/wistron_btns.c.orig 2013-11-16 09:05:55.612742472 +0100 -+++ linux-3.10/drivers/input/misc/wistron_btns.c 2013-11-16 09:24:37.356028732 +0100 -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - - /* How often we poll keys - msecs */ - #define POLL_INTERVAL_DEFAULT 500 /* when idle */ -@@ -124,6 +125,7 @@ - if (entry_point >= 0xF) { - bios_code_map_base = base; - bios_entry_point = bios_code_map_base + (entry_point & 0x); -+ set_memory_x((unsigned long)bios_code_map_base, 0x1 >> PAGE_SHIFT); - } else { - iounmap(base); - bios_code_map_base = ioremap(entry_point & ~0x3FFF, 0x4000); -@@ -134,6 +136,7 @@ - goto err; - } - bios_entry_point = bios_code_map_base + (entry_point & 0x3FFF); -+ set_memory_x((unsigned long)bios_code_map_base, 0x4000 >> PAGE_SHIFT); - } - /* The Windows driver maps 0x1 bytes, we keep only one page... */ - bios_data_map_base = ioremap(0x400, 0xc00); gitweb: http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/294f635766f4f49c437764a990a8df4106534c30 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/kernel] - rel 1
commit ffa93bbd04707fc20700de612a25425b0c1983de Author: Arkadiusz MiśkiewiczDate: Mon Jul 31 10:58:57 2017 +0200 - rel 1 kernel-aufs4.patch | 285 ++--- kernel.spec| 2 +- 2 files changed, 143 insertions(+), 144 deletions(-) --- diff --git a/kernel.spec b/kernel.spec index fa16f733..cd3ba333 100644 --- a/kernel.spec +++ b/kernel.spec @@ -68,7 +68,7 @@ %definehave_pcmcia 0 %endif -%definerel 0.1 +%definerel 1 %definebasever 4.12 %definepostver .4 diff --git a/kernel-aufs4.patch b/kernel-aufs4.patch index 45bf39d0..7d3892cf 100644 --- a/kernel-aufs4.patch +++ b/kernel-aufs4.patch @@ -1,10 +1,10 @@ -aufs4.11.7+ kbuild patch +aufs4.x-rcN kbuild patch diff --git a/fs/Kconfig b/fs/Kconfig -index 83eab52..31f16c4 100644 +index b0e42b6..7fa4b68 100644 --- a/fs/Kconfig +++ b/fs/Kconfig -@@ -248,6 +248,7 @@ source "fs/pstore/Kconfig" +@@ -249,6 +249,7 @@ source "fs/pstore/Kconfig" source "fs/sysv/Kconfig" source "fs/ufs/Kconfig" source "fs/exofs/Kconfig" @@ -21,25 +21,13 @@ index 7bbaca9..a026491 100644 obj-$(CONFIG_PSTORE) += pstore/ obj-$(CONFIG_EFIVAR_FS) += efivarfs/ +obj-$(CONFIG_AUFS_FS) += aufs/ -diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild -index f8d9fed..902305e 100644 a/include/uapi/linux/Kbuild -+++ b/include/uapi/linux/Kbuild -@@ -59,6 +59,7 @@ header-y += atmsvc.h - header-y += atm_tcp.h - header-y += atm_zatm.h - header-y += audit.h -+header-y += aufs_type.h - header-y += auto_fs4.h - header-y += auto_fs.h - header-y += auxvec.h -aufs4.11.7+ base patch +aufs4.x-rcN base patch diff --git a/MAINTAINERS b/MAINTAINERS -index 38d3e4e..c2b31bf 100644 +index 09b5ab6..6640ab1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -2319,6 +2319,19 @@ F: include/linux/audit.h +@@ -2348,6 +2348,19 @@ F: include/linux/audit.h F:include/uapi/linux/audit.h F:kernel/audit* @@ -60,10 +48,10 @@ index 38d3e4e..c2b31bf 100644 M:Miguel Ojeda Sandonis W:http://miguelojeda.es/auxdisplay.htm diff --git a/drivers/block/loop.c b/drivers/block/loop.c -index 0ecb646..cf39138 100644 +index ebbd0c3..6b8a6a4c 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c -@@ -701,6 +701,24 @@ static inline int is_loop_device(struct file *file) +@@ -700,6 +700,24 @@ static inline int is_loop_device(struct file *file) return i && S_ISBLK(i->i_mode) && MAJOR(i->i_rdev) == LOOP_MAJOR; } @@ -89,7 +77,7 @@ index 0ecb646..cf39138 100644 static ssize_t loop_attr_show(struct device *dev, char *page, diff --git a/fs/dcache.c b/fs/dcache.c -index 95d71ed..8ca5f09 100644 +index a9f995f..3458af5 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -1164,7 +1164,7 @@ enum d_walk_ret { @@ -102,10 +90,10 @@ index 95d71ed..8ca5f09 100644 void (*finish)(void *)) { diff --git a/fs/fcntl.c b/fs/fcntl.c -index be8fbe2..f5f4f94 100644 +index f4e7267..d39404c 100644 --- a/fs/fcntl.c +++ b/fs/fcntl.c -@@ -30,7 +30,7 @@ +@@ -31,7 +31,7 @@ #define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME) @@ -114,7 +102,7 @@ index be8fbe2..f5f4f94 100644 { struct inode * inode = file_inode(filp); int error = 0; -@@ -61,6 +61,8 @@ static int setfl(int fd, struct file * filp, unsigned long arg) +@@ -62,6 +62,8 @@ static int setfl(int fd, struct file * filp, unsigned long arg) if (filp->f_op->check_flags) error = filp->f_op->check_flags(arg); @@ -124,10 +112,10 @@ index be8fbe2..f5f4f94 100644 return error; diff --git a/fs/inode.c b/fs/inode.c -index 88110fd..9a9ba3a 100644 +index db59147..69cbe9c 100644 --- a/fs/inode.c +++ b/fs/inode.c -@@ -1642,7 +1642,7 @@ EXPORT_SYMBOL(generic_update_time); +@@ -1640,7 +1640,7 @@ EXPORT_SYMBOL(generic_update_time); * This does the actual work of updating an inodes time or version. Must have * had called mnt_want_write() before calling this. */ @@ -137,7 +125,7 @@ index 88110fd..9a9ba3a 100644 int (*update_time)(struct inode *, struct timespec *, int); diff --git a/fs/read_write.c b/fs/read_write.c -index f77eb22..eba4e7e 100644 +index 19d4d88..05033f7 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -513,6 +513,28 @@ ssize_t __vfs_write(struct file *file, const char __user *p, size_t count, @@ -170,10 +158,10 @@ index f77eb22..eba4e7e 100644 { mm_segment_t old_fs; diff --git a/fs/splice.c b/fs/splice.c -index 006ba50..46c87af 100644 +index 540c4a4..4a0bc62 100644 --- a/fs/splice.c +++ b/fs/splice.c -@@ -859,8 +859,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); +@@ -853,8 +853,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); /* * Attempt to initiate a splice from pipe to file. */ @@ -184,7 +172,7
[packages/nagios-plugin-check_ssl_cert] up to 1.51.0
commit 90a906de922147c3d141052149a7f25ff7c0e33e Author: Elan RuusamäeDate: Mon Jul 31 09:44:14 2017 +0300 up to 1.51.0 nagios-plugin-check_ssl_cert.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/nagios-plugin-check_ssl_cert.spec b/nagios-plugin-check_ssl_cert.spec index 80ff079..2c4af73 100644 --- a/nagios-plugin-check_ssl_cert.spec +++ b/nagios-plugin-check_ssl_cert.spec @@ -2,12 +2,12 @@ Summary: Nagios plugin to check the CA and validity of an X.509 certificate Summary(pl.UTF-8): Wtyczka Nagiosa sprawdzająca CA i ważność certyfikatu X.509 Name: nagios-plugin-%{plugin} -Version: 1.49.0 +Version: 1.51.0 Release: 1 License: GPL v3 Group: Networking Source0: https://github.com/matteocorti/check_ssl_cert/releases/download/v%{version}/check_ssl_cert-%{version}.tar.gz -# Source0-md5: 18c249a1349b9df51e9258e07800bc68 +# Source0-md5: 38e964d5014843392d340074699f1ac4 Source1: check_ssl_cert.cfg Patch0:ca_path.patch URL: https://github.com/matteocorti/check_ssl_cert/wiki gitweb: http://git.pld-linux.org/gitweb.cgi/packages/nagios-plugin-check_ssl_cert.git/commitdiff/90a906de922147c3d141052149a7f25ff7c0e33e ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: nagios-plugin-check_ssl_cert: check_ssl_cert-1.51.0.tar.gz
Request by: glen Files fetched: 1 STORED: https://github.com/matteocorti/check_ssl_cert/releases/download/v1.51.0/check_ssl_cert-1.51.0.tar.gz 38e964d5014843392d340074699f1ac4 check_ssl_cert-1.51.0.tar.gz Size: 186861 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/kernel] - oss is obsolete; update files and aufs4 patch
commit f99f421485c1f34d056c6b96a4bde6d8d59485c5 Author: Arkadiusz MiśkiewiczDate: Mon Jul 31 10:21:13 2017 +0200 - oss is obsolete; update files and aufs4 patch kernel-aufs4.patch | 274 - kernel.spec| 38 +--- 2 files changed, 144 insertions(+), 168 deletions(-) --- diff --git a/kernel.spec b/kernel.spec index efa5a587..fa16f733 100644 --- a/kernel.spec +++ b/kernel.spec @@ -43,7 +43,6 @@ %definehave_drm1 %definehave_ide1 -%definehave_oss1 %definehave_sound 1 %definehave_pcmcia 1 @@ -56,7 +55,6 @@ %if %{with myown} %definehave_drm0 %definehave_ide0 -%definehave_oss0 %definehave_sound 0 %definehave_pcmcia 0 %endif @@ -64,7 +62,6 @@ %ifarch sparc sparc64 %unglobal with_pcmcia %definehave_drm0 -%definehave_oss0 %endif %if %{without pcmcia} @@ -520,25 +517,6 @@ ALSA (Advanced Linux Sound Architecture) Sound-Treiber. %description sound-alsa -l pl.UTF-8 Sterowniki dźwięku ALSA (Advanced Linux Sound Architecture). -%package sound-oss -Summary: OSS kernel modules -Summary(de.UTF-8): OSS Kernel Module -Summary(pl.UTF-8): Sterowniki dźwięku OSS -Group: Base/Kernel -Requires(postun): %{name} = %{epoch}:%{version}-%{release} -Requires: %{name} = %{epoch}:%{version}-%{release} -Obsoletes: kernel-smp-sound-oss -AutoReqProv: no - -%description sound-oss -OSS (Open Sound System) drivers. - -%description sound-oss -l de.UTF-8 -OSS (Open Sound System) Treiber. - -%description sound-oss -l pl.UTF-8 -Sterowniki dźwięku OSS (Open Sound System). - %package headers Summary: Header files for the Linux kernel Summary(de.UTF-8): Header Dateien für den Linux-Kernel @@ -1197,12 +1175,6 @@ fi %postun sound-alsa %depmod %{kernel_release} -%post sound-oss -%depmod %{kernel_release} - -%postun sound-oss -%depmod %{kernel_release} - %post headers ln -snf %{basename:%{_kernelsrcdir}} %{_prefix}/src/linux%{versuffix}%{_alt_kernel} @@ -1245,6 +1217,7 @@ fi %dir /lib/modules/%{kernel_release} %dir /lib/modules/%{kernel_release}/kernel /lib/modules/%{kernel_release}/kernel/arch +/lib/modules/%{kernel_release}/kernel/block /lib/modules/%{kernel_release}/kernel/crypto /lib/modules/%{kernel_release}/kernel/drivers %if %{have_drm} @@ -1389,21 +1362,12 @@ fi %exclude %dir /lib/modules/%{kernel_release}/kernel/sound %exclude /lib/modules/%{kernel_release}/kernel/sound/ac97_bus.ko* %exclude /lib/modules/%{kernel_release}/kernel/sound/sound*.ko* -%if %{have_oss} -%exclude /lib/modules/%{kernel_release}/kernel/sound/oss -%endif %ifnarch sparc /lib/modules/%{kernel_release}/kernel/drivers/usb/gadget/legacy/g_midi.ko* /lib/modules/%{kernel_release}/kernel/drivers/media/pci/cx88/cx88-alsa.ko* /lib/modules/%{kernel_release}/kernel/drivers/media/usb/em28xx/em28xx-alsa.ko* /lib/modules/%{kernel_release}/kernel/drivers/media/pci/saa7134/saa7134-alsa.ko* %endif - -%if %{have_oss} -%files sound-oss -%defattr(644,root,root,755) -/lib/modules/%{kernel_release}/kernel/sound/oss -%endif %endif %files headers -f files.headers_exclude_kbuild diff --git a/kernel-aufs4.patch b/kernel-aufs4.patch index 8b5e8f8c..45bf39d0 100644 --- a/kernel-aufs4.patch +++ b/kernel-aufs4.patch @@ -1,10 +1,10 @@ -aufs4.x-rcN kbuild patch +aufs4.11.7+ kbuild patch diff --git a/fs/Kconfig b/fs/Kconfig -index b0e42b6..7fa4b68 100644 +index 83eab52..31f16c4 100644 --- a/fs/Kconfig +++ b/fs/Kconfig -@@ -249,6 +249,7 @@ source "fs/pstore/Kconfig" +@@ -248,6 +248,7 @@ source "fs/pstore/Kconfig" source "fs/sysv/Kconfig" source "fs/ufs/Kconfig" source "fs/exofs/Kconfig" @@ -21,13 +21,25 @@ index 7bbaca9..a026491 100644 obj-$(CONFIG_PSTORE) += pstore/ obj-$(CONFIG_EFIVAR_FS) += efivarfs/ +obj-$(CONFIG_AUFS_FS) += aufs/ -aufs4.x-rcN base patch +diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild +index f8d9fed..902305e 100644 +--- a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild +@@ -59,6 +59,7 @@ header-y += atmsvc.h + header-y += atm_tcp.h + header-y += atm_zatm.h + header-y += audit.h ++header-y += aufs_type.h + header-y += auto_fs4.h + header-y += auto_fs.h + header-y += auxvec.h +aufs4.11.7+ base patch diff --git a/MAINTAINERS b/MAINTAINERS -index 09b5ab6..6640ab1 100644 +index 38d3e4e..c2b31bf 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -2348,6 +2348,19 @@ F: include/linux/audit.h +@@ -2319,6 +2319,19 @@ F: include/linux/audit.h F:include/uapi/linux/audit.h F:kernel/audit* @@ -48,10 +60,10 @@ index 09b5ab6..6640ab1 100644 M:Miguel Ojeda Sandonis W:
[packages/kernel] - more options
commit fb0e638c4e5cb665e71a5be26a076c9082827adb Author: Arkadiusz MiśkiewiczDate: Mon Jul 31 09:32:42 2017 +0200 - more options kernel-multiarch.config | 9 + 1 file changed, 9 insertions(+) --- diff --git a/kernel-multiarch.config b/kernel-multiarch.config index c5fb147b..3b5c3157 100644 --- a/kernel-multiarch.config +++ b/kernel-multiarch.config @@ -1153,6 +1153,7 @@ GPIO_ICH all=m GPIO_LYNXPOINT all=y GPIO_MENZ127 all=m GPIO_MOCKUP all=m +GPIO_STA2X11 all=y GPIO_VX855 all=m GPIO_XILINX powerpc=y GPIO_ZX all=y @@ -1160,6 +1161,7 @@ GPIO_104_DIO_48E all=m GPIO_104_IDIO_16 all=m GPIO_104_IDI_48 all=m GPIO_F7188X all=m +GPIO_GPIO_MM all=m GPIO_IT87 all=m GPIO_SCH all=m GPIO_SCH311X all=m @@ -2008,6 +2010,7 @@ MEN_Z188_ADC all=m NAU7802 all=m QCOM_SPMI_IADC all=m QCOM_SPMI_VADC all=m +STX104 all=m TI_ADC081C all=m TI_ADC0832 all=m TI_ADC12138 all=m @@ -2050,6 +2053,11 @@ IIO_SSP_SENSORS_COMMONS all=m IIO_SSP_SENSORHUB all=m #- +#- *** FILE: drivers/iio/counter/Kconfig *** +#- +104_QUAD_8 all=m + +#- #- *** FILE: drivers/iio/dac/Kconfig *** #- AD5064 all=m @@ -2069,6 +2077,7 @@ AD5761 all=m AD5764 all=m AD5791 all=m AD7303 all=m +CIO_DAC all=m AD8801 all=m M62332 all=m MAX517 all=m gitweb: http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/fb0e638c4e5cb665e71a5be26a076c9082827adb ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/kernel] - config update
commit bedfaf97d36e2491933fd758964c82da02df1386 Author: Arkadiusz MiśkiewiczDate: Mon Jul 31 09:24:34 2017 +0200 - config update kernel-multiarch.config | 287 ++-- 1 file changed, 256 insertions(+), 31 deletions(-) --- diff --git a/kernel-multiarch.config b/kernel-multiarch.config index ba331117..c5fb147b 100644 --- a/kernel-multiarch.config +++ b/kernel-multiarch.config @@ -11,6 +11,7 @@ DEBUG_ENTRY all=n DEBUG_IMR_SELFTEST all=n DEBUG_WX all=y EARLY_PRINTK_EFI all=n +EARLY_PRINTK_USB_XDBC all=n EFI_MIXED all=y EFI_PGT_DUMP all=n GCC_PLUGINS all=y @@ -26,7 +27,6 @@ IOSF_MBI_DEBUG all=y KEXEC_FILE all=y KEXEC_VERIFY_SIG all=n KVM_DEBUG_FS all=n -KVM_DEVICE_ASSIGNMENT all=y MCE_AMD_INJ all=m PERF_EVENTS_AMD_POWER all=m PERF_EVENTS_INTEL_CSTATE all=m @@ -34,14 +34,19 @@ PERF_EVENTS_INTEL_RAPL all=m PERF_EVENTS_INTEL_UNCORE all=m PUNIT_ATOM_DEBUG all=m RANDOMIZE_MEMORY all=y +RAS_CEC all=y SCHED_MC_PRIO all=y STATIC_KEYS_SELFTEST all=y VMAP_STACK all=y X86_AMD_PLATFORM_DEVICE all=y X86_DEBUG_FPU all=n +X86_MCELOG_LEGACY all=y X86_SYSFB all=y XEN_512GB all=y +XEN_DOM0 all=y +XEN_PV all=y XEN_PVH all=y +XEN_PVHVM all=y #- #- *** FILE: block/Kconfig *** @@ -53,6 +58,7 @@ BLK_DEV_BSGLIB all=y BLK_DEV_INTEGRITY all=y BLK_DEV_ZONED all=y BLK_DEV_THROTTLING all=y +BLK_DEV_THROTTLING_LOW all=y BLK_CMDLINE_PARSER all=y BLK_WBT all=y BLK_WBT_SQ all=y @@ -74,6 +80,9 @@ DEFAULT_CFQ all=y DEFAULT_NOOP all=n DEFAULT_IOSCHED all="cfq" MQ_IOSCHED_DEADLINE all=y +MQ_IOSCHED_KYBER all=m +IOSCHED_BFQ all=m +BFQ_GROUP_IOSCHED all=y #- #- *** FILE: block/partitions/Kconfig *** @@ -114,6 +123,8 @@ SYSTEM_TRUSTED_KEYS all="" SYSTEM_EXTRA_CERTIFICATE all=y SYSTEM_EXTRA_CERTIFICATE_SIZE all=4096 SECONDARY_TRUSTED_KEYRING all=y +SYSTEM_BLACKLIST_KEYRING all=y +SYSTEM_BLACKLIST_HASH_LIST all="" #- #- *** FILE: crypto/Kconfig *** @@ -301,6 +312,8 @@ ACPI_BGRT all=y #- file drivers/acpi/dptf/Kconfig goes here ACPI_EXTLOG all=m PMIC_OPREGION all=y +XPOWER_PMIC_OPREGION all=y +BXT_WC_PMIC_OPREGION all=y ACPI_CONFIGFS all=m #- file drivers/acpi/arm64/Kconfig goes here @@ -465,12 +478,17 @@ ATM_SOLOS all=m #- *** FILE: drivers/auxdisplay/Kconfig *** #- AUXDISPLAY all=y +HD44780 all=m KS0108 all=m KS0108_PORT all=0x378 KS0108_DELAY all=2 CFAG12864B i386=m x86_64=m CFAG12864B_RATE i386=20 x86_64=20 IMG_ASCII_LCD all=y +PANEL all=m +PANEL_PARPORT all=0 +PANEL_PROFILE all=5 +PANEL_CHANGE_MESSAGE all=n #- #- *** FILE: drivers/base/Kconfig *** @@ -547,7 +565,6 @@ BLK_DEV_CRYPTOLOOP all=n #- file drivers/block/drbd/Kconfig goes here BLK_DEV_NBD all=m BLK_DEV_SKD all=m -BLK_DEV_OSD all=m BLK_DEV_SX8 all=m BLK_DEV_RAM all=y BLK_DEV_RAM_COUNT all=16 @@ -563,7 +580,6 @@ XEN_BLKDEV_FRONTEND all=m XEN_BLKDEV_BACKEND all=m VIRTIO_BLK all=m VIRTIO_BLK_SCSI all=y -BLK_DEV_HD all=n BLK_DEV_RBD all=m BLK_DEV_RSXX all=m @@ -620,6 +636,7 @@ BT_HCIBTUSB_RTL all=y BT_HCIBTSDIO all=m BT_HCIUART all=m BT_HCIUART_H4 all=y +BT_HCIUART_NOKIA all=m BT_HCIUART_BCSP all=y BT_HCIUART_ATH3K all=y BT_HCIUART_LL all=y @@ -726,7 +743,6 @@ HW_RANDOM_N2RNG sparc64=m HW_RANDOM_VIA all=m HW_RANDOM_PASEMI ppc64=m HW_RANDOM_VIRTIO=m -HW_RANDOM_EXYNOS all=m HW_RANDOM_TPM all=m #- @@ -887,6 +903,7 @@ CRYPTO_DEV_CCP all=y #- file drivers/crypto/vmx/Kconfig goes here #- file drivers/crypto/chelsio/Kconfig goes here #- file drivers/crypto/virtio/Kconfig goes here +#- file drivers/crypto/stm32/Kconfig goes here #- #- *** FILE: drivers/crypto/ccp/Kconfig *** @@ -919,7 +936,6 @@ CRYPTO_DEV_VIRTIO all=m #- DEV_DAX all=m DEV_DAX_PMEM all=m -NR_DEV_DAX all=32768 #- #- *** FILE: drivers/devfreq/Kconfig *** @@ -993,7 +1009,7 @@ EDAC all=y EDAC_LEGACY_SYSFS all=y EDAC_DEBUG all=n EDAC_DECODE_MCE all=m -EDAC_MM_EDAC all=m +EDAC_GHES all=y EDAC_AMD64 all=m EDAC_AMD64_ERROR_INJECTION all=y EDAC_AMD76X i386=m @@ -1094,7 +1110,11 @@ EFI_TEST all=m #- GOOGLE_FIRMWARE all=y GOOGLE_SMI all=m +GOOGLE_COREBOOT_TABLE_ACPI all=m GOOGLE_MEMCONSOLE all=m +GOOGLE_MEMCONSOLE_X86_LEGACY all=m +GOOGLE_MEMCONSOLE_COREBOOT all=m +GOOGLE_VPD all=m #- #- *** FILE: drivers/fmc/Kconfig *** @@ -1109,7 +1129,9 @@ FMC_CHARDEV all=m #- *** FILE: drivers/fpga/Kconfig *** #- FPGA all=m +FPGA_MGR_XILINX_SPI all=m FPGA_MGR_ZYNQ_FPGA all=m +ALTERA_PR_IP_CORE all=m #- #- *** FILE: drivers/fsi/Kconfig *** @@ -1165,6 +1187,7 @@ GPIO_TPS65218 all=m GPIO_TPS65912 all=m GPIO_TWL4030 powerpc=m GPIO_UCB1400 all=m +GPIO_WHISKEY_COVE all=m GPIO_WM831X all=m GPIO_WM8994 all=m GPIO_AMD8111 all=m @@ -1188,6 +1211,7 @@ DRM all=m DRM_DP_AUX_CHARDEV all=y DRM_DEBUG_MM_SELFTEST all=m DRM_FBDEV_EMULATION all=y +DRM_FBDEV_OVERALLOC all=100 DRM_LOAD_EDID_FIRMWARE all=y #- file drivers/gpu/drm/i2c/Kconfig goes here #- file drivers/gpu/drm/arm/Kconfig goes here @@ -1277,6 +1301,7 @@ DRM_BOCHS all=m DRM_ANALOGIX_ANX78XX all=m #- file