diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2012-01-18 11:24:07 +0100 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2012-01-18 11:24:07 +0100 |
| commit | ee4edefa2f12372adb4793c0dd6420fc76911ae4 (patch) | |
| tree | a7f0d9569fe988813504b2ba5befb4585358aa19 /archbuild.in | |
| parent | a8b64995ee6ee32285cc4f33f127a094b8a63fff (diff) | |
Remove any pacman 4 related workarounds20120118
Diffstat (limited to 'archbuild.in')
| -rw-r--r-- | archbuild.in | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/archbuild.in b/archbuild.in index 4e16d1f..122f1e0 100644 --- a/archbuild.in +++ b/archbuild.in @@ -2,8 +2,7 @@ m4_include(lib/common.sh) -# FIXME: temporary added curl until pacman 4.0 moves to [core] -base_packages=(base base-devel sudo curl) +base_packages=(base base-devel sudo) cmd="${0##*/}" if [[ "${cmd%%-*}" == 'multilib' ]]; then @@ -53,15 +52,6 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then done exec 9>&- - # FIXME: temporary workaround until pacman 4.0 moves to [core] - if pacman -V | grep -q 'v4.' && ( [[ "$repo" == 'extra' || "$repo" == 'multilib' ]] ); then - pacman_conf=$(mktemp) - cp "@pkgdatadir@/pacman-${repo}.conf" "${pacman_conf}" - sed -r 's/^#(SigLevel = Never)/\1/' -i "${pacman_conf}" - else - pacman_conf="@pkgdatadir@/pacman-${repo}.conf" - fi - rm -rf "${chroots}/${repo}-${arch}" mkdir -p "${chroots}/${repo}-${arch}" setarch "${arch}" mkarchroot \ @@ -69,11 +59,6 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then -M "@pkgdatadir@/makepkg-${arch}.conf" \ "${chroots}/${repo}-${arch}/root" \ "${base_packages[@]}" - - # FIXME: temporary workaround until pacman 4.0 moves to [core] - if pacman -V | grep -q 'v4.' && ( [[ "$repo" == 'extra' || "$repo" == 'multilib' ]] ); then - cp "@pkgdatadir@/pacman-${repo}.conf" "${chroots}/${repo}-${arch}/root/etc/pacman.conf" - fi else setarch ${arch} mkarchroot \ -u \ |