Skip to contentSkip to conversation

poky-master: Update poky master builds

PATCH New Ryan Eatmon 1 participant 2 messages Jun 1

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 poky-master: Update poky master builds

A few changes:

- Drop meta-clang since it was merged into oe-core
- Move meta-arago-test to meta-ti-test
- Drop meta-arago since this is a poky build

---
 bitbake-setup/poky-master-config.conf.json     | 13 +------------
 bitbake-setup/poky-master-wip-config.conf.json | 13 +------------
 configs/poky-master-config.txt                 |  4 +---
 configs/poky-master-wip-config.txt             |  4 +---
 kas/poky-master-config.yml                     | 10 ++--------
 kas/poky-master-wip-config.yml                 | 10 ++--------
 src/configs/poky-master-config.xml             | 11 ++---------
 src/configs/poky-master-wip-config.xml         | 11 ++---------
 8 files changed, 12 insertions(+), 64 deletions(-)
bitbake-setup/poky-master-config.conf.json +1 -12
index f01ca8e..4726117 100644
@@ -67,17 +67,6 @@
         "rev": "master"
       },
       "path": "oe-core"
-    },
-    "meta-arago": {
-      "git-remote": {
-        "remotes": {
-          "origin": {
-            "uri": "https://git.yoctoproject.org/meta-arago"
-          }
-        },
-        "rev": "master"
-      },
-      "path": "meta-arago"
     }
   },
   "bitbake-setup": {
@@ -85,7 +74,7 @@
       {
         "name": "poky",
         "description": "Yocto Project Poky reference distro build",
-        "bb-layers": [ "meta-yocto/meta-poky","meta-yocto/meta-yocto-bsp","meta-ti/meta-ti-extras","meta-ti/meta-ti-bsp","meta-arm/meta-arm","meta-arm/meta-arm-toolchain","oe-core/meta","meta-arago/meta-arago-extras","meta-arago/meta-arago-test","oe-layersetup" ],
+        "bb-layers": [ "meta-yocto/meta-poky","meta-yocto/meta-yocto-bsp","meta-ti/meta-ti-test","meta-ti/meta-ti-extras","meta-ti/meta-beagle","meta-ti/meta-ti-bsp","meta-arm/meta-arm","meta-arm/meta-arm-toolchain","oe-core/meta","oe-layersetup" ],
         "oe-fragments": [ "oe-layersetup/localconf/local-poky-v3" ],
         "oe-fragments-one-of": {
           "machine": {
bitbake-setup/poky-master-wip-config.conf.json +1 -12
index 53a3df3..b949b3f 100644
@@ -67,17 +67,6 @@
         "rev": "master"
       },
       "path": "oe-core"
-    },
-    "meta-arago": {
-      "git-remote": {
-        "remotes": {
-          "origin": {
-            "uri": "https://git.yoctoproject.org/meta-arago"
-          }
-        },
-        "rev": "master-wip"
-      },
-      "path": "meta-arago"
     }
   },
   "bitbake-setup": {
@@ -85,7 +74,7 @@
       {
         "name": "poky",
         "description": "Yocto Project Poky reference distro build",
-        "bb-layers": [ "meta-yocto/meta-poky","meta-yocto/meta-yocto-bsp","meta-ti/meta-ti-extras","meta-ti/meta-ti-bsp","meta-arm/meta-arm","meta-arm/meta-arm-toolchain","oe-core/meta","meta-arago/meta-arago-extras","meta-arago/meta-arago-test","oe-layersetup" ],
+        "bb-layers": [ "meta-yocto/meta-poky","meta-yocto/meta-yocto-bsp","meta-ti/meta-ti-test","meta-ti/meta-ti-extras","meta-ti/meta-beagle","meta-ti/meta-ti-bsp","meta-arm/meta-arm","meta-arm/meta-arm-toolchain","oe-core/meta","oe-layersetup" ],
         "oe-fragments": [ "oe-layersetup/localconf/local-poky-v3" ],
         "oe-fragments-one-of": {
           "machine": {
configs/poky-master-config.txt +1 -3
index 307d79d..45639a7 100644
@@ -3,11 +3,9 @@
 
 bitbake,https://git.openembedded.org/bitbake,master,HEAD
 meta-yocto,https://git.yoctoproject.org/meta-yocto,master,HEAD,layers=meta-poky:meta-yocto-bsp
-meta-ti,https://git.yoctoproject.org/meta-ti,master,HEAD,layers=meta-ti-extras:meta-ti-bsp
+meta-ti,https://git.yoctoproject.org/meta-ti,master,HEAD,layers=meta-ti-test:meta-ti-extras:meta-beagle:meta-ti-bsp
 meta-arm,https://git.yoctoproject.org/meta-arm,master,HEAD,layers=meta-arm:meta-arm-toolchain
-#meta-clang,https://github.com/kraj/meta-clang,master,HEAD,layers=
 oe-core,https://git.openembedded.org/openembedded-core,master,HEAD,layers=meta
-meta-arago,https://git.yoctoproject.org/meta-arago,master,HEAD,layers=meta-arago-extras:meta-arago-test
 
 OECORELAYERCONF=./sample-files/bblayers.conf.sample
 OECORELOCALCONF=./sample-files/local-poky-v3.conf.sample
configs/poky-master-wip-config.txt +1 -3
index 6602ce8..0a14f48 100644
@@ -3,11 +3,9 @@
 
 bitbake,https://git.openembedded.org/bitbake,master,HEAD
 meta-yocto,https://git.yoctoproject.org/meta-yocto,master,HEAD,layers=meta-poky:meta-yocto-bsp
-meta-ti,https://git.yoctoproject.org/meta-ti,master-wip,HEAD,layers=meta-ti-extras:meta-ti-bsp
+meta-ti,https://git.yoctoproject.org/meta-ti,master-wip,HEAD,layers=meta-ti-test:meta-ti-extras:meta-beagle:meta-ti-bsp
 meta-arm,https://git.yoctoproject.org/meta-arm,master,HEAD,layers=meta-arm:meta-arm-toolchain
-#meta-clang,https://github.com/kraj/meta-clang,master,HEAD,layers=
 oe-core,https://git.openembedded.org/openembedded-core,master,HEAD,layers=meta
-meta-arago,https://git.yoctoproject.org/meta-arago,master-wip,HEAD,layers=meta-arago-extras:meta-arago-test
 
 OECORELAYERCONF=./sample-files/bblayers.conf.sample
 OECORELOCALCONF=./sample-files/local-poky-v3.conf.sample
kas/poky-master-config.yml +2 -8
index 7d66844..1b8035c 100644
@@ -28,7 +28,9 @@ repos:
     branch: "master"
     path: "sources/meta-ti"
     layers:
+      meta-ti-test:
       meta-ti-extras:
+      meta-beagle:
       meta-ti-bsp:
 
   meta-arm:
@@ -45,11 +47,3 @@ repos:
     path: "sources/oe-core"
     layers:
       meta:
-
-  meta-arago:
-    url: "https://git.yoctoproject.org/meta-arago"
-    branch: "master"
-    path: "sources/meta-arago"
-    layers:
-      meta-arago-extras:
-      meta-arago-test:
kas/poky-master-wip-config.yml +2 -8
index 7a92b90..ede97d9 100644
@@ -28,7 +28,9 @@ repos:
     branch: "master-wip"
     path: "sources/meta-ti"
     layers:
+      meta-ti-test:
       meta-ti-extras:
+      meta-beagle:
       meta-ti-bsp:
 
   meta-arm:
@@ -45,11 +47,3 @@ repos:
     path: "sources/oe-core"
     layers:
       meta:
-
-  meta-arago:
-    url: "https://git.yoctoproject.org/meta-arago"
-    branch: "master-wip"
-    path: "sources/meta-arago"
-    layers:
-      meta-arago-extras:
-      meta-arago-test:
src/configs/poky-master-config.xml +2 -9
index f8fff75..8562f36 100644
@@ -18,7 +18,9 @@
         </repo>
         <repo name='meta-ti' url='https://git.yoctoproject.org/meta-ti' branch='master' commit='HEAD'>
             <layers>
+                <layer>meta-ti-test</layer>
                 <layer>meta-ti-extras</layer>
+                <layer>meta-beagle</layer>
                 <layer>meta-ti-bsp</layer>
             </layers>
         </repo>
@@ -28,20 +30,11 @@
                 <layer>meta-arm-toolchain</layer>
             </layers>
         </repo>
-        <repo name='meta-clang' url='https://github.com/kraj/meta-clang' branch='master' commit='HEAD' disabled='true'>
-            <layers/>
-        </repo>
         <repo name='oe-core' url='https://git.openembedded.org/openembedded-core' branch='master' commit='HEAD'>
             <layers>
                 <layer>meta</layer>
             </layers>
         </repo>
-        <repo name='meta-arago' url='https://git.yoctoproject.org/meta-arago' branch='master' commit='HEAD'>
-            <layers>
-                <layer>meta-arago-extras</layer>
-                <layer>meta-arago-test</layer>
-            </layers>
-        </repo>
     </repos>
 
     <tools>
src/configs/poky-master-wip-config.xml +2 -9
index 82375a6..9e4d6c0 100644
@@ -18,7 +18,9 @@
         </repo>
         <repo name='meta-ti' url='https://git.yoctoproject.org/meta-ti' branch='master-wip' commit='HEAD'>
             <layers>
+                <layer>meta-ti-test</layer>
                 <layer>meta-ti-extras</layer>
+                <layer>meta-beagle</layer>
                 <layer>meta-ti-bsp</layer>
             </layers>
         </repo>
@@ -28,20 +30,11 @@
                 <layer>meta-arm-toolchain</layer>
             </layers>
         </repo>
-        <repo name='meta-clang' url='https://github.com/kraj/meta-clang' branch='master' commit='HEAD' disabled='true'>
-            <layers/>
-        </repo>
         <repo name='oe-core' url='https://git.openembedded.org/openembedded-core' branch='master' commit='HEAD'>
             <layers>
                 <layer>meta</layer>
             </layers>
         </repo>
-        <repo name='meta-arago' url='https://git.yoctoproject.org/meta-arago' branch='master-wip' commit='HEAD'>
-            <layers>
-                <layer>meta-arago-extras</layer>
-                <layer>meta-arago-test</layer>
-            </layers>
-        </repo>
     </repos>
 
     <tools>
Signature · 1 line
2.43.0
#1 lore raw

PATCH 2/2 poky-wrynose: Add poky-wrynose configs

Add the various poky-wrynose configs to support building poky with meta-ti.

---
 ...onfig.conf.json => poky-wrynose-config.conf.json} | 10 +++++-----
 ...g.conf.json => poky-wrynose-wip-config.conf.json} | 10 +++++-----
 configs/poky-wrynose-config.txt                      | 12 ++++++++++++
 configs/poky-wrynose-wip-config.txt                  | 12 ++++++++++++
 ...oky-master-config.yml => poky-wrynose-config.yml} | 10 +++++-----
 ...master-config.yml => poky-wrynose-wip-config.yml} | 10 +++++-----
 ...oky-master-config.xml => poky-wrynose-config.xml} | 10 +++++-----
 ...er-wip-config.xml => poky-wrynose-wip-config.xml} | 10 +++++-----
 8 files changed, 54 insertions(+), 30 deletions(-)
 copy bitbake-setup/{poky-master-config.conf.json => poky-wrynose-config.conf.json} (96%)
 copy bitbake-setup/{poky-master-wip-config.conf.json => poky-wrynose-wip-config.conf.json} (95%)
 create mode 100644 configs/poky-wrynose-config.txt
 create mode 100644 configs/poky-wrynose-wip-config.txt
 copy kas/{poky-master-config.yml => poky-wrynose-config.yml} (89%)
 copy kas/{poky-master-config.yml => poky-wrynose-wip-config.yml} (88%)
 copy src/configs/{poky-master-config.xml => poky-wrynose-config.xml} (88%)
 copy src/configs/{poky-master-wip-config.xml => poky-wrynose-wip-config.xml} (88%)
