diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2018-08-26 22:58:42 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2018-08-26 22:59:41 -0400 |
| commit | e6703fc24249cee29d1960d446369bfc43503603 (patch) | |
| tree | 8a70eaf117fad068ae7307618dce80a91a16aa16 | |
| parent | 97c3ec0be57fa5c14964561d6807bf0299e3f808 (diff) | |
base-pacman: Is no longer necessary, has been rolled in to default config
| -rw-r--r-- | config-parabola-base-openresolv.PKGBUILD | 4 | ||||
| -rw-r--r-- | config-parabola-base-pacman.PKGBUILD | 23 | ||||
| -rw-r--r-- | config-parabola-mgmt-pacman-repo-config.PKGBUILD | 4 | ||||
| -rw-r--r-- | config-parabola-mgmt-pacman-repo-lukeshu.PKGBUILD | 4 | ||||
| -rw-r--r-- | config-parabola-mgmt-pacman.PKGBUILD | 4 |
5 files changed, 8 insertions, 31 deletions
diff --git a/config-parabola-base-openresolv.PKGBUILD b/config-parabola-base-openresolv.PKGBUILD index 9bd86ce..d5e6d71 100644 --- a/config-parabola-base-openresolv.PKGBUILD +++ b/config-parabola-base-openresolv.PKGBUILD @@ -1,5 +1,5 @@ . ${BUILDFILE%/*}/common.sh -pkgver=20180826.1 +pkgver=20180826.2 package() { preamble @@ -21,7 +21,7 @@ EOF _EOF_ # Instruct pacman to not try to update it. -depends+=(config-parabola-base-pacman) +depends+=('pacman>=5.1.1-1.parabola5') add-file etc/pacman.d/resolvconf.conf <<'EOF' [options] NoExtract = etc/resolv.conf diff --git a/config-parabola-base-pacman.PKGBUILD b/config-parabola-base-pacman.PKGBUILD deleted file mode 100644 index b551bf2..0000000 --- a/config-parabola-base-pacman.PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -. ${BUILDFILE%/*}/common.sh -pkgver=20180826 - -package() { -preamble -# #### pacman - -depends=(pacman) - -# In order for configuration sets to modularly adjust the pacman -# configuration, we patch `/etc/pacman.conf` to include -# `/etc/pacman.d/*.conf`. -add-file -m755 usr/share/holo/files/10-"$pkgname"/etc/pacman.conf.holoscript <<EOF -#!/bin/sh -{ - grep -vxF 'Include = /etc/pacman.d/*.conf' - echo - echo 'Include = /etc/pacman.d/*.conf' -} | cat -s -EOF - -postamble -} diff --git a/config-parabola-mgmt-pacman-repo-config.PKGBUILD b/config-parabola-mgmt-pacman-repo-config.PKGBUILD index 3a6395e..98309af 100644 --- a/config-parabola-mgmt-pacman-repo-config.PKGBUILD +++ b/config-parabola-mgmt-pacman-repo-config.PKGBUILD @@ -1,11 +1,11 @@ . ${BUILDFILE%/*}/common.sh -pkgver=20180826.1 +pkgver=20180826.2 package() { preamble # #### pacman -depends+=(config-parabola-base-pacman) +depends+=('pacman>=5.1.1-1.parabola5') add-file etc/pacman.d/repo-config.conf <<EOF [config] diff --git a/config-parabola-mgmt-pacman-repo-lukeshu.PKGBUILD b/config-parabola-mgmt-pacman-repo-lukeshu.PKGBUILD index 85246ec..f3e51ab 100644 --- a/config-parabola-mgmt-pacman-repo-lukeshu.PKGBUILD +++ b/config-parabola-mgmt-pacman-repo-lukeshu.PKGBUILD @@ -1,11 +1,11 @@ . ${BUILDFILE%/*}/common.sh -pkgver=20180826.1 +pkgver=20180826.2 package() { preamble # #### pacman -depends+=(config-parabola-base-pacman) +depends+=('pacman>=5.1.1-1.parabola5') add-file etc/pacman.d/repo-lukeshu.conf <<EOF [~lukeshu] diff --git a/config-parabola-mgmt-pacman.PKGBUILD b/config-parabola-mgmt-pacman.PKGBUILD index 91200b5..ab9f2cd 100644 --- a/config-parabola-mgmt-pacman.PKGBUILD +++ b/config-parabola-mgmt-pacman.PKGBUILD @@ -1,11 +1,11 @@ . ${BUILDFILE%/*}/common.sh -pkgver=20180826.1 +pkgver=20180826.2 package() { preamble # #### pacman -depends+=(config-parabola-base-pacman) +depends+=('pacman>=5.1.1-1.parabola5') add-file etc/pacman.d/options.conf <<EOF [options] |