Commit 810a4855 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 

Pull kbuild changes from Michal Marek:
 "The kbuild changes are minimal this time:

   - scripts/pnmlogo fix for some newer format

   - minor top-level Makefile cleanup

   - fix for a v3.5 regression with make clean M=<directory>"

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  kbuild: Do not remove vmlinux when cleaning external module
  scripts/pnmtologo: fix for plain PBM
  kbuild: Remove reference to uninitialised variable
parents 6f8c9d21 bd1ee804

Makefile

+6 −4
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ $(if $(KBUILD_OUTPUT),, \ 
PHONY += $(MAKECMDGOALS) sub-make



$(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make

	$(Q)@:

	@:



sub-make: FORCE

	$(if $(KBUILD_VERBOSE:1=),@)$(MAKE) -C $(KBUILD_OUTPUT) \
@@ -1027,11 +1027,14 @@ clean: rm-dirs := $(CLEAN_DIRS) 
clean: rm-files := $(CLEAN_FILES)

clean-dirs      := $(addprefix _clean_, . $(vmlinux-alldirs) Documentation samples)



PHONY += $(clean-dirs) clean archclean

PHONY += $(clean-dirs) clean archclean vmlinuxclean

$(clean-dirs):

	$(Q)$(MAKE) $(clean)=$(patsubst _clean_%,%,$@)



clean: archclean

vmlinuxclean:

	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/link-vmlinux.sh clean



clean: archclean vmlinuxclean



# mrproper - Delete all generated files, including .config

#
@@ -1258,7 +1261,6 @@ scripts: ; 
endif # KBUILD_EXTMOD



clean: $(clean-dirs)

	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/link-vmlinux.sh clean

	$(call cmd,rmdirs)

	$(call cmd,rmfiles)

	@find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \

scripts/pnmtologo.c

+7 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ static unsigned int logo_height; 
static struct color **logo_data;

static struct color logo_clut[MAX_LINUX_LOGO_COLORS];

static unsigned int logo_clutsize;

static int is_plain_pbm = 0;



static void die(const char *fmt, ...)

    __attribute__ ((noreturn)) __attribute ((format (printf, 1, 2)));
@@ -103,6 +104,11 @@ static unsigned int get_number(FILE *fp) 
    val = 0;

    while (isdigit(c)) {

	val = 10*val+c-'0';

	/* some PBM are 'broken'; GiMP for example exports a PBM without space

	 * between the digits. This is Ok cause we know a PBM can only have a '1'

	 * or a '0' for the digit. */

	if (is_plain_pbm)

		break;

	c = fgetc(fp);

	if (c == EOF)

	    die("%s: end of file\n", filename);
@@ -167,6 +173,7 @@ static void read_image(void) 
    switch (magic) {

	case '1':

	    /* Plain PBM */

	    is_plain_pbm = 1;

	    for (i = 0; i < logo_height; i++)

		for (j = 0; j < logo_width; j++)

		    logo_data[i][j].red = logo_data[i][j].green =

CRA Git | Maintained and supported by SUSTech CRA and CCSE