Doug / smarc-fsl-linux-kernel

21 Jul, 2010

1 commit

  • b003afe32   kbuild: Fix make rpm ... Browse Code »

    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
     

02 Jul, 2010

1 commit

18 Jun, 2010

1 commit

  • 09155120c   kbuild: Clean up and speed up the localversion logic ... Browse Code »

    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
     

01 Jun, 2010

1 commit

  • 1f7389786   Merge branch 'for-35' of git://repo.or.cz/linux-kbuild ... Browse Code »

    * '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

  • 880df92fa   scripts: use %_tmppath in "make rpm-pkg" ... Browse Code »

    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

  • db1d18657   scripts/package: deb-pkg: use fakeroot if available ... Browse Code »

    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
     
  • 05ba4488a   scripts/package: add KBUILD_PKG_ROOTCMD variable ... Browse Code »

    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
     
  • 91d161857   scripts/package: tar-pkg: use tar --owner=root ... Browse Code »

    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
     

12 Oct, 2009

1 commit

  • db9038c89   kbuild: fix the binrpm-pkg target to work with KBUILD_OUTPUT set ... Browse Code »

    The binrpm-pkg target (binary RPM only) fails when called with
    KBUILD_OUTPUT set. This patch makes it work.

    For the rpm-pkg target (source + binary RPM), building with
    KBUILD_OUTPUT set is not possible and also not needed as the
    actual build is done in a temporary directory anyway, so check
    that KBUILD_OUTPUT is not set in that case to avoid later errors.

    Signed-off-by: Frans Pop
    Signed-off-by: Sam Ravnborg

    Frans Pop
     

18 Jul, 2009

1 commit

  • 241ad11f2   kbuild, deb-pkg: fix install scripts for posix sh ... Browse Code »

    bash versus dash and posh disagree on expanding $@ within double quotes:
    export x="$@"
    see http://bugs.debian.org/381091 for details
    just use the arglist with $*.

    dpkg: error processing linux-image-2.6.31-rc1_2.6.31-rc1-18_i386.deb (--install):
    subprocess pre-installation script returned error exit status 2
    export: 6: 2.6.31-rc1-18: bad variable name
    fixes http://bugzilla.kernel.org/show_bug.cgi?id=13567

    seen on Ubuntu as there dash is the default sh,
    versus bash on Debian.

    Reported-by: Pauli
    Cc: Frans Pop
    Signed-off-by: maximilian attems
    Acked-By: Andres Salomon

    maximilian attems
     

27 Jun, 2009

1 commit

  • 1ab18486e   kbuild: deb-pkg ship changelog ... Browse Code »

    In the series for 2.6.31 it was noticed to ship the copyright,
    but the generated changelog got lost somehow.

    As bonus the generated linux-image deb packages are Lenny lintian clean.

    Cc: Frans Pop
    Cc: Andres Salomon
    Signed-off-by: maximilian attems
    Signed-off-by: Sam Ravnborg

    maximilian attems
     

10 Jun, 2009

14 commits

02 Apr, 2009

1 commit

07 Mar, 2009

