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/distro | |
| parent | 0773447006cd2aa0b2c3ac364ce6e1c151215087 (diff) | |
| parent | 0f5b41fdc74c6b18d482cab683a7fb2d53b6e3a2 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/angstrom-2008.1.conf | 6 | ||||
| -rw-r--r-- | conf/distro/slugos.conf | 2 |
2 files changed, 8 insertions, 0 deletions
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 |