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

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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

parents 4a8e4a27 df9df036

Makefile

+15 −13
Original line number Original line Diff line number Diff line
@@ -106,12 +106,13 @@ KBUILD_OUTPUT := $(shell cd $(KBUILD_OUTPUT) && /bin/pwd) 
$(if $(KBUILD_OUTPUT),, \

$(if $(KBUILD_OUTPUT),, \

     $(error output directory "$(saved-output)" does not exist))

     $(error output directory "$(saved-output)" does not exist))





.PHONY: $(MAKECMDGOALS)

.PHONY: $(MAKECMDGOALS) cdbuilddir

$(MAKECMDGOALS) _all: cdbuilddir





$(filter-out _all,$(MAKECMDGOALS)) _all:

cdbuilddir:

	$(if $(KBUILD_VERBOSE:1=),@)$(MAKE) -C $(KBUILD_OUTPUT) \

	$(if $(KBUILD_VERBOSE:1=),@)$(MAKE) -C $(KBUILD_OUTPUT) \

	KBUILD_SRC=$(CURDIR) \

	KBUILD_SRC=$(CURDIR) \

	KBUILD_EXTMOD="$(KBUILD_EXTMOD)" -f $(CURDIR)/Makefile $@

	KBUILD_EXTMOD="$(KBUILD_EXTMOD)" -f $(CURDIR)/Makefile $(MAKECMDGOALS)





# Leave processing to above invocation of make

# Leave processing to above invocation of make

skip-makefile := 1

skip-makefile := 1
@@ -337,8 +338,9 @@ AFLAGS := -D__ASSEMBLY__ 




# Read KERNELRELEASE from .kernelrelease (if it exists)

# Read KERNELRELEASE from .kernelrelease (if it exists)

KERNELRELEASE = $(shell cat .kernelrelease 2> /dev/null)

KERNELRELEASE = $(shell cat .kernelrelease 2> /dev/null)

KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)





export	VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE \

export	VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION \

	ARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC \

	ARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC \

	CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL UTS_MACHINE \

	CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL UTS_MACHINE \

	HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS

	HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS
@@ -433,6 +435,7 @@ export KBUILD_DEFCONFIG 
config %config: scripts_basic outputmakefile FORCE

config %config: scripts_basic outputmakefile FORCE

	$(Q)mkdir -p include/linux

	$(Q)mkdir -p include/linux

	$(Q)$(MAKE) $(build)=scripts/kconfig $@

	$(Q)$(MAKE) $(build)=scripts/kconfig $@

	$(Q)$(MAKE) .kernelrelease





else

else

# ===========================================================================

# ===========================================================================
@@ -542,7 +545,7 @@ export INSTALL_PATH ?= /boot 
# makefile but the arguement can be passed to make if needed.

# makefile but the arguement can be passed to make if needed.

#

#





MODLIB	:= $(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE)

MODLIB	= $(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE)

export MODLIB

export MODLIB
@@ -783,12 +786,10 @@ endif 
localver-full = $(localver)$(localver-auto)

localver-full = $(localver)$(localver-auto)





# Store (new) KERNELRELASE string in .kernelrelease

# Store (new) KERNELRELASE string in .kernelrelease

kernelrelease = \

kernelrelease = $(KERNELVERSION)$(localver-full)

       $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)$(localver-full)

.kernelrelease: FORCE

.kernelrelease: FORCE

	$(Q)rm -f .kernelrelease

	$(Q)rm -f $@

	$(Q)echo $(kernelrelease) > .kernelrelease

	$(Q)echo $(kernelrelease) > $@

	$(Q)echo "  Building kernel $(kernelrelease)"









# Things we need to do before we recursively start building the kernel

# Things we need to do before we recursively start building the kernel
@@ -898,7 +899,7 @@ define filechk_version.h 
	)

	)

endef

endef





include/linux/version.h: $(srctree)/Makefile FORCE

include/linux/version.h: $(srctree)/Makefile .config FORCE

	$(call filechk,version.h)

	$(call filechk,version.h)





# ---------------------------------------------------------------------------

# ---------------------------------------------------------------------------
@@ -1301,9 +1302,10 @@ checkstack: 
	$(PERL) $(src)/scripts/checkstack.pl $(ARCH)

	$(PERL) $(src)/scripts/checkstack.pl $(ARCH)





kernelrelease:

