diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2012-02-07 12:02:45 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2012-02-07 12:02:45 -0500 |
| commit | bddef7d222b7f68d44b28d9aaeb5d17dba2f939d (patch) | |
| tree | 5084eb633a98b8c2af3a484c5166718401ed174b /kernel.spec | |
| parent | 7c0775b48bf5d54d43bd45ef2792e02290b1cd57 (diff) | |
| download | kernel-bddef7d222b7f68d44b28d9aaeb5d17dba2f939d.tar.gz kernel-bddef7d222b7f68d44b28d9aaeb5d17dba2f939d.tar.xz kernel-bddef7d222b7f68d44b28d9aaeb5d17dba2f939d.zip | |
Make build/ point to /usr/src/kernels instead of being relative (rhbz 788125)
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec index 5bb2e1be..f7379e95 100644 --- a/kernel.spec +++ b/kernel.spec @@ -54,7 +54,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 1 +%global baserelease 2 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -1783,7 +1783,12 @@ BuildKernel() { # Move the devel headers out of the root file system mkdir -p $RPM_BUILD_ROOT/usr/src/kernels mv $RPM_BUILD_ROOT/lib/modules/$KernelVer/build $RPM_BUILD_ROOT/$DevelDir - ln -sf ../../..$DevelDir $RPM_BUILD_ROOT/lib/modules/$KernelVer/build + + # This is going to create a broken link during the build, but we don't use + # it after this point. We need the link to actually point to something + # when kernel-devel is installed, and a relative link doesn't work across + # the F17 UsrMove feature. + ln -sf $DevelDir $RPM_BUILD_ROOT/lib/modules/$KernelVer/build # prune junk from kernel-devel find $RPM_BUILD_ROOT/usr/src/kernels -name ".*.cmd" -exec rm -f {} \; @@ -2306,6 +2311,9 @@ fi # || || %changelog * Tue Feb 07 2012 Josh Boyer <jwboyer@redhat.com> +- Make build/ point to /usr/src/kernels instead of being relative (rhbz 788125) + +* Tue Feb 07 2012 Josh Boyer <jwboyer@redhat.com> - Linux 3.3-rc2-git5 (upstream 8597559a78e1cde158b999212bc9543682638eb1) - Add hfsplus file blessing patches from Matthew Garrett |