From 6600d5c1a1b166faa7ea4163e6173b420e67fbc1 Mon Sep 17 00:00:00 2001 From: Daniel Langbein Date: Wed, 8 Sep 2021 22:32:03 +0200 Subject: [PATCH] minor --- README.md | 1 + build-pkg/build-all | 6 ++++++ build-pkg/run.sh | 4 ---- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index e51b9e7..2b1f841 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,7 @@ They were added in the following manner: ```shell AUR_PKG=amdgpu-pro-installer git submodule add "https://aur.archlinux.org/${AUR_PKG}.git" pkg/"${AUR_PKG}" +# echo " ${AUR_PKG}" >> build-pkg/pkglist-AUR.txt ``` And can be removed with: diff --git a/build-pkg/build-all b/build-pkg/build-all index 4762be8..f34a6b2 100755 --- a/build-pkg/build-all +++ b/build-pkg/build-all @@ -26,6 +26,10 @@ function start-docker() { esac } +function update-build-image() { + sudo docker-compose build --pull +} + function build-pkg() { # $1: package-name # $2, $3, ...: makepkg-args @@ -87,6 +91,8 @@ before continuing with the next line."; is-installed "docker-compose" || return $? } + update-build-image || return $? + # Read content of PKGLIST file to an array # For each line: build and push all space separated packages diff --git a/build-pkg/run.sh b/build-pkg/run.sh index 86f80d0..103df89 100644 --- a/build-pkg/run.sh +++ b/build-pkg/run.sh @@ -9,10 +9,6 @@ function main(){ # Write-permission for user "build" sudo chown "build:wheel" /out - # Refresh mirrors - # TODO: Move this to the Dockerfile? - sudo pacman -Sy - PKG=/pkg/"${1}" shift; # remove first arg echo "Looking for PKGBUILD in ${PKG} ..."