bitbake-setup/poky-wrynose-config.conf.json renamed from bitbake-setup/poky-master-config.conf.json +5 -5
similarity index 96%
copy from bitbake-setup/poky-master-config.conf.json
copy to bitbake-setup/poky-wrynose-config.conf.json
index 4726117..80c5557 100644
@@ -20,7 +20,7 @@
             "uri": "https://git.openembedded.org/bitbake"
           }
         },
-        "rev": "master"
+        "rev": "2.18"
       },
       "path": "bitbake"
     },
@@ -31,7 +31,7 @@
             "uri": "https://git.yoctoproject.org/meta-yocto"
           }
         },
-        "rev": "master"
+        "rev": "wrynose"
       },
       "path": "meta-yocto"
     },
@@ -42,7 +42,7 @@
             "uri": "https://git.yoctoproject.org/meta-ti"
           }
         },
-        "rev": "master"
+        "rev": "wrynose"
       },
       "path": "meta-ti"
     },
@@ -53,7 +53,7 @@
             "uri": "https://git.yoctoproject.org/meta-arm"
           }
         },
-        "rev": "master"
+        "rev": "wrynose"
       },
       "path": "meta-arm"
     },
@@ -64,7 +64,7 @@
             "uri": "https://git.openembedded.org/openembedded-core"
           }
         },
