Author: hawk Date: Fri Apr 29 11:43:03 2011 GMT Module: packages Tag: Titanium ---- Log message: - updated to 2.6.38.4
---- Files affected: packages/kernel-bare-grsecurity: kernel-bare-grsecurity.spec (1.1.2.114 -> 1.1.2.115) ---- Diffs: ================================================================ Index: packages/kernel-bare-grsecurity/kernel-bare-grsecurity.spec diff -u packages/kernel-bare-grsecurity/kernel-bare-grsecurity.spec:1.1.2.114 packages/kernel-bare-grsecurity/kernel-bare-grsecurity.spec:1.1.2.115 --- packages/kernel-bare-grsecurity/kernel-bare-grsecurity.spec:1.1.2.114 Thu Oct 7 09:07:57 2010 +++ packages/kernel-bare-grsecurity/kernel-bare-grsecurity.spec Fri Apr 29 13:42:58 2011 @@ -14,8 +14,8 @@ %define have_sound 1 %define have_isa 1 -%define _basever 2.6.32 -%define _postver .24 +%define _basever 2.6.38 +%define _postver .4 %define _rel 1 %define _enable_debug_packages 0 @@ -40,10 +40,10 @@ License: GPL v2 Group: Base/Kernel Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{_basever}.tar.bz2 -# Source0-md5: 260551284ac224c3a43c4adac7df4879 +# Source0-md5: 7d471477bfa67546f902da62227fa976 %if "%{_postver}" != "%{nil}" Source1: http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2 -# Source1-md5: e3346e3b4b92f048b8ecded829f45cdf +# Source1-md5: 6ef1279c7bd0078fc0fd50aa83e86203 %endif Source2: kernel-bare-grsecurity-autoconf.h @@ -56,6 +56,10 @@ # from http://www.grsecurity.net/~spender/ Patch100: linux-2.6-grsecurity.patch +# required by our pppd +Patch200: kernel-atm-vbr.patch +# various small fixes +Patch201: kernel-small_fixes.patch URL: http://www.kernel.org/ BuildRequires: binutils >= 3:2.18 @@ -370,6 +374,8 @@ %endif %patch100 -p1 +%patch200 -p1 +%patch201 -p1 # Fix EXTRAVERSION in main Makefile sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{_postver}-%{alt_kernel}#g' Makefile @@ -509,19 +515,19 @@ rm -rf $KERNEL_INSTALL_DIR BuildConfig ln -sf %{defconfig} .config +BuildKernel +install -d $KERNEL_INSTALL_DIR%{_kernelsrcdir}/include/generated install -d $KERNEL_INSTALL_DIR%{_kernelsrcdir}/include/linux -rm -f include/linux/autoconf.h -%{__make} %CrossOpts include/linux/autoconf.h -install include/linux/autoconf.h \ - $KERNEL_INSTALL_DIR%{_kernelsrcdir}/include/linux/autoconf-dist.h +install include/generated/autoconf.h \ + $KERNEL_INSTALL_DIR%{_kernelsrcdir}/include/generated/autoconf-dist.h +install include/generated/utsrelease.h \ + $KERNEL_INSTALL_DIR%{_kernelsrcdir}/include/generated/ +install include/linux/version.h \ + $KERNEL_INSTALL_DIR%{_kernelsrcdir}/include/linux/ install .config \ $KERNEL_INSTALL_DIR%{_kernelsrcdir}/config-dist -BuildKernel PreInstallKernel -%{__make} %CrossOpts include/linux/utsrelease.h -cp include/linux/utsrelease.h{,.save} -cp include/linux/version.h{,.save} cp scripts/mkcompile_h{,.save} %install @@ -556,23 +562,21 @@ %{__make} %CrossOpts mrproper archclean \ RCS_FIND_IGNORE='-name build-done -prune -o' -if [ -e $KERNEL_BUILD_DIR/build-done/kernel%{_kernelsrcdir}/include/linux/autoconf-dist.h ]; then - install $KERNEL_BUILD_DIR/build-done/kernel%{_kernelsrcdir}/include/linux/autoconf-dist.h \ - $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux - install $KERNEL_BUILD_DIR/build-done/kernel%{_kernelsrcdir}/config-dist \ - $RPM_BUILD_ROOT%{_kernelsrcdir} -fi - cp -Rdp$l $KERNEL_BUILD_DIR/include/linux/* \ $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux %{__make} %CrossOpts mrproper -mv -f include/linux/utsrelease.h.save $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux/utsrelease.h -cp include/linux/version.h{.save,} -cp scripts/mkcompile_h{.save,} -rm -rf include/linux/version.h.save -rm -rf scripts/mkcompile_h.save -install %{SOURCE2} $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux/autoconf.h +install -d $RPM_BUILD_ROOT%{_kernelsrcdir}/include/generated +install -d $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux +install $KERNEL_BUILD_DIR/build-done/kernel%{_kernelsrcdir}/include/linux/version.h \ + $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux +install $KERNEL_BUILD_DIR/build-done/kernel%{_kernelsrcdir}/include/generated/autoconf-dist.h \ + $RPM_BUILD_ROOT%{_kernelsrcdir}/include/generated +install $KERNEL_BUILD_DIR/build-done/kernel%{_kernelsrcdir}/include/generated/utsrelease.h \ + $RPM_BUILD_ROOT%{_kernelsrcdir}/include/generated +install $KERNEL_BUILD_DIR/build-done/kernel%{_kernelsrcdir}/config-dist \ + $RPM_BUILD_ROOT%{_kernelsrcdir} +install %{SOURCE2} $RPM_BUILD_ROOT%{_kernelsrcdir}/include/generated/autoconf.h install %{SOURCE3} $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux/config.h # collect module-build files and directories @@ -822,8 +826,11 @@ %dir %{_kernelsrcdir}/scripts/selinux %{_kernelsrcdir}/scripts/selinux/Makefile %dir %{_kernelsrcdir}/scripts/selinux/mdp +%dir %{_kernelsrcdir}/scripts/selinux/genheaders %{_kernelsrcdir}/scripts/selinux/mdp/Makefile %{_kernelsrcdir}/scripts/selinux/mdp/*.c +%{_kernelsrcdir}/scripts/selinux/genheaders/Makefile +%{_kernelsrcdir}/scripts/selinux/genheaders/*.c %files doc %defattr(644,root,root,755) @@ -885,6 +892,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.1.2.115 2011/04/29 11:42:58 hawk +- updated to 2.6.38.4 + Revision 1.1.2.114 2010/10/07 07:07:57 hawk - updated to 2.6.32.24 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-bare-grsecurity/kernel-bare-grsecurity.spec?r1=1.1.2.114&r2=1.1.2.115&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
