[OpenWrt-Devel] [PATCH 1/2] ncdu: update to 1.11

[Charles Lehner]

Add patch to get WEXITSTATUS and WIFEXITED defined.

This patch will not be needed in the next ncdu release
because it is already fixed upstream.

Signed-off-by: Charles Lehner 
---
 utils/ncdu/Makefile   |  4 ++--
 utils/ncdu/patches/010-add_sys_wait.patch | 10 ++
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 utils/ncdu/patches/010-add_sys_wait.patch

diff --git a/utils/ncdu/Makefile b/utils/ncdu/Makefile
index edd8527..bae46bd 100644
--- a/utils/ncdu/Makefile
+++ b/utils/ncdu/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ncdu
-PKG_VERSION:=1.10
+PKG_VERSION:=1.11
 PKG_RELEASE=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://dev.yorhel.nl/download
-PKG_MD5SUM:=7535decc8d54eca811493e82d4bfab2d
+PKG_MD5SUM:=9e44240a5356b029f05f0e70a63c4d12
 
 PKG_INSTALL:=1
 
diff --git a/utils/ncdu/patches/010-add_sys_wait.patch 
b/utils/ncdu/patches/010-add_sys_wait.patch
new file mode 100644
index 000..b6ffe44
--- /dev/null
+++ b/utils/ncdu/patches/010-add_sys_wait.patch
@@ -0,0 +1,10 @@
+--- ncdu-1.11/src/shell.c
 ncdu-1.11/src/shell.c
+@@ -33,6 +33,7 @@
+ #include 
+ #include 
++#include 
+ 
+ void shell_draw() {
+   char *full_path;
+   int res;
-- 
2.1.4
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH 2/2] ncdu: optimize build

[Charles Lehner]

- depend on more commonly used libncurses instead of libncursesw
- enable parallel build

Signed-off-by: Charles Lehner 
---
 utils/ncdu/Makefile | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/utils/ncdu/Makefile b/utils/ncdu/Makefile
index bae46bd..4715a80 100644
--- a/utils/ncdu/Makefile
+++ b/utils/ncdu/Makefile
@@ -9,13 +9,14 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ncdu
 PKG_VERSION:=1.11
-PKG_RELEASE=1
+PKG_RELEASE=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://dev.yorhel.nl/download
 PKG_MD5SUM:=9e44240a5356b029f05f0e70a63c4d12
 
 PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=COPYING
@@ -26,7 +27,7 @@ define Package/ncdu
   SUBMENU:=Filesystem
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=+libncursesw
+  DEPENDS:=+libncurses
   TITLE:=ncurses disk usage viewer
   MAINTAINER:=Charles Lehner 
   URL:=http://dev.yorhel.nl/ncdu
@@ -38,6 +39,8 @@ define Package/ncdu/description
   directories and show percentages of disk usage with ncurses library.
 endef
 
+CONFIGURE_ARGS += --with-ncurses
+
 define Package/ncdu/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ncdu $(1)/usr/bin/
-- 
2.1.4
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] [PATCH] [package] uhttpd: fix handling of / as lua or ubus prefix

[Charles Lehner]

On Mon, 28 Jul 2014 12:30:23 +0200
Felix Fietkau  wrote:

> On 2014-07-28 07:52, Charles Lehner wrote:
> > From: Charles Lehner 
> > 
> > Fix up lua prefix and ubus prefix, as done with cgi prefix.
> > 
> > Signed-off-by: Charles Lehner 
> Your patch is whitespace mangled and does not apply. Please resend.
> 
> Thanks,
> 
> - Felix
> 

Woops, here is one with fixed whitespace.

Charles

---
diff --git a/main.c b/main.c
index 44c3226..39fb6b6 100644
--- a/main.c
+++ b/main.c
@@ -378,6 +378,7 @@ int main(int argc, char **argv)
 
 #ifdef HAVE_LUA
case 'l':
+   fixup_prefix(optarg);
conf.lua_prefix = optarg;
break;
 
@@ -397,6 +398,7 @@ int main(int argc, char **argv)
break;
 
case 'u':
+   fixup_prefix(optarg);
conf.ubus_prefix = optarg;
break;
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel