aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2014-11-30 01:14:17 +0000
committerLuka Perkov <luka@openwrt.org>2014-11-30 01:14:17 +0000
commitc25e55d851a4a5590610b238cb77df92237bfb7e (patch)
tree9f2cf6fd68a5387ac0c75b7707140dd46b8e65f2
parent5c4f9198bbe94d5ae513e601631393048ecc61b7 (diff)
downloadupstream-c25e55d851a4a5590610b238cb77df92237bfb7e.tar.gz
upstream-c25e55d851a4a5590610b238cb77df92237bfb7e.tar.bz2
upstream-c25e55d851a4a5590610b238cb77df92237bfb7e.zip
uboot-envtools: bump to 2014.10
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 43433
-rw-r--r--package/boot/uboot-envtools/Makefile12
-rw-r--r--package/boot/uboot-envtools/patches/001-compile.patch2
-rw-r--r--package/boot/uboot-envtools/patches/300-support-env-in-ubivol-chardev.patch2
3 files changed, 8 insertions, 8 deletions
diff --git a/package/boot/uboot-envtools/Makefile b/package/boot/uboot-envtools/Makefile
index a6467e1d2d..6b0885ac8b 100644
--- a/package/boot/uboot-envtools/Makefile
+++ b/package/boot/uboot-envtools/Makefile
@@ -9,23 +9,23 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=uboot-envtools
PKG_DISTNAME:=u-boot
-PKG_VERSION:=2014.07
+PKG_VERSION:=2014.10
PKG_RELEASE:=1
+PKG_BUILD_DIR:=$(BUILD_DIR)/u-boot-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:= \
+PKG_SOURCE_URL:=\
http://mirror2.openwrt.org/sources \
ftp://ftp.denx.de/pub/u-boot
-
-PKG_MD5SUM:=36d4bad687edcafa396fee607e505d4e
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/u-boot-$(PKG_VERSION)
+PKG_MD5SUM:=3ddcaee2f05b7c464778112ec83664b5
PKG_BUILD_DEPENDS:=+fstools
PKG_LICENSE:=GPL-2.0 GPL-2.0+
PKG_LICENSE_FILES:=Licenses/README
+PKG_BUILD_PARALLEL:=1
+
include $(INCLUDE_DIR)/package.mk
define Package/uboot-envtools
diff --git a/package/boot/uboot-envtools/patches/001-compile.patch b/package/boot/uboot-envtools/patches/001-compile.patch
index 5e038ce729..1705979765 100644
--- a/package/boot/uboot-envtools/patches/001-compile.patch
+++ b/package/boot/uboot-envtools/patches/001-compile.patch
@@ -9,5 +9,5 @@
+endif
+
# Compile for a hosted environment on the target
- HOST_EXTRACFLAGS = $(patsubst -I%,-idirafter%, $(UBOOTINCLUDE)) \
+ HOST_EXTRACFLAGS = $(patsubst -I%,-idirafter%, $(filter -I%, $(UBOOTINCLUDE))) \
-idirafter $(srctree)/tools/env \
diff --git a/package/boot/uboot-envtools/patches/300-support-env-in-ubivol-chardev.patch b/package/boot/uboot-envtools/patches/300-support-env-in-ubivol-chardev.patch
index 557fa9756f..05ec74ae68 100644
--- a/package/boot/uboot-envtools/patches/300-support-env-in-ubivol-chardev.patch
+++ b/package/boot/uboot-envtools/patches/300-support-env-in-ubivol-chardev.patch
@@ -21,7 +21,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+endif
+
always := fw_printenv
- hostprogs-y := fw_printenv_unstripped
+ hostprogs-y := fw_printenv
--- a/tools/env/fw_env.c
+++ b/tools/env/fw_env.c