This email list is read-only. Emails sent to this list will be discarded
----------------------------------
.gitignore | 3 ++
scripts/poky-env-internal | 64 +++++++++++++++++++++++++++++++-------------
2 files changed, 48 insertions(+), 19 deletions(-)
New commits:
commit 4a04f29527ca0371fb3364ec0e0242db092749c0
Author: Richard Purdie <[EMAIL PROTECTED]>
Date: Thu Nov 6 14:39:19 2008 +0000
.gitignore: Add extra entries
commit 9715260c3567510a97b8aaf6408a79e07930f21e
Author: Richard Purdie <[EMAIL PROTECTED]>
Date: Thu Nov 6 14:39:12 2008 +0000
scripts/poky-env-internal: Automatically add in additional meta-
repositories if found
Diff in this email is a maximum of 400 lines.
diff --git a/.gitignore b/.gitignore
index 0b13ee1..435bd0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,9 @@
*.pyc
build/conf/local.conf
build/tmp/
+scripts/poky-git-proxy-socks
sources/
meta-moblin-internal
*.swp
+*.orig
+*.rej
diff --git a/scripts/poky-env-internal b/scripts/poky-env-internal
index 81b1425..8655bb1 100755
--- a/scripts/poky-env-internal
+++ b/scripts/poky-env-internal
@@ -30,14 +30,47 @@ if [ "x$BDIR" = "x" ]; then
BDIR="$1"
fi
fi
-
-BBDIR="$OEROOT/bitbake$BBEXTRA/"
-PKGDIR="$OEROOT/meta/"
-PKGDIR_MOBLIN="$OEROOT/meta-moblin/"
BUILDDIR="$OEROOT/$BDIR/"
-MSG=''
-
unset BDIR
+BITBAKEDIR="$OEROOT/bitbake$BBEXTRA/"
+PKGDIR="$OEROOT/meta/"
+BBPATH="$BITBAKEDIR $PKGDIR"
+
+#
+# Add in any extra meta-* repositories to BBPATH
+#
+METAREPOS=`cd $OEROOT; find . -maxdepth 1 -name 'meta-*' -type d| sed -e
's#./##g'`
+for repo in $METAREPOS
+do
+ # meta-openmoko is disabled by default - see local.conf.sample to enable it
+ if [ $repo = "meta-openmoko" ]; then
+ continue
+ fi
+ # meta-extras is disabled by default - see local.conf.sample to enable it
+ if [ $repo = "meta-extras" ]; then
+ continue
+ fi
+ if [ -e $OEROOT/$repo/poky-extra-environment ]; then
+ . $OEROOT/$repo/poky-extra-environment
+ fi
+ BBPATH=" $BBPATH $OEROOT/$repo"
+done
+
+BBPATH="$BBPATH $HOME/.oe $HOME/.poky $BUILDDIR"
+
+#
+# Remove any symlinks from BBPATH
+#
+NEWPATH=""
+for p in $BBPATH
+do
+ p2=`readlink -f "$p"`
+ NEWPATH="$p2:$NEWPATH"
+done
+BBPATH="$NEWPATH"
+
+
+MSG=''
BUILD_ARCH=`uname -m`
BUILD_OS=`uname | tr '[A-Z]' '[a-z]'`
@@ -52,26 +85,19 @@ BBDIR=`readlink -f "$BBDIR"`
PKGDIR=`readlink -f "$PKGDIR"`
BUILDDIR=`readlink -f "$BUILDDIR"`
-if ! (test -d "$BBDIR" && test -d "$PKGDIR" && test -d "$BUILDDIR"); then
+if ! (test -d "$BITBAKEDIR" && test -d "$PKGDIR" && test -d "$BUILDDIR"); then
echo >&2 "Error: Not all directories exist! Did you run this script in
poky directory?"
return
fi
-if ! (test -r "$BUILDDIR/conf/local.conf"); then
- cp -f $BUILDDIR/conf/local.conf.sample $BUILDDIR/conf/local.conf
+if [ "x" = "x$POKYLOCALCONF" ]; then
+ POKYLOCALCONF="$BUILDDIR/conf/local.conf.sample"
fi
-BBPATH=$BBDIR
-if test x"$BBDIR" != x"$PKGDIR_MOBLIN"; then
- BBPATH=$PKGDIR_MOBLIN:$BBPATH
-fi
-if test x"$BBDIR" != x"$PKGDIR"; then
- BBPATH=$PKGDIR:$BBPATH
-fi
-BBPATH="`readlink -f $HOME/.oe`:`readlink -f $HOME/.poky`:$BBPATH"
-if test x"$PKGDIR" != x"$BUILDDIR"; then
- BBPATH=$BUILDDIR:$BBPATH
+if ! (test -r "$BUILDDIR/conf/local.conf"); then
+ cp -f $POKYLOCALCONF $BUILDDIR/conf/local.conf
fi
+
export BBPATH OEROOT BUILD_SYS BUILDDIR
# Kill off the TERMINFO variable, as glibc will grab its contents in its 'make
_______________________________________________
Commits mailing list
[email protected]
https://lists.moblin.org/mailman/listinfo/commits
