From 146a09e0a4ccc92459f5611d74536c3a6d3af911 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Wed, 1 May 2019 18:38:27 +0200 Subject: shellrc: drop ash variant It doesn't not make any sense to have some ash variant. Ash is installed in default and what else should we have otherwise. --- personal-pkgs-repo/Makefile | 2 +- personal-pkgs-repo/files/updater.lua | 2 +- shellrc/Makefile | 18 ++---------------- 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/personal-pkgs-repo/Makefile b/personal-pkgs-repo/Makefile index 0c4ce70..df91bbe 100644 --- a/personal-pkgs-repo/Makefile +++ b/personal-pkgs-repo/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=personal-pkgs-repo -PKG_VERSION:=1.4.8 +PKG_VERSION:=1.4.9 PKG_MAINTAINER:=Karel Kočí PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) diff --git a/personal-pkgs-repo/files/updater.lua b/personal-pkgs-repo/files/updater.lua index ca5dd0f..a14e06a 100644 --- a/personal-pkgs-repo/files/updater.lua +++ b/personal-pkgs-repo/files/updater.lua @@ -52,7 +52,7 @@ if tools then Install("grep", "coreutils-sha256sum") Install("iperf", "iperf3") Install("sysstat", "strace", "gdbserver") - Install("shellrc-zsh", "shellrc-ash") + Install("shellrc-zsh") end if vpn then Install("luci-app-openvpn", "openvpn-openssl") diff --git a/shellrc/Makefile b/shellrc/Makefile index 1316349..5cf70a9 100644 --- a/shellrc/Makefile +++ b/shellrc/Makefile @@ -1,5 +1,5 @@ # -## Copyright (C) 2018 Karel Kočí +## Copyright (C) 2018-2019 Karel Kočí # ## This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -29,14 +29,7 @@ define Package/$(PKG_NAME)-zsh DEPENDS:=+$(PKG_NAME) +zsh endef -define Package/$(PKG_NAME)-ash - TITLE:=Shell initialization files ash specific - DEPENDS:=+$(PKG_NAME) +busybox -endef - -define Build/Compile - true -endef +Build/Compile:=: define Package/$(PKG_NAME)/install $(PKG_BUILD_DIR)/install --prefix "$(1)" @@ -50,13 +43,6 @@ define Package/$(PKG_NAME)-zsh/install $(PKG_BUILD_DIR)/install --prefix "$(1)" --zsh --no-base endef -define Package/$(PKG_NAME)-ash/install - true - # TODO - #$(PKG_BUILD_DIR)/install --prefix "$(1)" --ash --no-base -endef - $(eval $(call BuildPackage,$(PKG_NAME))) $(eval $(call BuildPackage,$(PKG_NAME)-bash)) $(eval $(call BuildPackage,$(PKG_NAME)-zsh)) -$(eval $(call BuildPackage,$(PKG_NAME)-ash)) -- cgit v1.2.3