diff --git a/.abf.yml b/.abf.yml index 3022b8a..204657d 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,6 +1,4 @@ sources: - linux-3.10.19-rosa666.tar.xz: 1567bd23723952a40e7b1963945b21b21f2d73ed - linux-3.10.tar.sign: 3d28ba603aca8015c1f5a3eca799fc849a576ac8 + linux-3.10.26-rosa69.tar.xz: 2be89dfa8987fc1a01c09376da37a1d7745e7db0 linux-3.10.tar.xz: a649d5c15f68ccbae1c4863e357bdc48da4cc0b4 - patch-3.10.19.bz2: 11762d1c92b60b35779f3931460dc8cb817729c9 - patch-3.10.19.sign: b0f56670ba1a1c241b012a6f88004b1882e723bb + patch-3.10.26.xz: 25dc6bce487b97e2a00880bbd543b8cdd8d30ed8 diff --git a/kernel-3.10.19-1.spec b/kernel-3.10.26-1.spec similarity index 99% rename from kernel-3.10.19-1.spec rename to kernel-3.10.26-1.spec index 995b863..75982f2 100644 --- a/kernel-3.10.19-1.spec +++ b/kernel-3.10.26-1.spec @@ -6,17 +6,17 @@ Vendor: MIB - Mandriva International Backports %endif -Packager: Nicolo' Costanza +Packager: Eugene Shatokhin # end MIB header # %define kernelversion 3 %define patchlevel 10 # sublevel is now used for -stable patches -%define sublevel 19 +%define sublevel 26 # Package release -%define mibrel 666 +%define mibrel 69 # kernel Makefile extraversion is substituted by # kpatch wich are either 0 (empty), rc (kpatch) @@ -39,7 +39,7 @@ Packager: Nicolo' Costanza %define rpmrel %mkrel 0.%{kpatch}.%{mibrel} %endif %else -%define rpmrel 2 +%define rpmrel 1 %endif # fakerel and fakever never change, they are used to fool @@ -105,13 +105,13 @@ Packager: Nicolo' Costanza %endif # Build desktop (i686 / 4GB) / x86_64 / sparc64 sets -%define build_desktop 1 +%define build_desktop 0 # Build netbook (i686 / 4GB) / x86_64 %define build_netbook 0 # Build server (i686 / 64GB)/x86_64 / sparc64 sets -%define build_server 1 +%define build_server 0 # Build desktop686 pae (i686 / 64GB) %ifarch %{ix86} @@ -136,17 +136,17 @@ Packager: Nicolo' Costanza %define build_nrj_desktop 1 # Build nrj realtime (i686 / 4GB) / x86_64 -%define build_nrj_realtime 1 +%define build_nrj_realtime 0 # Build nrj laptop (i686 / 4GB) / x86_64 -%define build_nrj_laptop 1 +%define build_nrj_laptop 0 # Build nrj netbook (i686 / 4GB) / x86_64 -%define build_nrj_netbook 1 +%define build_nrj_netbook 0 # Build nrj desktop pae (i686 / 64GB) %ifarch %{ix86} -%define build_nrj_desktop_pae 1 +%define build_nrj_desktop_pae 0 %endif # Build nrj realtime pae (i686 / 64GB) @@ -415,26 +415,26 @@ Source100: linux-%{patch_ver}.tar.xz %if %kpatch %if %sublevel -Patch2: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.x/stable-review/patch-%{kversion}-%{kpatch}.bz2 +Patch2: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.x/stable-review/patch-%{kversion}-%{kpatch}.xz Source11: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.x/stable-review/patch-%{kversion}-%{kpatch}.sign %else -Patch1: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.x/testing/patch-%{kernelversion}.%{patchlevel}-%{kpatch}.bz2 +Patch1: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.x/testing/patch-%{kernelversion}.%{patchlevel}-%{kpatch}.xz Source10: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.x/testing/patch-%{kernelversion}.%{patchlevel}-%{kpatch}.sign %endif %endif %if %kgit -Patch2: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.x/snapshots/patch-%{kernelversion}.%{patchlevel}-%{kpatch}-git%{kgit}.bz2 +Patch2: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.x/snapshots/patch-%{kernelversion}.%{patchlevel}-%{kpatch}-git%{kgit}.xz Source11: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.x/snapshots/patch-%{kernelversion}.%{patchlevel}-%{kpatch}-git%{kgit}.sign %endif %if %sublevel %if %kpatch %define prev_sublevel %(expr %{sublevel} - 1) %if %prev_sublevel -Patch1: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.x/patch-%{kernelversion}.%{patchlevel}.%{prev_sublevel}.bz2 +Patch1: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.x/patch-%{kernelversion}.%{patchlevel}.%{prev_sublevel}.xz Source10: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.x/patch-%{kernelversion}.%{patchlevel}.%{prev_sublevel}.sign %endif %else -Patch1: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.x/patch-%{kversion}.bz2 +Patch1: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.x/patch-%{kversion}.xz Source10: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.x/patch-%{kversion}.sign %endif %endif @@ -2061,6 +2061,19 @@ rm -rf %{buildroot} %changelog +* Mon Jan 13 2014 Eugene Shatokhin 3.10.26-1 ++ update to 3.10.26 stable +- patch dropped, now in upstream: + * input-xpad-add-signature-for-Razer-Onza-Classic-Edit.patch +- patches: 9 for IFW (net-*netfilter-*) and 5 for HECI dropped +- patches updated to newer versions: + * new ndiswrapper 1.59 + * new char-agp-intel-new-Q57-id.patch +- added patches to (partially) fix the problems with backlight on some + MS Windows 8 - capable laptops +- xz-compressed patches are now used instead of bz2-compressed ones which + are no longer provided (http://lwn.net/Articles/578160/) + * Fri Nov 15 2013 Nicolo' Costanza 3.10.19-1 - Virtual package for new nrj kernel for properly install and updates. + update to 3.10.19 stable diff --git a/linux-3.10.intel.i915.patch b/linux-3.10.intel.i915.patch deleted file mode 100644 index 668850e..0000000 --- a/linux-3.10.intel.i915.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Nur linux-3.10.old/drivers/gpu/drm/i915/intel_dp.c linux-3.10/drivers/gpu/drm/i915/intel_dp.c ---- linux-3.10.old/drivers/gpu/drm/i915/intel_dp.c 2013-07-01 02:13:29.000000000 +0400 -+++ linux-3.10/drivers/gpu/drm/i915/intel_dp.c 2013-12-20 12:56:08.972821208 +0400 -@@ -702,8 +702,11 @@ - /* Walk through all bpp values. Luckily they're all nicely spaced with 2 - * bpc in between. */ - bpp = min_t(int, 8*3, pipe_config->pipe_bpp); -- if (is_edp(intel_dp) && dev_priv->edp.bpp) -- bpp = min_t(int, bpp, dev_priv->edp.bpp); -+ if (is_edp(intel_dp) && dev_priv->edp.bpp) { -+ // bpp = min_t(int, bpp, dev_priv->edp.bpp); -+ printk("BPPHACK - pipe_config->pipe_bpp: %d, dev_priv->edp.bpp: %d\n", pipe_config->pipe_bpp, dev_priv->edp.bpp); -+ } -+ - - for (; bpp >= 6*3; bpp -= 2*3) { - mode_rate = intel_dp_link_required(target_clock, bpp); diff --git a/linux-3.10.tar.sign b/linux-3.10.tar.sign new file mode 100644 index 0000000..5664e2d --- /dev/null +++ b/linux-3.10.tar.sign @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iQEcBAABAgAGBQJR0LWKAAoJEHm+PkMAQRiG1VcIAJTZEcZ4x3F7yzLyA+OfsEm6 +q4PrmLdcqmFOn9vh+kZ/IHvawIa038TGxxfkPC5l8ViDbEgvkIt3V1XfEIKeRxEV +9uKwRuJH4wXiB8sJ/+4uOszJ0hM3aJajFftbgQ3vxA7/Ve3vG/OMWeOSfe+k66Hu +KKeNNorTqMBseUt3cG5kLYliotxe7PTCs+uM1EtKHodUBr8GBVNFpDBhbjiLVr2H +iPzulOVZKmk2GwjnKHTtAJADCRL/DW0RLtSMcjqLcd9ovKssBR5BO/G0/N/+VMNO +9Xt3q2hat7qo3AzeR//2DC5cZlIVY5tQSqqdrTMCBLGeZTnvciwWKCyElcc7t3s= +=Cmwg +-----END PGP SIGNATURE----- diff --git a/patch-3.10.19.bz2 b/patch-3.10.19.bz2 deleted file mode 100644 index 1b0e246..0000000 Binary files a/patch-3.10.19.bz2 and /dev/null differ diff --git a/patch-3.10.26.sign b/patch-3.10.26.sign new file mode 100644 index 0000000..22c3499 --- /dev/null +++ b/patch-3.10.26.sign @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.22 (GNU/Linux) + +iQIcBAABAgAGBQJSzwvWAAoJEDjbvchgkmk+iOQP+gNUsm8AO3j/3Rdcv7cDqfXp +zDRTLOPNZ+mCiCTGsk8uCf8AS2YpDNp+t+Khr2kIyfD8tc1LkNxiQy8lYwyKPYxd +lkAMA6Vw1kTMd0wgyf7EwJIaIQghDgAWfusSmAxsDlyl4hD1Cr1g6pp0V9pTqAJf +Aj711Oys5rl++yF9Imo4apusKrhHU90vWnxgW5mrXJv1U50KXaHGEzzd4huvDGj4 +YDdcm3IHakU2Tl2eYc8TPy/XpeupGOijkL5QHs+NJNCDbDS/mNumVb1WcHVportd +HlgnCGLrtn9UIo6wulQ0E4Nlfq1CzpNP3zTmKNCqr8bh19EIqGO/sPEv3lzZMfjX +ndxHzVkl4V8sWbEmSUXxMhRdD4/H043uZIZE80zmWD2642QGBI4JR4IbQw3S7DuU +38Y0XQ8vNTJLqkJf54sKw8Q5pl6MkhKY9+W69cF7Ap5brzCKRRdc15SkGlngt92+ +GwJZaqbhMX2RxEtdnx9nLC8Jm8aoTshyjPZe8zYaoG3OnnYWll/NmUudAnx7llfS +jS94Jw2d0YPNTZAL2ej4XR3ki9bw0cia5V2+SfSGLKRMk2sH7MQ06m3dpj0xC9RV +OsmaKoPEMr8iZla3/9j1Jb1Wsjeqab+8EXwPK/FesTPEbWoIdwkiiH6Hrp+f8mSd +zbKwSdOcfPhhB6kqe13J +=Mjpi +-----END PGP SIGNATURE-----