diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-12-23 10:13:33 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-12-23 10:13:33 +0000 |
| commit | 954b2ef83b614194c7c050deee04a9b996578c8e (patch) | |
| tree | 8883296a2191a038159ccec6dec884077b36ec75 | |
| parent | 20e5fbe217c05900868741ec16b09092eaf0830a (diff) | |
| parent | 4a7845120a5e9bd146b6479f38fdde0b0bece357 (diff) | |
merge of 'd8bfa63aa913e7227790ba2d02253cfbecce61ab'
and 'e49af3b0c9501d9799a24ac39d4afbb1c92ff181'
| -rw-r--r-- | packages/apex/apex-env_1.5.8.bb | 6 | ||||
| -rw-r--r-- | packages/apex/files/find-apex-partition.patch | 34 |
2 files changed, 38 insertions, 2 deletions
diff --git a/packages/apex/apex-env_1.5.8.bb b/packages/apex/apex-env_1.5.8.bb index 0f310f107e..a0e44346bb 100644 --- a/packages/apex/apex-env_1.5.8.bb +++ b/packages/apex/apex-env_1.5.8.bb @@ -3,9 +3,11 @@ SECTION = "util" PRIORITY = "optional" HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" LICENSE = "GPL" -# PR = "r1" +PR = "r1" -SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz" +SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \ + file://find-apex-partition.patch;patch=1 \ + " S = ${WORKDIR}/apex-${PV}/usr EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}" diff --git a/packages/apex/files/find-apex-partition.patch b/packages/apex/files/find-apex-partition.patch new file mode 100644 index 0000000000..3aa62a186a --- /dev/null +++ b/packages/apex/files/find-apex-partition.patch @@ -0,0 +1,34 @@ +*** usr/link.cc.orig Sun Dec 23 20:31:49 2007 +--- usr/link.cc Sun Dec 23 20:32:46 2007 +*************** +*** 278,285 **** + fixed-up env_link structure, scanning for the environment variables + and their defaults, and opening the flash instance of the + environment. It first looks for the "Loader" partition. If there +! is none, it uses the first partition with the assumption that APEX +! may be the primary boot loader. + + */ + +--- 278,286 ---- + fixed-up env_link structure, scanning for the environment variables + and their defaults, and opening the flash instance of the + environment. It first looks for the "Loader" partition. If there +! is none, it then looks for the "apex" partition. If there is none, +! it uses the first partition with the assumption that APEX may be +! the primary boot loader. + + */ + +*************** +*** 289,294 **** +--- 290,298 ---- + MTDPartition mtd = MTDPartition::find ("Loader"); + + if (!mtd.is ()) ++ mtd = MTDPartition::find ("apex"); ++ ++ if (!mtd.is ()) + mtd = MTDPartition::first (); + + bool fFound = mtd.is () && open_apex (mtd); |