Now kernel.spec and binkernel.spec have the exactly same contents. Use kernel.spec for binrpm-pkg as well.
Unified · Split
| @@ -74,7 +74,7 @@ modules.order · 73 unmodified lines | ||
| 74 | 74 | # |
| 75 | 75 | # RPM spec file (make rpm-pkg) |
| 76 | 76 | # |
| 77 | −/*.spec | |
| 77 | +/kernel.spec | |
| 78 | 78 | /rpmbuild/ |
| 79 | 79 | |
| 80 | 80 | # |
| @@ -1610,7 +1610,7 @@ MRPROPER_FILES += include/config include/generated \ · 1609 unmodified lines | ||
| 1610 | 1610 | certs/signing_key.pem \ |
| 1611 | 1611 | certs/x509.genkey \ |
| 1612 | 1612 | vmlinux-gdb.py \ |
| 1613 | − *.spec rpmbuild \ | |
| 1613 | + kernel.spec rpmbuild \ | |
| 1614 | 1614 | rust/libmacros.so |
| 1615 | 1615 | |
| 1616 | 1616 | # clean - Delete most, but leave enough to build external modules |
| @@ -86,9 +86,9 @@ srcrpm-pkg: linux.tar.gz · 85 unmodified lines | ||
| 86 | 86 | # --------------------------------------------------------------------------- |
| 87 | 87 | PHONY += binrpm-pkg |
| 88 | 88 | binrpm-pkg: |
| 89 | − $(CONFIG_SHELL) $(MKSPEC) prebuilt > $(objtree)/binkernel.spec | |
| 89 | + $(CONFIG_SHELL) $(MKSPEC) prebuilt > $(objtree)/kernel.spec | |
| 90 | 90 | +rpmbuild $(RPMOPTS) --define "_builddir $(objtree)" --target \ |
| 91 | − $(UTS_MACHINE)-linux -bb $(objtree)/binkernel.spec \ | |
| 91 | + $(UTS_MACHINE)-linux -bb $(objtree)/kernel.spec \ | |
| 92 | 92 | --build-in-place --noprep --define='_smp_mflags %{nil}' --without devel \ |
| 93 | 93 | --define='make $(MAKE)' |
| 94 | 94 | |
| @@ -37,3 +37,5 @@ rm -f .scmversion · 36 unmodified lines | ||
| 37 | 37 | rm -rf include/ksym |
| 38 | 38 | |
| 39 | 39 | find . -name '*.usyms' | xargs rm -f |
| 40 | + | |
| 41 | +rm -f binkernel.spec | |