* [PATCH] builddeb: fix errors caused by objtree redefinition
@ 2014-06-19 0:13 Darrick J. Wong
2014-06-19 7:27 ` Michal Marek
0 siblings, 1 reply; 3+ messages in thread
From: Darrick J. Wong @ 2014-06-19 0:13 UTC (permalink / raw)
To: Michal Marek; +Cc: linux-kernel
In commit 7e1c04779efd51154baf652e653ceb24ce68939b ("kbuild: Use
relative path for $(objtree)"), objtree was redefined from whatever
$(CURDIR) is to a simple ".". Unfortunately, this breaks builddeb,
which was relying on $objtree to be an absolute path, not a relative
one. Since the script is run from the object directory, pick up a
more absolute value for objtree where it's needed.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
scripts/package/builddeb | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 2f3ec77..ce7d05b 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -299,6 +299,7 @@ EOF
fi
# Build header package
+objtree="$(pwd)"
(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 Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] builddeb: fix errors caused by objtree redefinition
2014-06-19 0:13 [PATCH] builddeb: fix errors caused by objtree redefinition Darrick J. Wong
@ 2014-06-19 7:27 ` Michal Marek
2014-06-19 8:30 ` Darrick J. Wong
0 siblings, 1 reply; 3+ messages in thread
From: Michal Marek @ 2014-06-19 7:27 UTC (permalink / raw)
To: Darrick J. Wong; +Cc: linux-kernel
On 2014-06-19 02:13, Darrick J. Wong wrote:
> In commit 7e1c04779efd51154baf652e653ceb24ce68939b ("kbuild: Use
> relative path for $(objtree)"), objtree was redefined from whatever
> $(CURDIR) is to a simple ".". Unfortunately, this breaks builddeb,
> which was relying on $objtree to be an absolute path, not a relative
> one. Since the script is run from the object directory, pick up a
> more absolute value for objtree where it's needed.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
> scripts/package/builddeb | 1 +
> 1 file changed, 1 insertion(+)
Hi Darrick,
thanks for the patch. Can you check if commit a765a7ce from linux-next
also fixes your issue? This is on its way to Linus.
Thanks,
Michal
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] builddeb: fix errors caused by objtree redefinition
2014-06-19 7:27 ` Michal Marek
@ 2014-06-19 8:30 ` Darrick J. Wong
0 siblings, 0 replies; 3+ messages in thread
From: Darrick J. Wong @ 2014-06-19 8:30 UTC (permalink / raw)
To: Michal Marek; +Cc: linux-kernel
On Thu, Jun 19, 2014 at 09:27:40AM +0200, Michal Marek wrote:
> On 2014-06-19 02:13, Darrick J. Wong wrote:
> > In commit 7e1c04779efd51154baf652e653ceb24ce68939b ("kbuild: Use
> > relative path for $(objtree)"), objtree was redefined from whatever
> > $(CURDIR) is to a simple ".". Unfortunately, this breaks builddeb,
> > which was relying on $objtree to be an absolute path, not a relative
> > one. Since the script is run from the object directory, pick up a
> > more absolute value for objtree where it's needed.
> >
> > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> > ---
> > scripts/package/builddeb | 1 +
> > 1 file changed, 1 insertion(+)
>
> Hi Darrick,
>
> thanks for the patch. Can you check if commit a765a7ce from linux-next
> also fixes your issue? This is on its way to Linus.
Looks good! You can add my Tested-by if you like.
--D
>
> Thanks,
> Michal
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-06-19 8:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-06-19 0:13 [PATCH] builddeb: fix errors caused by objtree redefinition Darrick J. Wong
2014-06-19 7:27 ` Michal Marek
2014-06-19 8:30 ` Darrick J. Wong
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.