Patchwork oebb.sh oe-core with non-angstrom distro

login
register
mail settings
Submitter Lukas-David Gorris
Date May 31, 2011, 10:25 p.m.
Message ID <20110531232513.19296umd0ei7gu0w@webmail.htc-linux.org>
Download mbox | patch
Permalink /patch/5133/
State New, archived
Headers show

Comments

Lukas-David Gorris - May 31, 2011, 10:25 p.m.
Quoting Lukas-David Gorris <lukas@htc-linux.org>:

> Quoting Lukas-David Gorris <lukas@htc-linux.org>:
>
>> Hi,
>>
>> Is it possible to use the  
>> http://git.angstrom-distribution.org/cgi-bin/cgit.cgi/setup-scripts/ setup  
>> scripts for a non-angstrom distro?
>>
>> I tried to do this as explained in the following:
>>
>> git clone git://git.angstrom-distribution.org/setup-scripts
>> cd setup-scripts
>> git checkout -b oe-core remotes/origin/oe-core
>>
>> Now I replace ¨angstrom...¨ with ¨shr¨ in DISTRO= in oebb.sh and run
>>
>> ./oebb.sh config htcleo #I added htcleo machine in the meta-smartphone layer
>>
>> ./oebb.sh bitbake shr-image
>>
>> This will end up with bitbake trying to use some angstrom scripts  
>> and then fail. It would be very nice to make the distro  
>> configurable in oebb.sh. I suppose extra configurations for the  
>> non-angstrom distro will be needed but I am uncertain how to go  
>> about this. Maybe we can add a new branch for SHR specific oebb.sh ?
>>
>> Best regards
>>
>> Lukas
>>
>>
>
> Thanks to Heiner I just found the first problem.The meta-shr layer  
> that provides everything specific to the shr distro must be included  
> for this to work.
>

Patch for git://git.angstrom-distribution.org/setup-scripts,oe-core  
for use with SHR distro:


  meta-xilinx,git://git.yoctoproject.org/meta-xilinx,master,HEAD
-openembedded-core,https://github.com/openembedded/oe-core.git,master,HEAD
+openembedded-core,git://git.openembedded.net/openembedded-core-contrib,shr,HEAD
Khem Raj - June 1, 2011, 2:27 a.m.
On 05/31/2011 03:25 PM, Lukas-David Gorris wrote:
> Quoting Lukas-David Gorris <lukas@htc-linux.org>:
>
>> Quoting Lukas-David Gorris <lukas@htc-linux.org>:
>>
>>> Hi,
>>>
>>> Is it possible to use the
>>> http://git.angstrom-distribution.org/cgi-bin/cgit.cgi/setup-scripts/
>>> setup scripts for a non-angstrom distro?
>>>
>>> I tried to do this as explained in the following:
>>>
>>> git clone git://git.angstrom-distribution.org/setup-scripts
>>> cd setup-scripts
>>> git checkout -b oe-core remotes/origin/oe-core
>>>
>>> Now I replace ¨angstrom...¨ with ¨shr¨ in DISTRO= in oebb.sh and run
>>>
>>> ./oebb.sh config htcleo #I added htcleo machine in the
>>> meta-smartphone layer
>>>
>>> ./oebb.sh bitbake shr-image
>>>
>>> This will end up with bitbake trying to use some angstrom scripts and
>>> then fail. It would be very nice to make the distro configurable in
>>> oebb.sh. I suppose extra configurations for the non-angstrom distro
>>> will be needed but I am uncertain how to go about this. Maybe we can
>>> add a new branch for SHR specific oebb.sh ?
>>>
>>> Best regards
>>>
>>> Lukas
>>>
>>>
>>
>> Thanks to Heiner I just found the first problem.The meta-shr layer
>> that provides everything specific to the shr distro must be included
>> for this to work.
>>
>
> Patch for git://git.angstrom-distribution.org/setup-scripts,oe-core for
> use with SHR distro:
>
>
> diff --git a/conf/local.conf b/conf/local.conf
> index a641121..69ac50e 100644
> --- a/conf/local.conf
> +++ b/conf/local.conf
> @@ -19,7 +19,7 @@ IMAGE_FSTYPES += "tar.bz2"
> PARALLEL_MAKE = "-j2"
> BB_NUMBER_THREADS = "2"
>
> -DISTRO = "angstrom-2010.x"
> +DISTRO = "shr"
>
> # Set terminal types by default it expects gnome-terminal
> # but we chose xterm
> diff --git a/oebb.sh b/oebb.sh
> index 43697ab..49afaa8 100755
> --- a/oebb.sh
> +++ b/oebb.sh
> @@ -66,7 +66,7 @@ else
> #--------------------------------------------------------------------------
> # Specify distribution information
> #--------------------------------------------------------------------------
> - DISTRO="angstrom-2010.x"
> + DISTRO="shr"
> DISTRO_DIRNAME=`echo $DISTRO | sed s#[.-]#_#g`
>
> echo "export SCRIPTS_BASE_VERSION=${BASE_VERSION}" > ${OE_ENV_FILE}
> @@ -253,7 +253,6 @@ BBFILES = ""
> # Add your overlay location to BBLAYERS
> # Make sure to have a conf/layers.conf in there
> BBLAYERS = " \\
> - \${TOPDIR}/sources/meta-angstrom \\
> \${TOPDIR}/sources/meta-openembedded/meta-oe \\
> \${TOPDIR}/sources/meta-openembedded/meta-efl \\
> \${TOPDIR}/sources/meta-openembedded/meta-gpe \\
> @@ -266,6 +265,8 @@ BBLAYERS = " \\
> \${TOPDIR}/sources/meta-smartphone/meta-openmoko \\
> \${TOPDIR}/sources/meta-smartphone/meta-palm \\
> \${TOPDIR}/sources/meta-smartphone/meta-zaurus \\
> + \${TOPDIR}/sources/meta-smartphone/meta-shr \\
> + \${TOPDIR}/sources/meta-smartphone/meta-fso \\
> \${TOPDIR}/sources/meta-intel/meta-sugarbay \\
> \${TOPDIR}/sources/meta-intel/meta-crownbay \\
> \${TOPDIR}/sources/meta-intel/meta-emenlow \\
> diff --git a/sources/layers.txt b/sources/layers.txt
> index 45c68d2..0d96a70 100644
> --- a/sources/layers.txt
> +++ b/sources/layers.txt
> @@ -1,11 +1,10 @@
> # Name,repo-uri,branch,rev
> bitbake,git://git.openembedded.net/bitbake,master,HEAD
> -meta-angstrom,git://git.angstrom-distribution.org/meta-angstrom,master,HEAD
>
> -meta-openembedded,git://git.openembedded.net/meta-openembedded,master,HEAD
> +meta-openembedded,git://git.openembedded.net/meta-openembedded-contrib,shr,HEAD
>
> meta-texasinstruments,git://git.angstrom-distribution.org/meta-texasinstruments,master,HEAD
>
> meta-efikamx,git://github.com/kraj/meta-efikamx.git,master,HEAD
> meta-nslu2,git://github.com/kraj/meta-nslu2.git,master,HEAD
> meta-smartphone,http://git.shr-project.org/repo/meta-smartphone.git,master,HEAD
>
> meta-intel,git://git.yoctoproject.org/meta-intel,master,HEAD
> meta-xilinx,git://git.yoctoproject.org/meta-xilinx,master,HEAD
> -openembedded-core,https://github.com/openembedded/oe-core.git,master,HEAD
> +openembedded-core,git://git.openembedded.net/openembedded-core-contrib,shr,HEAD
>
>

I guess SHR needs a master projects on similar lines. Using angstrom 
scripts may not be the correct thing to do. Martin might already have 
something. But similar to angstrom scripts there is slugos master 
repository for layer management and configuration.

git://github.com/kraj/slugos-setup.git

I think distro's should have such a repo so they do not have conflict of 
interest and can do things without pinching others toes.