kernelrelease:

	@echo $(KERNELRELEASE)

	$(if $(wildcard .kernelrelease), $(Q)echo $(KERNELRELEASE), \

	$(error kernelrelease not valid - run 'make *config' to update it))

kernelversion:

kernelversion:

	@echo $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)

	@echo $(KERNELVERSION)





# FIXME Should go into a make.lib or something 

# FIXME Should go into a make.lib or something 

# ===========================================================================

# ===========================================================================

scripts/kconfig/confdata.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -375,7 +375,7 @@ int conf_write(const char *name) 
		if (!out_h)

		if (!out_h)

			return 1;

			return 1;

	}

	}

	sym = sym_lookup("KERNELRELEASE", 0);

	sym = sym_lookup("KERNELVERSION", 0);

	sym_calc_value(sym);

	sym_calc_value(sym);

	time(&now);

	time(&now);

	env = getenv("KCONFIG_NOTIMESTAMP");

	env = getenv("KCONFIG_NOTIMESTAMP");

scripts/kconfig/gconf.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -276,7 +276,7 @@ void init_main_window(const gchar * glade_file) 
					  NULL);

					  NULL);





	sprintf(title, _("Linux Kernel v%s Configuration"),

	sprintf(title, _("Linux Kernel v%s Configuration"),

		getenv("KERNELRELEASE"));

		getenv("KERNELVERSION"));

	gtk_window_set_title(GTK_WINDOW(main_wnd), title);

	gtk_window_set_title(GTK_WINDOW(main_wnd), title);





	gtk_widget_show(main_wnd);

	gtk_widget_show(main_wnd);

scripts/kconfig/lxdialog/Makefile

+3 −3
Original line number Original line Diff line number Diff line
@@ -3,7 +3,7 @@ 




check-lxdialog  := $(srctree)/$(src)/check-lxdialog.sh

check-lxdialog  := $(srctree)/$(src)/check-lxdialog.sh

HOST_EXTRACFLAGS:= $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)

HOST_EXTRACFLAGS:= $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)

HOST_LOADLIBES   := $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags)

HOST_LOADLIBES  := $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))

 

 

HOST_EXTRACFLAGS += -DLOCALE 

HOST_EXTRACFLAGS += -DLOCALE

scripts/kconfig/lxdialog/check-lxdialog.sh

+18 −5
Original line number Original line Diff line number Diff line
@@ -4,11 +4,22 @@ 
# What library to link

# What library to link

ldflags()

ldflags()

{

{

	if [ `uname` == SunOS ]; then

	echo "main() {}" | $cc -lncursesw -xc - -o /dev/null 2> /dev/null

		echo '-lcurses'

	if [ $? -eq 0 ]; then

	else

		echo '-lncursesw'

		exit

	fi

	echo "main() {}" | $cc -lncurses -xc - -o /dev/null 2> /dev/null

	if [ $? -eq 0 ]; then

		echo '-lncurses'

		echo '-lncurses'

		exit

	fi

	fi

	echo "main() {}" | $cc -lcurses -xc - -o /dev/null 2> /dev/null

	if [ $? -eq 0 ]; then

		echo '-lcurses'

		exit

	fi

	exit 1

}

}





# Where is ncurses.h?

# Where is ncurses.h?
@@ -28,7 +39,7 @@ ccflags() 
compiler=""

compiler=""

# Check if we can link to ncurses

# Check if we can link to ncurses

check() {

check() {

	echo "main() {}" | $compiler -xc -

	echo "main() {}" | $cc -xc - -o /dev/null 2> /dev/null

	if [ $? != 0 ]; then

	if [ $? != 0 ]; then

		echo " *** Unable to find the ncurses libraries."          1>&2

		echo " *** Unable to find the ncurses libraries."          1>&2

		echo " *** make menuconfig require the ncurses libraries"  1>&2

		echo " *** make menuconfig require the ncurses libraries"  1>&2
@@ -51,13 +62,15 @@ fi 
case "$1" in

case "$1" in

	"-check")

	"-check")

		shift

		shift

		compiler="$@"

		cc="$@"

		check

		check

		;;

		;;

	"-ccflags")

	"-ccflags")

		ccflags

		ccflags

		;;

		;;

	"-ldflags")

	"-ldflags")

		shift

		cc="$@"

		ldflags

		ldflags

		;;

		;;

	"*")

	"*")