diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-03-06 17:48:07 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-03-06 17:48:07 +0000 |
| commit | ccab4b3ba6f2ccc5e598c9d2ec6405f4494ca200 (patch) | |
| tree | e5ef89417787be33a962905a6a9c6d79e456e6f1 | |
| parent | bc63d79985ece0bdf9ea69a0df0a25fcc36f6c3c (diff) | |
| parent | abbb0c6e198af23ee2216bd6849d91a70cb4ba6c (diff) | |
merge of '90546772890b2522b88f319019775be22b6e70f2'
and '9ddb942debcda58f976549da4141ba8488765949'
| -rw-r--r-- | conf/distro/angstrom-2007.1-oabi.conf | 2 | ||||
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 4 | ||||
| -rw-r--r-- | packages/linux/linux-handhelds-2.6_2.6.19-hh13.bb (renamed from packages/linux/linux-handhelds-2.6_2.6.19-hh12.bb) | 0 | ||||
| -rw-r--r-- | packages/linux/linux-handhelds-2.6_cvs.bb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/conf/distro/angstrom-2007.1-oabi.conf b/conf/distro/angstrom-2007.1-oabi.conf index f2fee9f1c8..d2e59f85a4 100644 --- a/conf/distro/angstrom-2007.1-oabi.conf +++ b/conf/distro/angstrom-2007.1-oabi.conf @@ -11,7 +11,7 @@ TARGET_OS = "linux" PACKAGE_ARCH = "arm-oabi" PACKAGE_EXTRA_ARCHS = "arm-oabi" -PREFERRED_VERSION_linux-handhelds-2.6_h3600 = "2.6.19-hh12" +PREFERRED_VERSION_linux-handhelds-2.6_h3600 = "2.6.19-hh13" FEED_ARCH_collie = "arm-oabi" FEED_ARCH_h3600 = "arm-oabi" diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 187d7c6bf1..d6766bedbc 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -85,8 +85,8 @@ FEED_URIS += " \ #SRCDATE = "20070303" PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.16-hh9" -PREFERRED_VERSION_linux-handhelds-2.6_h3900 ?= "2.6.19-hh12" -PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal ?= "2.6.19-hh12" +PREFERRED_VERSION_linux-handhelds-2.6_h3900 ?= "2.6.19-hh13" +PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal ?= "2.6.19-hh13" PREFERRED_VERSION_file = "4.18" PREFERRED_VERSION_file_native = "4.18" diff --git a/packages/linux/linux-handhelds-2.6_2.6.19-hh12.bb b/packages/linux/linux-handhelds-2.6_2.6.19-hh13.bb index ec5844bfb5..ec5844bfb5 100644 --- a/packages/linux/linux-handhelds-2.6_2.6.19-hh12.bb +++ b/packages/linux/linux-handhelds-2.6_2.6.19-hh13.bb diff --git a/packages/linux/linux-handhelds-2.6_cvs.bb b/packages/linux/linux-handhelds-2.6_cvs.bb index 2211bab8f0..0f9a38b631 100644 --- a/packages/linux/linux-handhelds-2.6_cvs.bb +++ b/packages/linux/linux-handhelds-2.6_cvs.bb @@ -9,7 +9,7 @@ DEFAULT_PREFERENCE = "-1" K_MAJOR = "2" K_MINOR = "6" K_MICRO = "20" -HHV = "1" +HHV = "2" SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26 \ file://defconfig" |