* added a conf/aurora directory with its config files
* added a setup-aurora target on the same scheme as setup-shr-core
* fetch openembedded-core meta-openembedded and meta-smartphone in OE
instead of in shr-core/
in order to mutualise it with aurora build and
in order to avoid adding pseudo duplicated targets in this
Makefile,i.e adding a new target but trying to not weigh it down.
* added links in shr-core pointing to openembedded-core
meta-openembedded and meta-smartphone to balance previous change
Note: this new target is based of the fact taht Aurora will uses the same
branche than shr-core for openembedded-core meta-openembedded which has still
not been validated by Simon
Signed-off-by: Sylvain 'GarthPS' Paré <[email protected]>
---
Makefile | 97 ++++++++++++++++++++++++++----------------
conf/aurora/auto.conf | 5 ++
conf/aurora/bblayers.conf | 17 +++++++
conf/aurora/local-builds.inc | 3 +
conf/aurora/local.conf | 23 ++++++++++
conf/aurora/site.conf | 70 ++++++++++++++++++++++++++++++
6 files changed, 178 insertions(+), 37 deletions(-)
create mode 100644 conf/aurora/auto.conf
create mode 100644 conf/aurora/bblayers.conf
create mode 100644 conf/aurora/local-builds.inc
create mode 100644 conf/aurora/local.conf
create mode 100644 conf/aurora/site.conf
diff --git a/Makefile b/Makefile
index bbe9ba7..66d6bb4 100644
--- a/Makefile
+++ b/Makefile
@@ -35,9 +35,9 @@ update:
# [ ! -e ../.git/config-64bit ] || ${MAKE} update-shr-chroot
[ ! -e common ] || ${MAKE} update-common
[ ! -e openembedded ] || ${MAKE} update-openembedded
- [ ! -e shr-core/openembedded-core ] || ${MAKE}
update-shr-core-openembedded-core
- [ ! -e shr-core/meta-openembedded ] || ${MAKE}
update-shr-core-meta-openembedded
- [ ! -e shr-core/meta-smartphone ] || ${MAKE}
update-shr-core-meta-smartphone
+ [ ! -e openembedded-core ] || ${MAKE} update-openembedded-core
+ [ ! -e meta-openembedded ] || ${MAKE} update-meta-openembedded
+ [ ! -e meta-smartphone ] || ${MAKE} update-meta-smartphone
[ ! -e shr-unstable ] || ${MAKE} update-shr-unstable
[ ! -e shr-testing ] || ${MAKE} update-shr-testing
[ ! -e bitbake ] || ${MAKE} update-bitbake
@@ -114,38 +114,38 @@ setup-openembedded openembedded/.git/config:
git checkout --no-track -b ${BRANCH_OE} origin/${BRANCH_OE} )
touch openembedded/.git/config
-.PHONY: setup-shr-core-openembedded-core
-.PRECIOUS: shr-core/openembedded-core/.git/config
-setup-shr-core-openembedded-core shr-core/openembedded-core/.git/config:
- [ -e shr-core/openembedded-core/.git/config ] || \
+.PHONY: setup-openembedded-core
+.PRECIOUS: openembedded-core/.git/config
+setup-openembedded-core openembedded-core/.git/config:
+ [ -e openembedded-core/.git/config ] || \
( echo "setting up openembedded-core"; \
- git clone ${URL_OE_CORE} shr-core/openembedded-core )
- ( cd shr-core/openembedded-core && \
+ git clone ${URL_OE_CORE} openembedded-core )
+ ( cd openembedded-core && \
git checkout ${BRANCH_OE_CORE} 2>/dev/null || \
git checkout --no-track -b ${BRANCH_OE_CORE} origin/${BRANCH_OE_CORE}
)
- touch shr-core/openembedded-core/.git/config
+ touch openembedded-core/.git/config
-.PHONY: setup-shr-core-meta-openembedded
-.PRECIOUS: shr-core/meta-openembedded/.git/config
-setup-shr-core-meta-openembedded shr-core/meta-openembedded/.git/config:
- [ -e shr-core/meta-openembedded/.git/config ] || \
+.PHONY: setup-meta-openembedded
+.PRECIOUS: meta-openembedded/.git/config
+setup-meta-openembedded meta-openembedded/.git/config:
+ [ -e meta-openembedded/.git/config ] || \
( echo "setting up meta-openembedded"; \
- git clone ${URL_META_OE} shr-core/meta-openembedded )
- ( cd shr-core/meta-openembedded && \
+ git clone ${URL_META_OE} meta-openembedded )
+ ( cd meta-openembedded && \
git checkout ${BRANCH_META_OE} 2>/dev/null || \
git checkout --no-track -b ${BRANCH_META_OE} origin/${BRANCH_META_OE}
)
- touch shr-core/meta-openembedded/.git/config
+ touch meta-openembedded/.git/config
-.PHONY: setup-shr-core-meta-smartphone
-.PRECIOUS: shr-core/meta-smartphone/.git/config
-setup-shr-core-meta-smartphone shr-core/meta-smartphone/.git/config:
- [ -e shr-core/meta-smartphone/.git/config ] || \
+.PHONY: setup-meta-smartphone
+.PRECIOUS: meta-smartphone/.git/config
+setup-meta-smartphone meta-smartphone/.git/config:
+ [ -e meta-smartphone/.git/config ] || \
( echo "setting up meta-smartphone"; \
- git clone ${URL_META_SMARTPHONE} shr-core/meta-smartphone )
- ( cd shr-core/meta-smartphone && \
+ git clone ${URL_META_SMARTPHONE} meta-smartphone )
+ ( cd meta-smartphone && \
git checkout ${BRANCH_META_SMARTPHONE} 2>/dev/null || \
git checkout --no-track -b ${BRANCH_META_SMARTPHONE}
origin/${BRANCH_META_SMARTPHONE} )
- touch shr-core/meta-smartphone/.git/config
+ touch meta-smartphone/.git/config
.PHONY: setup-%
@@ -209,10 +209,13 @@ shr-unstable/.configured: common/.git/config
openembedded/.git/config
touch shr-unstable/.configured
.PRECIOUS: shr-core/.configured
-shr-core/.configured: common/.git/config
shr-core/openembedded-core/.git/config shr-core/meta-openembedded/.git/config
shr-core/meta-smartphone/.git/config
+shr-core/.configured: common/.git/config openembedded-core/.git/config
meta-openembedded/.git/config meta-smartphone/.git/config
@echo "preparing shr-core tree"
[ -d shr-core ] || ( mkdir -p shr-core )
[ -e downloads ] || ( mkdir -p downloads )
+ [ -e shr-core/openembedded-core ] || ( cd shr-core ; ln -sf
../openembedded-core . )
+ [ -e shr-core/meta-openembedded ] || ( cd shr-core ; ln -sf
../meta-openembedded . )
+ [ -e shr-core/meta-smartphone ] || ( cd shr-core ; ln -sf
../meta-smartphone . )
[ -e shr-core/setup-env ] || ( cd shr-core ; ln -sf ../common/setup-env
. )
[ -e shr-core/setup-local ] || ( cd shr-core ; cp ../common/setup-local
.; echo 'export BBFETCH2=True' >> setup-local )
[ -e shr-core/downloads ] || ( cd shr-core ; ln -sf ../downloads . )
@@ -221,6 +224,26 @@ shr-core/.configured: common/.git/config
shr-core/openembedded-core/.git/config
[ -e shr-core/conf/topdir.conf ] || echo "TOPDIR='`pwd`/shr-core'" >
shr-core/conf/topdir.conf
touch shr-core/.configured
+.PRECIOUS: aurora/.configured
+aurora/.configured: common/.git/config openembedded-core/.git/config
meta-openembedded/.git/config meta-smartphone/.git/config
+ @echo "preparing aurora tree"
+ [ -d aurora ] || ( mkdir -p aurora )
+ [ -e downloads ] || ( mkdir -p downloads )
+ [ -e aurora/openembedded-core ] || ( cd aurora ; ln -sf
../openembedded-core . )
+ [ -e aurora/meta-openembedded ] || ( cd aurora ; ln -sf
../meta-openembedded . )
+ [ -e aurora/meta-smartphone ] || ( cd aurora ; ln -sf
../meta-smartphone . )
+ [ -e aurora/setup-env ] || ( cd aurora ; ln -sf ../common/setup-env . )
+ [ -e aurora/setup-local ] || ( cd aurora ; \
+ echo "# keep this file compatible with sh (it's read from setup-env)"
> setup-local; \
+ echo "DISTRO="aurora"" >> setup-local; \
+ echo "MACHINE="palmpre2"" >> setup-local; \
+ echo "export BBFETCH2=True" >> setup-local; )
+ [ -e aurora/downloads ] || ( cd aurora ; ln -sf ../downloads . )
+ [ -e aurora/bitbake ] || ( cd aurora ; ln -sf ../bitbake . )
+ [ -d aurora/conf ] || ( cp -ra common/conf/aurora aurora/conf )
+ [ -e aurora/conf/topdir.conf ] || echo "TOPDIR='`pwd`/aurora'" >
aurora/conf/topdir.conf
+ touch aurora/.configured
+
.PHONY: update-common
update-common: common/.git/config
@echo "updating common (Makefile)"
@@ -305,30 +328,30 @@ update-shr-unstable: shr-unstable/.configured
git checkout --no-track -b ${BRANCH_OE_SHR_UNSTABLE}
origin/${BRANCH_OE_SHR_UNSTABLE} ; \
git reset --hard origin/${BRANCH_OE_SHR_UNSTABLE} )
-.PHONY: update-shr-core-openembedded-core
-update-shr-core-openembedded-core: shr-core/openembedded-core/.git/config
- @echo "updating shr-core/openembedded-core tree"
- ( cd shr-core/openembedded-core ; \
+.PHONY: update-openembedded-core
+update-openembedded-core: openembedded-core/.git/config
+ @echo "updating openembedded-core tree"
+ ( cd openembedded-core ; \
sed -e s/git.openembedded.net/git.openembedded.org/ -i .git/config ; \
git clean -d -f ; git reset --hard ; git fetch ; \
git checkout ${BRANCH_OE_CORE} 2>/dev/null || \
git checkout --no-track -b ${BRANCH_OE_CORE} origin/${BRANCH_OE_CORE}
; \
git reset --hard origin/${BRANCH_OE_CORE} )
-.PHONY: update-shr-core-meta-openembedded
-update-shr-core-meta-openembedded: shr-core/meta-openembedded/.git/config
- @echo "updating shr-core/meta-openembedded tree"
- ( cd shr-core/meta-openembedded ; \
+.PHONY: update-meta-openembedded
+update-meta-openembedded: meta-openembedded/.git/config
+ @echo "updating meta-openembedded tree"
+ ( cd meta-openembedded ; \
sed -e s/git.openembedded.net/git.openembedded.org/ -i .git/config ; \
git clean -d -f ; git reset --hard ; git fetch ; \
git checkout ${BRANCH_META_OE} 2>/dev/null || \
git checkout --no-track -b ${BRANCH_META_OE} origin/${BRANCH_META_OE}
; \
git reset --hard origin/${BRANCH_META_OE} )
-.PHONY: update-shr-core-meta-smartphone
-update-shr-core-meta-smartphone: shr-core/meta-smartphone/.git/config
- @echo "updating shr-core/meta-smartphone tree"
- ( cd shr-core/meta-smartphone ; \
+.PHONY: update-meta-smartphone
+update-meta-smartphone: meta-smartphone/.git/config
+ @echo "updating meta-smartphone tree"
+ ( cd meta-smartphone ; \
git clean -d -f ; git reset --hard ; git fetch ; \
git checkout ${BRANCH_META_SMARTPHONE} 2>/dev/null || \
git checkout --no-track -b ${BRANCH_META_SMARTPHONE}
origin/${BRANCH_META_SMARTPHONE} ; \
diff --git a/conf/aurora/auto.conf b/conf/aurora/auto.conf
new file mode 100644
index 0000000..b936db5
--- /dev/null
+++ b/conf/aurora/auto.conf
@@ -0,0 +1,5 @@
+IMAGE_TARGET="shr-lite-image"
+DISTRO_TARGET="task-shr-feed"
+DISTRO_FEED_PREFIX="shr"
+#DISTRO_FEED_URI="http://build.shr-project.org/shr-unstable/ipk/";
+DISTRO_FEED_URI="http://build.shr-project.org/shr-core/ipk/";
diff --git a/conf/aurora/bblayers.conf b/conf/aurora/bblayers.conf
new file mode 100644
index 0000000..29a7d1a
--- /dev/null
+++ b/conf/aurora/bblayers.conf
@@ -0,0 +1,17 @@
+# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+LCONF_VERSION = "4"
+
+BBFILES ?= ""
+
+# Add your overlay location to BBLAYERS
+# Make sure to have a conf/layers.conf in there
+BBLAYERS = " \
+ ${TOPDIR}/openembedded-core/meta \
+ ${TOPDIR}/meta-openembedded/meta-oe \
+ ${TOPDIR}/meta-openembedded/meta-gnome \
+ ${TOPDIR}/meta-smartphone/meta-palm \
+ ${TOPDIR}/meta-smartphone/meta-samsung \
+ ${TOPDIR}/meta-smartphone/meta-fso \
+ ${TOPDIR}/meta-smartphone/meta-aurora \
+"
diff --git a/conf/aurora/local-builds.inc b/conf/aurora/local-builds.inc
new file mode 100644
index 0000000..dbbdac8
--- /dev/null
+++ b/conf/aurora/local-builds.inc
@@ -0,0 +1,3 @@
+INHERIT_append_pn-libphone-ui-shr = "srctree gitpkgv"
+SRCREV_pn-libphone-ui-shr = "${GITSHA}"
+S_pn-libphone-ui-shr = "/path/to/source/${PN}"
diff --git a/conf/aurora/local.conf b/conf/aurora/local.conf
new file mode 100644
index 0000000..3699d26
--- /dev/null
+++ b/conf/aurora/local.conf
@@ -0,0 +1,23 @@
+# CONF_VERSION is increased each time build/conf/ changes incompatibly
+CONF_VERSION = "1"
+
+# additionally build a tar.gz image file (as needed for installing on SD)
+#IMAGE_FSTYPES = "jffs2 tar.gz"
+
+# speed up build by parallel building - usefull for multicore cpus
+#PARALLEL_MAKE = "-j 4"
+#BB_NUMBER_THREADS = "4"
+
+# avoid multiple locales generation to speedup the build and save space
+#GLIBC_GENERATE_LOCALES = "en_US.UTF-8"
+
+# completely disable generation of locales. If building qemu fails this might
help
+#ENABLE_BINARY_LOCALE_GENERATION = "0"
+
+# enable local builds for SHR apps
+#require local-builds.inc
+
+INHERIT += "rm_work"
+
+TERMCMD = "${SCREEN_TERMCMD}"
+TERMCMDRUN = "${SCREEN_TERMCMDRUN}"
diff --git a/conf/aurora/site.conf b/conf/aurora/site.conf
new file mode 100644
index 0000000..b5cf198
--- /dev/null
+++ b/conf/aurora/site.conf
@@ -0,0 +1,70 @@
+#
+# local.conf covers user settings, site.conf covers site specific information
+# such as proxy server addresses and optionally any shared download location
+#
+# SITE_CONF_VERSION is increased each time build/conf/site.conf
+# changes incompatibly
+SCONF_VERSION = "1"
+
+# Uncomment to cause CVS to use the proxy host specified
+#CVS_PROXY_HOST = "proxy.example.com"
+#CVS_PROXY_PORT = "81"
+
+# For svn, you need to create ~/.subversion/servers containing:
+#[global]
+#http-proxy-host = proxy.example.com
+#http-proxy-port = 81
+#
+
+# Uncomment to cause git to use the proxy host specificed
+# although this only works for http
+#GIT_PROXY_HOST = "proxy.example.com"
+#GIT_PROXY_PORT = "81"
+#export GIT_PROXY_COMMAND = "${POKYBASE}/scripts/poky-git-proxy-command"
+
+# GIT_PROXY_IGNORE_* lines define hosts which do not require a proxy to access
+#GIT_CORE_CONFIG = "Yes"
+#GIT_PROXY_IGNORE_1 = "host.server.com"
+#GIT_PROXY_IGNORE_2 = "another.server.com"
+
+# If SOCKS is available run the following command to comple a simple transport
+# gcc scripts/poky-git-proxy-socks.c -o poky-git-proxy-socks
+# and then share that binary somewhere in PATH, then use the following settings
+#GIT_PROXY_HOST = "proxy.example.com"
+#GIT_PROXY_PORT = "81"
+#export GIT_PROXY_COMMAND = "${POKYBASE}/scripts/poky-git-proxy-socks-command"
+
+
+# Uncomment this to use a shared download directory
+#DL_DIR = "/some/shared/download/directory/"
+
+# FSO/SHR makefile bitbake site configuration
+# It should not be necessary to alter this file!
+#
+# This configuration defines the location of the directories
+# bitbake requires to build a particular distribution (DISTRO)
+#
+# Each DISTRO must create a appropriate topdir file containing
+# (just) the definition of TOPDIR
+include conf/topdir.conf
+
+# These definitions should be the same for every DISTRO - if
+# a change is necessary make it in the DISTRO auto.conf. The
+# rvalues are evaluated here for safety (i.e. to prevent accidents
+# if something else defines TOPDIR).
+TMPDIR := "${TOPDIR}/tmp"
+DL_DIR := "${TOPDIR}/downloads"
+
+# The distro must create the following directories - either by
+# populating them with the required files or, in the master makefile
+# environment, by symbolic links to the relevant shared directories
+# (which are directories of the same name in ..)
+#
+# common - contains conf/site.conf - this file
+# downloads - contains the source files downloaded from the network
+# openembedded - the directory containing the OE source
+#
+# All these directories may be shared between multiple distros.
+# The 'tmp' directory may not be shared, however bitbake will create
+# it automatically when required. The 'downloads' directory will also
+# be created if required by bitbake.
--
1.7.4.1
_______________________________________________
Shr-devel mailing list
[email protected]
http://lists.shr-project.org/mailman/listinfo/shr-devel
