From a33560b767853b34bcdd99b4298cd34f48fcf28f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 7 Aug 2005 14:20:15 +0000 Subject: [PATCH] linux-oz-2.6: Update to 2.6.13-rc5-mm1. Remove merged patches. --- .../.mtn2git_empty | 0 .../add-elpp-stuff.patch | 0 .../add-oz-release-string.patch | 0 .../defconfig-c7x0 | 0 .../defconfig-collie | 0 .../defconfig-ipaq-pxa-2.6 | 0 .../defconfig-poodle | 0 .../defconfig-spitz | 0 .../defconfig-tosa | 0 .../dtl1_cs-add-socket-revE.patch | 0 .../pxa-serial-hack.patch | 0 ....bb => linux-openzaurus_2.6.13-rc5-mm1.bb} | 26 +++++++++---------- 12 files changed, 13 insertions(+), 13 deletions(-) rename packages/linux/{linux-openzaurus-2.6.13-rc4-mm1 => linux-openzaurus-2.6.13-rc5-mm1}/.mtn2git_empty (100%) rename packages/linux/{linux-openzaurus-2.6.13-rc4-mm1 => linux-openzaurus-2.6.13-rc5-mm1}/add-elpp-stuff.patch (100%) rename packages/linux/{linux-openzaurus-2.6.13-rc4-mm1 => linux-openzaurus-2.6.13-rc5-mm1}/add-oz-release-string.patch (100%) rename packages/linux/{linux-openzaurus-2.6.13-rc4-mm1 => linux-openzaurus-2.6.13-rc5-mm1}/defconfig-c7x0 (100%) rename packages/linux/{linux-openzaurus-2.6.13-rc4-mm1 => linux-openzaurus-2.6.13-rc5-mm1}/defconfig-collie (100%) rename packages/linux/{linux-openzaurus-2.6.13-rc4-mm1 => linux-openzaurus-2.6.13-rc5-mm1}/defconfig-ipaq-pxa-2.6 (100%) rename packages/linux/{linux-openzaurus-2.6.13-rc4-mm1 => linux-openzaurus-2.6.13-rc5-mm1}/defconfig-poodle (100%) rename packages/linux/{linux-openzaurus-2.6.13-rc4-mm1 => linux-openzaurus-2.6.13-rc5-mm1}/defconfig-spitz (100%) rename packages/linux/{linux-openzaurus-2.6.13-rc4-mm1 => linux-openzaurus-2.6.13-rc5-mm1}/defconfig-tosa (100%) rename packages/linux/{linux-openzaurus-2.6.13-rc4-mm1 => linux-openzaurus-2.6.13-rc5-mm1}/dtl1_cs-add-socket-revE.patch (100%) rename packages/linux/{linux-openzaurus-2.6.13-rc4-mm1 => linux-openzaurus-2.6.13-rc5-mm1}/pxa-serial-hack.patch (100%) rename packages/linux/{linux-openzaurus_2.6.13-rc4-mm1.bb => linux-openzaurus_2.6.13-rc5-mm1.bb} (92%) diff --git a/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/.mtn2git_empty b/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/.mtn2git_empty similarity index 100% rename from packages/linux/linux-openzaurus-2.6.13-rc4-mm1/.mtn2git_empty rename to packages/linux/linux-openzaurus-2.6.13-rc5-mm1/.mtn2git_empty diff --git a/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/add-elpp-stuff.patch b/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/add-elpp-stuff.patch similarity index 100% rename from packages/linux/linux-openzaurus-2.6.13-rc4-mm1/add-elpp-stuff.patch rename to packages/linux/linux-openzaurus-2.6.13-rc5-mm1/add-elpp-stuff.patch diff --git a/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/add-oz-release-string.patch b/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/add-oz-release-string.patch similarity index 100% rename from packages/linux/linux-openzaurus-2.6.13-rc4-mm1/add-oz-release-string.patch rename to packages/linux/linux-openzaurus-2.6.13-rc5-mm1/add-oz-release-string.patch diff --git a/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-c7x0 similarity index 100% rename from packages/linux/linux-openzaurus-2.6.13-rc4-mm1/defconfig-c7x0 rename to packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-c7x0 diff --git a/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/defconfig-collie b/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-collie similarity index 100% rename from packages/linux/linux-openzaurus-2.6.13-rc4-mm1/defconfig-collie rename to packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-collie diff --git a/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/defconfig-ipaq-pxa-2.6 b/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-ipaq-pxa-2.6 similarity index 100% rename from packages/linux/linux-openzaurus-2.6.13-rc4-mm1/defconfig-ipaq-pxa-2.6 rename to packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-ipaq-pxa-2.6 diff --git a/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/defconfig-poodle b/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-poodle similarity index 100% rename from packages/linux/linux-openzaurus-2.6.13-rc4-mm1/defconfig-poodle rename to packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-poodle diff --git a/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/defconfig-spitz b/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz similarity index 100% rename from packages/linux/linux-openzaurus-2.6.13-rc4-mm1/defconfig-spitz rename to packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz diff --git a/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/defconfig-tosa b/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-tosa similarity index 100% rename from packages/linux/linux-openzaurus-2.6.13-rc4-mm1/defconfig-tosa rename to packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-tosa diff --git a/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/dtl1_cs-add-socket-revE.patch b/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/dtl1_cs-add-socket-revE.patch similarity index 100% rename from packages/linux/linux-openzaurus-2.6.13-rc4-mm1/dtl1_cs-add-socket-revE.patch rename to packages/linux/linux-openzaurus-2.6.13-rc5-mm1/dtl1_cs-add-socket-revE.patch diff --git a/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/pxa-serial-hack.patch b/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/pxa-serial-hack.patch similarity index 100% rename from packages/linux/linux-openzaurus-2.6.13-rc4-mm1/pxa-serial-hack.patch rename to packages/linux/linux-openzaurus-2.6.13-rc5-mm1/pxa-serial-hack.patch diff --git a/packages/linux/linux-openzaurus_2.6.13-rc4-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb similarity index 92% rename from packages/linux/linux-openzaurus_2.6.13-rc4-mm1.bb rename to packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb index c726d24793..8021dc4211 100644 --- a/packages/linux/linux-openzaurus_2.6.13-rc4-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r1" +PR = "r0" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" @@ -29,19 +29,20 @@ BASRC = "http://www.orca.cx/zaurus/patches" # ${RPSRC}/corgikbd_temphack-r0.patch;patch=1 \ # ${RPSRC}/2.6.13-rc3-mm3_fix-r0.patch;patch=1 \ # ${RPSRC}/mmc_sd-r5.patch;patch=1 \ +# ${RPSRC}/preempt_nwfpe-r2.patch;patch=1 \ +# ${RPSRC}/oprofile_typo-r0.patch;patch=1 \ +# ${RPSRC}/mmc_bytefix-r0.patch;patch=1 \ +# ${RPSRC}/mmc_pxa_roswitch-r0.patch;patch=1 \ +# ${RPSRC}/mmc_corgi_roswitch-r0.patch;patch=1 \ +# ${RPSRC}/corgi_base_extras1-r4.patch;patch=1 \ + # Patches submitted upstream are towards top of this list SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ - ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.13-rc4.bz2;patch=1 \ - ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.13-rc4/2.6.13-rc4-mm1/2.6.13-rc4-mm1.bz2;patch=1 \ - ${RPSRC}/reverse_pagefault-r1.patch;patch=1 \ - ${RPSRC}/preempt_nwfpe-r2.patch;patch=1 \ - ${RPSRC}/oprofile_typo-r0.patch;patch=1 \ + ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.13-rc5.bz2;patch=1 \ + ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.13-rc5/2.6.13-rc5-mm1/2.6.13-rc5-mm1.bz2;patch=1 \ + ${RPSRC}/reverse_pagefault-r2.patch;patch=1 \ ${RPSRC}/corgi_tspmufix-r0.patch;patch=1 \ - ${RPSRC}/mmc_bytefix-r0.patch;patch=1 \ - ${RPSRC}/mmc_pxa_roswitch-r0.patch;patch=1 \ - ${RPSRC}/mmc_corgi_roswitch-r0.patch;patch=1 \ - ${RPSRC}/corgi_base_extras1-r4.patch;patch=1 \ ${RPSRC}/pxa_rtc-r1.patch;patch=1 \ ${RPSRC}/pxa_irda-r2.patch;patch=1 \ ${RPSRC}/sharp_multi_pcmcia-r2.patch;patch=1 \ @@ -77,7 +78,6 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${DOSRC}/tosa-lcd-r3.patch;patch=1 \ ${DOSRC}/tosa-2.6.13-r1.patch;patch=1 \ ${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \ - ${JLSRC}/zaurus-local-2.6.11.diff.gz;patch=1 \ file://add-oz-release-string.patch;patch=1 \ file://add-elpp-stuff.patch;patch=1 \ file://pxa-serial-hack.patch;patch=1 \ @@ -90,8 +90,8 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ file://defconfig-spitz \ file://defconfig-tosa " - -#${JLSRC}/zaurus-base-2.6.11.diff.gz;patch=1 \ +# ${JLSRC}/zaurus-local-2.6.11.diff.gz;patch=1 \ +# ${JLSRC}/zaurus-base-2.6.11.diff.gz;patch=1 \ # ${JLSRC}/zaurus-leds-2.6.11.diff.gz;patch=1 \ SRC_URI_append_collie = "${RPSRC}/jl1/collie_keymap.patch;patch=1 " -- 2.39.5