[oe-commits] org.oe.dev uboot-utils: Make it usable on other machines than the storcenter

[nail commit]

uboot-utils: Make it usable on other machines than the storcenter

Author: nail at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 436213c80e7a60c8c8aa7431e95557ee8fcd2b4f
ViewMTN: http://monotone.openembedded.org/revision.psp?id=436213c80e7a60c8c8aa7431e95557ee8fcd2b4f
Files:
1
packages/uboot-utils/fw_env.h.patch
packages/uboot-utils/env-Makefile.patch
packages/uboot-utils/files/env-Makefile.patch
packages/uboot-utils/fw_env.c.patch
packages/uboot-utils/files/fw_env.c.patch
packages/uboot-utils/tools-Makefile.patch
packages/uboot-utils/files/tools-Makefile.patch
packages/uboot-utils/files
packages/uboot-utils/files/fw_env.h.patch
packages/uboot-utils/uboot-utils_1.1.2.bb
Diffs:

#
# mt diff -rcc551d0b7ab4012acba8b4cf85caf32aa53f5f43 -r436213c80e7a60c8c8aa7431e95557ee8fcd2b4f
#
# 
# 
# delete "packages/uboot-utils/fw_env.h.patch"
# 
# rename "packages/uboot-utils/env-Makefile.patch"
#     to "packages/uboot-utils/files/env-Makefile.patch"
# 
# rename "packages/uboot-utils/fw_env.c.patch"
#     to "packages/uboot-utils/files/fw_env.c.patch"
# 
# rename "packages/uboot-utils/tools-Makefile.patch"
#     to "packages/uboot-utils/files/tools-Makefile.patch"
# 
# add_dir "packages/uboot-utils/files"
# 
# add_file "packages/uboot-utils/files/fw_env.h.patch"
#  content [bf83c2c595418e7871c5779e17b9e917ec906745]
# 
# patch "packages/uboot-utils/uboot-utils_1.1.2.bb"
#  from [b482bbfa50eae6be53497fdd4c9925268dc1707b]
#    to [f0fa6bc1e2131634594fd427fd71525b09532d4d]
# 
============================================================
--- packages/uboot-utils/files/fw_env.h.patch	bf83c2c595418e7871c5779e17b9e917ec906745
+++ packages/uboot-utils/files/fw_env.h.patch	bf83c2c595418e7871c5779e17b9e917ec906745
@@ -0,0 +1,24 @@
+--- u-boot-1.1.2.orig/tools/env/fw_env.h	2003-06-27 14:32:49.000000000 -0700
++++ u-boot-1.1.2/tools/env/fw_env.h	2006-11-16 10:51:01.000000000 -0800
+@@ -27,14 +27,15 @@
+  * See included "fw_env.config" sample file (TRAB board)
+  * for notes on configuration.
+  */
+-#define CONFIG_FILE     "/etc/fw_env.config"
+ 
+-#define HAVE_REDUND /* For systems with 2 env sectors */
+-#define DEVICE1_NAME      "/dev/mtd1"
++/* #define CONFIG_FILE     "/etc/fw_env.config" */
++
++#undef  HAVE_REDUND /* For systems with 2 env sectors */
++#define DEVICE1_NAME      "/dev/mtd/3"
+ #define DEVICE2_NAME      "/dev/mtd2"
+-#define DEVICE1_OFFSET    0x0000
+-#define ENV1_SIZE         0x4000
+-#define DEVICE1_ESIZE     0x4000
++#define DEVICE1_OFFSET    0x30000
++#define ENV1_SIZE         0x10000
++#define DEVICE1_ESIZE     0x10000
+ #define DEVICE2_OFFSET    0x0000
+ #define ENV2_SIZE         0x4000
+ #define DEVICE2_ESIZE     0x4000
============================================================
--- packages/uboot-utils/uboot-utils_1.1.2.bb	b482bbfa50eae6be53497fdd4c9925268dc1707b
+++ packages/uboot-utils/uboot-utils_1.1.2.bb	f0fa6bc1e2131634594fd427fd71525b09532d4d
@@ -1,11 +1,11 @@ DEPENDS = "mtd-utils"
 DESCRIPTION = "U-boot bootloader OS env. access tools for PPC"
 SECTION = "bootloaders"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "mtd-utils"
+PR = "1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/u-boot/u-boot-${PV}.tar.bz2 \
-	 file://fw_env.h.patch;patch=1 \
 	 file://fw_env.c.patch;patch=1 \
 	 file://tools-Makefile.patch;patch=1 \
 	 file://env-Makefile.patch;patch=1 "
@@ -33,7 +33,9 @@ do_install () {
 }
 
 do_install () {
-	install -d     ${D}/sbin
+	install -d	${D}/sbin
+	install -d	${D}${sysconfdir}
 	install -m 755 ${S}/tools/env/fw_printenv ${D}/sbin/fw_printenv
 	install -m 755 ${S}/tools/env/fw_printenv ${D}/sbin/fw_setenv
+	install -m 644 ${S}/tools/env/fw_env.config ${D}${sysconfdir}/fw_env.config
 }