>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Martin Jansa - June 1, 2011, 5:01 a.m.
On Tue, May 31, 2011 at 07:27:44PM -0700, Khem Raj wrote:
> I guess SHR needs a master projects on similar lines. Using angstrom 
> scripts may not be the correct thing to do. Martin might already have 
> something. But similar to angstrom scripts there is slugos master 
> repository for layer management and configuration.
> 
> git://github.com/kraj/slugos-setup.git
> 
> I think distro's should have such a repo so they do not have conflict of 
> interest and can do things without pinching others toes.

Yes we have..
http://git.shr-project.org/git/?p=shr-makefile.git;a=summary
with shr-core (shr based on oe-core and other layers) support since
2011-03-02 :). But Lukas doesn't like Makefile for some reason..

Cheers,

Patch

diff --git a/conf/local.conf b/conf/local.conf
index a641121..69ac50e 100644
--- a/conf/local.conf
+++ b/conf/local.conf
@@ -19,7 +19,7 @@  IMAGE_FSTYPES += "tar.bz2"
  PARALLEL_MAKE     = "-j2"
  BB_NUMBER_THREADS = "2"

-DISTRO   = "angstrom-2010.x"
+DISTRO   = "shr"

  # Set terminal types by default it expects gnome-terminal
  # but we chose xterm
diff --git a/oebb.sh b/oebb.sh
index 43697ab..49afaa8 100755
--- a/oebb.sh
+++ b/oebb.sh
@@ -66,7 +66,7 @@  else
       
#--------------------------------------------------------------------------
      # Specify distribution information
       
#--------------------------------------------------------------------------
-    DISTRO="angstrom-2010.x"
+    DISTRO="shr"
      DISTRO_DIRNAME=`echo $DISTRO | sed s#[.-]#_#g`

      echo "export SCRIPTS_BASE_VERSION=${BASE_VERSION}" > ${OE_ENV_FILE}
@@ -253,7 +253,6 @@  BBFILES = ""
  # Add your overlay location to BBLAYERS
  # Make sure to have a conf/layers.conf in there
  BBLAYERS = " \\
-  \${TOPDIR}/sources/meta-angstrom \\
    \${TOPDIR}/sources/meta-openembedded/meta-oe \\
    \${TOPDIR}/sources/meta-openembedded/meta-efl \\
    \${TOPDIR}/sources/meta-openembedded/meta-gpe \\
@@ -266,6 +265,8 @@  BBLAYERS = " \\
    \${TOPDIR}/sources/meta-smartphone/meta-openmoko \\
    \${TOPDIR}/sources/meta-smartphone/meta-palm \\
    \${TOPDIR}/sources/meta-smartphone/meta-zaurus \\
+  \${TOPDIR}/sources/meta-smartphone/meta-shr \\
+  \${TOPDIR}/sources/meta-smartphone/meta-fso \\
    \${TOPDIR}/sources/meta-intel/meta-sugarbay \\
    \${TOPDIR}/sources/meta-intel/meta-crownbay \\
    \${TOPDIR}/sources/meta-intel/meta-emenlow \\
diff --git a/sources/layers.txt b/sources/layers.txt
index 45c68d2..0d96a70 100644
--- a/sources/layers.txt
+++ b/sources/layers.txt
@@ -1,11 +1,10 @@ 
  # Name,repo-uri,branch,rev
  bitbake,git://git.openembedded.net/bitbake,master,HEAD
-meta-angstrom,git://git.angstrom-distribution.org/meta-angstrom,master,HEAD
-meta-openembedded,git://git.openembedded.net/meta-openembedded,master,HEAD
+meta-openembedded,git://git.openembedded.net/meta-openembedded-contrib,shr,HEAD
   
meta-texasinstruments,git://git.angstrom-distribution.org/meta-texasinstruments,master,HEAD
  meta-efikamx,git://github.com/kraj/meta-efikamx.git,master,HEAD
  meta-nslu2,git://github.com/kraj/meta-nslu2.git,master,HEAD
   
meta-smartphone,http://git.shr-project.org/repo/meta-smartphone.git,master,HEAD
  meta-intel,git://git.yoctoproject.org/meta-intel,master,HEAD