summaryrefslogtreecommitdiff
path: root/archPackagesUpdate
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2016-04-13 10:05:56 +0200
committerErich Eckner <git@eckner.net>2016-04-13 10:07:38 +0200
commite5666e4572f2273f8d3dd4443cf48566517a8f52 (patch)
tree429db8dbeb8f08b60aa3c93153e6e17b415d1c12 /archPackagesUpdate
parentf074db5a8818fafc491f3c62238432d024e37bcb (diff)
downloadarchlinuxewe.git.save-e5666e4572f2273f8d3dd4443cf48566517a8f52.tar.xz
add cutsom makepkg.conf's
Diffstat (limited to 'archPackagesUpdate')
-rwxr-xr-xarchPackagesUpdate11
1 files changed, 9 insertions, 2 deletions
diff --git a/archPackagesUpdate b/archPackagesUpdate
index ab1bc8da..89a387fe 100755
--- a/archPackagesUpdate
+++ b/archPackagesUpdate
@@ -143,6 +143,13 @@ if ${aufRechenknecht}
then
maxErr=0
+# generate current makepkg.conf and makepkg32.conf
+ cd "${tmpDir}"
+ cp /etc/makepkg.conf .
+ patch -p0 -i makepkgSystem.patch
+ cp makepkg{,32}.conf
+ patch -p0 -i makepkg32.patch
+
# build packages
for ((i=0; i<${#pakete[@]}; i++))
do
@@ -159,7 +166,7 @@ then
echo '\
sudo pacman -Sy && \
cd "'"${tmpDir}/${paket}"'" && \
- _targetHost='\''--host=i686-pc-linux-gnu'\'' makepkg -fcsr --noconfirm && \
+ _targetHost='\''--host=i686-pc-linux-gnu'\'' makepkg --config "'"${tmpDir}"'/makepkg32.conf" -fcsr --noconfirm && \
exit\
' | \
chrootUnpriv
@@ -167,7 +174,7 @@ then
else
# everything else is built directly
sudo pacman -Sy
- makepkg -fcsr --noconfirm
+ makepkg --config "${tmpDir}/makepkg.conf" -fcsr --noconfirm
err[${i}]=$?
fi
if ${abortOnMakepkgError} && [ ${err[${i}]} -ne 0 ]