Patchwork [1/1] Revised: adt-installer: Add adt-installer-dev.bb

login
register
mail settings
Submitter Elizabeth Flanagan
Date Sept. 5, 2012, 5:27 p.m.
Message ID <CAPhnLPC6xOrTSk_uo2unRO7JM4G7_oV1N+p1Lv84j5YKge1bpw@mail.gmail.com>
Download mbox | patch
Permalink /patch/35977/
State New
Headers show

Comments

Elizabeth Flanagan - Sept. 5, 2012, 5:27 p.m.
This adds an adt-installer-dev for QA and autobuilder use.
It repoints the ADTREPO url to adtrepo-dev.yp.org.

Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
---
 .../installer/adt-installer-dev_1.0.bb             |   26 ++++++++++++++++++++
 .../installer/adt-installer/adt_installer.conf     |    2 +-
 .../installer/adt-installer_1.0.bb                 |    1 +
 3 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-devtools/installer/adt-installer-dev_1.0.bb
Richard Purdie - Sept. 5, 2012, 8:21 p.m.
On Wed, 2012-09-05 at 10:27 -0700, Flanagan, Elizabeth wrote:
> This adds an adt-installer-dev for QA and autobuilder use.
> It repoints the ADTREPO url to adtrepo-dev.yp.org.
> 
> Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
> ---
>  .../installer/adt-installer-dev_1.0.bb             |   26 ++++++++++++++++++++
>  .../installer/adt-installer/adt_installer.conf     |    2 +-
>  .../installer/adt-installer_1.0.bb                 |    1 +
>  3 files changed, 28 insertions(+), 1 deletion(-)
>  create mode 100644 meta/recipes-devtools/installer/adt-installer-dev_1.0.bb
> 
> diff --git a/meta/recipes-devtools/installer/adt-installer-dev_1.0.bb
> b/meta/recipes-devtools/installer/adt-installer-dev_1.0.bb
> new file mode 100644
> index 0000000..7679038
> --- /dev/null
> +++ b/meta/recipes-devtools/installer/adt-installer-dev_1.0.bb
> @@ -0,0 +1,26 @@
> +# Yocto ADT Installer bb file
> +#
> +# Copyright 2010-2011 by Intel Corp.
> +#
> +# Permission is hereby granted, free of charge, to any person obtaining a copy
> +# of this software and associated documentation files (the
> "Software"), to deal
> +# in the Software without restriction, including without limitation the rights
> +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
> +# copies of the Software, and to permit persons to whom the Software is
> +# furnished to do so, subject to the following conditions:
> +
> +# The above copyright notice and this permission notice shall be included in
> +# all copies or substantial portions of the Software.
> +
> +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
> +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> ARISING FROM,
> +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
> +# THE SOFTWARE.
> +
> +require recipes-devtools/installer/adt-installer_${PV}.bb
> +
> +FILESEXTRAPATHS_prepend := "${THISDIR}/adt-installer:"
> +ADTREPO = "http://adtrepo-dev.yoctoproject.org/${SDK_VERSION}"
> diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
> b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
> index afc69a4..171d2ac 100644
> --- a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
> +++ b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
> @@ -23,7 +23,7 @@
> 
>  # Your yocto distro repository, this should include IPKG based
> packages and root filesystem files where the installation is based on
> 
> -YOCTOADT_REPO="http://adtrepo.yoctoproject.org/YOCTOADT_VERSION"
> +YOCTOADT_REPO="ADTREPO"
> 
>  # The following are for system wide setup
>  # Target architectures that you want to setup host cross dev environment for
> diff --git a/meta/recipes-devtools/installer/adt-installer_1.0.bb
> b/meta/recipes-devtools/installer/adt-installer_1.0.bb
> index becdef6..4ee276f 100644
> --- a/meta/recipes-devtools/installer/adt-installer_1.0.bb
> +++ b/meta/recipes-devtools/installer/adt-installer_1.0.bb
> @@ -68,6 +68,7 @@ fakeroot do_populate_adt () {
>  	cp -r scripts ${ADT_DIR}/
>  	cp adt_installer ${ADT_DIR}
>  	cp adt_installer.conf ${ADT_DIR}
> +	sed -i -e 's#ADTREPO#${ADTREPO}#' ${ADT_DIR}/adt_installer.conf
>  	sed -i -e 's#YOCTOADT_VERSION#${SDK_VERSION}#' ${ADT_DIR}/adt_installer.conf
>  	echo 'SDK_VENDOR=${SDK_VENDOR}' >> ${ADT_DIR}/scripts/data_define
>  	echo 'DEFAULT_INSTALL_FOLDER=${SDKPATH}' >> ${ADT_DIR}/scripts/data_define

Firstly, this breaks the adt-installer recipe since nothing sets
YOCTOADT_REPO to a value.

Secondly, having two recipe just for this is wrong, lets just set the
variable as needed. Either:

a) Setting to the release location should happen at release time,
otherwise it can default to the dev repo

