summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2004-12-04 22:39:55 +0000
committerPhil Blundell <philb@gnu.org>2004-12-04 22:39:55 +0000
commite53c12ba6ba08bf8c6e61cc935592f6e58b089a4 (patch)
tree7857d9b1ba61856f3f4977621648388cb7ec3c01 /conf/machine
parent70b4cd9b6c14979525ac11e93e1b051128ff5e08 (diff)
Merge bk://oe-devel@oe-devel.bkbits.net/packages
into stealth.nexus.co.uk:/home/pb/oe/oe-packages 2004/12/04 18:20:04+00:00 nexus.co.uk!pb using r/w ext2, not r/o cramfs, on epia 2004/12/04 18:19:11+00:00 nexus.co.uk!pb fix typo in mythtv packaging 2004/12/04 17:01:03+00:00 nexus.co.uk!pb increase mythtv packaging granularity a bit 2004/12/04 16:59:02+00:00 nexus.co.uk!pb put lame binary and libraries in separate packages 2004/12/04 16:15:50+00:00 nexus.co.uk!pb break udevinfo and udevtest out of main udev package (now in udev-utils) 2004/12/04 16:11:48+00:00 nexus.co.uk!pb remove strace from epia BOOTSTRAP_EXTRA_(R)DEPENDS 2004/12/04 16:09:30+00:00 nexus.co.uk!pb bump task-bootstrap PR 2004/12/04 16:07:24+00:00 nexus.co.uk!pb move lrzsz dependency from task-bootstrap to handhelds-common BKrev: 41b23cbbTdZ1jNiugIMAe6ydDY_o4Q
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/epia.conf4
-rw-r--r--conf/machine/handheld-common.conf4
2 files changed, 4 insertions, 4 deletions
diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf
index ed74c94c6b..03a9c532d3 100644
--- a/conf/machine/epia.conf
+++ b/conf/machine/epia.conf
@@ -2,8 +2,8 @@ TARGET_ARCH = "i686"
TARGET_VENDOR = "-oe"
PREFERRED_PROVIDER_virtual/kernel = "linux-epia"
IMAGE_FSTYPE = "ext2.gz"
-BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils udev module-init-tools strace"
-BOOTSTRAP_EXTRA_RDEPENDS = "pciutils udev module-init-tools kernel-modules strace"
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils udev module-init-tools"
+BOOTSTRAP_EXTRA_RDEPENDS = "pciutils udev module-init-tools kernel-modules"
udevdir = "/dev"
OLDEST_KERNEL = "2.6.5"
GLIBC_ADDONS = "nptl"
diff --git a/conf/machine/handheld-common.conf b/conf/machine/handheld-common.conf
index 0d77f776f4..c606b13975 100644
--- a/conf/machine/handheld-common.conf
+++ b/conf/machine/handheld-common.conf
@@ -17,8 +17,8 @@ input uinput \
"
# Configuration bits for "generic handheld"
-BOOTSTRAP_EXTRA_DEPENDS += "pcmcia-cs apmd ppp wireless-tools irda-utils openswan hostap-wpa-supplicant-nossl"
+BOOTSTRAP_EXTRA_DEPENDS += "pcmcia-cs apmd ppp wireless-tools irda-utils openswan hostap-wpa-supplicant-nossl lrzsz"
BOOTSTRAP_EXTRA_RDEPENDS += "pcmcia-cs apm apmd"
-BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan hostap-wpa-supplicant-nossl ${@linux_module_packages('${HANDHELD_MODULES}')}"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan hostap-wpa-supplicant-nossl lrzsz ${@linux_module_packages('${HANDHELD_MODULES}')}"
INHERIT += "linux_modules"