Patchwork [1/1] self-hosted-image: pre-populate the builder user with poky source

login
register
mail settings
Submitter Dexuan Cui
Date March 18, 2012, 5:41 a.m.
Message ID <401c27ba4e7f8b5bc0da084cd48d1738157c894b.1332049148.git.dexuan.cui@intel.com>
Download mbox | patch
Permalink /patch/23767/
State New
Headers show

Comments

Dexuan Cui - March 18, 2012, 5:41 a.m.
[YOCTO #2065]

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
 meta/recipes-core/images/self-hosted-image.bb |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)
Koen Kooi - March 18, 2012, 8:21 a.m.
Op 18 mrt. 2012, om 06:41 heeft Dexuan Cui het volgende geschreven:

> [YOCTO #2065]

What does that mean?
Dexuan Cui - March 18, 2012, 9:52 a.m.
Koen Kooi wrote on 2012-03-18:
> 
> Op 18 mrt. 2012, om 06:41 heeft Dexuan Cui het volgende geschreven:
> 
>> [YOCTO #2065]
> 
> What does that mean?
Sorry, I should have made it more clear. :-) 

It means bug 2065 is addressed by the patch:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=2065

Thanks,
-- Dexuan
Koen Kooi - March 18, 2012, 12:07 p.m.
Op 18 mrt. 2012, om 10:52 heeft Cui, Dexuan het volgende geschreven:

> Koen Kooi wrote on 2012-03-18:
>> 
>> Op 18 mrt. 2012, om 06:41 heeft Dexuan Cui het volgende geschreven:
>> 
>>> [YOCTO #2065]
>> 
>> What does that mean?
> Sorry, I should have made it more clear. :-) 
> 
> It means bug 2065 is addressed by the patch:
> https://bugzilla.yoctoproject.org/show_bug.cgi?id=2065

So add that and (part of) the bug description into the commit message
Dexuan Cui - March 19, 2012, 1:33 a.m.
Koen Kooi wrote on 2012-03-18:
> 
> Op 18 mrt. 2012, om 10:52 heeft Cui, Dexuan het volgende geschreven:
> 
>> Koen Kooi wrote on 2012-03-18:
>>> 
>>> Op 18 mrt. 2012, om 06:41 heeft Dexuan Cui het volgende geschreven:
>>> 
>>>> [YOCTO #2065]
>>> 
>>> What does that mean?
>> Sorry, I should have made it more clear. :-)
>> 
>> It means bug 2065 is addressed by the patch:
>> https://bugzilla.yoctoproject.org/show_bug.cgi?id=2065
> 
> So add that and (part of) the bug description into the commit message
OK, please review and use the updated commit(only the commit description was updated):
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=dcui/self&id=0882b5e0adb05d4f950c721fcb80b4cff42ce079

Thanks,
-- Dexuan

Patch

diff --git a/meta/recipes-core/images/self-hosted-image.bb b/meta/recipes-core/images/self-hosted-image.bb
index d56c2cb..7f5173a 100644
--- a/meta/recipes-core/images/self-hosted-image.bb
+++ b/meta/recipes-core/images/self-hosted-image.bb
@@ -4,7 +4,7 @@  LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
-PR = "r5"
+PR = "r6"
 
 CORE_IMAGE_EXTRA_INSTALL = "\
     task-self-hosted \
@@ -21,3 +21,24 @@  APPEND += "quiet"
 IMAGE_FSTYPES = "vmdk"
 
 inherit core-image
+
+SRCREV = "26a46938d3ea1821e7bec4fa6cc8379babad238b"
+SRC_URI = "git://git.yoctoproject.org/poky;protocol=git"
+
+fakeroot do_populate_poky_src () {
+    # Because fetch2's git's unpack uses -s cloneflag, the unpacked git repo
+    # will become invalid in the target.
+    rm -rf ${WORKDIR}/git/.git
+    rm -f ${WORKDIR}/git/.gitignore
+
+    cp -Rp ${WORKDIR}/git ${IMAGE_ROOTFS}/home/builder/poky
+    chown -R builder.builder  ${IMAGE_ROOTFS}/home/builder/poky
+}
+
+IMAGE_PREPROCESS_COMMAND += "do_populate_poky_src; "
+
+python do_get_poky_src () {
+    bb.build.exec_func('base_do_fetch', d)
+    bb.build.exec_func('base_do_unpack', d)
+}
+addtask do_get_poky_src before do_rootfs