public inbox for linux-kbuild@vger.kernel.org
 help / color / mirror / Atom feed
From: Harald Dunkel <harri@afaics.de>
To: linux-kbuild@vger.kernel.org, Michal Marek <mmarek@suse.cz>
Subject: [PATCH] scripts/package/builddeb: include generated header files
Date: Sat, 26 May 2012 17:11:24 +0200	[thread overview]
Message-ID: <4FC0F29C.9050508@afaics.de> (raw)

Building the linux-headers*.deb file on amd64 it seems that scripts/\
package/builddeb forgets to include some generated header files from
the build directory. It uses other header files generated in the
source directory instead.

	arch/x86/include/generated/asm/unistd_32_ia32.h
	arch/x86/include/generated/asm/unistd_64_x32.h

are lost. AFAICS this problem was introduced by
9b4ce7bce5f30712fd926ab4599a803314a07719 .

Below is a patch.

This is the very first patch I am trying to get into the kernel source
tree. Please excuse and correct me if I don't follow the blessed
procedure.

Thanx for your patience.


Harri
-----------------------------------------------------------------------------------
commit 43aa35286ac190fc64998587e54bade3e53487ef
Author: Harald Dunkel <harri@afaics.de>
Date:   Sat May 26 15:41:24 2012 +0200

    kbuild: add generated header files for 'make deb-pkg'

    9b4ce7bce5f30712fd926ab4599a803314a07719 introduced a regression: The header
    files generated in $objtree/arch/$SRCARCH/include are not included in the
    linux-headers*.deb package. This breaks building some 3rd-party modules due
    to a missing unistd_32_ia32.h file.

    Further the temporary "hdrobjfiles" list of files is not properly reset.

    This patch fixes these problem.

    Signed-off-by: Harald Dunkel <harri@afaics.de>

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index eee5f8e..1cf6352 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -245,6 +245,7 @@ fi
 # Build header package
 (cd $srctree; find . -name Makefile -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles")
 (cd $srctree; find arch/$SRCARCH/include include scripts -type f >> "$objtree/debian/hdrsrcfiles")
+(cd $objtree; find arch/$SRCARCH/include -type f -name \*.h > "$objtree/debian/hdrobjfiles")
 (cd $objtree; find .config Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")
 destdir=$kernel_headers_dir/usr/src/linux-headers-$version
 mkdir -p "$destdir"

             reply	other threads:[~2012-05-26 15:18 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-26 15:11 Harald Dunkel [this message]
2012-05-26 21:00 ` [PATCH] scripts/package/builddeb: include generated header files Michal Marek
2012-05-26 22:03   ` Harald Dunkel
2012-05-28  9:23     ` Michal Marek
2012-06-07  4:07     ` Harald Dunkel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4FC0F29C.9050508@afaics.de \
    --to=harri@afaics.de \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=mmarek@suse.cz \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox