diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-03-18 08:38:49 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-03-18 08:38:49 +0000 |
| commit | ad235ae7778c27d30ac0fb07fb763545f6c68d26 (patch) | |
| tree | f07312edf5fa9b4ee3c9a5f8b39fcad9493ccf85 /conf | |
| parent | 486680eea259b7239fd724e51096a7d5c90a446f (diff) | |
| parent | db7b73377145d875dca71d50daa10a543c5b5014 (diff) | |
merge of '88f5fe35a17263e7916fdae03fcab22c2fadea72'
and 'bf587e15b3b89ef1d11762c426f618a151a0c287'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/angstrom-2008.1.conf | 3 | ||||
| -rw-r--r-- | conf/distro/include/angstrom.inc | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 551865db80..921d12ec79 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -20,6 +20,9 @@ DISTRO_VERSION = "2008.1-test-${DATE}" DISTRO_REVISION = "1" +#build staging from packages +INHERIT += "packaged-staging" + require conf/distro/include/sane-srcdates.inc require conf/distro/include/sane-srcrevs.inc require conf/distro/include/angstrom-2008-preferred-versions.inc diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 14d1f5bd6c..60ba8c6325 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -49,9 +49,6 @@ INHERIT += "insane" #save statistical info on images INHERIT += "testlab" -#build staging from packages -#INHERIT += "packaged-staging" - ANGSTROM_PKG_FORMAT ?= "ipk" require conf/distro/include/angstrom-package-${ANGSTROM_PKG_FORMAT}.inc |