b) It can default to the last release and the autobuilder overrides the
variable to the dev location.

I suspect a) is less work and makes most sense.

Cheers,

Richard
Jessica Zhang - Sept. 5, 2012, 8:31 p.m.
+1 for option a.

-----Original Message-----
From: openembedded-core-bounces@lists.openembedded.org [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of Richard Purdie
Sent: Wednesday, September 05, 2012 1:21 PM
To: Flanagan, Elizabeth
Cc: Patches and discussions about the oe-core layer
Subject: Re: [OE-core] [PATCH 1/1] Revised: adt-installer: Add adt-installer-dev.bb

On Wed, 2012-09-05 at 10:27 -0700, Flanagan, Elizabeth wrote:
> This adds an adt-installer-dev for QA and autobuilder use.
> It repoints the ADTREPO url to adtrepo-dev.yp.org.
>
> Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
> ---
>  .../installer/adt-installer-dev_1.0.bb             |   26 ++++++++++++++++++++
>  .../installer/adt-installer/adt_installer.conf     |    2 +-
>  .../installer/adt-installer_1.0.bb                 |    1 +
>  3 files changed, 28 insertions(+), 1 deletion(-)  create mode 100644
> meta/recipes-devtools/installer/adt-installer-dev_1.0.bb
>
> diff --git a/meta/recipes-devtools/installer/adt-installer-dev_1.0.bb
> b/meta/recipes-devtools/installer/adt-installer-dev_1.0.bb
> new file mode 100644
> index 0000000..7679038
> --- /dev/null
> +++ b/meta/recipes-devtools/installer/adt-installer-dev_1.0.bb
> @@ -0,0 +1,26 @@
> +# Yocto ADT Installer bb file
> +#
> +# Copyright 2010-2011 by Intel Corp.
> +#
> +# Permission is hereby granted, free of charge, to any person
> +obtaining a copy # of this software and associated documentation
> +files (the
> "Software"), to deal
> +# in the Software without restriction, including without limitation
> +the rights # to use, copy, modify, merge, publish, distribute,
> +sublicense, and/or sell # copies of the Software, and to permit
> +persons to whom the Software is # furnished to do so, subject to the following conditions:
> +
> +# The above copyright notice and this permission notice shall be
> +included in # all copies or substantial portions of the Software.
> +
> +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> +EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
> +MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND
> +NONINFRINGEMENT. IN NO EVENT SHALL THE # AUTHORS OR COPYRIGHT HOLDERS
> +BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER # LIABILITY, WHETHER IN AN
> +ACTION OF CONTRACT, TORT OR OTHERWISE,
> ARISING FROM,
> +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
> +DEALINGS IN # THE SOFTWARE.
> +
> +require recipes-devtools/installer/adt-installer_${PV}.bb
> +
> +FILESEXTRAPATHS_prepend := "${THISDIR}/adt-installer:"
> +ADTREPO = "http://adtrepo-dev.yoctoproject.org/${SDK_VERSION}"
> diff --git
> a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
> b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
> index afc69a4..171d2ac 100644
> --- a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
> +++ b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
> @@ -23,7 +23,7 @@
>
>  # Your yocto distro repository, this should include IPKG based
> packages and root filesystem files where the installation is based on
>
> -YOCTOADT_REPO="http://adtrepo.yoctoproject.org/YOCTOADT_VERSION"
> +YOCTOADT_REPO="ADTREPO"
>
>  # The following are for system wide setup  # Target architectures
> that you want to setup host cross dev environment for diff --git
> a/meta/recipes-devtools/installer/adt-installer_1.0.bb
> b/meta/recipes-devtools/installer/adt-installer_1.0.bb
> index becdef6..4ee276f 100644
> --- a/meta/recipes-devtools/installer/adt-installer_1.0.bb
> +++ b/meta/recipes-devtools/installer/adt-installer_1.0.bb
> @@ -68,6 +68,7 @@ fakeroot do_populate_adt () {
>       cp -r scripts ${ADT_DIR}/
>       cp adt_installer ${ADT_DIR}
>       cp adt_installer.conf ${ADT_DIR}
> +     sed -i -e 's#ADTREPO#${ADTREPO}#' ${ADT_DIR}/adt_installer.conf
>       sed -i -e 's#YOCTOADT_VERSION#${SDK_VERSION}#' ${ADT_DIR}/adt_installer.conf
>       echo 'SDK_VENDOR=${SDK_VENDOR}' >> ${ADT_DIR}/scripts/data_define
>       echo 'DEFAULT_INSTALL_FOLDER=${SDKPATH}' >>
> ${ADT_DIR}/scripts/data_define

Firstly, this breaks the adt-installer recipe since nothing sets YOCTOADT_REPO to a value.

Secondly, having two recipe just for this is wrong, lets just set the variable as needed. Either:

a) Setting to the release location should happen at release time, otherwise it can default to the dev repo

b) It can default to the last release and the autobuilder overrides the variable to the dev location.