-        "rev": "master"
+        "rev": "wrynose"
       },
       "path": "oe-core"
     }
bitbake-setup/poky-wrynose-wip-config.conf.json renamed from bitbake-setup/poky-master-wip-config.conf.json +5 -5
similarity index 95%
copy from bitbake-setup/poky-master-wip-config.conf.json
copy to bitbake-setup/poky-wrynose-wip-config.conf.json
index b949b3f..6906490 100644
@@ -20,7 +20,7 @@
             "uri": "https://git.openembedded.org/bitbake"
           }
         },
-        "rev": "master"
+        "rev": "2.18"
       },
       "path": "bitbake"
     },
@@ -31,7 +31,7 @@
             "uri": "https://git.yoctoproject.org/meta-yocto"
           }
         },
-        "rev": "master"
+        "rev": "wrynose"
       },
       "path": "meta-yocto"
     },
@@ -42,7 +42,7 @@
             "uri": "https://git.yoctoproject.org/meta-ti"
           }
         },
-        "rev": "master-wip"
+        "rev": "wrynose-wip"
       },
       "path": "meta-ti"
     },
@@ -53,7 +53,7 @@
             "uri": "https://git.yoctoproject.org/meta-arm"
           }
         },
-        "rev": "master"
+        "rev": "wrynose"
       },
       "path": "meta-arm"
     },
