From 8e466ad34b11fea6003489e1c8875042d991b5a7 Mon Sep 17 00:00:00 2001 From: Samuel Ortiz Date: Fri, 3 Oct 2008 08:42:49 +0000 Subject: [PATCH] linux-moblin2: Use a more generic name And fix the eee901 machine file accordingly. git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5404 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/conf/machine/eee901.conf | 4 ++-- .../0001_Export_shmem_file_setup_for_DRM-GEM.patch | 0 .../0002_i915.Use_more_consistent_names_for_regs.patch | 0 ...03_i915.Add_support_for_MSI_and_interrupt_mitigation.patch | 0 ...ss_inside_of_batchbuffers_for_determining_wedgedness.patch | 0 .../0005_i915.remove_settable_use_mi_batchbuffer_start.patch | 0 .../0006_i915.Ignore_X_server_provided_mmio_address.patch | 0 ...ze_hardware_status_page_at_device_load_when_possible.patch | 0 ...rm.Add_GEM_graphics_execution_manager_to_i915_driver.patch | 0 .../0009-squashfs3.3-2.6.27.patch | 0 .../0010_unionfs-2.4_for_2.6.27-rc1.patch | 0 .../0011_workaround_unidef_step.patch | 0 .../0012_intelfb_945gme.patch | 0 .../defconfig-eee901 | 0 meta/packages/linux/{linux-moblin2.inc => linux-moblin.inc} | 0 ...linux-moblin2_2.6.27-rc1.bb => linux-moblin_2.6.27-rc1.bb} | 4 ++-- 16 files changed, 4 insertions(+), 4 deletions(-) rename meta/packages/linux/{linux-moblin2-2.6.27-rc1 => linux-moblin-2.6.27-rc1}/0001_Export_shmem_file_setup_for_DRM-GEM.patch (100%) rename meta/packages/linux/{linux-moblin2-2.6.27-rc1 => linux-moblin-2.6.27-rc1}/0002_i915.Use_more_consistent_names_for_regs.patch (100%) rename meta/packages/linux/{linux-moblin2-2.6.27-rc1 => linux-moblin-2.6.27-rc1}/0003_i915.Add_support_for_MSI_and_interrupt_mitigation.patch (100%) rename meta/packages/linux/{linux-moblin2-2.6.27-rc1 => linux-moblin-2.6.27-rc1}/0004_i915.Track_progress_inside_of_batchbuffers_for_determining_wedgedness.patch (100%) rename meta/packages/linux/{linux-moblin2-2.6.27-rc1 => linux-moblin-2.6.27-rc1}/0005_i915.remove_settable_use_mi_batchbuffer_start.patch (100%) rename meta/packages/linux/{linux-moblin2-2.6.27-rc1 => linux-moblin-2.6.27-rc1}/0006_i915.Ignore_X_server_provided_mmio_address.patch (100%) rename meta/packages/linux/{linux-moblin2-2.6.27-rc1 => linux-moblin-2.6.27-rc1}/0007_i915.Initialize_hardware_status_page_at_device_load_when_possible.patch (100%) rename meta/packages/linux/{linux-moblin2-2.6.27-rc1 => linux-moblin-2.6.27-rc1}/0008_drm.Add_GEM_graphics_execution_manager_to_i915_driver.patch (100%) rename meta/packages/linux/{linux-moblin2-2.6.27-rc1 => linux-moblin-2.6.27-rc1}/0009-squashfs3.3-2.6.27.patch (100%) rename meta/packages/linux/{linux-moblin2-2.6.27-rc1 => linux-moblin-2.6.27-rc1}/0010_unionfs-2.4_for_2.6.27-rc1.patch (100%) rename meta/packages/linux/{linux-moblin2-2.6.27-rc1 => linux-moblin-2.6.27-rc1}/0011_workaround_unidef_step.patch (100%) rename meta/packages/linux/{linux-moblin2-2.6.27-rc1 => linux-moblin-2.6.27-rc1}/0012_intelfb_945gme.patch (100%) rename meta/packages/linux/{linux-moblin2-2.6.27-rc1 => linux-moblin-2.6.27-rc1}/defconfig-eee901 (100%) rename meta/packages/linux/{linux-moblin2.inc => linux-moblin.inc} (100%) rename meta/packages/linux/{linux-moblin2_2.6.27-rc1.bb => linux-moblin_2.6.27-rc1.bb} (96%) diff --git a/meta/conf/machine/eee901.conf b/meta/conf/machine/eee901.conf index 3d17ba0ffe..f6dbe333aa 100644 --- a/meta/conf/machine/eee901.conf +++ b/meta/conf/machine/eee901.conf @@ -13,7 +13,7 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 wifi \ KERNEL_IMAGETYPE = "bzImage" -PREFERRED_PROVIDER_virtual/kernel = "linux-moblin2" +PREFERRED_PROVIDER_virtual/kernel = "linux-moblin" PREFERRED_PROVIDER_virtual/libx11 = "libx11-trim" PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" PREFERRED_PROVIDER_virtual/xserver = "xserver-xf86-dri-lite" @@ -34,7 +34,7 @@ IMAGE_ROOTFS_SIZE_ext3 = "250000" IMAGE_FSTYPES += "ext3 jffs2 cpio.gz" -APPEND += "video=intelfb:mode=800x600,accel=0,hwcursor=0 vga=788" +APPEND += "video=intelfb:mode=800x600,accel=0,hwcursor=0 vga=788 usbcore.autosuspend=1" GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls" diff --git a/meta/packages/linux/linux-moblin2-2.6.27-rc1/0001_Export_shmem_file_setup_for_DRM-GEM.patch b/meta/packages/linux/linux-moblin-2.6.27-rc1/0001_Export_shmem_file_setup_for_DRM-GEM.patch similarity index 100% rename from meta/packages/linux/linux-moblin2-2.6.27-rc1/0001_Export_shmem_file_setup_for_DRM-GEM.patch rename to meta/packages/linux/linux-moblin-2.6.27-rc1/0001_Export_shmem_file_setup_for_DRM-GEM.patch diff --git a/meta/packages/linux/linux-moblin2-2.6.27-rc1/0002_i915.Use_more_consistent_names_for_regs.patch b/meta/packages/linux/linux-moblin-2.6.27-rc1/0002_i915.Use_more_consistent_names_for_regs.patch similarity index 100% rename from meta/packages/linux/linux-moblin2-2.6.27-rc1/0002_i915.Use_more_consistent_names_for_regs.patch rename to meta/packages/linux/linux-moblin-2.6.27-rc1/0002_i915.Use_more_consistent_names_for_regs.patch diff --git a/meta/packages/linux/linux-moblin2-2.6.27-rc1/0003_i915.Add_support_for_MSI_and_interrupt_mitigation.patch b/meta/packages/linux/linux-moblin-2.6.27-rc1/0003_i915.Add_support_for_MSI_and_interrupt_mitigation.patch similarity index 100% rename from meta/packages/linux/linux-moblin2-2.6.27-rc1/0003_i915.Add_support_for_MSI_and_interrupt_mitigation.patch rename to meta/packages/linux/linux-moblin-2.6.27-rc1/0003_i915.Add_support_for_MSI_and_interrupt_mitigation.patch diff --git a/meta/packages/linux/linux-moblin2-2.6.27-rc1/0004_i915.Track_progress_inside_of_batchbuffers_for_determining_wedgedness.patch b/meta/packages/linux/linux-moblin-2.6.27-rc1/0004_i915.Track_progress_inside_of_batchbuffers_for_determining_wedgedness.patch similarity index 100% rename from meta/packages/linux/linux-moblin2-2.6.27-rc1/0004_i915.Track_progress_inside_of_batchbuffers_for_determining_wedgedness.patch rename to meta/packages/linux/linux-moblin-2.6.27-rc1/0004_i915.Track_progress_inside_of_batchbuffers_for_determining_wedgedness.patch diff --git a/meta/packages/linux/linux-moblin2-2.6.27-rc1/0005_i915.remove_settable_use_mi_batchbuffer_start.patch b/meta/packages/linux/linux-moblin-2.6.27-rc1/0005_i915.remove_settable_use_mi_batchbuffer_start.patch similarity index 100% rename from meta/packages/linux/linux-moblin2-2.6.27-rc1/0005_i915.remove_settable_use_mi_batchbuffer_start.patch rename to meta/packages/linux/linux-moblin-2.6.27-rc1/0005_i915.remove_settable_use_mi_batchbuffer_start.patch diff --git a/meta/packages/linux/linux-moblin2-2.6.27-rc1/0006_i915.Ignore_X_server_provided_mmio_address.patch b/meta/packages/linux/linux-moblin-2.6.27-rc1/0006_i915.Ignore_X_server_provided_mmio_address.patch similarity index 100% rename from meta/packages/linux/linux-moblin2-2.6.27-rc1/0006_i915.Ignore_X_server_provided_mmio_address.patch rename to meta/packages/linux/linux-moblin-2.6.27-rc1/0006_i915.Ignore_X_server_provided_mmio_address.patch diff --git a/meta/packages/linux/linux-moblin2-2.6.27-rc1/0007_i915.Initialize_hardware_status_page_at_device_load_when_possible.patch b/meta/packages/linux/linux-moblin-2.6.27-rc1/0007_i915.Initialize_hardware_status_page_at_device_load_when_possible.patch similarity index 100% rename from meta/packages/linux/linux-moblin2-2.6.27-rc1/0007_i915.Initialize_hardware_status_page_at_device_load_when_possible.patch rename to meta/packages/linux/linux-moblin-2.6.27-rc1/0007_i915.Initialize_hardware_status_page_at_device_load_when_possible.patch diff --git a/meta/packages/linux/linux-moblin2-2.6.27-rc1/0008_drm.Add_GEM_graphics_execution_manager_to_i915_driver.patch b/meta/packages/linux/linux-moblin-2.6.27-rc1/0008_drm.Add_GEM_graphics_execution_manager_to_i915_driver.patch similarity index 100% rename from meta/packages/linux/linux-moblin2-2.6.27-rc1/0008_drm.Add_GEM_graphics_execution_manager_to_i915_driver.patch rename to meta/packages/linux/linux-moblin-2.6.27-rc1/0008_drm.Add_GEM_graphics_execution_manager_to_i915_driver.patch diff --git a/meta/packages/linux/linux-moblin2-2.6.27-rc1/0009-squashfs3.3-2.6.27.patch b/meta/packages/linux/linux-moblin-2.6.27-rc1/0009-squashfs3.3-2.6.27.patch similarity index 100% rename from meta/packages/linux/linux-moblin2-2.6.27-rc1/0009-squashfs3.3-2.6.27.patch rename to meta/packages/linux/linux-moblin-2.6.27-rc1/0009-squashfs3.3-2.6.27.patch diff --git a/meta/packages/linux/linux-moblin2-2.6.27-rc1/0010_unionfs-2.4_for_2.6.27-rc1.patch b/meta/packages/linux/linux-moblin-2.6.27-rc1/0010_unionfs-2.4_for_2.6.27-rc1.patch similarity index 100% rename from meta/packages/linux/linux-moblin2-2.6.27-rc1/0010_unionfs-2.4_for_2.6.27-rc1.patch rename to meta/packages/linux/linux-moblin-2.6.27-rc1/0010_unionfs-2.4_for_2.6.27-rc1.patch diff --git a/meta/packages/linux/linux-moblin2-2.6.27-rc1/0011_workaround_unidef_step.patch b/meta/packages/linux/linux-moblin-2.6.27-rc1/0011_workaround_unidef_step.patch similarity index 100% rename from meta/packages/linux/linux-moblin2-2.6.27-rc1/0011_workaround_unidef_step.patch rename to meta/packages/linux/linux-moblin-2.6.27-rc1/0011_workaround_unidef_step.patch diff --git a/meta/packages/linux/linux-moblin2-2.6.27-rc1/0012_intelfb_945gme.patch b/meta/packages/linux/linux-moblin-2.6.27-rc1/0012_intelfb_945gme.patch similarity index 100% rename from meta/packages/linux/linux-moblin2-2.6.27-rc1/0012_intelfb_945gme.patch rename to meta/packages/linux/linux-moblin-2.6.27-rc1/0012_intelfb_945gme.patch diff --git a/meta/packages/linux/linux-moblin2-2.6.27-rc1/defconfig-eee901 b/meta/packages/linux/linux-moblin-2.6.27-rc1/defconfig-eee901 similarity index 100% rename from meta/packages/linux/linux-moblin2-2.6.27-rc1/defconfig-eee901 rename to meta/packages/linux/linux-moblin-2.6.27-rc1/defconfig-eee901 diff --git a/meta/packages/linux/linux-moblin2.inc b/meta/packages/linux/linux-moblin.inc similarity index 100% rename from meta/packages/linux/linux-moblin2.inc rename to meta/packages/linux/linux-moblin.inc diff --git a/meta/packages/linux/linux-moblin2_2.6.27-rc1.bb b/meta/packages/linux/linux-moblin_2.6.27-rc1.bb similarity index 96% rename from meta/packages/linux/linux-moblin2_2.6.27-rc1.bb rename to meta/packages/linux/linux-moblin_2.6.27-rc1.bb index fa9cccaffb..bf33144e66 100644 --- a/meta/packages/linux/linux-moblin2_2.6.27-rc1.bb +++ b/meta/packages/linux/linux-moblin_2.6.27-rc1.bb @@ -1,6 +1,6 @@ -require linux-moblin2.inc +require linux-moblin.inc -PR = "r2" +PR = "r3" DEFAULT_PREFERENCE_eee901 = "1" -- 2.40.1