Skip to content

Commit

Permalink
Merge pull request #188 from jean-edouard/stable-6-submodules
Browse files Browse the repository at this point in the history
STABLE-6: Add git submodules to be compatible with the new build scripts
  • Loading branch information
rossphilipson authored Sep 29, 2016
2 parents 6a34c92 + 917b8d6 commit caeeb5e
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 3 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ build/manifest
build/oe
build/oeenv
build/pseudodone
build/repos
build/cache
build/sstate-cache
build/tmp-glibc
Expand Down
20 changes: 20 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
[submodule "build/repos/openembedded-core"]
path = build/repos/openembedded-core
url = git://git.openembedded.org/openembedded-core
update = none
[submodule "build/repos/bitbake"]
path = build/repos/bitbake
url = git://git.openembedded.org/bitbake.git
branch = 1.28
[submodule "build/repos/meta-openembedded"]
path = build/repos/meta-openembedded
url = git://git.openembedded.org/meta-openembedded
update = none
[submodule "build/repos/meta-java"]
path = build/repos/meta-java
url = git://git.yoctoproject.org/meta-java
update = none
[submodule "build/repos/meta-selinux"]
path = build/repos/meta-selinux
url = git://git.yoctoproject.org/meta-selinux
update = none
1 change: 1 addition & 0 deletions build/repos/bitbake
Submodule bitbake added at b993d9
1 change: 1 addition & 0 deletions build/repos/meta-java
Submodule meta-java added at a73939
1 change: 1 addition & 0 deletions build/repos/meta-openembedded
Submodule meta-openembedded added at 8ab04a
1 change: 1 addition & 0 deletions build/repos/meta-selinux
Submodule meta-selinux added at 4c75d9
1 change: 1 addition & 0 deletions build/repos/openembedded-core
Submodule openembedded-core added at 1f4bfa
4 changes: 2 additions & 2 deletions setup_build-next.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ process_git_repo() {
local repo="$2"
local branch="$3"

if [ ! -d $path ]; then
# The path does not exist. Proceed.
if [ ! -d $path ] || [ -z "`ls -A $path`" ]; then
# The path does not exist or is empty. Proceed.
fetch_git_repo $path $repo $branch
checkout_git_branch $path $branch
fi
Expand Down

0 comments on commit caeeb5e

Please sign in to comment.