I suspect a) is less work and makes most sense.

Cheers,

Richard

Patch

diff --git a/meta/recipes-devtools/installer/adt-installer-dev_1.0.bb
b/meta/recipes-devtools/installer/adt-installer-dev_1.0.bb
new file mode 100644
index 0000000..7679038
--- /dev/null
+++ b/meta/recipes-devtools/installer/adt-installer-dev_1.0.bb
@@ -0,0 +1,26 @@ 
+# Yocto ADT Installer bb file
+#
+# Copyright 2010-2011 by Intel Corp.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the
"Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require recipes-devtools/installer/adt-installer_${PV}.bb
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/adt-installer:"
+ADTREPO = "http://adtrepo-dev.yoctoproject.org/${SDK_VERSION}"
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
index afc69a4..171d2ac 100644
--- a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
+++ b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
@@ -23,7 +23,7 @@ 

 # Your yocto distro repository, this should include IPKG based
packages and root filesystem files where the installation is based on

-YOCTOADT_REPO="http://adtrepo.yoctoproject.org/YOCTOADT_VERSION"
+YOCTOADT_REPO="ADTREPO"

 # The following are for system wide setup
 # Target architectures that you want to setup host cross dev environment for
diff --git a/meta/recipes-devtools/installer/adt-installer_1.0.bb
b/meta/recipes-devtools/installer/adt-installer_1.0.bb
index becdef6..4ee276f 100644
--- a/meta/recipes-devtools/installer/adt-installer_1.0.bb
+++ b/meta/recipes-devtools/installer/adt-installer_1.0.bb
@@ -68,6 +68,7 @@  fakeroot do_populate_adt () {
 	cp -r scripts ${ADT_DIR}/
 	cp adt_installer ${ADT_DIR}
 	cp adt_installer.conf ${ADT_DIR}
+	sed -i -e 's#ADTREPO#${ADTREPO}#' ${ADT_DIR}/adt_installer.conf
 	sed -i -e 's#YOCTOADT_VERSION#${SDK_VERSION}#' ${ADT_DIR}/adt_installer.conf
 	echo 'SDK_VENDOR=${SDK_VENDOR}' >> ${ADT_DIR}/scripts/data_define
 	echo 'DEFAULT_INSTALL_FOLDER=${SDKPATH}' >> ${ADT_DIR}/scripts/data_define