From 280cfdee4732b0731cd5d2f45acee7bdeb164e9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Fri, 3 Jul 2020 09:45:01 +0200
Subject: [PATCH] generate_medkit: fix updater compilation
This fixes medkit generation. It was failing because new version of
updater-ng now uses autotools instead of custom makefile.
Also usign is no longer required for medkit generation (by updater).
Updater now has its own implementation using OpenSSL. It is still
required for signing.
---
generate_medkit | 1 -
helpers/generate_common.sh | 10 +++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/generate_medkit b/generate_medkit
index 3efe658a6..490ae206c 100755
--- a/generate_medkit
+++ b/generate_medkit
@@ -145,7 +145,6 @@ updater_ng_repodetect "$BRANCH" "$BOARD"
get_usign
get_updater_ng
-export PATH="$PATH:$(dirname "$USIGN")"
## Generate root ##
exec fakeroot -- /bin/bash -s <<EOF
set -e
diff --git a/helpers/generate_common.sh b/helpers/generate_common.sh
index 061f43ab4..97a545a7e 100644
--- a/helpers/generate_common.sh
+++ b/helpers/generate_common.sh
@@ -85,8 +85,12 @@ updater_ng_repodetect() {
get_updater_ng() {
if ! git_get "$SRC_UPDATER" turris-tools/updater-ng "$UPDATER_VERSION"; then
- make -C turris-tools/updater-ng NO_DOC=1 LUA_COMPILE=no
+ (
+ ./bootstrap
+ ./configure --disable-tests --disable-linters --disable-docs --disable-valgrind
+ make
+ )
fi
- export PKGUPDATE="$(pwd)/turris-tools/updater-ng/bin/pkgupdate"
- export OPKG_TRANS="$(pwd)/turris-tools/updater-ng/bin/opkg-trans"
+ export PKGUPDATE="$PWD/turris-tools/updater-ng/pkgupdate"
+ export PKGTRANSACTION="$PWD/turris-tools/updater-ng/pkgtransaction"
}
--
GitLab