Merge pull request #69 from kraj/kraj/master

Add layer manipulation commands to envsetup

README.md

@@ -67,7 +67,7 @@ Using
 This is where all the magic happens.  In general, this build system
 must be run in a bash shell.  To set up the environment, source the following file:
 
-. envsetup.sh
+. ./envsetup.sh
 
 This file will create a bunch of functions in the environment
 prefixed with oe\_ that can be executed.  Type oe\_ <tab><tab>
@@ -93,13 +93,15 @@ directory specific variables based on the build system location.
 
 ### adding a new layer
 
-*  git submodule add <git URI> sources/meta-mylayer
-*  add layer to conf/bblayers.conf
+*  Adding rocko branch of meta-altera layer to layer mix
+
+oe_add_layer https://github.com/kraj/meta-altera rocko
 
 ### removing a new layer
 
-*  git rm sources/meta-mylayer
-*  remove layer from conf/bblayers.conf
+*  Remove meta-altera
+
+oe_remove_layer meta-altera
 
 ### customizing settings
 

envsetup.sh

@@ -297,6 +297,43 @@ function oe_search_text() {
   cd -
 }
 
+function oe_add_layer() {
+  if test -z $1; then
+    echo "Usage:  oe_add_layer <url> [<branch>]"
+    return
+  fi
+  cd $OE_BASE
+  if [ -z "$2" ]; then
+    br="master"
+  else
+    br="$2"
+  fi
+  n=`echo $1 | awk -F "[/:]" '{ print $NF }'`
+  if [[ -e sources/$n && ! -e sources/$n/.git ]]; then
+    echo "'sources/$n' already exists and is not a valid git repo"
+    return
+  fi
+  git submodule add -b $br -f $1 sources/$n
+  git submodule init sources/$n
+  bitbake-layers add-layer sources/$n && sed -i -e "s|$OE_BASE|\${TOPDIR}|" conf/bblayers.conf
+  echo "please commit with - git add conf/bblayers.conf && git commit -s -m'Added module $n'"
+}
+
+function oe_remove_layer() {
+  if test -z $1; then
+    echo "Usage:  oe_remove_layer <layer-name>"
+    return
+  fi
+  cd $OE_BASE
+  m=sources/$1
+  bitbake-layers remove-layer $1
+  git submodule deinit -f $m
+  git rm -r -f $m
+  echo "please commit with - git add conf/bblayers.conf && git commit -s -m'Added module $n'"
+  rm -rf .git/modules/$m
+  #rm -rf $m
+}
+
 function oe_console() {
   # requires serial->usb device be mapped to /dev/ttyUSB_<machine name>
   # see http://bec-systems.com/site/1004/perisistent-device-names-usb-serial-ports

imx6ul-var-dart-envsetup.sh

@@ -1,6 +1,3 @@
-export MACHINE=imx6ul-var-dart
-export MACHINE_SHORT=dart
-
 . envsetup.sh
 
 function oe_partition_sd_mx6() {

minnowboard-max-envsetup.sh

@@ -1,4 +1,4 @@
-# TODO add MACHINE export
+. envsetup.sh
 
 # Minnowboard max functions
 function oe_partition_sd_mbm() {

overo-envsetup.sh

@@ -1,5 +1,3 @@
-export MACHINE=overo
-
 . envsetup.sh
 
 function oe_partition_sd() {

qemuriscv64-envsetup.sh

@@ -0,0 +1 @@
+envsetup.sh