From 9fa8dbf7ead1f2baef0db13355d5c48adc71e041 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Thu, 19 Oct 2017 16:42:53 +0300
Subject: [PATCH] main/aports-build: add efi release dependencies, modernize
---
main/aports-build/APKBUILD | 27 +++++++++------------------
main/aports-build/aports-build | 3 ++-
2 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/main/aports-build/APKBUILD b/main/aports-build/APKBUILD
index e85e95ab8f50..626ff9f6b66d 100644
--- a/main/aports-build/APKBUILD
+++ b/main/aports-build/APKBUILD
@@ -1,11 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=aports-build
-pkgver=1.1
-pkgrel=6
+pkgver=1.2
+pkgrel=0
pkgdesc="MQTT based build-on-git-push scripts for Alpine Linux"
url="http://alpinelinux.org"
arch="noarch"
license="GPL2"
+options="!check"
depends="abuild>2.20.0 mosquitto-clients alpine-sdk mqtt-exec rsync lua-aports
lua5.2-cjson lua5.2-mqtt-publish"
depends_dev=""
@@ -20,15 +21,6 @@ source="aports-build
"
builddir="$srcdir"
-prepare() {
- local i
- cd "$builddir"
- for i in $source; do
- case $i in
- *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
- esac
- done
-}
build() {
cd "$builddir"
@@ -37,19 +29,18 @@ build() {
package() {
cd "$builddir"
install -Dm755 "$srcdir"/aports-build \
- "$pkgdir"/usr/bin/aports-build || return 1
- install -d "$pkgdir"/etc/init.d || return 1
+ "$pkgdir"/usr/bin/aports-build
+ install -d "$pkgdir"/etc/init.d
- ln -s mqtt-exec "$pkgdir"/etc/init.d/mqtt-exec.aports-build || return 1
+ ln -s mqtt-exec "$pkgdir"/etc/init.d/mqtt-exec.aports-build
install -Dm644 "$srcdir"/mqtt-exec.aports-build.confd \
- "$pkgdir"/etc/conf.d/mqtt-exec.aports-build || return 1
+ "$pkgdir"/etc/conf.d/mqtt-exec.aports-build
install -Dm644 "$srcdir"/report-build-errors.lua \
- "$pkgdir"/etc/buildrepo/plugins.d/report-build-errors.lua \
- || return 1
+ "$pkgdir"/etc/buildrepo/plugins.d/report-build-errors.lua
}
-sha512sums="d0b3547322e0073583c9bcf262c56204940303d7c9512cc7b4bd3182c84db9acbbecfafa28d9a323d013ac91c55ea9bfc095f1098d590e57ae219a55e285bebd aports-build
+sha512sums="e5fc3d6993f387a21aa73c9c0dc7caefad8f8420fb62044566cd0cb02ca7a65d2b69e8213e97b5d6dc035fca0e7d31a4c5d3134d066fe1a27bb166cd6e8a1f53 aports-build
821035bda47152c341ec94bf960fa67e3377051826712ceb74f39103e6e422777b6e082231bfb87865653d2b93b7d3154cfc24abf65a52e3e66da69412dd7e41 aports-build.initd
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 06618d12cb0c..7177ea212089 100644
--- a/main/aports-build/aports-build
+++ b/main/aports-build/aports-build
@@ -67,7 +67,8 @@ create_release() {
local release="$1"
local release_deps="abuild apk-tools alpine-conf busybox fakeroot xorriso rsync"
case "$arch" in
- x86*) release_deps="$release_deps syslinux";;
+ aarch64|arm*) release_deps="$release_deps mtools grub-efi";;
+ x86*) release_deps="$release_deps syslinux mtools grub-efi";;
ppc64le) release_deps="$release_deps grub grub-ieee1275";;
esac
--
GitLab