@@ -64,7 +64,7 @@
             "uri": "https://git.openembedded.org/openembedded-core"
           }
         },
-        "rev": "master"
+        "rev": "wrynose"
       },
       "path": "oe-core"
     }
configs/poky-wrynose-config.txt new file +12 -0
new file mode 100644
index 0000000..50d7a79
@@ -0,0 +1,12 @@
+# This file takes repo entries in the format
+# repo name,repo uri,repo branch,repo commit[,layers=layer1:layer2...:layern]
+
+bitbake,https://git.openembedded.org/bitbake,2.18,HEAD
+meta-yocto,https://git.yoctoproject.org/meta-yocto,wrynose,HEAD,layers=meta-poky:meta-yocto-bsp
+meta-ti,https://git.yoctoproject.org/meta-ti,wrynose,HEAD,layers=meta-ti-test:meta-ti-extras:meta-beagle:meta-ti-bsp
+meta-arm,https://git.yoctoproject.org/meta-arm,wrynose,HEAD,layers=meta-arm:meta-arm-toolchain
+oe-core,https://git.openembedded.org/openembedded-core,wrynose,HEAD,layers=meta
+
+OECORELAYERCONF=./sample-files/bblayers.conf.sample
+OECORELOCALCONF=./sample-files/local-poky-v3.conf.sample
+BITBAKE_INCLUSIVE_VARS=yes
configs/poky-wrynose-wip-config.txt new file +12 -0
new file mode 100644
index 0000000..c541fb2
@@ -0,0 +1,12 @@
+# This file takes repo entries in the format
+# repo name,repo uri,repo branch,repo commit[,layers=layer1:layer2...:layern]
+
+bitbake,https://git.openembedded.org/bitbake,2.18,HEAD
+meta-yocto,https://git.yoctoproject.org/meta-yocto,wrynose,HEAD,layers=meta-poky:meta-yocto-bsp
+meta-ti,https://git.yoctoproject.org/meta-ti,wrynose-wip,HEAD,layers=meta-ti-test:meta-ti-extras:meta-beagle:meta-ti-bsp
+meta-arm,https://git.yoctoproject.org/meta-arm,wrynose,HEAD,layers=meta-arm:meta-arm-toolchain
+oe-core,https://git.openembedded.org/openembedded-core,wrynose,HEAD,layers=meta
+
+OECORELAYERCONF=./sample-files/bblayers.conf.sample
+OECORELOCALCONF=./sample-files/local-poky-v3.conf.sample
+BITBAKE_INCLUSIVE_VARS=yes
kas/poky-wrynose-config.yml renamed from kas/poky-master-config.yml +5 -5
similarity index 89%
copy from kas/poky-master-config.yml
copy to kas/poky-wrynose-config.yml
index 1b8035c..34577f3 100644
@@ -10,14 +10,14 @@ target: core_image_minimal
 repos:
   bitbake:
     url: "https://git.openembedded.org/bitbake"
