From e307ea2a862bd308504b3f18fb688423b9a87215 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Sun, 7 Oct 2007 18:06:42 +0000 Subject: x86 machines: added 'x86' MACHINE_FEATURE to limit amount of overrides needed when package need x86 special options - look at mplayer as example --- conf/machine/alix.conf | 2 +- conf/machine/epia.conf | 2 +- conf/machine/guinness.conf | 2 +- conf/machine/i586-generic.conf | 2 +- conf/machine/i686-generic.conf | 2 +- conf/machine/netvista.conf | 2 +- conf/machine/progear.conf | 2 +- conf/machine/qemux86.conf | 2 ++ conf/machine/wrap.conf | 2 +- conf/machine/x86-32-nocona.conf | 2 +- conf/machine/x86-prescott.conf | 2 +- conf/machine/x86.conf | 2 +- 12 files changed, 13 insertions(+), 11 deletions(-) (limited to 'conf/machine') diff --git a/conf/machine/alix.conf b/conf/machine/alix.conf index 29af29a3b8..3d83300963 100644 --- a/conf/machine/alix.conf +++ b/conf/machine/alix.conf @@ -15,7 +15,7 @@ OLDEST_KERNEL = "2.6.17" GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls" -MACHINE_FEATURES = "kernel26 usbhost ext2 pci screen alsa acpi" +MACHINE_FEATURES = "kernel26 usbhost ext2 pci screen alsa acpi x86" require conf/machine/include/tune-geodelx.conf diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf index 0750e4d646..69d5e66171 100644 --- a/conf/machine/epia.conf +++ b/conf/machine/epia.conf @@ -12,7 +12,7 @@ GLIBC_EXTRA_OECONF = "--with-tls" IMAGE_FSTYPES = "ext2.gz" -MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2" +MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86" MACHINE_TASK_PROVIDER = "task-base" require conf/machine/include/tune-c3.inc diff --git a/conf/machine/guinness.conf b/conf/machine/guinness.conf index 626e755b1f..f17451556f 100644 --- a/conf/machine/guinness.conf +++ b/conf/machine/guinness.conf @@ -17,7 +17,7 @@ OLDEST_KERNEL = "2.6.17" GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls" -MACHINE_FEATURES = "kernel26 usbhost ext2 pci acpi screen" +MACHINE_FEATURES = "kernel26 usbhost ext2 pci acpi screen x86" #require conf/machine/include/tune-athlonmp.inc diff --git a/conf/machine/i586-generic.conf b/conf/machine/i586-generic.conf index 0ef522441b..53e088da1c 100644 --- a/conf/machine/i586-generic.conf +++ b/conf/machine/i586-generic.conf @@ -19,7 +19,7 @@ GLIBC_EXTRA_OECONF = "--with-tls" IMAGE_FSTYPES = "ext2.gz" -MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2" +MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" MACHINE_TASK_PROVIDER = "task-base" diff --git a/conf/machine/i686-generic.conf b/conf/machine/i686-generic.conf index 8ff87553ba..b8e73f3085 100644 --- a/conf/machine/i686-generic.conf +++ b/conf/machine/i686-generic.conf @@ -18,7 +18,7 @@ GLIBC_EXTRA_OECONF = "--with-tls" IMAGE_FSTYPES = "ext2.gz" -MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2" +MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" MACHINE_TASK_PROVIDER = "task-base" diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf index 8d6cd2d220..3ee97a447e 100644 --- a/conf/machine/netvista.conf +++ b/conf/machine/netvista.conf @@ -15,7 +15,7 @@ KERNEL_IMAGETYPE = "bzImage" # BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" -MACHINE_FEATURES = "kernel26 pci usbhost ext2 screen keyboard irda apm alsa" +MACHINE_FEATURES = "kernel26 pci usbhost ext2 screen keyboard irda apm alsa x86" ROOT_FLASH_SIZE = "64" GUI_MACHINE_CLASS = "bigscreen" diff --git a/conf/machine/progear.conf b/conf/machine/progear.conf index ffa7dad468..2a8c009b10 100644 --- a/conf/machine/progear.conf +++ b/conf/machine/progear.conf @@ -15,7 +15,7 @@ OLDEST_KERNEL = "2.6.17" GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls" -MACHINE_FEATURES = "kernel26 usbhost ext2 pci pcmcia screen alsa irda acpi screen touchscreen" +MACHINE_FEATURES = "kernel26 usbhost ext2 pci pcmcia screen alsa irda acpi screen touchscreen x86" IMAGE_FSTYPES = "tar.gz" diff --git a/conf/machine/qemux86.conf b/conf/machine/qemux86.conf index 2378a9990e..fe811ba54e 100644 --- a/conf/machine/qemux86.conf +++ b/conf/machine/qemux86.conf @@ -7,6 +7,8 @@ PACKAGE_EXTRA_ARCHS = "x86" require conf/machine/include/qemu.inc +MACHINE_FEATURES += "x86" + KERNEL_IMAGETYPE = "bzImage" SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/wrap.conf b/conf/machine/wrap.conf index d73c80214c..92720043f2 100644 --- a/conf/machine/wrap.conf +++ b/conf/machine/wrap.conf @@ -22,7 +22,7 @@ USE_DEVFS = "0" IMAGE_FSTYPE ?= "tar.gz" # Things to include in the fs image -MACHINE_FEATURES = "kernel26 pci ext2" +MACHINE_FEATURES = "kernel26 pci ext2 x86" # The kernel and grub need to installed to boot from flash MACHINE_EXTRA_RDEPENDS = "kernel grub" diff --git a/conf/machine/x86-32-nocona.conf b/conf/machine/x86-32-nocona.conf index ad5badf84a..e52454ed52 100644 --- a/conf/machine/x86-32-nocona.conf +++ b/conf/machine/x86-32-nocona.conf @@ -17,7 +17,7 @@ GLIBC_EXTRA_OECONF = "--with-tls" IMAGE_FSTYPES = "ext2.gz" -MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2" +MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" MACHINE_TASK_PROVIDER = "task-base" diff --git a/conf/machine/x86-prescott.conf b/conf/machine/x86-prescott.conf index b4021a6496..bd96c387b6 100644 --- a/conf/machine/x86-prescott.conf +++ b/conf/machine/x86-prescott.conf @@ -16,7 +16,7 @@ GLIBC_EXTRA_OECONF = "--with-tls" IMAGE_FSTYPES = "ext2.gz" -MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2" +MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" MACHINE_TASK_PROVIDER = "task-base" diff --git a/conf/machine/x86.conf b/conf/machine/x86.conf index 51757e950c..c35e7ad389 100644 --- a/conf/machine/x86.conf +++ b/conf/machine/x86.conf @@ -13,7 +13,7 @@ KERNEL_IMAGETYPE = "bzImage" # BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" -MACHINE_FEATURES = "kernel26 pci usbhost ext2 screen" +MACHINE_FEATURES = "kernel26 pci usbhost ext2 screen x86" udevdir = "/dev" OLDEST_KERNEL = "2.6.17" -- cgit v1.2.3