Re: [yocto] Fetching Yocto layers
On Mon, Sep 2, 2019 at 2:05 PM Brian Silverman wrote: > > Is there a way to automatically fetch/add a yocto layer from another layer? > > My problem is that I’d like to be able to build instructions of my product > from one version number. But here’s our normal (example) build instructions: > > git clone git://git.yoctoproject.org/poky -b some_poky_tag > > cd poky > git clone git://git.somelayer1.com/meta-layer1 -b some_layer1_tag > > git clone git://git.somelayer2.com/meta-layer2 -b some_layer2_tag > > git clone git://git.mylayer.com/meta-mylayer -b some_mylayer_tag > > source ./oe-init-build-env > bitbake-layers add-layer ../meta-layer1 > bitbake-layers add-layer ../meta-layer2 > bitbake-layers add-layer ../meta-mylayer > > bitbake mylayer-image > > > The tags chosen above are based on what we test and ship. So my issue is > that someone has to correctly follow the above instructions for different > versions of multiple layers if they want a reproducible build of a specific > version of mylayer-image. > > Is there a canonical why to encode this information within my layer? > Obviously I could script the above, store it in my layer, and have the user > run that script. But, that seems very unyocto-like. There is combo-layer. I've used it before and for certain applications it's useful. https://wiki.yoctoproject.org/wiki/Combo-layer http://git.yoctoproject.org/cgit.cgi/poky-config/tree/ -b > > -- > > Brian Silverman > > Ready Set STEM > > b...@readysetstem.com > > > -- > ___ > yocto mailing list > yocto@yoctoproject.org > https://lists.yoctoproject.org/listinfo/yocto -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] Git tool/command problems with YOCTO Open Source repos
On Wed, Nov 28, 2018 at 9:18 AM Zoran Stojsavljevic wrote: > > Hello YOCTO people, > > I would like to use standard git tool while using all the Yocto > layers. NOT only Poky repository (which, I believe, works all the way > with git tools), but as much as possible with other github proprietary > repos and layers. Since I am not able to execute git commands using > some number of proprietary repos over github. > > As example, I'll use meta-bbb repository. > https://github.com/jumpnow/meta-bbb.git, after cloning the following > happens (chosen, since it has at least dozen of branches): > > After cloning, I did not get anything from the following commands, > being in the root of the meta-bbb repo, namely: > > [user@fedora28-ssd meta-bbb]$ pwd > /home/user/projects2/beaglebone-black/yocto-master/meta-bbb > [user@fedora28-ssd meta-bbb]$ git describe > fatal: No names found, cannot describe anything. > [user@fedora28-ssd meta-bbb]$ git tag > [user@fedora28-ssd meta-bbb]$ git checkout thud > Branch 'thud' set up to track remote branch 'thud' from 'origin'. > Switched to a new branch 'thud' > [user@fedora28-ssd meta-bbb]$ git checkout sumo > Switched to branch 'sumo' > Your branch is up to date with 'origin/sumo'. > [user@fedora28-ssd meta-bbb]$ git describe > fatal: No names found, cannot describe anything. > [user@fedora28-ssd meta-bbb]$ > > The rationale behind this request: git is the powerful tool which > should work and be solely used for YOCTO layers' synchronization. In > other words, YOCTO should give some tools' (namely git) unification > guidelines in some way. :-) > Zoran, This is normal behaviour for git repositories with no tags. Git describe just describes the latest annotated tag and if there is none, then it of course, can't describe anything. Generally, this is up to the repo maintainer to define tagging policy (I think all we do in OE/YP is ask for named release branches). So this isn't something that is "broken" it's just not asked of layer maintainers. I'm not sure why you need git describe in your workflow, but you could easily write something that reverts to something like `git shortlog -1` or something on repos that return fatal on a git describe. I'm not sure what the request is here. To ask all the repository maintainers to add tags so you don't return a fatal on git describe? -b -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] Generating license/manifest for a specific layer?
Ok, I guess my question there then would be is how you'd determine where a recipe "lived". Like, if meta-foo has a bbappends for something in core, would you include it or not in your manifest? If so, then taking the original manifest and just doing some text manipulation in a ROOTFS_POSTPROCESS_COMMAND would be the way I'd probably look at tackling it. On Wed, Jun 13, 2018 at 2:42 PM, Michael Habibi wrote: > Beth, > > This is for internal consumption. We want to be able to generate a full > manifest, and also one that reflects how we diverged from base Yocto > distribution. > > On Mon, Jun 11, 2018 at 10:55 AM Beth Flanagan wrote: >> >> On Mon, Jun 11, 2018 at 2:46 PM, Michael Habibi >> wrote: >> > Our use case is to capture the license files, manifest >> > (package/version), >> > and download information only for packages we modify/add. We use our own >> > layer to modify/add packages, everything coming from standard Yocto >> > layers >> > are untouched. >> > >> > Is there a way to generate this information on a layer-by-layer basis, >> > instead of a full manifest that includes all standard, unmodified >> > packages? >> >> The easy (cheating) way, would be to modify the tmp/deploy/licenses >> artifact post build (I do it to remove -native- and -cross- from >> things I distribute as I'm not actually distributing them) or put in a >> post do_rootfs function that does it. >> >> I guess my question would be (and this is less a technical question >> and more of a legal one) is why would you want to only include a >> manifest for only part of what you're distributing (or am I >> misunderstanding what you're trying to do here?) >> >> -b >> > >> > -- >> > ___ >> > yocto mailing list >> > yocto@yoctoproject.org >> > https://lists.yoctoproject.org/listinfo/yocto >> > -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] Generating license/manifest for a specific layer?
On Mon, Jun 11, 2018 at 2:46 PM, Michael Habibi wrote: > Our use case is to capture the license files, manifest (package/version), > and download information only for packages we modify/add. We use our own > layer to modify/add packages, everything coming from standard Yocto layers > are untouched. > > Is there a way to generate this information on a layer-by-layer basis, > instead of a full manifest that includes all standard, unmodified packages? The easy (cheating) way, would be to modify the tmp/deploy/licenses artifact post build (I do it to remove -native- and -cross- from things I distribute as I'm not actually distributing them) or put in a post do_rootfs function that does it. I guess my question would be (and this is less a technical question and more of a legal one) is why would you want to only include a manifest for only part of what you're distributing (or am I misunderstanding what you're trying to do here?) -b > > -- > ___ > yocto mailing list > yocto@yoctoproject.org > https://lists.yoctoproject.org/listinfo/yocto > -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH] poky.conf: Bump for 2.1 development
Signed-off-by: Beth Flanagan <elizabeth.flana...@intel.com>
---
meta-yocto/conf/distro/poky.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf
index 2c99da8..e62ad4d 100644
--- a/meta-yocto/conf/distro/poky.conf
+++ b/meta-yocto/conf/distro/poky.conf
@@ -1,7 +1,7 @@
DISTRO = "poky"
DISTRO_NAME = "Poky (Yocto Project Reference Distro)"
-DISTRO_VERSION = "2.0"
-DISTRO_CODENAME = "jethro"
+DISTRO_VERSION = "2.0+snapshot-${DATE}"
+DISTRO_CODENAME = "master"
SDK_VENDOR = "-pokysdk"
SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
--
1.9.1
-
Intel Ireland Limited (Branch)
Collinstown Industrial Park, Leixlip, County Kildare, Ireland
Registered Number: E902934
This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH] poky.conf: DISTRO_VERSION bump
We missed the DISTRO_VERSION bump for the 1.6.3 release. I've opened
https://bugzilla.yoctoproject.org/show_bug.cgi?id=7836 to
ensure that this doesn't happen again.
Signed-off-by: Beth Flanagan elizabeth.flana...@intel.com
---
meta-yocto/conf/distro/poky.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf
index b62de4b..9c10031 100644
--- a/meta-yocto/conf/distro/poky.conf
+++ b/meta-yocto/conf/distro/poky.conf
@@ -1,6 +1,6 @@
DISTRO = poky
DISTRO_NAME = Poky (Yocto Project Reference Distro)
-DISTRO_VERSION = 1.6.2
+DISTRO_VERSION = 1.6.3
DISTRO_CODENAME = daisy
SDK_VENDOR = -pokysdk
SDK_VERSION := ${@'${DISTRO_VERSION}'}
--
1.9.1
-
Intel Ireland Limited (Branch)
Collinstown Industrial Park, Leixlip, County Kildare, Ireland
Registered Number: E902934
This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH] distro_alias.inc: update/sort alias information.
Added new package data, and cleaned up whitespace. I've also corrected some packaged data (replacement-tar from my reading of the recipe is the tar normally found in distros). One issue this patch exposed st I haven't had a chance to track down is that when you attempt to get distrodata from gcc-crosssdk-initial-x86_64. The produced .csv in tmp/log is missing the Distro information. bitbake -e shows that DISTRO_PN_ALIAS isn't even getting set in this case. My guess here is that something is happening with the _ along the way, I've just not found it yet. Signed-off-by: Beth Flanagan elizabeth.flana...@intel.com --- meta-yocto/conf/distro/include/distro_alias.inc | 41 + 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/meta-yocto/conf/distro/include/distro_alias.inc b/meta-yocto/conf/distro/include/distro_alias.inc index 48c1d92..2c35c28 100644 --- a/meta-yocto/conf/distro/include/distro_alias.inc +++ b/meta-yocto/conf/distro/include/distro_alias.inc @@ -1,6 +1,6 @@ # # This is a list for tracking status of package relative to Major -# distributions such as Fedora, Ubuntu, Debian, ... The package +# distributions such as Fedora, Ubuntu, Debian, ... The package # name is the major distribution equivalent to the name used in oe-core # # The format is as a bitbake variable override for each recipe @@ -54,6 +54,7 @@ DISTRO_PN_ALIAS_pn-core-image-base = OE-Core DISTRO_PN_ALIAS_pn-core-image-clutter = OE-Core DISTRO_PN_ALIAS_pn-core-image-directfb = OE-Core DISTRO_PN_ALIAS_pn-core-image-full-cmdline = OE-Core +DISTRO_PN_ALIAS_pn-core-image-kernel-dev = OE-Core DISTRO_PN_ALIAS_pn-core-image-lsb = OE-Core DISTRO_PN_ALIAS_pn-core-image-lsb-dev = OE-Core DISTRO_PN_ALIAS_pn-core-image-lsb-qt3 = OE-Core @@ -67,14 +68,19 @@ DISTRO_PN_ALIAS_pn-core-image-rt-sdk = OE-Core DISTRO_PN_ALIAS_pn-core-image-sato = OE-Core DISTRO_PN_ALIAS_pn-core-image-sato-dev = OE-Core DISTRO_PN_ALIAS_pn-core-image-sato-sdk = OE-Core +DISTRO_PN_ALIAS_pn-core-image-testmaster = OE-Core +DISTRO_PN_ALIAS_pn-core-image-testmaster-initramfs = OE-Core DISTRO_PN_ALIAS_pn-core-image-weston = OE-Core DISTRO_PN_ALIAS_pn-core-image-x11 = OE-Core DISTRO_PN_ALIAS_pn-cross-localedef = OSPDT DISTRO_PN_ALIAS_pn-cryptodev-linux = OE-Core +DISTRO_PN_ALIAS_pn-cryptodev-module = OE-Core +DISTRO_PN_ALIAS_pn-cryptodev-tests = OE-Core DISTRO_PN_ALIAS_pn-cwautomacros = OSPDT upstream=http://cwautomacros.berlios.de/; DISTRO_PN_ALIAS_pn-damageproto = Meego=xorg-x11-proto-damageproto DISTRO_PN_ALIAS_pn-db = Debian=db5.1 Ubuntu=db5.1 DISTRO_PN_ALIAS_pn-dbus-ptest = Fedora=dbus Ubuntu=dbus +DISTRO_PN_ALIAS_pn-dbus-test = Fedora=dbus Ubuntu=dbus DISTRO_PN_ALIAS_pn-dbus-wait = OpenedHand DISTRO_PN_ALIAS_pn-depmodwrapper-cross = OE-Core DISTRO_PN_ALIAS_pn-directfb-examples = Debian=directfb Fedora=directfb @@ -85,6 +91,8 @@ DISTRO_PN_ALIAS_pn-docbook-dsssl-stylesheets = Fedora=docbook-style-dsssl Ubunt DISTRO_PN_ALIAS_pn-docbook-sgml-dtd-3.1 = Fedora=docbook-dtds Mandriva=docbook-dtd31-sgml DISTRO_PN_ALIAS_pn-docbook-sgml-dtd-4.1 = Fedora=docbook-dtds Mandriva=docbook-dtd41-sgml DISTRO_PN_ALIAS_pn-docbook-sgml-dtd-4.5 = Fedora=docbook-dtds Mandriva=docbook-dtd42-sgml +DISTRO_PN_ALIAS_pn-docbook-xml-dtd4 = Ubuntu=docbook-xml Fedora=docbook-dtds +DISTRO_PN_ALIAS_pn-docbook-xml-dtd4-native = Ubuntu=docbook-xml Fedora=docbook-dtds DISTRO_PN_ALIAS_pn-dri2proto = Meego=xorg-x11-proto-dri2proto DISTRO_PN_ALIAS_pn-dropbear = Debian=dropbear Ubuntu=dropbear DISTRO_PN_ALIAS_pn-dtc = Fedora=dtc Ubuntu=dtc @@ -112,14 +120,21 @@ DISTRO_PN_ALIAS_pn-gail = Fedora=gail Ubuntu=libgail-3-0 DISTRO_PN_ALIAS_pn-gaku = OpenedHand DISTRO_PN_ALIAS_pn-galago-daemon = Debian=galago-daemon Ubuntu=galago-daemon DISTRO_PN_ALIAS_pn-gcc-cross-initial = OE-Core +DISTRO_PN_ALIAS_pn-gcc-cross-initial-i586 = OE-Core DISTRO_PN_ALIAS_pn-gcc-crosssdk-initial = OE-Core +DISTRO_PN_ALIAS_pn-gcc-crosssdk-initial-x86_64 = OE-Core DISTRO_PN_ALIAS_pn-gccmakedep = Mandriva=gccmakedep Ubuntu=xutils-dev DISTRO_PN_ALIAS_pn-gcc-runtime = Ubuntu=gcc Fedora=gcc +DISTRO_PN_ALIAS_pn-gcc-sanitizers = Ubuntu=gcc Fedora=gcc +DISTRO_PN_ALIAS_pn-gcc-source = Ubuntu=gcc Fedora=gcc DISTRO_PN_ALIAS_pn-gconf-dbus = Meego=GConf-dbus DISTRO_PN_ALIAS_pn-gdk-pixbuf = Debian=libgdk-pixbuf2.0 Fedora=gdk-pixbuf DISTRO_PN_ALIAS_pn-gdk-pixbuf-csource = Debian=libgdk-pixbuf2.0-0 Fedora=gdk-pixbuf2 DISTRO_PN_ALIAS_pn-gettext-minimal = Debian=gettext Fedora=gettext DISTRO_PN_ALIAS_pn-glib-2.0 = Meego=glib2 Fedora=glib2 OpenSuSE=glib2 Ubuntu=glib2.0 Mandriva=glib2.0 Debian=glib2.0 +DISTRO_PN_ALIAS_pn-glibc-locale = OpenSuSE=glibc-locale Fedora=glibc-devel +DISTRO_PN_ALIAS_pn-glibc-mtrace = Fedora=glibc-utils Ubuntu=libc-dev-bin +DISTRO_PN_ALIAS_pn-glibc-scripts = Fedora=glibc Ubuntu=libc-bin DISTRO_PN_ALIAS_pn-glproto = Meego=xorg-x11-proto-glproto DISTRO_PN_ALIAS_pn-gnome-desktop-testing = Debian=gnome-desktop-testing Fedora=gnome-desktop-testing
[yocto] [PATCH][yocto-docs] poky.ent: Ubuntu based systems need xlstproc
xlstproc is needed for doc building. I'm sure others are effected as well. Signed-off-by: Beth Flanagan elizabeth.flana...@intel.com --- documentation/poky.ent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/poky.ent b/documentation/poky.ent index 5d12fc1..a8fe99f 100644 --- a/documentation/poky.ent +++ b/documentation/poky.ent @@ -59,7 +59,7 @@ !ENTITY OE_INIT_PATH YOCTO_POKY;/oe-init-build-env !ENTITY OE_INIT_FILE oe-init-build-env !ENTITY UBUNTU_HOST_PACKAGES_ESSENTIAL gawk wget git-core diffstat unzip texinfo gcc-multilib \ - build-essential chrpath socat + build-essential chrpath socat xsltproc !ENTITY FEDORA_HOST_PACKAGES_ESSENTIAL gawk make wget tar bzip2 gzip python unzip perl patch \ diffutils diffstat git cpp gcc gcc-c++ glibc-devel texinfo chrpath \ ccache perl-Data-Dumper perl-Text-ParseWords perl-Thread-Queue socat -- 1.9.1 - Intel Ireland Limited (Branch) Collinstown Industrial Park, Leixlip, County Kildare, Ireland Registered Number: E902934 This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies. -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH] poky.conf: Flip DISTRO_VERSION for pending 1.8 release
Flipping DISTRO_VERSION for fido.
Signed-off-by: Beth Flanagan elizabeth.flana...@intel.com
---
meta-yocto/conf/distro/poky.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf
index 66c7b4c..34d4f37 100644
--- a/meta-yocto/conf/distro/poky.conf
+++ b/meta-yocto/conf/distro/poky.conf
@@ -1,6 +1,6 @@
DISTRO = poky
DISTRO_NAME = Poky (Yocto Project Reference Distro)
-DISTRO_VERSION = 1.7+snapshot-${DATE}
+DISTRO_VERSION = 1.8
DISTRO_CODENAME = fido
SDK_VENDOR = -pokysdk
SDK_VERSION := ${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}
--
1.9.1
-
Intel Ireland Limited (Branch)
Collinstown Industrial Park, Leixlip, County Kildare, Ireland
Registered Number: E902934
This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH 0/1] Increment DISTRO_VERSION and DISTRO_NAME in master
With the edison branch stable, it's safe to increment DISTRO_VERSION and DISTRO_NAME The following changes since commit 72928abdfc00af2a7a5fac27f82e23e5de8efc4b: util-linux: Ensure perl scripts reference the correct perl (2011-09-28 21:51:52 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib eflanagan/distro_version http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=eflanagan/distro_version Elizabeth Flanagan (1): poky.conf: Increment DISTRO_VERSION meta-yocto/conf/distro/poky.conf |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH 1/1] poky.conf: Increment DISTRO_VERSION
From: Elizabeth Flanagan elizabeth.flana...@intel.com
With 1.1 release coming, it's time to increment the DISTRO_VERSION
and poky version.
Signed-off-by: Elizabeth Flanagan elizabeth.flana...@intel.com
---
meta-yocto/conf/distro/poky.conf |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf
index 46b22f4..80d4e47 100644
--- a/meta-yocto/conf/distro/poky.conf
+++ b/meta-yocto/conf/distro/poky.conf
@@ -1,6 +1,6 @@
DISTRO = poky
-DISTRO_NAME = Yocto (Built by Poky 5.0)
-DISTRO_VERSION = 1.0+snapshot-${DATE}
+DISTRO_NAME = Yocto (Built by Poky 6.0)
+DISTRO_VERSION = 1.1+snapshot-${DATE}
SDK_VENDOR = -pokysdk
SDK_VERSION := ${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}
--
1.7.1
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH 0/1] Autobuilder fixes and added functionality
Some minor fixes to the Autobuilder. I've reverted to Buildbot 0.8.2 for the time being, as well as fixed some issues with poky-autobuild-generate-sources-tarball. There is also a nasty issue when you have easy_install installed on a system. The BB installer will attempt to install via easy_install, however, if the install directory does not exist, it fails to install. I now create the install directories beforehand. This is actually something that should be fixed on the BB side, and when I have some time I'll look at it. I've also added a --installbase option which does away with having to set all of the --(*)dir= options when you are trying to relocate the install from ~. Pull URL: git://git.pokylinux.org/poky-contrib.git Branch: eflanagan/poky-ab-fixes Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=eflanagan/poky-ab-fixes Thanks, Beth Flanagan elizabeth.flana...@intel.com --- Beth Flanagan (1): Fix for easy_install, source tarball and 0.8.3 scripts/poky-autobuild-generate-sources-tarball |2 +- scripts/poky-setup-autobuilder | 59 +-- 2 files changed, 35 insertions(+), 26 deletions(-) ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH 0/1] Autobuilder fixes and added functionality
Some minor fixes to the Autobuilder. I've reverted to Buildbot 0.8.2 for the time being, as well as fixed some issues with poky-autobuild-generate-sources-tarball. There is also a nasty issue when you have easy_install installed on a system. The BB installer will attempt to install via easy_install, however, if the install directory does not exist, it fails to install. I now create the install directories beforehand. This is actually something that should be fixed on the BB side, and when I have some time I'll look at it. I've also added a --installbase option which does away with having to set all of the --(*)dir= options when you are trying to relocate the install from ~. Pull URL: git://git.pokylinux.org/poky-contrib.git Branch: eflanagan/bb-0.8.3 Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=eflanagan/bb-0.8.3 Thanks, Beth Flanagan elizabeth.flana...@intel.com --- Beth Flanagan (1): Fix for easy_install, source tarball and 0.8.3 scripts/poky-autobuild-generate-sources-tarball |2 +- scripts/poky-setup-autobuilder | 27 +++--- 2 files changed, 19 insertions(+), 10 deletions(-) ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH 1/1] Fix for easy_install, source tarball and 0.8.3
A few fixes here. First, reverting down to 0.8.2 for the time being since
there was issues with 0.8.3's git poller. Also, fixing an issue with how
bb setup.py works when setuptools is installed.
Fixing a known error in how generate sources tarball performs
Signed-off-by: Beth Flanagan elizabeth.flana...@intel.com
---
scripts/poky-autobuild-generate-sources-tarball |2 +-
scripts/poky-setup-autobuilder | 27 +++---
2 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/scripts/poky-autobuild-generate-sources-tarball
b/scripts/poky-autobuild-generate-sources-tarball
index 11ebda1..c445f24 100755
--- a/scripts/poky-autobuild-generate-sources-tarball
+++ b/scripts/poky-autobuild-generate-sources-tarball
@@ -19,7 +19,7 @@ if [[ -z $RELEASE || -z $VERSION ]]; then
fi
if [[ -z $BRANCH ]]; then
- $BRANCH = master
+ BRANCH = master
fi
BASEDIR=poky-tarball
diff --git a/scripts/poky-setup-autobuilder b/scripts/poky-setup-autobuilder
index 51e06eb..ad31fef 100755
--- a/scripts/poky-setup-autobuilder
+++ b/scripts/poky-setup-autobuilder
@@ -140,22 +140,23 @@ def configureBot(buildtype):
bbInstallDir = bbMasterDir
elif buildtype == slave:
bbInstallDir = bbSlaveDir
-cmd = cd + bbSourceDir + ; export PYTHONPATH= + bbInstallDir +
/lib/python2.6/site-packages/:$PYTHONPATH; python ./setup.py install
--prefix= + bbInstallDir
+cmd = cd + bbSourceDir + ; export PYTHONPATH= + bbInstallDir +
/lib/python2.6/site-packages/:$PYTHONPATH; python ./setup.py build; python
./setup.py install --prefix= + bbInstallDir
os.system (cmd)
except:
print Issues Configuring
sys.exit(1)
-#BuildBot download parameters
-bbVersion = 0.8.3
+# BuildBot download parameters
+#bbVersion = 0.8.3
+# Pushing this back down to 0.8.2 until 0.8.3p1 comes out.
+bbVersion = 0.8.2
bbMasterDownloadUrl = http://buildbot.googlecode.com/files/buildbot-; +
bbVersion + .tar.gz
bbSlaveDownloadUrl = http://buildbot.googlecode.com/files/buildbot-slave-; +
bbVersion + .tar.gz
bbConfigDownloadUrl = None
bbInstallerHome = os.getcwd()
bbInstallFile =
-# We need the expanded path for ~ later
-bbHome = os.path.expanduser('~')
+bbHome =
bbType = None
bbSlaveDesc=Poky Autobuilder Example
@@ -188,7 +189,8 @@ parser.add_option( --maxlogs, help = The max number of
logs you want saved. I
action = store, dest = bbMaxLogs, default = 10 )
parser.add_option( --adminmail, help = The administrator email address. If
left unset we set it to current user @ localhost,
action = store, dest = bbAdminMail, default =
r...@localhost )
-
+parser.add_option( --installbase, help = The base install directory. If
left unset we set we'll use --masterdir/slavedir/sourcedir/pstagedir/controldir
or their defaults,
+ action = store, dest = bbHome, default =
os.path.expanduser('~') )
options, args = parser.parse_args( sys.argv )
# We need to decide if we're doing a master or slave install or both
@@ -236,7 +238,10 @@ if bbPStagingDir == :
if bbType == master or bbType == both:
try:
-os.mkdir(bbMasterDir)
+# We do this here, because if setuputils is installed BuildBot wants
to use it the easy_install way
+# however, their easy_install way will fail if the dir does not exist.
It's a bug in the BB installer
+# that I'm going to have to figure out and push upstream.
+os.makedirs(bbMasterDir + /lib/python2.6/site-packages/)
except:
print bbMasterDir + already exists.
pass
@@ -332,7 +337,10 @@ c['projectURL'] = pokyABConfig.poky_projurl
if bbType == slave or bbType == both:
try:
-os.mkdir(bbSlaveDir)
+# We do this here, because if setuputils is installed BuildBot wants
to use it the easy_install way
+# however, their easy_install way will fail if the dir does not exist.
It's a bug in the BB installer
+# that I'm going to have to figure out and push upstream.
+os.makedirs(bbSlaveDir + /lib/python2.6/site-packages/)
os.mkdir(bbOutputDir)
os.mkdir(bbPStagingDir)
@@ -400,7 +408,7 @@ PSTAGEDIR=%s
# We should correct this for slave only/master only builds
print
-nstallation complete. Please review the output above for any errors.
+Installation complete. Please review the output above for any errors.
Then edit the master.cfg file in %s and start the build master and
build slave by running 'make start' in %s and %s directories.
-
@@ -418,3 +426,4 @@ cd poky-slave; make start
% (bbMasterDir, bbMasterDir, bbSlaveDir, bbSlaveDir, bbSlaveDir,
bbSlaveDir)
+
--
1.7.1
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org
[yocto] [PATCH 3/3] Change to poky-autobuild to source correct file:
A change to poky-init-build-env in poky master broke the autobuilder. Switching this to source poky-init-build-env instead of poky-env-internal. Signed-off-by: Beth Flanagan elizabeth.flana...@intel.com --- scripts/poky-autobuild |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/poky-autobuild b/scripts/poky-autobuild index 5ea61bb..882df97 100755 --- a/scripts/poky-autobuild +++ b/scripts/poky-autobuild @@ -32,7 +32,7 @@ cd $CURRDIR echo Changed to $CURRDIR BDIR=build -. ./scripts/poky-env-internal +. ./scripts/poky-init-build-env POSTPROCESS=`which poky-autobuild-postprocess` if [ xcomplete = x$1 ]; then -- 1.7.1 ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