-    branch: "master"
+    branch: "2.18"
     path: "sources/bitbake"
     layers:
       .: disabled
 
   meta-yocto:
     url: "https://git.yoctoproject.org/meta-yocto"
-    branch: "master"
+    branch: "wrynose"
     path: "sources/meta-yocto"
     layers:
       meta-poky:
@@ -25,7 +25,7 @@ repos:
 
   meta-ti:
     url: "https://git.yoctoproject.org/meta-ti"
-    branch: "master"
+    branch: "wrynose"
     path: "sources/meta-ti"
     layers:
       meta-ti-test:
@@ -35,7 +35,7 @@ repos:
 
   meta-arm:
     url: "https://git.yoctoproject.org/meta-arm"
-    branch: "master"
+    branch: "wrynose"
     path: "sources/meta-arm"
     layers:
       meta-arm:
@@ -43,7 +43,7 @@ repos:
 
   oe-core:
     url: "https://git.openembedded.org/openembedded-core"
-    branch: "master"
+    branch: "wrynose"
     path: "sources/oe-core"
     layers:
       meta:
kas/poky-wrynose-wip-config.yml renamed from kas/poky-master-config.yml +5 -5
similarity index 88%
copy from kas/poky-master-config.yml
copy to kas/poky-wrynose-wip-config.yml
index 1b8035c..e023e9f 100644
@@ -10,14 +10,14 @@ target: core_image_minimal
 repos:
   bitbake:
     url: "https://git.openembedded.org/bitbake"
-    branch: "master"
+    branch: "2.18"
     path: "sources/bitbake"
     layers:
       .: disabled
 
   meta-yocto:
     url: "https://git.yoctoproject.org/meta-yocto"
-    branch: "master"
+    branch: "wrynose"
     path: "sources/meta-yocto"
     layers:
       meta-poky:
@@ -25,7 +25,7 @@ repos:
 
   meta-ti:
     url: "https://git.yoctoproject.org/meta-ti"
-    branch: "master"
+    branch: "wrynose-wip"
     path: "sources/meta-ti"
     layers:
       meta-ti-test:
@@ -35,7 +35,7 @@ repos:
 
   meta-arm:
     url: "https://git.yoctoproject.org/meta-arm"
-    branch: "master"
+    branch: "wrynose"
     path: "sources/meta-arm"
     layers:
       meta-arm:
@@ -43,7 +43,7 @@ repos:
 
   oe-core:
     url: "https://git.openembedded.org/openembedded-core"
-    branch: "master"
+    branch: "wrynose"
     path: "sources/oe-core"
     layers:
       meta:
src/configs/poky-wrynose-config.xml renamed from src/configs/poky-master-config.xml +5 -5
similarity index 88%
copy from src/configs/poky-master-config.xml
copy to src/configs/poky-wrynose-config.xml
index 8562f36..3a0a19f 100644
@@ -7,16 +7,16 @@
     <xi:include href='../templates/bblayers.conf.xml' xmlns:xi='http://www.w3.org/2001/XInclude'/>
     <xi:include href='../templates/local-poky-v3.conf.xml' xmlns:xi='http://www.w3.org/2001/XInclude'/>
 
