Re: [OpenWrt-Devel] [PATCHv3] package/uboot-envtools: generate config-file from UCI and make fw_setenv symlink optional

2011-11-01 Thread Gabor Juhos
2011.10.27. 17:02 keltezéssel, Daniel Golle írta:
 On Thu, Oct 27, 2011 at 04:51:57PM +0200, Thomas Langer wrote:
 please check, if this really creates multiple entries in /etc/fw_env.config 
 if they are defined in the uci config.
 This is required for (other) boards using a redundant environment.
 Updated the init-script accordingly, multiple environments are now appended 
 to /etc/fw_env.config.
 
 Signed-off-by: Daniel Golle dgo...@allnet.de

Applied in r28696, r28697 and r28698.

Thanks,
Gabor
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] [PATCHv3] package/uboot-envtools: generate config-file from UCI and make fw_setenv symlink optional

2011-10-27 Thread Daniel Golle
On Thu, Oct 27, 2011 at 04:51:57PM +0200, Thomas Langer wrote:
 please check, if this really creates multiple entries in /etc/fw_env.config 
 if they are defined in the uci config.
 This is required for (other) boards using a redundant environment.
Updated the init-script accordingly, multiple environments are now appended to 
/etc/fw_env.config.

Signed-off-by: Daniel Golle dgo...@allnet.de

Index: package/uboot-envtools/files/uboot-envtools.init
===
--- package/uboot-envtools/files/uboot-envtools.init(revision 0)
+++ package/uboot-envtools/files/uboot-envtools.init(revision 0)
@@ -0,0 +1,27 @@
+#!/bin/sh /etc/rc.common
+# (C) 2011 OpenWrt.org
+# Creates /etc/fw_env.conf for fw_printenv (and fw_setenv)
+
+START=80
+
+create_fwenv_config() {
+   local dev
+   local offset
+   local envsize
+   local secsize
+   local numsec
+   config_get dev $1 dev
+   config_get offset $1 offset 0x
+   config_get envsize $1 envsize
+   config_get secsize $1 secsize
+   config_get numsec $1 numsec
+   echo $dev  $offset $envsize
$secsize$numsec /etc/fw_env.config
+}
+
+start() {
+   [ ! -e /etc/fw_env.config ]  {
+   echo # MTD device name Device offset   Env. size   Flash 
sector size   Number of sectors /etc/fw_env.config
+   config_load ubootenv
+   config_foreach create_fwenv_config ubootenv
+   }
+}

Property changes on: package/uboot-envtools/files/uboot-envtools.init
___
Added: svn:executable
   + *

Index: package/uboot-envtools/Makefile
===
--- package/uboot-envtools/Makefile (revision 28625)
+++ package/uboot-envtools/Makefile (working copy)
@@ -10,7 +10,7 @@
 PKG_NAME:=uboot-envtools
 PKG_DISTNAME:=u-boot
 PKG_VERSION:=2011.06
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.denx.de/pub/u-boot
@@ -24,18 +24,27 @@
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=read/modify U-Boot bootloader environment
-  DEPENDS:= +zlib
   URL:=http://www.denx.de/wiki/U-Boot
+  PKG_BUILD_DEPENDS:=zlib
 endef
 
 define Package/uboot-envtools/description
  This package includes tools to read and modify U-Boot bootloader environment.
 endef
 
+define Package/uboot-envtools/config
+config PACKAGE_uboot-envtools_setenv_symlink
+bool create fw_setenv symlink
+endef
+
 define Package/uboot-envtools/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/fw_printenv $(1)/usr/sbin/
-   ln -sf fw_printenv $(1)/usr/sbin/fw_setenv
+   $(INSTALL_DIR) $(1)/etc/init.d
+   $(INSTALL_BIN) ./files/uboot-envtools.init 
$(1)/etc/init.d/uboot-envtools
+ifneq ($(CONFIG_PACKAGE_uboot-envtools_setenv_symlink),)
+   ln -s fw_printenv $(1)/usr/sbin/fw_setenv
+endif
 endef
 
 define Build/Prepare
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel