aboutsummaryrefslogtreecommitdiffstats
path: root/package/boot/uboot-envtools/patches
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
commit5694907d83acad5f0042f23db6518f17b54edd07 (patch)
tree8669b38eeb5a3d1402f9abef1bbbf271fe2c041a /package/boot/uboot-envtools/patches
parent6f8a78e39b49fec9dc33420b4ea163f23cafc6f1 (diff)
downloadmaster-187ad058-5694907d83acad5f0042f23db6518f17b54edd07.tar.gz
master-187ad058-5694907d83acad5f0042f23db6518f17b54edd07.tar.bz2
master-187ad058-5694907d83acad5f0042f23db6518f17b54edd07.zip
uboot-envtools: bump to 2014.10
Signed-off-by: Luka Perkov <luka@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43433 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/boot/uboot-envtools/patches')
-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
2 files changed, 2 insertions, 2 deletions
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