22 Feb, 2013
1 commit
-
'make rpm-pkg' and 'make binrpm-pkg' fail when the kernel source is
read-only. Specifically, when the RPM spec generated by
scripts/package/mkspec is run, KBUILD_SRC happens to be set to the
source location and thus the invocation of 'make headers_install'
fails when an internal call to 'filechk' tries to write a file into
the source tree.The fix is to clear KBUILD_SRC for the 'make headers_install'
invocation in the spec file, as is already done for the 'make
modules_install' invocation.Signed-off-by: David R. Bild
Signed-off-by: Michal Marek
12 Oct, 2012
1 commit
-
Pull kbuild changes from Michal Marek:
"The main part of kbuild for v3.7 contains:
- Fix for scripts/Makefile.modpost to not choke on a '.ko' substring
in the build directory path
- Two warning fixes (modpost and main Makefile)
- __compiletime_error works also with gcc 4.3
- make tar{gz,bz2,xz}-pkg uses default compression settings instead
of saving as many bytes as possible (this should actually be in the
misc branch, I don't know why I applied it here)."* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
compiler-gcc4.h: correct verion check for __compiletime_error
modpost: Permit .GCC.command.line sections
Kbuild: use normal compression settings for tar*-pkg
scripts/Makefile.modpost: error in finding modules from .mod files.
kbuild: Remove useless warning while appending KCFLAGS
27 Sep, 2012
2 commits
-
For large kernel configurations (like a distribution kernel)
targz-pkg takes a quite long time to just do the compression.
I clocked it at 15+mins for a SUSE kernel like config on a fast
system. And tarxz and bzip2 are even slower.The main reason is that the script that is doing the taring sets
the highest compression level (-9). When I change it to just
use the defaults the gzip time for the same kernel goes down
to ~3 mins. I haven't tested xz and bzip, but I expect those
to be much faster too.I'm not willing to wait that long for a small compression
gain. So just change the script to use the defaults.Signed-off-by: Andi Kleen
Reviewed-by: Fengguang Wu
Signed-off-by: Michal Marek -
There were reports of users destroying their Fedora installs by a kernel
tarball that replaces the /lib -> /usr/lib symlink. Let's remove the
toplevel directories from the tarball to prevent this from happening.Reported-by: Andi Kleen
Suggested-by: Ben Hutchings
Cc:
Signed-off-by: Michal Marek
28 Jun, 2012
2 commits
-
I discovered that make deb-pkg does not add Makefile_32.cpu from
arch/x86 directory when doing i386 kernel build and package build.
Fix it by greedily adding all Makefiles.Reported-by: Witold Baryluk
Signed-off-by: maximilian attems
Signed-off-by: Michal Marek -
That way they don't file conflict with official firmware package:
trying to overwrite '/lib/firmware/qlogic/1040.bin', which is
also in package firmware-qlogic 0.35
..Reported-by: Michael Prokop
Signed-off-by: maximilian attems
Signed-off-by: Michal Marek
27 May, 2012
1 commit
-
After 303395ac3bf3e2cb488435537d416bc840438fcb, some headers are
autogenerated. Include these autogenerated headers (mainly
unistd_32_ia32.h) in out-of-tree builds to allow DKMS modules to be
built succesfully.Signed-off-by: Peter Lekensteyn
Signed-off-by: Michal Marek
25 Feb, 2012
3 commits
-
The out-of-tree build is broken in 'make deb-pkg'. The
header checks and the header install works on the source and
not on the object tree.
While fixing this also replace the direct 'make' invocations
with the $MAKE variable to be consistent within the script.Cc: maximilian attems
Cc: Ben Hutchings
Cc: debian-kernel@lists.debian.org
Cc: linux-kbuild@vger.kernel.org
Signed-off-by: Joerg Roedel
Signed-off-by: Michal Marek -
For user-mode Linux the other packages are not required. So
only build the package with the linux-image in it.Cc: maximilian attems
Cc: debian-kernel@lists.debian.org
Cc: linux-kbuild@vger.kernel.org
Signed-off-by: Joerg Roedel
Tested-by: Ben Hutchings
Signed-off-by: Michal Marek -
The Link to the kernel header files in the debian packages
point to the original build directory. This is a bad choice
if the packages were installed on a different machine. Fix
this in by manually re-creating the link in the builddeb
script.Cc: maximilian attems
Cc: debian-kernel@lists.debian.org
Cc: linux-kbuild@vger.kernel.org
Signed-off-by: Joerg Roedel
Reviewed-by: Ben Hutchings
Signed-off-by: Michal Marek
19 Feb, 2012
1 commit
-
The current use of /tmp for file lists is insecure. Put them under
$objtree/debian instead.Signed-off-by: Ben Hutchings
Cc: stable@vger.kernel.org # 2.6.39+
Acked-by: maximilian attems
Signed-off-by: Michal Marek
30 Oct, 2011
1 commit
-
Signed-off-by: Paul Menzel
Signed-off-by: Jiri Kosina
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
26 May, 2011
1 commit
-
* 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
kbuild: Create a kernel-headers RPM
rpm-pkg: Fix when current directory is a symlink
Replace '-' in kernel version with '_'
25 May, 2011
1 commit
-
To compile binaries which depend on new kernel interfaces, we need a
kernel-headers RPMSigned-off-by: Arun Sharma
Signed-off-by: Michal Marek
24 May, 2011
1 commit
-
The better fix would be to stop using the parent directory (principle of
least surprise), but as long as we use it, use it consistently.Signed-off-by: Michal Marek
05 May, 2011
1 commit
-
Removing the '-' results in hard to read filenames such as:
kernel-2.6.35.2000042g76e4caf-28.x86_64.rpmkernel-2.6.35.2_000042_g76e4caf-28.x86_64.rpm is easier to
read.Signed-off-by: Arun Sharma
Signed-off-by: Michal Marek
31 Mar, 2011
1 commit
-
Fixes generated by 'codespell' and manually reviewed.
Signed-off-by: Lucas De Marchi
09 Mar, 2011
2 commits
-
Signed-off-by: Zdenek Kaspar
Signed-off-by: Michal Marek
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
15 Jan, 2011
1 commit
-
Fix x86 centric path to allow building kernel-header packages for
other architecture.Signed-off-by: maximilian attems
Signed-off-by: Michal Marek
11 Jan, 2011
1 commit
-
* 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
deb-pkg: s/hdr/kernel_headers_/ && s/header/libc_headers_/
deb-pkg: Make deb-pkg generate a seperate linux-libc-dev deb
kbuild: create linux-headers package in deb-pkg
kbuild, deb-pkg: support overriding userland architecture
kbuild, deb-pkg: select userland architecture based on UTS_MACHINE
kbuild, deb-pkg: Fix build with paranoid umask
08 Jan, 2011
1 commit
-
hdrpackage and headerpackage are not intuitive names,
use proposed alternatives by Michel Marek.While touching them move the mkdir of the kernel_headers dir up
and fix it for paranoid umask.CC: Theodore Ts'o
Signed-off-by: maximilian attems
Signed-off-by: Michal Marek
07 Jan, 2011
1 commit
-
userland dev likes latest incarnation of that userland API.
make it easy to also build it on make deb-pkg invocation:dpkg-deb: building package `linux-libc-dev' in `../linux-libc-dev_2.6.32-rc6-4_amd64.deb'.
Last year patch rebased on top of latest deb-pkg changes.
Signed-off-by: maximilian attems
Signed-off-by: Michal Marek
29 Dec, 2010
1 commit
-
Create a linux-headers-$KVER.deb package which can be used to build
external modules without having the source tree around.Signed-off-by: "Theodore Ts'o"
Signed-off-by: Michal Marek
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-pkgLKML-reference:
Signed-off-by: Asbjoern Sloth Toennesen
Reviewed-by: WANG Cong
Acked-by: maximilian attems
Signed-off-by: Michal Marek
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
11 Nov, 2010
1 commit
-
umask 077
make deb-pkgdpkg-deb: building package `linux-image-2.6.36+' in `../linux-image-2.6.36+_2.6.36+-4_amd64.deb'.
dpkg-deb: control directory has bad permissions 700 (must be >=0755 and
Signed-off-by: maximilian attems
Signed-off-by: Michal Marek
29 Oct, 2010
1 commit
-
* 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
scripts/package: don't break if %{_smp_mflags} isn't set
kbuild, deb-pkg: Check if KBUILD_IMAGE exists before copying it
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
06 Sep, 2010
1 commit
-
Avoid an error when doing cp over the image when it does not contain
the full path to the file.Signed-off-by: Guillem Jover
Signed-off-by: Michal Marek
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
06 Aug, 2010
1 commit
-
* 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
kbuild: Change section of generated debian packages to kernel
kbuild: Mark that the packages generated conform to Standards-Version 3.8.4
kbuild: Add homepage field to debian/control file
02 Aug, 2010
1 commit
-
Conflicts:
tools/perf/Makefile
tools/perf/util/hist.cMerge reason: Resolve the conflicts and update to latest upstream.
Signed-off-by: Ingo Molnar
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 1Reported-and-tested-by: "Zheng, Jiajia"
Signed-off-by: Michal Marek
05 Jul, 2010
1 commit
-
Merge reason: Pick up the latest perf fixes
Signed-off-by: Ingo Molnar
02 Jul, 2010
1 commit
-
Conflicts:
Makefile
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 -
Merge reason: Go from -rc1 base to -rc3 base, merge in fixes.