X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kernel.spec;h=d3c5af14d04eb1b4633df4f4c975c52b474489c1;hb=c6b83492807c79f85f49bddb8c5c6c2a59518669;hp=20b5eda07e949f1661c32596eac0c00b2b28e02a;hpb=c47129d5f2bb64e6541dbb4039e913eb3d79aa05;p=packages%2Fkernel.git diff --git a/kernel.spec b/kernel.spec index 20b5eda0..d3c5af14 100644 --- a/kernel.spec +++ b/kernel.spec @@ -73,7 +73,7 @@ %define rel 1 %define basever 4.9 -%define postver .144 +%define postver .212 # define this to '-%{basever}' for longterm branch %define versuffix -%{basever} @@ -125,7 +125,7 @@ Source0: https://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz # Source0-md5: 0a68ef3615c64bd5ee54a3320e46667d %if "%{postver}" != ".0" Patch0: https://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz -# Patch0-md5: 786c3ae2a15bc685ef86bca196635026 +# Patch0-md5: 7a55b9dbc33770c8bdd769dc3ed7b57f %endif Source1: kernel.sysconfig @@ -254,11 +254,11 @@ BuildRequires: uboot-mkimage %endif BuildRequires: xz >= 1:4.999.7 Requires(post): coreutils -Requires(post): geninitrd >= 12749 +Requires(post): geninitrd >= 12787-6 Requires(post): kmod >= 12-2 Requires: /sbin/depmod Requires: coreutils -Requires: geninitrd >= 12749 +Requires: geninitrd >= 12787-6 Requires: kmod >= 12-2 %if %{with pae} %ifarch i686 athlon pentium3 pentium4 @@ -732,6 +732,31 @@ sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{?alt_kernel:.%{alt_kernel}}#g' Makef # cleanup backups after patching find '(' -name '*~' -o -name '*.orig' -o -name '.gitignore' ')' -print0 | xargs -0 -r -l512 rm -f +find -name '*.py' -print0 | \ + xargs -0 %{__sed} -i -e '1s,/usr/bin/python,%{__python},' \ + -e '1s,/usr/bin/env python,%{__python},' \ + -e '1s,/usr/bin/env python3,%{__python3},' + +%{__sed} -i -e '1s,/usr/bin/python,%{__python},' \ + -e '1s,/usr/bin/env python,%{__python},' \ + -e '1s,/usr/bin/env python3,%{__python3},' \ + drivers/staging/greybus/tools/lbtest \ + scripts/bloat-o-meter \ + scripts/diffconfig \ + scripts/show_delta \ + tools/kvm/kvm_stat/kvm_stat + +find -name '*.pl' -print0 | \ + xargs -0 %{__sed} -i -e '1s,/usr/bin/env perl,%{__perl},' \ + +%{__sed} -i -e '1s,/usr/bin/env perl,%{__perl},' \ + scripts/dtc/dt_to_config \ + scripts/cleanfile \ + scripts/cleanpatch \ + scripts/get_dvb_firmware \ + scripts/kernel-doc \ + scripts/stackdelta + %build install -d %{objdir} cat > %{targetobj}.mk <<'EOF' @@ -1015,8 +1040,8 @@ touch $RPM_BUILD_ROOT%{initrd_dir}/initramfs-%{kernel_release}.img touch $RPM_BUILD_ROOT/lib/modules/%{kernel_release}/modules.dep %endif -# /etc/modrobe.d -install -d $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/%{kernel_release} +# /etc/depmod.d /etc/modrobe.d +install -d $RPM_BUILD_ROOT%{_sysconfdir}/{depmod.d,modprobe.d}/%{kernel_release} install -d $RPM_BUILD_ROOT/etc/sysconfig install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/kernel @@ -1308,6 +1333,7 @@ fi /lib/modules/%{kernel_release}/kernel/security /lib/modules/%{kernel_release}/kernel/virt +%dir %{_sysconfdir}/depmod.d/%{kernel_release} %dir %{_sysconfdir}/modprobe.d/%{kernel_release} # provided by build