Module: setup-scripts
Branch: master
Commit: 8a9a1ad9bd5cacc4959404e99fb02757d314f6c3
Author: Koen Kooi <k...@dominion.thruhere.net>
Date: Thu Jan 27 10:01:02 2011 +0100
oebb: tweak layerman
Signed-off-by: Koen Kooi <k...@dominion.thruhere.net>
---
oebb.sh | 11 ++---------
scripts/layerman | 12 +++++++-----
sources/layers.txt | 1 +
3 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/oebb.sh b/oebb.sh
index 17a6b22..04c11ae 100755
--- a/oebb.sh
+++ b/oebb.sh
@@ -242,13 +242,6 @@ function update_oe()
echo "Updating OE submodule"
git submodule update --init ${OE_SOURCE_DIR}/openembedded
else
- if [ ! -d ${OE_SOURCE_DIR}/angstrom-layers ] ; then
- echo "Checking out angstrom layers"
- git clone
"git://gitorious.org/angstrom/angstrom-layers.git"
${OE_SOURCE_DIR}/angstrom-layers
- else
- echo "Updating angstrom-layers"
- cd ${OE_SOURCE_DIR}/angstrom-layers && git stash && git pull
--rebase && git stash pop
- fi
# manage meta-openembedded and meta-angstrom with layerman
${OE_BASE}/scripts/layers.awk ${OE_SOURCE_DIR}/layers.txt
@@ -328,8 +321,8 @@ BBFILES ?= ""
# Make sure to have a conf/layers.conf in there
BBLAYERS = " \\
${OE_SOURCE_DIR}/openembedded/meta \\
- ${OE_SOURCE_DIR}/layers/meta-angstrom \\
- ${OE_SOURCE_DIR}/layers/meta-openembedded \\
+ ${OE_SOURCE_DIR}/meta-angstrom \\
+ ${OE_SOURCE_DIR}/meta-openembedded \\
${OE_SOURCE_DIR}/angstrom-layers/BSP/TI \\
"
_EOF
diff --git a/scripts/layerman b/scripts/layerman
index e809841..0bce163 100755
--- a/scripts/layerman
+++ b/scripts/layerman
@@ -5,12 +5,14 @@ LAYERURI=$2
BRANCH=$3
REV=$4
-if ! [ -e ${OE_SOURCE_DIR}/layers/${LAYERNAME} ] ; then
- echo "Layer checkout missing at ${OE_SOURCE_DIR}/layers/${LAYERNAME},
creating one"
- git clone ${LAYERURI} ${OE_SOURCE_DIR}/layers/${LAYERNAME}
+LAYERDIR="${OE_SOURCE_DIR}/${LAYERNAME}"
+
+if ! [ -e ${LAYERDIR} ] ; then
+ echo "Layer checkout missing at ${LAYERDIR}, creating one"
+ git clone ${LAYERURI} ${LAYERDIR}
if [ "${BRANCH}" != "master" ] ; then
- cd ${OE_SOURCE_DIR}/layers/${LAYERNAME} && git checkout
origin/${BRANCH} -b ${BRANCH}
+ cd ${LAYERDIR} && git checkout origin/${BRANCH} -b ${BRANCH}
fi
if [ "${REV}" != "HEAD" ] ; then
@@ -18,7 +20,7 @@ if ! [ -e ${OE_SOURCE_DIR}/layers/${LAYERNAME} ] ; then
fi
else
if [ "${REV}" = "HEAD" ] ; then
- cd ${OE_SOURCE_DIR}/layers/${LAYERNAME} && echo "Updating layer
at layers/${LAYERNAME}" && git stash && git pull --rebase && git stash apply
+ cd ${LAYERDIR} && echo "Updating layer at layers/${LAYERNAME}"
&& git stash && git pull --rebase && git stash apply
fi
echo ""
fi
diff --git a/sources/layers.txt b/sources/layers.txt
index a5a67aa..a5c1bd2 100644
--- a/sources/layers.txt
+++ b/sources/layers.txt
@@ -1,4 +1,5 @@
# Name,repo-uri,branch,rev
+openembedded,git://git.pokylinux.org/poky,master,HEAD
meta-angstrom,http://git.gitorious.org/angstrom/meta-angstrom.git,master,HEAD
meta-openembedded,git://git.openembedded.net/meta-openembedded,master,HEAD
angstrom-layers,http://git.gitorious.org/angstrom/angstrom-layers.git,master,HEAD
_______________________________________________
Angstrom-distro-devel mailing list
Angstrom-distro-devel@linuxtogo.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel
