From 36408e8982f7a59193143e5e883266d2e8a6e385 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 7 Jan 2006 23:55:36 +0000 Subject: Move machine include files (files that are not machines in their own right) into conf/machine/include. --- conf/machine/h3900.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'conf/machine/h3900.conf') diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf index cff74131d5..a047761598 100644 --- a/conf/machine/h3900.conf +++ b/conf/machine/h3900.conf @@ -33,10 +33,10 @@ SERIAL_CONSOLE = "115200 tts/0 vt100" USE_DEVFS_kernel24 = "1" USE_VT = "0" -include conf/machine/ipaq-common.conf -include conf/machine/handheld-common.conf +include conf/machine/include/ipaq-common.conf +include conf/machine/include/handheld-common.conf GUI_MACHINE_CLASS = "smallscreen" #use tune xscale for extra performance. Distro feeds be built with tune-strongarm -include conf/machine/tune-xscale.conf +include conf/machine/include/tune-xscale.conf -- cgit v1.2.3 From 00d6afcb893bec3fee68e3121c9d25999e833e27 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 8 Jan 2006 14:56:12 +0000 Subject: Following from the meta/packages changes, cleanup conf/machine for incorrect DEPENDS usage. Move certain things into EXTRA_IMAGEDEPENDS. No valid users of EXTRA_BOOTSTRAP_DEPENDS were found so it was removed entirely. Change zaurus-updater not to package as it doesn't provide any. --- conf/machine/h3900.conf | 4 ---- 1 file changed, 4 deletions(-) (limited to 'conf/machine/h3900.conf') diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf index a047761598..238f6ad17a 100644 --- a/conf/machine/h3900.conf +++ b/conf/machine/h3900.conf @@ -16,10 +16,6 @@ EXTRA_IMAGECMD_h3900_jffs2 = "-e 0x40000 -p" ROOT_FLASH_SIZE = "32" -BOOTSTRAP_EXTRA_DEPENDS = "ipaq-boot-params" -BOOTSTRAP_EXTRA_DEPENDS_append_kernel24 = " handhelds-pxa at76c503a-modules" -BOOTSTRAP_EXTRA_DEPENDS_append_kernel26 = " handhelds-pxa-2.6 udev module-init-tools" - BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${H3900_MODULES}', d)}" BOOTSTRAP_EXTRA_RDEPENDS_append_kernel24 = " at76c503a-modules" BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 = " udev module-init-tools" -- cgit v1.2.3