[PATCH] Angstrom: weak-assign DEPLOY_DIR

[PATCH] Angstrom: weak-assign DEPLOY_DIR

[Matthieu Poullet]

Allow DEPLOY_DIR to be outside of TMPDIR,
so that it can be set in local.conf

---
 conf/distro/include/angstrom.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 60f2e55..7493055 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -21,7 +21,7 @@ ANGSTROMLIBC ?= "glibc"
 PSTAGE_EXTRAPATH = "${ANGSTROMLIBC}"
 
 CACHE = "${TMPDIR}/cache/${ANGSTROMLIBC}/${MACHINE}"
-DEPLOY_DIR = "${TMPDIR}/deploy/${ANGSTROMLIBC}"
+DEPLOY_DIR ?= "${TMPDIR}/deploy/${ANGSTROMLIBC}"
 require conf/distro/include/angstrom-${ANGSTROMLIBC}.inc
 
 # ARM920T and up can use thumb mode to decrease binary size at the expense of speed
-- 
1.5.6.3

Re: [PATCH] Angstrom: weak-assign DEPLOY_DIR

[Andrea Adami]

+1 from me

Cannot cause any trouble!

Andrea

Re: [PATCH] Angstrom: weak-assign DEPLOY_DIR

[Andrea Adami]

Acked-by: Andrea Adami (andrea.adami@gmail.com)

thx

Andrea

Re: [PATCH] Angstrom: weak-assign DEPLOY_DIR

[Denys Dmytriyenko]

On Sun, Mar 22, 2009 at 05:27:23PM +0100, Andrea Adami wrote:
> +1 from me
> 
> Cannot cause any trouble!
> 
> Andrea

Actually, only yesterday you mentioned about problems packaging a kernel when 
DEPLOY_DIR is outside of TMPDIR...

-- 
Denys

Re: [PATCH] Angstrom: weak-assign DEPLOY_DIR

[Andrea Adami]

Well, I reproduced the issue after long time. Still present.

http://www.hentges.net/irclogs/%23oe/2008/July/20080725_oe.log
[20080725 09:57:35]	 <ant|work>  	 I already have /build/pstage

The 'fix' can be discuted but seems to work

Regards

Andrea

Re: [PATCH] Angstrom: weak-assign DEPLOY_DIR

[Andrea Adami]

Wait a moment:

if we weak-assign DEPLOY_DIR in angstrom.inc
DEPLOY_DIR ?= "${TMPDIR}/deploy/${ANGSTROMLIBC}"

then it takes the value from bitbake.conf?
DEPLOY_DIR ?= "${TMPDIR}/deploy"


Now doubtful...

Andrea

Re: [PATCH] Angstrom: weak-assign DEPLOY_DIR

[Tom Rini]

On Mon, Mar 23, 2009 at 12:30:10AM +0100, Andrea Adami wrote:
> Wait a moment:
> 
> if we weak-assign DEPLOY_DIR in angstrom.inc
> DEPLOY_DIR ?= "${TMPDIR}/deploy/${ANGSTROMLIBC}"
> 
> then it takes the value from bitbake.conf?
> DEPLOY_DIR ?= "${TMPDIR}/deploy"

Sounds like Angstrom needs:
USER_DEPLOY_DIR ?= "${TMPDIR}/deploy/${ANGSTROMLIBC}"
DEPLOY_DIR = "${USER_DEPLOY_DIR}" if users are going to further override
what the distro thinks is best.

-- 
Tom Rini

Re: [PATCH] Angstrom: weak-assign DEPLOY_DIR

[Andrea Adami]

was: DEPLOY_DIR out of TMPDIR

>Sounds like Angstrom needs:
>USER_DEPLOY_DIR ?= "${TMPDIR}/deploy/${ANGSTROMLIBC}"
>DEPLOY_DIR = "${USER_DEPLOY_DIR}" if users are going to further override
>what the distro thinks is best.

As pointed out by Denix and me, we need changes to base.bbclass too:

 package_stagefile_shell()
 ...
-destfile=`echo $srcfile | sed s#${TMPDIR}#${PSTAGE_TMPDIR_STAGE}#`
+destfile=`echo $srcfile | sed s#${DEPLOY_DIR}#${PSTAGE_TMPDIR_STAGE}#`
...

I tested both patches building from scratch and using packaged staging.

Issues: the 5-6 recipes using package_stagefile_shell() are possibly
broken...DEPLOY_DIR get sed out and the files are not found.
I don't have a list here offhand, just grep...two of them are
zaurus-updater and git.

I fixed locally zaurus-updater just avoiding to call the a.m. function

-        package_stagefile_shell ${DEPLOY_DIR_IMAGE}/updater.sh.${MACHINE}
+       cp -dp updater.sh ${DEPLOY_DIR_IMAGE}/updater.sh.${MACHINE}

-        package_stagefile_shell ${DEPLOY_DIR_IMAGE}/gnu-tar
+       cp -dp gnu-tar ${DEPLOY_DIR_IMAGE}/gnu-tar

Can I proceed and send the set of patches to the mailing list? Better ideas?


Regards

Andrea

Re: [PATCH] Angstrom: weak-assign DEPLOY_DIR

[Koen Kooi]

On 26-03-09 09:47, Andrea Adami wrote:

> I fixed locally zaurus-updater just avoiding to call the a.m. function
>
> -        package_stagefile_shell ${DEPLOY_DIR_IMAGE}/updater.sh.${MACHINE}
> +       cp -dp updater.sh ${DEPLOY_DIR_IMAGE}/updater.sh.${MACHINE}
>
> -        package_stagefile_shell ${DEPLOY_DIR_IMAGE}/gnu-tar
> +       cp -dp gnu-tar ${DEPLOY_DIR_IMAGE}/gnu-tar

That breaks packaged-staging, so no, it isn't a fix.

regards,

Koen

Re: [PATCH] Angstrom: weak-assign DEPLOY_DIR

[Andrea Adami]

>that breaks packaged-staging, so no, it isn't a fix.

FWIW packaged-staging *is* already broken wrt these few recipes.

Andrea

Refs:
http://bugs.openembedded.net/show_bug.cgi?id=4580

Re: [PATCH] Angstrom: weak-assign DEPLOY_DIR

[Koen Kooi]

On 26-03-09 11:23, Andrea Adami wrote:
>> that breaks packaged-staging, so no, it isn't a fix.
>
> FWIW packaged-staging *is* already broken wrt these few recipes.

Only if you put deploy outside TMPDIR, which isn't the default and known 
to cause other issues. Your patch makes to go for "working, but broken 
for corner-cases" to "completely broken".

regards,

Koen

Re: [PATCH] Angstrom: weak-assign DEPLOY_DIR

[Andrea Adami]

The fact is even the standard case (deploy_dir inside tmpdir) is broken...see
http://bugs.openembedded.net/show_bug.cgi?id=4234#c2

Sorry if I'm mixing apples with pears ;-)

Andrea