Merge pull request #3 from Avinash95/package_signing

enable package signing
CreatorDev · Sep 14, 2016 · e623c4c · e623c4c
2 parents 6a1ba5c + 53c26f2
commit e623c4c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -7,14 +7,17 @@ all: openwrt
 openwrt: build_openwrt
 	echo "OpenWrt Done!"
 
-clean: clean_openwrt clean_feeds clean_binaries
+clean: clean_openwrt clean_feeds clean_binaries clean_keys
 
 # Building OpenWRT
 $(DIR__CI)/patched:
 	git submodule init openwrt;git submodule update --remote; \
 	cd $(DIR__OPENWRT); \
 	./scripts/feeds update -a; \
-	./scripts/feeds install -a;
+	./scripts/feeds install -a;\
+	/vault read -field=key secret/creator/packagesigning > key.pem; \
+	/vault read -field=cert secret/creator/packagesigning > cert.pem; \
+	/vault read -field=password secret/creator/packagesigning > pass.txt
 ifneq (_,_$(findstring all,$P))
 	cd $(DIR__OPENWRT)/feeds/packages; patch -p1 < $(DIR__CI)/0001-glib2-make-libiconv-dependent-on-ICONV_FULL-variable.patch;\
 	patch -p1 < $(DIR__CI)/0001-node-host-turn-off-verbose.patch;
@@ -67,3 +70,10 @@ clean_feeds: clean_patches
 clean_binaries:
 	rm -rf $(DIR__OPENWRT)/bin/pistachio/
 
+.PHONY: clean_keys
+clean_keys:
+	cd $(DIR__OPENWRT); \
+	rm -f key.pem; \
+	rm -f cert.pem; \
+	rm -f pass.txt;
+
diff --git a/creator-platform-all-cascoda.config b/creator-platform-all-cascoda.config
@@ -10,13 +10,18 @@ CONFIG_KERNEL_KALLSYMS=y
 CONFIG_IMAGEOPT=y
 CONFIG_LOCALMIRROR="https://downloads.creatordev.io/pistachio/marduk/dl"
 CONFIG_OPENSSL_WITH_EC=y
+CONFIG_OPKGSMIME_CERT="$(TOPDIR)/cert.pem"
+CONFIG_OPKGSMIME_KEY="$(TOPDIR)/key.pem"
+CONFIG_OPKGSMIME_PASSFILE="$(TOPDIR)/pass.txt"
+# CONFIG_OPKGSMIME_PASSPHRASE is not set
 CONFIG_PACKAGE_ca-certificates=y
 CONFIG_PACKAGE_libopenssl=y
 CONFIG_PACKAGE_libustream-openssl=y
 CONFIG_PACKAGE_opkg-smime=y
 # CONFIG_PACKAGE_usign is not set
 CONFIG_PACKAGE_zlib=y
 # CONFIG_SIGNED_PACKAGES is not set
+CONFIG_SMIMEOPT=y
 CONFIG_VERSIONOPT=y
 CONFIG_VERSION_DIST="OpenWrt"
 CONFIG_VERSION_NICK="Ci40All"

diff --git a/creator-platform-all.config b/creator-platform-all.config
@@ -10,13 +10,18 @@ CONFIG_KERNEL_KALLSYMS=y
 CONFIG_IMAGEOPT=y
 CONFIG_LOCALMIRROR="https://downloads.creatordev.io/pistachio/marduk/dl"
 CONFIG_OPENSSL_WITH_EC=y
+CONFIG_OPKGSMIME_CERT="$(TOPDIR)/cert.pem"
+CONFIG_OPKGSMIME_KEY="$(TOPDIR)/key.pem"
+CONFIG_OPKGSMIME_PASSFILE="$(TOPDIR)/pass.txt"
+# CONFIG_OPKGSMIME_PASSPHRASE is not set
 CONFIG_PACKAGE_ca-certificates=y
 CONFIG_PACKAGE_libopenssl=y
 CONFIG_PACKAGE_libustream-openssl=y
 CONFIG_PACKAGE_opkg-smime=y
 # CONFIG_PACKAGE_usign is not set
 CONFIG_PACKAGE_zlib=y
 # CONFIG_SIGNED_PACKAGES is not set
+CONFIG_SMIMEOPT=y
 CONFIG_VERSIONOPT=y
 CONFIG_VERSION_DIST="OpenWrt"
 CONFIG_VERSION_NICK="Ci40All"