Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 9ead64974b05501bbac0d63a47c99fa786d064ba

Authored by Linus Torvalds
2 parents 0b80e3adc2 75bccd881a

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()

Showing 4 changed files Side-by-side Diff

... ... @@ -904,12 +904,18 @@
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  
... ... @@ -1537,7 +1543,7 @@
1537 1543 cmd_depmod = \
1538 1544 if [ -r System.map -a -x $(DEPMOD) ]; then \
1539 1545 $(DEPMOD) -ae -F System.map \
1540   - $(if $(strip $(INSTALL_MOD_PATH)), -b $(INSTALL_MOD_PATH) -r) \
  1546 + $(if $(strip $(INSTALL_MOD_PATH)), -b $(INSTALL_MOD_PATH) ) \
1541 1547 $(KERNELRELEASE); \
1542 1548 fi
1543 1549  
scripts/package/Makefile
Diff comments   View file @ 9ead649
... ... @@ -35,9 +35,10 @@
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; \
scripts/package/mkspec
Diff comments   View file @ 9ead649
... ... @@ -96,7 +96,7 @@
96 96  
97 97 echo ""
98 98 echo "%clean"
99   -echo '#echo -rf $RPM_BUILD_ROOT'
  99 +echo 'rm -rf $RPM_BUILD_ROOT'
100 100 echo ""
101 101 echo "%files"
102 102 echo '%defattr (-, root, root)'
... ... @@ -206,7 +206,7 @@
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,7 +512,7 @@
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,7 +526,7 @@
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;