aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbuild_repo.sh2
-rw-r--r--myrepo/Makefile (renamed from myrepo-cert/Makefile)14
-rw-r--r--myrepo/files/key.pub (renamed from myrepo-cert/files/key.pub)0
-rw-r--r--myrepo/files/key.sec (renamed from myrepo-cert/files/key.sec)0
-rw-r--r--myrepo/files/updater.lua (renamed from myrepo-cert/files/updater.lua)2
-rw-r--r--omnia.lua2
6 files changed, 11 insertions, 9 deletions
diff --git a/build_repo.sh b/build_repo.sh
index e57a779..130e239 100755
--- a/build_repo.sh
+++ b/build_repo.sh
@@ -67,7 +67,7 @@ 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;34mSign and deploy $1\e[0m"
- SEC=myrepo-cert/files/key.sec
+ SEC=myrepo/files/key.sec
pushd .$1-sdk
staging_dir/host/bin/usign -S -s ../$SEC -m bin/$2/packages/base/Packages
scp bin/$2/packages/base/* "$TARGET/$1/"
diff --git a/myrepo-cert/Makefile b/myrepo/Makefile
index c8ce9d6..ac252cc 100644
--- a/myrepo-cert/Makefile
+++ b/myrepo/Makefile
@@ -7,22 +7,22 @@
#
include $(TOPDIR)/rules.mk
-PKG_NAME:=myrepo-cert
-PKG_VERSION:=3
+PKG_NAME:=myrepo
+PKG_VERSION:=1
PKG_MAINTAINER:=Karel Koci
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
include $(INCLUDE_DIR)/package.mk
-define Package/myrepo-cert
- TITLE:=myrepo-cert
+define Package/myrepo
+ TITLE:=myrepo
endef
define Build/Compile
- true
+ :
endef
-define Package/myrepo-cert/install
+define Package/myrepo/install
$(INSTALL_DIR) $(1)/etc/opkg/keys
$(INSTALL_DIR) $(1)/etc/updater/keys
$(INSTALL_DATA) ./files/key.pub $(1)/etc/opkg/keys/cfb977a0d53c5424
@@ -32,4 +32,4 @@ define Package/myrepo-cert/install
$(INSTALL_CONF) ./files/updater.lua $(1)/etc/updater/conf.d/myrepo.lua
endef
-$(eval $(call BuildPackage,myrepo-cert))
+$(eval $(call BuildPackage,myrepo))
diff --git a/myrepo-cert/files/key.pub b/myrepo/files/key.pub
index 4173ed5..4173ed5 100644
--- a/myrepo-cert/files/key.pub
+++ b/myrepo/files/key.pub
diff --git a/myrepo-cert/files/key.sec b/myrepo/files/key.sec
index 5731869..5731869 100644
--- a/myrepo-cert/files/key.sec
+++ b/myrepo/files/key.sec
diff --git a/myrepo-cert/files/updater.lua b/myrepo/files/updater.lua
index f68f585..b9946c0 100644
--- a/myrepo-cert/files/updater.lua
+++ b/myrepo/files/updater.lua
@@ -8,3 +8,5 @@ end
Script("myrepo", "http://cynerd.cz/myrepo/" .. board .. ".lua", {
pubkey = "file:///etc/updater/keys/myrepo.pub"
})
+
+Install("myrepo")
diff --git a/omnia.lua b/omnia.lua
index a494368..0225da8 100644
--- a/omnia.lua
+++ b/omnia.lua
@@ -4,4 +4,4 @@ Repository("myrepo", "http://cynerd.cz/myrepo/omnia/", {
priority = 50, pubkey = "file:///etc/updater/keys/myrepo.pub"
})
-Install("myrepo-cert", {critical=true})
+Install("myrepo", {critical=true})