From e7b5e1602c3e3ce718a5a67a1775ff045a93e81e Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 4 Sep 2007 08:22:28 +0000 Subject: base.bbclass: Wipe install directory before running install to make rebuilding packages safer (from poky) --- classes/base.bbclass | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'classes/base.bbclass') diff --git a/classes/base.bbclass b/classes/base.bbclass index 1a3739f383..304eaecb10 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -374,6 +374,12 @@ oe_machinstall() { fi } +# Remove and re-create ${D} so that is it guaranteed to be empty +do_install_prepend() { + rm -rf ${D} + mkdir -p ${D} +} + addtask listtasks do_listtasks[nostamp] = "1" python do_listtasks() { -- cgit v1.2.3 From d50cfb53ec731680c3a7cfb772f27308acff0f06 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 4 Sep 2007 08:24:59 +0000 Subject: classes/conf: Remove bitbake < 1.8.8 compatibility code --- classes/base.bbclass | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'classes/base.bbclass') diff --git a/classes/base.bbclass b/classes/base.bbclass index 304eaecb10..9bcf212e95 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -582,10 +582,6 @@ python base_do_unpack() { local = bb.data.expand(bb.fetch.localpath(url, localdata), localdata) except bb.MalformedUrl, e: raise FuncFailed('Unable to generate local path for malformed uri: %s' % e) - # dont need any parameters for extraction, strip them off - # RP: Insane. localpath shouldn't have parameters - # RP: Scehdule for removal with bitbake 1.8.8 - local = re.sub(';.*$', '', local) local = os.path.realpath(local) ret = oe_unpack_file(local, localdata, url) if not ret: @@ -877,14 +873,6 @@ python () { base_after_parse(d) } -# Remove me when we switch to bitbake 1.8.8 -def base_get_srcrev(d): - import bb - - if hasattr(bb.fetch, "get_srcrev"): - return bb.fetch.get_srcrev(d) - return "NOT IMPLEMENTED" - # Patch handling inherit patch -- cgit v1.2.3