diff options
author | Karel Kočí <karel.koci@nic.cz> | 2018-02-19 15:59:32 +0100 |
---|---|---|
committer | Karel Kočí <karel.koci@nic.cz> | 2018-02-19 15:59:32 +0100 |
commit | d6fb69c26c1ed966b41d3d1f09b40638fce3e521 (patch) | |
tree | 38b148bae13bab561aa0918da6e3eb84cab3202b | |
parent | 679ec20eabb4ee738e100ab9c49b79c77d75d801 (diff) | |
download | turris-myrepo-d6fb69c26c1ed966b41d3d1f09b40638fce3e521.tar.gz turris-myrepo-d6fb69c26c1ed966b41d3d1f09b40638fce3e521.tar.bz2 turris-myrepo-d6fb69c26c1ed966b41d3d1f09b40638fce3e521.zip |
Drop files that shouldn't be in master
These files are my personal ones and shouldn't be there when we are
releasing this as a tool to public.
-rwxr-xr-x | build_deploy.sh | 20 | ||||
-rw-r--r-- | deactivated/turris-lcd/Makefile | 41 | ||||
-rw-r--r-- | key.sec | 2 | ||||
-rw-r--r-- | myrepo/files/key.pub | 2 | ||||
-rw-r--r-- | turtetris/Makefile | 105 | ||||
-rwxr-xr-x | turtetris/files/master.init | 15 | ||||
-rwxr-xr-x | turtetris/files/slave.init | 15 | ||||
-rw-r--r-- | turtetris/files/uci | 3 | ||||
-rw-r--r-- | updater-ng/Makefile | 198 | ||||
-rw-r--r-- | updater-ng/files/updater.config | 9 |
10 files changed, 0 insertions, 410 deletions
diff --git a/build_deploy.sh b/build_deploy.sh deleted file mode 100755 index 80572d0..0000000 --- a/build_deploy.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -cd "$(dirname "$0")" - -./build_repo.sh "$@" - -deploy() { - local TARGET="cynerd.cz:/var/www/myrepo" - ssh cynerd.cz -- mkdir -p "/var/www/myrepo/$1" # Make sure that directory exists - echo -e "\e[1;34mDeploy $1\e[0m" - scp repo/$1/* $TARGET/$1/ - - .$1-sdk/staging_dir/host/bin/usign -S -s key.sec -m $1.lua - scp $1.lua $TARGET/$1.lua - scp $1.lua.sig $TARGET/$1.lua.sig - rm $1.lua.sig -} - -[ ! -d repo/omnia ] || deploy omnia -[ ! -d repo/turris ] || deploy turris diff --git a/deactivated/turris-lcd/Makefile b/deactivated/turris-lcd/Makefile deleted file mode 100644 index dbf260a..0000000 --- a/deactivated/turris-lcd/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# -## Copyright (C) 2016 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:=turris-lcd -PKG_VERSION:=1 -PKG_RELEASE:=3 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=http://git.cynerd.cz/turris-lcd -PKG_SOURCE:=$(PKG_NAME).tar.gz -PKG_SOURCE_VERSION:=eda6326d35e65098e08518a2c6b499709f8ee67e -PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz -PKG_SOURCE_SUBDIR:=$(PKG_NAME) -PKG_MAINTAINER:=Karel Koci -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) - -include $(INCLUDE_DIR)/package.mk - -define Package/turris-lcd - TITLE:=turris-lcd - DEPENDS:=+libc +libstdcpp -endef - -# Compilation seems to be some what broken with static library so just go around.. -define Build/Compile - cd $(PKG_BUILD_DIR) && ./configure - $(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) Q= -endef - #cd $(BUILD_DIR)/turris-lcd && arm-openwrt-linux-g++ -Iliblcd liblcd/I2CIO.cpp liblcd/LCD.cpp liblcd/LiquidCrystal_I2C.cpp liblcd/smbus.c src/turris-lcd.cpp -o turris-lcd - -define Package/turris-lcd/install - $(INSTALL_DIR) $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/turris-lcd $(1)/usr/bin/turris-lcd -endef - -$(eval $(call BuildPackage,turris-lcd)) diff --git a/key.sec b/key.sec deleted file mode 100644 index 5731869..0000000 --- a/key.sec +++ /dev/null @@ -1,2 +0,0 @@ -untrusted comment: public key cfb977a0d53c5424 -RWRCSwAAAAC/rGfdjaQn9ZWPHvtqQrzm9dkd/bHNF4XPuXeg1TxUJCiZuBFQLxqoolLnufYHIHHGvgFbJpjnT1v8X2W831l+LoQ6ZrB2ibH7Vy49oHHmDoHUDaerRMjoZ/yZtGhTbDo= diff --git a/myrepo/files/key.pub b/myrepo/files/key.pub deleted file mode 100644 index 4173ed5..0000000 --- a/myrepo/files/key.pub +++ /dev/null @@ -1,2 +0,0 @@ -untrusted comment: private key cfb977a0d53c5424 -RWTPuXeg1TxUJC6EOmawdomx+1cuPaBx5g6B1A2nq0TI6Gf8mbRoU2w6 diff --git a/turtetris/Makefile b/turtetris/Makefile deleted file mode 100644 index b962a92..0000000 --- a/turtetris/Makefile +++ /dev/null @@ -1,105 +0,0 @@ -# -# Copyright (C) 2017 CZ.NIC, z. s. p. o. (https://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:=turtetris -PKG_VERSION:=1.3 -PKG_RELEASE:=1 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://git.cynerd.cz/turris-tetris -PKG_SOURCE_VERSION:=v$(PKG_VERSION) -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) - -include $(INCLUDE_DIR)/package.mk -$(call include_mk, python3-package.mk) - -define Package/Common - SUBMENU:=Python - SECTION:=lang - CATEGORY:=Languages - URL:=http://git.cynerd.cz/turris-tetris/ - MAINTAINER:=CZ.NIC <packaging@turris.cz> -endef - -define Package/$(PKG_NAME) - TITLE:=turtetris - $(call Package/Common) - DEPENDS:=+python3 +python3-usb +python3-zmq -endef - -define Package/$(PKG_NAME)-master - TITLE:=turtetris-master - $(call Package/Common) - DEPENDS:=+turtetris +turtetris-slave -endef - -define Package/$(PKG_NAME)-slave - TITLE:=turtetris-slave - $(call Package/Common) - DEPENDS:=+turtetris -endef - -define Package/$(PKG_NAME)/description - Tetris game played on ten Turris Omnias stacked on top of each other. -endef - -define Build/Compile - $(call Build/Compile/Py3Mod,,install --prefix="/usr" --root=$(PKG_INSTALL_DIR)) -endef - -define Package/$(PKG_NAME)-master/install - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/master.init $(1)/etc/init.d/turtetris-master -endef - -define Package/$(PKG_NAME)-slave/install - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/slave.init $(1)/etc/init.d/turtetris-slave - $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_CONF) ./files/uci $(1)/etc/config/turtetris -endef - -define Package/$(PKG_NAME)-slave/conffiles -/etc/config/turtetris -endef - -define Package/$(PKG_NAME)-master/postinst -[ -n "$$IPKG_INSTROOT" ] || { - /etc/init.d/turtetris-master enable - /etc/init.d/turtetris-master restart -} -endef - -define Package/$(PKG_NAME)-slave/postinst -[ -n "$$IPKG_INSTROOT" ] || { - /etc/init.d/turtetris-slave enable - /etc/init.d/turtetris-slave restart -} -endef - -define Package/$(PKG_NAME)-master/prerm -[ -n "$$IPKG_INSTROOT" ] || { - /etc/init.d/turtetris-master stop - /etc/init.d/turtetris-master disable -} -endef - -define Package/$(PKG_NAME)-slave/prerm -[ -n "$$IPKG_INSTROOT" ] || { - /etc/init.d/turtetris-slave stop - /etc/init.d/turtetris-slave disable -} -endef - -$(eval $(call Py3Package,turtetris)) -$(eval $(call BuildPackage,turtetris)) -$(eval $(call BuildPackage,turtetris-master)) -$(eval $(call BuildPackage,turtetris-slave)) diff --git a/turtetris/files/master.init b/turtetris/files/master.init deleted file mode 100755 index 912aff4..0000000 --- a/turtetris/files/master.init +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2006-2011 OpenWrt.org - -USE_PROCD=1 - -START=99 - -start_service() { - procd_open_instance - procd_set_param command python3 -m turtetris_master - procd_set_param respawn - procd_set_param stdout 1 - procd_set_param stderr 1 - procd_close_instance -} diff --git a/turtetris/files/slave.init b/turtetris/files/slave.init deleted file mode 100755 index 5092328..0000000 --- a/turtetris/files/slave.init +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2006-2011 OpenWrt.org - -USE_PROCD=1 - -START=99 - -start_service() { - procd_open_instance - procd_set_param command python3 -m turtetris_slave - procd_set_param respawn - procd_set_param stdout 1 - procd_set_param stderr 1 - procd_close_instance -} diff --git a/turtetris/files/uci b/turtetris/files/uci deleted file mode 100644 index d33219b..0000000 --- a/turtetris/files/uci +++ /dev/null @@ -1,3 +0,0 @@ - -config 1 'line' - diff --git a/updater-ng/Makefile b/updater-ng/Makefile deleted file mode 100644 index c008452..0000000 --- a/updater-ng/Makefile +++ /dev/null @@ -1,198 +0,0 @@ -# -## Copyright (C) 2016-2017 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:=updater-ng -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://gitlab.labs.nic.cz/turris/updater.git -PKG_SOURCE_BRANCH:=HEAD -PKG_MAINTAINER:=CZ.NIC <packaging@turris.cz> -HOST_BUILD_DEPENDS:=curl/host libevent2/host lua/host - -include $(INCLUDE_DIR)/pkgauto.mk -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/host-build.mk - -define Package/$(PKG_NAME) - TITLE:=The next generation updater - DEPENDS:=+liblua +libevent2 +usign +libcurl +vixie-cron +ca-certificates +libc -endef - -define Package/$(PKG_NAME)/install - $(INSTALL_DIR) $(1)/usr/lib/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/libupdater.so $(1)/usr/lib/ - - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/opkg-trans $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/pkgupdate $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/updater/updater.sh $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/updater/updater-unstuck.sh $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/updater/updater-wipe.sh $(1)/usr/bin/ - - $(INSTALL_DIR) $(1)/etc/updater - $(INSTALL_CONF) $(PKG_BUILD_DIR)/src/pkgupdate/configs/entry.lua $(1)/etc/updater - $(INSTALL_DIR) $(1)/etc/updater/conf.d - $(INSTALL_CONF) $(PKG_BUILD_DIR)/src/pkgupdate/configs/base.lua $(1)/etc/updater/conf.d/base.lua - $(INSTALL_CONF) $(PKG_BUILD_DIR)/src/pkgupdate/configs/example.lua $(1)/etc/updater/conf.d/example.lua - - $(INSTALL_DIR) $(1)/etc/updater/hook_preupdate - $(INSTALL_DIR) $(1)/etc/updater/hook_postupdate - $(INSTALL_DIR) $(1)/etc/updater/hook_reboot_required - touch $(1)/etc/updater/hook_preupdate/.keep - touch $(1)/etc/updater/hook_postupdate/.keep - $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/pkgupdate/hook_reboot_required/50-create-notification.sh $(1)/etc/updater/hook_reboot_required/50-create-notification.sh - - $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_CONF) ./files/updater.config $(1)/etc/config/updater -ifneq ($(PKG_BRANCH),) - echo >> $(1)/etc/config/updater - echo "config override 'override'" >> $(1)/etc/config/updater - echo " option branch '$(PKG_BRANCH)'" >> $(1)/etc/config/updater -endif - - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/updater/init $(1)/etc/init.d/updater - - $(INSTALL_DIR) $(1)/etc/cron.d - $(INSTALL_CONF) $(PKG_BUILD_DIR)/src/updater/cron $(1)/etc/cron.d/updater -endef - -define Package/$(PKG_NAME)/conffiles -/etc/updater/conf.d/example.lua -/etc/config/updater -endef - -define Package/$(PKG_NAME)/postinst -#!/bin/sh -if [ -z "$$IPKG_INSTROOT" ]; then - /etc/init.d/updater enable || true -fi - -# Remove morphered syntax from auto.lua -# This matches all Install and Package commands not followed by brackets. Whole -# line is enclosed with brackets and between strings and tables are added commas. -# Note: we don't have to check opkg-auto.lua as we do this migration before we -# move auto.lua to that name. -if [ -f "$$IPKG_INSTROOT/etc/updater/auto.lua" ]; then - AUTOTMP="$$(mktemp)" - sed -E '/^(Install|Package) +[^(]/{ - s/(Install|Package) +(.*)/\1(\2)/; - s/("|\}) ("|\{)/\1, \2/g - }' "$$IPKG_INSTROOT/etc/updater/auto.lua" > "$$AUTOTMP" - # Note: Edit in place in busybox limits regexp syntax so we are using our temporally file - mv "$$AUTOTMP" "$$IPKG_INSTROOT/etc/updater/auto.lua" -fi - -# With updater version 60.0 all configurations were moved to /etc/updater/conf.d/ -conf_move() { - if [ -f "$$IPKG_INSTROOT/etc/updater/$$1" -a ! -f "$$IPKG_INSTROOT/etc/updater/conf.d/$$2" ]; then - mv "$$IPKG_INSTROOT/etc/updater/$$1" "$$IPKG_INSTROOT/etc/updater/conf.d/$$2" - fi -} -conf_move user.lua user.lua -conf_move auto.lua opkg-auto.lua -endef - -define Build/Compile - $(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) NO_DOC=1 LUA_COMPILE:=no UPDATER_VERSION:=$(PKG_VERSION) -endef - -define Host/Compile - $(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) $(HOST_MAKE_FLAGS) NO_DOC=1 LUA_COMPILE:=no UPDATER_VERSION:=$(PKG_VERSION) -endef - -define Host/Install - $(INSTALL_DIR) $(STAGING_DIR_HOST)/usr/lib/ - $(INSTALL_BIN) $(HOST_BUILD_DIR)/lib/libupdater.so $(STAGING_DIR_HOST)/usr/lib/ - - $(INSTALL_DIR) $(STAGING_DIR_HOST)/usr/bin - $(INSTALL_BIN) $(HOST_BUILD_DIR)/bin/opkg-trans $(STAGING_DIR_HOST)/usr/bin/ - $(INSTALL_BIN) $(HOST_BUILD_DIR)/bin/pkgupdate $(STAGING_DIR_HOST)/usr/bin/ -endef - - -define Package/$(PKG_NAME)-localrepo - TITLE:=Next generation updater local repository manager - DEPENDS:=+python-light -endef - -define Package/$(PKG_NAME)-localrepo/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/localrepo/localrepo $(1)/usr/bin/localrepo - $(INSTALL_DIR) $(1)/etc/updater/conf.d - $(INSTALL_CONF) $(PKG_BUILD_DIR)/src/localrepo/localrepo.lua $(1)/etc/updater/conf.d/localrepo.lua -endef - -# Repository should be consistent when updater is executed successfully but this -# ensures that we will fix any problems that can be caused by older version of -# localrepo -define Package/$(PKG_NAME)-localrepo/postinst -[ -n "$$IPKG_INSTROOT" ] || { - localrepo check --fix -} -endef - - -define Package/$(PKG_NAME)-opkg - TITLE:=OPKG compatibility wrapper for next generation updater - DEPENDS:=+opkg +$(PKG_NAME)-localrepo -endef - -define Package/$(PKG_NAME)-opkg/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/opkg-wrapper/opkg $(1)/usr/bin/opkg-pkgupdate-wrapper.sh - $(INSTALL_DIR) $(1)/usr/share/updater - $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/localrepo/content2localrepo $(1)/usr/share/updater/opkg-content2localrepo.sh - $(INSTALL_DIR) $(1)/etc/updater/conf.d - $(INSTALL_CONF) $(PKG_BUILD_DIR)/src/opkg-wrapper/opkg.lua $(1)/etc/updater/conf.d/opkg.lua -endef - -# We are calling migration to localrepo from updater-ng-opkg package posinst as -# this one is called after updater-ng-localrepo one and script expect both of -# these packages. -define Package/$(PKG_NAME)-opkg/postinst -[ -n "$$IPKG_INSTROOT" ] || { - /usr/share/updater/opkg-content2localrepo.sh -} -endef - -# Current implementation of updater can't remove package before replan and so we -# can't let updater-ng steal opkg-trans files. With dependency: -# if not version_match then -# Package 'updater-ng' { deps = 'opkg-trans' } -# end -# this empty package should ensure that we correctly move packages from opkg-trans -# to updater-ng even with old version of updater. Unfortunately this won't work -# with downgrade. -# Note that because version_match was defined after package rename we can't use it -# to check version. But if it isn't defined than we know that we are using some -# old version of updater. -define Package/opkg-trans - TITLE:=Dummy opkg-trans package -endef - -define Package/opkg-trans/install - true -endef - -# This is same case as opkg-trans. Updater is package with originally obsolete -# updater version. -define Package/updater - TITLE:=Dummy updater package -endef - -define Package/updater/install - true -endef - -$(eval $(call BuildPackage,updater-ng)) -$(eval $(call BuildPackage,updater-ng-localrepo)) -$(eval $(call BuildPackage,updater-ng-opkg)) -$(eval $(call BuildPackage,opkg-trans)) -$(eval $(call BuildPackage,updater)) -$(eval $(call HostBuild)) diff --git a/updater-ng/files/updater.config b/updater-ng/files/updater.config deleted file mode 100644 index 4bc05ed..0000000 --- a/updater-ng/files/updater.config +++ /dev/null @@ -1,9 +0,0 @@ -config pkglists pkglists - list lists 'cacerts' - list lists 'luci-controls' - list lists 'nas' - list lists 'netutils' - -config l10n 'l10n' - list langs 'cs' - list langs 'de' |