summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@digital-scurf.org>2017-06-04 16:22:36 +0100
committerDaniel Silverstone <dsilvers@digital-scurf.org>2017-06-04 16:22:36 +0100
commit5c70a3828009074900a657b4cd88d7b482ffab49 (patch)
treedfb970c09450b27bf6fcf2aeb95e3cff7fb18d2b
parent3323c8e2c371aee3af5d73fb614e083a2146edac (diff)
downloadgp-packaging-tools-5c70a3828009074900a657b4cd88d7b482ffab49.tar.bz2
Fix build-packages
-rw-r--r--README2
-rwxr-xr-xgp-build-packages16
2 files changed, 15 insertions, 3 deletions
diff --git a/README b/README
index a4f7bef..5f956f9 100644
--- a/README
+++ b/README
@@ -12,7 +12,7 @@ Dependencies
GPPT is written in plain Lua 5.2. It is also expecting the git tooling, debian
packaging tooling, and a number of other bits and bobs:
- apt install lua5.2 dpkg-dev devscripts xz-utils fakeroot pbuilder
+ apt install lua5.2 dpkg-dev devscripts xz-utils fakeroot pbuilder gnupg
If the machine GPPT is running on will be running the stimulus converter then
diff --git a/gp-build-packages b/gp-build-packages
index 3f6d468..1a30c61 100755
--- a/gp-build-packages
+++ b/gp-build-packages
@@ -56,17 +56,29 @@ pbarg("--distribution", BASE_DISTRO)
pbarg("--mirror", "http://httpredir.debian.org/debian/")
pbarg("--othermirror",
- table.concat({"deb [allow-insecure=yes trusted=yes] http://",
+ table.concat({"deb http://",
servername, "/gitano-release/ ",
BASE_DISTRO, " main"}, ""))
+local keyring = assert(io.popen("curl -s http://" .. servername .. "/gitano-release/repository-key.pub")):read("*a")
+
if distname:sub(1,3) == "ci-" then
PBUILDER_ARGS[#PBUILDER_ARGS] = PBUILDER_ARGS[#PBUILDER_ARGS] .. "|" ..
- table.concat({"deb [allow-insecure=yes trusted=yes] http://",
+ table.concat({"deb http://",
servername, "/gitano-ci/ ",
distname, " main"}, "")
+ keyring = keyring .. "\n" .. assert(io.popen("curl -s http://" .. servername .. "/gitano-ci/repository-key.pub")):read("*a")
end
+run("rm", "-f", "extras", "extras.gpg")
+
+local keyfh = io.open("extras", "w")
+keyfh:write(keyring)
+keyfh:close()
+run("gpg", "--dearmor", "extras")
+
+pbarg("--keyring", "extras.gpg")
+
pbarg("--buildresult", ".")
pbarg("--debbuildopts", "-b")