diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2009-02-23 13:19:19 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2009-02-23 13:19:19 -0800 |
| commit | 8c2955ce84aa2dacfacdfa96b8d2bfaf08f985d2 (patch) | |
| tree | 01b120afb41cf6fe91c0a093ac38ad7864bb862f /conf | |
| parent | 0773447006cd2aa0b2c3ac364ce6e1c151215087 (diff) | |
| parent | 0f5b41fdc74c6b18d482cab683a7fb2d53b6e3a2 (diff) | |
| download | openembedded-8c2955ce84aa2dacfacdfa96b8d2bfaf08f985d2.tar.gz | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/checksums.ini | 4 | ||||
| -rw-r--r-- | conf/distro/angstrom-2008.1.conf | 6 | ||||
| -rw-r--r-- | conf/distro/slugos.conf | 2 |
3 files changed, 12 insertions, 0 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index 5efcecf298..9492b94809 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -4618,6 +4618,10 @@ sha256=635d6d07e5a4d615e599c051166af965baa754f9ff7435e746de1a5d2a5c0d56 md5=1c1c5177aea9a23b45b9b3f5b3241819 sha256=635d6d07e5a4d615e599c051166af965baa754f9ff7435e746de1a5d2a5c0d56 +[http://qa.debian.org/watch/sf.php/e2fsprogs/e2fsprogs-1.41.4.tar.gz] +md5=59033388df36987d2b9c9bbf7e19bd57 +sha256=2cc10fee2b29add737e454eb634513135b34a638f7ca2b18364864fe089020dc + [http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-libs-1.33.tar.gz] md5=c7545bb05e0c2fc59174f0dc455c6519 sha256=a65d064bee3e97c164d07a490692db0e73da8da10019ad9a89866706c93ae703 diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 062cba7ac6..27545cebde 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -181,6 +181,12 @@ PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" ARM_ABI ?= "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" require conf/distro/include/angstrom${ARM_ABI}.inc + + +# If we're using an .ipk based rootfs, we want to have opkg-nogpg installed so postinst script can run +# We also take this opportunity to inject angstrom-version and the feed configs into the rootfs +IPKG_VARIANT = "opkg-nogpg angstrom-version ${ANGSTROM_FEED_CONFIGS}" + # do some task-base stuff here # We want to ship extra debug utils in the rootfs when doing a debug build diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf index 6182591d6a..3e816f7c58 100644 --- a/conf/distro/slugos.conf +++ b/conf/distro/slugos.conf @@ -12,6 +12,8 @@ DISTRO_TYPE = "alpha" TARGET_ARCH ?= "armeb" ARM_INSTRUCTION_SET = "arm" TARGET_OS = "linux-gnueabi" +IPKG_VARIANT ?= "opkg-nogpg-nocurl" +IMAGE_INITSCRIPTS ?= "initscripts-slugos" require conf/distro/include/slugos.inc |