summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <karel.koci@nic.cz>2020-06-22 18:00:34 +0200
committerKarel Kočí <karel.koci@nic.cz>2020-06-22 18:00:34 +0200
commite13f0e62373c9521316e799ed39ab25ce0ab71d0 (patch)
tree0e393dd68057ca33b6b5ba56a4623580cff115ee
parented8a1598c030667f165696bf01014746f15b5a3d (diff)
downloadopenwrt-personal-pkgs-e13f0e62373c9521316e799ed39ab25ce0ab71d0.tar.gz
openwrt-personal-pkgs-e13f0e62373c9521316e799ed39ab25ce0ab71d0.tar.bz2
openwrt-personal-pkgs-e13f0e62373c9521316e799ed39ab25ce0ab71d0.zip
Remove libb64 and dependency on it in updater-ng
-rw-r--r--libb64/Makefile48
-rw-r--r--updater-ng/Makefile2
2 files changed, 1 insertions, 49 deletions
diff --git a/libb64/Makefile b/libb64/Makefile
deleted file mode 100644
index 5b86800..0000000
--- a/libb64/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-## Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
-#
-## This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-# #
-#
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libb64
-PKG_VERSION:=2.0.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://codeload.github.com/libb64/libb64/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=28c43c47674409fc50e7145d4c2d26dc1f3d200889c41205e7812c2b67f26382
-
-PKG_MAINTAINER:=CZ.NIC <packaging@turris.cz>
-
-include $(INCLUDE_DIR)/host-build.mk
-include $(INCLUDE_DIR)/package.mk
-
-EXTRA_CFLAGS += -fPIC
-
-define Build/Compile
- $(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR)/src $(MAKE_FLAGS)
-endef
-
-define Host/Compile
- $(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR)/src $(HOST_MAKE_FLAGS)
-endef
-
-define Build/InstallDev
- $(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_BUILD_DIR)/src/libb64.a $(1)/usr/lib/
- $(INSTALL_DIR) $(1)/usr/include/b64
- $(CP) $(PKG_BUILD_DIR)/include/b64/* $(1)/usr/include/b64/
-endef
-
-define Host/Install
- $(INSTALL_DIR) $(STAGING_DIR_HOST)/usr/lib
- $(CP) $(HOST_BUILD_DIR)/src/libb64.a $(STAGING_DIR_HOST)/usr/lib/
- $(INSTALL_DIR) $(STAGING_DIR_HOST)/usr/include/b64
- $(CP) $(HOST_BUILD_DIR)/include/b64/* $(STAGING_DIR_HOST)/usr/include/b64/
-endef
-
-$(eval $(call HostBuild))
-$(eval $(call Build/DefaultTargets))
diff --git a/updater-ng/Makefile b/updater-ng/Makefile
index c9ff272..4334f8a 100644
--- a/updater-ng/Makefile
+++ b/updater-ng/Makefile
@@ -12,7 +12,7 @@ PKG_SOURCE_URL:=https://gitlab.labs.nic.cz/turris/updater/updater.git
PKG_SOURCE_BRANCH:=hotfix-sign
PKG_MAINTAINER:=CZ.NIC <packaging@turris.cz>
-PKG_BUILD_DEPENDS:=busybox libb64 uthash argp-standalone
+PKG_BUILD_DEPENDS:=busybox uthash argp-standalone
PKG_INSTALL:=1
PKG_FIXUP:=autoreconf