[oe-commits] org.oe.dev x86 machines: added 'x86' MACHINE_FEATURE to limit amount of overrides needed when package need x86 special options - look at mplayer as example
hrw commit
openembedded-commits at lists.openembedded.org
Sun Oct 7 18:55:47 UTC 2007
x86 machines: added 'x86' MACHINE_FEATURE to limit amount of overrides needed when package need x86 special options - look at mplayer as example
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: eaf98be5dcfba80d61fd7d46052a466eef0710b7
ViewMTN: http://monotone.openembedded.org/revision/info/eaf98be5dcfba80d61fd7d46052a466eef0710b7
Files:
1
conf/machine/alix.conf
conf/machine/epia.conf
conf/machine/guinness.conf
conf/machine/i586-generic.conf
conf/machine/i686-generic.conf
conf/machine/netvista.conf
conf/machine/progear.conf
conf/machine/qemux86.conf
conf/machine/wrap.conf
conf/machine/x86-32-nocona.conf
conf/machine/x86-prescott.conf
conf/machine/x86.conf
Diffs:
#
# mt diff -rde9ebeb8851c460c013bc23f36d54dd56c9f2755 -reaf98be5dcfba80d61fd7d46052a466eef0710b7
#
#
#
# patch "conf/machine/alix.conf"
# from [f8fdaa68a61adeffcb530a174e2e182280770dd5]
# to [53d221f82557e515e40af9234547d38664a2dff9]
#
# patch "conf/machine/epia.conf"
# from [447a89306f42410510b6676e2e317f2a893709b4]
# to [7ea29c9254e8cf7eb3efe9042c2597a57123e9d9]
#
# patch "conf/machine/guinness.conf"
# from [73fc910a04f64a44077423b2ae1d4a124f4ebfdc]
# to [9cae2f8707149cf3e6b6e33cebaa348560898962]
#
# patch "conf/machine/i586-generic.conf"
# from [006a74a863afd1f923bb67cedef39bf4391cffd0]
# to [d53211500c299b141a5911dd6cb8b095d46bf74a]
#
# patch "conf/machine/i686-generic.conf"
# from [ee687be060f3975c6581a344e0fcff555311c4c0]
# to [fe0d7dacb28a7233e9aec258ab69a439e0f89d7f]
#
# patch "conf/machine/netvista.conf"
# from [5fa034197f2e35cab1099297e0461c05d84a1401]
# to [4a37e5d3eb7a0ac06c088d3f1d6f68e27044f66b]
#
# patch "conf/machine/progear.conf"
# from [22e49b5432e36f46f19bdb061e0226cda4016d6c]
# to [6ddc658f0cc1cf705f4430b92e3c7d534cf644bd]
#
# patch "conf/machine/qemux86.conf"
# from [2aa871c692f0a5205e3b06714b12e27b7bc978c1]
# to [74fdc152193ec1934216879ff766e8e13e098985]
#
# patch "conf/machine/wrap.conf"
# from [7364205fdb720403971f54dc88bc58479794a3a2]
# to [e9bcd3174ca6a26e8d157ac7df123c6bedd4e36d]
#
# patch "conf/machine/x86-32-nocona.conf"
# from [23cb58df20b02ae0c028f4341041e6800d10f347]
# to [4751fe71ac3de06ec5669fd29663ce396bf3ac4f]
#
# patch "conf/machine/x86-prescott.conf"
# from [aaa114f1f2f973a0736d7df2a7ecef7794a59966]
# to [c4bf154f03bb4818ad538b852d24e1d50e653d76]
#
# patch "conf/machine/x86.conf"
# from [e40a530eadbc02e9ed6fd2d267d4a492bc1d403a]
# to [28f63bda2b037a316931c0707a0db0f81b10a9cb]
#
============================================================
--- conf/machine/alix.conf f8fdaa68a61adeffcb530a174e2e182280770dd5
+++ conf/machine/alix.conf 53d221f82557e515e40af9234547d38664a2dff9
@@ -15,7 +15,7 @@ GLIBC_EXTRA_OECONF = "--with-tls"
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
============================================================
--- conf/machine/epia.conf 447a89306f42410510b6676e2e317f2a893709b4
+++ conf/machine/epia.conf 7ea29c9254e8cf7eb3efe9042c2597a57123e9d9
@@ -12,7 +12,7 @@ IMAGE_FSTYPES = "ext2.gz"
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
============================================================
--- conf/machine/guinness.conf 73fc910a04f64a44077423b2ae1d4a124f4ebfdc
+++ conf/machine/guinness.conf 9cae2f8707149cf3e6b6e33cebaa348560898962
@@ -17,7 +17,7 @@ GLIBC_EXTRA_OECONF = "--with-tls"
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
============================================================
--- conf/machine/i586-generic.conf 006a74a863afd1f923bb67cedef39bf4391cffd0
+++ conf/machine/i586-generic.conf d53211500c299b141a5911dd6cb8b095d46bf74a
@@ -19,7 +19,7 @@ IMAGE_FSTYPES = "ext2.gz"
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"
============================================================
--- conf/machine/i686-generic.conf ee687be060f3975c6581a344e0fcff555311c4c0
+++ conf/machine/i686-generic.conf fe0d7dacb28a7233e9aec258ab69a439e0f89d7f
@@ -18,7 +18,7 @@ IMAGE_FSTYPES = "ext2.gz"
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"
============================================================
--- conf/machine/netvista.conf 5fa034197f2e35cab1099297e0461c05d84a1401
+++ conf/machine/netvista.conf 4a37e5d3eb7a0ac06c088d3f1d6f68e27044f66b
@@ -15,7 +15,7 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-mod
# 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"
============================================================
--- conf/machine/progear.conf 22e49b5432e36f46f19bdb061e0226cda4016d6c
+++ conf/machine/progear.conf 6ddc658f0cc1cf705f4430b92e3c7d534cf644bd
@@ -15,7 +15,7 @@ GLIBC_EXTRA_OECONF = "--with-tls"
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"
============================================================
--- conf/machine/qemux86.conf 2aa871c692f0a5205e3b06714b12e27b7bc978c1
+++ conf/machine/qemux86.conf 74fdc152193ec1934216879ff766e8e13e098985
@@ -7,6 +7,8 @@ require conf/machine/include/qemu.inc
require conf/machine/include/qemu.inc
+MACHINE_FEATURES += "x86"
+
KERNEL_IMAGETYPE = "bzImage"
SERIAL_CONSOLE = "115200 ttyS0"
============================================================
--- conf/machine/wrap.conf 7364205fdb720403971f54dc88bc58479794a3a2
+++ conf/machine/wrap.conf e9bcd3174ca6a26e8d157ac7df123c6bedd4e36d
@@ -22,7 +22,7 @@ IMAGE_FSTYPE ?= "tar.gz"
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"
============================================================
--- conf/machine/x86-32-nocona.conf 23cb58df20b02ae0c028f4341041e6800d10f347
+++ conf/machine/x86-32-nocona.conf 4751fe71ac3de06ec5669fd29663ce396bf3ac4f
@@ -17,7 +17,7 @@ IMAGE_FSTYPES = "ext2.gz"
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"
============================================================
--- conf/machine/x86-prescott.conf aaa114f1f2f973a0736d7df2a7ecef7794a59966
+++ conf/machine/x86-prescott.conf c4bf154f03bb4818ad538b852d24e1d50e653d76
@@ -16,7 +16,7 @@ IMAGE_FSTYPES = "ext2.gz"
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"
============================================================
--- conf/machine/x86.conf e40a530eadbc02e9ed6fd2d267d4a492bc1d403a
+++ conf/machine/x86.conf 28f63bda2b037a316931c0707a0db0f81b10a9cb
@@ -13,7 +13,7 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-mod
# 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"
More information about the Openembedded-commits
mailing list