projects
/
platform
/
kernel
/
linux-starfive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dmaengine: fail device registration if channel registration fails
[platform/kernel/linux-starfive.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
681c1d2
..
2e2f4a4
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,7
+1,7
@@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 29
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 29
-EXTRAVERSION = -rc
4
+EXTRAVERSION = -rc
8
NAME = Erotic Pickled Herring
# *DOCUMENTATION*
NAME = Erotic Pickled Herring
# *DOCUMENTATION*
@@
-389,6
+389,7
@@
PHONY += outputmakefile
# output directory.
outputmakefile:
ifneq ($(KBUILD_SRC),)
# output directory.
outputmakefile:
ifneq ($(KBUILD_SRC),)
+ $(Q)ln -fsn $(srctree) source
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkmakefile \
$(srctree) $(objtree) $(VERSION) $(PATCHLEVEL)
endif
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkmakefile \
$(srctree) $(objtree) $(VERSION) $(PATCHLEVEL)
endif
@@
-903,12
+904,18
@@
localver = $(subst $(space),, $(string) \
# and if the SCM is know a tag from the SCM is appended.
# The appended tag is determined by the SCM used.
#
# and if the SCM is know a tag from the SCM is appended.
# The appended tag is determined by the SCM used.
#
-#
Currently, only git is supported.
-#
Other SCMs can edit scripts/setlocalversion and add the appropriate
-#
checks as needed.
+#
.scmversion is used when generating rpm packages so we do not loose
+#
the version information from the SCM when we do the build of the kernel
+#
from the copied source
ifdef CONFIG_LOCALVERSION_AUTO
ifdef CONFIG_LOCALVERSION_AUTO
- _localver-auto = $(shell $(CONFIG_SHELL) \
- $(srctree)/scripts/setlocalversion $(srctree))
+
+ifeq ($(wildcard .scmversion),)
+ _localver-auto = $(shell $(CONFIG_SHELL) \
+ $(srctree)/scripts/setlocalversion $(srctree))
+else
+ _localver-auto = $(shell cat .scmversion 2> /dev/null)
+endif
+
localver-auto = $(LOCALVERSION)$(_localver-auto)
endif
localver-auto = $(LOCALVERSION)$(_localver-auto)
endif
@@
-946,7
+953,6
@@
ifneq ($(KBUILD_SRC),)
mkdir -p include2; \
ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm; \
fi
mkdir -p include2; \
ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm; \
fi
- ln -fsn $(srctree) source
endif
# prepare2 creates a makefile if using a separate output directory
endif
# prepare2 creates a makefile if using a separate output directory
@@
-1537,7
+1543,7
@@
quiet_cmd_depmod = DEPMOD $(KERNELRELEASE)
cmd_depmod = \
if [ -r System.map -a -x $(DEPMOD) ]; then \
$(DEPMOD) -ae -F System.map \
cmd_depmod = \
if [ -r System.map -a -x $(DEPMOD) ]; then \
$(DEPMOD) -ae -F System.map \
- $(if $(strip $(INSTALL_MOD_PATH)), -b $(INSTALL_MOD_PATH)
-r)
\
+ $(if $(strip $(INSTALL_MOD_PATH)), -b $(INSTALL_MOD_PATH)
)
\
$(KERNELRELEASE); \
fi
$(KERNELRELEASE); \
fi