2 commits

  • b925dbfe3   kbuild: fix 'make rpm' when CONFIG_LOCALVERSION_AUTO=y and using SCM tree ... Browse Code »

    Running 'make rpm' fails when CONFIG_LOCALVERSION_AUTO=y and using a kernel source
    tree under SCM. This is due to KERNELRELEASE being different when the initial make
    is run and when make is run from rpmbuild.

    mkspec creates kernel.spec using KERNELRELEASE:

    echo "%files"
    echo '%defattr (-, root, root)'
    echo "%dir /lib/modules"
    echo "/lib/modules/$KERNELRELEASE"
    echo "/lib/firmware"
    echo "/boot/*"
    echo ""

    When CONFIG_LOCALVERSION_AUTO=y scripts/setlocalversion is called and grabs any
    additional version info from SCM. Next, the srctree is tarred up and SCM
    information is excluded.

    rpmbuild reruns make and in the process generates a new include/config/kernel.release
    and thus a new KERNELRELEASE. However this time the SCM information is gone so
    KERNELRELEASE no longer has the additional version information. When "make modules_install"
    runs, it uses the new KERNELRELEASE value to determine where to install the modules.
    This conflicts with where the spec file assumes they are going because of the
    mis-matching KERNELRELEASE versions.

    + INSTALL_MOD_PATH=/var/tmp/kernel-2.6.29rc4tip01479g5d85422-root
    + make -j16 modules_install
    INSTALL crypto/aead.ko
    INSTALL crypto/cbc.ko
    INSTALL crypto/chainiv.ko
    INSTALL crypto/crc32c.ko
    INSTALL crypto/crypto_algapi.ko
    INSTALL crypto/crypto_blkcipher.ko
    INSTALL crypto/crypto_hash.ko
    INSTALL crypto/cryptomgr.ko
    INSTALL crypto/ecb.ko
    INSTALL crypto/eseqiv.ko
    INSTALL crypto/krng.ko
    INSTALL crypto/md5.ko
    INSTALL crypto/pcbc.ko
    INSTALL crypto/rng.ko
    INSTALL drivers/block/cciss.ko
    INSTALL drivers/hid/hid-dummy.ko
    INSTALL drivers/scsi/iscsi_tcp.ko
    INSTALL drivers/scsi/libiscsi.ko
    INSTALL drivers/scsi/libiscsi_tcp.ko
    INSTALL drivers/scsi/scsi_transport_iscsi.ko
    INSTALL drivers/scsi/scsi_wait_scan.ko
    INSTALL fs/lockd/lockd.ko
    INSTALL fs/nfs/nfs.ko
    INSTALL fs/nfsd/nfsd.ko
    INSTALL lib/libcrc32c.ko
    INSTALL net/sunrpc/sunrpc.ko
    DEPMOD 2.6.29-rc4-tip
    + cp arch/x86/boot/bzImage
    /var/tmp/kernel-2.6.29rc4tip01479g5d85422-root/boot/vmlinuz-2.6.29-rc4-tip-01479-g5d85422
    + cp System.map
    /var/tmp/kernel-2.6.29rc4tip01479g5d85422-root/boot/System.map-2.6.29-rc4-tip-01479-g5d85422
    + cp .config
    /var/tmp/kernel-2.6.29rc4tip01479g5d85422-root/boot/config-2.6.29-rc4-tip-01479-g5d85422
    + cp vmlinux vmlinux.orig
    + bzip2 -9 vmlinux
    + mv vmlinux.bz2
    /var/tmp/kernel-2.6.29rc4tip01479g5d85422-root/boot/vmlinux-2.6.29-rc4-tip-01479-g5d85422.bz2
    + mv vmlinux.orig vmlinux
    + /usr/lib/rpm/brp-compress
    Processing files: kernel-2.6.29rc4tip01479g5d85422-2
    error: File not found:
    /var/tmp/kernel-2.6.29rc4tip01479g5d85422-root/lib/modules/2.6.29-rc4-tip-01479-g5d85422

    RPM build errors:
    File not found:
    /var/tmp/kernel-2.6.29rc4tip01479g5d85422-root/lib/modules/2.6.29-rc4-tip-01479-g5d85422
    make[1]: *** [rpm] Error 1
    make: *** [rpm] Error 2

    I have tested this patch on git -tip, Linus' git tree, and the kernel.org tar files, both
    with and without CONFIG_LOCALVERSION_AUTO=y.

    Signed-off-by: Josh Hunt
    Signed-off-by: Sam Ravnborg
    ----

    Josh Hunt
     
  • a2ebcc7a8   kbuild: fix mkspec to cleanup RPM_BUILD_ROOT ... Browse Code »

    The contents of the %clean section in mkspec is currently commented
    out leaving RPM_BUILD_ROOT and its contents on the build machine.
    This patch removes it once the rpm build process is complete.

    Signed-off-by: Josh Hunt
    Signed-off-by: Sam Ravnborg

    Josh Hunt
     

15 Feb, 2009

1 commit

  • fc370ecfd   kbuild: add vmlinux to kernel rpm ... Browse Code »

    We are building an automated system to test kernels weekly and need to
    provide an rpm to our QA dept. We would like to use the ability to create
    kernel rpms already in the kernel's Makefile, but need the vmlinux file
    included in the rpm for later debugging.

    This patch adds a compressed vmlinux to the kernel rpm when doing a
    make rpm-pkg or binrpm-pkg and upon install places the vmlinux file in /boot.

    Signed-off-by: Josh Hunt
    Signed-off-by: Sam Ravnborg

    Josh Hunt
     

06 Dec, 2008

1 commit

04 Dec, 2008

1 commit

10 Nov, 2008

1 commit

30 Oct, 2008

2 commits

  • 13797b77d   scripts/package: don't break if %{_smp_mflags} isn't set ... Browse Code »

    Currently, if we do a 'make rpm-pkg' without the _smp_mflags rpm macro
    defined, the build fails with:

    [snip]
    Executing(%build): /bin/bash -e /var/tmp/rpm-tmp.67959
    + umask 022
    + cd /home/jk/devel/kernel-snapshot/rpm/BUILD
    + cd kernel-2.6.26
    + make clean
    + make '%{_smp_mflags}'
    make[3]: *** No rule to make target `%{_smp_mflags}'. Stop.
    error: Bad exit status from /var/tmp/rpm-tmp.67959 (%build)

    This change uses the 'null if not set' reference to the _smp_mflags
    macro instead.

    Signed-off-by: Jeremy Kerr
    Signed-off-by: Andrew Morton
    Signed-off-by: Sam Ravnborg

    Jeremy Kerr
     
  • 46dca86cb   kbuild: mkspec - fix build rpm ... Browse Code »

    This is patch to fix incorrect mkspec script to make rpm correctly at 2.6.27 vanilla kernel.
    This is regression in 2.6.27. 2.6.26 make rpm work good.
    In 2.6.27 'make rpm' say error from rpmbuild "Many unpacked files (*.fw)."

    Signed-off-by: Evgeniy Manachkin
    Acked-by: Alan Cox
    Signed-off-by: Sam Ravnborg
    Cc: Stable

    Evgeniy Manachkin
     

09 Feb, 2008

1 commit

29 Jan, 2008

2 commits

18 Oct, 2007

1 commit

  • 6f67a0049   kbuild: make deb-pkg - add 'Provides:' line ... Browse Code »

    http://bugzilla.kernel.org/show_bug.cgi?id=8941

    Current Debian's kernel-modules depend on matching linux-image-$version, though
    Linux's make deb-pkg build a .deb that 'Provides: kernel-image-$version' only.
    The following patch adds the Debian-compliant 'Provides', leaving the default
    one; hopely this will make way all happy.

    Signed-off-by: paolo
    Signed-off-by: Sam Ravnborg

    bugme-daemon@bugzilla.kernel.org