[oe-commits] org.oe.dev apex-env: Find partition named 'apex' for environment link.

[rwhitby commit]

apex-env: Find partition named 'apex' for environment link.

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: e49af3b0c9501d9799a24ac39d4afbb1c92ff181
ViewMTN: http://monotone.openembedded.org/revision/info/e49af3b0c9501d9799a24ac39d4afbb1c92ff181
Files:
1
packages/apex/files/find-apex-partition.patch
packages/apex/apex-env_1.5.8.bb
Diffs:

#
# mt diff -r93da97955651e2be857cbec4891eaf3f125f9ec4 -re49af3b0c9501d9799a24ac39d4afbb1c92ff181
#
# 
# 
# add_file "packages/apex/files/find-apex-partition.patch"
#  content [a1985a204e000e121aa7918bb0754ef375def89a]
# 
# patch "packages/apex/apex-env_1.5.8.bb"
#  from [fdbc0b6132572b780b950c96db6cdd6c7f609f7d]
#    to [802ae62b74a85155710d25eb4ad8101aab3c8f44]
# 
============================================================
--- packages/apex/files/find-apex-partition.patch	a1985a204e000e121aa7918bb0754ef375def89a
+++ packages/apex/files/find-apex-partition.patch	a1985a204e000e121aa7918bb0754ef375def89a
@@ -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);
============================================================
--- packages/apex/apex-env_1.5.8.bb	fdbc0b6132572b780b950c96db6cdd6c7f609f7d
+++ packages/apex/apex-env_1.5.8.bb	802ae62b74a85155710d25eb4ad8101aab3c8f44
@@ -1,11 +1,13 @@ LICENSE = "GPL"
 DESCRIPTION = "APEX Boot Loader Environment User Modification Tool"
 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}"