Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ead6497 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents 0b80e3ad 75bccd88

Makefile

+12 −6
Original line number Diff line number Diff line
@@ -904,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.

#

# 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



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
@@ -1537,7 +1543,7 @@ quiet_cmd_depmod = DEPMOD $(KERNELRELEASE) 
      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

scripts/package/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -35,9 +35,10 @@ $(objtree)/kernel.spec: $(MKSPEC) $(srctree)/Makefile 
rpm-pkg rpm: $(objtree)/kernel.spec FORCE

	$(MAKE) clean

	$(PREV) ln -sf $(srctree) $(KERNELPATH)

	$(CONFIG_SHELL) $(srctree)/scripts/setlocalversion > $(objtree)/.scmversion

	$(PREV) tar -cz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(KERNELPATH)/.

	$(PREV) rm $(KERNELPATH)



	rm -f $(objtree)/.scmversion

	set -e; \

	$(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version

	set -e; \

scripts/package/mkspec

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ echo "%endif" 


echo ""

echo "%clean"

echo '#echo -rf $RPM_BUILD_ROOT'

echo 'rm -rf $RPM_BUILD_ROOT'

echo ""

echo "%files"

echo '%defattr (-, root, root)'

scripts/unifdef.c

+3 −3
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ static void done(void); 
static void             error(const char *);

static int              findsym(const char *);

static void             flushline(bool);

static Linetype         getline(void);

static Linetype         get_line(void);

static Linetype         ifeval(const char **);

static void             ignoreoff(void);

static void             ignoreon(void);
@@ -512,7 +512,7 @@ process(void) 


	for (;;) {

		linenum++;

		lineval = getline();

		lineval = get_line();

		trans_table[ifstate[depth]][lineval]();

		debug("process %s -> %s depth %d",

		    linetype_name[lineval],
@@ -526,7 +526,7 @@ process(void) 
 * help from skipcomment().

 */

static Linetype

getline(void)

get_line(void)

{

	const char *cp;

	int cursym;