30 Oct, 2011

1 commit


24 Jun, 2011

1 commit

  • Specify --git-dir when building perf targets to allow out-of-tree
    builds using O=.

    The shell command in `git archive' had to be modified to allow proper
    file name expansion of the files listed in MANIFEST.

    Signed-off-by: matt mooney
    Signed-off-by: Michal Marek

    matt mooney
     

26 May, 2011

1 commit


25 May, 2011

1 commit


24 May, 2011

1 commit


05 May, 2011

1 commit


31 Mar, 2011

1 commit


09 Mar, 2011

2 commits


04 Feb, 2011

1 commit

  • When building linux-headers package using deb-pkg, builddeb erroneously assume
    current directory is the source tree. This is not true if building in another
    directory, using make O=... deb-pkg.

    This patch fix this problem.

    Signed-off-by: Nicolas de Pesloüan
    Tested-by: Nikolai Kondrashov
    Acked-by: maximilian attems
    Signed-off-by: Michal Marek

    Nicolas de Pesloüan
     

15 Jan, 2011

1 commit


11 Jan, 2011

1 commit


08 Jan, 2011

1 commit


07 Jan, 2011

1 commit


29 Dec, 2010

1 commit


20 Dec, 2010

1 commit

  • Usefull if building for sparc64 userland, because the
    sparc and sparc64 userlands use the same 64-bit kernel,
    making it impossible to always select the correct userland
    architecture for the resulting debian package.

    Might also be usefull, if you want a i386 userland with a amd64 kernel.

    Example usage:
    make KBUILD_DEBARCH=i386 deb-pkg

    LKML-reference:
    Signed-off-by: Asbjoern Sloth Toennesen
    Reviewed-by: WANG Cong
    Acked-by: maximilian attems
    Signed-off-by: Michal Marek

    Asbjoern Sloth Toennesen
     

25 Nov, 2010

1 commit

  • Instead of creating the debian package for the compiling userland,
    create it for a userland matching the kernel thats being compiled.

    This patch supports all Lenny release architectures,
    and Linux-based architecture candidates for Squeeze.

    If it can't find a proper Debian userspace it displays a warning,
    and fallback to let deb-gencontrol use the host's userspace arch.

    Eg. with this patch the following make command:

    make ARCH=i386 deb-pkg

    will output an i386 Debian package instead of an amd64 one,
    when run on an amd64 machine.

    Signed-off-by: Asbjoern Sloth Toennesen
    Acked-by: maximilian attems
    Signed-off-by: Michal Marek

    Asbjoern Sloth Toennesen
     

11 Nov, 2010

1 commit


29 Oct, 2010

1 commit


14 Oct, 2010

1 commit

  • Same fix as in 13797b77d419fc1b16eebf2993bf7b5cea65f0bf is needed for the "new"
    line invoking _smp_mflags for modules_install. Without the fix, `make
    binrpm-pkg` fails with:

    + make '%{_smp_mflags}' KBUILD_SRC= modules_install
    make[2]: warning: jobserver unavailable: using -j1. Add `+' to parent make rule.
    make[2]: *** No rule to make target `%{_smp_mflags}'. Stop.
    error: Bad exit status from /var/tmp/rpm-tmp.8S9B9e (%install)

    Signed-off-by: Nishanth Aravamudan
    Signed-off-by: Michal Marek

    Nishanth Aravamudan
     

06 Sep, 2010

1 commit


07 Aug, 2010

1 commit

  • …git/tip/linux-2.6-tip

    * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (162 commits)
    tracing/kprobes: unregister_trace_probe needs to be called under mutex
    perf: expose event__process function
    perf events: Fix mmap offset determination
    perf, powerpc: fsl_emb: Restore setting perf_sample_data.period
    perf, powerpc: Convert the FSL driver to use local64_t
    perf tools: Don't keep unreferenced maps when unmaps are detected
    perf session: Invalidate last_match when removing threads from rb_tree
    perf session: Free the ref_reloc_sym memory at the right place
    x86,mmiotrace: Add support for tracing STOS instruction
    perf, sched migration: Librarize task states and event headers helpers
    perf, sched migration: Librarize the GUI class
    perf, sched migration: Make the GUI class client agnostic
    perf, sched migration: Make it vertically scrollable
    perf, sched migration: Parameterize cpu height and spacing
    perf, sched migration: Fix key bindings
    perf, sched migration: Ignore unhandled task states
    perf, sched migration: Handle ignored migrate out events
    perf: New migration tool overview
    tracing: Drop cpparg() macro
    perf: Use tracepoint_synchronize_unregister() to flush any pending tracepoint call
    ...

    Fix up trivial conflicts in Makefile and drivers/cpufreq/cpufreq.c

    Linus Torvalds
     

06 Aug, 2010

1 commit


02 Aug, 2010

1 commit


21 Jul, 2010

1 commit

  • make rpm was broken by commit 0915512:
    make clean
    set -e; cd ..; ln -sf /usr/src/iwlwifi-2.6 kernel-2.6.35rc4wl
    /bin/sh /usr/src/iwlwifi-2.6/scripts/setlocalversion --scm-only >
    /usr/src/iwlwifi-2.6/.scmversion
    cat: .scmversion: input file is output file
    make[1]: *** [rpm] Error 1

    Reported-and-tested-by: "Zheng, Jiajia"
    Signed-off-by: Michal Marek

    Michal Marek
     

05 Jul, 2010

1 commit


02 Jul, 2010

1 commit


18 Jun, 2010

2 commits

  • Now that we run scripts/setlocalversion during every build, it makes
    sense to move all the localversion logic there. This cleans up the
    toplevel Makefile and also makes sure that the script is called only
    once in 'make prepare' (previously, it would be called every time due to
    a variable expansion in an ifneq statement). No user-visible change is
    intended, unless one runs the setlocalversion script directly.

    Reported-by: Dmitry Torokhov
    Cc: David Rientjes
    Cc: Greg Thelen
    Cc: Nico Schottelius
    Signed-off-by: Michal Marek

    Michal Marek
     
  • Merge reason: Go from -rc1 base to -rc3 base, merge in fixes.

    Ingo Molnar
     

05 Jun, 2010

1 commit

  • Useful for when people want to try some version of the perf tools and don't
    wants to download the kernel tarball.

    Here is a session using this new target:

    [root@emilia linux-2.6-tip]# make help | grep -i perf
    perf-tar-src-pkg - Build perf-2.6.35-rc1.tar source tarball
    perf-targz-src-pkg - Build perf-2.6.35-rc1.tar.gz source tarball
    perf-tarbz2-src-pkg - Build perf-2.6.35-rc1.tar.bz2 source tarball
    [root@emilia linux-2.6-tip]# make perf-tarbz2-src-pkg
    TAR
    [root@emilia linux-2.6-tip]# ls -la perf-2.6.35-rc1.tar.bz2
    -rw-r--r-- 1 root root 295731 May 31 11:18 perf-2.6.35-rc1.tar.bz2
    [root@emilia linux-2.6-tip]# tar xf perf-2.6.35-rc1.tar.bz2
    [root@emilia linux-2.6-tip]# cd perf-2.6.35-rc1
    [root@emilia perf-2.6.35-rc1]# ls
    arch HEAD include lib tools
    [root@emilia perf-2.6.35-rc1]# cd tools/perf
    [root@emilia perf]# make -j9 2>&1 | tail
    CC arch/x86/util/dwarf-regs.o
    CC util/probe-finder.o
    CC util/newt.o
    CC util/scripting-engines/trace-event-perl.o
    CC scripts/perl/Perf-Trace-Util/Context.o
    CC perf.o
    CC builtin-help.o
    AR libperf.a
    LINK perf
    rm .perf.dev.null
    [root@emilia perf]# ./perf record -a sleep 1
    [ perf record: Woken up 1 times to write data ]
    [ perf record: Captured and wrote 0.262 MB perf.data (~11457 samples) ]
    [root@emilia perf]# ./perf report | head -12
    # Events: 6K cycles
    #
    # Overhead Command Shared Object Symbol
    # ........ ............... .................. ......
    #
    4.73% perf [kernel.kallsyms] [k] format_decode
    4.49% perf libc-2.12.so [.] _IO_file_underflow_internal
    4.38% init [kernel.kallsyms] [k] mwait_idle
    3.29% perf [kernel.kallsyms] [k] vsnprintf
    2.38% init [kernel.kallsyms] [k] sched_clock_local
    2.35% init [kernel.kallsyms] [k] apic_timer_interrupt
    1.86% sirq-timer/5 [kernel.kallsyms] [k] find_busiest_group
    [root@emilia perf]#

    Acked-by: Michal Marek
    Acked-by: Sam Ravnborg
    Cc: David S. Miller
    Cc: Frédéric Weisbecker
    Cc: Ingo Molnar
    Cc: Michal Marek
    Cc: Mike Galbraith
    Cc: Paul Mackerras
    Cc: Peter Zijlstra
    Cc: Sam Ravnborg
    Cc: Stephane Eranian
    Cc: Tom Zanussi
    LKML-Reference:
    Signed-off-by: Arnaldo Carvalho de Melo

    Arnaldo Carvalho de Melo
     

03 Jun, 2010

3 commits


01 Jun, 2010

1 commit

  • * 'for-35' of git://repo.or.cz/linux-kbuild: (81 commits)
    kbuild: Revert part of e8d400a to resolve a conflict
    kbuild: Fix checking of scm-identifier variable
    gconfig: add support to show hidden options that have prompts
    menuconfig: add support to show hidden options which have prompts
    gconfig: remove show_debug option
    gconfig: remove dbg_print_ptype() and dbg_print_stype()
    kconfig: fix zconfdump()
    kconfig: some small fixes
    add random binaries to .gitignore
    kbuild: Include gen_initramfs_list.sh and the file list in the .d file
    kconfig: recalc symbol value before showing search results
    .gitignore: ignore *.lzo files
    headerdep: perlcritic warning
    scripts/Makefile.lib: Align the output of LZO
    kbuild: Generate modules.builtin in make modules_install
    Revert "kbuild: specify absolute paths for cscope"
    kbuild: Do not unnecessarily regenerate modules.builtin
    headers_install: use local file handles
    headers_check: fix perl warnings
    export_report: fix perl warnings
    ...

    Linus Torvalds
     

29 Mar, 2010

1 commit


07 Mar, 2010

1 commit


02 Feb, 2010

1 commit

  • The mkspec script hardcodes "/var/tmp" into the generated rpm spec file's
    BuildRoot. The user, however, may have a custom setting for %_tmppath,
    which should be used in BuildRoot. This patch changes mkspec's
    BuildRoot output to appropriately use %_tmppath.

    Signed-off-by: John Saalwaechter
    Signed-off-by: Michal Marek

    John Saalwaechter
     

12 Dec, 2009

3 commits

  • Running "make deb-pkg" requires setting KBUILD_PKG_ROOTCMD or
    becoming root oneself or it errors out. Unless already running
    as root or KBUILD_PKG_ROOTCMD is already set, use fakeroot as a
    good default.

    With this patch applied, you can run "make oldconfig deb-pkg" as
    an ordinary user to build a binary package for an updated kernel
    tree and it should just work.

    fakeroot is too zealous by default in treating files as owned by
    root. Its wrapped stat() sets st_uid and st_gid to 0 for all
    files, which causes Git to go on a wild goose chase if
    CONFIG_LOCALVERSION_AUTO is set, checking if any file's content
    has changed along with its stat information. Avoid this by
    telling fakeroot to use the actual owner and group for
    preexisting files, by passing it the -u option.

    Signed-off-by: Jonathan Nieder
    Signed-off-by: Michal Marek

    Jonathan Nieder
     
  • Let the deb-pkg target acquire (fake) root privileges before
    running commands that need them. Without such privileges,
    deb-pkg errors out because chown fails.

    The new KBUILD_PKG_ROOTCMD variable, if defined, is used as a
    command to run other commands with possibly fake elevated
    privileges. Since this is not needed for the tar-pkg and rpm-pkg
    targets, it is only used by deb-pkg. If it is not defined, the
    behavior is as before, and the user will have to rerun make as
    root.

    In other words, as a shortcut, instead of running 'make oldconfig &&
    make && fakeroot -u make deb-pkg', one can use the single command
    'make oldconfig deb-pkg KBUILD_PKG_ROOTCMD="fakeroot -u"'.

    Suggested-by: Ryan Anderson
    Signed-off-by: Jonathan Nieder
    Signed-off-by: Michal Marek

    Jonathan Nieder
     
  • Use the --owner= and --group= options to make sure the entries in
    the built tar file are owned by root. Without this change, a
    careless sysadmin using the tar-pkg target can easily end up
    installing a kernel that is writable by the unprivileged user
    account used to build the kernel.

    Test that these options are understood before using them so that
    non-GNU versions of tar can still be used if the operator is
    appropriately cautious.

    Signed-off-by: Jonathan Nieder
    Signed-off-by: Michal Marek

    Michal Marek