diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-02-02 01:35:23 -0200 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-02-02 02:22:48 -0200 |
| commit | 4008cf7899d9fe8b11fb2ebbd29338514ef3b73f (patch) | |
| tree | 07c0ab932a91d8f6d410e793dbe28da4f4af9271 /libre | |
| parent | 399db66ccffe4fe3c23539d3416b949f25a77dd0 (diff) | |
arch-install-scripts: add new package to [libre] to solve bug #662 -> https://labs.parabola.nu/issues/662
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/arch-install-scripts/PKGBUILD | 36 | ||||
| -rw-r--r-- | libre/arch-install-scripts/copykeyring_fix.patch | 15 |
2 files changed, 51 insertions, 0 deletions
diff --git a/libre/arch-install-scripts/PKGBUILD b/libre/arch-install-scripts/PKGBUILD new file mode 100644 index 000000000..d92f5e595 --- /dev/null +++ b/libre/arch-install-scripts/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 227573 2014-12-12 23:47:01Z dreisner $ +# Maintainer (Arch): Dave Reisner <dreisner@archlinux.org> +# Maintainer: André Silva <emulatorman@parabola.nu> +# Maintainer: Esteban Carnevale <alfplayer@mailoo.org> + +pkgname=arch-install-scripts +pkgver=14 +pkgrel=1.parabola1 +pkgdesc="Scripts to aid in installing Parabola" +arch=('any') +url="https://projects.archlinux.org/arch-install-scripts.git" +license=('GPL') +depends=('bash' 'coreutils' 'pacman' 'util-linux') +source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz" + 'copykeyring_fix.patch') +md5sums=('fcab5a3e463413b06790969cfe09851c' + '566b8d1b0b4ac21c4040ff5171275beb') + +prepare() { + cd "$pkgname-$pkgver" + patch -Np1 -i "$srcdir"/copykeyring_fix.patch +} + +build() { + make -C "$pkgname-$pkgver" +} + +check() { + make -C "$pkgname-$pkgver" check +} + +package() { + make -C "$pkgname-$pkgver" PREFIX=/usr DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/arch-install-scripts/copykeyring_fix.patch b/libre/arch-install-scripts/copykeyring_fix.patch new file mode 100644 index 000000000..cc4f3f8cd --- /dev/null +++ b/libre/arch-install-scripts/copykeyring_fix.patch @@ -0,0 +1,15 @@ +diff -Nur arch-install-scripts-14.orig/pacstrap.in arch-install-scripts-14/pacstrap.in +--- arch-install-scripts-14.orig/pacstrap.in 2014-12-12 21:43:21.000000000 -0200 ++++ arch-install-scripts-14/pacstrap.in 2015-02-02 01:21:12.998548374 -0200 +@@ -109,10 +109,7 @@ + fi + + if (( copykeyring )); then +- # if there's a keyring on the host, copy it into the new root, unless it exists already +- if [[ -d /etc/pacman.d/gnupg && ! -d $newroot/etc/pacman.d/gnupg ]]; then +- cp -a /etc/pacman.d/gnupg "$newroot/etc/pacman.d/" +- fi ++ cp -na /etc/pacman.d/gnupg/* "$newroot/etc/pacman.d/gnupg/" + fi + + if (( copymirrorlist )); then |