Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
kbuild: remove unused -r option for module-init-tool depmod
kbuild: fix 'make rpm' when CONFIG_LOCALVERSION_AUTO=y and using SCM tree
kbuild: fix mkspec to cleanup RPM_BUILD_ROOT
kbuild: fix C libary confusion in unifdef.c due to getline()
+18
-11
+12
-6
Makefile
+12
-6
Makefile
···
904
904
# and if the SCM is know a tag from the SCM is appended.
905
905
# The appended tag is determined by the SCM used.
906
906
#
907
-
# Currently, only git is supported.
908
-
# Other SCMs can edit scripts/setlocalversion and add the appropriate
909
-
# checks as needed.
907
+
# .scmversion is used when generating rpm packages so we do not loose
908
+
# the version information from the SCM when we do the build of the kernel
909
+
# from the copied source
910
910
ifdef CONFIG_LOCALVERSION_AUTO
911
-
_localver-auto = $(shell $(CONFIG_SHELL) \
912
-
$(srctree)/scripts/setlocalversion $(srctree))
911
+
912
+
ifeq ($(wildcard .scmversion),)
913
+
_localver-auto = $(shell $(CONFIG_SHELL) \
914
+
$(srctree)/scripts/setlocalversion $(srctree))
915
+
else
916
+
_localver-auto = $(shell cat .scmversion 2> /dev/null)
917
+
endif
918
+
913
919
localver-auto = $(LOCALVERSION)$(_localver-auto)
914
920
endif
915
921
···
1543
1537
cmd_depmod = \
1544
1538
if [ -r System.map -a -x $(DEPMOD) ]; then \
1545
1539
$(DEPMOD) -ae -F System.map \
1546
-
$(if $(strip $(INSTALL_MOD_PATH)), -b $(INSTALL_MOD_PATH) -r) \
1540
+
$(if $(strip $(INSTALL_MOD_PATH)), -b $(INSTALL_MOD_PATH) ) \
1547
1541
$(KERNELRELEASE); \
1548
1542
fi
1549
1543
+2
-1
scripts/package/Makefile
+2
-1
scripts/package/Makefile
···
35
35
rpm-pkg rpm: $(objtree)/kernel.spec FORCE
36
36
$(MAKE) clean
37
37
$(PREV) ln -sf $(srctree) $(KERNELPATH)
38
+
$(CONFIG_SHELL) $(srctree)/scripts/setlocalversion > $(objtree)/.scmversion
38
39
$(PREV) tar -cz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(KERNELPATH)/.
39
40
$(PREV) rm $(KERNELPATH)
40
-
41
+
rm -f $(objtree)/.scmversion
41
42
set -e; \
42
43
$(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version
43
44
set -e; \
+1
-1
scripts/package/mkspec
+1
-1
scripts/package/mkspec
+3
-3
scripts/unifdef.c
+3
-3
scripts/unifdef.c
···
206
206
static void error(const char *);
207
207
static int findsym(const char *);
208
208
static void flushline(bool);
209
-
static Linetype getline(void);
209
+
static Linetype get_line(void);
210
210
static Linetype ifeval(const char **);
211
211
static void ignoreoff(void);
212
212
static void ignoreon(void);
···
512
512
513
513
for (;;) {
514
514
linenum++;
515
-
lineval = getline();
515
+
lineval = get_line();
516
516
trans_table[ifstate[depth]][lineval]();
517
517
debug("process %s -> %s depth %d",
518
518
linetype_name[lineval],
···
526
526
* help from skipcomment().
527
527
*/
528
528
static Linetype
529
-
getline(void)
529
+
get_line(void)
530
530
{
531
531
const char *cp;
532
532
int cursym;