diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-26 22:00:52 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-26 22:00:52 -0400 |
| commit | 45f6bc5ff9c3387387f048ec85dcb4e69acf0b03 (patch) | |
| tree | d04952bb05b53a362bcd165fb910c5c1441b4c5d /scripts/package | |
| parent | 3138887bd8d18173f3c2baf1e43621c49090cd27 (diff) | |
| parent | e4aa937ec75df0eea0bee03bffa3303ad36c986b (diff) | |
Merge 3.10-rc3 into usb-next
We want these fixes.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'scripts/package')
| -rw-r--r-- | scripts/package/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/package/Makefile b/scripts/package/Makefile index 84a406070f6f..a4f31c900fa6 100644 --- a/scripts/package/Makefile +++ b/scripts/package/Makefile | |||
| @@ -63,7 +63,7 @@ binrpm-pkg: FORCE | |||
| 63 | mv -f $(objtree)/.tmp_version $(objtree)/.version | 63 | mv -f $(objtree)/.tmp_version $(objtree)/.version |
| 64 | 64 | ||
| 65 | $(RPM) $(RPMOPTS) --define "_builddir $(objtree)" --target \ | 65 | $(RPM) $(RPMOPTS) --define "_builddir $(objtree)" --target \ |
| 66 | $(UTS_MACHINE) -bb $< | 66 | $(UTS_MACHINE) -bb $(objtree)/binkernel.spec |
| 67 | rm binkernel.spec | 67 | rm binkernel.spec |
| 68 | 68 | ||
| 69 | # Deb target | 69 | # Deb target |