-    <bitbake url='https://git.openembedded.org/bitbake' branch='master' commit='HEAD'/>
+    <bitbake url='https://git.openembedded.org/bitbake' branch='2.18' commit='HEAD'/>
 
     <repos>
-        <repo name='meta-yocto' url='https://git.yoctoproject.org/meta-yocto' branch='master' commit='HEAD'>
+        <repo name='meta-yocto' url='https://git.yoctoproject.org/meta-yocto' branch='wrynose' commit='HEAD'>
             <layers>
                 <layer>meta-poky</layer>
                 <layer>meta-yocto-bsp</layer>
             </layers>
         </repo>
-        <repo name='meta-ti' url='https://git.yoctoproject.org/meta-ti' branch='master' commit='HEAD'>
+        <repo name='meta-ti' url='https://git.yoctoproject.org/meta-ti' branch='wrynose' commit='HEAD'>
             <layers>
                 <layer>meta-ti-test</layer>
                 <layer>meta-ti-extras</layer>
@@ -24,13 +24,13 @@
                 <layer>meta-ti-bsp</layer>
             </layers>
         </repo>
-        <repo name='meta-arm' url='https://git.yoctoproject.org/meta-arm' branch='master' commit='HEAD'>
+        <repo name='meta-arm' url='https://git.yoctoproject.org/meta-arm' branch='wrynose' commit='HEAD'>
             <layers>
                 <layer>meta-arm</layer>
                 <layer>meta-arm-toolchain</layer>
             </layers>
         </repo>
-        <repo name='oe-core' url='https://git.openembedded.org/openembedded-core' branch='master' commit='HEAD'>
+        <repo name='oe-core' url='https://git.openembedded.org/openembedded-core' branch='wrynose' commit='HEAD'>
             <layers>
                 <layer>meta</layer>
             </layers>
src/configs/poky-wrynose-wip-config.xml renamed from src/configs/poky-master-wip-config.xml +5 -5
similarity index 88%
copy from src/configs/poky-master-wip-config.xml
copy to src/configs/poky-wrynose-wip-config.xml
index 9e4d6c0..4e2d9f1 100644
@@ -7,16 +7,16 @@
     <xi:include href='../templates/bblayers.conf.xml' xmlns:xi='http://www.w3.org/2001/XInclude'/>
     <xi:include href='../templates/local-poky-v3.conf.xml' xmlns:xi='http://www.w3.org/2001/XInclude'/>
 
-    <bitbake url='https://git.openembedded.org/bitbake' branch='master' commit='HEAD'/>
+    <bitbake url='https://git.openembedded.org/bitbake' branch='2.18' commit='HEAD'/>
 
     <repos>
-        <repo name='meta-yocto' url='https://git.yoctoproject.org/meta-yocto' branch='master' commit='HEAD'>
+        <repo name='meta-yocto' url='https://git.yoctoproject.org/meta-yocto' branch='wrynose' commit='HEAD'>
             <layers>
                 <layer>meta-poky</layer>
                 <layer>meta-yocto-bsp</layer>
             </layers>
         </repo>
-        <repo name='meta-ti' url='https://git.yoctoproject.org/meta-ti' branch='master-wip' commit='HEAD'>
+        <repo name='meta-ti' url='https://git.yoctoproject.org/meta-ti' branch='wrynose-wip' commit='HEAD'>
             <layers>
                 <layer>meta-ti-test</layer>
                 <layer>meta-ti-extras</layer>
@@ -24,13 +24,13 @@
                 <layer>meta-ti-bsp</layer>
             </layers>
         </repo>
-        <repo name='meta-arm' url='https://git.yoctoproject.org/meta-arm' branch='master' commit='HEAD'>
+        <repo name='meta-arm' url='https://git.yoctoproject.org/meta-arm' branch='wrynose' commit='HEAD'>
             <layers>
                 <layer>meta-arm</layer>
                 <layer>meta-arm-toolchain</layer>
             </layers>
         </repo>
-        <repo name='oe-core' url='https://git.openembedded.org/openembedded-core' branch='master' commit='HEAD'>
+        <repo name='oe-core' url='https://git.openembedded.org/openembedded-core' branch='wrynose' commit='HEAD'>
             <layers>
                 <layer>meta</layer>
             </layers>
Signature · 1 line
2.43.0