From 9ed434ffef7851ab2bacb05bff75fc9c79446e09 Mon Sep 17 00:00:00 2001 From: Daniel Langbein Date: Wed, 8 Sep 2021 22:53:17 +0200 Subject: [PATCH] fix --- README.md | 2 +- build-pkg/Dockerfile | 4 ++-- build-pkg/run.sh | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 2b1f841..0d924ca 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ See [build-pkg/pkglist-AUR.txt](build-pkg/pkglist-AUR.txt) for a full list. They were added in the following manner: ```shell -AUR_PKG=amdgpu-pro-installer +AUR_PKG=plib git submodule add "https://aur.archlinux.org/${AUR_PKG}.git" pkg/"${AUR_PKG}" # echo " ${AUR_PKG}" >> build-pkg/pkglist-AUR.txt ``` diff --git a/build-pkg/Dockerfile b/build-pkg/Dockerfile index 599e0b9..87b667e 100644 --- a/build-pkg/Dockerfile +++ b/build-pkg/Dockerfile @@ -9,10 +9,10 @@ FROM archlinux:base-devel # 2. Enable parallel downloads # TODO: Wait until next baseimage update # && sed --in-place 's|^#ParallelDownloads\s*=.*$|ParallelDownloads = 4|' /etc/pacman.conf \ -# 3. Update mirrors + packages +# 3. Update mirrors + packages; install svn for makepkg to handle svn sources RUN printf '\n[options]\nDisableDownloadTimeout\n' >> /etc/pacman.conf && \ printf '\n[de-p1st]\nSigLevel = Optional TrustAll\nServer = https://arch.p1st.de\n' >> /etc/pacman.conf && \ - pacman -Syu --noconfirm + pacman -Syu --noconfirm && pacman -S --needed --noconfirm svn # 1. Set packager # 2. Store built packages in /out/ diff --git a/build-pkg/run.sh b/build-pkg/run.sh index 103df89..d68b1bf 100644 --- a/build-pkg/run.sh +++ b/build-pkg/run.sh @@ -9,6 +9,9 @@ function main(){ # Write-permission for user "build" sudo chown "build:wheel" /out + # Refresh mirrors, e.g. to fetch packages that were built in the previous build stage + sudo pacman -Sy + PKG=/pkg/"${1}" shift; # remove first arg echo "Looking for PKGBUILD in ${PKG} ..."