Skip to content

L
linux
Commit 5737ac73 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files
Options

[PATCH] tidy up make rpm

parent e0dbc63c
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
Makefile
View file @ 5737ac73
...@@ -164,6 +164,8 @@ STRIP = $(CROSS_COMPILE)strip ...@@ -164,6 +164,8 @@ STRIP = $(CROSS_COMPILE)strip
OBJCOPY = $(CROSS_COMPILE)objcopy OBJCOPY = $(CROSS_COMPILE)objcopy
OBJDUMP = $(CROSS_COMPILE)objdump OBJDUMP = $(CROSS_COMPILE)objdump
AWK = awk AWK = awk
RPM := $(shell if [ -x "/usr/bin/rpmbuild" ]; then echo rpmbuild; \
else echo rpm; fi)
GENKSYMS = scripts/genksyms/genksyms GENKSYMS = scripts/genksyms/genksyms
DEPMOD = /sbin/depmod DEPMOD = /sbin/depmod
KALLSYMS = scripts/kallsyms KALLSYMS = scripts/kallsyms
...@@ -768,9 +770,7 @@ rpm: clean spec ...@@ -768,9 +770,7 @@ rpm: clean spec
rm $(KERNELPATH) ; \ rm $(KERNELPATH) ; \
cd $(TOPDIR) ; \ cd $(TOPDIR) ; \
$(CONFIG_SHELL) $(srctree)/scripts/mkversion > .version ; \ $(CONFIG_SHELL) $(srctree)/scripts/mkversion > .version ; \
RPM=`which rpmbuild`; \ $(RPM) -ta $(TOPDIR)/../$(KERNELPATH).tar.gz ; \
if [ -z "$$RPM" ]; then RPM=rpm; fi; \
$$RPM -ta $(TOPDIR)/../$(KERNELPATH).tar.gz ; \
rm $(TOPDIR)/../$(KERNELPATH).tar.gz rm $(TOPDIR)/../$(KERNELPATH).tar.gz
# Brief documentation of the typical targets used # Brief documentation of the typical targets used
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7