Skip to contentSkip to conversation

minor fixes for archiver and selftest

PATCH New Robert Yang 1 participant 3 messages Mar 30, 2016

lore
Share & tools
lore

Robert Yang

author
#0 lore raw

cover minor fixes for archiver and selftest

The following changes since commit b3f80743cd1b9a15a8ee4d20c2a54c2f6cbcd13c:

gcc: Backport fixes for musl ssp configuration (2016-03-29 23:19:45 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib 07b3a5e5f8d42008b72679b702962e4eb6de441a
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=07b3a5e5f8d42008b72679b702962e4eb6de441a

Robert Yang (2):
archiver.bbclass: addtask do_deploy_archives_setscene selftest/buildoptions.py: use INHERIT +=

 meta/classes/archiver.bbclass          | 1 +
 meta/lib/oeqa/selftest/buildoptions.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH 1/2 archiver.bbclass: addtask do_deploy_archives_setscene

There was a do_deploy_archives_setscene, but no addtask.

Signed-off-by Robert Yang <[email protected]>
---
 meta/classes/archiver.bbclass | 1 +
 1 file changed, 1 insertion(+)
meta/classes/archiver.bbclass +1 -0
index 42982ab..15d2d04 100644
@@ -364,6 +364,7 @@ python do_deploy_archives_setscene () {
 }
 do_deploy_archives[sstate-inputdirs] = "${ARCHIVER_TOPDIR}"
 do_deploy_archives[sstate-outputdirs] = "${DEPLOY_DIR_SRC}"
+addtask do_deploy_archives_setscene
 
 addtask do_ar_original after do_unpack
 addtask do_unpack_and_patch after do_patch
Signature · 1 line
2.7.4
author
#2 lore raw

PATCH 2/2 selftest/buildoptions.py: use INHERIT +=

In reply to Robert Yang

* INHERIT = -> INHERIT +=

Signed-off-by Robert Yang <[email protected]>
---
 meta/lib/oeqa/selftest/buildoptions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oeqa/selftest/buildoptions.py +1 -1
index 2fc77e1..e9a5aad 100644
@@ -276,7 +276,7 @@ class ArchiverTest(oeSelfTest):
         Test for archiving the work directory and exporting the source files.
         """
         self.add_command_to_tearDown('cleanup-workdir')
-        self.write_config("INHERIT = \"archiver\"\nARCHIVER_MODE[src] = \"original\"\nARCHIVER_MODE[srpm] = \"1\"")
+        self.write_config("INHERIT += \"archiver\"\nARCHIVER_MODE[src] = \"original\"\nARCHIVER_MODE[srpm] = \"1\"")
         res = bitbake("xcursor-transparent-theme", ignore_status=True)
         self.assertEqual(res.status, 0, "\nCouldn't build xcursortransparenttheme.\nbitbake output %s" % res.output)
         pkgs_path = g.glob(str(self.builddir) + "/tmp/deploy/sources/allarch*/xcurs*")
Signature · 1 line
2.7.4