Re: [LEDE-DEV] [PATCH] Add Friendly Interactive Shell

2017-02-02 Thread Mathias Kresin 

01.02.2017 23:36, Shane Peelar:

Signed-off-by: Shane Peelar 
---
 utils/fish/Makefile | 71 +
 utils/fish/patches/0001-configure.patch | 11 +
 2 files changed, 82 insertions(+)
 create mode 100644 utils/fish/Makefile
 create mode 100644 utils/fish/patches/0001-configure.patch


This package as well as the PCRE2 libraries should go into the OpenWrt 
community packages repository at https://github.com/openwrt/packages.


Only essential packages are in the LEDE repository.

Mathias



___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] [PATCH] Add Friendly Interactive Shell

2017-02-01 Thread Rafał Miłecki 
On 1 February 2017 at 23:36, Shane Peelar  wrote:
> Signed-off-by: Shane Peelar 

Please use something like
[PATCH packages]


> ---
>  utils/fish/Makefile | 71 
> +
>  utils/fish/patches/0001-configure.patch | 11 +
>  2 files changed, 82 insertions(+)
>  create mode 100644 utils/fish/Makefile
>  create mode 100644 utils/fish/patches/0001-configure.patch
>
> diff --git a/utils/fish/Makefile b/utils/fish/Makefile
> new file mode 100644
> index 000..a5d7b6e
> --- /dev/null
> +++ b/utils/fish/Makefile
> @@ -0,0 +1,71 @@
> +#
> +# Copyright (C) 2007-2015 OpenWrt.org

Were you contracted by OpenWrt to work on this since 2007?

Please use your own name for copyrights with a proper year.

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH] Add Friendly Interactive Shell

2017-02-01 Thread Shane Peelar 
Signed-off-by: Shane Peelar 
---
 utils/fish/Makefile | 71 +
 utils/fish/patches/0001-configure.patch | 11 +
 2 files changed, 82 insertions(+)
 create mode 100644 utils/fish/Makefile
 create mode 100644 utils/fish/patches/0001-configure.patch

diff --git a/utils/fish/Makefile b/utils/fish/Makefile
new file mode 100644
index 000..a5d7b6e
--- /dev/null
+++ b/utils/fish/Makefile
@@ -0,0 +1,71 @@
+#
+# Copyright (C) 2007-2015 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+BASE_VERSION:=2.4.0
+
+PKG_NAME:=fish
+PKG_VERSION:=$(BASE_VERSION)
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(BASE_VERSION).tar.gz
+PKG_SOURCE_URL:=https://fishshell.com/files/2.4.0/
+PKG_SHA1SUM:=c5981245b45ea61b765008299b5ac477657089c3
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BASE_VERSION)
+
+PKG_LICENSE:=GPL-3.0+
+PKG_LICENSE_FILES:=COPYING
+PKG_MAINTAINER:=Shane Peelar 
+
+PKG_FIXUP:=autoreconf
+
+PKG_CHECK_FORMAT_SECURITY:=0
+include $(INCLUDE_DIR)/package.mk
+
+define Package/fish
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=Shells
+  TITLE:=The Friendly Interactive SHell
+  DEPENDS:=+libncurses +libpcre2-32 +libstdcpp
+  URL:=https://fishshell.com/
+endef
+
+define Package/fish/description
+  fish is a user friendly commandline shell intended mostly for interactive 
use. 
+   For the latest information on fish, please visit the fish homepage.
+endef
+
+
+define Build/Configure
+   $(call Build/Configure/Default, \
+   --without-included-pcre2)
+endef
+
+
+define Build/Compile
+   $(MAKE) -C $(PKG_BUILD_DIR) \
+   DESTDIR="$(PKG_INSTALL_DIR)" \
+   SHELL="/bin/sh" \
+   all install
+endef
+
+define Package/fish/postinst
+#!/bin/sh
+grep fish $${IPKG_INSTROOT}/etc/shells || \
+   echo "/usr/bin/fish" >> $${IPKG_INSTROOT}/etc/shells
+endef
+
+define Package/fish/install
+   $(INSTALL_DIR) $(1)/usr/bin
+   $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fish{_indent,_key_reader} 
$(1)/usr/bin/
+   $(CP) -r $(PKG_INSTALL_DIR)/usr/share $(1)/usr
+endef
+
+
+$(eval $(call BuildPackage,fish))
diff --git a/utils/fish/patches/0001-configure.patch 
b/utils/fish/patches/0001-configure.patch
new file mode 100644
index 000..59aae56
--- /dev/null
+++ b/utils/fish/patches/0001-configure.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac 2017-02-01 15:09:24.399387241 -0500
 b/configure.ac 2017-02-01 15:09:09.899387310 -0500
+@@ -236,7 +236,7 @@
+ # information about running processes.
+ #
+ 
+-AC_CHECK_FILES([/proc/self/stat])
++#AC_CHECK_FILES([/proc/self/stat])
+ 
+ # Disable curses macros that conflict with the STL
+ AC_DEFINE([NCURSES_NOMACROS], [1], [Define to 1 to disable ncurses macros 
that conflict with the STL])
-- 
2.11.0


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev