From 7772819f568aba3c8f917c49d22272bdd4fa47d5 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 19 May 2017 15:11:53 +0000
Subject: [PATCH] main/aports-build: remove release_formats
new mkimage scripts decides the target format
---
main/aports-build/APKBUILD | 6 +++---
main/aports-build/aports-build | 3 ---
main/aports-build/mqtt-exec.aports-build.confd | 3 ---
3 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/main/aports-build/APKBUILD b/main/aports-build/APKBUILD
index 57be7fbb9d6d..96cde998b39d 100644
--- a/main/aports-build/APKBUILD
+++ b/main/aports-build/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=aports-build
pkgver=1.1
-pkgrel=3
+pkgrel=4
pkgdesc="MQTT based build-on-git-push scripts for Alpine Linux"
url="http://alpinelinux.org"
arch="noarch"
@@ -49,7 +49,7 @@ package() {
|| return 1
}
-sha512sums="62d12aa79e8d864e2e5a2a742bcd501de1339f9e00e425055fd3e9538f88492cdba406fb5fcb2621e46501cff2412ee91c90c52ad51098925000dae20c7a87ae aports-build
+sha512sums="ed45a4a7c8a8056def9efcc15d8692bdbc788c4c952d06fdd800d808613b9d445888d4fc1192d092d164665ce5a06419b20c45f8426e8006849f6b777288dcc2 aports-build
821035bda47152c341ec94bf960fa67e3377051826712ceb74f39103e6e422777b6e082231bfb87865653d2b93b7d3154cfc24abf65a52e3e66da69412dd7e41 aports-build.initd
-93d26e2055dbb02e863bf76b64a549c100decec3fda612ce96ca1464e6d61befa9f57f202553a25cf323e67e266f532d19c7423ff070943a59b3973946d949fe mqtt-exec.aports-build.confd
+62ed5cb6d1fef03fa707512c8c99c572a91e64706ebcc2e7097108811818615618bab908292d0ba0ad2afe93a27333d9c91deb347d6c99703eb8983d1ee5f480 mqtt-exec.aports-build.confd
ded99f4c9474e4dc91605de71919deebbeb8e2e3ebcc9d61890f327bb6220d891a9f2a6c615929cc53bd8007b1a1dbd827bc55cd5cbdd1a6661fcdafa4912950 report-build-errors.lua"
diff --git a/main/aports-build/aports-build b/main/aports-build/aports-build
index 723fe476bd3b..a5c11204774d 100644
--- a/main/aports-build/aports-build
+++ b/main/aports-build/aports-build
@@ -129,9 +129,6 @@ while true; do
_current_tag=$(git describe --abbrev=0)
if [ "$_old_tag" != "$_current_tag" ]; then
log "$_old_tag -> $_current_tag"
- if [ -n "$release_formats" ]; then
- do_release=true
- fi
fi
if [ "$_old" = "$_current" ] && [ -f /tmp/uploaded ] && [ -z "$force" ] && [ "$_current_tag" = "$_old_tag" ]; then
break
diff --git a/main/aports-build/mqtt-exec.aports-build.confd b/main/aports-build/mqtt-exec.aports-build.confd
index 731677c884c9..75e3f12a7e0e 100644
--- a/main/aports-build/mqtt-exec.aports-build.confd
+++ b/main/aports-build/mqtt-exec.aports-build.confd
@@ -7,9 +7,6 @@ git_branch=master
# prefix for url where logs can be found
# logurlprefix=http://bld1.alpinelinux.org/buildlogs
-# list of release formats. unset for no release
-# release_formats="iso"
-
# mqtt-exec params
exec_command=/usr/bin/aports-build
--
GitLab