diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2018-08-26 15:42:58 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2018-08-26 15:42:58 -0400 |
| commit | 73982c5ad7057ce2fdec669d962aec6c9caf28c8 (patch) | |
| tree | 8e966672881b42d16930c5089f73ae4c9c922d97 /libre/pacman | |
| parent | 89953235cbab39a4c39b8085161a8c7175d4867a (diff) | |
| download | abslibre-73982c5ad7057ce2fdec669d962aec6c9caf28c8.tar.gz abslibre-73982c5ad7057ce2fdec669d962aec6c9caf28c8.tar.bz2 abslibre-73982c5ad7057ce2fdec669d962aec6c9caf28c8.zip | |
libre/pacman: default config: Load modular configuration files
https://lists.parabola.nu/pipermail/dev/2017-December/006177.html
Diffstat (limited to 'libre/pacman')
| -rw-r--r-- | libre/pacman/PKGBUILD | 12 | ||||
| -rw-r--r-- | libre/pacman/makepkg.conf.in | 10 | ||||
| -rw-r--r-- | libre/pacman/pacman.conf.armv7h | 2 | ||||
| -rw-r--r-- | libre/pacman/pacman.conf.i686 | 2 | ||||
| -rw-r--r-- | libre/pacman/pacman.conf.x86_64 | 2 |
5 files changed, 22 insertions, 6 deletions
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index 5397abe7e..a838ac8ec 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -12,7 +12,7 @@ pkgname=pacman pkgver=5.1.1 pkgrel=1 -pkgrel+=.parabola3 +pkgrel+=.parabola4 pkgdesc="A library-based package manager with dependency support" arch=('x86_64') arch+=('i686' 'armv7h') @@ -47,10 +47,10 @@ source_armv7h=(0001-Sychronize-filesystem.patch 0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch) sha256sums=('be04b9162d62d2567e21402dcbabb5bedfdb03909fa5ec6e8568e02ab325bd8d' 'SKIP' - '1b2c8f4ec84d0dc496516880a54b5e4deb78798618c9cf5e284a45303f156e58' - '19853ea9a2138157bbb334eb7f3a9b3098b88e513678b54b7b4f19d2ffd6ecad' - 'b2cb3ba229edba338c0af7d7f5bb1a6ef6143bcd453c693bfee0c02fa1cfa18a' - 'ecef1e98eaaf207f4f2c3d07cfe13533866e1e774240eb833e8b3bd691ada95f' + '53c3d28314fd8fc6f92a0720c41fc5bd4c7b24793f84158d07988b294c5480a2' + '6baddd5a4651f147b9412d86dc8c5b4763e4f34deaf140a7fb986fb4d4a05949' + '435f4e93355048f83697317b35aad7788162bab5f58f1b9268bc83ad03ed41d8' + 'c0cbdc0df96f13a73d241c1eb85a969098bd414f12ecd7c045922b154537e00a' '220f1b25a64727041dc6fa3fd486b0a043f735a3f6cecedc4e2f7c47ec6ce66d' '2a857061f032ff5485f5c75ab74e6f6532621e08963ef48640a792cca16cacd6' '075ac1f8d782ac9868f5e7f3043f684a00da33915eba9ec7e4a8940992ddc269' @@ -128,7 +128,7 @@ package() { make DESTDIR="$pkgdir" install # install distro-specific stuff - install -dm755 "$pkgdir/etc" + install -dm755 "$pkgdir/etc/makepkg.d" install -m644 "$srcdir/pacman.conf.$CARCH" "$pkgdir/etc/pacman.conf" install -m644 "$srcdir/makepkg.conf.$CARCH" "$pkgdir/etc/makepkg.conf" diff --git a/libre/pacman/makepkg.conf.in b/libre/pacman/makepkg.conf.in index 9b90a2b26..3fc6ed099 100644 --- a/libre/pacman/makepkg.conf.in +++ b/libre/pacman/makepkg.conf.in @@ -143,3 +143,13 @@ COMPRESSZ=(compress -c -f) # PKGEXT='.pkg.tar.xz' SRCEXT='.src.tar.gz' + +######################################################################### +# MODULAR CONFIGURATION +######################################################################### +# +for file in /etc/makepkg.d/*.conf; do + [[ -f "$file" ]] || continue + source "$file" +done +unset file diff --git a/libre/pacman/pacman.conf.armv7h b/libre/pacman/pacman.conf.armv7h index f997c8e2e..72d59e83b 100644 --- a/libre/pacman/pacman.conf.armv7h +++ b/libre/pacman/pacman.conf.armv7h @@ -118,3 +118,5 @@ Include = /etc/pacman.d/mirrorlist #[custom] #SigLevel = Optional TrustAll #Server = file:///home/custompkgs + +Include = /etc/pacman.d/*.conf diff --git a/libre/pacman/pacman.conf.i686 b/libre/pacman/pacman.conf.i686 index f0be9bacb..49b8785da 100644 --- a/libre/pacman/pacman.conf.i686 +++ b/libre/pacman/pacman.conf.i686 @@ -118,3 +118,5 @@ Include = /etc/pacman.d/mirrorlist #[custom] #SigLevel = Optional TrustAll #Server = file:///home/custompkgs + +Include = /etc/pacman.d/*.conf diff --git a/libre/pacman/pacman.conf.x86_64 b/libre/pacman/pacman.conf.x86_64 index b9ea190e5..b5401acc0 100644 --- a/libre/pacman/pacman.conf.x86_64 +++ b/libre/pacman/pacman.conf.x86_64 @@ -145,3 +145,5 @@ Include = /etc/pacman.d/mirrorlist #[custom] #SigLevel = Optional TrustAll #Server = file:///home/custompkgs + +Include = /etc/pacman.d/*.conf |