summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2006-03-04 15:52:58 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-03-04 15:52:58 +0000
commite8251f5ecd1459bb5b25c622514324f133485986 (patch)
tree86d5a9bd4394f15842fa7b2c91685ac20f2adc67 /conf
parent102787f045e2858cb45032291b52ece55f893d4d (diff)
parent0afc9678f57e1832a0c2d995637fcc7cfa59ce2a (diff)
merge of 253db2cc1289b54dcf638e5bd3cd11ae2a9c432f
and bee378ef0bf8d72ae3f2f94a19b1ed5b0b2f95f4
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/angstrom-2006.9.conf7
-rw-r--r--conf/distro/angstrom.conf4
-rw-r--r--conf/distro/slugos-packages.conf3
-rw-r--r--conf/machine/ep93xx.conf3
4 files changed, 11 insertions, 6 deletions
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index 4bb27afa51..4f94ddb30f 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -10,9 +10,10 @@ DISTRO_TYPE = "debug"
FEED_URIS += " \
- base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/base \
- ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \
- updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates"
+ base##${ANGSTROM_URI}/unstable/feed/base/"
+# base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/base \
+# ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \
+# updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates"
#CVSDATE = 20050331
diff --git a/conf/distro/angstrom.conf b/conf/distro/angstrom.conf
index a68adaae42..916b14d9b9 100644
--- a/conf/distro/angstrom.conf
+++ b/conf/distro/angstrom.conf
@@ -31,8 +31,8 @@ TARGET_FPU = "soft"
PARALLEL_INSTALL_MODULES = "1"
-BOOTSTRAP_EXTRA_DEPENDS += "angstrom-version"
-BOOTSTRAP_EXTRA_RDEPENDS += "angstrom-version"
+BOOTSTRAP_EXTRA_DEPENDS += "angstrom-version dropbear sysvinit"
+BOOTSTRAP_EXTRA_RDEPENDS += "angstrom-version dropbear sysvinit"
#Name the generated images in a sane way
IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}"
diff --git a/conf/distro/slugos-packages.conf b/conf/distro/slugos-packages.conf
index f05dd23e81..dec59f9f68 100644
--- a/conf/distro/slugos-packages.conf
+++ b/conf/distro/slugos-packages.conf
@@ -45,6 +45,7 @@ ${PKGDIR}/packages/dropbear/*.bb \
${PKGDIR}/packages/dsniff/*.bb \
${PKGDIR}/packages/e2fsprogs/*.bb \
${PKGDIR}/packages/e2fsprogs-libs/*.bb \
+${PKGDIR}/packages/eciadsl/*.bb \
${PKGDIR}/packages/expat/*.bb \
${PKGDIR}/packages/ez-ipupdate/*.bb \
${PKGDIR}/packages/fakeroot/*.bb \
@@ -72,6 +73,7 @@ ${PKGDIR}/packages/gtk-doc/*.bb \
${PKGDIR}/packages/gzip/*.bb \
${PKGDIR}/packages/hal/*.bb \
${PKGDIR}/packages/hotplug-ng/*.bb \
+${PKGDIR}/packages/icecast/*.bb \
${PKGDIR}/packages/ifupdown/*.bb \
${PKGDIR}/packages/initscripts/*.bb \
${PKGDIR}/packages/install/*.bb \
@@ -112,6 +114,7 @@ ${PKGDIR}/packages/libtool/*.bb \
${PKGDIR}/packages/libusb/*.bb \
${PKGDIR}/packages/libvorbis/*.bb \
${PKGDIR}/packages/libxml/*.bb \
+${PKGDIR}/packages/libxslt/* \
${PKGDIR}/packages/linux-libc-headers/*.bb \
${PKGDIR}/packages/linux/*.bb \
${PKGDIR}/packages/lirc/*.bb \
diff --git a/conf/machine/ep93xx.conf b/conf/machine/ep93xx.conf
index 1289fb4505..1fb3b2894c 100644
--- a/conf/machine/ep93xx.conf
+++ b/conf/machine/ep93xx.conf
@@ -22,7 +22,8 @@ SERIAL_CONSOLE = "57600 ttyAM0"
# used by some images
ROOT_FLASH_SIZE = "8"
-
+#extra jffs2 tweaks
+EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x40000 --pad=0x500000 "
#tune for ep93xx cpus
#can be used for crunch support later on